Merge branch 'M_2.5_1122' into test

src/views/system/goods/add/components/goodsparameter.vue

@@ -396,7 +396,7 @@ export default {
           slPriceNum = jsPriceVal
         }
         if (this.cateFee > 0) {
-          slPriceNum = (10000 - this.cateFee) * jsPriceVal /10000
+          slPriceNum = (1000 - this.cateFee) * (jsPriceVal * 1000) /1000000
         }
       }else if (jsPriceVal == 0) {
         slPriceNum = 0;

src/views/system/shop/brand.vue

@@ -555,6 +555,7 @@
         getDetails(data).then(res => {
           if(res.code == 1) {
             this.isOpen = true;
+            this.reset('brandForm')
             this.brandTitle = '品牌信息详情';
             this.brandForm = res.data;
             // 品牌审核状态
@@ -648,6 +649,7 @@
       },
       /** 取消、关闭  新增，编辑 */
       handleCancel() {
+        this.reset('brandForm')
         this.isOpen = false;
       },
       /** 提交審核 */