Merge branch 'pyq_goods' into 'dev'

Pyq goods

See merge request bp/op-web-service!18

src/pages/Goods/Retail/index.vue

@@ -68,7 +68,7 @@
             <el-table-column
               align="center"
               prop="first_commission_value"
-              label="一级分销金额"
+              label="分享者分销金额"
             >
               <template #default="scope">
                 <span>
@@ -79,7 +79,7 @@
             <el-table-column
               align="center"
               prop="second_commission_value"
-              label="二级分销金额"
+              label="上线分销金额"
             >
               <template #default="scope">
                 <span>
@@ -200,7 +200,7 @@
               ></el-input>
               <div style="margin: 20px 0"></div>
             </el-form-item>
-            <el-form-item label="一级佣金:" prop="first_commission_value">
+            <el-form-item label="分享者佣金:" prop="first_commission_value">
               <el-input
                 v-model="ruleForm.first_commission_value"
                 oninput="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)"
@@ -210,7 +210,7 @@
                 <template #append>%</template>
               </el-input>
             </el-form-item>
-            <el-form-item label="二级佣金: " prop="second_commission_value">
+            <el-form-item label="上线佣金: " prop="second_commission_value">
               <el-input
                 v-model="ruleForm.second_commission_value"
                 oninput="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)"
@@ -363,7 +363,7 @@ export default {
           50 ||
         value > 50
       ) {
-        callback(new Error("一级佣金与二级佣金之和不可大于50%"));
+        callback(new Error("分享者佣金与上线佣金之和不可大于50%"));
       } else {
         callback();
       }
@@ -419,7 +419,7 @@ export default {
         first_commission_value: [
           {
             required: true,
-            message: "请填写一级佣金",
+            message: "请填写分享者佣金",
             trigger: "blur",
           },
           { type: "number", message: "必须为数值型" },