From ceea40372050073c202d1a3ab2112f9754f2bce4 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期一, 19 六月 2023 15:22:19 +0800
Subject: [PATCH] no message

---
 uniapp/manifest.json              |   17 +++++---
 uniapp/pages/index/launchPage.vue |   14 +++---
 uniapp/pages/login/wxlogin.vue    |    9 ++--
 uniapp/utils/getClipboard.js      |   79 +++++++++++++++++++++++++++++----------
 4 files changed, 81 insertions(+), 38 deletions(-)

diff --git a/uniapp/manifest.json b/uniapp/manifest.json
index 3013d8c..27d87b5 100644
--- a/uniapp/manifest.json
+++ b/uniapp/manifest.json
@@ -12,8 +12,8 @@
         "nvueCompiler" : "uni-app",
         "compilerVersion" : 3,
         "splashscreen" : {
-            "alwaysShowBeforeRender" : false,
-            "waiting" : false,
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
             "autoclose" : true,
             "delay" : 0
         },
@@ -126,13 +126,16 @@
                 }
             },
             "splashscreen" : {
-                "androidStyle" : "common",
+                "androidStyle" : "default",
                 "android" : {
-                    "hdpi" : "E:/OPProject/鍙戠増鐢╛鍕垮垹/寮�灞�/寮�灞忓皬.png",
-                    "xhdpi" : "E:/OPProject/鍥剧墖/寮�灞�/寮�灞忎腑.png",
-                    "xxhdpi" : "E:/OPProject/鍥剧墖/寮�灞�/寮�灞忓ぇ.png"
+                    "hdpi" : "E:/OPProject/鍙戠増鐢╛鍕垮垹/android/480X762.9.png",
+                    "xhdpi" : "E:/OPProject/鍙戠増鐢╛鍕垮垹/android/720X1242.9.png",
+                    "xxhdpi" : "E:/OPProject/鍙戠増鐢╛鍕垮垹/android/1080x1882.9.png"
                 },
-                "iosStyle" : "common"
+                "iosStyle" : "storyboard",
+                "ios" : {
+                    "storyboard" : "E:/OPProject/鍙戠増鐢╛鍕垮垹/ios/CustomStoryboard.zip"
+                }
             },
             "icons" : {
                 "android" : {
diff --git a/uniapp/pages/index/launchPage.vue b/uniapp/pages/index/launchPage.vue
index 381c371..0843bdf 100644
--- a/uniapp/pages/index/launchPage.vue
+++ b/uniapp/pages/index/launchPage.vue
@@ -37,7 +37,7 @@
 						return;
             		}
             		var res = e.data.info;
-            		if(res.launchpic&&res.launchpic.length>0)
+            		if(res&&res.length>0&&res.launchpic&&res.launchpic.length>0)
             		{
             			that.list=res.launchpic;
             		}
@@ -65,12 +65,12 @@
 			},
 			t_index()
 			{
-				uni.reLaunch({
-				    url: "/pages/index/index"
-				});
-				/* setTimeout(()=>{
-					
-				}, 500); */
+				
+				 setTimeout(()=>{
+					uni.reLaunch({
+					    url: "/pages/index/index"
+					});
+				}, 500);
 			}
         }
     }
