Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/layout/components/Navbar.vue

@@ -153,7 +153,7 @@
               <p class="name">{{ tenantInfo.serverName }}</p>
               <div class="serviceRenew" @click="onRenew" v-if="$helpers.permission('/productService') && $helpers.permission('/serviceRenew')">立即续费</div>
             </div>
-            <div class="serviceTime" v-if="tenantInfo.validRemaining <= 0">
+            <div class="serviceTime" v-if="tenantInfo.validRemaining > 0">
               剩余{{ tenantInfo.validRemaining }}天（{{ tenantInfo.expiryDateEnd }}）到期
             </div>
             <div class="serviceTime" v-else>

src/views/categroyManager/generalSettings/holidaySetting.vue

@@ -40,11 +40,11 @@ export default {
     },
     onSave () {
       let configList = this.configList
-      let params = {
+      let params = [{
         id: configList.id,
         paranValue: JSON.stringify(this.dateList),
         paramName: configList.paramName
-      }
+      }]
       sysConfigUpdate(params).then(res => {
         if (res.code == 200) {
           this.$message.success('保存成功')

src/views/categroyManager/insideSetting/branchManager.vue

@@ -310,6 +310,9 @@
           >
             <el-input
               :disabled="basdisabled"
+              :max="11"
+              :min="11"
+              maxlength="11"
               v-model.trim="item.mobileNo"
               autocomplete="off"
             ></el-input>
@@ -649,11 +652,12 @@ export default {
     },
   },
   watch: {
-    teachingStatus(val) {
-      if (!val) {
-        this.getList();
-      }
-    },
+    // 页面会请求二次getList
+    // teachingStatus(val) {
+    //   if (!val) {
+    //     this.getList();
+    //   }
+    // },
   },
 };
 </script>

src/views/courseRulersManager/components/loginRules.vue

@@ -20,7 +20,7 @@
               },
             ]"
           >
-            教务端每台设置可登录:
+            教务端每台设备可登录:
             <el-input
               v-model="form['190']"
               placeholder="请输入账号数量"
@@ -42,7 +42,7 @@
               },
             ]"
           >
-            老师端每台设置可登录:
+            老师端每台设备可登录:
             <el-input
               v-model="form['191']"
               placeholder="请输入账号数量"
@@ -64,11 +64,11 @@
               },
             ]"
           >
-            学生端每台设置可登录:
+            学生端每个账号可登录:
             <el-input v-model="form['192']" placeholder="请输入设备数量" >
-              <template slot="append">个</template>
+              <template slot="append">台</template>
             </el-input>
-            学员
+            设备
           </el-form-item>
         </el-row>
       </el-form>

src/views/resetTeaming/modals/courseModel.vue

@@ -62,7 +62,7 @@
           </el-col>
           <el-col :span="6">
             <span style="color: #1A1A1A"
-              >￥{{ item.courseCurrentPrice | moneyFormat }}</span
+              >￥{{ (remissionCourseFeeStatus ? 0 : item.courseCurrentPrice) | moneyFormat }}</span
             >
           </el-col>
         </el-row>
