Merge remote-tracking branch 'remotes/origin/master'

src/pages-home/device-control/office/Personaldevices.vue

@@ -0,0 +1,44 @@
+<template>
+	<PageLayout :navbarShow="false">
+		<wd-card type="rectangle">
+		  <template #title>
+		    <view class="title">
+		      <view>2020-02-03服务到期</view>
+		      <view class="title-tip">
+		        <wd-icon name="warning" size="14px" custom-style="vertical-align: bottom" />
+		        您可以去电脑上使用该服务
+		      </view>
+		    </view>
+		  </template>
+		  <view style="height: 40px;" class="content">
+		    <image
+		      src="https://img11.360buyimg.com/imagetools/jfs/t1/143248/37/5695/265818/5f3a8546E98d998a4/745897ca9c9e474b.jpg"
+		      width="40"
+		      height="40"
+		      alt="joy"
+		      style="border-radius: 4px; margin-right: 12px;"
+		    />
+		    <view>
+		      <view style="color: rgba(0,0,0,0.85); font-size: 16px;">智催评营销</view>
+		      <view style="color: rgba(0,0,0,0.25); font-size: 12px;">高级版-快速吸粉 | 周期一年</view>
+		    </view>
+		  </view>
+		
+		  <template #footer>
+		    <view>
+		      <wd-button size="small" style="margin-right: 8px;">评价</wd-button>
+		      <wd-button size="small" plain>立即使用</wd-button>
+		    </view>
+		  </template>
+		</wd-card>
+	</PageLayout>
+</template>
+
+<script setup>
+	
+	
+	
+</script>
+
+<style>
+</style>

src/pages-home/device-control/office/index.vue

@@ -0,0 +1,36 @@
+<route lang="json5" type="page">
+	{
+	layout: 'default',
+	style: {
+	navigationBarTitleText: '办公室设备列表',
+	},
+	}
+</route>
+
+<template>
+	<PageLayout navTitle="设备管理">
+		<view class="content">
+			<view v-if="current === 0">
+				<Personaldevices></Personaldevices>
+			</view>
+			<view v-if="current === 1">
+			</view>
+		</view>
+	</PageLayout>
+</template>
+
+<script setup>
+	import Personaldevices from './Personaldevices'
+	
+	const current = ref(0)
+	const items = ref(['个人使用房间设备', '全部房间设备'])
+	
+	function onClickItem(e) {
+		if (current.value != e.currentIndex) {
+			current.value = e.currentIndex;
+		}
+	}
+</script>
+
+<style>
+</style>

src/pages-home/home/home.vue

@@ -1,20 +0,0 @@
-<route lang="json5" type="page">
-	{
-	layout: 'default',
-	style: {
-	navigationBarTitleText: '',
-	},
-	}
-</route>
-
-<template>
-	<view class=""></view>
-</template>
-
-<script lang="ts" setup>
-	//
-</script>
-
-<style lang="scss" scoped>
-	//
-</style>

src/pages-politics/healthfollow/send.vue

@@ -84,7 +84,7 @@
 		const selectedData = list.value.filter(item => item.checked);
 
 		if (selectedData.length === 0) {
-			toast.success('请先选择要发送消息的人员')
+			toast.warning('请先选择要发送消息的人员')
 			return;
 		}
 		// 收集所有选中项的 ldhth 字段并以逗号拼接

src/pages.json

@@ -222,12 +222,16 @@
       "root": "pages-home",
       "pages": [
         {
-          "path": "home/home",
+          "path": "device-control/office/index",
           "type": "page",
           "layout": "default",
           "style": {
-            "navigationBarTitleText": ""
+            "navigationBarTitleText": "办公室设备列表"
           }
+        },
+        {
+          "path": "device-control/office/Personaldevices",
+          "type": "page"
         }
       ]
     },

src/types/uni-pages.d.ts

@@ -27,7 +27,8 @@ interface NavigateToOptions {
        "/pages/production/shishishuju/nyxhSssj" |
        "/pages/production/shishishuju/trqSssj" |
        "/pages/production/shishishuju/ysjSssj" |
-       "/pages-home/home/home" |
+       "/pages-home/device-control/office/index" |
+       "/pages-home/device-control/office/Personaldevices" |
        "/pages-message/chat/chat" |
        "/pages-message/contacts/contacts" |
        "/pages-message/personPage/personPage" |