Merge branch 'master' of https://codeup.aliyun.com/66da74bcd660318010cc8b9c/jsy-app

pages.json

@@ -16,6 +16,12 @@
 				"navigationBarTitleText": "",
 				"navigationBarBackgroundColor": "#39ac4f"
 			}
+		}, {
+			"path": "pages/index-list",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#39ac4f"
+			}
 		},
 		{
 			"path": "pages/agricultural/index",

pages/index-list.vue

@@ -0,0 +1,38 @@
+<template>
+	<view>横向列表页面</view>
+</template>
+
+<script>
+	import store from "@/store"
+	import plus from "@/plugins"
+
+	export default {
+		data() {
+			return {}
+		},
+		onLoad() {
+			// #ifdef APP-PLUS
+			plus.screen.lockOrientation('landscape-primary');
+			plus.navigator.setFullscreen(true);
+			// #endif
+		},
+		onShow() {},
+		methods: {
+			openLand() {
+				this.$refs.refLand.open();
+			},
+			change(e) {
+				console.log('change', e);
+			},
+			toList() {
+				uni.navigateTo({
+					url: `/pages/index-list/index-list`
+				})
+			},
+			toQRCode() {},
+		},
+	}
+</script>
+
+<style>
+</style>

pages/index.vue

@@ -179,19 +179,20 @@
 											</u-col>
 											<u-col span="4">
 												<view class="fixed">
-												<view class="battery-container">
+													<view class="battery-container">
-													<text>60</text>
+														<text>60</text>
-													<view class="battery-level battery-level-60">
+														<view class="battery-level battery-level-60">
+														</view>
+													</view>
+													<view>
+														<view class="iconfont icon-wendu icon"></view>26.2
 													</view>
-												</view>
-												<view>
-													<view class="iconfont icon-wendu icon"></view>26.2
-												</view>
 												</view>
 											</u-col>
 											<u-col span="5" style="align-items: flex-end;">
 												<view class="fixed">
-													<u-button type="success" size="mini" text="刷新" icon="reload"></u-button>
+													<u-button type="success" size="mini" text="刷新"
+														icon="reload"></u-button>
 												</view>
 											</u-col>
 										</u-row>
@@ -233,6 +234,12 @@
 		onLoad() {
 			// uni.$emit("mqtt-link");
 		},
+		onShow() {
+			// #ifdef APP-PLUS
+			plus.screen.lockOrientation("portrait-primary");
+			plus.navigator.setFullscreen(false);
+			// #endif
+		},
 		methods: {
 			openLand() {
 				this.$refs.refLand.open();