11

11

src/store/getters.js

@@ -11,6 +11,7 @@ const getters = {
   topinfo: state => state.buildTeam.topinfo,
   checkinfo: state => state.buildTeam.checkinfo,
   payList: state => state.buildTeam.payList,
-  phone: state => state.user.phone
+  phone: state => state.user.phone,
+  newStudentinfo: state => state.buildTeam.newStudentList
 }
 export default getters

src/store/modules/buildTeam.js

@@ -1,7 +1,8 @@
 const state = {
   topinfo: {},
   checkinfo: {},
-  payList: {}
+  payList: {},
+  newStudentList: {}
 }
 
 const mutations = {
@@ -13,6 +14,9 @@ const mutations = {
   },
   SET_PAY (state, payList) {
     state.payList = payList
+  },
+  SET_NEW_STUDENT (state, newStudentList) {
+    state.newStudentList = newStudentList
   }
 }
 const actions = {
@@ -24,10 +28,13 @@ const actions = {
   },
   getpayInfo ({ commit }, payList) {
     commit('SET_PAY', payList)
+  },
+  newStudentinfo ({ commit }, newStudentList) {
+
+    commit('SET_NEW_STUDENT', newStudentList)
   }
 }
 export default {
-
   state,
   mutations,
   actions

src/views/teamBuild/components/teamBaseInfo.vue

@@ -217,75 +217,75 @@
         </el-form-item>
       </el-form>
       <div class="checkList">
-        <div class="head noMargin">课程组成形态：</div>
+        <div class="head noMargin">乐团课程:</div>
         <div class="checkRow">
           <el-checkbox label="乐团声部训练"
                        v-model.trim="checkList.soundInfo.ischeck"></el-checkbox>
           <div class="inputWrap">
-            单价:
+            原价:
             <input type="text"
                    placeholder="请输入"
                    v-model.trim="checkList.soundInfo.value" />
           </div>
-          <div class="inputWrap">
+          <!-- <div class="inputWrap">
             <el-checkbox v-model="checkList.soundInfo.checkBuy">是否可选择购买</el-checkbox>
-          </div>
+          </div> -->
         </div>
         <div class="checkRow">
           <el-checkbox label="乐团合奏训练"
                        v-model.trim="checkList.allInfo.ischeck"></el-checkbox>
           <div class="inputWrap">
-            单价:
+            原价:
             <input type="text"
                    placeholder="请输入"
                    v-model.trim="checkList.allInfo.value" />
           </div>
-          <div class="inputWrap">
+          <!-- <div class="inputWrap">
             <el-checkbox v-model="checkList.allInfo.checkBuy">是否可选择购买</el-checkbox>
-          </div>
+          </div> -->
         </div>
         <div class="checkRow">
           <el-checkbox label="假期集中训练"
                        v-model.trim="checkList.holidayInfo.ischeck"></el-checkbox>
           <div class="inputWrap">
-            单价:
+            原价:
             <input type="number"
                    @mousewheel.native.prevent
                    placeholder="请输入"
                    v-model.trim="checkList.holidayInfo.value" />
           </div>
-          <div class="inputWrap">
+          <!-- <div class="inputWrap">
             <el-checkbox v-model="checkList.holidayInfo.checkBuy">是否可选择购买</el-checkbox>
-          </div>
+          </div> -->
         </div>
         <div class="checkRow"
              v-if="checkList.networkInfo">
           <el-checkbox label="乐团云课堂"
                        v-model="checkList.networkInfo.ischeck"></el-checkbox>
           <div class="inputWrap">
-            单价:
+            原价:
             <input type="number"
                    @mousewheel.native.prevent
                    placeholder="请输入"
                    v-model.trim="checkList.networkInfo.value" />
           </div>
-          <div class="inputWrap">
+          <!-- <div class="inputWrap">
             <el-checkbox v-model="checkList.networkInfo.checkBuy">是否可选择购买</el-checkbox>
-          </div>
+          </div> -->
         </div>
         <div class="checkRow">
           <el-checkbox label="网络基础训练"
                        v-model.trim="checkList.baseInfo.ischeck"></el-checkbox>
           <div class="inputWrap">
-            单价:
+            原价:
             <input type="number"
                    @mousewheel.native.prevent
                    placeholder="请输入"
                    v-model.trim="checkList.baseInfo.value" />
           </div>
-          <div class="inputWrap">
+          <!-- <div class="inputWrap">
             <el-checkbox v-model="checkList.baseInfo.checkBuy">是否可选择购买</el-checkbox>
-          </div>
+          </div> -->
         </div>
         <div class="checkRow">
           <el-checkbox label="课程提示"
@@ -299,6 +299,31 @@
                       v-model.trim="checkList.submit.value"></el-input>
           </div>
         </div>
+        <div class="head noMargin">新生专享:</div>
+
+        <div class="checkRow"
+             v-if="newStudentList.baseInfo">
+          <el-checkbox label="网络基础训练"
+                       v-model="newStudentList.baseInfo.ischeck"></el-checkbox>
+          <div class="inputWrap">
+            原价:
+            <input type="number"
+                   @mousewheel.native.prevent
+                   placeholder="请输入"
+                   v-model.trim="newStudentList.baseInfo.value" />
+          </div>
+          <div class="inputWrap">
+            现价:
+            <input type="number"
+                   @mousewheel.native.prevent
+                   placeholder="请输入"
+                   v-model.trim="newStudentList.baseInfo.nowValue" />
+          </div>
+          <!-- <div class="inputWrap">
+            <el-checkbox v-model="newStudentList.baseInfo.checkBuy">是否可选择购买</el-checkbox>
+          </div> -->
+
+        </div>
         <div class="head noMargin">付费方式：</div>
         <div class="checkRow">
           <el-checkbox label="学校"
@@ -362,42 +387,6 @@
                    v-model.trim="payList.company.value" />
           </div>
         </div>
-        <!-- <div class="checkRow"
-             v-if='teamStatus !="resetTeam"'>
-          <el-checkbox label="学员"
-                       class="classCheckBox"
-                       v-model.trim="payList.student.ischeck"></el-checkbox>
-          <div class="chioseList">
-            <div class="chioseItem"
-                 :class="payList.student.chiose == 'ONE_OFF'?'active':''"
-                 @click="payList.student.chiose='ONE_OFF'">一次性</div>
-            <div class="chioseItem"
-                 :class="payList.student.chiose == 'loop'?'active':''"
-                 @click="payList.student.chiose='loop'">周期循环</div>
-          </div>
-        </div> -->
-        <!-- <p class="subTitle"
-           v-if="payList.student.chiose == 'loop'&&teamStatus !='resetTeam'">按月缴费时，将在所选月份的1号的前一周提醒用户缴费操作，单次的缴费金额为当前列表「预计收费」的设置金额</p>
-        <div class="chioseWrap"
-             v-if="payList.student.chiose == 'loop'&&teamStatus !='resetTeam'">
-          <p>缴费月份:</p>
-          <el-checkbox-group v-model.trim="payList.chioseMonth"
-                             fill="#14928A"
-                             text-color="#474747">
-            <el-checkbox :label="1">一月</el-checkbox>
-            <el-checkbox :label="2">二月</el-checkbox>
-            <el-checkbox :label="3">三月</el-checkbox>
-            <el-checkbox :label="4">四月</el-checkbox>
-            <el-checkbox :label="5">五月</el-checkbox>
-            <el-checkbox :label="6">六月</el-checkbox>
-            <el-checkbox :label="7">七月</el-checkbox>
-            <el-checkbox :label="8">八月</el-checkbox>
-            <el-checkbox :label="9">九月</el-checkbox>
-            <el-checkbox :label="10">十月</el-checkbox>
-            <el-checkbox :label="11">十一月</el-checkbox>
-            <el-checkbox :label="12">十二月</el-checkbox>
-          </el-checkbox-group>
-        </div> -->
       </div>
       <div class="btnWrap">
         <div class="nextBtn"
@@ -471,30 +460,35 @@ export default {
           // 声部
           ischeck: false,
           value: "",
-          checkBuy: false
+          checkBuy: false,
+          isNew: 0
         },
         allInfo: {
           // 合奏
           ischeck: false,
           value: "",
-          checkBuy: false
+          checkBuy: false,
+          isNew: 0
         },
         baseInfo: {
           // 基础
           ischeck: false,
           value: "",
-          checkBuy: false
+          checkBuy: false,
+          isNew: 0
         },
         holidayInfo: {
           // 假期
           ischeck: false,
           value: "",
-          checkBuy: false
+          checkBuy: false,
+          isNew: 0
         },
         networkInfo: {
           ischeck: false,
           value: "",
-          checkBuy: false
+          checkBuy: false,
+          isNew: 0
         },
         submit: {
           ischeck: false,
@@ -502,7 +496,15 @@ export default {
             "年度安排个月共xxx课时,课时,原价xxx元,现价xxxx元/月(约 xxxx元/课时 )"
         }
       }, // 选中的集合
-
+      newStudentList: {
+        baseInfo: {
+          ischeck: false,
+          value: "",
+          checkBuy: true,
+          nowValue: "",
+          isNew: 1
+        },
+      },
       baseInfo: {},
       money: 580,
       orderInfo: {
@@ -586,37 +588,52 @@ export default {
           // 声部
           ischeck: false,
           value: "",
-          checkBuy: false
+          checkBuy: false,
+          isNew: 0
         },
         allInfo: {
           // 合奏
           ischeck: false,
           value: "",
-          checkBuy: false
+          checkBuy: false,
+          isNew: 0
         },
         baseInfo: {
           // 基础
           ischeck: false,
           value: "",
-          checkBuy: false
+          checkBuy: false,
+          isNew: 0
         },
         holidayInfo: {
           // 假期
           ischeck: false,
           value: "",
-          checkBuy: false
+          checkBuy: false,
+          isNew: 0
         },
         networkInfo: {
           ischeck: false,
           value: "",
-          checkBuy: false
+          checkBuy: false,
+          isNew: 0
         },
         submit: {
           ischeck: false,
           value:
             "年度安排个月共xxx课时,课时,原价xxx元,现价xxxx元/月(约 xxxx元/课时 )"
         }
-      }
+      },
+        this.newStudentList = {
+          baseInfo: {
+            // 基础
+            ischeck: false,
+            value: "",
+            checkBuy: true,
+            nowValue: '',
+            isNew: 1
+          },
+        }
       this.isInit = true;
       // 分为3种  this.teamStatus
       //          1.resetTeam 乐团修改
