From 9cfb506460492824370617a7340158edbac6938d Mon Sep 17 00:00:00 2001
From: shuxiaoquan <853623962@qq.com>
Date: Thu, 21 Mar 2024 09:46:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E5=93=81=E7=89=8C?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E4=B8=8E=E6=8F=90=E7=8E=B0=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json             |  8 ++++----
 pages/activity/charts.vue | 13 ++++++++-----
 pages/news1/wallet.vue    | 11 +++++++----
 pages/order/detail.vue    |  4 ++--
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/manifest.json b/manifest.json
index a915bb8..7e39406 100644
--- a/manifest.json
+++ b/manifest.json
@@ -116,14 +116,14 @@
             "scope.userLocation" : {
                 "desc" : "获取当前所在城市位置"
             },
-			"makePhoneCall": {
-			  "desc": "用于拨打电话"
-			}
+            "makePhoneCall" : {
+                "desc" : "用于拨打电话"
+            }
         },
         "optimization" : {
             "subPackages" : true
         },
-        "requiredPrivateInfos" : [ "chooseAddress","getLocation" ]
+        "requiredPrivateInfos" : [ "chooseAddress", "getLocation" ]
     },
     "mp-alipay" : {
         "usingComponents" : true
diff --git a/pages/activity/charts.vue b/pages/activity/charts.vue
index 295fc2e..ef86bbe 100644
--- a/pages/activity/charts.vue
+++ b/pages/activity/charts.vue
@@ -60,12 +60,12 @@
 					</image>
 				</view>
 				<view class="rank_content" v-if="rankList.length>0">
-					<view class="rank_box" v-for="(item,index) in rankList"
+					<view class="rank_box" @click="toBack(item)" v-for="(item,index) in rankList"
 						:style="{ backgroundImage: 'url(' + (item.rankimage!=null?item.rankimage.external_url:'') + ')', }">
 						<view class="rank_name">
 							{{item.name}}榜
 						</view>
-						<view class="rank_go" @click="toBack(item.path)">
+						<view class="rank_go">
 							<text>GO</text>
 							<u-icon name="arrow-right" color="#fff" size="23"></u-icon>
 						</view>
@@ -131,12 +131,15 @@
 					this.rankList = data.list
 				}
 			},
-			toBack() {
+			toBack(item) {
 				// let pages = getCurrentPages();
 				// let beforePage = pages[pages.length - 2]
 				// console.log(this.removeAfter(pages, 'pages/activity/ranking'))
-				uni.redirectTo({
-					url: '/pages/activity/ranking'
+				// uni.redirectTo({
+				// 	url: '/pages/activity/ranking'
+				// })
+				uni.navigateTo({
+					url: '/pages/activity/charts?categoryId=' + item.category_id + '&name=' + item.name
 				})
 			},
 			removeAfter(arr, value) {
diff --git a/pages/news1/wallet.vue b/pages/news1/wallet.vue
index 6f36950..a83f5fe 100644
--- a/pages/news1/wallet.vue
+++ b/pages/news1/wallet.vue
@@ -51,7 +51,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="getData">
+		<view class="getData" :style="{'z-index': OrderType == ''?'1':'3'}">
 			<view class="order-tab">
 				<view class="tab" :class="{'action':OrderType==''}" @click="onOrderTab('')">
 					<text>全部</text>
@@ -256,10 +256,11 @@
 </script>
 <style lang="scss" scoped>
 	page {
-		// min-height: calc(100vh);
-		min-height: 100%;
+		min-height: calc(100vh);
+		// min-height: 100%;
 		background: #fff !important;
-
+		overflow-x: hidden;
+		overflow-y: scroll;
 		.wallet {
 			height: 100%;
 			position: relative;
@@ -616,6 +617,8 @@
 		}
 
 		.dataList {
+			position: relative;
+			z-index: 2;
 			.empty {
 				// margin:0 auto;
 				// text-align: center;
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index a2caba0..2717d0f 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -175,7 +175,7 @@
 					{{order.pay_method_text}}
 				</view>
 			</view>
-			<view class="orderTitle">
+			<!-- <view class="orderTitle">
 				<view class="total">
 					商品快照：
 				</view>
@@ -185,7 +185,7 @@
 				<view class="copy">
 					查看
 				</view>
-			</view>
+			</view> -->
 			<view class="orderTitle" v-if="order.delivery_status == DeliveryStatusEnum.DELIVERED.value">
 				<view class="total" v-if="order.delivery[0].delivery_method != DeliveryMethodEnum.UNWANTED.value">
 					物流公司：