合并

dist/static/css/chunk-13d65bc2.28a0a0bf.css

@@ -0,0 +1 @@
+.dialog-footer[data-v-07e9e40c]{display:block;text-align:right;margin-top:20px}.title[data-v-4d6fa5aa],.title[data-v-327d34c3],.title[data-v-80522168]{margin-bottom:30px;font-size:16px;color:#000}.dialog-footer[data-v-4d102b4c]{display:block;text-align:right;margin-top:20px}.newBand[data-v-471715f8]{display:inline-block;margin-right:10px}.right-code .title[data-v-471715f8]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-471715f8] .studentInfo .multiple.el-select{width:185px!important}.red[data-v-471715f8]{color:red}.demo-table-expand label[data-v-471715f8]{width:150px;color:#99a9bf}.demo-table-expand .el-form-item[data-v-471715f8]{margin-right:0;margin-bottom:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding-right:10px;position:relative}.demo-table-expand .el-form-item__label[data-v-471715f8]{z-index:100}[data-v-471715f8] .el-table__expanded-cell[class*=cell]{padding:20px 0 20px 110px}.schoolWrap[data-v-471715f8]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.el-dropdown-link[data-v-471715f8]{color:#00a79d;cursor:pointer}

dist/static/css/chunk-3ac590f2.691e0f3d.css

@@ -0,0 +1 @@
+.alert[data-v-8ea9ed6e]{margin-bottom:10px}[data-v-8ea9ed6e] .description-title{margin-bottom:0}.description-label[data-v-8ea9ed6e]{width:120px!important}.title[data-v-4d6fa5aa]{margin-bottom:30px;font-size:16px;color:#000}

dist/static/css/chunk-49311e0b.65385f02.css

@@ -1 +1,5 @@
-.feeInput[data-v-6033476c] .el-input__inner{width:120px!important}.dialog[data-v-6033476c] .el-dialog{border-radius:4px;overflow:hidden}.dialog[data-v-6033476c] .el-dialog__header{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-negative:0;flex-shrink:0;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-sizing:border-box;box-sizing:border-box;width:100%;height:48px;padding:0 20px}.dialog[data-v-6033476c] .el-dialog__header .el-dialog__title{font-weight:500;font-size:16px}.dialog[data-v-6033476c] .el-dialog__header .el-dialog__headerbtn{position:relative;top:0;right:0}.dialog[data-v-6033476c] .el-dialog__header .el-dialog__headerbtn:before{position:absolute;display:block;-webkit-box-sizing:border-box;box-sizing:border-box;background-color:transparent;border-radius:50%;-webkit-transition:background-color .1s linear;transition:background-color .1s linear;content:"";top:50%;left:50%;width:20px;height:20px;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.dialog[data-v-6033476c] .el-dialog__header .el-dialog__headerbtn:hover:before{background-color:rgba(0,0,0,.5)}.dialog[data-v-6033476c] .el-dialog__header .el-dialog__close{position:relative}.dialog[data-v-6033476c] .el-dialog__body{padding:10px 20px}.dialog[data-v-6033476c] .el-input-group__append{padding:0 10px}.elForm[data-v-6033476c] .el-form-item__label{max-width:100%;color:#4e5969;font-size:14px;white-space:normal;padding:0;font-weight:400;line-height:32px}.lineTitle[data-v-6033476c]{background-color:#f7f7f7;padding:10px;border-radius:4px;color:#333}.wrap[data-v-6033476c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.wrap[data-v-6033476c] .el-form-item:not(:last-child){margin-right:20px}.wrap .el-form-item[data-v-6033476c]{width:180px}
+<<<<<<<< HEAD:dist/static/css/chunk-49311e0b.65385f02.css
+.feeInput[data-v-6033476c] .el-input__inner{width:120px!important}.dialog[data-v-6033476c] .el-dialog{border-radius:4px;overflow:hidden}.dialog[data-v-6033476c] .el-dialog__header{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-negative:0;flex-shrink:0;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-sizing:border-box;box-sizing:border-box;width:100%;height:48px;padding:0 20px}.dialog[data-v-6033476c] .el-dialog__header .el-dialog__title{font-weight:500;font-size:16px}.dialog[data-v-6033476c] .el-dialog__header .el-dialog__headerbtn{position:relative;top:0;right:0}.dialog[data-v-6033476c] .el-dialog__header .el-dialog__headerbtn:before{position:absolute;display:block;-webkit-box-sizing:border-box;box-sizing:border-box;background-color:transparent;border-radius:50%;-webkit-transition:background-color .1s linear;transition:background-color .1s linear;content:"";top:50%;left:50%;width:20px;height:20px;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.dialog[data-v-6033476c] .el-dialog__header .el-dialog__headerbtn:hover:before{background-color:rgba(0,0,0,.5)}.dialog[data-v-6033476c] .el-dialog__header .el-dialog__close{position:relative}.dialog[data-v-6033476c] .el-dialog__body{padding:10px 20px}.dialog[data-v-6033476c] .el-input-group__append{padding:0 10px}.elForm[data-v-6033476c] .el-form-item__label{max-width:100%;color:#4e5969;font-size:14px;white-space:normal;padding:0;font-weight:400;line-height:32px}.lineTitle[data-v-6033476c]{background-color:#f7f7f7;padding:10px;border-radius:4px;color:#333}.wrap[data-v-6033476c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.wrap[data-v-6033476c] .el-form-item:not(:last-child){margin-right:20px}.wrap .el-form-item[data-v-6033476c]{width:180px}
+========
+.feeInput[data-v-5afd0581] .el-input__inner{width:120px!important}.dialog[data-v-5afd0581] .el-dialog{border-radius:4px;overflow:hidden}.dialog[data-v-5afd0581] .el-dialog__header{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-negative:0;flex-shrink:0;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-sizing:border-box;box-sizing:border-box;width:100%;height:48px;padding:0 20px}.dialog[data-v-5afd0581] .el-dialog__header .el-dialog__title{font-weight:500;font-size:16px}.dialog[data-v-5afd0581] .el-dialog__header .el-dialog__headerbtn{position:relative;top:0;right:0}.dialog[data-v-5afd0581] .el-dialog__header .el-dialog__headerbtn:before{position:absolute;display:block;-webkit-box-sizing:border-box;box-sizing:border-box;background-color:transparent;border-radius:50%;-webkit-transition:background-color .1s linear;transition:background-color .1s linear;content:"";top:50%;left:50%;width:20px;height:20px;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.dialog[data-v-5afd0581] .el-dialog__header .el-dialog__headerbtn:hover:before{background-color:rgba(0,0,0,.5)}.dialog[data-v-5afd0581] .el-dialog__header .el-dialog__close{position:relative}.dialog[data-v-5afd0581] .el-dialog__body{padding:10px 20px}.dialog[data-v-5afd0581] .el-input-group__append{padding:0 10px}.elForm[data-v-5afd0581] .el-form-item__label{max-width:100%;color:#4e5969;font-size:14px;white-space:normal;padding:0;font-weight:400;line-height:32px}.lineTitle[data-v-5afd0581]{background-color:#f7f7f7;padding:10px;border-radius:4px;color:#333}.wrap[data-v-5afd0581]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.wrap[data-v-5afd0581] .el-form-item:not(:last-child){margin-right:20px}.wrap .el-form-item[data-v-5afd0581]{width:180px}
+>>>>>>>> iteration-20250327:dist/static/css/chunk-df273b78.69dd6ad3.css

dist/static/css/chunk-4d837747.664aeca6.css

@@ -0,0 +1 @@
+.btns[data-v-47517a28]{text-align:right}.files[data-v-47517a28]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-47517a28]{position:absolute;right:20px;bottom:10px}.gradual-item[data-v-47517a28]{background-color:#f8f8f8;margin-bottom:10px;padding:10px;border-radius:6px}.dialog-footer[data-v-f189da54]{text-align:right}.numberInput[data-v-f189da54]{width:100%}[data-v-f189da54] .el-input-number .el-input__inner{text-align:left!important}.dialog-footer[data-v-66e7d516]{text-align:right}[data-v-66e7d516] .el-input-number .el-input__inner{text-align:left!important}.myCascader .el-radio[data-v-740bd23c]{width:100%;height:100%;z-index:10;position:absolute;top:10px;right:10px}.myCascader .el-radio__input[data-v-740bd23c]{visibility:hidden}.myCascader .el-cascader-node__postfix[data-v-740bd23c]{top:10px}[data-v-740bd23c] .el-dropdown{margin-right:10px;color:#14928a}.remark[data-v-740bd23c]{display:inline;overflow:hidden;white-space:pre}.lookForm[data-v-740bd23c] .el-dialog__body{padding:0;font-size:0}.iframe_back[data-v-740bd23c]{width:195px;height:45px;position:absolute;bottom:50px;background:transparent;left:50%;z-index:99;margin-left:-100px}.iframe_help[data-v-740bd23c]{position:absolute;background:transparent;width:50px;height:120px;top:50%;right:0;margin-top:-35px}.iframe_header_back[data-v-740bd23c]{background:transparent;width:225px;height:50px;position:absolute;top:65px;left:20px}

dist/static/css/chunk-89311380.f34ab316.css

@@ -0,0 +1 @@
+.tree[data-v-29e286f5]{min-width:630px}

dist/static/css/chunk-c3a18f78.d763a918.css

@@ -0,0 +1 @@
+.el-input[data-v-6a586318],.el-select[data-v-6a586318]{width:300px!important}.el-tag+.el-tag[data-v-3a40cdc0],.el-tag+.el-tag[data-v-6a586318]{margin-left:10px}.el-cascader[data-v-3a40cdc0],.el-cascader__dropdown[data-v-3a40cdc0],.el-input[data-v-3a40cdc0],.el-select[data-v-3a40cdc0]{width:100%!important}.el-cascader-menu[data-v-3a40cdc0]{width:100%}[data-v-8187e6e0] .el-input-number .el-input__inner{text-align:left}.el-input-number[data-v-8187e6e0],.el-input[data-v-97dd5394],.el-input[data-v-8187e6e0],.el-select[data-v-97dd5394],.el-select[data-v-8187e6e0]{width:300px!important}

dist/static/css/chunk-df273b78.69dd6ad3.css

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/static/css/chunk-49311e0b.65385f02.css
+.feeInput[data-v-6033476c] .el-input__inner{width:120px!important}.dialog[data-v-6033476c] .el-dialog{border-radius:4px;overflow:hidden}.dialog[data-v-6033476c] .el-dialog__header{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-negative:0;flex-shrink:0;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-sizing:border-box;box-sizing:border-box;width:100%;height:48px;padding:0 20px}.dialog[data-v-6033476c] .el-dialog__header .el-dialog__title{font-weight:500;font-size:16px}.dialog[data-v-6033476c] .el-dialog__header .el-dialog__headerbtn{position:relative;top:0;right:0}.dialog[data-v-6033476c] .el-dialog__header .el-dialog__headerbtn:before{position:absolute;display:block;-webkit-box-sizing:border-box;box-sizing:border-box;background-color:transparent;border-radius:50%;-webkit-transition:background-color .1s linear;transition:background-color .1s linear;content:"";top:50%;left:50%;width:20px;height:20px;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.dialog[data-v-6033476c] .el-dialog__header .el-dialog__headerbtn:hover:before{background-color:rgba(0,0,0,.5)}.dialog[data-v-6033476c] .el-dialog__header .el-dialog__close{position:relative}.dialog[data-v-6033476c] .el-dialog__body{padding:10px 20px}.dialog[data-v-6033476c] .el-input-group__append{padding:0 10px}.elForm[data-v-6033476c] .el-form-item__label{max-width:100%;color:#4e5969;font-size:14px;white-space:normal;padding:0;font-weight:400;line-height:32px}.lineTitle[data-v-6033476c]{background-color:#f7f7f7;padding:10px;border-radius:4px;color:#333}.wrap[data-v-6033476c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.wrap[data-v-6033476c] .el-form-item:not(:last-child){margin-right:20px}.wrap .el-form-item[data-v-6033476c]{width:180px}
+========
+.feeInput[data-v-5afd0581] .el-input__inner{width:120px!important}.dialog[data-v-5afd0581] .el-dialog{border-radius:4px;overflow:hidden}.dialog[data-v-5afd0581] .el-dialog__header{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-negative:0;flex-shrink:0;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-sizing:border-box;box-sizing:border-box;width:100%;height:48px;padding:0 20px}.dialog[data-v-5afd0581] .el-dialog__header .el-dialog__title{font-weight:500;font-size:16px}.dialog[data-v-5afd0581] .el-dialog__header .el-dialog__headerbtn{position:relative;top:0;right:0}.dialog[data-v-5afd0581] .el-dialog__header .el-dialog__headerbtn:before{position:absolute;display:block;-webkit-box-sizing:border-box;box-sizing:border-box;background-color:transparent;border-radius:50%;-webkit-transition:background-color .1s linear;transition:background-color .1s linear;content:"";top:50%;left:50%;width:20px;height:20px;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.dialog[data-v-5afd0581] .el-dialog__header .el-dialog__headerbtn:hover:before{background-color:rgba(0,0,0,.5)}.dialog[data-v-5afd0581] .el-dialog__header .el-dialog__close{position:relative}.dialog[data-v-5afd0581] .el-dialog__body{padding:10px 20px}.dialog[data-v-5afd0581] .el-input-group__append{padding:0 10px}.elForm[data-v-5afd0581] .el-form-item__label{max-width:100%;color:#4e5969;font-size:14px;white-space:normal;padding:0;font-weight:400;line-height:32px}.lineTitle[data-v-5afd0581]{background-color:#f7f7f7;padding:10px;border-radius:4px;color:#333}.wrap[data-v-5afd0581]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.wrap[data-v-5afd0581] .el-form-item:not(:last-child){margin-right:20px}.wrap .el-form-item[data-v-5afd0581]{width:180px}
+>>>>>>>> iteration-20250327:dist/static/css/chunk-df273b78.69dd6ad3.css

src/constant/index.js

@@ -437,14 +437,14 @@ export const tenantStatus = {
 //   "DAY": '天',
 export const memberEnum = {
   MONTH: "月度",
-  QUARTERLY: "季度",
+  // QUARTERLY: "季度",
   YEAR_HALF: "半年",
   YEAR: "年"
 };
 export const cloudGroupActive = {
   1: "固定天数",
   2: "月度",
-  3: "季度",
+  // 3: "季度",
   4: "半年",
   5: "年度"
 };

src/utils/vueFilter.js

@@ -848,7 +848,7 @@ Vue.filter("cloudGroupActive", value => {
   let template = {
     1: "天数",
     2: "月度",
-    3: "季度",
+    // 3: "季度",
     4: "半年",
     5: "年度"
   };

src/views/accompaniment/index.vue

@@ -92,8 +92,6 @@
             v-model="searchForm.scoreType"
             clearable
             filterable
-            clearable
-            filterable
             placeholder="请选择默认谱面"
           >
             <el-option
@@ -533,7 +531,7 @@ export default {
     },
     async looker(row, num) {
       this.accompanyUrl =
-        location.origin + '/gym-music-score/' +
+        '/gym-music-score/' +
         "?Authorization=" +
         getToken() +
         "&systemType=web&isHideBack=1&isHideMusicList=1&id=" +

src/views/afterSchoolManager/components/examinationDetail.vue

@@ -60,12 +60,10 @@
         <el-table-column prop="memo" align="left" label="练习说明">
           <template slot-scope="scope">
             <Tooltip
-              :content="
-                scope.row.memo
-                  ? scope.row.memo
-                  : '--'
-              "
+              v-if="scope.row.memo"
+              :content="scope.row.memo"
             />
+            <span v-else>--</span>
           </template>
         </el-table-column>
         <el-table-column prop="trainingTime" align="left" label="完成时间">
@@ -76,7 +74,7 @@
         </el-table-column>
         <el-table-column prop="finishFlag" align="left" label="测验分数">
           <template slot-scope="scope">
-            <div>{{ scope.row.trainingScore || 0 }}</div>
+            <div>{{ scope.row.trainingScore == -1 ? '--' : (scope.row.trainingScore || 0) }}</div>
           </template>
         </el-table-column>
         <el-table-column prop="finishFlag" align="right" label="操作">

src/views/afterSchoolManager/modal/homework-detail.vue

@@ -21,7 +21,7 @@
                     :class="
                       scope.row.trainingScore >= scope.row.standardScore ? '' : 'red'
                     "
-                    >{{ scope.row.trainingScore }}</span
+                    >{{ scope.row.trainingScore == -1 ? '--' : scope.row.trainingScore }}</span
                   >
                   / {{ scope.row.standardScore }} 分</template
           >

src/views/auditList/member.vue

@@ -10,7 +10,7 @@
             style="width: 100% !important"
           >
             <el-option label="月度" value="MONTH"></el-option>
-            <el-option label="季度" value="QUARTERLY"></el-option>
+            <!-- <el-option label="季度" value="QUARTERLY"></el-option> -->
             <el-option label="半年" value="YEAR_HALF"></el-option>
             <el-option label="年度" value="YEAR"></el-option>
             <!-- <el-option label="固定天数" value="DAY"></el-option> -->

src/views/categroyManager/generalSettings/groupMarkPrice.vue

@@ -45,7 +45,7 @@
           </el-input>
         </el-form-item>
       </el-row>
-      <el-row>
+      <!-- <el-row>
         <el-form-item
           prop="minQuarterlyFee"
           label="季度学练宝机构定价范围最低:"
@@ -81,7 +81,7 @@
             >
           </el-input>
         </el-form-item>
-      </el-row>
+      </el-row> -->
       <el-row>
         <el-form-item
           prop="minHalfYearFee"

src/views/categroyManager/productSystem/memberFeeSet.vue

@@ -93,7 +93,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="left" prop="type" label="季度收费">
+        <!-- <el-table-column align="left" prop="type" label="季度收费">
           <template slot-scope="scope">
             <div>
               <p>
@@ -103,12 +103,6 @@
                     | hasMoneyFormat
                 }}
               </p>
-              <!-- <p>
-              零售:
-              {{
-                scope.row.memberFeeSetting.currentQuarterlyFee | hasMoneyFormat
-              }}
-            </p> -->
               <p>
                 原价:
                 {{
@@ -126,7 +120,7 @@
               </div>
             </div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column align="left" prop="type" label="半年收费">
           <template slot-scope="scope">
             <div>
@@ -387,7 +381,7 @@
           </el-form-item>
         </div>
 
-        <div class="lineTitle">季度收费</div>
+        <!-- <div class="lineTitle">季度收费</div>
 
         <div class="wrap">
           <el-form-item
@@ -482,7 +476,7 @@
               >
             </el-input>
           </el-form-item>
-        </div>
+        </div> -->
 
         <div class="lineTitle">半年收费</div>
 

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>

src/views/organManager/components/memberSetting.vue

@@ -48,7 +48,7 @@
           <div slot="append">元/月/人</div>
         </el-input>
       </el-form-item>
-      <el-form-item
+      <!-- <el-form-item
         label="季度会员激活价"
         prop="quarter_divide"
         :rules="[
@@ -64,7 +64,7 @@
         >
           <div slot="append">元/季/人</div>
         </el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item
         label="半年会员激活价"
         prop="half_year_divide"

src/views/organManager/components/memberSettingMore.vue

@@ -68,7 +68,7 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <!-- <el-col :span="4">
           <el-form-item
             label="季度会员激活价"
             prop="quarterDivide"
@@ -87,7 +87,7 @@
               <div slot="append">元/季/人</div>
             </el-input>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="4"
           ><el-form-item
             label="半年会员激活价"

src/views/resetTeaming/components/payInfoDetail.vue

@@ -659,7 +659,7 @@ export default {
               "isShowMusicCourseForPay",
               res.data?.calender?.paymentItemShowState?.isShowMusicCourseForPay
             );
-            if (res.data.member) {
+            if (res.data.member && res.data.member.length > 0) {
               // 团练保
               this.member = true;
 
@@ -1166,6 +1166,7 @@ export default {
         });
       }
       let memberObj = JSON.parse(JSON.stringify(form.memberList))
+      const tempMemberObj = []
       // // 获取会员名称
       if (memberObj && memberObj.length > 0) {
         memberObj.forEach(item => {
@@ -1175,6 +1176,10 @@ export default {
             item.name = n.name;
             item.intro = n.intro
           }
+
+          if(item.memberRankSettingId) {
+            tempMemberObj.push(item)
+          }
         })
       }
       let tempCourseList = form.eclass?.length > 0 ? form.eclass : [];
@@ -1196,7 +1201,7 @@ export default {
           },
           activity: [...activeList], // 小班课
           course: courseList, // 课程
-          member: memberObj, // 学练宝
+          member: tempMemberObj, // 学练宝
           memberPrivilegesItemList: [], // 会员基本内容
           repair:
             form.leBaoList?.length > 0 &&
@@ -1217,10 +1222,13 @@ export default {
         const calenderMember = []
         tempMemberList.forEach(item => {
           const { memberRankSettingId, ...more } = item 
-          calenderMember.push({
-            ...more,
-            memberRankSettingId: memberRankSettingId.length > 0 ? memberRankSettingId[memberRankSettingId.length - 1] : null
-          })
+          if(memberRankSettingId) {
+            calenderMember.push({
+              ...more,
+              memberRankSettingId: memberRankSettingId.length > 0 ? memberRankSettingId[memberRankSettingId.length - 1] : null
+            })
+          }
+          
         })
         return {
           payUserType: this.$route.query.payUserType,
@@ -1240,7 +1248,7 @@ export default {
           //   this.form.memberList[0]?.memberRankSettingId
           //     ? { ...this.form.memberList[0] }
           //     : null,
-          calenderMemberList: calenderMember.length > 0 ? calenderMember : [],
+          calenderMemberList: calenderMember.length > 0 ? calenderMember : null,
           musicGroupPaymentCalenderCourseSettingsList:
             this.form.eclass?.length > 0 ? this.form.eclass : null,
           musicGroupId: this.$route.query.id,
@@ -1261,10 +1269,12 @@ export default {
         const calenderMember = []
         tempMemberList.forEach(item => {
           const { memberRankSettingId, ...more } = item 
-          calenderMember.push({
-            ...more,
-            memberRankSettingId: memberRankSettingId.length > 0 ? memberRankSettingId[memberRankSettingId.length - 1] : null
-          })
+          if(memberRankSettingId) {
+            calenderMember.push({
+              ...more,
+              memberRankSettingId: memberRankSettingId.length > 0 ? memberRankSettingId[memberRankSettingId.length - 1] : null
+            })
+          }
         })
         return {
           payUserType: this.$route.query.payUserType,
@@ -1284,7 +1294,7 @@ export default {
           //   this.form.memberList[0]?.memberRankSettingId
           //     ? { ...this.form.memberList[0] }
           //     : null,
-          calenderMemberList: calenderMember.length > 0 ? calenderMember : [],
+          calenderMemberList: calenderMember.length > 0 ? calenderMember : null,
           musicGroupPaymentCalenderCourseSettingsList:
             this.form.eclass?.length > 0 ? this.form.eclass : null,
           musicGroupId: this.$route.query.id,

src/views/resetTeaming/modals/giveMemberModel.vue

@@ -25,34 +25,54 @@
           <el-option label="微信支付" value="wx_pub"></el-option>
         </el-select>
       </el-form-item>
+
+      <el-table
+        style="width: 100%"
+        :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+        :data="tableList"
+      >
+        <el-table-column align="center" prop="name" label="学员姓名">
+        </el-table-column>
+        <el-table-column align="center" prop="phone" label="手机号">
+        </el-table-column>
+        <el-table-column align="center" prop="memberName" label="学练宝版本">
+        </el-table-column>
+        <el-table-column align="center" prop="type" label="周期">
+          <template slot-scope="scope">
+            {{ scope.row.type | memberEnumType }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="time"
+          label="数量"
+        ></el-table-column>
+        <el-table-column align="center" label="缴费金额(元)">
+          <template slot-scope="scope">
+            {{ scope.row.amount | hasMoneyFormat }}
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-form-item
+        style="padding-top: 12px; margin-bottom: 8px;"
+        prop="payType"
+        label="是否向学生发送激活提醒短信："
+      >
+        <el-radio-group v-model="payForm.sendSmsFlag">
+          <el-radio :label="1">是</el-radio>
+          <el-radio :label="0">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+
+      <el-alert
+        v-if="payForm.sendSmsFlag == 1"
+        title="【管乐迷】您购买的{团练宝版本名称}已成功激活，请打开管乐迷APP开始练习吧！"
+        :closable="false"
+        type="error"
+      >
+      </el-alert>
     </el-form>
-    <el-table
-      style="width: 100%"
-      :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
-      :data="tableList"
-    >
-      <el-table-column align="center" prop="name" label="学员姓名">
-      </el-table-column>
-      <el-table-column align="center" prop="phone" label="手机号">
-      </el-table-column>
-      <el-table-column align="center" prop="memberName" label="学练宝版本">
-      </el-table-column>
-      <el-table-column align="center" prop="type" label="周期">
-        <template slot-scope="scope">
-          {{ scope.row.type | memberEnumType }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        align="center"
-        prop="time"
-        label="数量"
-      ></el-table-column>
-      <el-table-column align="center" label="缴费金额(元)">
-        <template slot-scope="scope">
-          {{ scope.row.amount | hasMoneyFormat }}
-        </template>
-      </el-table-column>
-    </el-table>
 
     <span slot="footer" class="dialog-footer">
       <el-button
@@ -93,7 +113,8 @@ export default {
   data() {
     return {
       payForm: {
-        payType: null
+        payType: null,
+        sendSmsFlag: 1
       },
       pay_channel: null, //支付渠道
       selectStudentMoney: 0, // 选中学生金额
@@ -113,6 +134,10 @@ export default {
       this.$refs.payForm.validate(async _ => {
         if (_) {
           try {
+            const tableList = this.tableList || [];
+            tableList.forEach(item => {
+              item.sendSmsFlag = this.payForm.sendSmsFlag;
+            });
             const res = await cloudPay(this.tableList);
             console.log(res);
             if (res.data.amount == 0 && res.data.orderNo) {
@@ -155,11 +180,8 @@ export default {
               "&returnUrl=" +
               returnUrl +
               "&type=" +
-              res.data.type
-              "&wxAppId=" +
-              wxAppId +
-              "&alipayAppId=" +
-              alipayAppId;
+              res.data.type;
+            "&wxAppId=" + wxAppId + "&alipayAppId=" + alipayAppId;
             console.log(this.codeUrl, "codeUrl");
             this.payMentVisible = true;
           } catch (e) {}

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>

src/views/resetTeaming/modals/member.vue

@@ -38,7 +38,7 @@ export default {
       let template = {
         YEAR: "年",
         MONTH: "月",
-        QUARTERLY: "季度",
+        // QUARTERLY: "季度",
         YEAR_HALF: "半年"
       };
       return template[val];

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

@@ -447,6 +447,7 @@ export default {
         paymentCalender && paymentCalender.course ? paymentCalender.course : [];
 
       // 学练宝
+      console.log(paymentCalender, "paymentCalender")
       const member =
         paymentCalender && paymentCalender.member ? paymentCalender.member : [];
 
@@ -829,10 +830,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);
@@ -947,7 +954,7 @@ export default {
       let template = {
         YEAR: "(年)",
         MONTH: "(月)",
-        QUARTERLY: "(季度)",
+        // QUARTERLY: "(季度)",
         YEAR_HALF: "(半年)"
       };
       return template[val];

src/views/studentManager/modals/createMember.vue

@@ -41,7 +41,7 @@
           style="width: 100% !important"
         >
           <el-option label="月度" value="MONTH"></el-option>
-          <el-option label="季度" value="QUARTERLY"></el-option>
+          <!-- <el-option label="季度" value="QUARTERLY"></el-option> -->
           <el-option label="半年" value="YEAR_HALF"></el-option>
           <el-option label="年度" value="YEAR"></el-option>
           <!-- <el-option label="固定天数" value="DAY"></el-option> -->

src/views/studentManager/modals/setMemberDate.vue

@@ -30,7 +30,7 @@
         >
           <el-option v-if="type !== 'add'" label="天" value="DAY"></el-option>
           <el-option label="月度" value="MONTH"></el-option>
-          <el-option label="季度" value="QUARTERLY"></el-option>
+          <!-- <el-option label="季度" value="QUARTERLY"></el-option> -->
           <el-option label="半年" value="YEAR_HALF"></el-option>
           <el-option label="年度" value="YEAR"></el-option>
         </el-select>

src/views/studentManager/studentGroupRecord.vue

@@ -14,7 +14,7 @@
             style="width: 100% !important"
           >
             <el-option label="月度" value="MONTH"></el-option>
-            <el-option label="季度" value="QUARTERLY"></el-option>
+            <!-- <el-option label="季度" value="QUARTERLY"></el-option> -->
             <el-option label="半年" value="YEAR_HALF"></el-option>
             <el-option label="年度" value="YEAR"></el-option>
             <!-- <el-option label="固定天数" value="DAY"></el-option> -->