4 years ago
parent
commit
e646f07b84

+ 0 - 2
pages/Pay/css/pay.css

@@ -201,7 +201,6 @@
   top: 384rpx;
   top: 384rpx;
   left: 50%;
   left: 50%;
   transform: translateX(-325rpx);
   transform: translateX(-325rpx);
-  z-index: 5;
   width: 650rpx;
   width: 650rpx;
   height: 566rpx;
   height: 566rpx;
   background: #ffffff;
   background: #ffffff;
@@ -322,7 +321,6 @@
   top: 301rpx;
   top: 301rpx;
   left: 50%;
   left: 50%;
   transform: translateX(-325rpx);
   transform: translateX(-325rpx);
-  z-index: 5;
   width: 650rpx;
   width: 650rpx;
   height: 732rpx;
   height: 732rpx;
   background: #ffffff;
   background: #ffffff;

File diff suppressed because it is too large
+ 1 - 1
pages/Pay/css/pay.min.css


+ 0 - 2
pages/Pay/css/pay.scss

@@ -181,7 +181,6 @@
         top: 384rpx;
         top: 384rpx;
         left: 50%;
         left: 50%;
         transform: translateX(-325rpx);
         transform: translateX(-325rpx);
-        z-index: 5;
         width: 650rpx;
         width: 650rpx;
         height: 566rpx;
         height: 566rpx;
         background: #ffffff;
         background: #ffffff;
@@ -288,7 +287,6 @@
         top: 301rpx;
         top: 301rpx;
         left: 50%;
         left: 50%;
         transform: translateX(-325rpx);
         transform: translateX(-325rpx);
-        z-index: 5;
         width: 650rpx;
         width: 650rpx;
         height: 732rpx;
         height: 732rpx;
         background: #ffffff;
         background: #ffffff;

+ 10 - 1
pages/Pay/pay.vue

@@ -323,14 +323,17 @@ export default {
       let that = this;
       let that = this;
 
 
       let cardNumber = localStorage.getItem("cardNumber");
       let cardNumber = localStorage.getItem("cardNumber");
+
       if (cardNumber == null) {
       if (cardNumber == null) {
         uni.showToast({
         uni.showToast({
           title: "cardNumber为空,请重新授权",
           title: "cardNumber为空,请重新授权",
           icon: "error",
           icon: "error",
           mask: true,
           mask: true,
-          duration: 2000,
+          duration: 1500,
         });
         });
+        setTimeout(() => this.toBlank, 2000);
       }
       }
+
       let url =
       let url =
         that.homeUrl + `/tuitionpayment/payorder/${that.studentNo}/create`;
         that.homeUrl + `/tuitionpayment/payorder/${that.studentNo}/create`;
 
 
@@ -347,7 +350,9 @@ export default {
         sslVerify: true,
         sslVerify: true,
         success: ({ data, statusCode, header }) => {
         success: ({ data, statusCode, header }) => {
           let res = data.data;
           let res = data.data;
+
           that.orderNo = res.orderNo;
           that.orderNo = res.orderNo;
+
           if (!data.success) {
           if (!data.success) {
             //接口错误提示框
             //接口错误提示框
             uni.showToast({
             uni.showToast({
@@ -634,6 +639,10 @@ export default {
     toOrder() {
     toOrder() {
       uni.navigateTo({ url: "/pages/order/order" });
       uni.navigateTo({ url: "/pages/order/order" });
     },
     },
+    //跳转空白页面重新授权拿cardNumber
+    toBlank() {
+      uni.navigateTo({ url: "/pages/blankIndex/blankIndex" });
+    },
   },
   },
 };
 };
 </script>
 </script>

+ 8 - 2
pages/order/order.vue

@@ -377,17 +377,21 @@ export default {
     //支付
     //支付
     getPay() {
     getPay() {
       this.btDisabled = !this.btDisabled;
       this.btDisabled = !this.btDisabled;
+
       this.bgColor = " background: #b3b3b3;";
       this.bgColor = " background: #b3b3b3;";
+
       setTimeout(() => {
       setTimeout(() => {
         this.btDisabled = !this.btDisabled;
         this.btDisabled = !this.btDisabled;
         this.bgColor = " background: #298def;";
         this.bgColor = " background: #298def;";
       }, 4000);
       }, 4000);
+
       uni.showToast({
       uni.showToast({
         title: "支付中,请稍等",
         title: "支付中,请稍等",
         icon: "loading",
         icon: "loading",
         mask: true,
         mask: true,
         duration: 2000,
         duration: 2000,
       });
       });
+
       this.getOrderNo(); //获取订单号
       this.getOrderNo(); //获取订单号
     },
     },
     //获取订单号
     //获取订单号
@@ -395,15 +399,17 @@ export default {
       let that = this;
       let that = this;
 
 
       let cardNumber = localStorage.getItem("cardNumber");
       let cardNumber = localStorage.getItem("cardNumber");
+
       if (cardNumber == null) {
       if (cardNumber == null) {
         uni.showToast({
         uni.showToast({
           title: "cardNumber为空,请重新授权",
           title: "cardNumber为空,请重新授权",
           icon: "error",
           icon: "error",
           mask: true,
           mask: true,
-          duration: 2000,
+          duration: 1500,
         });
         });
-        setTimeout(() => this.toBlank, 3000);
+        setTimeout(() => this.toBlank, 2000);
       }
       }
+
       let url =
       let url =
         that.homeUrl + `/tuitionpayment/payorder/${that.studentNo}/create`;
         that.homeUrl + `/tuitionpayment/payorder/${that.studentNo}/create`;
 
 

+ 3 - 2
pages/parentPay/parentPay.vue

@@ -350,9 +350,9 @@ export default {
           title: "cardNumber为空,请重新授权",
           title: "cardNumber为空,请重新授权",
           icon: "error",
           icon: "error",
           mask: true,
           mask: true,
-          duration: 2000,
+          duration: 1500,
         });
         });
-        setTimeout(() => this.toBlank, 3000);
+        setTimeout(() => this.toBlank, 2000);
       }
       }
 
 
       let url =
       let url =
@@ -593,6 +593,7 @@ export default {
     toOrder() {
     toOrder() {
       uni.navigateTo({ url: "/pages/order/order" });
       uni.navigateTo({ url: "/pages/order/order" });
     },
     },
+    //跳转空白页面重新授权拿cardNumber
     toBlank() {
     toBlank() {
       uni.navigateTo({ url: "/pages/blankIndex/blankIndex" });
       uni.navigateTo({ url: "/pages/blankIndex/blankIndex" });
     },
     },