From d749dfb8cd6eac179db922cd1a99bf896a00f79d Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Fri, 28 Jan 2022 09:20:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B9=BF=E5=91=8A=E9=A1=B5=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                |  8 ++++----
 CHANGELOG.md           |  3 ++-
 components/Adv/Adv.vue |  9 +++++++--
 pages.json             | 16 ----------------
 pages/index/index.vue  | 13 +++++++++----
 5 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/App.vue b/App.vue
index 664440b..c279b04 100644
--- a/App.vue
+++ b/App.vue
@@ -25,11 +25,11 @@ export default {
 
     // 查询广告页和引导页并缓存
     // #ifdef APP-PLUS
-    // uni.$storage.setStorageSync('isOpenApp', true);
-    // this.$store.commit('setIsOpenApp', true);
+    uni.$storage.setStorageSync('isOpenApp', true);
+    this.$store.commit('setIsOpenApp', true);
     // 判断是否第一次打开App
-    // let firstOpenApp = uni.$storage.getStorageSync('firstOpenApp');
-    // this.$store.commit('setFirstOpenApp');
+    let firstOpenApp = uni.$storage.getStorageSync('firstOpenApp');
+    this.$store.commit('setFirstOpenApp');
     this.getGuide(0);
     this.getGuide(1);
     // #endif
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5137e47..841db52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 1.0.0 (2022-01-27)
+# 1.0.0 (2022-01-28)
 
 ### 🌟 新功能
 范围|描述|commitId
@@ -15,6 +15,7 @@
  - | 登录图标、日历页今日 | [7de419d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7de419d)
  - | 服务、插件缓存、导入选择服务列表、 | [cc8004b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/cc8004b)
  - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc)
+ - | 工作台功能 | [b674733](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b674733)
  - | 广告页、引导页 | [fe87d00](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fe87d00)
  - | 广告页、引导页 | [1c89806](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1c89806)
  - | 广告页、引导页改为组件 | [2be7903](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2be7903)
diff --git a/components/Adv/Adv.vue b/components/Adv/Adv.vue
index a2e12cf..11f75ae 100644
--- a/components/Adv/Adv.vue
+++ b/components/Adv/Adv.vue
@@ -10,7 +10,7 @@
 
     <image v-else src="/static/adv.jpg"></image>
 
-    <view class="time-box absolute">{{ time }} 跳过</view>
+    <view class="time-box absolute" @click="toIndex">{{ time }} 跳过</view>
   </view>
 </template>
 
@@ -43,6 +43,11 @@
     }
   }, 1000);
 
+  function toIndex() {
+    uni.$storage.setStorageSync('isOpenApp', false);
+    store.commit('setIsOpenApp', false);
+  }
+
   // setTimeout(() => {
   //   // 判断是否第一次打开App
   //   let firstOpenApp = uni.$storage.getStorageSync('firstOpenApp');
@@ -64,7 +69,7 @@
 <style lang="scss" scoped>
   .adv-box {
     width: 100%;
-    height: 100%;
+    height: calc(100vh - var(--status-bar-height));
 
     image {
       width: 100%;
diff --git a/pages.json b/pages.json
index eedaf89..a8bdd1a 100644
--- a/pages.json
+++ b/pages.json
@@ -1,21 +1,5 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		// #ifdef APP-PLUS
-		{
-			"path": "pages/guide/adv",
-			"style": {
-				"navigationBarText": "TALL",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/guide/guide",
-			"style": {
-				"navigationBarText": "TALL",
-				"navigationStyle": "custom"
-			}
-		},
-		// #endif
 		{
 			"path": "pages/index/index",
 			"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f220d9c..01f349a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -6,14 +6,19 @@
 
   <!-- #ifdef APP-PLUS -->
   <!-- 广告 -->
-  <!-- <Adv v-if="isOpenApp"></Adv> -->
+  <Adv v-if="isOpenApp"></Adv>
 
   <!-- 引导页 -->
-  <!-- <Guide v-else-if="!firstOpenApp"></Guide> -->
+  <Guide v-else-if="!firstOpenApp"></Guide>
   <!-- #endif -->
 
   <!-- <view class="flex flex-col h-full bg-gray-50" @click="openAuth"> -->
+  <!-- #ifdef APP-PLUS -->
+  <theme v-if="!isOpenApp && firstOpenApp" class="relative flex flex-col h-full bg-gray-50">
+  <!-- #endif -->
+  <!-- #ifdef H5 -->
   <theme class="relative flex flex-col h-full bg-gray-50">
+  <!-- #endif -->
     <view class="relative">
       <!-- <view class="relative" @touchmove="onMove"> -->
       <!-- 日历 -->
@@ -45,8 +50,8 @@
   const store = useStore();
   const token = computed(() => store.state.user.token);
   const uTips = ref(null);
-  // const firstOpenApp = computed(() => store.state.firstOpenApp);
-  // const isOpenApp = computed(() => store.state.isOpenApp); // 是否打开APP
+  const firstOpenApp = computed(() => store.state.firstOpenApp); // 是否第一次打开APP false 是第一次 true不是
+  const isOpenApp = computed(() => store.state.isOpenApp); // 是否打开APP true 是 false 不是
   const userInfo = computed(() => store.state.user.user);
 
   const data = reactive({