Merge branch '2024鹅状元' of https://gogs.mtavip.com/wangguoyu/uniProject into 2024鹅状元

.zsign_cache/c3eee05bcc82089c9d3fd44adc90d4c560b655ce.json

@@ -0,0 +1,154 @@
+
+{
+	"bid" : "com.llisoft.ezhuangyuan",
+	"bver" : "1429",
+	"changed" : 
+	[
+		"Frameworks/libswiftCoreImage.dylib",
+		"Frameworks/libswiftObjectiveC.dylib",
+		"Frameworks/libswiftCore.dylib",
+		"Frameworks/libswiftCoreGraphics.dylib",
+		"Frameworks/libswiftUIKit.dylib",
+		"Frameworks/libswiftMetal.dylib",
+		"Frameworks/libswiftDispatch.dylib",
+		"Frameworks/libswiftos.dylib",
+		"Frameworks/libswiftCoreFoundation.dylib",
+		"Frameworks/libswiftDarwin.dylib",
+		"Frameworks/libswiftQuartzCore.dylib",
+		"Frameworks/libswiftCoreAudio.dylib",
+		"Frameworks/libswiftAVFoundation.dylib",
+		"Frameworks/libswiftNetwork.dylib",
+		"Frameworks/libswiftFoundation.dylib",
+		"Frameworks/libswiftCoreMedia.dylib",
+		"Frameworks/libswiftsimd.dylib",
+		"Frameworks/GTMSessionFetcher.framework/_CodeSignature/CodeResources",
+		"Frameworks/GTMSessionFetcher.framework/GTMSessionFetcher",
+		"Frameworks/DCloudUTSExtAPI.framework/_CodeSignature/CodeResources",
+		"Frameworks/DCloudUTSExtAPI.framework/DCloudUTSExtAPI",
+		"Frameworks/GTMAppAuth.framework/_CodeSignature/CodeResources",
+		"Frameworks/GTMAppAuth.framework/GTMAppAuth",
+		"Frameworks/AppAuth.framework/_CodeSignature/CodeResources",
+		"Frameworks/AppAuth.framework/AppAuth",
+		"Frameworks/UPLiveSDKDll.framework/_CodeSignature/CodeResources",
+		"Frameworks/UPLiveSDKDll.framework/UPLiveSDKDll",
+		"Frameworks/KSAdSDK.framework/_CodeSignature/CodeResources",
+		"Frameworks/KSAdSDK.framework/KSAdSDK",
+		"Frameworks/DCUniBase.framework/_CodeSignature/CodeResources",
+		"Frameworks/DCUniBase.framework/DCUniBase",
+		"Frameworks/GoogleSignIn.framework/_CodeSignature/CodeResources",
+		"Frameworks/GoogleSignIn.framework/GoogleSignIn",
+		"Frameworks/DCloudUTSFoundation.framework/_CodeSignature/CodeResources",
+		"Frameworks/DCloudUTSFoundation.framework/DCloudUTSFoundation",
+		"embedded.mobileprovision"
+	],
+	"exec" : "HBuilder",
+	"files" : 
+	[
+		"Frameworks/libswiftCoreImage.dylib",
+		"Frameworks/libswiftObjectiveC.dylib",
+		"Frameworks/libswiftCore.dylib",
+		"Frameworks/libswiftCoreGraphics.dylib",
+		"Frameworks/libswiftUIKit.dylib",
+		"Frameworks/libswiftMetal.dylib",
+		"Frameworks/libswiftDispatch.dylib",
+		"Frameworks/libswiftos.dylib",
+		"Frameworks/libswiftCoreFoundation.dylib",
+		"Frameworks/libswiftDarwin.dylib",
+		"Frameworks/libswiftQuartzCore.dylib",
+		"Frameworks/libswiftCoreAudio.dylib",
+		"Frameworks/libswiftAVFoundation.dylib",
+		"Frameworks/libswiftNetwork.dylib",
+		"Frameworks/libswiftFoundation.dylib",
+		"Frameworks/libswiftCoreMedia.dylib",
+		"Frameworks/libswiftsimd.dylib"
+	],
+	"folders" : 
+	[
+		
+		{
+			"bid" : "org.cocoapods.GTMSessionFetcher",
+			"bver" : "1",
+			"exec" : "GTMSessionFetcher",
+			"path" : "Frameworks/GTMSessionFetcher.framework",
+			"sha1" : "7ywus4u1XOCnaIAGLf7wqJMNRN4=",
+			"sha2" : "z7dVrFBiMvRPsDleBp60hE/fOqLoDq50ONL2VnvhO90="
+		},
+		
+		{
+			"bid" : "io.dcloud.uts.extAPI",
+			"bver" : "1",
+			"exec" : "DCloudUTSExtAPI",
+			"path" : "Frameworks/DCloudUTSExtAPI.framework",
+			"sha1" : "P5PKi7DW/eoQi7CZ69rXkv4SxDo=",
+			"sha2" : "2EWqs5o0wEgi/GcpDo0J93UMXOq/ad6xiAipU5Cirso="
+		},
+		
+		{
+			"bid" : "org.cocoapods.GTMAppAuth",
+			"bver" : "1",
+			"exec" : "GTMAppAuth",
+			"path" : "Frameworks/GTMAppAuth.framework",
+			"sha1" : "g0XH3aSl6KVxVQdYM3ZDhVYpOxM=",
+			"sha2" : "NVY1j4MHBM73FUdP3v/wq3D5gpDuboUc6FKXhEKc3oQ="
+		},
+		
+		{
+			"bid" : "org.cocoapods.AppAuth",
+			"bver" : "1",
+			"exec" : "AppAuth",
+			"path" : "Frameworks/AppAuth.framework",
+			"sha1" : "ND8tP74JKYCK+NiKTnize+i4gyM=",
+			"sha2" : "Gdz+15Ri2J85z+pri6JvJRuc2RAn1xHE4UMg2TEKK7I="
+		},
+		
+		{
+			"bid" : "upyun.UPLiveSDKDll",
+			"bver" : "1",
+			"exec" : "UPLiveSDKDll",
+			"path" : "Frameworks/UPLiveSDKDll.framework",
+			"sha1" : "9ptoKpCP6CY3FmnLi23Q+jvoi7c=",
+			"sha2" : "rFhl5jJHqlgZQGVpjM6Punk8/08j/bnaPAhh3+4Ydow="
+		},
+		
+		{
+			"bid" : "org.cocoapods.KSAdSDK",
+			"bver" : "1",
+			"exec" : "KSAdSDK",
+			"path" : "Frameworks/KSAdSDK.framework",
+			"sha1" : "hao+8JLEzZA66De0O0cZhdySgLE=",
+			"sha2" : "37kKrKPJbY1FE8NBZ5EiUglYmX715h+3vQOS0aBrCaM="
+		},
+		
+		{
+			"bid" : "io.dcloud.DCUniBaseUniMP",
+			"bver" : "1",
+			"exec" : "DCUniBase",
+			"path" : "Frameworks/DCUniBase.framework",
+			"sha1" : "vwd5VA8BbiTdW9lKVpBg+y7wOdU=",
+			"sha2" : "RWepJiA7iAJ8TQRYVpIOXCa1M09m3DvKB7nbQYkITso="
+		},
+		
+		{
+			"bid" : "org.cocoapods.GoogleSignIn",
+			"bver" : "1",
+			"exec" : "GoogleSignIn",
+			"path" : "Frameworks/GoogleSignIn.framework",
+			"sha1" : "Ol0QYalGrYo1N0zVIicsXCsgLm4=",
+			"sha2" : "ABZvzfeD2OBWGprzrkgQCgnbn7+7yPWQgsQyf7/kfw4="
+		},
+		
+		{
+			"bid" : "io.dcloud.DCloudUTSFoundationUniMP",
+			"bver" : "1",
+			"exec" : "DCloudUTSFoundation",
+			"path" : "Frameworks/DCloudUTSFoundation.framework",
+			"sha1" : "ge7s2KZrszUxsEquJVbIdTkxT6U=",
+			"sha2" : "hzUC1wMZju2InE4rp6F1Bn8Rwr+SqiU+5AjE7C55rJQ="
+		}
+	],
+	"name" : "HBuilder",
+	"path" : "/",
+	"root" : "/var/folders/fd/7440ggxn1gl9ftmsy9zyjdpr0000gn/T/HbuilderXSignture/Payload/HBuilder.app",
+	"sha1" : "1o982LPxRMjpszlxJif+6+CsAZM=",
+	"sha2" : "l2A50RNlywhNtimj2SduL37Pvs/emZHR3x/E1qIfa4c="
+}

