添加活动

dist/css/chunk-04225e12.7424ffe1.css

@@ -0,0 +1 @@
+header[data-v-9340ab14]{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}.paymentresult[data-v-9340ab14]{min-height:100vh}.payerror[data-v-9340ab14],.paying[data-v-9340ab14],.payon[data-v-9340ab14]{padding-top:1rem}.payerror img[data-v-9340ab14],.paying img[data-v-9340ab14],.payon img[data-v-9340ab14]{display:block;margin:0 auto;width:1.03rem;height:1.37rem}.payerror p[data-v-9340ab14],.paying p[data-v-9340ab14],.payon p[data-v-9340ab14]{padding-top:.12rem;font-size:.18rem;color:#444;text-align:center;margin-bottom:1.5rem}.van-button[data-v-9340ab14]{width:90%;margin:0 5% 0;line-height:.48rem;height:.5rem;font-size:.18rem;background:#14928a;border-color:#14928a}

dist/css/chunk-1195b854.e5ec1ffb.css

@@ -0,0 +1 @@
+.login[data-v-4c76c6da]{width:100vw;height:100vh;background:url(../img/bg1.fcd553b9.png) no-repeat 0 0;background-size:cover;overflow:hidden;position:relative}.section[data-v-4c76c6da]{margin-top:2.8rem;padding:0 .25rem}.section h2[data-v-4c76c6da]{font-size:.16rem;color:#fff}.form-container[data-v-4c76c6da]{background:transparent}.form-container.top[data-v-4c76c6da]{margin-bottom:.3rem}.form-container .van-cell[data-v-4c76c6da]{background:transparent;padding-left:0;border-bottom:1px solid #fff}.form-container .van-cell[data-v-4c76c6da] .van-field__control{font-size:.16rem;color:#fff}[data-v-4c76c6da] .van-hairline--top-bottom:after,[data-v-4c76c6da] .van-hairline-unset--top-bottom:after{border-width:0}[data-v-4c76c6da] .van-button--primary{background:transparent;border:1px solid #fff;border-radius:30px}.btn[data-v-4c76c6da]{margin-top:.3rem;margin-bottom:.2rem;border-radius:1rem;background:-webkit-gradient(linear,right top,left top,from(#f2d1a3),to(#bc824c));background:linear-gradient(270deg,#f2d1a3,#bc824c);border:0;color:#fff;font-size:.18rem}input[data-v-4c76c6da],textarea[data-v-4c76c6da]{-webkit-user-select:auto!important;-moz-user-select:auto!important;-ms-user-select:auto!important;-o-user-select:auto!important;user-select:auto!important}

dist/css/chunk-166fad54.b7ec7061.css

@@ -0,0 +1 @@
+.activepay[data-v-4c891422]{width:100vw;height:100vh;background:url(../img/bg2.e15f39b4.png) no-repeat 50%;background-size:cover;overflow:hidden}.coupon-section[data-v-4c891422]{margin-top:2.8rem;padding:0 .35rem}.coupon-section img[data-v-4c891422]{width:100%}.tip[data-v-4c891422]{padding:.22rem .35rem;font-size:.14rem;color:#fff}.btn[data-v-4c891422]{padding:.05rem 0 .08rem;border-radius:1rem;background:-webkit-gradient(linear,right top,left top,from(#f2d1a3),to(#bc824c));background:linear-gradient(270deg,#f2d1a3,#bc824c);border:0;color:#fff;font-size:.14rem;margin-bottom:.2rem;text-align:center}.btn del[data-v-4c891422]{font-size:.12rem}input[data-v-4c891422],textarea[data-v-4c891422]{-webkit-user-select:auto!important;-moz-user-select:auto!important;-ms-user-select:auto!important;-o-user-select:auto!important;user-select:auto!important}

dist/js/chunk-04225e12.593998d4.js

@@ -0,0 +1,2 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-04225e12"],{"01cc":function(t,a,n){"use strict";var e=n("a21a"),s=n.n(e);s.a},"0463":function(t,a,n){t.exports=n.p+"img/pay_success.181846c1.png"},"10b3":function(t,a,n){"use strict";n.r(a);var e=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",{staticClass:"paymentresult"},[e("header",[t._v("支付状态")]),"on"==t.pageStatus?e("div",{staticClass:"payon"},[e("img",{attrs:{src:n("0463"),alt:""}}),e("p",[t._v("支付成功")]),e("van-button",{attrs:{type:"info",round:""},on:{click:t.onAppBack}},[t._v("返回")])],1):t._e(),"error"==t.pageStatus?e("div",{staticClass:"payerror"},[e("img",{attrs:{src:n("b92e"),alt:""}}),e("p",[t._v("支付失败")]),e("van-button",{attrs:{type:"info",round:""},on:{click:t.onAppBack}},[t._v("返回")])],1):t._e(),"paying"==t.pageStatus?e("div",{staticClass:"paying"},[e("img",{attrs:{src:n("e868"),alt:""}}),e("p",[t._v("订单处理中")]),e("van-button",{attrs:{type:"info",round:""},on:{click:t.onAppBack}},[t._v("返回")])],1):t._e()])},s=[],r={name:"paymentresult",data:function(){return{pageStatus:null}},mounted:function(){this.__init()},methods:{__init:function(){var t=this,a=this.$route.query;a.merOrderId?this.$axios.get("/yqpay/getPayStatus?orderNo="+a.merOrderId).then(function(a){var n=a.data;200==n.code?"ING"==n.msg?t.pageStatus="paying":"SUCCESS"==n.msg?t.pageStatus="on":"FAIL"==n.msg&&(t.pageStatus="error"):(t.$toast(n.msg),t.pageStatus="error")}):this.pageStatus="paying"},onAppBack:function(){this.$router.push("loginActive")}}},i=r,o=(n("01cc"),n("2877")),p=Object(o["a"])(i,e,s,!1,null,"9340ab14",null);a["default"]=p.exports},a21a:function(t,a,n){},b92e:function(t,a,n){t.exports=n.p+"img/pay_error.109ccf27.png"},e868:function(t,a,n){t.exports=n.p+"img/pay_ing.2848bdf2.png"}}]);
+//# sourceMappingURL=chunk-04225e12.593998d4.js.map

package.json

@@ -28,7 +28,8 @@
     "qs": "^6.8.0",
     "vant": "^2.1.4",
     "vue-cli-plugin-axios": "0.0.4",
-    "vue-template-compiler": "^2.6.10"
+    "vue-template-compiler": "^2.6.10",
+    "webpack-dev-server": "^3.7.2"
   },
   "eslintConfig": {
     "root": true,

src/assets/front_active.js

@@ -0,0 +1,148 @@
+const branchRule = [{
+    branchId: 1019,
+    branchName: '长沙分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1040,
+    branchName: '常州分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1032,
+    branchName: '成都分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1039,
+    branchName: '大连分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1036,
+    branchName: '福州分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1020,
+    branchName: '广州分部',
+    branchType: '二类',
+    branchPrice: 220
+}, {
+    branchId: 1013,
+    branchName: '贵阳分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1025,
+    branchName: '杭州分部',
+    branchType: '二类',
+    branchPrice: 220
+}, {
+    branchId: 1011,
+    branchName: '合肥分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1024,
+    branchName: '惠州分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1008,
+    branchName: '济南分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1033,
+    branchName: '嘉兴分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1028,
+    branchName: '江门分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1035,
+    branchName: '昆明分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1017,
+    branchName: '南京分部',
+    branchType: '二类',
+    branchPrice: 220
+}, {
+    branchId: 1034,
+    branchName: '青岛分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1012,
+    branchName: '上海分部',
+    branchType: '三类',
+    branchPrice: 220
+}, {
+    branchId: 1010,
+    branchName: '深圳分部',
+    branchType: '三类',
+    branchPrice: 280
+}, {
+    branchId: 1023,
+    branchName: '沈阳分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1009,
+    branchName: '石家庄分',
+    branchType: '	一',
+    branchPrice: 	180
+}, {
+    branchId: 1014,
+    branchName: '苏州分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1015,
+    branchName: '无锡分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1007,
+    branchName: '武汉分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1029,
+    branchName: '西安分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1043,
+    branchName: '烟台分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1018,
+    branchName: '中山分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1016,
+    branchName: '重庆分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1041,
+    branchName: '淄博分部',
+    branchType: '一类',
+    branchPrice: 180
+}, {
+    branchId: 1030,
+    branchName: '测试分部',
+    branchType: '一类',
+    branchPrice: 180
+}]
+
+export default branchRule

src/router.js

@@ -52,10 +52,23 @@ export default new Router({
             name: 'order',
             component: () => import('./views/order.vue')
         },
-        {
-            path: '/orderpay',
-            name: 'orderpay',
-            component: () => import('./views/orderPay.vue')
+        { 
+            // 登录
+            path: '/loginActive',
+            name: 'loginActive',
+            component: () => import('./views/loginActive.vue')
+        },
+        { 
+            // 购买
+            path: '/activePay',
+            name: 'activePay',
+            component: () => import('./views/activePay.vue')
+        },
+        { 
+            // 购买回调
+            path: '/paymentResult',
+            name: 'paymentResult',
+            component: () => import('./views/paymentResult.vue')
         }
     ],
     scrollBehavior() {

src/views/Home.vue

@@ -107,7 +107,7 @@
                         </span>
 
                         <span class="o_ft" v-if="result.payMethod == '26'">
-                            <del>原价:￥{{ con.marketPrice }}</del> 押金:￥800
+                            <del>原价:￥{{ con.marketPrice }}</del> 押金:￥{{ amountType == 1 ? 800 : 1500 }}
                         </span>
                     </div>
 
@@ -192,11 +192,9 @@
 import {instruments, baseInfo } from '../assets/front_instruments_config'
 import qs from 'qs'
 import Protocol from './protocol'
-import OrderPay from './orderPay'
-import { Dialog, CountDown } from 'vant'
 export default {
     name: 'home',
-    components: { Protocol, Dialog, CountDown, OrderPay },
+    components: { Protocol },
     data() {
         return {
             loadingOrderStatus: false, // 排队中状态
@@ -227,7 +225,8 @@ export default {
                 timestamp: '',
                 version: '',
             },
-            isSingle: 1 // 是否是双乐器,默认是双乐器
+            isSingle: 1, // 是否是双乐器,默认是双乐器
+            amountType: 1
         }
     },
     mounted() {
@@ -240,11 +239,12 @@ export default {
          * 22 2.0
          * 25 1.5
          * 26 3.0 */
-        axios.post('/user/getUserRegisterViewDetail', qs.stringify({
+        this.$axios.post('/user/getUserRegisterViewDetail', qs.stringify({
             stuId: this.$route.query.stuId
         })).then((res) => {
             let r = res.data.data
             this.isSingle = r.is_single_
+            this.amountType = r.amount_type_
             this.result = {
                 userId: r.id_, // 学生编号
                 payMethod: r.fee_type_,
@@ -308,7 +308,7 @@ export default {
             // 重新计算金额
             this.calcPrice()
         },
-        instrumentF2(type, con) {
+        instrumentF2(type) {
             // 1.5 3.0 才会显示协议
             // if((this.result.payMethod == 25 || this.result.payMethod == 26) && !con.checked && con.name != '自备') {
             //     this.protocol()
@@ -386,7 +386,7 @@ export default {
             }))
 
             if(!instrumentCount) {
-                Dialog.alert({
+                this.$dialog.alert({
                     title: '提示',
                     message: '请选择乐器准备方式',
                     confirmButtonColor: '#269a93'
@@ -394,7 +394,7 @@ export default {
                 return false
             }
             this.resultParams = resultParams
-            axios.post('/yqpay/toPay', qs.stringify(resultParams)).then((res) => { 
+            this.$axios.post('/yqpay/toPay', qs.stringify(resultParams)).then((res) => { 
                 let result = res.data
                 this.clickBtnCount = true
                 if(result.code == 403) {
@@ -402,7 +402,7 @@ export default {
                     this.loadingOrderText = result.msg
                     this.paymentMethods()
                 } else if(result.code == 201) { // 0元购成功提示
-                    Dialog.alert({
+                    this.$dialog.alert({
                         title: '提示',
                         message: '报名成功',
                         confirmButtonColor: '#269a93'
@@ -416,20 +416,20 @@ export default {
                         })
                     })
                 } else if(result.code == 100) { // 订单已经存在继续支付
-                    Dialog.confirm({
+                    this.$dialog.confirm({
                         title: '提示',
                         message: result.msg,
                         confirmButtonColor: '#269a93',
                         cancelButtonText: '已完成支付',
                         confirmButtonText: '重新下单支付'
                     }).then(() => {
-                        axios.post('/yqpay/rePay', qs.stringify(resultParams)).then(repay => {
+                        this.$axios.post('/yqpay/rePay', qs.stringify(resultParams)).then(repay => {
                             let repayResult = repay.data
                             if(repayResult.code == 200) {
                                 this.form = repayResult.data
                                 this.onSubmit()
                             } else {
-                                Dialog.alert({
+                                this.$dialog.alert({
                                     title: '提示',
                                     message: repayResult.msg,
                                     confirmButtonColor: '#269a93'
@@ -437,14 +437,14 @@ export default {
                             }
                         })
                     }).catch(() => {
-                        Dialog.close()
+                        this.$dialog.close()
                     })
                 } else {
                     if(result.data) {
                         this.form = result.data
                         this.onSubmit()
                     } else {
-                        Dialog.alert({
+                        this.$dialog.alert({
                             title: '提示',
                             message: result.msg,
                             confirmButtonColor: '#269a93'
@@ -465,13 +465,13 @@ export default {
                 if(that.paymentPostCount >= 30) {
                     clearInterval(that.paymentTimers)
                 } else {
-                    axios.post('/yqpay/toPay', qs.stringify(resultParams)).then((res) => { 
+                    this.$axios.post('/yqpay/toPay', qs.stringify(resultParams)).then((res) => { 
                         let result = res.data
                         if(result.code == 403) {
                             that.loadingOrderStatus = true
                             that.loadingOrderText = result.msg
                         } else if(result.code == 201) {
-                            Dialog.alert({
+                            this.$dialog.alert({
                                 title: '提示',
                                 message: '报名成功',
                                 confirmButtonColor: '#269a93'
@@ -492,7 +492,7 @@ export default {
                                 that.form = result.data
                                 this.onSubmit()
                             } else {
-                                Dialog.alert({
+                                this.$dialog.alert({
                                     title: '提示',
                                     message: result.msg,
                                     confirmButtonColor: '#269a93'
@@ -519,7 +519,6 @@ export default {
         },
         protocol() {
             // 协议
-
             let r = this.result
             let protocol = {
                 patriarchName: r.patriarchName,
@@ -530,6 +529,7 @@ export default {
                 voicyPart: r.voicyPart,
                 userId: r.userId,
                 classAmount: r.classAmount,
+                amountType: this.amountType,
                 payMethod: r.payMethod, // 缴费类型
                 isCopperPipe: r.isCopperPipe // 是否为铜管
             }
@@ -612,7 +612,8 @@ export default {
                                 instrumentIndex = 99
                             }
                         } else {
-                            amountSummary.rInstrument = version == 26 ? 800 : parseInt(config[i].referencePrice)
+                            let amountt = this.amountType == 1 ? 800 : 1500
+                            amountSummary.rInstrument = version == 26 ? amountt : parseInt(config[i].referencePrice)
                         }
                     }
                 }
@@ -647,7 +648,7 @@ export default {
                 instrumentIndex: instrumentIndex
             }
         },
-        onPopupClose(status) {
+        onPopupClose() {
             document.querySelector('#protocolPopup').scroll(0, 0)
             this.popupStatus = false
 

src/views/activePay.vue

@@ -0,0 +1,131 @@
+<template>
+    <div class="activepay">
+
+        <div class="coupon-section">
+            <img v-if="activePrice == 777" src="../assets/coupon.png" alt="">
+            <img v-else src="../assets/coupon2.png" alt="">
+        </div>
+
+        <p class="tip">活动详情：缴费{{ showPrice }}元立刻享有 {{ activePrice }} 元现金券，仅限购买20次vip课，总价值{{ markAmount }}元；即日起至2019年11月11日 ，名额有限，先到先得。</p>
+
+        <div style="padding: 0 .25rem">
+            <div class="btn-group">
+                <div class="btn" @click="onPromotionPay">
+                    <del>原价：{{ markAmount }}</del>
+                    <p>现仅需：{{ amount }}</p>
+                </div>
+            </div>
+        </div>
+
+    </div>
+</template>
+
+<script>
+/* eslint-disable */
+import branchRule from '@/assets/front_active'
+import qs from 'qs'
+export default {
+    name: 'activepay',
+    data() {
+        return {
+            userId: this.$route.query.userId,
+            branchId: this.$route.query.branchId,
+            priceList: {},
+            activePrice: 777,
+            showPrice: 11.11,
+            amount: 0,
+            markAmount: 0
+        }
+    },
+    mounted() {
+        // 匹配对应的规则
+        branchRule.forEach(item => {
+            if(item.branchId == this.branchId) {
+                this.priceList = item
+                if(item.branchPrice == 180) {
+                    this.activePrice = 777
+                    this.showPrice = 11.11
+                }else if(item.branchPrice == 220 || item.branchPrice == 280) {
+                    this.activePrice = 1111
+                    this.showPrice = 111
+                }
+
+                this.markAmount = 20 * item.branchPrice
+                this.amount = this.markAmount  - this.activePrice + parseFloat(this.showPrice)
+            }
+        })
+    },
+    methods: {
+        onPromotionPay() {
+            this.$axios.post('/yqpay/promotionPay', 
+                qs.stringify({ 
+                    userId: this.userId, 
+                    branchId: this.branchId,
+                    amount: this.amount
+            }) ).then(res => {
+                let result = res.data
+                if(result.code == 200) {
+                    let f = result.data
+                    document.querySelector('#onSubmit').action = f.host
+                    document.querySelector('#apiContent').value = f.apiContent
+                    document.querySelector('#merNo').value = f.merNo
+                    document.querySelector('#notifyUrl').value = f.notifyUrl
+                    document.querySelector('#sign').value = f.sign
+                    document.querySelector('#signType').value = f.signType
+                    document.querySelector('#timestamp').value = f.timestamp
+                    document.querySelector('#version').value = f.version
+                    document.querySelector('#onSubmit').submit()
+                } else {
+                    this.$toast(result.msg)
+                }
+            })
+        }
+    }
+}
+</script>
+
+<style lang="less" scoped>
+.activepay {
+    width: 100vw;
+    height: 100vh;
+    background: url('../assets/bg2.png') no-repeat center;
+    background-size: cover;
+    overflow: hidden;
+}
+.coupon-section {
+    margin-top: 2.8rem;
+    padding: 0 .35rem;
+    img {
+        width: 100%;
+    }
+}
+.tip {
+    padding: .22rem .35rem;
+    font-size: .14rem;
+    color: #FFFFFF;
+}
+
+
+.btn {
+    padding: .05rem 0 .08rem;
+    border-radius: 1rem;
+    background:linear-gradient(270deg,rgba(242,209,163,1) 0%,rgba(188,130,76,1) 100%);
+    border: 0;
+    color: #fff;
+    font-size: .14rem;
+    margin-bottom: .2rem;
+    text-align: center;
+    del {
+        font-size: .12rem;
+    }
+}
+
+input, textarea {
+    -webkit-user-select: auto!important;
+    -khtml-user-select: auto!important;
+    -moz-user-select: auto!important;
+    -ms-user-select: auto!important;
+    -o-user-select: auto!important;
+    user-select: auto!important;
+}
+</style>

src/views/login.vue

@@ -45,11 +45,9 @@
 
 <script>
 /* eslint-disable */
-import { Button, Popup, Toast, Dialog } from 'vant'
 import qs from 'qs'
 export default {
     name: 'login',
-    components: { Button, Popup, Toast, Dialog },
     data() {
         return {
             popupStatus: false,
@@ -73,7 +71,7 @@ export default {
         let params = {
             schoolId: route.schoolId
         }
-        axios.post(`/user/getClassDetail`,qs.stringify(params)).then((response) => {
+        this.$axios.post(`/user/getClassDetail`,qs.stringify(params)).then((response) => {
             let result = response.data
             if(result.data) {
                 this.dataList = {
@@ -85,7 +83,7 @@ export default {
                     classId: result.data.id
                 }
                 if(result.data.status == 5) {
-                    Dialog.alert({
+                    this.$dialog.alert({
                         title: '提示',
                         message: '该乐团已停止注册',
                         confirmButtonColor: '#269a93'
@@ -94,7 +92,7 @@ export default {
                     this.btnStatus = false
                 }
             } else {
-                Dialog.alert({
+                this.$dialog.alert({
                     title: '提示',
                     message: '乐团建设中，请稍等',
                     confirmButtonColor: '#269a93'
@@ -114,18 +112,18 @@ export default {
             let dataStatus = this.dataList.status
 
             if(!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.dataList.phoneNumber))){ 
-                Toast('手机号输入有误')
-                return false; 
+                this.$toast('手机号输入有误')
+                return false;   
             }
 
             let params = this.$route.query
-            axios.get(`/user/getUserDetailByPhone?clazzId=${this.dataList.classId}&phone=${this.dataList.phoneNumber}&cityId=${params.cityId}`).then((res) => {
+            this.$axios.get(`/user/getUserDetailByPhone?clazzId=${this.dataList.classId}&phone=${this.dataList.phoneNumber}&cityId=${params.cityId}`).then((res) => {
                 let result = res.data
                 // 判断是否有数据
                 if(result.status) {
                     if(result.data) {
                         if(parseInt(result.data.pushStatus) == 1) {
-                            Dialog.alert({
+                            this.$dialog.alert({
                                 title: '提示',
                                 message: '恭喜您，报名成功',
                                 confirmButtonColor: '#269a93'
@@ -142,7 +140,7 @@ export default {
                                 }
                             })
                         } else if(parseInt(result.data.status) == 1) {
-                            Dialog.alert({
+                            this.$dialog.alert({
                                 title: '注册完成',
                                 message: '您已完成注册，欢迎加入管乐团开启您的器乐学习之旅，请等待开课通知！',
                                 confirmButtonColor: '#269a93'
@@ -152,7 +150,7 @@ export default {
                         this.sendCode() // 发送短信
                     }
                 } else {
-                    Dialog.alert({
+                    this.$dialog.alert({
                         title: '提示',
                         message: result.msg,
                         confirmButtonColor: '#269a93'
@@ -164,7 +162,7 @@ export default {
             let params = this.$route.query
             let code = this.dataList.code
             if(code.length >= 6) {
-                axios.post('/user/verifySmsCode', qs.stringify({
+                this.$axios.post('/user/verifySmsCode', qs.stringify({
                     smsCode: code,
                     mobile: this.dataList.phoneNumber
                 })).then(res => {
@@ -183,7 +181,7 @@ export default {
                             }
                         })
                     } else {
-                        Toast('验证码输入有误')
+                        this.$toast('验证码输入有误')
                         this.dataList.code = ''
                     }
                 })
@@ -194,7 +192,7 @@ export default {
             if(!this.codeStatus) {
                 return false
             }
-            axios.get('/user/sendSmsCode?mobile=' + this.dataList.phoneNumber).then(res => {
+            this.$axios.get('/user/sendSmsCode?mobile=' + this.dataList.phoneNumber).then(res => {
                 this.popupCodeStatus = true // 开启弹窗
                 let result = res.data
                 this.codeStatus = false

src/views/loginActive.vue

@@ -0,0 +1,210 @@
+<template>
+    <div class="login" :style="{ height: bodyHeight + 'px' }">
+        <div class="section">
+            <h2>手机号</h2>
+            <van-cell-group class="form-container top">
+                <van-field v-model="form.phone"
+                    center
+                    clearable
+                    placeholder="请输入手机号" >
+                </van-field>
+            </van-cell-group>
+            <h2>验证码</h2>
+            <van-cell-group class="form-container">
+                <van-field v-model="form.code" center
+                    clearable
+                    placeholder="请输入短信验证码" >
+                    <van-button slot="button" @click="sendCode" size="small" type="primary">{{ smsText }}</van-button>
+                </van-field>
+            </van-cell-group>
+
+            <div class="btn-group">
+                <van-button size="large" @click="onSubmit" class="btn">登录</van-button>
+            </div>
+        </div>
+        
+        
+
+    </div>
+</template>
+
+<script>
+/* eslint-disable */
+import qs from 'qs'
+export default {
+    name: 'login',
+    data() {
+        return {
+            bodyHeight: 0,
+            popupStatus: false,
+            popupCodeStatus: false, // 发送验证码弹窗
+            smsText: '发送验证码',
+            popupText: '',
+            codeStatus: true, // 是否可以发送验证码
+            btnStatus: true, 
+            form: {
+                phone: null,
+                code: null
+            }
+        }
+    },
+    mounted() {
+        this.bodyHeight = document.documentElement.clientHeight
+        let route = this.$route.query
+        let params = {
+            schoolId: route.schoolId
+        }
+    },
+    methods: {
+        codeBlur() {
+            setTimeout(() => {
+                const scrollHeight = document.documentElement.scrollTop || document.body.scrollTop || 0;
+                window.scrollTo(0, Math.max(scrollHeight - 1, 0));
+            }, 100);
+        },
+        onSubmit() {
+            let form = this.form
+            if(!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(form.phone))){ 
+                this.$toast('手机号输入有误')
+                return false; 
+            }
+            this.$axios.get(`/user/getMecUser?phone=${form.phone}&smsCode=${form.code}`).then((response) => {
+                let result = response.data
+                console.log(result)
+                if(result.code == 200) {
+                    this.$router.push({
+                        path: 'activePay',
+                        query: {
+                            userId: result.data.userId,
+                            branchId: result.data.branchId
+                        }
+                    })
+                } else {
+                    this.$toast(result.msg)
+                }
+            })
+        },
+        checkCode() {
+            let params = this.$route.query
+            let code = this.form.code
+            if(code.length >= 6) {
+                this.$axios.post('/user/verifySmsCode', qs.stringify({
+                    smsCode: code,
+                    mobile: this.form.phone
+                })).then(res => {
+                    let result = res.data
+                    if(result.status) {
+                         this.$router.push({
+                            path: 'register',
+                            query: {
+                                phone: this.form.phone,
+                                cityId: params.cityId,
+                                classId: this.dataList.classId,
+                                schoolId: params.schoolId,
+                                status: this.dataList.status, // 当前乐团状态
+                                schoolName: this.dataList.schoolName,
+                                branchId: this.dataList.branchId
+                            }
+                        })
+                    } else {
+                        this.$toast('验证码输入有误')
+                        this.form.code = ''
+                    }
+                })
+            }
+        },
+        sendCode() {
+            if(!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.form.phone))){ 
+                this.$toast('手机号输入有误')
+                return false; 
+            }
+            // 发送短信验证码
+            if(!this.codeStatus) {
+                return false
+            }
+            this.$axios.get('/user/sendSmsCode?mobile=' + this.form.phone).then(res => {
+                let result = res.data
+                this.codeStatus = false
+                this.CountDown()
+            })
+        },
+        CountDown() {
+            let s = 120
+            this.smsText = s + '秒'
+            let timer = setInterval(() => {
+                if(s <= 0) {
+                    this.codeStatus = true
+                    this.smsText = '发送验证码'
+                    clearInterval(timer)
+                } else {
+                    s--
+                    this.smsText = s + '秒'
+                }
+            }, 1000)
+        },
+    }
+}
+</script>
+
+<style lang="less" scoped>
+.login {
+    width: 100vw;
+    height: 100vh;
+    background: url('../assets/bg1.png') no-repeat left top;
+    background-size: cover;
+    overflow: hidden;
+    position: relative;
+}
+
+.section {
+    margin-top: 2.8rem;
+    padding: 0 .25rem;
+    h2 {
+        font-size: .16rem;
+        color: #FFFFFF;
+    }
+}
+.form-container {
+    background: transparent;
+    &.top {
+        margin-bottom: .3rem;
+    }
+    .van-cell {
+        background: transparent;
+        padding-left: 0;
+        border-bottom: 1px solid #fff;
+        /deep/.van-field__control {
+            font-size: .16rem;
+            color: #fff;
+        }
+    }
+    
+}
+/deep/.van-hairline--top-bottom::after, /deep/.van-hairline-unset--top-bottom::after {
+    border-width: 0;
+}
+/deep/.van-button--primary {
+    background: transparent;
+    border: 1px solid #fff;
+    border-radius: 30px;
+}
+
+.btn {
+    margin-top: .3rem;
+    margin-bottom: .2rem;
+    border-radius: 1rem;
+    background:linear-gradient(270deg,rgba(242,209,163,1) 0%,rgba(188,130,76,1) 100%);
+    border: 0;
+    color: #fff;
+    font-size: .18rem;
+}
+
+input, textarea {
+    -webkit-user-select: auto!important;
+    -khtml-user-select: auto!important;
+    -moz-user-select: auto!important;
+    -ms-user-select: auto!important;
+    -o-user-select: auto!important;
+    user-select: auto!important;
+}
+</style>

src/views/orderPay.vue

@@ -1,50 +0,0 @@
-<template>
-    <div class="orderpay">
-        <!-- <iframe class="iframe" src="" width="100%" height="100%" frameborder="0" scrolling='auto' seamless> -->
-            <form role="form" method="post" :action="proto.host" id="onSubmit">
-                <input type="hidden" v-model="proto.apiContent" name="apiContent" id="apiContent">
-                <input type="hidden" v-model="proto.merNo" name="merNo" id="merNo">
-                <input type="hidden" v-model="proto.notifyUrl" name="notifyUrl" id="notifyUrl">
-                <input type="hidden" v-model="proto.sign" name="sign" id="sign">
-                <input type="hidden" v-model="proto.signType" name="signType" id="signType">
-                <input type="hidden" v-model="proto.timestamp" name="timestamp" id="timestamp">
-                <input type="hidden" v-model="proto.version" name="version" id="version">
-            </form>
-        <!-- </iframe> -->
-    </div>
-</template>
-
-<script>
-export default {
-    name: 'orderpay',
-    // props: ['proto'],
-    data() {
-        return {
-            proto: {}
-        }
-    },
-    mounted() {
-        // console.log(sessionStorage.getItem('orderForm'))
-        // let tempOrderInfo = sessionStorage.getItem('orderForm')
-        console.log(this.$route.query)
-        
-        this.proto = JSON.parse(tempOrderInfo)
-        console.log(this.proto)
-        // sessionStorage.removeItem('orderForm')
-        document.querySelector('#onSubmit').submit()
-    }
-}
-</script>
-
-<style lang="less" scoped>
-.orderpay {
-    min-height: 100vh;
-}
-.iframe {
-    width: 100%;
-    height: 100%;
-    -webkit-overflow-scrolling: touch;
-    overflow-y: scroll;
-    border-top: none !important
-}
-</style>

src/views/payment.vue

@@ -82,10 +82,9 @@
 <script>
 import smallProtocol from './smallProtocol'
 import qs from 'qs'
-import { Dialog } from 'vant'
 export default {
     name: 'payment',
-    components: { smallProtocol, Dialog },
+    components: { smallProtocol },
     data() {
         return {
             popupStatus: false, // 协议弹窗样式
@@ -112,7 +111,7 @@ export default {
     mounted() {
         let userId = this.$route.query.userId
 
-        axios.post('/user/queryUserCourse', qs.stringify({ userId: userId })).then((res) => {
+        this.$axios.post('/user/queryUserCourse', qs.stringify({ userId: userId })).then((res) => {
             let data = res.data.data.courses
             // let data = res.data.data
             if(!data) {
@@ -201,7 +200,7 @@ export default {
                 }
             })
             let cour = {}
-            let configIndex, inputCount // 课程编号（唯一）  输入的次数
+            let configIndex // 课程编号（唯一） 
             // 拼接参数
             this.classInfo.forEach(c => {
                 if(c.classType == 2 && c.status) {
@@ -229,7 +228,7 @@ export default {
 
             params.courses = JSON.stringify(cour)
             if(!record) {
-                Dialog.alert({
+                this.$dialog.alert({
                     title: '提示',
                     message: '请选择续费课程',
                     confirmButtonColor: '#269a93'
@@ -242,7 +241,7 @@ export default {
                 config: configIndex
             }))
 
-            axios.post('/yqpay/renewalsPay', qs.stringify(params)).then(res => {
+            this.$axios.post('/yqpay/renewalsPay', qs.stringify(params)).then(res => {
                 let result = res.data
                 if(result.status) {
                     document.querySelector('#onSubmit').action = result.data.host
@@ -255,7 +254,7 @@ export default {
                     document.querySelector('#version').value = result.data.version
                     document.querySelector('#onSubmit').submit()
                 } else {
-                    Dialog.alert({
+                    this.$dialog.alert({
                         title: '提示',
                         message: result.msg,
                         confirmButtonColor: '#269a93'
@@ -370,7 +369,7 @@ export default {
             }
             this.popupStatus = true
         },
-        onPopupClose(status) {
+        onPopupClose() {
             // document.querySelector('#protocolPopup').scroll(0, 0)
             // this.popupStatus = false
 

src/views/paymentResult.vue

@@ -0,0 +1,107 @@
+<template>
+  <div class="paymentresult">
+        <header>支付状态</header>
+        <div class="payon" v-if="pageStatus == 'on'">
+            <img src="@/assets/pay_success.png" alt="">
+            <p>支付成功</p>
+            <van-button type="info" @click="onAppBack" round>返回</van-button>
+        </div>
+
+        <div class="payerror" v-if="pageStatus == 'error'">
+            <img src="@/assets/pay_error.png" alt="">
+            <p>支付失败</p>
+            <van-button type="info" @click="onAppBack" round>返回</van-button>
+        </div>
+
+        <div class="paying" v-if="pageStatus == 'paying'">
+            <img src="@/assets/pay_ing.png" alt="">
+            <p>订单处理中</p>
+            <van-button type="info" @click="onAppBack" round>返回</van-button>
+        </div>
+
+  </div>
+</template>
+
+<script>
+export default {
+    name: 'paymentresult',
+    data() {
+        return {
+            pageStatus: null
+        }
+    },
+    mounted() {
+        this.__init()
+    },
+    methods: {
+        __init() {
+            let params = this.$route.query
+            // 支付成功
+            if(params.merOrderId) {
+                this.$axios.get('/yqpay/getPayStatus?orderNo=' + params.merOrderId).then(res => {
+                    let result = res.data
+                    if(result.code == 200) {
+                        if(result.msg == "ING") {
+                            this.pageStatus = 'paying'
+                        } else if(result.msg == 'SUCCESS') {
+                            this.pageStatus = 'on'
+                        } else if(result.msg == 'FAIL') {
+                            this.pageStatus = 'error'
+                        }
+                    } else {
+                        this.$toast(result.msg)
+                        this.pageStatus = 'error'
+                    }
+                })
+            } else {
+                this.pageStatus = 'paying'
+            }
+        },
+        onAppBack() { // app回调页面
+            this.$router.push('loginActive')
+        },
+    }
+}
+</script>
+
+<style lang="less" scoped>
+header {
+    height: .40rem;
+    line-height: .40rem;
+    color: #000;
+    font-size: .17rem;
+    background: #fff;
+    box-shadow: 0px 1px 8px 0px rgba(0,0,0,0.07);
+    text-align: center;
+    margin-bottom: .06rem;
+}
+.paymentresult {
+    min-height: 100vh;
+}
+.payerror, .payon, .paying {
+    padding-top: 1rem;
+    img {
+        display: block;
+        margin: 0 auto;
+        width: 1.03rem;
+        height: 1.37rem;
+    }
+    p {
+        padding-top: .12rem;
+        font-size: .18rem;
+        color: #444444;
+        text-align: center;
+        margin-bottom: 1.5rem;
+    }
+}
+.van-button {
+    width: 90%;
+    margin: 0 5% 0;
+    line-height: .48rem;
+    height: .5rem;
+    font-size: .18rem;
+    background: #14928A;
+    border-color: #14928A;
+}
+
+</style>

src/views/protocol.vue

@@ -120,7 +120,7 @@
             3、乙方归还乐器时，双方当面当场验收，经甲方维修技师检验确认乐器无人为损坏、可正常使用后，甲方在七个工作日内全额不计息退还乙方已交纳的押金。<br/>
             4、如乙方已购买甲方乐器保养服务，甲方需在乙方借用期间协助乙方处理乐器维修和保养问题。
             <h2>二、乙方权利与义务：</h2>
-            1、乙方在签订本协议、交纳乐器使用押金￥{{ proto.payMethod == 25 ? 0 : 800}}元（大写人民币{{ proto.payMethod == 25 ? '零' : '捌佰'}}元整）后，享有所借用乐器在学校乐团期间的免费使用权。乙方应当爱惜乐器并妥善保管，不得将该乐器转租、借用、出售、典当、质押或抵押，也不得将乐器交于非专业人士使用。乐器借用政策，每位团员仅可享受一次，退团后再次加入乐团的，将无法享受乐器借用政策。<br/>
+            1、乙方在签订本协议、交纳乐器使用押金￥{{ proto.payMethod == 25 ? 0 : (proto.amountType == 1 ? 800 : 1500)}}元（大写人民币{{ proto.payMethod == 25 ? '零' : '捌佰'}}元整）后，享有所借用乐器在学校乐团期间的免费使用权。乙方应当爱惜乐器并妥善保管，不得将该乐器转租、借用、出售、典当、质押或抵押，也不得将乐器交于非专业人士使用。乐器借用政策，每位团员仅可享受一次，退团后再次加入乐团的，将无法享受乐器借用政策。<br/>
             2、乐器日常维护由乙方自行完成，每次练习完毕后需按老师要求对乐器进行擦拭并装箱保管。如因人为原因（包括但不限于磕、碰、摔等）造成乐器损坏的，乙方需自行承担维修费用；如因非甲方原因导致乐器无法正常使用（正常使用磨损除外）或乐器毁损、灭失、遗失的，乙方须按本协议中明示的乐器团购价格进行赔付。<br/>
             3、当乙方决定不再继续乐团学习时，应在退团之日起1日内将其借用的乐器归还甲方，双方当面当场验收，经甲方维修技师检验确认乐器无人为损坏、可正常使用后，乙方可按照本协议约定获得已交纳的押金；经甲方维修技师检验，乐器存在损坏的，乙方应承担相应的维修费用，如乐器已经无法正常使用的，乙方须按本协议中明示的乐器团购价格进行赔付，甲方有权从应退还乙方的押金中先行扣除维修费用、赔付费用，如甲方扣除押金后仍然不足以弥补维修费用、赔付费用的，甲方有权继续要求乙方支付剩余费用。<br/>
             4、乙方终止乐团学习2个月内，仍未将乐器归还给甲方的，则视为乙方违约，乙方所交押金甲方有权不予退还，同时乙方须按乐器团购价格进行赔付。

src/views/register.vue

@@ -42,8 +42,7 @@
                 type="textarea"
                 placeholder="请输入备注"
                 rows="2"
-                autosize
-            />
+                autosize />
         </van-cell-group>
 
         <div class="btn-group">
@@ -71,12 +70,10 @@
 </template>
 
 <script>
-import { Field, CellGroup, Cell, ActionSheet, Button, DatetimePicker, Popup, Toast, Dialog } from 'vant'
 import cityName from '../assets/front_ciry'
 import qs from 'qs'
 export default {
     name: 'register',
-    components: { Field, CellGroup, Cell, ActionSheet, Button, DatetimePicker, Popup, Toast, Dialog },
     data() {
         return {
             currentDate: new Date(), // 当前时间
@@ -138,7 +135,7 @@ export default {
         this.stu.city = cityName(params.cityId)
         this.stu.band = params.schoolName
         let arr = []
-        axios.post('/user/getCourses', qs.stringify({clazzId: params.classId})).then((res) => {
+        this.$axios.post('/user/getCourses', qs.stringify({clazzId: params.classId})).then((res) => {
             (res.data.data).forEach(element => {
                 let tempSubName = element.subName.split('.').reverse()[0]
                 arr.push({
@@ -194,14 +191,14 @@ export default {
             // 确定注册
             let checkResult = this.onCheckForm()
             if(checkResult) {
-                Toast(checkResult)
+                this.$toast(checkResult)
                 return false
             }
             
             let s = this.stu
             let params = this.$route.query
 
-            axios.post('/user/userApply', qs.stringify({
+            this.$axios.post('/user/userApply', qs.stringify({
                 name: s.name,
                 sex: this.stuIndex.sexNo,
                 birthday: s.birthday,
@@ -248,7 +245,7 @@ export default {
                         }})
                     }
                 } else {
-                    Toast(result.msg)
+                    this.$toast(result.msg)
                 }
             })
         },

src/views/smallProtocol.vue

@@ -127,7 +127,7 @@ export default {
     mounted() {
         let tempDate = new Date()
         this.nowDate = tempDate.getFullYear() + '年' + (tempDate.getMonth() + 1) + '月' + tempDate.getDate() + '日'
-        axios.post('/user/findMecUser', qs.stringify({userId: this.params.userId})).then(res => {
+        this.$axios.post('/user/findMecUser', qs.stringify({userId: this.params.userId})).then(res => {
             this.dataList = res.data.data
         })
     },

vue.config.js

@@ -1,10 +1,12 @@
 // let targetUrl = 'https://pay.dayaedu.com'
-let targetUrl = 'http://192.168.3.48:8000'
+let targetUrl = 'http://192.168.3.27:8088'
+// let targetUrl = 'http://192.168.3.38:8088'
 module.exports = {
     devServer: {
         open: process.platform === 'darwin',
         host: '0.0.0.0',
         https: false,
+        port: 8888,
         hotOnly: false,
         // 查阅 https://github.com/vuejs/vue-doc-zh-cn/vue-cli/cli-service.md#配置代理
         proxy: {