From 4ac3c2382e0733685f7612f8e9ca4e85d15c1411 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期日, 25 六月 2023 08:55:00 +0800
Subject: [PATCH] Merge branch 'hotfix/苹果审核修改'

---
 uniapp/pages/goods/shareGoods.vue |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/uniapp/pages/goods/shareGoods.vue b/uniapp/pages/goods/shareGoods.vue
index 021035c..f9e334f 100644
--- a/uniapp/pages/goods/shareGoods.vue
+++ b/uniapp/pages/goods/shareGoods.vue
@@ -256,10 +256,10 @@
 
         onLoad(options) {
 			this.appInfo = utils.getCacheSync('appInfo');
-			console.log(this.appInfo)
-          //  this.goodsInfo = JSON.parse(options.info);
-		   this.goodsInfo = JSON.parse(decodeURIComponent(options.info));
-            console.log(this.goodsInfo,"@@@@this.goodsInfo")
+			console.log(options.info)
+			console.log(JSON.parse(options.info))
+		   this.goodsInfo = JSON.parse(options.info);
+          
             this.imageList = this.goodsInfo.imgs
 			this.getJumpUrl(this.goodsInfo)
 			this.getuserInfo()
@@ -311,13 +311,24 @@
 				var that = this;
 				if (goods.faction == 't') {
 					this.$u.api.getPrivilegeLink({type:0,goodsId:goods.goodsId}).then(e => {
+						console.log(e)
 						if(e.code == 1)return that.$alert(e.msg);
 						var res = e.data.info;
 						//that.Jumpurl = res.kuaiZhanUrl
 						that.tpwd = res.tpwd
 						var long = res.longTpwd
+						that.url = res.shortUrl;
+						if(that.url){
+							that.makeQRcode()
+						}else{
+							uni.showToast({
+								title:'鍒朵綔娴锋姤澶辫触锛�',
+								icon:'none'
+							})
+						}
 						//鑾峰彇杞摼鎺�
-						that.$u.api.getPrivilegeShareLink({type:0,goodsId:goods.goodsId}).then(ed=>{
+						/* that.$u.api.getPrivilegeShareLink({type:0,goodsId:goods.goodsId}).then(ed=>{
+							console.log(ed)
 							if(ed.code == 1)return that.$alert(ed.msg);
 							var re = ed.data.list;
 							that.url = re.link;
@@ -330,7 +341,7 @@
 								})
 							}
 						}).catch(function (er) {
-						})
+						}) */
 						
 					}).catch(function (err) {
 					})
@@ -502,9 +513,7 @@
                 }
                 // APP涓嬭浇鍦板潃+閭�璇风爜
                 if (e === 3) {
-					console.log(this.user)
-                    data = '銆愪笅杞介摼鎺ャ��' + this.appInfo.appAndroidDownUrl +
-                        '\n銆愰個璇风爜銆�' + this.user.invitation_code
+                    data = this.appInfo.invite_url +"?code="+this.user.invitation_code
                 }
                 uni.setClipboardData({
                     data,

--
Gitblit v1.9.3