Merge branch '07/06musicArchives' into test

src/views/categroyManager/productSystem/memberFeeSet.vue

@@ -78,34 +78,28 @@
         <template slot-scope="scope">
           <div>
             <p>
-              开团:
-              {{
-                scope.row.memberFeeSetting.groupPurchaseMonthFee | moneyFormat
-              }}元
-            </p>
-            <p>
-              销售:
+              零售:
               {{ scope.row.memberFeeSetting.currentMonthFee | moneyFormat }}元
             </p>
             <p>
               原价:
               {{ scope.row.memberFeeSetting.originalMonthFee | moneyFormat }}元
             </p>
+            <p>
+              团购:
+              {{
+                scope.row.memberFeeSetting.groupPurchaseMonthFee | moneyFormat
+              }}元
+            </p>
           </div>
         </template>
       </el-table-column>
       <el-table-column align="left" prop="type" label="季度收费">
         <template slot-scope="scope">
           <div>
+
             <p>
-              开团:
-              {{
-                scope.row.memberFeeSetting.groupPurchaseQuarterlyFee
-                  | moneyFormat
-              }}元
-            </p>
-            <p>
-              销售:
+              零售:
               {{
                 scope.row.memberFeeSetting.currentQuarterlyFee | moneyFormat
               }}元
@@ -116,6 +110,13 @@
                 scope.row.memberFeeSetting.originalQuarterlyFee | moneyFormat
               }}元
             </p>
+                     <p>
+              团购:
+              {{
+                scope.row.memberFeeSetting.groupPurchaseQuarterlyFee
+                  | moneyFormat
+              }}元
+            </p>
             <!-- </div>
             {{ scope.row.memberFeeSetting.currentHalfYearFee | moneyFormat }}元 -->
           </div>
@@ -124,15 +125,9 @@
       <el-table-column align="left" prop="type" label="半年收费">
         <template slot-scope="scope">
           <div>
+
             <p>
-              开团:
-              {{
-                scope.row.memberFeeSetting.groupPurchaseHalfYearFee
-                  | moneyFormat
-              }}元
-            </p>
-            <p>
-              销售:
+              零售:
               {{
                 scope.row.memberFeeSetting.currentHalfYearFee | moneyFormat
               }}元
@@ -143,26 +138,34 @@
                 scope.row.memberFeeSetting.originalHalfYearFee | moneyFormat
               }}元
             </p>
+                    <p>
+              团购:
+              {{
+                scope.row.memberFeeSetting.groupPurchaseHalfYearFee
+                  | moneyFormat
+              }}元
+            </p>
           </div>
         </template>
       </el-table-column>
       <el-table-column align="left" prop="type" label="年收费">
         <template slot-scope="scope">
           <div>
+
             <p>
-              开团:
-              {{
-                scope.row.memberFeeSetting.groupPurchaseYearFee | moneyFormat
-              }}元
-            </p>
-            <p>
-              销售:
+              零售:
               {{ scope.row.memberFeeSetting.currentYearFee | moneyFormat }}元
             </p>
             <p>
               原价:
               {{ scope.row.memberFeeSetting.originalYearFee | moneyFormat }}元
             </p>
+                      <p>
+              团购:
+              {{
+                scope.row.memberFeeSetting.groupPurchaseYearFee | moneyFormat
+              }}元
+            </p>
           </div>
         </template>
       </el-table-column>
@@ -300,9 +303,9 @@
         </el-form-item> -->
         <el-form-item
           prop="currentMonthFee"
-          label="月收费销售价"
+          label="月收费零售价"
           :rules="[
-            { required: false, message: '请输入月收费销售价' },
+            { required: false, message: '请输入月收费零售价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -340,9 +343,9 @@
         </el-form-item>
         <el-form-item
           prop="groupPurchaseMonthFee"
-          label="月收费开团价"
+          label="月收费团购价"
           :rules="[
-            { required: false, message: '请输入月收费开团价' },
+            { required: false, message: '请输入月收费团购价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -360,9 +363,9 @@
         </el-form-item>
         <el-form-item
           prop="currentQuarterlyFee"
-          label="季度收费销售价"
+          label="季度收费零售价"
           :rules="[
-            { required: false, message: '请输入季度收费销售价' },
+            { required: false, message: '请输入季度收费零售价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -400,9 +403,9 @@
         </el-form-item>
         <el-form-item
           prop="groupPurchaseQuarterlyFee"
-          label="季度收费开团价"
+          label="季度收费团购价"
           :rules="[
-            { required: false, message: '请输入季度收费开团价' },
+            { required: false, message: '请输入季度收费团购价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -420,9 +423,9 @@
         </el-form-item>
         <el-form-item
           prop="currentHalfYearFee"
-          label="半年收费销售价"
+          label="半年收费零售价"
           :rules="[
-            { required: false, message: '请输入半年收费销售价' },
+            { required: false, message: '请输入半年收费零售价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -460,9 +463,9 @@
         </el-form-item>
         <el-form-item
           prop="groupPurchaseHalfYearFee"
-          label="半年收费开团价"
+          label="半年收费团购价"
           :rules="[
-            { required: false, message: '请输入半年收费开团价' },
+            { required: false, message: '请输入半年收费团购价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -480,9 +483,9 @@
         </el-form-item>
         <el-form-item
           prop="currentYearFee"
-          label="年收费销售价"
+          label="年收费零售价"
           :rules="[
-            { required: false, message: '请输入年收费销售价' },
+            { required: false, message: '请输入年收费零售价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -518,11 +521,11 @@
             <template slot="append">元/年</template>
           </el-input>
         </el-form-item>
-                <el-form-item
+        <el-form-item
           prop="groupPurchaseYearFee"
-          label="年收费开团价"
+          label="年收费团购价"
           :rules="[
-            { required: false, message: '请输入年收费开团价' },
+            { required: false, message: '请输入年收费团购价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -700,13 +703,13 @@ export default {
       });
     },
   },
-  watch:{
-    branchStatus(val){
-      if(!val){
-        this.onFormClose('ruleForm')
+  watch: {
+    branchStatus(val) {
+      if (!val) {
+        this.onFormClose("ruleForm");
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/resetTeaming/modals/member-setting.vue

@@ -59,7 +59,7 @@
       </el-tooltip>
     </el-form-item>
     <el-form-item
-      label="开团价"
+      label="团购价"
       prop="memberPaymentAmount"
       v-if="isUserType && radio"
       :rules="[