6 år sedan · 311e8dd602
--- a/src/main/phone/package-lock.json
+++ b/src/main/phone/package-lock.json
@@ -7491,6 +7491,11 @@
 
				         }
			
 
				       }
			
 
				     },
			
 
				+    "moment": {
			
 
				+      "version": "2.24.0",
			
 
				+      "resolved": "https://registry.npm.taobao.org/moment/download/moment-2.24.0.tgz",
			
 
				+      "integrity": "sha1-DQVdU/UFKqZTyfbraLtdEr9cK1s="
			
 
				+    },
			
 
				     "move-concurrently": {
			
 
				       "version": "1.0.1",
			
 
				       "resolved": "https://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz",
			
--- a/src/main/phone/package.json
+++ b/src/main/phone/package.json
@@ -10,6 +10,7 @@
 
				   "dependencies": {
			
 
				     "axios": "^0.19.0",
			
 
				     "core-js": "^2.6.5",
			
 
				+    "moment": "^2.24.0",
			
 
				     "qrcode": "^1.4.1",
			
 
				     "vant": "^2.1.8",
			
 
				     "vue": "^2.6.10",
			
--- a/src/main/phone/src/router.js
+++ b/src/main/phone/src/router.js
@@ -85,16 +85,23 @@ router.beforeEach((to, from, next) => {
 
				               next();
			
 
				             }
			
 
				             return;
			
 
				+          } else if (to.name == "login") {
			
 
				+            next();
			
 
				           } else {
			
 
				             next("/login");
			
 
				           }
			
 
				         })
			
 
				         .catch(() => {
			
 
				-          next("/login");
			
 
				+          if (to.name == "login") {
			
 
				+            next();
			
 
				+          } else {
			
 
				+            next("/login");
			
 
				+          }
			
 
				         });
			
 
				     } else if (!to.matched.length) {
			
 
				       next("/404");
			
 
				     } else {
			
 
				+      console.log("aaaaaa");
			
 
				       if (to.name == "login") {
			
 
				         next("/");
			
 
				       } else {
			
--- a/src/main/phone/src/views/pay/CloudFlash.vue
+++ b/src/main/phone/src/views/pay/CloudFlash.vue
@@ -5,7 +5,7 @@
 
				         </div>
			
 
				         <div class="main">
			
 
				             <div class="money">{{orderInfo.money}}</div>
			
 
				-            <div class="time">过期时间：15:45:30</div>
			
 
				+            <div class="time">过期时间：{{doneTime}}</div>
			
 
				             <div class="qrcode">
			
 
				                 <div class="img"
			
 
				                     :style="{backgroundImage:'url('+payCodeInfo.image+')'}">
			
@@ -48,6 +48,10 @@ export default {
 
				             default: () => {
			
 
				                 return {};
			
 
				             }
			
 
				+        },
			
 
				+        doneTime:{
			
 
				+            type:String,
			
 
				+            default:''
			
 
				         }
			
 
				     },
			
 
				     data() {
			
--- a/src/main/phone/src/views/pay/Index.vue
+++ b/src/main/phone/src/views/pay/Index.vue
@@ -2,10 +2,10 @@
 
				     <div class='pay'>
			
 
				         <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
			
 
				             <div>
			
 
				-                <wechat v-if="payType=='wechat'" :orderInfo="orderInfo">
			
 
				+                <wechat v-if="payType=='wechat'" :orderInfo="orderInfo" :doneTime='doneTime'>
			
 
				                 </wechat>
			
 
				                 <cloudFlash v-else-if="payType=='cloud_flash'"
			
 
				-                    :orderInfo="orderInfo">
			
 
				+                    :orderInfo="orderInfo" :doneTime='doneTime'>
			
 
				                 </cloudFlash>
			
 
				             </div>
			
 
				         </van-pull-refresh>
			
@@ -14,6 +14,7 @@
 
				 <script>
			
 
				 import cloudFlash from "./CloudFlash";
			
 
				 import wechat from "./Wechat";
			
 
				+import moment from 'moment'
			
 
				 export default {
			
 
				     name: "pay",
			
 
				     data() {
			
@@ -23,6 +24,11 @@ export default {
 
				             isLoading: false
			
 
				         };
			
 
				     },
			
 
				+    computed:{
			
 
				+        doneTime(){
			
 
				+            return moment(this.orderInfo.createTime).add(0.09,'hours').format('HH:mm:ss')
			
 
				+        }
			
 
				+    },
			
 
				     created() {
			
 
				         this.getInfo();
			
 
				     },
			
--- a/src/main/phone/src/views/pay/Wechat.vue
+++ b/src/main/phone/src/views/pay/Wechat.vue
@@ -5,7 +5,7 @@
 
				         </div>
			
 
				         <div class="main">
			
 
				             <div class="money">{{orderInfo.money}}</div>
			
 
				-            <div class="time">过期时间：15:45:30</div>
			
 
				+            <div class="time">过期时间：{{doneTime}}</div>
			
 
				             <div class="qrcode">
			
 
				                 <div class="img"
			
 
				                     :style="{backgroundImage:'url('+payCodeInfo.image+')'}">
			
@@ -32,6 +32,10 @@ export default {
 
				             default: () => {
			
 
				                 return {};
			
 
				             }
			
 
				+        },
			
 
				+        doneTime:{
			
 
				+            type:String,
			
 
				+            default:''
			
 
				         }
			
 
				     },
			
 
				     data() {
			
--- a/src/main/webapp/phone/css/chunk-820d1570.42cef544.css
+++ b/src/main/webapp/phone/css/chunk-820d1570.42cef544.css
--- a/src/main/webapp/phone/index.html
+++ b/src/main/webapp/phone/index.html
@@ -1,3 +1,3 @@
 
				 <!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=icon_logo.ico><title>全民电竞</title><style>body {
			
 
				             background-color: #2e3049;
			
 
				-        }</style><link href=css/chunk-328b5d5a.8dd0244a.css rel=prefetch><link href=css/chunk-3866ce2a.819b39e4.css rel=prefetch><link href=css/chunk-474b536c.966f2ee3.css rel=prefetch><link href=css/chunk-addb732a.3024b250.css rel=prefetch><link href=js/chunk-2d22d746.145e8ec4.js rel=prefetch><link href=js/chunk-328b5d5a.519b379c.js rel=prefetch><link href=js/chunk-3866ce2a.3e893c6a.js rel=prefetch><link href=js/chunk-474b536c.466ad121.js rel=prefetch><link href=js/chunk-addb732a.901641df.js rel=prefetch><link href=css/app.14f8f0f7.css rel=preload as=style><link href=css/chunk-vendors.598da5eb.css rel=preload as=style><link href=js/app.6634c5d1.js rel=preload as=script><link href=js/chunk-vendors.2796d7d9.js rel=preload as=script><link href=css/chunk-vendors.598da5eb.css rel=stylesheet><link href=css/app.14f8f0f7.css rel=stylesheet></head><body><div id=app></div><script src=js/chunk-vendors.2796d7d9.js></script><script src=js/app.6634c5d1.js></script></body></html>
			
 
				+        }</style><link href=css/chunk-328b5d5a.8dd0244a.css rel=prefetch><link href=css/chunk-3866ce2a.819b39e4.css rel=prefetch><link href=css/chunk-474b536c.966f2ee3.css rel=prefetch><link href=css/chunk-820d1570.42cef544.css rel=prefetch><link href=js/chunk-2d22d746.fcfd2b03.js rel=prefetch><link href=js/chunk-328b5d5a.e22bcc69.js rel=prefetch><link href=js/chunk-3866ce2a.acbb7949.js rel=prefetch><link href=js/chunk-474b536c.281621a6.js rel=prefetch><link href=js/chunk-820d1570.014ea4dc.js rel=prefetch><link href=css/app.14f8f0f7.css rel=preload as=style><link href=css/chunk-vendors.598da5eb.css rel=preload as=style><link href=js/app.e273b2db.js rel=preload as=script><link href=js/chunk-vendors.2796d7d9.js rel=preload as=script><link href=css/chunk-vendors.598da5eb.css rel=stylesheet><link href=css/app.14f8f0f7.css rel=stylesheet></head><body><div id=app></div><script src=js/chunk-vendors.2796d7d9.js></script><script src=js/app.e273b2db.js></script></body></html>
			
--- a/src/main/webapp/phone/js/app.6634c5d1.js.map
+++ b/src/main/webapp/phone/js/app.6634c5d1.js.map
--- a/src/main/webapp/phone/js/app.e273b2db.js
+++ b/src/main/webapp/phone/js/app.e273b2db.js
--- a/src/main/webapp/phone/js/app.e273b2db.js.map
+++ b/src/main/webapp/phone/js/app.e273b2db.js.map
--- a/src/main/webapp/phone/js/chunk-2d22d746.fcfd2b03.js
+++ b/src/main/webapp/phone/js/chunk-2d22d746.fcfd2b03.js
@@ -1,2 +1,2 @@
 
				 (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d22d746"],{f820:function(t,e,n){"use strict";n.r(e);var a=function(){var t=this,e=t.$createElement;t._self._c;return t._m(0)},s=[function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"about"},[n("h1",[t._v("This is an about page")])])}],u=n("2877"),c={},i=Object(u["a"])(c,a,s,!1,null,null,null);e["default"]=i.exports}}]);
			
 
				-//# sourceMappingURL=chunk-2d22d746.145e8ec4.js.map
			
 
				+//# sourceMappingURL=chunk-2d22d746.fcfd2b03.js.map
			
--- a/src/main/webapp/phone/js/chunk-2d22d746.fcfd2b03.js.map
+++ b/src/main/webapp/phone/js/chunk-2d22d746.fcfd2b03.js.map
@@ -1 +1 @@
 
				-{"version":3,"sources":["webpack:///./src/views/About.vue?9ad3","webpack:///./src/views/About.vue"],"names":["render","_vm","this","_h","$createElement","_self","_c","_m","staticRenderFns","staticClass","_v","script","component"],"mappings":"uHAAA,IAAIA,EAAS,WAAa,IAAIC,EAAIC,KAASC,EAAGF,EAAIG,eAAsBH,EAAII,MAAMC,GAAO,OAAOL,EAAIM,GAAG,IACnGC,EAAkB,CAAC,WAAa,IAAIP,EAAIC,KAASC,EAAGF,EAAIG,eAAmBE,EAAGL,EAAII,MAAMC,IAAIH,EAAG,OAAOG,EAAG,MAAM,CAACG,YAAY,SAAS,CAACH,EAAG,KAAK,CAACL,EAAIS,GAAG,+B,YCAtJC,EAAS,GAKTC,EAAY,eACdD,EACAX,EACAQ,GACA,EACA,KACA,KACA,MAIa,aAAAI,E","file":"js/chunk-2d22d746.145e8ec4.js","sourcesContent":["var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _vm._m(0)}\nvar staticRenderFns = [function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:\"about\"},[_c('h1',[_vm._v(\"This is an about page\")])])}]\n\nexport { render, staticRenderFns }","import { render, staticRenderFns } from \"./About.vue?vue&type=template&id=1ae8a7be&\"\nvar script = {}\n\n\n/* normalize component */\nimport normalizer from \"!../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  null,\n  null\n  \n)\n\nexport default component.exports"],"sourceRoot":""}
			
 
				+{"version":3,"sources":["webpack:///./src/views/About.vue?e5f1","webpack:///./src/views/About.vue"],"names":["render","_vm","this","_h","$createElement","_self","_c","_m","staticRenderFns","staticClass","_v","script","component"],"mappings":"uHAAA,IAAIA,EAAS,WAAa,IAAIC,EAAIC,KAASC,EAAGF,EAAIG,eAAsBH,EAAII,MAAMC,GAAO,OAAOL,EAAIM,GAAG,IACnGC,EAAkB,CAAC,WAAa,IAAIP,EAAIC,KAASC,EAAGF,EAAIG,eAAmBE,EAAGL,EAAII,MAAMC,IAAIH,EAAG,OAAOG,EAAG,MAAM,CAACG,YAAY,SAAS,CAACH,EAAG,KAAK,CAACL,EAAIS,GAAG,+B,YCAtJC,EAAS,GAKTC,EAAY,eACdD,EACAX,EACAQ,GACA,EACA,KACA,KACA,MAIa,aAAAI,E","file":"js/chunk-2d22d746.fcfd2b03.js","sourcesContent":["var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _vm._m(0)}\nvar staticRenderFns = [function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:\"about\"},[_c('h1',[_vm._v(\"This is an about page\")])])}]\n\nexport { render, staticRenderFns }","import { render, staticRenderFns } from \"./About.vue?vue&type=template&id=1ae8a7be&\"\nvar script = {}\n\n\n/* normalize component */\nimport normalizer from \"!../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  null,\n  null\n  \n)\n\nexport default component.exports"],"sourceRoot":""}
			
--- a/src/main/webapp/phone/js/chunk-328b5d5a.e22bcc69.js
+++ b/src/main/webapp/phone/js/chunk-328b5d5a.e22bcc69.js
--- a/src/main/webapp/phone/js/chunk-328b5d5a.e22bcc69.js.map
+++ b/src/main/webapp/phone/js/chunk-328b5d5a.e22bcc69.js.map
--- a/src/main/webapp/phone/js/chunk-3866ce2a.acbb7949.js
+++ b/src/main/webapp/phone/js/chunk-3866ce2a.acbb7949.js
--- a/src/main/webapp/phone/js/chunk-3866ce2a.acbb7949.js.map
+++ b/src/main/webapp/phone/js/chunk-3866ce2a.acbb7949.js.map
--- a/src/main/webapp/phone/js/chunk-474b536c.281621a6.js
+++ b/src/main/webapp/phone/js/chunk-474b536c.281621a6.js
--- a/src/main/webapp/phone/js/chunk-474b536c.281621a6.js.map
+++ b/src/main/webapp/phone/js/chunk-474b536c.281621a6.js.map
--- a/src/main/webapp/phone/js/chunk-820d1570.014ea4dc.js
+++ b/src/main/webapp/phone/js/chunk-820d1570.014ea4dc.js
--- a/src/main/webapp/phone/js/chunk-820d1570.014ea4dc.js.map
+++ b/src/main/webapp/phone/js/chunk-820d1570.014ea4dc.js.map
--- a/src/main/webapp/phone/js/chunk-addb732a.901641df.js
+++ b/src/main/webapp/phone/js/chunk-addb732a.901641df.js
--- a/src/main/webapp/phone/js/chunk-addb732a.901641df.js.map
+++ b/src/main/webapp/phone/js/chunk-addb732a.901641df.js.map