Merge branch 'dev' into 'test'

Dev

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

src/views/order/channel/components/SendGoods.vue

@@ -38,7 +38,7 @@
         </el-form-item>
         <el-form-item label="快递单号：" prop="deliveryFlowId">
           <el-input
-            v-model.number="shipForm.deliveryFlowId"
+            v-model="shipForm.deliveryFlowId"
             placeholder="输入快递单号"
             clearable
             size="small"
@@ -170,7 +170,6 @@ export default {
         ],
         deliveryFlowId: [
           { required: true, message: "请输入快递单号", trigger: "blur" },
-          { type: "number", message: "快递单号为数字值", trigger: "blur" },
         ],
       },
     };

src/views/order/channel/detail.vue

@@ -29,7 +29,7 @@
         <div class="info-item-content">
           <div class="info-item-content-one">
             <div class="title">经销商：</div>
-            <div class="txt">{{ info.channel && info.channel.contact }}</div>
+            <div class="txt">{{ info.channel && info.channel.name }}</div>
           </div>
           <div class="info-item-content-one">
             <div class="title">收货人：</div>

src/views/order/deliver/components/SendGoods.vue

@@ -38,7 +38,7 @@
         </el-form-item>
         <el-form-item label="快递单号：" prop="deliveryFlowId">
           <el-input
-            v-model.number="shipForm.deliveryFlowId"
+            v-model="shipForm.deliveryFlowId"
             placeholder="输入快递单号"
             clearable
             size="small"
@@ -132,7 +132,6 @@ export default {
         ],
         deliveryFlowId: [
           { required: true, message: "请输入快递单号", trigger: "blur" },
-          { type: "number", message: "快递单号为数字值", trigger: "blur" },
         ],
       },
     };