Merge branch 'dev' into 'test'

Dev

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

src/views/business/goods/add.vue

@@ -104,7 +104,7 @@
         </el-col>
         <el-col :span="23">
           <el-form-item label="商品编码:" prop="goodsCode">
-            <el-input v-model="addData.goodsCode" type="number" placeholder="请输入商品编码">
+            <el-input v-model="addData.goodsCode" type="text" placeholder="请输入商品编码">
             </el-input>
           </el-form-item>
         </el-col>

src/views/business/goods/components/spec.vue

@@ -168,7 +168,6 @@ export default {
       this.specListTmp = JSON.parse(JSON.stringify(this.specList))
       this.skuList = sku.map(item => {
         this.$set(item, 'valueY', accDiv(item.value, 100))
-        this.$set(item, 'skuCode', accDiv(item.skuCode, 1))
         this.$set(item, 'exchange', accDiv(item.exchangePrice,1))
         this.$set(item, 'costY', item.cost == null ? '' : accDiv(item.cost, 100) )
         this.$set(item, 'picUrlArr', item.picUrl.split(',').map(item => { return { fileName: item }}))

src/views/order/channel/index.vue

@@ -405,18 +405,24 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        this.vloading = this.$loading({
+          lock: true,
+          text: "正在取消订单.....",
+          background: "rgba(0, 0, 0, 0.7)",
+        });
         let data = {
           orderId:row.orderId
         }
         return  removeChannelOrder(data)
       }).then(()=>{
+        this.vloading.close();
         this.getList()
         this.$message({
           type: 'success',
           message: '取消订单成功!'
         })
       }).catch(() => {
-
+        this.vloading.close();
       });
     },