Etusivu Tutki Apua
Kirjaudu sisään
lex
/
wxdaya
1
0
Fork 0
Tiedostot Ongelmat 0 Pull-pyynnöt 0 Wiki
Selaa lähdekoodia

修改bug

lex-xin 5 vuotta sitten
vanhempi
e86d847d92
commit
f14665fbf7
28 muutettua tiedostoa jossa 158 lisäystä ja 77 poistoa
Jaettu näkymä Näytä diff tilastot
  1. BIN
      dist.zip
  2. 0 0
      dist/css/app.3a958c17.css
  3. 0 0
      dist/css/chunk-1dc9a788.dade014f.css
  4. 1 1
      dist/css/chunk-52946d00.fa6bf40f.css
  5. 0 0
      dist/index.html
  6. 0 0
      dist/js/app.1b957136.js
  7. 0 0
      dist/js/app.1b957136.js.map
  8. 0 0
      dist/js/app.b62fe834.js
  9. 0 0
      dist/js/app.b62fe834.js.map
  10. 0 0
      dist/js/chunk-1dc9a788.9781f7b8.js
  11. 0 0
      dist/js/chunk-1dc9a788.9781f7b8.js.map
  12. 0 0
      dist/js/chunk-52946d00.f5147093.js
  13. 0 0
      dist/js/chunk-52946d00.f5147093.js.map
  14. 0 0
      dist/js/chunk-618edccf.271d087c.js
  15. 0 0
      dist/js/chunk-618edccf.271d087c.js.map
  16. 0 0
      dist/js/chunk-8caa900e.8fda8697.js
  17. 0 0
      dist/js/chunk-8caa900e.8fda8697.js.map
  18. 1 1
      public/index.html
  19. 35 35
      src/assets/front_instruments_config.js
  20. 0 0
      src/assets/publicMethods.js
  21. 1 1
      src/router.js
  22. 52 5
      src/views/Home.vue
  23. 22 10
      src/views/login.vue
  24. 32 2
      src/views/payment.vue
  25. 2 8
      src/views/protocol.vue
  26. 6 5
      src/views/register.vue
  27. 1 4
      src/views/smallProtocol.vue
  28. 5 5
      vue.config.js

BIN
dist.zip
Näytä tiedosto


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/css/app.3a958c17.css


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/css/chunk-1dc9a788.dade014f.css


+ 1 - 1
dist/css/chunk-8caa900e.10619da1.css → dist/css/chunk-52946d00.fa6bf40f.css
Näytä tiedosto 

@@ -1 +1 @@
 
-.register[data-v-1666c572]{margin-bottom:.3rem}header[data-v-1666c572]{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-1666c572]{font-size:0}.banner img[data-v-1666c572]{width:100%}.reg-title[data-v-1666c572]{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-1666c572]{color:#9b9b9b}.reg-title .card_icon[data-v-1666c572]{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-1666c572]{margin:.3rem .3rem 0}.btn-group .btn-submit[data-v-1666c572]{background:#14928a;border-radius:1rem;color:#fff;font-size:.18rem}.van-cell[data-v-1666c572]{font-size:.16rem;padding:.13rem .11rem}.van-field__controll[data-v-1666c572]{color:#323233}
 
+.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}

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/index.html


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/js/app.1b957136.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/js/app.1b957136.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/js/app.b62fe834.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/js/app.b62fe834.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/js/chunk-1dc9a788.9781f7b8.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/js/chunk-1dc9a788.9781f7b8.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/js/chunk-52946d00.f5147093.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/js/chunk-52946d00.f5147093.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/js/chunk-618edccf.271d087c.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/js/chunk-618edccf.271d087c.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/js/chunk-8caa900e.8fda8697.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/js/chunk-8caa900e.8fda8697.js.map


+ 1 - 1
public/index.html
Näytä tiedosto 