manifest.json

@@ -3,7 +3,7 @@
     "appid" : "__UNI__CB9D85D",
     "description" : "",
     "versionName" : "1.0.1",
-    "versionCode" : 6,
+    "versionCode" : 9,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -72,6 +72,11 @@
                 "payment" : {
                     "alipay" : {
                         "__platform__" : [ "ios", "android" ]
+                    },
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wxd6a8954fa7b0f8a0",
+                        "UniversalLinks" : "https://goosechampion.com/app/"
                     }
                 }
             },

pages/login/index.vue

@@ -263,62 +263,68 @@
 		// 		  }
 		// 	  });
 		//    }
-		// });
-		uni.login({
-			"provider": "weixin",
-			"onlyAuthorize": true, // 微信登录仅请求授权认证
-			success: function(event) {
-				console.log(event);
-				const {
-					code
-				} = event
-				//客户端成功获取授权临时票据（code）,向业务服务器发起登录请求。
-				let req = {
-					"apple": false,
-					"code": code
-				}
-				console.log(req);
-				wxLogin(req).then(res => {
-					console.log(res);
-					if (!res.data.bind) {
-						console.log('未绑定');
-						cacheManager.set('wxLogin', {
-							bind: res.data.bing
-						})
-						telDialogFlag.value = true;
-						nextTick(() => {
-							telDialogRef.value.getOpenId(res.data.openId);
-						})
-					} else {
-						uni.showLoading({
-							title: '登录中'
-						});
-						setTimeout(() => {
-							cacheManager.set('auth', res.data.loginVo)
-							if (res.data.loginVo.cardId == 0) {
-
-								uni.redirectTo({
-									url: `/pages/selectGradesTerms/index`
-								})
-								uni.hideLoading();
-							} else {
-
-								uni.redirectTo({
-									url: `/pages/study/index`
-								})
-								uni.hideLoading();
-							}
-						}, 1000)
-					}
-				}).catch((error) => {
-					console.log(error);
-				})
-			},
-			fail: function(err) {
-				console.log(err);
-				// 登录授权失败
-				// err.code是错误码
-			}
-		})
+		// });
+		if(plus.runtime.isApplicationExist({ pname: 'com.tencent.mm', action: 'weixin://' })) {
+			console.log('111',"已安装微信");
+		uni.login({
+			"provider": "weixin",
+			"onlyAuthorize": true, // 微信登录仅请求授权认证
+			success: function(event) {
+				console.log(event);
+				const {
+					code
+				} = event
+				//客户端成功获取授权临时票据（code）,向业务服务器发起登录请求。
+				let req = {
+					"apple": false,
+					"code": code
+				}
+				console.log(req);
+				wxLogin(req).then(res => {
+					console.log(res);
+					if (!res.data.bind) {
+						console.log('未绑定');
+						cacheManager.set('wxLogin', {
+							bind: res.data.bing
+						})
+						telDialogFlag.value = true;
+						nextTick(() => {
+							telDialogRef.value.getOpenId(res.data.openId);
+						})
+					} else {
+						uni.showLoading({
+							title: '登录中'
+						});
+						setTimeout(() => {
+							cacheManager.set('auth', res.data.loginVo)
+							if (res.data.loginVo.cardId == 0) {
+		
+								uni.redirectTo({
+									url: `/pages/selectGradesTerms/index`
+								})
+								uni.hideLoading();
+							} else {
+		
+								uni.redirectTo({
+									url: `/pages/study/index`
+								})
+								uni.hideLoading();
+							}
+						}, 1000)
+					}
+				}).catch((error) => {
+					console.log(error);
+				})
+			},
+			fail: function(err) {
+				console.log(err);
+				// 登录授权失败
+				// err.code是错误码
+			}
+		})
+		} else {
+			toast("未安装微信,请安装微信进行登录！")
+			return false
+		}
 	}
 </script>

