Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/product/index.vue

@@ -234,6 +234,7 @@
            <span @click="toPriceManager(formCopy, true)" style="color: #0a84ff;cursor: pointer;">
              查看《#{{$l(formCopy,'title')}}#》路线价格
            </span>
+           <el-button style="font-size: 12px;margin-left: 15px;color: red;" type="text" @click="form.priceStepClearanceList = [];lineNum = 0"  >清楚路线</el-button>
          </p>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/ecw/productAttr/edit.vue

@@ -42,9 +42,10 @@
            <span>
              复制模板线路价格：{{lineNum}}个
            </span>
-        <span @click="toPriceManager(formCopv)" style="color: #0a84ff;cursor: pointer;">
+         <span @click="toPriceManager(formCopv)" style="color: #0a84ff;cursor: pointer;">
              查看《#{{$l(formCopv,'title')}}#》路线价格
            </span>
+        <el-button style="font-size: 12px;margin-left: 15px;color: red;" type="text" @click="form.priceStepClearanceList = [];lineNum = 0"  >清楚路线</el-button>
       </p>
       <el-form-item>
         <el-button type="primary" @click="submitForm">{{$t('确定')}}</el-button>
@@ -138,7 +139,8 @@ export default {
         name: 'ProductPrice',
         query: {
           product_id: row.id,
-          product_type: row.typeId
+          product_type: row.typeId,
+          transportType:3
         }
       })
     },