Merge branch 'online' of http://git.dayaedu.com/molingzhide/dy-admin-manager into online

src/views/teamBuild/components/teamBaseInfo.vue

@@ -310,14 +310,14 @@
             <input type="number"
                    @mousewheel.native.prevent
                    placeholder="请输入"
-                   v-model.trim="newStudentList.baseInfo.value" />
+                   v-model.trim="newStudentList.baseInfo.nowValue" />
           </div>
           <div class="inputWrap">
             现价:
             <input type="number"
                    @mousewheel.native.prevent
                    placeholder="请输入"
-                   v-model.trim="newStudentList.baseInfo.nowValue" />
+                   v-model.trim="newStudentList.baseInfo.value" />
           </div>
           <!-- <div class="inputWrap">
             <el-checkbox v-model="newStudentList.baseInfo.checkBuy">是否可选择购买</el-checkbox>
@@ -461,34 +461,39 @@ export default {
           ischeck: false,
           value: "",
           checkBuy: false,
-          isNew: 0
+          isNew: 0,
+          isStatus: false
         },
         allInfo: {
           // 合奏
           ischeck: false,
           value: "",
           checkBuy: false,
-          isNew: 0
+          isNew: 0,
+          isStatus: false
         },
         baseInfo: {
           // 基础
           ischeck: false,
           value: "",
           checkBuy: false,
-          isNew: 0
+          isNew: 0,
+          isStatus: false
         },
         holidayInfo: {
           // 假期
           ischeck: false,
           value: "",
           checkBuy: false,
-          isNew: 0
+          isNew: 0,
+          isStatus: false
         },
         networkInfo: {
           ischeck: false,
           value: "",
           checkBuy: false,
-          isNew: 0
+          isNew: 0,
+          isStatus: false
         },
         submit: {
           ischeck: false,
@@ -502,7 +507,8 @@ export default {
           value: "",
           checkBuy: true,
           nowValue: "",
-          isNew: 1
+          isNew: 1,
+          isStatus: false
         },
       },
       baseInfo: {},
@@ -589,34 +595,39 @@ export default {
           ischeck: false,
           value: "",
           checkBuy: false,
-          isNew: 0
+          isNew: 0,
+          isStatus: false
         },
         allInfo: {
           // 合奏
           ischeck: false,
           value: "",
           checkBuy: false,
-          isNew: 0
+          isNew: 0,
+          isStatus: false
         },
         baseInfo: {
           // 基础
           ischeck: false,
           value: "",
           checkBuy: false,
-          isNew: 0
+          isNew: 0,
+          isStatus: false
         },
         holidayInfo: {
           // 假期
           ischeck: false,
           value: "",
           checkBuy: false,
-          isNew: 0
+          isNew: 0,
+          isStatus: false
         },
         networkInfo: {
           ischeck: false,
           value: "",
           checkBuy: false,
-          isNew: 0
+          isNew: 0,
+          isStatus: false
         },
         submit: {
           ischeck: false,
@@ -631,7 +642,8 @@ export default {
             value: "",
             checkBuy: true,
             nowValue: '',
-            isNew: 1
+            isNew: 1,
+            isStatus: false
           },
         }
       this.isInit = true;
@@ -681,6 +693,7 @@ export default {
                 this.checkList[i] = list[i]
               } else if (list[i] && list[i].isNew) {
                 this.newStudentList[i] = list[i]
+                console.log(this.newStudentList[i])
                 this.newStudentList[i].checkBuy = true
               }
             }
@@ -856,6 +869,7 @@ export default {
     gotoNext (num) {
       // 1.效验数据    判断是否数据正常=> 正常放入store存储
       //                       不正常=>  进行效验提示
+
       this.$refs["topinfo"].validate((valid, object) => {
         if (!valid) {
           this.$message.error("请填写建团必要参数");
@@ -895,7 +909,7 @@ export default {
             this.resetSubmit();
 
           } else {
-
+            // this.resetSubmit();
             this.$emit("chiosetab", num);
           }
         }

src/views/teamBuild/components/teamSoundMoney.vue

@@ -279,7 +279,7 @@
               <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 }}
+                价格:￥{{ courseScheduleInfo.soundInfo.value ? courseScheduleInfo.soundInfo.value : 0 }}
               </span>
             </div>
             <div class="option"
@@ -288,7 +288,7 @@
               <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 }}
+                价格:￥{{ courseScheduleInfo.allInfo.value ? courseScheduleInfo.allInfo.value : 0 }}
               </span>
             </div>
             <div class="option"