@@ -3,7 +3,7 @@
 
   <head>
 
     <meta charset="utf-8">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 
     <!-- <link rel="icon" href="<%= BASE_URL %>favicon.ico"> -->
 
     <title>大雅乐盟乐团助手</title>
 
     <style>html{background: #f5f5f5;min-height: 100vh;color:#444;overflow-y:scroll;overflow-x:hidden;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-size:100px;-webkit-font-smoothing:antialiased;-webkit-overflow-scrolling:touch}.link,.link:hover,.link:visited,a{color:#333}body,html{font-family:"PingFang SC","Heiti SC","SF UI Text","Helvetica Neue",Roboto,"Droid Sans Fallback",arial,sans-serif;font-weight:normal}body{font-size:.12rem;line-height:1.5}*{margin:0;padding:0;outline:0;-webkit-text-size-adjust:none;-webkit-tap-highlight-color:transparent}input,select,textarea{font-size:100%}table{border-collapse:collapse;border-spacing:0}img{border:0}del{text-decoration:line-through}.link:active,a{text-decoration:none}ol,ul{list-style:none}caption,th{text-align:left}h1,h2,h3,h4,h5,h6{font-weight:500}h1{font-size:.36rem}h2{font-size:.28rem}h3{font-size:.24rem}h4{font-size:.2rem;line-height:.26rem}h5{font-size:.18rem;line-height:.24rem}h6{font-size:.16rem;line-height:.2rem}q:after,q:before{content:''}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}.link:active{color:#e61414}ins,u{text-decoration:underline;text-decoration-color:#eee}</style>

+ 35 - 35
src/assets/front_instruments_config.js
Näytä tiedosto 

@@ -44,21 +44,21 @@ let instruments = {
 
                 name: '节拍器',
 
                 marketPrice: 120,
 
                 referencePrice: 95,
 
-                checked: false,
 
+                checked: true,
 
                 index: 1
 
             },
 
             {
 
                 name: '谱架',
 
                 marketPrice: 80,
 
                 referencePrice: 65,
 
-                checked: false,
 
+                checked: true,
 
                 index: 2
 
             },
 
             {
 
                 name: '乐器维护',
 
                 marketPrice: 480,
 
                 referencePrice: 300,
 
-                checked: false,
 
+                checked: true,
 
                 index: 8
 
             }
 
         ]
 
@@ -99,35 +99,35 @@ let instruments = {
 
                 index: 1,
 
                 name: '节拍器',
 
                 marketPrice: 120,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 95
 
             },
 
             {
 
                 index: 2,
 
                 name: '谱架',
 
                 marketPrice: 80,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 65
 
             },
 
             {
 
                 index: 4,
 
                 name: '软木膏',
 
                 marketPrice: 30,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 25
 
             },
 
             {
 
                 index: 5,
 
                 name: '哨片',
 
                 marketPrice: 150,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 120
 
             },
 
             {
 
                 index: 8,
 
                 name: '乐器维护',
 
                 marketPrice: 480,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 300
 
             }
 
         ]
 
@@ -168,35 +168,35 @@ let instruments = {
 
                 index: 1,
 
                 name: '节拍器',
 
                 marketPrice: 120,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 95
 
             },
 
             {
 
                 index: 2,
 
                 name: '谱架',
 
                 marketPrice: 80,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 65
 
             },
 
             {
 
                 index: 4,
 
                 name: '软木膏',
 
                 marketPrice: 30,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 25
 
             },
 
             {
 
                 index: 5,
 
                 name: '哨片',
 
                 marketPrice: 150,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 120
 
             },
 
             {
 
                 index: 8,
 
                 name: '乐器维护',
 
                 marketPrice: 480,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 300
 
             }
 
         ]
 
@@ -228,35 +228,35 @@ let instruments = {
 
                 index: 1,
 
                 name: '节拍器',
 
                 marketPrice: 120,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 95
 
             },
 
             {
 
                 index: 2,
 
                 name: '谱架',
 
                 marketPrice: 80,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 65
 
             },
 
             {
 
                 index: 3,
 
                 name: '活塞油',
 
                 marketPrice: 30,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 25
 
             },
 
             {
 
                 index: 7,
 
                 name: '调音管油',
 
                 marketPrice: 30,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 25
 
             },
 
             {
 
                 index: 8,
 
                 name: '乐器维护',
 
                 marketPrice: 480,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 300
 
             }
 
         ]
 
