From e2fc505a3aafa550c103255639af8403dd81895f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Fri, 22 Sep 2023 14:07:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=8C=BB=E8=B7=AF=E5=81=A5=E5=BA=B7?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                               | 12 ++++++------
 pages/myinformation/myinformation.vue    | 24 +++++++++++++++++++++++-
 pagesB/CommodityOrder/CommodityOrder.vue |  2 +-
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/pages.json b/pages.json
index bddd499..467542d 100644
--- a/pages.json
+++ b/pages.json
@@ -4,6 +4,12 @@
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
+			"path": "pages/myinformation/myinformation",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		}, {
 			"path": "pages/startup/startup",
 			"style": {
 				"navigationBarTitleText": "",
@@ -15,12 +21,6 @@
 				"navigationBarTitleText": "登录",
 				"enablePullDownRefresh": false
 			}
-		}, {
-			"path": "pages/myinformation/myinformation",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
 		}, {
 			"path": "pages/homepage/homepage",
 			"style": {}
diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue
index 77307d1..72adb9e 100644
--- a/pages/myinformation/myinformation.vue
+++ b/pages/myinformation/myinformation.vue
@@ -54,7 +54,7 @@
 			<view class="title">
 				我的订单
 			</view>
-			<view class="righttitle">
+			<view class="righttitle" @tap="goorder">
 				查看全部
 				<image src="../../static/huijiantou.png" mode=""></image>
 			</view>
@@ -143,6 +143,7 @@
 				<image src="../../static/huijiantou.png" mode=""></image>
 			</view>
 		</view>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 
@@ -154,6 +155,27 @@
 			};
 		},
 		methods: {
+			//全部订单
+			goorder() {
+				const value = uni.getStorageSync('openid');
+				const value2 = uni.getStorageSync('patientId');
+				if (value && value2) {
+					uni.navigateTo({
+						url: '/pagesB/CommodityOrder/CommodityOrder'
+					})
+				} else {
+					this.gologin();
+				}
+			},
+			//去登陆
+			gologin() {
+				this.$refs.uToast.show({
+					title: '您未登录,请先登录',
+					type: 'error',
+					duration: '1000',
+					url: '/pages/login/login'
+				})
+			},
 			goBehaviorpoints() {
 				uni.navigateTo({
 					url: '/pagesB/Behaviorpoints/Behaviorpoints'
diff --git a/pagesB/CommodityOrder/CommodityOrder.vue b/pagesB/CommodityOrder/CommodityOrder.vue
index 6bfc6dd..b74a26f 100644
--- a/pagesB/CommodityOrder/CommodityOrder.vue
+++ b/pagesB/CommodityOrder/CommodityOrder.vue
@@ -347,4 +347,4 @@
 
 <style lang="scss">
 	@import "./CommodityOrder.scss";
-</style>
+</style>
\ No newline at end of file