Merge remote-tracking branch 'origin/dev' into dev

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": {}

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'