diff --git a/uniapp/pages/login/wxlogin.vue b/uniapp/pages/login/wxlogin.vue
index 65fd4fb..5b2d4f4 100644
--- a/uniapp/pages/login/wxlogin.vue
+++ b/uniapp/pages/login/wxlogin.vue
@@ -53,8 +53,8 @@
 		},
 		onLoad() {
 			this.appInfo = uni.getStorageSync('appInfo')
-			console.log(this.appInfo.iosExamine)
-			console.log(getApp().globalData.ifwt)
+			//console.log(this.appInfo.iosExamine)
+			//console.log(getApp().globalData.ifwt)
 			//this.haswxlogin = this.appInfo.iosExamine ? false : (getApp().globalData.ifwt == 1 ? true : false)
 			this.haswxlogin = getApp().globalData.ifwt == 1 ? true :false;
 			this.isSupportMoblie();
@@ -210,11 +210,12 @@
 								uni.login({
 									provider: 'weixin',
 									success: (loginRes) => {
+										console.log(loginRes);
 										that.$u.api.wxapplogin({
 											openid: loginRes.authResult.openid,
-											access_token: loginRes.authResult.access_token,
-											push_cid:that.clientid
+											access_token: loginRes.authResult.access_token
 										}).then(e => {
+											console.log(e);
 											if (e.code != 0) return that.$alert(e.msg)
 											var res = e.data;
 											if(res.type == 'goUser'){
diff --git a/uniapp/utils/getClipboard.js b/uniapp/utils/getClipboard.js
index ec4c169..875016a 100644
--- a/uniapp/utils/getClipboard.js
+++ b/uniapp/utils/getClipboard.js
@@ -5,7 +5,8 @@
     
 
   function getclick(callback) {
-    uni.getClipboardData({
+	 
+  uni.getClipboardData({
       success: res => {
         console.log(res, '======================================================');
         var nowClipData = res.data
@@ -18,11 +19,6 @@
             callback(res)
           }).catch(function (err) {
           })
-          // request.post("tb/parseContent", {
-          //  content: nowClipData
-          // }, 'application/json').then(res => {
-          //  callback(res)
-          // });
         }else{
           getApp().globalData.hasMode = false
           console.log('鍐呴儴澶嶅埗');
@@ -417,11 +413,31 @@
           },
           position: {
             top: uni.upx2px(580) + "px",
-            left: uni.upx2px(115) + "px",
+            left: uni.upx2px(85) + "px",
             width: uni.upx2px(74) + "px",
             height: uni.upx2px(24) + "px",
           }
         },
+		{
+		  tag: 'font',
+		  id: 'dytxt',
+		  text: '鎶栭煶',
+		  textStyles: {
+		    size: uni.upx2px(24) + "px",
+		    color: "#333333",
+		    align: "center",
+		    weight: "normal",
+		    whiteSpace: "nowrap",
+		    overflow: 'ellipsis',
+		    verticalAlign: 'middle'
+		  },
+		  position: {
+			  top: uni.upx2px(580) + "px",
+			  left: uni.upx2px(185) + "px",
+			  width: uni.upx2px(74) + "px",
+			  height: uni.upx2px(24) + "px",
+		  }
+		},
         {
           tag: 'font',
           id: 'pddtxt',
@@ -437,7 +453,7 @@
           },
           position: {
             top: uni.upx2px(580) + "px",
-            left: uni.upx2px(225) + "px",
+            left: uni.upx2px(285) + "px",
             width: uni.upx2px(74) + "px",
             height: uni.upx2px(24) + "px",
           }
@@ -457,29 +473,41 @@
           },
           position: {
             top: uni.upx2px(580) + "px",
-            left: uni.upx2px(335) + "px",
+            left: uni.upx2px(385) + "px",
             width: uni.upx2px(74) + "px",
             height: uni.upx2px(24) + "px",
           }
         },
+		
         {
           src: './static/images/app/jd.png',
           tag: 'img',
           id: 'jd',
           position: {
             top: uni.upx2px(490) + "px",
-            left: uni.upx2px(115) + "px",
+            left: uni.upx2px(85) + "px",
             width: uni.upx2px(74) + "px",
             height: uni.upx2px(74) + "px",
           }
         },
+		{
+		  src: 'https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/index_icon/%E6%8A%96.png',
+		  tag: 'img',
+		  id: 'dy',
+		  position: {
+		    top: uni.upx2px(490) + "px",
+		    left: uni.upx2px(185) + "px",
+		    width: uni.upx2px(74) + "px",
+		    height: uni.upx2px(74) + "px",
+		  }
+		},
         {
           src: './static/images/app/pdd.png',
           tag: 'img',
           id: 'pdd',
           position: {
             top: uni.upx2px(490) + "px",
-            left: uni.upx2px(225) + "px",
+            left: uni.upx2px(285) + "px",
             width: uni.upx2px(74) + "px",
             height: uni.upx2px(74) + "px",
           }
@@ -490,11 +518,12 @@
           id: 'vph',
           position: {
             top: uni.upx2px(490) + "px",
-            left: uni.upx2px(335) + "px",
+            left: uni.upx2px(385) + "px",
             width: uni.upx2px(74) + "px",
             height: uni.upx2px(74) + "px",
           }
         },
+		
       ];
 
       nogoodsIdwrap.drawRect({
@@ -570,13 +599,14 @@
 
         let icontop = uni.upx2px(490)
         let iconbtm = uni.upx2px(600)
-        let jdleft = uni.upx2px(115)
-        let jdrgt = uni.upx2px(190)
-        let pddleft = uni.upx2px(225)
-        let pddrgt = uni.upx2px(300)
-        let vphleft = uni.upx2px(335)
-        let vphrgt = uni.upx2px(410)
-
+        let jdleft = uni.upx2px(85)
+        let jdrgt = uni.upx2px(160)
+        let pddleft = uni.upx2px(285)
+        let pddrgt = uni.upx2px(360)
+        let vphleft = uni.upx2px(385)
+        let vphrgt = uni.upx2px(460)
+		let dyleft= uni.upx2px(185)
+		let dyrgt= uni.upx2px(260)
         if (e.clientY > icontop && e.clientY < iconbtm) {
           if (e.clientX < jdrgt && e.clientX > jdleft) {
             console.log('鍘籮d');
@@ -588,7 +618,16 @@
             uni.setStorageSync('clipboard',dataInfo.goods_url)
             getApp().globalData.hasMode = false
           }
-
+		  if(e.clientX < dyrgt && e.clientX > dyleft) {
+				console.log('鍘籨y');
+				maskLayers.hide();
+				nogoodsIdwrap.hide();
+				uni.navigateTo({
+				  url: '/pages/search/searchResult?storetype=4&searchText=' + dataInfo.goods_url
+				})
+				uni.setStorageSync('clipboard',dataInfo.goods_url)
+				getApp().globalData.hasMode = false
+		  }
           if (e.clientX < pddrgt && e.clientX > pddleft) {
             console.log('鍘籶dd');
             const value = uni.getStorageSync('userInfo');

--
Gitblit v1.9.3