Merge branch 'dev' into 'master'

Dev

See merge request !179

src/views/order/podCN/components/WeightDialog.vue

@@ -22,7 +22,7 @@
           placeholder=""
           placeholder=""
         >
         >
           <el-option label="跟踪号" value="trackingNumber"></el-option>
           <el-option label="跟踪号" value="trackingNumber"></el-option>
-          <el-option label="店铺单号" value="shopNumber"></el-option>
+          <el-option label="客户单号" value="shopNumber"></el-option>
         </el-select>
         </el-select>
         <input
         <input
           ref="weighInput"
           ref="weighInput"
@@ -33,7 +33,7 @@
             weight.weightInput
             weight.weightInput
               ? selectType === 'trackingNumber'
               ? selectType === 'trackingNumber'
                 ? '请输入跟踪号'
                 ? '请输入跟踪号'
-                : '请输入店铺单号'
+                : '请输入客户单号'
               : '请输入重量'
               : '请输入重量'
           "
           "
           @keyup.enter="weightChange"
           @keyup.enter="weightChange"