lex-xin 6 months ago
parent
commit
317ef3ae12

+ 1 - 1
src/views/categroyManager/productSystem/memberSet.vue

@@ -159,7 +159,7 @@
             v-model.trim="form.name"
             autocomplete="off"
             style="width: 620px"
-            maxlength="10"
+            maxlength="15"
             show-word-limit
             placeholder="请输入学练宝名称"
           ></el-input>

+ 15 - 6
src/views/resetTeaming/modals/instrumentModel.vue

@@ -80,10 +80,13 @@
                 <!-- 乐器现价 = 乐器现价 + 分部分润金额 -->
                 <span style="color: #1A1A1A" v-if="con.kitType == 'GROUP'"
                   >¥{{
-                    Number(
-                      (con.price - con.coupon + con.organShareProfit).toFixed(2)
-                    ) | moneyFormat
-                  }}</span
+                  (courseViewType == 2 && organId == 55 && !toolsPackages ? Number(
+                    (con.discountPrice - con.coupon + con.organShareProfit).toFixed(2)
+                  ) : Number(
+                    (con.price - con.coupon + con.organShareProfit).toFixed(2)
+                  ))
+                   | moneyFormat
+                }}</span
                 >
               </el-col>
               <el-col :span="5" v-if="con.kitType == 'LEASE'">
@@ -163,8 +166,14 @@ export default {
   },
   computed: {
     toolsPackages() {
-      return this.toolsPackage[0].isStatus;
-    }
+      let status = false
+      this.toolsPackage.forEach(item => {
+        if(item.isStatus) {
+          status = true
+        }
+      })
+      return status
+    },
   }
 };
 </script>

+ 7 - 1
src/views/resetTeaming/modals/subject-preview.vue

@@ -829,10 +829,16 @@ export default {
               }
             } else if (item.kitType == "GROUP") {
               // 团购
+               let isToolStatus = false
+                this.toolsPackage.forEach(item => {
+                  if(item.isStatus) {
+                    isToolStatus = true
+                  }
+                })
               if (
                 this.courseViewType == 2 &&
                 this.organId == 55 &&
-                !this.toolsPackage[0].isStatus
+                !isToolStatus
               ) {
                 amount += parseFloat(item.discountPrice);
                 goodsPrice += parseFloat(item.discountPrice);