修改样式及bug

dist/css/chunk-52946d00.fa6bf40f.css → dist/css/chunk-986fe2ae.857eb7a9.css

@@ -1 +1 @@
-.register[data-v-a3af1c0e]{margin-bottom:.3rem}header[data-v-a3af1c0e]{height:.4rem;line-height:.4rem;color:#000;font-size:.17rem;background:#fff;-webkit-box-shadow:0 1px 8px 0 rgba(0,0,0,.07);box-shadow:0 1px 8px 0 rgba(0,0,0,.07);text-align:center;margin-bottom:.06rem}.banner[data-v-a3af1c0e]{font-size:0}.banner img[data-v-a3af1c0e]{width:100%}.reg-title[data-v-a3af1c0e]{padding:0 .12rem;position:relative;height:.4rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;color:#666;font-size:.14rem}.reg-title span[data-v-a3af1c0e]{color:#9b9b9b}.reg-title .card_icon[data-v-a3af1c0e]{display:inline-block;width:.23rem;height:.2rem;margin-right:.1rem;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAUCAYAAABmvqYOAAACFUlEQVRIS72TP2gTYRjGn+eOYKSm6uXUIbYglM7+WdxEHEVHwYKCOAnmNJqkLSjGQdqLreSSZtDBohQUxMlOKoog6OIoOghqGxThYhqkFM3dvZKUSpDr3Uml3/i+v/f5ft8LHxHh6Nb4kECZpoKaCDXXdfYsZEY/hY0yDGj3k1ZxjESfnc6d0CvXv0LkuH1u+HnYLLVyoVdVe7cHgeI6WQBDELyAwsMCnFQU9fVqM79cR5obPswxWSnWKEgFhgNfCPn2hxEOgEgEzginqZeLEvY8ADepKjMrnLieBWBviNBjJq1ii5QnES6IjAi4BcCPtnnTNvKbI09GALWyuZ/g1fUL7yld2xFn7FiQnKNwtpnOfQxifM21srmT4JnAl7syU88Mv2szWnWyj647BpG5emPpEgoFr1P/H2tJWuZtkqeWZXjUNnKPVg3fWhrvVxT1op+557kPGudHXnb3tIp5msJbAJoOuW9lXb7miYkJPRZzj/iFU1Ff1dPZ9+2ebpoJbGSGas8NcRYvC+Whq6hxel6qYeTvrWktumUeBPlMiFF6OADwjlCuAIjXjfwu33B9anIQnlPqNhfwft3I3+2uJafMQ/T4FAJbiFkhbEWQFWC+buT7fcO3VaubgKXd3UEtwfzC2exn3/BOUWoQEkQqMDzC5+sgyxKLA3/z7k+v9f3CyNs17TxMYt3C3wAyGGbzb31SiOpvlWIPRlUdpeMAAAAASUVORK5CYII=) no-repeat 50%;background-size:contain}.btn-group[data-v-a3af1c0e]{margin:.3rem .3rem 0}.btn-group .btn-submit[data-v-a3af1c0e]{background:#14928a;border-radius:1rem;color:#fff;font-size:.18rem}.van-cell[data-v-a3af1c0e]{font-size:.16rem;padding:.13rem .11rem}[data-v-a3af1c0e] .van-field--disabled .van-field__control{color:#444!important}.van-field__controll[data-v-a3af1c0e]{color:#323233}
+.register[data-v-33942d01]{margin-bottom:.3rem}header[data-v-33942d01]{height:.4rem;line-height:.4rem;color:#000;font-size:.17rem;background:#fff;-webkit-box-shadow:0 1px 8px 0 rgba(0,0,0,.07);box-shadow:0 1px 8px 0 rgba(0,0,0,.07);text-align:center;margin-bottom:.06rem}.banner[data-v-33942d01]{font-size:0}.banner img[data-v-33942d01]{width:100%}.reg-title[data-v-33942d01]{padding:0 .12rem;position:relative;height:.4rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;color:#666;font-size:.14rem}.reg-title span[data-v-33942d01]{color:#9b9b9b}.reg-title .card_icon[data-v-33942d01]{display:inline-block;width:.23rem;height:.2rem;margin-right:.1rem;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAUCAYAAABmvqYOAAACFUlEQVRIS72TP2gTYRjGn+eOYKSm6uXUIbYglM7+WdxEHEVHwYKCOAnmNJqkLSjGQdqLreSSZtDBohQUxMlOKoog6OIoOghqGxThYhqkFM3dvZKUSpDr3Uml3/i+v/f5ft8LHxHh6Nb4kECZpoKaCDXXdfYsZEY/hY0yDGj3k1ZxjESfnc6d0CvXv0LkuH1u+HnYLLVyoVdVe7cHgeI6WQBDELyAwsMCnFQU9fVqM79cR5obPswxWSnWKEgFhgNfCPn2hxEOgEgEzginqZeLEvY8ADepKjMrnLieBWBviNBjJq1ii5QnES6IjAi4BcCPtnnTNvKbI09GALWyuZ/g1fUL7yld2xFn7FiQnKNwtpnOfQxifM21srmT4JnAl7syU88Mv2szWnWyj647BpG5emPpEgoFr1P/H2tJWuZtkqeWZXjUNnKPVg3fWhrvVxT1op+557kPGudHXnb3tIp5msJbAJoOuW9lXb7miYkJPRZzj/iFU1Ff1dPZ9+2ebpoJbGSGas8NcRYvC+Whq6hxel6qYeTvrWktumUeBPlMiFF6OADwjlCuAIjXjfwu33B9anIQnlPqNhfwft3I3+2uJafMQ/T4FAJbiFkhbEWQFWC+buT7fcO3VaubgKXd3UEtwfzC2exn3/BOUWoQEkQqMDzC5+sgyxKLA3/z7k+v9f3CyNs17TxMYt3C3wAyGGbzb31SiOpvlWIPRlUdpeMAAAAASUVORK5CYII=) no-repeat 50%;background-size:contain}.btn-group[data-v-33942d01]{margin:.3rem .3rem 0}.btn-group .btn-submit[data-v-33942d01]{background:#14928a;border-radius:1rem;color:#fff;font-size:.18rem}.van-cell[data-v-33942d01]{font-size:.16rem;padding:.13rem .11rem}[data-v-33942d01] .van-field--disabled .van-field__control{color:#444!important}.van-field__controll[data-v-33942d01]{color:#323233}

src/App.vue

@@ -11,4 +11,7 @@
   -moz-osx-font-smoothing: grayscale;
   color: #444;
 }
+// /deep/.van-button__text {
+//     color: #269a93 !important;
+// }
 </style>

src/views/Home.vue

@@ -4,11 +4,14 @@
 
         <div class="section">
             <h2 class="title line_bottom">课程</h2>
-            <p class="indate" v-if="result.payMethod >= 26" key="indate-price"><span>现价:￥{{ result.classAmount }}</span></p>
+            <!-- <p class="indate" v-if="result.payMethod >= 26" key="indate-price"><span>现价:￥{{ result.classAmount }}</span></p> -->
             <div class="options" v-if="result.payMethod >= 26" key="class-list">
                 <div class="option">
                     <div class="0_hd"><i class="check_default check_active"></i></div>
                     <div class="o_bd">乐团声部训练</div>
+                    <span class="o_ft">
+                        现价:￥{{ result.classAmount }}
+                    </span>
                 </div>
                 <div class="option">
                     <div class="0_hd"><i class="check_default check_active"></i></div>
@@ -28,6 +31,7 @@
                 <div class="option">
                     <div class="0_hd"><i class="check_default check_active"></i></div>
                     <div class="o_bd">乐团课</div>
+                    
                     <span class="o_ft" v-if="result.payMethod == 21 || result.payMethod == 25" key="class-price">
                         <del>原价:￥23520</del> 现价:免费
                     </span>
@@ -45,7 +49,7 @@
         <div class="section">
             <h2 class="title line_bottom">乐器</h2>
 
-            <div class="options" v-if="result.payMethod == 21 || result.payMethod == 22 || result.payMethod > 26 || (result.payMethod == 25 && result.isCopperPipe == 1)">
+            <div class="options" v-if="result.payMethod == 21 || result.payMethod == 22 || result.payMethod > 26 || (result.payMethod == 25 && !result.isCopperPipe)">
                 <div v-for="(con, index) in instrument.config" :key="con.name" :class="[ instrument.config.length > 1 ? 'oc' : '' ]" @click="instrumentF(index)">
                     <div class="option">
                         <div class="o_"><i class="check_default" :class="[ con.checked ? 'check_active' : '' ]"></i></div>
@@ -58,7 +62,7 @@
 
                     <div class="configuration" v-if="con.marketPrice > 0">
                         <div class="config">
-                            <div class="title"><span>参数</span></div>
+                            <div class="title"><span>配置参数</span></div>
                             <div class="content">
                                 <p>{{ instrument.configuration }} {{ con.texture}}</p>
                             </div>
@@ -66,8 +70,7 @@
                     </div>
                 </div>
             </div>
-
-            <div class="options" v-if="(result.payMethod == 25 && result.isCopperPipe == 0) || result.payMethod == 26"> 
+            <div class="options" v-if="(result.payMethod == 25 && result.isCopperPipe) || result.payMethod == 26"> 
                 <div v-for="con in instrument.config" :key="con.name" class="oc" @click="instrumentF2('default', con)">
                     <div class="option" v-if="con.default">
                         <div class="o_"><i class="check_default" :class="[ con.checked ? 'check_active' : '' ]"></i></div>
@@ -86,7 +89,7 @@
 
                     <div class="configuration" v-if="con.default">
                         <div class="config">
-                            <div class="title"><span>参数</span></div>
+                            <div class="title"><span>配置参数</span></div>
                             <div class="content">
                                 <p>{{ instrument.configuration }} {{ con.texture}}</p>
                             </div>
@@ -136,10 +139,10 @@
 
          <div class="buy">
              <div class="price">
-                 <!-- <p class="oldprice">
+                 <p class="oldprice">
                      <del class="text">原价</del>
                      <del>￥{{ orderInfo.marketPrice }}</del>
-                 </p> -->
+                 </p>
                  <p class="now_price">
                      <span class="text">仅需支付</span>
                      <span>￥{{ orderInfo.referencePrice }}</span>
@@ -326,7 +329,8 @@ export default {
             if(!instrumentCount) {
                 Dialog.alert({
                     title: '提示',
-                    message: '请选择乐器准备方式'
+                    message: '请选择乐器准备方式',
+                    confirmButtonColor: '#269a93'
                 })
                 return false
             }
@@ -338,7 +342,8 @@ export default {
                 } else {
                     Dialog.alert({
                         title: '提示',
-                        message: result.msg
+                        message: result.msg,
+                        confirmButtonColor: '#269a93'
                     })
                 }
             })
