Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-pc!191

src/views/business/coupon/add.vue

@@ -36,7 +36,7 @@
             <el-input v-model="addData.minOrderAmt" :readonly="readonly" type="number" placeholder="请输入可使用的最低消费金额">
               <template slot="append">元</template>
             </el-input>
-            <div class="tip">最低消费金额小于等于面值则为无门槛券</div>
+            <div class="tip">最低消费金额为0则为无门槛优惠券</div>
           </el-form-item>
           <el-form-item label="有效期限:" prop="dueDays">
             <el-select v-model="addData.dueDays" clearable placeholder="请选择有效期限">

src/views/order/channel/detail.vue

@@ -68,7 +68,7 @@
             <div class="txt" v-if="status.value == 2">已发货</div>
             <div class="txt" v-else>{{ status.desc || "--" }}</div>
           </div>
-          <div class="info-item-content-one" v-if="status.value === 2">
+          <div class="info-item-content-one" v-if="status.value === 2 || status.value === 3">
             <div class="title">发货时间：</div>
             <div class="txt">{{ parseTime(info.deliveryTime) || "--" }}</div>
           </div>
@@ -84,20 +84,20 @@
             @click="toGoods()"
             >发货</el-button
           >
-          <div class="info-item-content-one" v-if="status.value === 2">
+          <div class="info-item-content-one" v-if="status.value === 2 || status.value === 3">
             <div class="title">配送方式：</div>
             <div class="txt">
 <!--              {{ info.deliveryType || "&#45;&#45;" }}-->
               {{ "快递发货" || "--" }}
             </div>
           </div>
-          <div class="info-item-content-one" v-if="status.value === 2">
+          <div class="info-item-content-one" v-if="status.value === 2 || status.value === 3">
             <div class="title">快递公司：</div>
             <div class="txt">
               {{ (delivery && delivery.companyName) || "--" }}
             </div>
           </div>
-          <div class="info-item-content-one" v-if="status.value === 2">
+          <div class="info-item-content-one" v-if="status.value === 2 || status.value === 3">
             <div class="title">快递单号：</div>
             <div class="txt">{{ info.deliveryFlowId || "--" }}</div>
           </div>

src/views/order/deliver/detail.vue

@@ -77,7 +77,7 @@
       </div>
     </div>
     <!-- 物流信息 -->
-    <div class="info" v-if="status.value === 2 || status.value === 4">
+    <div class="info" v-if="status.value === 2 || status.value === 3 || status.value === 4">
       <div class="info-title">物流信息</div>
       <div class="info-item">
         <div
@@ -112,7 +112,7 @@
               <div class="txt">{{ parseTime(item.deliveryTime) || "--" }}</div>
             </div>
             <div class="info-one">
-              <div class="edit-express" @click="editExpress(item)">修改</div>
+              <div class="edit-express" @click="editExpress(item)" v-if="status.value === 2 || status.value === 4">修改</div>
             </div>
           </div>
           <div class="goods">
@@ -233,6 +233,7 @@ export default {
         if (res.code == 0) {
           this.info = res.data;
           this.status = JSON.parse(res.data.status);
+          console.log(this.status)
           res.data.deliverList &&
             res.data.deliverList.forEach((item) => {
               item.items.forEach((ele) => {