@@ -297,7 +297,7 @@
               <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 }}
+                价格:￥{{ courseScheduleInfo.holidayInfo.value ? courseScheduleInfo.holidayInfo.value : 0 }}
               </span>
             </div>
             <div class="option"
@@ -306,7 +306,7 @@
               <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 }}
+                价格:￥{{ courseScheduleInfo.networkInfo.value ? courseScheduleInfo.networkInfo.value : 0 }}
               </span>
             </div>
             <div class="option"
@@ -315,7 +315,7 @@
               <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 }}
+                价格:￥{{ courseScheduleInfo.baseInfo.value ? courseScheduleInfo.baseInfo.value : 0 }}
               </span>
             </div>
           </div>
@@ -325,8 +325,7 @@
                :class="[courseScheduleStatus?'lines':'']">
             <div class="option">
               <div class="o_bd"></div>
-              <span class="o_ft"
-                    style="font-size: 20px">现价￥{{ orderInfo.coursePrice }}</span>
+              <span class="o_ft">现价￥{{ orderInfo.coursePrice }}</span>
             </div>
           </div>
           <div class="coutInfo"
@@ -338,33 +337,33 @@
 
         <div class="section"
              v-if="newStudentfor.baseInfo.ischeck">
-          <h2 class="title line_bottom">新生专享</h2>
+          <h2 class="title">新生专享</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"
+              <div class="o_hd"><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 }}
+                价格:￥{{ newStudentfor.baseInfo.nowValue ? newStudentfor.baseInfo.nowValue : 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>
+              <div class="o_bd"></div>
               <!-- 以后要加课程这里得计算课程 -->
-              <span class="o_ft">￥{{ newStudentfor.baseInfo.nowValue }}</span>
+              <span class="o_ft">现价￥{{ newStudentfor.baseInfo.value }}</span>
             </div>
           </div>
         </div>
         <div class="section"
-             v-if="lookPreviewRow&&lookPreviewRow.goodsList.length > 0">
-          <h2 class="title line_bottom">乐器</h2>
+             v-if="lookPreviewRow&&lookPreviewRow.fangshi.length > 0">
+          <h2 class="title ">乐器</h2>
           <div class="options">
             <div v-for="(con, index) in lookPreviewRow.fangshi"
                  @click="instrumentF(con)"
@@ -379,15 +378,16 @@
                      :class="[ con.chiosetype=='GROUP'&&con.checked ? 'check_active' : '' ]"></i>
                 </div>
                 <div class="o_bd">{{ con.shopName }}</div>
-                <span class="o_ft">
-                  <del>原价:￥{{ con.mode.marketPrice }}</del>
-                  现价:￥{{ (con.mode.price - con.mode.GROUP).toFixed(2) }}
+                <span class="nowPrice">
+                  价格:<del>￥{{ con.mode.marketPrice }}</del>
+                  <!-- <del></del> -->
+                  <!-- 现价:￥{{ (con.mode.price - con.mode.GROUP).toFixed(2) }} -->
                 </span>
               </div>
               <!--   v-if="con.marketPrice" -->
               <div v-if="con.mode.isGROUP"
                    class="configuration">
-                <div class="config">
+                <div class="config config_line">
                   <div class="title">
                     <span>配置参数</span>
                   </div>
@@ -398,6 +398,10 @@
                     </template>
                   </div>
                 </div>
+                <div class="nowMoney">
+                  <span class="title">现价</span> <span class="dot">￥</span>{{ (con.mode.price - con.mode.GROUP).toFixed(2) }}
+                </div>
+                <!-- // 现价 -->
               </div>
               <div class="option"
                    v-if="(con.mode.isLEASE)"
@@ -409,15 +413,16 @@
                 </div>
                 <div class="o_bd">{{ con.shopName }}</div>
                 <template>
-                  <span class="o_ft">
+                  <!-- <span class="o_ft">
                     押金:￥{{ (con.mode.depositFee).toFixed(2) }}
-                  </span>
+                  </span> -->
                 </template>
+
               </div>
               <!--   v-if="con.marketPrice" -->
               <div class="configuration"
                    v-if="(con.mode.isLEASE)">
-                <div class="config">
+                <div class="config config_line">
                   <div class="title">
                     <span>配置参数</span>
                   </div>
@@ -429,7 +434,12 @@
                     </template>
                   </div>
                 </div>
+                <div class="nowMoney">
+                  <span class="title">押金</span> <span class="dot">￥:</span> {{ (con.mode.depositFee).toFixed(2) }}
+                </div>
               </div>
+
+              <!-- 免费 -->
               <div class="option"
                    v-if="con.mode.isFREE"
                    @click="con.chiosetype='FREE'">
@@ -440,16 +450,16 @@
                 </div>
                 <div class="o_bd">{{ con.shopName }}</div>
                 <template>
-                  <span class="o_ft">
-                    <del>原价:￥{{ con.mode.marketPrice }}</del>
-                    免费领用
+                  <span class="nowPrice">
+                    价格:<del>￥{{ con.mode.marketPrice }}</del>
+
                   </span>
                 </template>
               </div>
               <!--   v-if="con.marketPrice" -->
               <div class="configuration"
                    v-if="con.mode.isFREE">
-                <div class="config">
+                <div class="config config_line">
                   <div class="title">
                     <span>配置参数</span>
                   </div>
@@ -460,6 +470,10 @@
                          v-if="con.id == goods.id">{{ lookPreviewRow.goodsList[index].specification }}</p>
                     </template>
                   </div>
+
+                </div>
+                <div class="nowMoney">
+                  免费领用
                 </div>
               </div>
             </div>
@@ -469,8 +483,9 @@
         <div class="section"
              v-if="lookPreviewRow&&lookPreviewRow.markList&&lookPreviewRow.markList.length > 0"
              key="accessOries">
-          <h2 class="title line_bottom">辅件</h2>
+          <h2 class="title">辅件</h2>
           <div class="options"
+               style="padding:0 16px;"
                v-for="(instr, index) in lookPreviewRow.markList"
                :key="index"
                @click="onAuxiliarie(instr)">
@@ -481,16 +496,16 @@
               </div>
               <div class="o_bd">{{ instr.name }}</div>
               <span class="o_ft">
-                <!-- <del>原价:￥{{ instr.marketPrice }}</del> -->
+                <!-- <del>价格:￥{{ instr.marketPrice }}</del> -->
                 {{ instr.price == 0 ? '免费' : '现价:￥' + instr.price }}
               </span>
             </div>
             <div class="configuration">
-              <div class="config">
+              <div class="config config_other">
                 <div class="title">
                   <span>配置</span>
                 </div>
-                <div class="content"
+                <div class="content "
                      v-for="item in instr.goods"
                      :key="item">
                   <div class="option">
@@ -507,6 +522,7 @@
              key="accessOries">
           <h2 class="title line_bottom">辅件</h2>
           <div class="options"
+               style="padding:0 16px;"
                v-for="(instr, index) in accessGoods"
                :key="index">
             <div class="option">
@@ -516,7 +532,7 @@
               </div>
               <div class="o_bd">{{ instr.name }}</div>
               <span class="o_ft">
-                <del>原价:￥{{ instr.marketPrice }}</del>
+                <del>价格:￥{{ instr.marketPrice }}</del>
                 {{ instr.groupPurchasePrice == 0 ? '免费' : '现价:￥' + instr.groupPurchasePrice }}
               </span>
             </div>
@@ -528,6 +544,7 @@
              key="otherResult">
           <h2 class="title line_bottom">其它</h2>
           <div class="options"
+               style="padding:0 16px;"
                v-for="(base, index) in otherResult"
                :key="index">
             <div class="option">
@@ -536,12 +553,12 @@
               </div>
               <div class="o_bd">{{ base.name }}</div>
               <span class="o_ft">
-                <del>原价:￥{{ base.marketPrice }}</del>
+                <del>价格:￥{{ base.marketPrice }}</del>
                 {{ base.price == 0 ? '免费' : '现价:￥' + base.price }}
               </span>
             </div>
             <div class="configuration">
-              <div class="config">
+              <div class="config config_other">
                 <div class="title">
                   <span>配置</span>
                 </div>
@@ -571,7 +588,7 @@
               </div>
               <div class="o_bd">{{ base.name }}</div>
               <span class="o_ft">
-                <del>原价:￥{{ base.marketPrice }}</del>
+                <del>价格:￥{{ base.marketPrice }}</del>
                 {{ base.groupPurchasePrice == 0 ? '免费' : '现价:￥' + base.groupPurchasePrice }}
               </span>
             </div>
@@ -579,7 +596,7 @@
         </div>
         <div class="section">
           <div class="needprice markerprice">
-            <del>原价</del>
+            <del>价格</del>
             <del>￥{{ orderInfo.marketPrice }}</del>
           </div>
           <!-- <div class="needprice markerprice">
@@ -1044,7 +1061,6 @@ export default {
       this.topfor = this.$store.getters.topinfo;
       this.checkfor = this.$store.getters.checkinfo;
       this.newStudentfor = this.$store.getters.newStudentinfo
-      // 
       this.$nextTick(res => {
 
 
@@ -1053,6 +1069,15 @@ export default {
         for (let i in tempInfo) {
           if (tempInfo[i] && !tempInfo[i].isNew) {
             tempInfo[i].isStatus = true
+          } else {
+            tempInfo[i].isStatus = false
+          }
+        }
+        for (let i in this.newStudentfor) {
+          if (this.newStudentfor[i] && !this.newStudentfor[i].isNew) {
+            this.newStudentfor[i].isStatus = true
+          } else {
+            this.newStudentfor[i].isStatus = false
           }
         }
         this.courseScheduleInfo = tempInfo;
@@ -1987,8 +2012,25 @@ export default {
 // .el-table__body tr.current-row > td {
 //   background-color: #c6cbd4 !important;
 // }
-section {
-  padding: 0;
+.nowPrice {
+  color: #1a1a1a;
+  font-size: 16px;
+}
+.nowMoney {
+  height: 50px;
+  border-top: 1px solid #eaeaea;
+  border-bottom: 1px solid #eaeaea;
+  line-height: 50px;
+  text-align: right;
+  color: #ff0000;
+  font-size: 20px;
+  font-weight: bold;
+  .title {
+    font-size: 16px;
+  }
+  .dot {
+    font-size: 16px;
+  }
 }
 .el-checkbox__input.is-checked .el-checkbox__inner,
 .el-checkbox__input.is-indeterminate .el-checkbox__inner {
@@ -2230,7 +2272,7 @@ section {
   }
 
   .section {
-    padding: 16px 22px 10px;
+    padding: 16px 0 10px;
     background: #fff;
     margin-bottom: 10px;
     .line_bottom {
@@ -2241,6 +2283,7 @@ section {
       line-height: 28px;
       font-weight: bold;
       margin-bottom: 0px;
+      padding: 0px 16px;
       // padding-bottom: 5px;
       &::before {
         content: " ";
@@ -2270,7 +2313,7 @@ section {
       border-top: 1px solid #ededed;
       padding: 12px 16px 12px 31px;
       position: relative;
-      background-color: #ffe9d4;
+      // background-color: #ffe9d4;
       .trumpet_icon {
         width: 14px;
         height: 12px;
@@ -2287,8 +2330,9 @@ section {
   .options {
     padding-top: 8px;
     .oc {
+      padding: 0 16px;
       &:last-child {
-        border-top: 1px solid #ededed;
+        // border-top: 1px solid #ededed;
         margin-top: 8px;
         padding-top: 9px;
       }
@@ -2352,54 +2396,59 @@ section {
         top: 2px;
       }
       .check_default {
-        position: relative;
         margin-right: 8px;
         display: block;
-        width: 14px;
-        height: 14px;
+        width: 18px;
+        height: 18px;
+        background-color: #e9eaef;
         border-radius: 50%;
-        border: 1px solid #d0cfcf;
-        &::before {
-          position: absolute;
-          top: 1px;
-          left: 1px;
-          content: " ";
-          display: inline-block;
-          width: 10px;
-          height: 10px;
-          background: #d0cfcf;
-          border-radius: 50%;
-        }
         &.check_active {
-          border: 1px solid #f1111b;
-          &::before {
-            background: #f1111b;
-            border-radius: 50%;
-          }
+          background: url("../../../assets/images/icon_checkbox.png") 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: 12px;
-        padding: 0 4px;
+
+    .config {
+      min-height: 40px;
+    }
+    .config_line {
+      display: flex;
+      justify-content: space-between;
+      .content {
+        width: 70%;
+        text-align: right;
+      }
+      .title {
+        font-size: 14px;
+        color: #808080;
+        span {
+          padding-left: 26px;
+        }
+      }
+    }
+    .config_other {
+      .title {
+        background: rgba(246, 246, 246, 1);
+        height: 1px;
+        position: relative;
+        margin: 15px 0;
+        span {
+          position: absolute;
+          left: 12px;
+          top: -4px;
+          display: inline-block;
+          background-color: #fff;
+          font-size: 12px;
+          padding: 0 40px;
+        }
       }
     }
-
     .content {
       font-size: 12px;
       padding-left: 16px;
@@ -2417,6 +2466,7 @@ section {
       .option {
         font-size: 14px;
         color: #6f6f6f;
+        padding: 0;
       }
     }
   }