@@ -153,7 +153,8 @@ export default {
     serviceValidDate: String,
     chargeTypeName: String,
     memberCoursePrice: Array,
-    memberCourseShowFlag: Boolean
+    memberCourseShowFlag: Boolean,
+    remissionCourseFeeStatus: Boolean
   },
   components: {
     // videoPlayer

src/views/resetTeaming/modals/instrumentModel.vue

@@ -41,58 +41,15 @@
 
         <div v-for="(con, index) in i" :key="index">
           <div @click="instrumentF(con)">
-            <el-row
-              class="option-row"
-              v-if="organId == 55 && courseViewType == 2 && !toolsPackages"
-            >
-              <el-col :span="12">
-                <i
-                  class="check_default"
-                  :class="[con.isStatus ? 'check_active' : '']"
-                ></i>
-                <div>
-                  {{ con.name }}
-                  <div
-                    v-if="con.goodsList"
-                    style="font-size: 12px; color: #808080"
-                  >
-                    {{ con.goodsList[0].specification }}
-                  </div>
-                </div>
-              </el-col>
-              <el-col :span="6">
-                <del
-                  style="color: #808080; font-size: 12px;"
-                  v-if="con.kitType != 'owned'"
-                  >￥{{ con.marketPrice | moneyFormat }}</del
-                >
-              </el-col>
-              <el-col :span="6">
-                <span style="color: #1A1A1A" v-if="con.kitType == 'LEASE'"
-                  >￥{{
-                    Number((con.depositFee - con.coupon).toFixed(2))
-                      | moneyFormat
-                  }}</span
-                >
-                <span style="color: #1A1A1A" v-if="con.kitType == 'FREE'"
-                  >￥{{ 0 | moneyFormat }}</span
-                >
-                <span style="color: #1A1A1A" v-if="con.kitType == 'GROUP'"
-                  >￥{{
-                    Number((con.discountPrice - con.coupon).toFixed(2))
-                      | moneyFormat
-                  }}</span
-                >
-              </el-col>
-            </el-row>
-            <el-row class="option-row" v-else>
+            <el-row class="option-row">
               <el-col :span="12">
                 <i
                   class="check_default"
                   :class="[con.isStatus ? 'check_active' : '']"
                 ></i>
                 <div>
-                  {{ con.name }}
+                  <div style="display: flex;align-items: center;">{{ con.name }}
+								    <i class="icon_courseFee" @click.stop="onLookRule" v-if="con.groupRemissionCourseFee == 1 && con.kitType == 'GROUP'"></i></div>
                   <div
                     v-if="con.goodsList"
                     style="font-size: 12px; color: #808080"
@@ -178,4 +135,12 @@ export default {
 
 <style lang="less" scoped>
 @import url("./signUpPayment.less");
+.icon_courseFee {
+	margin-left: 9px;
+	display: inline-block;
+	width: 17px;
+	height: 15px;
+	background: url('../../../assets/images/musicGroup/icon_courseFee.png');
+	background-size: 100%;
+}
 </style>

src/views/resetTeaming/modals/subject-preview.vue

@@ -5,6 +5,7 @@
     <course-model
       :courseViewType="courseViewType"
       :courseShowInfo="courseShowInfo"
+      :remissionCourseFeeStatus="remissionCourseFeeStatus"
       :courseInfo="courseInfo"
       :trainSmallBg="trainSmallBg"
       :serviceValidDate="serviceValidDate"
@@ -171,6 +172,7 @@ export default {
       memberCoursePrice: [], // 云教练，显示赠送的课程
       memberCourseShowFlag: false, // 是否显示赠送课程
       buyCloudTeacher: false, // 是否购买云教练
+      remissionCourseFeeStatus: false,
     };
   },
   mounted() {
@@ -314,6 +316,7 @@ export default {
                     id: tempItem.id,
                     price: tempItem.price,
                     kitType: single,
+                    groupRemissionCourseFee: tempItem.groupRemissionCourseFee
                   };
                 }
               } else if (single == "LEASE") {
@@ -330,6 +333,7 @@ export default {
                     id: tempItem.id,
                     price: tempItem.price,
                     kitType: single,
+                    groupRemissionCourseFee: tempItem.groupRemissionCourseFee
                   };
                 }
               } else if (single == "FREE") {
@@ -346,6 +350,7 @@ export default {
                     id: tempItem.id,
                     price: tempItem.price,
                     kitType: single,
+                    groupRemissionCourseFee: tempItem.groupRemissionCourseFee
                   };
                 }
               }
@@ -355,6 +360,7 @@ export default {
                 id: tempItem.id,
                 price: tempItem.price,
                 kitType: single,
+                groupRemissionCourseFee: tempItem.groupRemissionCourseFee
               };
             }
             let childGoodsNameList = [];
@@ -385,6 +391,8 @@ export default {
         });
         this.instrumentResultList = sorted;
 
+        // 设置是否有减免金额
+        this.instrumentGetStatus()
         this.setLeBaoStatus()
       }
 
@@ -426,7 +434,6 @@ export default {
       }
     },
     onCheckItem(item,type) {
-      console.log(item)
       // 默认选中不可改
       if(item.optionalFlag) return
       // 判断乐保是否可选
@@ -435,18 +442,31 @@ export default {
       if(type == 'INSTRUMENT') {
         this.instrumentResultList.forEach(group => {
           group.forEach(child => {
-            if(child.id != item.id) {
+            if(child.id != item.id || (child.id == item.id && child.kitType != item.kitType)) {
               child.isStatus = false
             }
           })
         })
       }
       item.isStatus = !item.isStatus;
+      // 设置是否有减免金额
+      this.instrumentGetStatus()
       // 重新设置乐保状态
       this.setLeBaoStatus()
       // 重新计算金额
       this.calcPrice();
     },
+    instrumentGetStatus() {
+      let childItem = {}
+      this.instrumentResultList.forEach(group => {
+        group.forEach(child => {
+          if(child.isStatus) {
+            childItem = child
+          }
+        })
+      })
+      this.remissionCourseFeeStatus = childItem.kitType == 'GROUP' && childItem.groupRemissionCourseFee == 1 ? true : false
+    },
     setLeBaoStatus() { // 设置乐保状态
       let status = false // 是否有选中乐器
       this.instrumentResultList.forEach(group => {

src/views/teamBuild/components/soundSetComponents/soundSetCore.vue

@@ -726,7 +726,7 @@ export default {
         window.pageYOffset ||
         document.documentElement.scrollTop ||
         document.body.scrollTop;
-      if (!!this.scrollTop && this.scrollTop >= 210) {
+      if (!!this.scrollTop && this.scrollTop >= 190) {
         this.isField = false;
       } else {
         this.isField = true;
@@ -771,8 +771,8 @@ export default {
   padding: 20px;
 }
 .soundBtnFixed {
-  top: 125px;
-  left: 240px; // 205
+  top: 105px;
+  left: 245px; // 205
   width: 100%;
   position: fixed;
   background-color: #fff;