@@ -358,8 +363,16 @@ export default {
         },
         protocol() {
             // 协议
+            // let tempMark = 0 // 临时原价数据
+            // this.instrument.config.forEach(config => {
+            //     if(config.checked) {
+            //         tempMark = config.marketPrice
+            //     }
+            // })
+
             let r = this.result
             let protocol = {
+                // marketPrice: tempMark, // 原价
                 patriarchName: r.patriarchName,
                 patriarchPhone: r.patriarchPhone,
                 stuName: r.stuName,
@@ -438,7 +451,7 @@ export default {
                         // 1.5 版本  免费领用乐器  
                         // 3.0 版本 押金800
                         if(version == 25) {
-                            if(this.result.isCopperPipe == 1) {
+                            if(!this.result.isCopperPipe) {
                                 amountSummary.rInstrument = parseInt(config[i].referencePrice)
                             } else {
                                 amountSummary.rInstrument = 0
@@ -523,15 +536,15 @@ export default {
                 background: #14928a;
                 display: inline-block;
                 margin-right: .07rem;
+                border-radius: 8px;
             }
         }
         .indate {
-            font-size: .12rem;
+            font-size: .14rem;
             padding: .06rem 0;
             display: flex;
             // justify-content: space-between;
             justify-content: flex-end;
-            border-bottom: 1px solid #ededed;
             span {
                 color: #FA101D;
             }
@@ -584,23 +597,38 @@ export default {
                 }
             }
             .o_ft {
-                font-size: .12rem;
+                font-size: .14rem;
                 color: #FA101D;
                 del {
                     color: #AAAAAA;
-                    font-size: .11rem;
+                    font-size: .12rem;
                 }
             }
             .check_default {
+                position: relative;
                 margin-right: .08rem;
                 display: block;
                 width: .14rem;
                 height: .14rem;
-                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;
+                border-radius: 50%;
+                border: .01rem solid #D0CFCF;
+                &::before {
+                    position: absolute;
+                    top: .01rem;
+                    left: .01rem;
+                    content: ' ';
+                    display: inline-block;
+                    width: .12rem;
+                    height: .12rem;
+                    background: #D0CFCF;
+                    border-radius: 50%;
+                }
                 &.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;
+                    border: .01rem solid #F1111B;
+                    &::before {
+                        background: #F1111B;
+                        border-radius: 50%;
+                    }
                 }
             }
         }
@@ -620,7 +648,7 @@ export default {
                 top: -.09rem;
                 display: inline-block;
                 background-color: #fff;
-                font-size: .1rem;
+                font-size: .12rem;
                 padding: 0 .04rem;
             }
         }

src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="login">
         <div class="logo">
-            <img src="../assets/logo.png" alt="">
+            <img src="../assets/logo.png" style="width: 1.25rem;" alt="">
         </div>
         <div class="bandSection">
             <div class="school">
@@ -14,7 +14,7 @@
         </div>
 
         <div class="btn-group">
-            <van-button size="large" @click="onSubmit" class="btn">报名 / 查询进度</van-button>
+            <van-button size="large" @click="onSubmit" class="btn">{{ dataList.status == 2 ? '缴费' : '报名 / 查询进度' }}</van-button>
             <!-- <van-button size="large" class="btn">查询进度</van-button> -->
         </div>
 
@@ -82,7 +82,8 @@ export default {
                         if(parseInt(result.data.pushStatus) == 1) {
                             Dialog.alert({
                                 title: '提示',
-                                message: '恭喜您，报名成功'
+                                message: '恭喜您，报名成功',
+                                confirmButtonColor: '#269a93'
                             })
                         } else if(parseInt(result.data.pushStatus) == 2 && parseInt(result.data.status)  == 0) {
                             this.$router.push({
@@ -99,7 +100,8 @@ export default {
                         if(dataStatus >= 2) {
                             Dialog.alert({
                                 title: '提示',
-                                message: '报名已截止'
+                                message: '报名已截止，请联系教务老师',
+                                confirmButtonColor: '#269a93'
                             })
                         } else {
                             this.$router.push({
@@ -118,7 +120,8 @@ export default {
                 } else {
                     Dialog.alert({
                         title: '提示',
-                        message: result.msg
+                        message: result.msg,
+                        confirmButtonColor: '#269a93'
                     })
                 }
             })
@@ -234,8 +237,6 @@ export default {
         border: 0;
         color: #009688;
         font-size: .14rem;
-        // height: .2rem;
-        // line-height: .2rem;
         &:active::before {
             opacity: 0;
         }

src/views/payment.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="payment">
-        <header>乐团注册</header>
+        <header>课程缴费</header>
 
         <div class="section">
             <h2 class="title line_bottom">课程</h2>
@@ -187,7 +187,8 @@ export default {
             if(!record) {
                 Dialog.alert({
                     title: '提示',
-                    message: '请选择续费课程'
+                    message: '请选择续费课程',
+                    confirmButtonColor: '#269a93'
                 })
                 return false
             }
@@ -212,7 +213,8 @@ export default {
                 } else {
                     Dialog.alert({
                         title: '提示',
-                        message: result.msg
+                        message: result.msg,
+                        confirmButtonColor: '#269a93'
                     })
                 }
             })
@@ -352,6 +354,7 @@ header {
             background: #14928a;
             display: inline-block;
             margin-right: .07rem;
+            border-radius: 8px;
         }
     }
 }
@@ -380,15 +383,30 @@ header {
             }
         }
         .check_default {
+            position: relative;
             margin-right: .08rem;
             display: block;
             width: .14rem;
             height: .14rem;
-            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;
+            border-radius: 50%;
+            border: .01rem solid #D0CFCF;
+            &::before {
+                position: absolute;
+                top: .01rem;
+                left: .01rem;
+                content: ' ';
+                display: inline-block;
+                width: .12rem;
+                height: .12rem;
+                background: #D0CFCF;
+                border-radius: 50%;
+            }
             &.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;
+                border: .01rem solid #F1111B;
+                &::before {
+                    background: #F1111B;
+                    border-radius: 50%;
+                }
             }
         }
     }

src/views/protocol.vue

@@ -23,14 +23,14 @@
                 </div>
             </div>  	                   
             
-            为了促进学校乐团健康、持续发展，让更多的学生在校园拥有良好的器乐学习机会，甲方基于公益普惠的原则，决定提供价值****元的KEY品牌全新乐器供乙方在学校乐团期间免费使用。现根据《中华人民共和国合同法》等法律法规规定，为明确甲乙双方权利义务，经协商一致，就乙方借用乐器事宜达成如下协议：
+            为了促进学校乐团健康、持续发展，让更多的学生在校园拥有良好的器乐学习机会，甲方基于公益普惠的原则，决定提供价值{{ proto.marketPrice }}元的KEY品牌全新乐器供乙方在学校乐团期间免费使用。现根据《中华人民共和国合同法》等法律法规规定，为明确甲乙双方权利义务，经协商一致，就乙方借用乐器事宜达成如下协议：
             <h2>一、甲方权利与义务：</h2>
             1、乙方所借用的乐器为甲方资产，乐器所有权归属甲方所有，甲方有权在必要时向乙方收回借用乐器并退还押金。<br/>
             2、甲方所提供乐器为全新的KEY品牌乐器。在乙方签订本协议、交纳乐器使用押金后，甲方即将乐器交付给乙方供其在学校乐团期间免费使用。<br/>
             3、乙方归还乐器时，双方当面当场验收，经甲方维修技师检验确认乐器无人为损坏、可正常使用后，甲方在七个工作日内全额不计息退还乙方已交纳的押金。<br/>
             4、如乙方已购买甲方乐器保养服务，甲方需在乙方借用期间协助乙方处理乐器维修和保养问题。
             <h2>二、乙方权利与义务：</h2>
-            1、乙方在签订本协议、交纳乐器使用押金￥800元（大写人民币捌佰元整）后，享有所借用乐器在学校乐团期间的免费使用权。乙方应当爱惜乐器并妥善保管，不得将该乐器转租、借用、出售、典当、质押或抵押，也不得将乐器交于非专业人士使用。乐器借用政策，每位团员仅可享受一次，退团后再次加入乐团的，将无法享受乐器借用政策。<br/>
+            1、乙方在签订本协议、交纳乐器使用押金￥{{ proto.payMethod == 25 ? 0 : 800}}元（大写人民币{{ proto.payMethod == 25 ? '零' : '捌佰'}}元整）后，享有所借用乐器在学校乐团期间的免费使用权。乙方应当爱惜乐器并妥善保管，不得将该乐器转租、借用、出售、典当、质押或抵押，也不得将乐器交于非专业人士使用。乐器借用政策，每位团员仅可享受一次，退团后再次加入乐团的，将无法享受乐器借用政策。<br/>
             2、乐器日常维护由乙方自行完成，每次练习完毕后需按老师要求对乐器进行擦拭并装箱保管。如因人为原因（包括但不限于磕、碰、摔等）造成乐器损坏的，乙方需自行承担维修费用；如因非甲方原因导致乐器无法正常使用（正常使用磨损除外）或乐器毁损、灭失、遗失的，乙方须按本协议中明示的乐器团购价格进行赔付。<br/>
             3、当乙方决定不再继续乐团学习时，应在退团之日起1日内将其借用的乐器归还甲方，双方当面当场验收，经甲方维修技师检验确认乐器无人为损坏、可正常使用后，乙方可按照本协议约定获得已交纳的押金；经甲方维修技师检验，乐器存在损坏的，乙方应承担相应的维修费用，如乐器已经无法正常使用的，乙方须按本协议中明示的乐器团购价格进行赔付，甲方有权从应退还乙方的押金中先行扣除维修费用、赔付费用，如甲方扣除押金后仍然不足以弥补维修费用、赔付费用的，甲方有权继续要求乙方支付剩余费用。<br/>
             4、乙方终止乐团学习2个月内，仍未将乐器归还给甲方的，则视为乙方违约，乙方所交押金甲方有权不予退还，同时乙方须按乐器团购价格进行赔付。

src/views/register.vue

@@ -14,6 +14,7 @@
             <van-cell title="性别" v-model="stu.sex" @click="onChange('sex')" is-link value="请选择"></van-cell>
             <van-cell title="生日" v-model="stu.birthday" @click="birthdayStatus = true" is-link value="请选择"></van-cell>
             <van-field label="城市" disabled="true" placeholder="" v-model="stu.city"></van-field>
+            <van-cell title="学校" v-model="stu.school" @click="onChange('school')" is-link value="请选择"></van-cell>
             <van-cell title="年级" v-model="stu.class" @click="onChange('class')" is-link value="请选择"></van-cell>
             <van-field label="班级" placeholder="请输入班级" v-model="stu.grade"></van-field>
         </van-cell-group>
@@ -80,6 +81,7 @@ export default {
                 sex: '请选择', // 性别
                 birthday: '请选择', // 生日
                 city: '请选择', // 城市
+                school: '请选择', // 学校
                 class: '请选择', // 年级
                 grade: '', // 班级
                 major: '请选择', // 专业
@@ -98,6 +100,11 @@ export default {
             sheetActions: [], // 上拉列表数据展示
             dataList: { // 上拉列表数据列表
                 sex: [{ name: '男', index: 0 }, {name: '女', index: 1}],
+                school: [
+                    { name: '小学' },
+                    { name: '初中' },
+                    { name: '高中' },
+                ],
                 class: [
                     { name: '一年级' },
                     { name: '二年级' },
@@ -188,7 +195,7 @@ export default {
                 subId: this.stuIndex.subNo,
                 branchId: params.branchId,
                 schoolId: params.schoolId,
-                grade: s.class,
+                grade:  s.school + s.class,
                 gClass: s.grade,
                 isAdjust: this.stuIndex.adjustNo,
                 patriarchPhone: s.phone,
@@ -199,7 +206,8 @@ export default {
                 if(result.code == 200) {
                     Dialog.alert({
                         title: '提示',
-                        message: '恭喜您，已报名成功'
+                        message: '恭喜您，已报名成功',
+                        confirmButtonColor: '#269a93'
                     }).then(() => {
                         // 跳转到登录页面
                         this.$router.push({ path: 'login', query: {
@@ -219,6 +227,7 @@ export default {
                 name: '请输入姓名',
                 sex: '请选择性别', // 性别
                 birthday: '请选择生日', // 生日
+                school: '请选择学校', // 学校
                 class: '请选择年级', // 年级
                 grade: '请输入班级', // 班级
                 major: '请选择专业', // 专业

vue.config.js

@@ -9,7 +9,7 @@ module.exports = {
             '/user': {
                 target: 'https://pay.dayaedu.com',
                 // target: 'http://192.168.3.27:8005',
-                // target: 'http://192.168.3.28:9000',
+                // target: 'http://192.168.3.27:9000',
                 changeOrigin: true,
                 ws: true,
                 '^/user': '/user',