From b349755595b3d96b1ddf22d2632a1562842aede8 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 29 六月 2023 09:19:12 +0800
Subject: [PATCH] no message

---
 uniapp/pages/search/searchResult.vue |   26 ++++++++-----
 uniapp/manifest.json                 |    4 +-
 uniapp/pages/rankinglist/xianbao.vue |    2 
 uniapp/pages/login/wxlogin.vue       |    4 +-
 uniapp/pages/active/tmsearch.vue     |    2 
 uniapp/pages/search/search.vue       |   24 +++++++----
 uniapp/pages/login/setInviteCode.vue |    2 
 uniapp/components/rowGoods.vue       |    2 
 8 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/uniapp/components/rowGoods.vue b/uniapp/components/rowGoods.vue
index 2741ca8..d2dde21 100644
--- a/uniapp/components/rowGoods.vue
+++ b/uniapp/components/rowGoods.vue
@@ -17,7 +17,7 @@
 	
 			<view class="cardbottom-container colCenEnd">
 				<view class="discounts-container rowCen borderBox">
-					<view class="coupon-box rowCenCen" style="border: 1px solid #f50d49; color: #f50d49; background: none;" v-if="items.couponPrice>0 || items.sourceType=='wph'">
+					<view class="coupon-box rowCenCen" style="border: 1px solid #f50d49;width:auto;color: #f50d49; background: none;" v-if="items.couponPrice>0 || items.sourceType=='wph'">
 						<view>
 							{{items.sourceType=='wph'?items.discount+'鎶�':items.couponPrice+'鍏冨埜'}}
 						</view>
diff --git a/uniapp/manifest.json b/uniapp/manifest.json
index 0e3a85b..d97a230 100644
--- a/uniapp/manifest.json
+++ b/uniapp/manifest.json
@@ -2,8 +2,8 @@
     "name" : "澶ц繑瀹�",
     "appid" : "__UNI__FC8858A",
     "description" : "澶ц繑瀹榓pp",
-    "versionName" : "1.2.3",
-    "versionCode" : 123,
+    "versionName" : "1.1.3",
+    "versionCode" : 113,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/uniapp/pages/active/tmsearch.vue b/uniapp/pages/active/tmsearch.vue
index a95608f..d04124a 100644
--- a/uniapp/pages/active/tmsearch.vue
+++ b/uniapp/pages/active/tmsearch.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="pddsearch-wrapper wrapperLayer borderBox"  style="background: #fff;">
+	<view class="pddsearch-wrapper wrapperLayer borderBox">
 		<view class="topbarbox"></view>
 		<view class="fixed-container colCen">
 			<view class="topbarbox"></view>
diff --git a/uniapp/pages/login/setInviteCode.vue b/uniapp/pages/login/setInviteCode.vue
index 0a64ae0..66e25db 100644
--- a/uniapp/pages/login/setInviteCode.vue
+++ b/uniapp/pages/login/setInviteCode.vue
@@ -161,7 +161,7 @@
 						uni.switchTab({
 						  url: '../index/index'
 						})
-					 */}
+					 }*/
 				}).catch(function (err) {
 					console.log(err)
 				})
diff --git a/uniapp/pages/login/wxlogin.vue b/uniapp/pages/login/wxlogin.vue
index 511649a..5a53652 100644
--- a/uniapp/pages/login/wxlogin.vue
+++ b/uniapp/pages/login/wxlogin.vue
@@ -202,11 +202,11 @@
 							url: './setInviteCode'
 						})
 					}
