解决冲突

pageA/payorder.vue

@@ -207,6 +207,7 @@
 							customer_currency: "RMB",
 						})
 						.then((res) => {
+							console.log(res);
 							if (this.pay_type == "wechat") {
 								uni.requestPayment({
 									provider: 'wxpay',
@@ -215,16 +216,26 @@
 									package: res.package,
 									signType: res.signType,
 									paySign: res.paySign,
-									success: (result) => {
+									success: function(res) {
 										this.$u.toast('支付成功')
-										// console.log(result);
-										uni.navigateTo({
-											url: "confirm",
-										});
-									},
-									fail: (error) => {
-										console.log(error);
+										console.log('success:' + JSON.stringify(res));
+										setTimeout(() => {
+												// uni.navigateTo({
+												// 	url: "confirm",
+												// });
+										}, 800);
 									},
+									fail: function(err) {
+										console.log('fail:' + JSON.stringify(err));
+									}
+									// success: (result) => {
+									// 	
+									// 	// console.log(result);
+
+									// },
+									// fail: (error) => {
+									// 	console.log(error);
+									// },
 								});
 							}
 						})

pages/login/login.vue

@@ -102,11 +102,11 @@
 															uni.setStorageSync("token", res.token);
 															uni.setStorageSync("openid", res
 																.openid);
-															// setTimeout(() => {
-															// 	uni.navigateTo({
-															// 		url: "/pageA/changelange",
-															// 	});
-															// }, 300);
+															setTimeout(() => {
+																uni.navigateTo({
+																	url: "/pageA/changelange",
+																});
+															}, 300);
 														})
 														.catch(() => {});
 												})
@@ -168,9 +168,9 @@
 						  }
 						};
 						conn.open(options);
-						// uni.switchTab({
-						// 	url: "/pages/index/index",
-						// });
+						uni.switchTab({
+							url: "/pages/index/index",
+						});
 					})
 					.catch((error) => {
 						console.log(error);

unpackage/dist/build/mp-weixin/pageA/payorder.wxss

@@ -1 +1 @@
-.payment.data-v-58b0b8e1{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-58b0b8e1{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-58b0b8e1{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-58b0b8e1{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-58b0b8e1{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-58b0b8e1{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-58b0b8e1{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-58b0b8e1{position:relative}.back .topbox .state.data-v-58b0b8e1{width:128rpx;background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-58b0b8e1{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-58b0b8e1{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}
+.payment.data-v-98025b48{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-98025b48{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-98025b48{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-98025b48{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-98025b48{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-98025b48{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-98025b48{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-98025b48{position:relative}.back .topbox .state.data-v-98025b48{width:128rpx;background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-98025b48{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-98025b48{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}

unpackage/dist/build/mp-weixin/pages/login/login.wxss

@@ -1 +1 @@
-page.data-v-94f87ba8{background-color:#fff!important;height:100vh}.login-btn.data-v-94f87ba8{width:662rpx;height:96rpx;background:#f83224;box-shadow:0rpx 16rpx 40rpx -12rpx rgba(255,21,21,.5);border-radius:48rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:96rpx;text-align:center;font-style:normal}.fontYin.data-v-94f87ba8{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#666;line-height:34rpx;text-align:left;font-style:normal}
+page.data-v-d2872db8{background-color:#fff!important;height:100vh}.login-btn.data-v-d2872db8{width:662rpx;height:96rpx;background:#f83224;box-shadow:0rpx 16rpx 40rpx -12rpx rgba(255,21,21,.5);border-radius:48rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:96rpx;text-align:center;font-style:normal}.fontYin.data-v-d2872db8{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#666;line-height:34rpx;text-align:left;font-style:normal}

unpackage/dist/build/mp-weixin/pages/mine/component/personalFunction.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pageA/payorder.js

@@ -343,6 +343,7 @@ var _default = {
           pay_type: this.pay_type,
           customer_currency: "RMB"
         }).then(function (res) {
+          console.log(res);
           if (_this5.pay_type == "wechat") {
             uni.requestPayment({
               provider: 'wxpay',
@@ -351,16 +352,26 @@ var _default = {
               package: res.package,
               signType: res.signType,
               paySign: res.paySign,
-              success: function success(result) {
-                _this5.$u.toast('支付成功');
-                // console.log(result);
-                uni.navigateTo({
-                  url: "confirm"
-                });
+              success: function success(res) {
+                this.$u.toast('支付成功');
+                console.log('success:' + JSON.stringify(res));
+                setTimeout(function () {
+                  // uni.navigateTo({
+                  // 	url: "confirm",
+                  // });
+                }, 800);
               },
-              fail: function fail(error) {
-                console.log(error);
+              fail: function fail(err) {
+                console.log('fail:' + JSON.stringify(err));
               }
+              // success: (result) => {
+              // 	
+              // 	// console.log(result);
+
+              // },
+              // fail: (error) => {
+              // 	console.log(error);
+              // },
             });
           }
         }).catch(function () {});

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -261,11 +261,11 @@ var _default = {
                       _WebIM.conn.open(options);
                       uni.setStorageSync("token", res.token);
                       uni.setStorageSync("openid", res.openid);
-                      // setTimeout(() => {
-                      // 	uni.navigateTo({
-                      // 		url: "/pageA/changelange",
-                      // 	});
-                      // }, 300);
+                      setTimeout(function () {
+                        uni.navigateTo({
+                          url: "/pageA/changelange"
+                        });
+                      }, 300);
                     }).catch(function () {});
                   }).catch(function () {});
                 } else {
@@ -321,9 +321,9 @@ var _default = {
           error: function error() {}
         };
         _WebIM.conn.open(options);
-        // uni.switchTab({
-        // 	url: "/pages/index/index",
-        // });
+        uni.switchTab({
+          url: "/pages/index/index"
+        });
       }).catch(function (error) {
         console.log(error);
       });