@@ -657,14 +674,17 @@ export default {
             this.topFrom.repairUserId = res.data.musicGroup.repairUserId ? res.data.musicGroup.repairUserId : null;
             this.topFrom.feeType = res.data.musicGroup.feeType ? res.data.musicGroup.feeType : null;
             // 课程组成形式
-            this.checkList = JSON.parse(res.data.musicGroup.courseForm);
-            if (!this.checkList.networkInfo) {
-              this.$set(this.checkList, 'networkInfo', {
-                ischeck: false,
-                value: "",
-                checkBuy: false
-              })
+            this.checkList;
+            let list = JSON.parse(res.data.musicGroup.courseForm);
+            for (let i in this.checkList) {
+              if (list[i] && !list[i].isNew) {
+                this.checkList[i] = list[i]
+              } else if (list[i] && list[i].isNew) {
+                this.newStudentList[i] = list[i]
+                this.newStudentList[i].checkBuy = true
+              }
             }
+
             // 付费方式和周期
             for (let i in res.data.musicGroupPaymentEntities) {
               if (res.data.musicGroupPaymentEntities[i].name == "学校") {
@@ -849,6 +869,15 @@ export default {
               flagList.push(true)
             }
           }
+
+          for (let i in this.newStudentList) {
+            if (this.newStudentList[i].ischeck && !this.newStudentList[i].value || this.newStudentList[i].ischeck && !this.newStudentList[i].nowValue) {
+              flagList.push(false)
+            } else {
+              flagList.push(true)
+            }
+          }
+
           let flag = flagList.every(item => {
             return item == true
           })
@@ -860,6 +889,7 @@ export default {
           this.$store.dispatch("topinfo", this.topFrom);
           this.$store.dispatch("checkinfo", this.checkList);
           this.$store.dispatch("getpayInfo", this.payList);
+          this.$store.dispatch("newStudentinfo", this.newStudentList);
           if (this.teamStatus == "teamDraft") {
             // 获取数据提交
             this.resetSubmit();
@@ -884,6 +914,13 @@ export default {
               flagList.push(true)
             }
           }
+          for (let i in this.newStudentList) {
+            if (this.newStudentList[i].ischeck && !this.newStudentList[i].value || (this.newStudentList[i].ischeck && !this.newStudentList[i].nowValue)) {
+              flagList.push(false)
+            } else {
+              flagList.push(true)
+            }
+          }
           let flag = flagList.every(item => {
             return item == true
           })
@@ -916,7 +953,18 @@ export default {
           }
           let obj = {};
           // topFrom.ownershipType
-
+          //  修改  合并对象
+          let courseJson = {};
+          for (let i in this.checkList) {
+            if (this.checkList[i].ischeck) {
+              courseJson[i] = this.checkList[i]
+            }
+          }
+          for (let j in this.newStudentList) {
+            if (this.newStudentList[j].ischeck) {
+              courseJson[j] = this.newStudentList[j]
+            }
+          }
           this.payList.student.chiose == "loop"
             ? (obj.months = this.payList.chioseMonth)
             : (obj.months = []);
@@ -932,7 +980,7 @@ export default {
             organId: this.topFrom.section,
             // paymentMonths:obj.months  有待确认
             schoolId: this.topFrom.address,
-            courseForm: JSON.stringify(this.checkList),
+            courseForm: JSON.stringify(courseJson),
             id: this.teamid,
             directorUserId: this.topFrom.head,
             isClassroomLessons: this.topFrom.isClass,
@@ -985,8 +1033,28 @@ export default {
       });
     }
   },
-  computed: {}
-};
+  computed: {},
+  watch: {
+    newStudentList: {
+      handler: function (val) {
+        if (val.baseInfo.ischeck) {
+          this.checkList.baseInfo.ischeck = false;
+        }
+
+      },
+      deep: true
+    },
+    checkList: {
+      handler: function (val) {
+        if (val.baseInfo.ischeck) {
+          this.newStudentList.baseInfo.ischeck = false;
+        }
+      },
+      deep: true
+    },
+
+  }
+}
 </script>
 <style lang="scss">
 .base-container {

src/views/teamBuild/components/teamSoundMoney.vue

@@ -100,32 +100,6 @@
                    v-if="scope.row.fangshi.length >0">{{scope.row.fangshi | fangshiFilter(scope.row)}}</div>
               <i class="el-icon-edit"
                  @click="setGiveMode(scope.row)"></i>
-              <!-- <el-popover placement="bottom"
-                          v-model.trim="scope.row.provideVisible"
-                          v-if='scope.row.type == 1'>
-                <i class='el-icon-edit'
-                   slot='reference'>
-                </i>
-
-                <el-select v-model.trim="scope.row.fangshi"
-                           clearable>
-                  <el-option label="团购"
-                             value="GROUP"></el-option>
-                  <el-option label="借用"
-                             value="LEASE"></el-option>
-                  <el-option label="免费"
-                             value="FREE"></el-option>
-                </el-select>
-                <el-input placeholder="请输入费用"
-                          v-if='scope.row.fangshi == "LEASE"'
-                          v-model.trim="scope.row.fangshiprice"
-                          style='width:180px; margin-top:20px'></el-input>
-                <div style="text-align: right; margin-top: 20px">
-                  <el-button type="primary"
-                             size="mini"
-                             @click="scope.row.provideVisible  = false">确定</el-button>
-                </div>
-              </el-popover>-->
             </div>
           </template>
         </el-table-column>
@@ -285,56 +259,74 @@
       <div class="reductionWrap1 reductionWrap">
         <header style="background:#14928A;color:#fff">乐团缴费</header>
         <div class="noticeInfo">
-          <i class="trumpet_icon"></i>1、为确保声部平衡，请家长确认 注册声部为孩子的最终录取声部。
-          <br />2、为保障每个声部人数达标，我们都进行了超员20%的录取，系统将按照提交注册的先后顺序安排名额。超员后 有可能出现无法注册的情况，请您理解。如果其他声部仍有名额，我们将优先调配您的孩子；
+          <h2>缴费说明</h2>
+          1、为确保声部平衡，请家长确认 注册声部为孩子的最终录取声部。<br />
+          2、为保障每个声部人数达标，我们都进行了超员20%的录取，系统将按照提交注册的先后顺序安排名额。超员后 有可能出现无法注册的情况，请您理解。如果其他声部仍有名额，我们将优先调配您的孩子；
+          <div class="line_bottom"
+               style="margin: 20px 0 0;"></div>
         </div>
         <!-- && (courseScheduleStatus || musicGroupSubject.fee > 0) -->
         <div class="section"
+             style="padding: 0"
              v-if="courseScheduleInfo ">
-          <h2 class="title line_bottom">课程</h2>
-          <div class="options classInfo">
-            <div class="option" v-if="courseScheduleInfo.soundInfo.ischeck" @click="onCourseChange(courseScheduleInfo.soundInfo)">
-                    <div class="0_hd" :style="courseScheduleInfo.soundInfo.checkBuy ? null : 'opacity: 0.5'"><i class="check_default" :class="[courseScheduleInfo.soundInfo.isStatus ? 'check_active' : '']"></i></div>
-                    <div class="o_bd">乐团声部训练</div>
-                    <span class="o_ft">
-                        原价:￥{{ courseScheduleInfo.soundInfo.value ? courseScheduleInfo.soundInfo.value : 0 }}
-                    </span>
-                </div>
-                <div class="option" v-if="courseScheduleInfo.allInfo.ischeck" @click="onCourseChange(courseScheduleInfo.allInfo)">
-                    <div class="0_hd" :style="courseScheduleInfo.allInfo.checkBuy ? null : 'opacity: 0.5'"><i class="check_default" :class="[courseScheduleInfo.allInfo.isStatus ? 'check_active' : '']"></i></div>
-                    <div class="o_bd">乐团合奏训练</div>
-                    <span class="o_ft">
-                        原价:￥{{ courseScheduleInfo.allInfo.value ? courseScheduleInfo.allInfo.value : 0 }}
-                    </span>
-                </div>
-                <div class="option" v-if="courseScheduleInfo.holidayInfo.ischeck" @click="onCourseChange(courseScheduleInfo.holidayInfo)">
-                    <div class="0_hd" :style="courseScheduleInfo.holidayInfo.checkBuy ? null : 'opacity: 0.5'"><i class="check_default" :class="[courseScheduleInfo.holidayInfo.isStatus ? 'check_active' : '']"></i></div>
-                    <div class="o_bd">假期集中训练</div>
-                    <span class="o_ft">
-                        原价:￥{{ courseScheduleInfo.holidayInfo.value ? courseScheduleInfo.holidayInfo.value : 0 }}
-                    </span>
-                </div>
-                <div class="option" v-if="courseScheduleInfo.networkInfo && courseScheduleInfo.networkInfo.ischeck"  @click="onCourseChange(courseScheduleInfo.networkInfo)">
-                    <div class="0_hd" :style="courseScheduleInfo.networkInfo.checkBuy ? null : 'opacity: 0.5'"><i class="check_default" :class="[courseScheduleInfo.networkInfo.isStatus ? 'check_active' : '']"></i></div>
-                    <div class="o_bd">乐团云课堂</div>
-                    <span class="o_ft">
-                        原价:￥{{ courseScheduleInfo.networkInfo.value ? courseScheduleInfo.networkInfo.value : 0 }}
-                    </span>
-                </div>
-                <div class="option" v-if="courseScheduleInfo.baseInfo.ischeck" @click="onCourseChange(courseScheduleInfo.baseInfo)">
-                    <div class="0_hd" :style="courseScheduleInfo.baseInfo.checkBuy ? null : 'opacity: 0.5'"><i class="check_default" :class="[courseScheduleInfo.baseInfo.isStatus ? 'check_active' : '']"></i></div>
-                    <div class="o_bd">网络基础训练</div>
-                    <span class="o_ft">
-                        原价:￥{{ courseScheduleInfo.baseInfo.value ? courseScheduleInfo.baseInfo.value : 0 }}
-                    </span>
-                </div>
+          <h2 class="title"
+              style="padding: 0 16px;">乐团课程</h2>
+          <div class="options classInfo"
+               style="padding:8px 16pxm 0;">
+            <div class="option"
+                 v-if="courseScheduleInfo.soundInfo.ischeck"
+                 @click="onCourseChange(courseScheduleInfo.soundInfo)">
+              <div class="o_hd"><i class="check_radio"></i></div>
+              <div class="o_bd">乐团声部训练</div>
+              <span class="o_ft">
+                原价:￥{{ courseScheduleInfo.soundInfo.value ? courseScheduleInfo.soundInfo.value : 0 }}
+              </span>
+            </div>
+            <div class="option"
+                 v-if="courseScheduleInfo.allInfo.ischeck"
+                 @click="onCourseChange(courseScheduleInfo.allInfo)">
+              <div class="o_hd"><i class="check_radio"></i></div>
+              <div class="o_bd">乐团合奏训练</div>
+              <span class="o_ft">
+                原价:￥{{ courseScheduleInfo.allInfo.value ? courseScheduleInfo.allInfo.value : 0 }}
+              </span>
+            </div>
+            <div class="option"
+                 v-if="courseScheduleInfo.holidayInfo.ischeck"
+                 @click="onCourseChange(courseScheduleInfo.holidayInfo)">
+              <div class="o_hd"><i class="check_radio"></i></div>
+              <div class="o_bd">假期集中训练</div>
+              <span class="o_ft">
+                原价:￥{{ courseScheduleInfo.holidayInfo.value ? courseScheduleInfo.holidayInfo.value : 0 }}
+              </span>
+            </div>
+            <div class="option"
+                 v-if="courseScheduleInfo.networkInfo && courseScheduleInfo.networkInfo.ischeck"
+                 @click="onCourseChange(courseScheduleInfo.networkInfo)">
+              <div class="o_hd"><i class="check_radio"></i></div>
+              <div class="o_bd">乐团云课堂</div>
+              <span class="o_ft">
+                原价:￥{{ courseScheduleInfo.networkInfo.value ? courseScheduleInfo.networkInfo.value : 0 }}
+              </span>
+            </div>
+            <div class="option"
+                 v-if="courseScheduleInfo.baseInfo.ischeck"
+                 @click="onCourseChange(courseScheduleInfo.baseInfo)">
+              <div class="o_hd"><i class="check_radio"></i></div>
+              <div class="o_bd">网络基础训练</div>
+              <span class="o_ft">
+                原价:￥{{ courseScheduleInfo.baseInfo.value ? courseScheduleInfo.baseInfo.value : 0 }}
+              </span>
+            </div>
           </div>
           <div class="options sale"
+               style="padding: 8px 16px 10px;"
                v-if="lookPreviewRow&&lookPreviewRow.yuji"
                :class="[courseScheduleStatus?'lines':'']">
             <div class="option">
-              <div class="o_bd">现价</div>
-              <span class="o_ft">￥{{ orderInfo.coursePrice }}</span>
+              <div class="o_bd"></div>
+              <span class="o_ft"
+                    style="font-size: 20px">现价￥{{ orderInfo.coursePrice }}</span>
             </div>
           </div>
           <div class="coutInfo"
@@ -345,6 +337,32 @@
         </div>
 
         <div class="section"
+             v-if="newStudentfor.baseInfo.ischeck">
+          <h2 class="title line_bottom">新生专享</h2>
+          <div class="options classInfo">
+            <div class="option"
+                 v-if="newStudentfor.baseInfo.ischeck"
+                 @click="onCourseChange(newStudentfor.baseInfo)">
+              <div class="0_hd"
+                   :style="newStudentfor.baseInfo.ischeck ? null : 'opacity: 0.5'"><i class="check_default"
+                   :class="[newStudentfor.baseInfo.isStatus ? 'check_active' : '']"></i></div>
+              <div class="o_bd">网络基础训练</div>
+              <span class="o_ft">
+                原价:￥{{ newStudentfor.baseInfo.value ? newStudentfor.baseInfo.value : 0 }}
+              </span>
+            </div>
+          </div>
+          <div class="options sale"
+               v-if="lookPreviewRow&&lookPreviewRow.yuji"
+               :class="[courseScheduleStatus?'lines':'']">
+            <div class="option">
+              <div class="o_bd">现价</div>
+              <!-- 以后要加课程这里得计算课程 -->
+              <span class="o_ft">￥{{ newStudentfor.baseInfo.nowValue }}</span>
+            </div>
+          </div>
+        </div>
+        <div class="section"
              v-if="lookPreviewRow&&lookPreviewRow.goodsList.length > 0">
           <h2 class="title line_bottom">乐器</h2>
           <div class="options">
@@ -375,7 +393,8 @@
                   </div>
                   <div class="content">
                     <template v-for="(goods, index) in lookPreviewRow.goodsList">
-                      <p :key="goods.id" v-if="con.id == goods.id">{{ lookPreviewRow.goodsList[index].specification }}</p>
+                      <p :key="goods.id"
+                         v-if="con.id == goods.id">{{ lookPreviewRow.goodsList[index].specification }}</p>
                     </template>
                   </div>
                 </div>
@@ -405,7 +424,8 @@
                   <div class="content">
                     <!-- <p>{{ lookPreviewRow.goodsList[index].specification }}</p> -->
                     <template v-for="(goods, index) in lookPreviewRow.goodsList">
-                      <p :key="goods.id" v-if="con.id == goods.id">{{ lookPreviewRow.goodsList[index].specification }}</p>
+                      <p :key="goods.id"
+                         v-if="con.id == goods.id">{{ lookPreviewRow.goodsList[index].specification }}</p>
                     </template>
                   </div>
                 </div>
@@ -436,7 +456,8 @@
                   <div class="content">
                     <!-- <p>{{ lookPreviewRow.goodsList[index].specification }}</p> -->
                     <template v-for="(goods, index) in lookPreviewRow.goodsList">
-                      <p :key="goods.id" v-if="con.id == goods.id">{{ lookPreviewRow.goodsList[index].specification }}</p>
+                      <p :key="goods.id"
+                         v-if="con.id == goods.id">{{ lookPreviewRow.goodsList[index].specification }}</p>
                     </template>
                   </div>
                 </div>
@@ -655,7 +676,8 @@
                         v-model.trim="item.mode.LEASE"></el-input>
             </div>
             <div class="item">
-              <el-input style="width:80%" disabled
+              <el-input style="width:80%"
+                        disabled
                         type="number"></el-input>
             </div>
           </div>
@@ -676,7 +698,8 @@
                         disabled></el-input>
             </div>
             <div class="item">
-              <el-input style="width:80%" disabled
+              <el-input style="width:80%"
+                        disabled
                         type="number"></el-input>
             </div>
           </div>
@@ -728,6 +751,7 @@ export default {
       editSound: null,
       // 预览
       courseScheduleInfo: null, // 课程组信息
+      newStundentInfo: null,
       instrumentResult: [], // 乐器信息
       accessOries: [], // 辅件(打包)
       accessGoods: [],
@@ -756,12 +780,12 @@ export default {
   //   this.init();
   // },
   methods: {
-    onCourseChange(item) {
-        // 判断用户是否可以选择
-        if(item.checkBuy) {
-            item.isStatus = !item.isStatus
-            this.calcPrice()
-        }
+    onCourseChange (item) {
+      // 判断用户是否可以选择
+      if (item.checkBuy) {
+        item.isStatus = !item.isStatus
+        this.calcPrice()
+      }
     },
     init () {
       if (this.$route.query.search) {
@@ -779,11 +803,11 @@ export default {
           }
           // 新建团带默认的数据   this.topfor.section
           if (this.teamStatus == "newTeam") {
-            console.log({
-              chargeTypeId: type,
-              organId: this.topfor.section,
-              number: 1
-            })
+            // console.log({
+            //   chargeTypeId: type,
+            //   organId: this.topfor.section,
+            //   number: 1
+            // })
             getDefaultSubject({
               chargeTypeId: type,
               organId: this.topfor.section,
@@ -838,14 +862,14 @@ export default {
                 if (res.code == 200) {
                   this.activeSoundList = res.data.musicGroupSubjectPlans.map(
                     item => {
-                      console.log(item)
+
                       let fangshi = [];
                       res.data.musicGroupSubjectGoodsGroups.forEach(sub => {
                         if (
                           sub.subjectId == item.subjectId &&
                           sub.type == "INSTRUMENT"
                         ) {
-                          let FREE,  courseFree, LEASE, courseLease, GROUP, courseGroup;
+                          let FREE, courseFree, LEASE, courseLease, GROUP, courseGroup;
                           let isFREE = false;
                           let isLEASE = false;
                           let isGROUP = false;
@@ -870,7 +894,7 @@ export default {
                               isGROUP = true;
                             }
                           }
-                          if(sub.coursePurchaseTypeJson) {
+                          if (sub.coursePurchaseTypeJson) {
                             let courseJson = JSON.parse(sub.coursePurchaseTypeJson)
                             if (courseJson && courseJson.hasOwnProperty("FREE")) {
                               courseFree = courseJson.FREE;
@@ -1019,16 +1043,19 @@ export default {
       this.payfor = this.$store.getters.payList;
       this.topfor = this.$store.getters.topinfo;
       this.checkfor = this.$store.getters.checkinfo;
+      this.newStudentfor = this.$store.getters.newStudentinfo
+      // 
       this.$nextTick(res => {
+
+
         let tempInfo = this.$store.getters.checkinfo
         // 默认课程都选中
-        tempInfo.soundInfo.isStatus = true
-        tempInfo.allInfo.isStatus = true
-        tempInfo.baseInfo.isStatus = true
-        tempInfo.holidayInfo.isStatus = true
-        tempInfo.networkInfo.isStatus = true
+        for (let i in tempInfo) {
+          if (tempInfo[i] && !tempInfo[i].isNew) {
+            tempInfo[i].isStatus = true
+          }
+        }
         this.courseScheduleInfo = tempInfo;
-        //  console.log(this.courseScheduleInfo)
       });
       //  console.log(this.$store.getters.payList)
       //  console.log(this.$store.getters.checkinfo)
@@ -1169,7 +1196,18 @@ export default {
       // 整理数据提交
       if (this.teamStatus == "newTeam") {
         let obj = {};
-
+        // 解析数据 
+        let courseJson = {};
+        for (let i in this.checkfor) {
+          if (this.checkfor[i].ischeck) {
+            courseJson[i] = this.checkfor[i]
+          }
+        }
+        for (let j in this.newStudentfor) {
+          if (this.newStudentfor[j].ischeck) {
+            courseJson[j] = this.newStudentfor[j]
+          }
+        }
         obj.months = this.payfor.chioseMonth || [];
         let enrollClasses;
         this.topfor.startClass
@@ -1187,7 +1225,7 @@ export default {
           organId: this.topfor.section,
           // paymentMonths:obj.months  有待确认
           schoolId: this.topfor.address,
-          courseForm: JSON.stringify(this.checkfor),
+          courseForm: JSON.stringify(courseJson),
           expectStartGroupDate: this.topfor.startTime,
           isClassroomLessons: this.topfor.isClass,
           status,
@@ -1256,13 +1294,13 @@ export default {
                 }
 
                 let courseTypes = {}
-                if(fs.mode.courseFree) {
+                if (fs.mode.courseFree) {
                   courseTypes.FREE = fs.mode.courseFree
                 }
-                if(fs.mode.courseGroup) {
+                if (fs.mode.courseGroup) {
                   courseTypes.GROUP = fs.mode.courseGroup ? fs.mode.courseGroup : 0
                 }
-                if(fs.mode.courseLease) {
+                if (fs.mode.courseLease) {
                   courseTypes.LEASE = fs.mode.courseLease
                 }
                 coursePurchaseTypeJson = JSON.stringify(courseTypes)
@@ -1377,13 +1415,13 @@ export default {
                 }
 
                 let courseTypes = {}
-                if(fs.mode.courseFree) {
+                if (fs.mode.courseFree) {
                   courseTypes.FREE = fs.mode.courseFree
                 }
-                if(fs.mode.courseGroup) {
+                if (fs.mode.courseGroup) {
                   courseTypes.GROUP = fs.mode.courseGroup ? fs.mode.courseGroup : 0
                 }
-                if(fs.mode.courseLease) {
+                if (fs.mode.courseLease) {
                   courseTypes.LEASE = fs.mode.courseLease
                 }
                 coursePurchaseTypeJson = JSON.stringify(courseTypes)
@@ -1511,7 +1549,6 @@ export default {
     // 设置乐器提供方式
     setGiveMode (row) {
       // goodsList
-      console.log(row)
       if (row.zhonglei.length <= 0) {
         this.$message.error("请先选择乐器规格");
         return;
@@ -1568,10 +1605,10 @@ export default {
         item.mode.GROUP = item.mode.price;
       }
     },
-    groupCourseInput(item) {
+    groupCourseInput (item) {
       console.log(item)
       let mode = item.mode
-      if(mode.yuji - mode.courseGroup < 0) {
+      if (mode.yuji - mode.courseGroup < 0) {
         mode.courseGroup = mode.yuji
       }
     },
@@ -1586,9 +1623,22 @@ export default {
     // 查看预览
     lookPreview (row) {
       this.lookPreviewRow = row;
+      // 判断商品里的最高价 选中
+      console.log(this.lookPreviewRow)
       this.previewVisible = true;
+      this.setChioseMusic(this.lookPreviewRow)
       this.calcPrice()
     },
+    setChioseMusic (row) {
+      row.fangshi.forEach(item => {
+        if (item.mode.isGROUP) {
+          item.chiosetype = 'GROUP'
+          item.checked = true
+        } else {
+
+        }
+      })
+    },
     onAuxiliarie (item) {
       // 辅件切换状态
       item.checked = !item.checked;
@@ -1605,8 +1655,8 @@ export default {
       // 重新计算金额
       this.calcPrice();
     },
-    onPreviewClose() {
-       this.lookPreviewRow.fangshi.forEach(item => {
+    onPreviewClose () {
+      this.lookPreviewRow.fangshi.forEach(item => {
         item.checked = false;
       });
 
@@ -1632,50 +1682,50 @@ export default {
         const allInfo = csi.allInfo
         if (allInfo.ischeck) {
           const value = Number(parseFloat(allInfo.value ? allInfo.value : 0))
-          if(allInfo.isStatus) {
+          if (allInfo.isStatus) {
             marketPrice += value;
           }
-          if(allInfo.isStatus && allInfo.checkBuy) {
+          if (allInfo.isStatus && allInfo.checkBuy) {
             coursePrice += parseFloat(allInfo.checkBuy ? value : 0)
           }
         }
         const baseInfo = csi.baseInfo
         if (baseInfo.ischeck) {
           const value = parseFloat(baseInfo.value ? baseInfo.value : 0)
-          if(baseInfo.isStatus) {
+          if (baseInfo.isStatus) {
             marketPrice += value;
           }
-          if(baseInfo.isStatus && baseInfo.checkBuy) {
+          if (baseInfo.isStatus && baseInfo.checkBuy) {
             coursePrice += parseFloat(baseInfo.checkBuy ? value : 0)
           }
         }
         const holidayInfo = csi.holidayInfo
         if (holidayInfo.ischeck) {
           const value = parseFloat(holidayInfo.value ? holidayInfo.value : 0)
-          if(holidayInfo.isStatus) {
+          if (holidayInfo.isStatus) {
             marketPrice += value
           }
-          if(holidayInfo.isStatus && holidayInfo.checkBuy) {
+          if (holidayInfo.isStatus && holidayInfo.checkBuy) {
             coursePrice += parseFloat(holidayInfo.checkBuy ? value : 0)
           }
         }
         const soundInfo = csi.soundInfo
         if (soundInfo.ischeck) {
           const value = parseFloat(soundInfo.value ? soundInfo.value : 0)
-          if(soundInfo.isStatus) {
+          if (soundInfo.isStatus) {
             marketPrice += value;
           }
-          if(soundInfo.isStatus && soundInfo.checkBuy) {
+          if (soundInfo.isStatus && soundInfo.checkBuy) {
             coursePrice += parseFloat(soundInfo.checkBuy ? value : 0)
           }
         }
         const networkInfo = csi.networkInfo
         if (networkInfo.ischeck) {
           const value = parseFloat(networkInfo.value ? networkInfo.value : 0)
-          if(networkInfo.isStatus) {
+          if (networkInfo.isStatus) {
             marketPrice += value;
           }
-          if(networkInfo.isStatus && networkInfo.checkBuy) {
+          if (networkInfo.isStatus && networkInfo.checkBuy) {
             coursePrice += parseFloat(networkInfo.checkBuy ? value : 0)
           }
         }
@@ -1713,7 +1763,7 @@ export default {
           }
         });
       }
-      if(coursePrice - Number(courseCouponPrice) >= 0) {
+      if (coursePrice - Number(courseCouponPrice) >= 0) {
         coursePrice = Number((coursePrice - courseCouponPrice).toFixed(2))
       } else {
         coursePrice = 0
@@ -1937,6 +1987,9 @@ export default {
 // .el-table__body tr.current-row > td {
 //   background-color: #c6cbd4 !important;
 // }
+section {
+  padding: 0;
+}
 .el-checkbox__input.is-checked .el-checkbox__inner,
 .el-checkbox__input.is-indeterminate .el-checkbox__inner {
   background-color: #14928a;
@@ -2106,203 +2159,6 @@ export default {
 .el-icon-plus {
   cursor: pointer;
 }
-.baseRight {
-  width: 375px;
-  margin-left: 25px;
-  header {
-    width: 375px;
-    height: 40px;
-    line-height: 40px;
-    color: #000;
-    font-size: 14px;
-    background: #fff;
-    box-shadow: 0px 1px 8px 0px rgba(0, 0, 0, 0.07);
-    text-align: center;
-    margin-bottom: 6px;
-  }
-  .section {
-    width: 375px;
-    padding: 0 22px;
-    background: #fff;
-    margin-bottom: 10px;
-    .line_bottom {
-      border-bottom: 1px solid #ededed;
-    }
-    > .title {
-      font-size: 20px;
-      line-height: 28px;
-      font-weight: bold;
-    }
-    .indate {
-      font-size: 12px;
-      padding: 5px 0;
-      display: flex;
-      justify-content: space-between;
-      span {
-        color: #fa101d;
-      }
-    }
-
-    .coutInfo {
-      font-size: 14px;
-      color: #f85043;
-      text-align: left;
-      border-top: 1px solid #ededed;
-      padding: 12px 0 0 25px;
-      margin-top: 10px;
-      position: relative;
-      .trumpet_icon {
-        width: 14px;
-        height: 12px;
-        background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAYCAYAAADpnJ2CAAAAAXNSR0IArs4c6QAAAyZJREFUSA21Vk1IVFEUPufOezNilJXQD2UQRERamWhBaUWOSS3U0SawdgZai2gR0aoQXPSDm3JRCbm0xZBjbkQZS0KDjKywDCIIkoKKEIkm35uZezr32X0jQ+bY2IU359xzzj3fPXe++4PwDy0W8JdKgjYCWOkzzWIM9X5NN42RbqCKoxOHl1nR2FVJ1MRgqGzxhCxg8VDp6TSRTpCKsQL+aitqjwPRKQ3mjCVygFPz2MGKQqvG/zxW56+c7ZsXkIJH1liB8hARdQPButmD59WR8mUCuqy6ynwd686OmpsN++XjLUiYrZ0g5E6SdJmAVri2FMWDnnIz3P8gxex07Rp/owS6jQij3h1lu7G5Oe5UOF1bcc5+MTRFlBiTEH/iflLe+htYKsh0oHwzBcpztd3bHWlHxPtEUMTFHFV2YdceOglStnLiZGV6xEIlwbBF+JQaqpa6Qw246OiUOKOkICnPus4MFYGik7m80Z6MXtCpfKHIGBN6kIm2x66tLBJM7q3amak0DbqEgD84eQNzwiUkE+Wmk1vGjwtmnydTID0eQ5EpLoDZTGvjr4b2absXzGdKlwC73FloZ6aSSTKocjC7kyu3Ku8D2xOAuOk/ANKEAwhivZKqYXt7jFdyAnl7LTrgDMTcv4sOyCddnlOVnKlU6dTYaPKS5hHg5IIO77nnnfTw0h1QPTTgjWv9MrGB97ki5zvh/JmuJzOFgv4cPm9rGO6TUVD6SGezhV2sdF7OEcEB49qRqbRi0MKVLEEBHXxu8i6YabzMpx1NGJ18OIjr2pG5pHqu7r13efY1ncsK+rfxvtzPW2LY29U3Krxd/Xe4c55PiKgO+meJsNeHVIIdPd/dHHFoUToitSnpsDQrHGn1FpbmoMcoEIJPA/0BNvFEJlVgOi0rPPAWwwPfdKy6nphE1c71tL3snrK796EOSpVUX7Xano628cBgqk/157oP1Y1PcTkChDEwzRJfqNfhyrz7EO/2fPaFI8dAiGqe3sc/gc5pI3wtPFCrwVTcvBXOTuY8on7GrqBMvms8wjhodvWl/YhaEKAG//1MvMHXUO5Cn4m/ACXBMJBwQaFpAAAAAElFTkSuQmCC)
-          no-repeat center;
-        background-size: contain;
-        position: absolute;
-        left: 0;
-        top: 14px;
-      }
-    }
-  }
-
-  .options {
-    padding-top: 8px;
-    .oc {
-      &:last-child {
-        border-top: 1px solid #ededed;
-        margin-top: 8px;
-        padding-top: 9px;
-      }
-    }
-    .protocol {
-      padding-left: 20px;
-      font-size: 10px;
-      line-height: 14px;
-    }
-    .option {
-      width: 100%;
-      line-height: 26px;
-      font-size: 15px;
-      display: flex;
-      align-items: center;
-      position: relative;
-      .o_bd {
-        flex: 1;
-        .c {
-          font-size: 12px;
-        }
-      }
-      .o_ft {
-        font-size: 12px;
-        color: #fa101d;
-        del {
-          color: #aaaaaa;
-          font-size: 11px;
-        }
-      }
-      .check_default {
-        margin-right: 8px;
-        display: block;
-        width: 14px;
-        height: 14px;
-        background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAABK0lEQVQ4T6WSP0vDQBjGn3MIiYX+CbhYG7BR7CL5ANmS2SWQ7H4DZ3ed/QbuOcjinGz5ANGloqmQ2i5CmhZqQgZPLjRQFYS2N9297/t73+fuHoK15bruASHkijF2AeB0lXohhDwwxu4cx/moy0m9oZRaAO5VVW0qioJ2u12lsixDkiSI43gB4NK2bY/HK5BDoihSXdf3Wq0WZrMZPpfLCtxvNNDpdDCfzxGG4VdRFDaHyUreq2maTUmS8DYaoSzL9RtAEAQc9/vI8xy+7y8YYyeEUnqjquq1pml4Hg7/QHUHDp8NBoiiiMu+5RMfDcM45wXv4/GPSb8PR71eFQqC4ImDuWVZ4nQyQZqm/4KyLOOw24XnecVO4HZSd3kc7pbNv2NrA+xkuRrexOTfqpPUy7sW3D4AAAAASUVORK5CYII=)
-          no-repeat center;
-        background-size: contain;
-        &.check_active {
-          background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAABaUlEQVQ4T2NkQAKHPD1F2TmYChgZGHwZGBlUwVL/GW7/Z2DY/PPHvwl227e/hilnhDFOBXoHMbKxzhd18eATtnNg4FJQBEt9e3Cf4e2hAwyv9+z49P/X70Sz9VvXgcTBGkGa2EREVqtU1jFxSUgy/F+1geHf6bNgjUymxgyMYQEM3148Z7jT3vTv15s3oSDNjCDncfKx39Fs7+Xj+vWX4U9YAgPDo8fIPmBgkJNlYFm1gOEbGzPD9criT98//VRhPB3o2yrq5V0lFx3H8MfCBVMTzAiQ5hN7GB4tXcTwctvmNsZTgd6XNDt6dbmOn2X4W1CBahMaj3lCB8M3S2OG6xXFlxlPBXl/N16+juNfURXD/6Wr8GpkjA5jYOprYzgbGfSDAo1wp55j+FtQTsCpnQzfLI0gTiU7cMiODuwJYD3Dv9PnoAnAiIExLBAzAVCU5GCawc7mYCn4z/APJZEzMjBt/v7jD0oiBwAFDdbhAm8qEQAAAABJRU5ErkJggg==)
-            no-repeat center;
-          background-size: contain;
-        }
-      }
-    }
-  }
-
-  .configuration {
-    padding-right: 5px;
-    padding-bottom: 9px;
-    .title {
-      background: rgba(246, 246, 246, 1);
-      height: 1px;
-      position: relative;
-      margin: 15px 0;
-      span {
-        position: absolute;
-        left: 12px;
-        top: -9px;
-        display: inline-block;
-        background-color: #fff;
-        font-size: 10px;
-        padding: 0 4px;
-      }
-    }
-
-    .content {
-      font-size: 12px;
-      padding-left: 16px;
-      line-height: 22px;
-      color: #acacac;
-    }
-
-    .options {
-      padding-top: 0;
-      padding-left: 16px;
-      .option {
-        font-size: 14px;
-        color: #6f6f6f;
-      }
-    }
-  }
-
-  .buy {
-    margin-top: 200px;
-    width: 450px;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    height: 60px;
-    display: flex;
-    align-items: center;
-    padding: 0 20px;
-    border-top: 1px solid #ffe9e9e9;
-    color: #000000;
-    font-size: 12px;
-    background: #fff;
-    .price {
-      flex: 1;
-      font-size: 14px;
-    }
-    font-size: 14px;
-    span {
-      color: #fa101d;
-    }
-    .text {
-      font-size: 12px;
-      width: 60px;
-      display: inline-block;
-      color: #000;
-    }
-    del {
-      color: #b5b5b5;
-      &.text {
-        color: #b5b5b5;
-      }
-    }
-
-    a {
-      display: inline-block;
-      font-size: 18px;
-      color: #fff;
-      background: #f1111b;
-      border-radius: 4px;
-      box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.19);
-      padding: 8px 28px;
-    }
-  }
-
-  .couponprice {
-    display: flex;
-    justify-content: space-between;
-  }
-}
 .use_price {
   line-height: 52px;
   display: flex;
@@ -2347,28 +2203,21 @@ export default {
     background: #fff;
     box-shadow: 0px 1px 8px 0px rgba(0, 0, 0, 0.07);
     text-align: center;
-    margin-bottom: 6px;
   }
 
   .noticeInfo {
+    h2 {
+      font-size: 18px;
+      color: #1a1a1a;
+      // padding-bottom: 10px;
+    }
     position: relative;
-    margin-top: 7px;
-    // margin-bottom: 10px;
+    // margin-bottom: .1rem;
     background: #fff;
-    padding: 10px 22px 10px 32px;
-    font-size: 12px;
-    line-height: 14px;
-    color: #fa101d;
-    .trumpet_icon {
-      width: 14px;
-      height: 12px;
-      background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAYCAYAAADpnJ2CAAAAAXNSR0IArs4c6QAAAyZJREFUSA21Vk1IVFEUPufOezNilJXQD2UQRERamWhBaUWOSS3U0SawdgZai2gR0aoQXPSDm3JRCbm0xZBjbkQZS0KDjKywDCIIkoKKEIkm35uZezr32X0jQ+bY2IU359xzzj3fPXe++4PwDy0W8JdKgjYCWOkzzWIM9X5NN42RbqCKoxOHl1nR2FVJ1MRgqGzxhCxg8VDp6TSRTpCKsQL+aitqjwPRKQ3mjCVygFPz2MGKQqvG/zxW56+c7ZsXkIJH1liB8hARdQPButmD59WR8mUCuqy6ynwd686OmpsN++XjLUiYrZ0g5E6SdJmAVri2FMWDnnIz3P8gxex07Rp/owS6jQij3h1lu7G5Oe5UOF1bcc5+MTRFlBiTEH/iflLe+htYKsh0oHwzBcpztd3bHWlHxPtEUMTFHFV2YdceOglStnLiZGV6xEIlwbBF+JQaqpa6Qw246OiUOKOkICnPus4MFYGik7m80Z6MXtCpfKHIGBN6kIm2x66tLBJM7q3amak0DbqEgD84eQNzwiUkE+Wmk1vGjwtmnydTID0eQ5EpLoDZTGvjr4b2absXzGdKlwC73FloZ6aSSTKocjC7kyu3Ku8D2xOAuOk/ANKEAwhivZKqYXt7jFdyAnl7LTrgDMTcv4sOyCddnlOVnKlU6dTYaPKS5hHg5IIO77nnnfTw0h1QPTTgjWv9MrGB97ki5zvh/JmuJzOFgv4cPm9rGO6TUVD6SGezhV2sdF7OEcEB49qRqbRi0MKVLEEBHXxu8i6YabzMpx1NGJ18OIjr2pG5pHqu7r13efY1ncsK+rfxvtzPW2LY29U3Krxd/Xe4c55PiKgO+meJsNeHVIIdPd/dHHFoUToitSnpsDQrHGn1FpbmoMcoEIJPA/0BNvFEJlVgOi0rPPAWwwPfdKy6nphE1c71tL3snrK796EOSpVUX7Xano628cBgqk/157oP1Y1PcTkChDEwzRJfqNfhyrz7EO/2fPaFI8dAiGqe3sc/gc5pI3wtPFCrwVTcvBXOTuY8on7GrqBMvms8wjhodvWl/YhaEKAG//1MvMHXUO5Cn4m/ACXBMJBwQaFpAAAAAElFTkSuQmCC)
-        no-repeat center;
-      background-size: contain;
-      position: absolute;
-      left: 10px;
-      top: 12px;
-    }
+    padding: 15px 15px 10px;
+    font-size: 14px;
+    color: #808080;
+    border-bottom: 1px solid #eaeaea;
   }
   .protocolbtn {
     margin: 35px 0;
@@ -2391,7 +2240,8 @@ export default {
       font-size: 20px;
       line-height: 28px;
       font-weight: bold;
-      padding-bottom: 5px;
+      margin-bottom: 0px;
+      // padding-bottom: 5px;
       &::before {
         content: " ";
         width: 4px;
@@ -2414,23 +2264,22 @@ export default {
     }
 
     .coutInfo {
-      font-size: 12px;
-      color: #f85043;
+      font-size: 14px;
+      color: #905319;
       text-align: left;
       border-top: 1px solid #ededed;
-      padding: 12px 0 0 15px;
-      margin-top: 10px;
-
+      padding: 12px 16px 12px 31px;
       position: relative;
+      background-color: #ffe9d4;
       .trumpet_icon {
         width: 14px;
         height: 12px;
-        background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAYCAYAAADpnJ2CAAAAAXNSR0IArs4c6QAAAyZJREFUSA21Vk1IVFEUPufOezNilJXQD2UQRERamWhBaUWOSS3U0SawdgZai2gR0aoQXPSDm3JRCbm0xZBjbkQZS0KDjKywDCIIkoKKEIkm35uZezr32X0jQ+bY2IU359xzzj3fPXe++4PwDy0W8JdKgjYCWOkzzWIM9X5NN42RbqCKoxOHl1nR2FVJ1MRgqGzxhCxg8VDp6TSRTpCKsQL+aitqjwPRKQ3mjCVygFPz2MGKQqvG/zxW56+c7ZsXkIJH1liB8hARdQPButmD59WR8mUCuqy6ynwd686OmpsN++XjLUiYrZ0g5E6SdJmAVri2FMWDnnIz3P8gxex07Rp/owS6jQij3h1lu7G5Oe5UOF1bcc5+MTRFlBiTEH/iflLe+htYKsh0oHwzBcpztd3bHWlHxPtEUMTFHFV2YdceOglStnLiZGV6xEIlwbBF+JQaqpa6Qw246OiUOKOkICnPus4MFYGik7m80Z6MXtCpfKHIGBN6kIm2x66tLBJM7q3amak0DbqEgD84eQNzwiUkE+Wmk1vGjwtmnydTID0eQ5EpLoDZTGvjr4b2absXzGdKlwC73FloZ6aSSTKocjC7kyu3Ku8D2xOAuOk/ANKEAwhivZKqYXt7jFdyAnl7LTrgDMTcv4sOyCddnlOVnKlU6dTYaPKS5hHg5IIO77nnnfTw0h1QPTTgjWv9MrGB97ki5zvh/JmuJzOFgv4cPm9rGO6TUVD6SGezhV2sdF7OEcEB49qRqbRi0MKVLEEBHXxu8i6YabzMpx1NGJ18OIjr2pG5pHqu7r13efY1ncsK+rfxvtzPW2LY29U3Krxd/Xe4c55PiKgO+meJsNeHVIIdPd/dHHFoUToitSnpsDQrHGn1FpbmoMcoEIJPA/0BNvFEJlVgOi0rPPAWwwPfdKy6nphE1c71tL3snrK796EOSpVUX7Xano628cBgqk/157oP1Y1PcTkChDEwzRJfqNfhyrz7EO/2fPaFI8dAiGqe3sc/gc5pI3wtPFCrwVTcvBXOTuY8on7GrqBMvms8wjhodvWl/YhaEKAG//1MvMHXUO5Cn4m/ACXBMJBwQaFpAAAAAElFTkSuQmCC)
-          no-repeat center;
+        background: url("../../../assets/images/icon_smallBell.png") no-repeat
+          center;
         background-size: contain;
         position: absolute;
-        left: 0;
-        top: 12px;
+        left: 14px;
+        top: 16px;
       }
     }
   }
@@ -2450,6 +2299,7 @@ export default {
       line-height: 14px;
     }
     &.classInfo {
+      padding: 0 16px;
       .option .o_ft {
         color: #444444;
       }
@@ -2463,7 +2313,7 @@ export default {
         .o_bd,
         .o_ft {
           font-size: 16px;
-          color: #f85043;
+          color: #ff0000;
           font-weight: bold;
         }
       }
@@ -2472,8 +2322,10 @@ export default {
       line-height: 26px;
       font-size: 15px;
       display: flex;
+      flex-direction: row;
       align-items: center;
       position: relative;
+      margin-bottom: 9px;
       .o_bd {
         flex: 1;
         .c {
@@ -2482,12 +2334,23 @@ export default {
       }
       .o_ft {
         font-size: 14px;
-        color: #fa101d;
+        color: #ff0000;
         del {
           color: #aaaaaa;
           font-size: 12px;
         }
       }
+      .check_radio {
+        margin-right: 8px;
+        width: 18px;
+        height: 18px;
+        background: url("../../../assets/images/icon_radio.png") no-repeat
+          center;
+        background-size: contain;
+        display: inline-block;
+        position: relative;
+        top: 2px;
+      }
       .check_default {
         position: relative;
         margin-right: 8px;