@@ -288,35 +288,35 @@ let instruments = {
 
                 index: 1,
 
                 name: '节拍器',
 
                 marketPrice: 120,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 95
 
             },
 
             {
 
                 index: 2,
 
                 name: '谱架',
 
                 marketPrice: 80,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 65
 
             },
 
             {
 
                 index: 3,
 
                 name: '活塞油',
 
                 marketPrice: 30,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 25
 
             },
 
             {
 
                 index: 6,
 
                 name: '拉杆油',
 
                 marketPrice: 30,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 25
 
             },
 
             {
 
                 index: 8,
 
                 name: '乐器维护',
 
                 marketPrice: 480,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 300
 
             }
 
         ]
 
@@ -348,35 +348,35 @@ let instruments = {
 
                 index: 1,
 
                 name: '节拍器',
 
                 marketPrice: 120,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 95
 
             },
 
             {
 
                 index: 2,
 
                 name: '谱架',
 
                 marketPrice: 80,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 65
 
             },
 
             {
 
                 index: 3,
 
                 name: '活塞油',
 
                 marketPrice: 30,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 25
 
             },
 
             {
 
                 index: 7,
 
                 name: '调音管油',
 
                 marketPrice: 30,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 25
 
             },
 
             {
 
                 index: 8,
 
                 name: '乐器维护',
 
                 marketPrice: 480,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 300
 
             }
 
         ]
 
@@ -408,35 +408,35 @@ let instruments = {
 
                 index: 1,
 
                 name: '节拍器',
 
                 marketPrice: 120,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 95
 
             },
 
             {
 
                 index: 2,
 
                 name: '谱架',
 
                 marketPrice: 80,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 65
 
             },
 
             {
 
                 index: 3,
 
                 name: '活塞油',
 
                 marketPrice: 30,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 25
 
             },
 
             {
 
                 index: 7,
 
                 name: '调音管油',
 
                 marketPrice: 30,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 25
 
             },
 
             {
 
                 index: 8,
 
                 name: '乐器维护',
 
                 marketPrice: 480,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 300
 
             }
 
         ]
 
@@ -468,14 +468,14 @@ let instruments = {
 
                 index: 1,
 
                 name: '节拍器',
 
                 marketPrice: 120,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 95
 
             },
 
             {
 
                 index: 2,
 
                 name: '谱架',
 
                 marketPrice: 80,
 
-                checked: false,
 
+                checked: true,
 
                 referencePrice: 65
 
             }
 
         ]

+ 0 - 0
src/assets/publicMethods.js
Näytä tiedosto


+ 1 - 1
src/router.js
Näytä tiedosto 

@@ -6,7 +6,7 @@ import Login from './views/login.vue'
 
 Vue.use(Router)
 
 
 export default new Router({
 
-    mode: 'history',
 
+    // mode: 'history',
 
     base: process.env.BASE_URL,
 
     routes: [
 
         {

+ 52 - 5
src/views/Home.vue
Näytä tiedosto 

@@ -136,10 +136,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>
 
@@ -221,6 +221,31 @@ export default {
 
                 })
 
             }
 
 
+            let homeConfig = sessionStorage.getItem('homeConfig')
 
+            if(homeConfig) {
 
+                homeConfig = JSON.parse(homeConfig)
 
+
 
+                this.instrument.config.forEach(config => {
 
+                    if(config.index == homeConfig.config) {
 
+                        config.checked = true
 
+                    } else {
 
+                        config.checked = false
 
+                    }
 
+                })
 
+
 
+                let auxArr = homeConfig.auxiliaries.split(',')
 
+                this.instrument.auxiliaries.forEach(aux => {
 
+                    aux.checked = false
 
+                    auxArr.forEach(a => {
 
+                        if(aux.index == parseInt(a)) {
 
+                            aux.checked = true
 
+                        }
 
+                    })
 
+                })
 
+
 
+                sessionStorage.removeItem('homeConfig') // 用完就不要了
 
+            }
 
+
 
             // 初始化计算金额
 
             this.calcPrice()
 
         })
 