pages/pay/svip.vue

@@ -54,7 +54,8 @@
 	} from "vue";
 	import {
 		orderAdd,
-		orderPayAli
+		orderPayAli,
+		orderPayWx,
 	} from "@/api/order.js"
 	import CustomTabBar from '@/components/custom-tabbar/custom-tabbar.vue';
 	import cacheManager from "@/utils/cacheManager.js";
@@ -106,65 +107,128 @@
 
 	function creatOrder(data) {
 
-		if(payType.value =='weixin'){
-			toast("微信支付暂未开通,请选择支付宝")
-			return false
-		}
-		let req = {
-			cardId: cardId.value
-		}
-		orderAdd(req).then(res => {
-			console.log('res',res);
-			orderPayAli({id:res.data.id}).then(res2=>{
-				console.log('res2',res2);
-				  uni.requestPayment({
-				                "provider": "alipay",  
-				                "orderInfo": res2.data.text, //此处为服务器返回的订单信息字符串
-				                success: function (res) {
-				                   var rawdata = JSON.parse(res.rawdata);
-								   console.log('支付成功');
-								   console.log('rawdata',rawdata);
-				                  // toast("支付成功");
-								   cacheManager.updateVipStatus('auth', cardId.value)
-								   cacheManager.updateObject('auth', {
-								   	growthType: 1
-								   })
-								   if (isVip != 'VIP') {
-								   	daoPokeRef.value.handleShow();
-								   } else {
-								   	daoPokeAllRef.value.handleShow();
-								   }
-								   setTimeout(() => {
-								   	daoPokeRef.value.handleClose();
-								   	daoPokeAllRef.value.handleClose();
-								   	if(formPage.value =='my'){
-								   		uni.redirectTo({
-								   			url: '/pages/my/index'
-								   		})
-								   	}else{
-								   		uni.redirectTo({
-								   			url: '/pages/study/index'
-								   		})
-								   	}
-								   }, 3000)
-				                },
-				                fail: function (err) {
-				                 //  toast('支付失败:' + JSON.stringify(err));
-				                   console.log('支付失败:' + JSON.stringify(err));
-				                }
-				            });
+		if (payType.value == 'weixin') {
+			let req = {
+				cardId: cardId.value
+			}
+			orderAdd(req).then(res => {
+				console.log('res', res);
+				console.log(' res.data.id',  res.data.id);
+				orderPayWx({
+					id: res.data.id
+				}).then(res2 => {
+					console.log('res2', res2);
+					uni.requestPayment({
+						"provider": "wxpay",
+						"orderInfo": {
+							  "appid": res2.data.appid,  // 应用ID（AppID）
+							  "partnerid":  res2.data.partnerId,      // 商户号（PartnerID）
+							  "prepayid": res2.data.prepayId, // 预支付交易会话ID
+							  "package": res2.data.packageVal,        // 固定值
+							  "noncestr":  res2.data.nonceStr, // 随机字符串
+							  "timestamp":  res2.data.timestamp,        // 时间戳（单位：秒）
+							  "sign":  res2.data.sign // 签名，这里用的 MD5 签名
+						}, //此处为服务器返回的订单信息字符串
+						success: function(res) {
+							var rawdata = JSON.parse(res.rawdata);
+							console.log('支付成功');
+							console.log('rawdata', rawdata);
+							// toast("支付成功");
+							cacheManager.updateVipStatus('auth', cardId.value)
+							cacheManager.updateObject('auth', {
+								growthType: 1
+							})
+							if (isVip != 'VIP') {
+								daoPokeRef.value.handleShow();
+							} else {
+								daoPokeAllRef.value.handleShow();
+							}
+							setTimeout(() => {
+								daoPokeRef.value.handleClose();
+								daoPokeAllRef.value.handleClose();
+								if (formPage.value == 'my') {
+									uni.redirectTo({
+										url: '/pages/my/index'
+									})
+								} else {
+									uni.redirectTo({
+										url: '/pages/study/index'
+									})
+								}
+							}, 3000)
+						},
+						fail: function(err) {
+							//  toast('支付失败:' + JSON.stringify(err));
+							console.log('支付失败:' + JSON.stringify(err));
+						}
+					});
+				}).catch((error) => {
+				console.log(error);
+			})
+
+
 			})
-			
-	
-		})
+		} else {
+			let req = {
+				cardId: cardId.value
+			}
+			orderAdd(req).then(res => {
+				console.log('res', res);
+				orderPayAli({
+					id: res.data.id
+				}).then(res2 => {
+					console.log('res2', res2);
+
+					uni.requestPayment({
+						"provider": "alipay",
+						"orderInfo": res2.data.text, //此处为服务器返回的订单信息字符串
+						success: function(res) {
+							var rawdata = JSON.parse(res.rawdata);
+							console.log('支付成功');
+							console.log('rawdata', rawdata);
+							// toast("支付成功");
+							cacheManager.updateVipStatus('auth', cardId.value)
+							cacheManager.updateObject('auth', {
+								growthType: 1
+							})
+							if (isVip != 'VIP') {
+								daoPokeRef.value.handleShow();
+							} else {
+								daoPokeAllRef.value.handleShow();
+							}
+							setTimeout(() => {
+								daoPokeRef.value.handleClose();
+								daoPokeAllRef.value.handleClose();
+								if (formPage.value == 'my') {
+									uni.redirectTo({
+										url: '/pages/my/index'
+									})
+								} else {
+									uni.redirectTo({
+										url: '/pages/study/index'
+									})
+								}
+							}, 3000)
+						},
+						fail: function(err) {
+							//  toast('支付失败:' + JSON.stringify(err));
+							console.log('支付失败:' + JSON.stringify(err));
+						}
+					});
+				})
+
+
+			})
+		}
+
 	}
 
 	function goBack(data) {
-		if(formPage.value =='my'){
+		if (formPage.value == 'my') {
 			uni.redirectTo({
 				url: '/pages/my/index'
 			})
-		}else{
+		} else {
 			uni.redirectTo({
 				url: '/pages/study/index'
 			})