-					else if (e.data.userinfo.isPwd == 'N') {
+					/* else if (e.data.userinfo.isPwd == 'N') {
 						uni.redirectTo({
 							url: './setPass'
 						})
-					} else {
+					} */ else {
 						uni.switchTab({
 							url: '../index/index'
 						})
diff --git a/uniapp/pages/rankinglist/xianbao.vue b/uniapp/pages/rankinglist/xianbao.vue
index eace27c..b908771 100644
--- a/uniapp/pages/rankinglist/xianbao.vue
+++ b/uniapp/pages/rankinglist/xianbao.vue
@@ -48,7 +48,7 @@
 		},
 		onLoad(options) {
 			const value = uni.getStorageSync('userInfo');
-			this.webviewUrl = encodeURI('http://dfgapp.ushopvip.com/html/xianbao.html?token='+value.token);
+			this.webviewUrl = encodeURI('http://appapitest.ushopvip.com/html/xianbao.html?token='+value.token);
 		},
 		onReady() {
 		  this.clearMuiBack();
diff --git a/uniapp/pages/search/search.vue b/uniapp/pages/search/search.vue
index 6e51803..990c7ef 100644
--- a/uniapp/pages/search/search.vue
+++ b/uniapp/pages/search/search.vue
@@ -27,7 +27,7 @@
 				<view class="onlineStore-container rowCen" v-if="searchText==''">
 					<view class="onlineStoreList rowSta">
 						<block v-for="(items,index) in onlineStoreList" :key="index">
-							<view class="store-items colCen" :class="storeCurrent==index?'store-items-active':''" @click="checkstore(index)">
+							<view class="store-items colCen" :class="storeCurrent==items.inde?'store-items-active':''" @click="checkstore(items.inde)">
 								<view class="store-name">
 									{{items.name}}
 								</view>
@@ -166,24 +166,30 @@
 			return {
 				onlineStoreList: [{
 						name: '娣樺疂',
-						type: 'tb'
+						type: 'tb',
+						inde:0
 					},
 					{
 						name: '浜笢',
-						type: 'jd'
+						type: 'jd',
+						inde:1
 					},
 					{
 						name: '鎷煎澶�',
-						type: 'pdd'
-					},
-					{
-						name: '鍞搧浼�',
-						type: 'vph'
+						type: 'pdd',
+						inde:2
 					},
 					{
 						name: '鎶栭煶',
-						type: 'dy'
+						type: 'dy',
+						inde:4
+					},
+					{
+						name: '鍞搧浼�',
+						type: 'vph',
+						inde:3
 					}
+					
 				],
 				searchText: '',
 				storeCurrent: 0,
diff --git a/uniapp/pages/search/searchResult.vue b/uniapp/pages/search/searchResult.vue
index 650f64e..b9ad46e 100644
--- a/uniapp/pages/search/searchResult.vue
+++ b/uniapp/pages/search/searchResult.vue
@@ -23,8 +23,8 @@
 				<view class="onlineStore-container rowCen">
 					<view class="onlineStoreList rowSta" v-if="!showtar || platform!='iOS'">
 						<block v-for="(items,index) in onlineStoreList" :key="index">
-							<view class="store-items colCen" :class="storeCurrent==index?'store-items-active':''"
-								@click="checkstore(index)">
+							<view class="store-items colCen" :class="storeCurrent==items.inde?'store-items-active':''"
+								@click="checkstore(items.inde)">
 								<view class="store-name">
 									{{items.name}}
 								</view>
@@ -151,24 +151,30 @@
 				advertPic: '',
 				onlineStoreList: [{
 						name: '娣樺疂',
-						type: 'tb'
+						type: 'tb',
+						inde:0
 					},
 					{
 						name: '浜笢',
-						type: 'jd'
+						type: 'jd',
+						inde:1
 					},
 					{
 						name: '鎷煎澶�',
-						type: 'pdd'
-					},
-					{
-						name: '鍞搧浼�',
-						type: 'wph'
+						type: 'pdd',
+						inde:2
 					},
 					{
 						name: '鎶栭煶',
-						type: 'dy'
+						type: 'dy',
+						inde:4
+					},
+					{
+						name: '鍞搧浼�',
+						type: 'wph',
+						inde:3
 					}
+					
 				],
 
 				sortList: [{

--
Gitblit v1.9.3