@@ -263,7 +288,6 @@ export default {
 
         },
 
         buy() {
 
             // 确认购买
 
-            //   console.log('buy')
 
             let params = this.$route.query
 
             let resultParams = {
 
                 branchId: params.branchId,
 
@@ -278,13 +302,36 @@ export default {
 
                 resultParams.instrument = iI
 
             }
 
             // 辅件是否有选中的
 
+            let auxiliarieIndexArr // 辅件列表索引
 
             if(this.orderInfo.auxiliarie) {
 
-                resultParams.adjunct = this.orderInfo.auxiliarie
 
+                resultParams.adjunct = auxiliarieIndexArr = this.orderInfo.auxiliarie
 
             }
 
+            
+            // 判断乐器是否有选中
 
+            let instrumentCount = 0
 
+            let configIndex // 选中乐器的索引值
 
+            this.instrument.config.forEach(config => {
 
+                if(config.checked) {
 
+                    instrumentCount++
 
+                    configIndex = config.index
 
+                }
 
+            })
 
+
 
+            // 保存用户选择信息保存本地
 
+            sessionStorage.setItem('homeConfig', JSON.stringify({
 
+                config: configIndex,
 
+                auxiliaries: auxiliarieIndexArr 
+            }))
 
 
+            if(!instrumentCount) {
 
+                Dialog.alert({
 
+                    title: '提示',
 
+                    message: '请选择乐器准备方式'
 
+                })
 
+                return false
 
+            }
 
             axios.post('/yqpay/toPay', qs.stringify(resultParams)).then((res) => { 
                 let result = res.data
 
-                console.log(result.data)
 
                 if(result.data) {
 
                     this.form = result.data
 
                     this.onSubmit()

+ 22 - 10
src/views/login.vue
Näytä tiedosto 

@@ -45,6 +45,7 @@ export default {
 
             popupStatus: false,
 
             popupText: '',
 
             dataList: {
 
+                status: null,
 
                 schoolName: '', // 乐团名称
 
                 phoneNumber: '', // 手机号
 
                 branchId: '', // 分部编号
 
@@ -61,10 +62,13 @@ export default {
 
             let result = response.data
 
             this.dataList.schoolName = result.data.name
 
             this.dataList.branchId = result.data.branchId
 
+            this.dataList.status = result.data.status
 
         })
 
     },
 
     methods: {
 
         onSubmit() {
 
+            let dataStatus = this.dataList.status
 
+
 
             if(!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.dataList.phoneNumber))){ 
                 Toast('手机号输入有误')
 
                 return false; 
@@ -92,16 +96,24 @@ export default {
 
                         }
 
                         
                     } else {
 
-                        this.$router.push({
 
-                            path: 'register',
 
-                            query: {
 
-                                phone: this.dataList.phoneNumber,
 
-                                cityId: params.cityId,
 
-                                classId: params.classId,
 
-                                schoolId: params.schoolId,
 
-                                branchId: this.dataList.branchId
 
-                            }
 
-                        })
 
+                        if(dataStatus >= 2) {
 
+                            Dialog.alert({
 
+                                title: '提示',
 
+                                message: '报名已截止'
 
+                            })
 
+                        } else {
 
+                            this.$router.push({
 
+                                path: 'register',
 
+                                query: {
 
+                                    phone: this.dataList.phoneNumber,
 
+                                    cityId: params.cityId,
 
+                                    classId: params.classId,
 
+                                    schoolId: params.schoolId,
 
+                                    branchId: this.dataList.branchId
 
+                                }
 
+                            })
 
+                        }
 
+                        
                     }
 
                 } else {
 
                     Dialog.alert({

+ 32 - 2
src/views/payment.vue
Näytä tiedosto 

@@ -47,7 +47,7 @@
 
                     <div class="ct_button_group">
 
                         <span @click="fixationTimer(t, c)" v-for="t in classTimer" :key="t.timer" :class="[t.status?'active':'']">{{ t.timer }}次</span>
 
                     </div>
 
-                    <input type="number" placeholder="输入次数" @keyup="calcAmount(c)" v-model="c.inputNumber" class="inputTime" pattern="[0-9]">
 
+                    <input type="number" placeholder="输入次数" min="1" max="100" @keyup="onInputCheck(c)" v-model="c.inputNumber" class="inputTime" pattern="[0-9]">
 
                 </div>
 
             </div>
 
         </div>
 
@@ -114,6 +114,12 @@ export default {
 
                 throw '数据为空'
 
             }
 
             let subjectStatus = false // 过滤数据 乐团课只需要显示一条数据
 
+
 
+            let paymentConfig = sessionStorage.getItem('paymentConfig')
 
+            if(paymentConfig) {
 
+                paymentConfig = JSON.parse(paymentConfig)
 
+                sessionStorage.removeItem('homeConfig') // 用完就不要了
 
+            }
 
             data.forEach(el => {
 
                 el.status = false // 状态
 
                 el.inputNumber = null // 输入的内容
 
@@ -130,6 +136,11 @@ export default {
 
                 if(el.classType == 1) {
 
                     this.classInfo.push(el)
 
                 }
 
+
 
+                // 
+                if(paymentConfig && paymentConfig.config == el.courseId) {
 
+                    el.status = true
 
+                }
 
                 
             })
 
             this.calcAmount() // 计算金额
 
@@ -147,6 +158,8 @@ export default {
 
                 }
 
             })
 
             let cour = {}
 
+            let configIndex, inputCount // 课程编号（唯一）  输入的次数
 
+            // 拼接参数
 
             this.classInfo.forEach(c => {
 
                 if(c.classType == 2 && c.status) {
 
                    cour = {
 
@@ -167,6 +180,7 @@ export default {
 
                 }
 
                 if(c.status) {
 
                     record++
 
+                    configIndex = c.courseId
 
                 }
 
             })
 
             params.courses = JSON.stringify(cour)
 
@@ -178,6 +192,11 @@ export default {
 
                 return false
 
             }
 
 
+            // 保存用户选择信息保存本地
 
+            sessionStorage.setItem('paymentConfig', JSON.stringify({
 
+                config: configIndex
 
+            }))
 
+
 
             axios.post('/yqpay/renewalsPay', qs.stringify(params)).then(res => {
 
                 let result = res.data
 
                 if(result.status) {
 
@@ -205,7 +224,7 @@ export default {
 
                 if(e.status) {
 
                     buyTimer = e.timer
 
                 }
 
-            })
 
+            })  
             if(item.classType == 1 && !item.status) {
 
                 let tempBuyCount = buyTimer ? buyTimer : item.inputNumber
 
                 this.protocolData = {
 
@@ -219,6 +238,8 @@ export default {
 
                 this.popupStatus = true
 
             }
 
 
+            
+
 
             this.classInfo.forEach(e => {
 
                 e.status = false
 
             })
 
@@ -239,6 +260,15 @@ export default {
 
                 this.orderInfo.referencePrice = amount
 
             }
 
         },
 
+        onInputCheck(item) {
 
+            if(item.inputNumber <= 1 ) {
 
+                item.inputNumber = 1
 
+            }
 
+            if(item.inputNumber > 100) {
 
+                item.inputNumber = 100
 
+            }
 
+            this.calcAmount(item)
 
+        },
 
         // 计算总金额
 
         calcAmount(item) {
 
             let timer, c = this.classInfo

+ 2 - 8
src/views/protocol.vue
Näytä tiedosto 

@@ -66,7 +66,7 @@
 
 
             <div class="signature">
 
                 <span>甲方签章 <img class="cachet" src="../assets/cachet.png" alt=""> </span>
 
-                <span>乙方签字：</span>
 
+                <span>乙方签字：{{ proto.stuName }}</span>
 
             </div>
 
 
             <div class="btnback" @click="goBack">我同意</div>
 
@@ -96,16 +96,10 @@ export default {
 
         }
 
     },
 
     mounted() {
 
-        console.log(true)
 
-        // this.protocol = JSON.parse(this.$route.query.protocol)
 
-        // this.protocol = proto
 
-        window.scroll(0,0)
 
+        // window.scroll(0,0)
 
     },
 
     methods: {
 
         goBack() {
 
-            // this.$router.push({ path: '/home' })
 
-            // history.go(-1)
 
-            // console.log(true)
 
             this.$emit('popupClose', false)
 
         }
 
     }

+ 6 - 5
src/views/register.vue
Näytä tiedosto 

@@ -83,7 +83,7 @@ export default {
 
                 class: '请选择', // 年级
 
                 grade: '', // 班级
 
                 major: '请选择', // 专业
 
-                adjust: '请选择', // 是否服从调配
 
+                adjust: '是', // 是否服从调配
 
                 patriarch: '', // 家长
 
                 phone: '', // 电话
 
                 company: '', // 单位
 
@@ -92,7 +92,7 @@ export default {
 
                 sexNo: null, // 性别编号
 
                 majorNo: null, // 专业编号
 
                 subNo: null, // 科目编号
 
-                adjustNo: null, // 是否服从调配编号
 
+                adjustNo: 1, // 是否服从调配编号
 
             },
 
             selectName: '', // 选择是哪个字段
 
             sheetActions: [], // 上拉列表数据展示
 
@@ -170,8 +170,6 @@ export default {
 
         onSubmit() {
 
             // 确定注册
 
             let checkResult = this.onCheckForm()
 
-            console.log(checkResult)
 
-            return false
 
             if(checkResult) {
 
                 Toast(checkResult)
 
                 return false
 
@@ -180,7 +178,6 @@ export default {
 
             let s = this.stu
 
             let params = this.$route.query
 
 
-
 
             axios.post('/user/userApply', qs.stringify({
 
                 name: s.name,
 
                 sex: this.stuIndex.sexNo,
 
@@ -298,6 +295,10 @@ header {
 
     font-size: .16rem;
 
     padding: .13rem .11rem;
 
 }
 
+
 
+/deep/.van-field--disabled .van-field__control {
 
+    color: #444 !important;
 
+}
 
 // .van-field--disabled {
 
     .van-field__controll {
 
          color: #323233;

+ 1 - 4
src/views/smallProtocol.vue
Näytä tiedosto 

@@ -87,7 +87,7 @@
 
 
             <div class="signature">
 
                 <span>甲方签章 <img class="cachet" src="../assets/cachet.png" alt=""> </span>
 
-                <span>乙方签字：</span>
 
+                <span>乙方签字：{{ dataList.realName }}</span>
 
             </div>
 
 
             <div class="btnback" @click="goBack">我同意</div>
 
@@ -107,9 +107,6 @@ export default {
 
         }
 
     },
 
     mounted() {
 
-        // console.log(proto.userId)
 
-        console.log(this.p)
 
-
 
         axios.post('/user/findMecUser', qs.stringify({userId: this.params.userId})).then(res => {
 
             this.dataList = res.data.data
 
         })

+ 5 - 5
vue.config.js
Näytä tiedosto 

@@ -7,17 +7,17 @@ module.exports = {
 
         // 查阅 https://github.com/vuejs/vue-doc-zh-cn/vue-cli/cli-service.md#配置代理
 
         proxy: {
 
             '/user': {
 
-                target: 'http://pay.dayaedu.com',
 
-                // target: 'http://192.168.3.28:8005',
 
-                // target: 'http://192.168.3.28:8005',
 
+                target: 'https://pay.dayaedu.com',
 
+                // target: 'http://192.168.3.27:8005',
 
+                // target: 'http://192.168.3.28:9000',
 
                 changeOrigin: true,
 
                 ws: true,
 
                 '^/user': '/user',
 
                 xfwd: true
 
             },
 
             '/yqpay': {
 
-                target: 'http://pay.dayaedu.com',
 
-                // target: 'http://192.168.3.27:8005',
 
+                target: 'https://pay.dayaedu.com',
 
+                // target: 'http://192.168.3.27:9000',
 
                 // target: 'http://192.168.3.28:8005',
 
                 changeOrigin: true,
 
                 ws: true,

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä