Página Principal Explorar Ajuda
Iniciar Sessão
yonge
/
mgrading
2
0
Fork 0
Ficheiros Problemas 0 Pull Requests 0 Wiki
Ver Fonte

修改订单问题

lex-xin há 4 anos atrás
pai
864fc5b134
commit
db4fd85268
33 ficheiros alterados com 65 adições e 13 exclusões
Visão Unificada Mostrar Estatísticas Diff
  1. BIN
      dist/app.1382a202b8932f8073ba.js.gz
  2. 0 0
      dist/app.754fba27c930fe02b479.js
  3. BIN
      dist/app.754fba27c930fe02b479.js.gz
  4. 1 1
      dist/css/SignUp.c4f2966d.css
  5. 0 0
      dist/css/SignUpBaseInfo.9696939c.css
  6. 0 0
      dist/css/SignUpLevel.58200754.css
  7. 0 1
      dist/index.html
  8. BIN
      dist/js/PaymentResult.770cd594.js.gz
  9. 0 0
      dist/js/PaymentResult.fda8d0ed.js
  10. BIN
      dist/js/PaymentResult.fda8d0ed.js.gz
  11. 0 0
      dist/js/SignUp.2d8876e9.js
  12. BIN
      dist/js/SignUp.2d8876e9.js.gz
  13. 0 0
      dist/js/SignUp.92050db0.js
  14. BIN
      dist/js/SignUp.92050db0.js.gz
  15. 0 0
      dist/js/SignUpAccount.5894bdb2.js
  16. BIN
      dist/js/SignUpAccount.5894bdb2.js.gz
  17. 0 0
      dist/js/SignUpBaseInfo.c5cf1b1d.js
  18. BIN
      dist/js/SignUpBaseInfo.c5cf1b1d.js.gz
  19. 0 0
      dist/js/SignUpBaseInfo.f0451f91.js
  20. BIN
      dist/js/SignUpBaseInfo.f0451f91.js.gz
  21. 0 0
      dist/js/SignUpLevel.17abce65.js
  22. BIN
      dist/js/SignUpLevel.17abce65.js.gz
  23. 0 0
      dist/js/SignUpLevel.7199b67b.js
  24. BIN
      dist/js/SignUpLevel.7199b67b.js.gz
  25. BIN
      dist/js/SignUpPayment.5100ebbe.js.gz
  26. 0 0
      dist/js/SignUpPayment.658022cf.js
  27. BIN
      dist/js/SignUpPayment.658022cf.js.gz
  28. 1 1
      public/index.html
  29. 2 4
      src/views/signup/SignUp.vue
  30. 9 0
      src/views/signup/SignUpApi.js
  31. 12 2
      src/views/signup/SignUpBaseInfo.vue
  32. 38 2
      src/views/signup/SignUpLevel.vue
  33. 2 2
      vue.config.js

BIN
dist/app.1382a202b8932f8073ba.js.gz
Ver Ficheiro


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/app.754fba27c930fe02b479.js


BIN
dist/app.754fba27c930fe02b479.js.gz
Ver Ficheiro


+ 1 - 1
dist/css/SignUp.cf7556d8.css → dist/css/SignUp.c4f2966d.css
Ver Ficheiro 

@@ -1 +1 @@
 
-.SignUp[data-v-7130932a]{max-width:700px;position:relative;overflow-y:auto;overflow-x:hidden;background-color:#fff;margin:0 auto}.container[data-v-7130932a]{min-height:100vh;background:url(../img/signUpBg.e551d4ac.png) no-repeat top #f3f4f8;background-size:contain;overflow:hidden}.container h2[data-v-7130932a]{position:absolute;padding-top:.4rem;color:#fff;font-size:.26rem;font-weight:700;width:2.1rem;text-align:left;margin-left:.16rem}.container .section[data-v-7130932a]{background:#fff;margin:2.2rem .16rem 0;border-radius:.1rem;padding:.22rem}.container .section .title[data-v-7130932a]{margin-top:.28rem;font-size:.18rem;color:#1a1a1a}.container .section .content[data-v-7130932a]{padding-top:.05rem;color:grey;font-size:.16rem;word-break:break-all}.container .protocol[data-v-7130932a]{font-size:.14rem;margin-bottom:.3rem;text-align:center;display:block;color:#0091ff}.container .van-button--primary[data-v-7130932a]{margin:.35rem 0 .1rem;background-color:var(--main-color);border:1px solid var(--main-color);color:#fff;font-size:.18rem;height:.5rem;line-height:.52rem;width:90%;margin-left:5%}
 
+.SignUp[data-v-4df57167]{max-width:700px;position:relative;overflow-y:auto;overflow-x:hidden;background-color:#fff;margin:0 auto}.container[data-v-4df57167]{min-height:100vh;background:url(../img/signUpBg.e551d4ac.png) no-repeat top #f3f4f8;background-size:contain;overflow:hidden}.container h2[data-v-4df57167]{position:absolute;padding-top:.4rem;color:#fff;font-size:.26rem;font-weight:700;width:2.1rem;text-align:left;margin-left:.16rem}.container .section[data-v-4df57167]{background:#fff;margin:2.2rem .16rem 0;border-radius:.1rem;padding:.22rem}.container .section .title[data-v-4df57167]{margin-top:.28rem;font-size:.18rem;color:#1a1a1a}.container .section .content[data-v-4df57167]{padding-top:.05rem;color:grey;font-size:.16rem;word-break:break-all}.container .protocol[data-v-4df57167]{font-size:.14rem;margin-bottom:.3rem;text-align:center;display:block;color:#0091ff}.container .van-button--primary[data-v-4df57167]{margin:.35rem 0 .1rem;background-color:var(--main-color);border:1px solid var(--main-color);color:#fff;font-size:.18rem;height:.5rem;line-height:.52rem;width:90%;margin-left:5%}

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/css/SignUpBaseInfo.9696939c.css


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/css/SignUpLevel.58200754.css


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 1
dist/index.html


BIN
dist/js/PaymentResult.770cd594.js.gz
Ver Ficheiro


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/js/PaymentResult.fda8d0ed.js


BIN
dist/js/PaymentResult.fda8d0ed.js.gz
Ver Ficheiro


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/js/SignUp.2d8876e9.js


BIN
dist/js/SignUp.2d8876e9.js.gz
Ver Ficheiro


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/js/SignUp.92050db0.js


BIN
dist/js/SignUp.92050db0.js.gz
Ver Ficheiro


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/js/SignUpAccount.5894bdb2.js


BIN
dist/js/SignUpAccount.5894bdb2.js.gz
Ver Ficheiro


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/js/SignUpBaseInfo.c5cf1b1d.js


BIN
dist/js/SignUpBaseInfo.c5cf1b1d.js.gz
Ver Ficheiro


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/js/SignUpBaseInfo.f0451f91.js


BIN
dist/js/SignUpBaseInfo.f0451f91.js.gz
Ver Ficheiro


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/js/SignUpLevel.17abce65.js


BIN
dist/js/SignUpLevel.17abce65.js.gz
Ver Ficheiro


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/js/SignUpLevel.7199b67b.js


BIN
dist/js/SignUpLevel.7199b67b.js.gz
Ver Ficheiro


BIN
dist/js/SignUpPayment.5100ebbe.js.gz
Ver Ficheiro


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/js/SignUpPayment.658022cf.js


BIN
dist/js/SignUpPayment.658022cf.js.gz
Ver Ficheiro


+ 1 - 1
public/index.html
Ver Ficheiro 

@@ -26,7 +26,7 @@
 
 
 
     <!-- <link rel="stylesheet" href="https://www.unpkg.com/vant@2.8.4/lib/index.css"> -->
 
     <!-- <link rel="stylesheet" href="https://www.unpkg.com/vant@2.8.4/lib/index.css"> -->
 
     <script>!function(e,t){var n=t.documentElement,d=e.devicePixelRatio||1;function i(){var e=n.clientWidth/3.75;n.style.fontSize=e+"px"}if(function e(){t.body?t.body.style.fontSize="16px":t.addEventListener("DOMContentLoaded",e)}(),i(),e.addEventListener("resize",i),e.addEventListener("pageshow",function(e){e.persisted&&i()}),2<=d){var o=t.createElement("body"),a=t.createElement("div");a.style.border=".5px solid transparent",o.appendChild(a),n.appendChild(o),1===a.offsetHeight&&n.classList.add("hairlines"),n.removeChild(o)}}(window,document)</script>
 
     <script>!function(e,t){var n=t.documentElement,d=e.devicePixelRatio||1;function i(){var e=n.clientWidth/3.75;n.style.fontSize=e+"px"}if(function e(){t.body?t.body.style.fontSize="16px":t.addEventListener("DOMContentLoaded",e)}(),i(),e.addEventListener("resize",i),e.addEventListener("pageshow",function(e){e.persisted&&i()}),2<=d){var o=t.createElement("body"),a=t.createElement("div");a.style.border=".5px solid transparent",o.appendChild(a),n.appendChild(o),1===a.offsetHeight&&n.classList.add("hairlines"),n.removeChild(o)}}(window,document)</script>
 
-    <script type="text/javascript" src="./adaPay_min.js"></script>
 
+    <script type="text/javascript" src="./adaPay.min.js"></script>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <div id="app"></div>
 
     <div id="app"></div>

+ 2 - 4
src/views/signup/SignUp.vue
Ver Ficheiro 

@@ -24,12 +24,10 @@
 
 				<div class="content">{{ baseInfo.enrollTime }}</div>
 
 				<div class="content">{{ baseInfo.enrollTime }}</div>
 
 
 
 				<div class="title">预计考试日期</div>
 
 				<div class="title">预计考试日期</div>
 
-				<div class="content">{{ baseInfo.expectExamStartTime }}</div>
 
+				<div class="content">{{ baseInfo.expectExamTime }}</div>
 
 			</div>
 
 			</div>
 
-			<!-- <m-button class="sign-btn" @click="onSubmit" text="我要报名" /> -->
 
 			<van-button type="primary" :color="buttonColor" v-if="baseInfo.status" @click="onSubmit" round block>我要报名</van-button>
 
 			<van-button type="primary" :color="buttonColor" v-if="baseInfo.status" @click="onSubmit" round block>我要报名</van-button>
 
 			<a class="protocol" @click="onProtocol" v-if="baseInfo.status">协议</a>
 
 			<a class="protocol" @click="onProtocol" v-if="baseInfo.status">协议</a>
 
-			<!-- <m-button class="sign-btn" v-if="baseInfo.status === 'APPLYING'" @click="onSubmit" text="我要报名" /> -->
 
 		</div>
 
 		</div>
 
     </div>
 
     </div>
 
 </template>
 
 </template>
 
@@ -85,7 +83,7 @@ export default {
 
 						examMode: tempData.examMode,
 
 						examMode: tempData.examMode,
 
 						enrollTime: dayjs(tempData.enrollStartTime).format("YYYY-MM-DD HH:mm") + "～" + dayjs(tempData.enrollEndTime).format("YYYY-MM-DD HH:mm"),
 
 						enrollTime: dayjs(tempData.enrollStartTime).format("YYYY-MM-DD HH:mm") + "～" + dayjs(tempData.enrollEndTime).format("YYYY-MM-DD HH:mm"),
 
 						examLocationIdList: tempData.examLocationIdList,
 
 						examLocationIdList: tempData.examLocationIdList,
 
-						expectExamStartTime: dayjs(tempData.expectExamStartTime).format("YYYY-MM-DD"),
 
+						expectExamTime: dayjs(tempData.expectExamStartTime).format("YYYY-MM-DD") + "～" + dayjs(tempData.expectExamEndTime).format("YYYY-MM-DD"),
 
 						status: tempStatus,
 
 						status: tempStatus,
 
 						examLocations: tempData.examLocations, // 地址
 
 						examLocations: tempData.examLocations, // 地址
 
 						posterProfile: tempData.posterProfile
 
 						posterProfile: tempData.posterProfile

+ 9 - 0
src/views/signup/SignUpApi.js
Ver Ficheiro 

@@ -169,4 +169,13 @@ export function repay (data) {
 
         method: 'post',
 
         method: 'post',
 
         data: qs.stringify(data)
 
         data: qs.stringify(data)
 
     })
 
     })
 
+}
 
+
 
+// 关闭订单
 
+export function closeOrder (data) {
 
+    return axios({
 
+        url: '/api-user/examOrder/closeOrder',
 
+        method: 'post',
 
+        data: qs.stringify(data)
 
+    })
 
 }
 
 }

+ 12 - 2
src/views/signup/SignUpBaseInfo.vue
Ver Ficheiro 

@@ -57,7 +57,7 @@ import MHeader from '@/components/MHeader'
 
 import MStep from '@/components/MStep'
 
 import MStep from '@/components/MStep'
 
 import MButton from '@/components/MButton'
 
 import MButton from '@/components/MButton'
 
 import setLoading from '@/utils/loading'
 
 import setLoading from '@/utils/loading'
 
-import { getStudent, ocr, uploadFile, updateStudentInfo, getExamIngOrder } from './SignUpApi'
 
+import { getStudent, ocr, uploadFile, updateStudentInfo, getExamIngOrder, closeOrder } from './SignUpApi'
 
 import dayjs from 'dayjs'
 
 import dayjs from 'dayjs'
 
 export default {
 
 export default {
 
     name: 'signupBaseInfo',
 
     name: 'signupBaseInfo',
 
@@ -113,7 +113,7 @@ export default {
 
                 if(resultOrder.code == 200 && resultOrder.data) {
 
                 if(resultOrder.code == 200 && resultOrder.data) {
 
                     this.$dialog.confirm({
 
                     this.$dialog.confirm({
 
                         title: '提示',
 
                         title: '提示',
 
-                        message: "您有待支付订单",
 
+                        message: "您当前有待支付订单",
 
                         confirmButtonColor: '#269a93',
 
                         confirmButtonColor: '#269a93',
 
                         cancelButtonText: '取消订单',
 
                         cancelButtonText: '取消订单',
 
                         confirmButtonText: '去支付'
 
                         confirmButtonText: '去支付'
 
@@ -126,7 +126,12 @@ export default {
 
                             }
 
                             }
 
                         })
 
                         })
 
                     }).catch(() => {
 
                     }).catch(() => {
 
+                        const orderNo = resultOrder.data.orderNo
 
                         this.$dialog.close()
 
                         this.$dialog.close()
 
+                        if(!orderNo) {
 
+                            return
 
+                        }
 
+                        this.onCloseOrder(orderNo)
 
                     })
 
                     })
 
                 }
 
                 }
 
             } catch(err) {
 
             } catch(err) {
 
@@ -134,6 +139,11 @@ export default {
 
             }
 
             }
 
             setLoading(false)
 
             setLoading(false)
 
         },
 
         },
 
