fix：回滚分销代码

src/pages/Goods/Detail/index.vue

@@ -381,14 +381,6 @@
               ></el-input>
               <span v-else>{{ goodsObj.original_price }}</span>
             </el-form-item>
-            <el-form-item label="结算价">
-              <el-input
-                v-if="$route.params.operation === 'EDIT'"
-                v-model="goodsObj.clear_price"
-                @change="perPrice"
-              ></el-input>
-              <span v-else>{{ goodsObj.clear_price }}</span>
-            </el-form-item>
             <h4 style="margin:20px 0">库存信息</h4>
             <el-form-item label="剩余库存量:">
               <span>{{ goodsObj.inventory_rest }}</span>
@@ -458,7 +450,7 @@
             ">购买后不允许退款</span>
           <span v-else-if="
               $route.params.operation !== 'EDIT' && goodsObj.rule_refund === 3
-            ">到期后不允许退款</span>
+            ">到期后不退款</span>
         </el-form-item>
         <el-form-item label="使用日期：">
           <el-radio-group
@@ -745,9 +737,9 @@ export default {
       rulesForm: {
         // 退款选项
         rulesOptions: [
-          { value: 1, label: "到期后自动退款" },
+          { value: 1, label: "到期自动退款" },
           { value: 2, label: "购买后不允许退款" },
-          { value: 3, label: "到期后不允许退款" }
+          { value: 3, label: "到期后不退款" }
         ],
         useStartTime: "", // 使用开始时间
         useEndTime: "", // 使用结束时间
@@ -1175,14 +1167,23 @@ export default {
     },
 
     // 更改原价
-    perPrice (val) {
-      if (val.length === 0) val = 0;
-      const parseOriginalPrice = Number(val).toFixed(2);
-      val = Number(parseOriginalPrice);
-      if (typeof val === "number" &&isNaN(val)) {
-        val = 0;
-        return this.$message.error("原价价格必为数字");
+    perPrice () {
+      if (!this.goodsObj.original_price || this.goodsObj.original_price == 0) {
+        this.$nextTick(() => {
+          this.goodsObj.original_price = "";
+        })
       }
+      const parseOriginalPrice = Number(this.goodsObj.original_price).toFixed(
+        2
+      );
+      this.goodsObj.original_price = Number(parseOriginalPrice);
+      // if (
+      //   typeof this.goodsObj.original_price === "number" &&
+      //   isNaN(this.goodsObj.original_price)
+      // ) {
+      //   this.goodsObj.original_price = "";
+      //   return this.$message.error("原价价格必为数字");
+      // }
     },
 
     // 审核通过
@@ -1299,10 +1300,6 @@ export default {
       }
 
       console.log(query);
-        //  是否该商品关联的分销活动满足售价-分销总金额>=结算价
-      // if (query.price -  d >= query.clear_price) {
-      //   return this.$message.error("请至少选择一个门店");
-      // }
 
       const res = await editGoods(query);
       if (res.code !== 0) {

src/pages/Goods/Retail/index.vue

@@ -200,17 +200,6 @@
               ></el-input>
               <div style="margin: 20px 0"></div>
             </el-form-item>
-            <el-form-item
-              prop="commission_mode"
-              label="金额计算方式:"
-            >
-              <el-radio-group
-                v-model="ruleForm.commission_mode"
-              >
-                <el-radio :label="2">按金额</el-radio>
-                <el-radio :label="1">按比例</el-radio>
-              </el-radio-group>
-            </el-form-item>
             <el-form-item label="上线佣金:" prop="first_commission_value">
               <el-input
                 v-model="ruleForm.first_commission_value"
@@ -218,7 +207,7 @@
                 @input="changeValue($event, 'first_commission_value')"
                 :disabled="shopStart !== 0"
               >
-                <template #append>{{ruleForm.commission_mode == 1? '%' : '￥'}}</template>
+                <template #append>%</template>
               </el-input>
             </el-form-item>
             <el-form-item label="分享者佣金: " prop="second_commission_value">
@@ -228,7 +217,7 @@
                 @input="changeValue($event, 'second_commission_value')"
                 :disabled="shopStart !== 0"
               >
-                <template #append>{{ruleForm.commission_mode == 1? '%' : '￥'}}</template>
+                <template #append>%</template>
               </el-input>
             </el-form-item>
             <el-form-item label="活动生效时间:">
@@ -369,11 +358,10 @@ export default {
   data() {
     var commission = (rule, value, callback) => {
       if (
-        this.ruleForm.commission_mode == 1 &&
-        (this.ruleForm.first_commission_value +
+        this.ruleForm.first_commission_value +
           this.ruleForm.second_commission_value >
           50 ||
-        value > 50 )
+        value > 50
       ) {
         callback(new Error("上线佣金与分享者佣金之和不可大于50%"));
       } else {
@@ -410,7 +398,6 @@ export default {
 
       ruleForm: {
         marketing_name: "",
-        commission_mode: 1,
         first_commission_value: "",
         second_commission_value: "",
         start_time: "",
@@ -619,7 +606,6 @@ export default {
           let {
             marketing_name,
             first_commission_value,
-            commission_mode,
             second_commission_value,
           } = this.ruleForm;
           let [start_time, end_time] = this.timeSelect || [];
@@ -634,7 +620,6 @@ export default {
           }
           let addParams = {
             goods_sku_id,
-            commission_mode,
             marketing_name,
             first_commission_value: first_commission_value + "",
             second_commission_value: second_commission_value + "",