+        async onCloseOrder(orderNo) {
 
+            setLoading(true)
 
+            await closeOrder({ orderNo: orderNo })
 
+            setLoading(false)
 
+        },
 
         async onSubmit() {
 
         async onSubmit() {
 
             if(!this.onCheckFields()) {
 
             if(!this.onCheckFields()) {
 
                 return
 
                 return

+ 38 - 2
src/views/signup/SignUpLevel.vue
Ver Ficheiro 

@@ -127,7 +127,7 @@ import MHeader from '@/components/MHeader'
 
 import MStep from '@/components/MStep'
 
 import MStep from '@/components/MStep'
 
 import setLoading from '@/utils/loading'
 
 import setLoading from '@/utils/loading'
 
 import { patternPhone } from '@/utils/validateRules'
 
 import { patternPhone } from '@/utils/validateRules'
 
-import { getExamSubjects, getExamSubjectLevel, getExamSubjectSong, uploadFile, getTheoryLevelList } from './SignUpApi'
 
+import { getExamSubjects, getExamSubjectLevel, getExamSubjectSong, uploadFile, getTheoryLevelList, getExamIngOrder, closeOrder } from './SignUpApi'
 
 const levelToCN = {
 
 const levelToCN = {
 
     1: "一级",
 
     1: "一级",
 
     2: "二级",
 
     2: "二级",
 
@@ -147,7 +147,6 @@ export default {
 
         const examId = localStorage.getItem('examId')
 
         const examId = localStorage.getItem('examId')
 
         const organId = localStorage.getItem('organId')
 
         const organId = localStorage.getItem('organId')
 
         const examRegistrationParams = localStorage.getItem("examRegistrationParams") ? JSON.parse(localStorage.getItem("examRegistrationParams")) : null
 
         const examRegistrationParams = localStorage.getItem("examRegistrationParams") ? JSON.parse(localStorage.getItem("examRegistrationParams")) : null
 
-        localStorage.removeItem("examRegistrationParams")
 
         const query = this.$route.query
 
         const query = this.$route.query
 
         return {
 
         return {
 
             examId: examId,
 
             examId: examId,
 
@@ -231,6 +230,8 @@ export default {
 
         } else {
 
         } else {
 
             this.getTheoryLevelList()
 
             this.getTheoryLevelList()
 
         }
 
         }
 
+
 
+        this.onCheckOrder() // 查询有没有待支付订单
 
         // this.form.levelId = 1
 
         // this.form.levelId = 1
 
         // this.practiceNum = 2
 
         // this.practiceNum = 2
 
         // this.practiceSongIdList = ""
 
         // this.practiceSongIdList = ""
 
@@ -239,6 +240,41 @@ export default {
 
         // this.getExamSubjectSong()
 
         // this.getExamSubjectSong()
 
     },
 
     },
 
     methods: {
 
     methods: {
 
+        async onCheckOrder() {
 
+            const order = await getExamIngOrder({ examinationBasicId: this.examId })
 
+            const resultOrder = order.data
 
+            if(resultOrder.code == 200 && resultOrder.data) {
 
+                this.$dialog.confirm({
 
+                    title: '提示',
 
+                    message: "您当前有待支付订单",
 
+                    confirmButtonColor: '#269a93',
 
+                    cancelButtonText: '取消订单',
 
+                    confirmButtonText: '去支付'
 
+                }).then(() => {
 
+                    this.$router.push({
 
+                        path: '/signUpPayment',
 
+                        query: {
 
+                            orderNo: resultOrder.data.orderNo,
 
+                            examRegistrationId: resultOrder.data.examRegistrationId
 
+                        }
 
+                    })
 
+                }).catch(() => {
 
+                    const orderNo = resultOrder.data.orderNo
 
+                    this.$dialog.close()
 
+                    if(!orderNo) {
 
+                        return
 
+                    }
 
+                    this.onCloseOrder(orderNo)
 
+                })
 
+            } else {
 
+                localStorage.removeItem("examRegistrationParams")
 
+            }
 
+        },
 
+        async onCloseOrder(orderNo) {
 
+            setLoading(true)
 
+            await closeOrder({ orderNo: orderNo })
 
+            setLoading(false)
 
+        },
 
         async getRegisterInfo(data) {
 
         async getRegisterInfo(data) {
 
             if(!data) { // 判断是否有数据
 
             if(!data) { // 判断是否有数据
 
                 return
 
                 return

+ 2 - 2
vue.config.js
Ver Ficheiro 

@@ -1,8 +1,8 @@
 
 const path = require('path')
 
 const path = require('path')
 
 
 
-// let targetUrl = 'http://kjtest.dayaedu.com'
 
+let targetUrl = 'http://kjtest.dayaedu.com'
 
 // let targetUrl = 'http://192.168.3.28:8000/'
 
 // let targetUrl = 'http://192.168.3.28:8000/'
 
-let targetUrl = 'http://192.168.3.139:8000' // 箭河
 
+// let targetUrl = 'http://192.168.3.139:8000' // 箭河
 
 // let targetUrl = 'http://192.168.3.48:8000'
 
 // let targetUrl = 'http://192.168.3.48:8000'
 
 // let version = '1.0.0'
 
 // let version = '1.0.0'
 
 // webpack.prod.conf.js
 
 // webpack.prod.conf.js

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff