From 17869db2f27d3763b10cc05fa307a868b263dd42 Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Fri, 28 Jan 2022 18:18:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2sto?=
 =?UTF-8?q?re=E6=95=B0=E6=8D=AE=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                             |   1 +
 components/Plugin/Plugin.vue             |   4 +-
 components/Render/Render.vue             |  49 ++++++++++++++++-------
 hooks/project/useGenerateWebviewParam.js |   3 +-
 pages.json                               |  24 ++++-------
 pages/project/project.vue                |  17 +++++---
 pages/workbench/workbench.vue            |   4 +-
 static/work.png                          | Bin 0 -> 25412 bytes
 store/index.js                           |  12 +++---
 9 files changed, 66 insertions(+), 48 deletions(-)
 create mode 100644 static/work.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63ee44a..33da863 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@
  - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b)
  - | 刷新token重新运行api | [02fb4bf](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/02fb4bf)
  - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b)
+ - | 添加财务申请详情页 | [e69d233](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e69d233)
  - | 跳转财务详情 | [742720d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/742720d)
  - | 未登录调用项目列表接口 | [aab6489](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aab6489)
  - | 文件上传添加APP的条件判断 | [5d4c1be](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5d4c1be)
diff --git a/components/Plugin/Plugin.vue b/components/Plugin/Plugin.vue
index 5dae351..eb08749 100644
--- a/components/Plugin/Plugin.vue
+++ b/components/Plugin/Plugin.vue
@@ -27,7 +27,8 @@
     <p-account-management v-else-if="pluginId === '19'" class="p-2" />
     <p-domain-source-manage v-else-if="pluginId === '20'" class="p-2" />
     <p-project-version-management v-else-if="pluginId === '21'" class="p-2" />
-
+    
+    <!-- #ifdef H5 -->
     <Render
       v-else
       :task="task"
@@ -37,6 +38,7 @@
       :businessPluginId="businessPluginId"
       :param="param"
     />
+    <!-- #endif -->
   </view>
 </template>
 
diff --git a/components/Render/Render.vue b/components/Render/Render.vue
index e9f229c..86d6261 100644
--- a/components/Render/Render.vue
+++ b/components/Render/Render.vue
@@ -4,7 +4,7 @@
     <view
       class="content"
       style="border-radius: 8px;"
-      id="project"
+      :id="`project-${task.id}`"
       :data-did="task.detailId"
       :data-param="param"
       :data-pdu="task.planDuration"
@@ -22,7 +22,7 @@
     <!-- #ifdef APP-PLUS -->
     <view
       class="content"
-      id="project"
+      :id="`project-${task.id}`"
       :data-did="task.detailId"
       :data-param="param"
       :data-pdu="task.planDuration"
@@ -60,6 +60,7 @@ const roleId = computed(() => store.state.role.roleId);
 const token = computed(() => store.state.user.token);
 const userId = computed(() => store.getters['user/userId']);
 const projectId = computed(() => store.getters['project/projectId']);
+const allPlugin = uni.$storage.getStorageSync('allPlugin');
 </script>
 
 <script module="project" lang="renderjs">
@@ -69,6 +70,9 @@ export default {
       pluginContent: null,
       pluginJs: null,
       show: false,
+      pluginlists: [],
+      flag: false,
+      pluginInfo: {}
     };
   },
 
@@ -81,24 +85,39 @@ export default {
   methods: {
     // 获取插件信息
     async getPlugin() {
-      const params = { businessPluginId: this.businessPluginId };
-      this.$catchReq.getOtherPlugin(params, (err, res) => {
-        if (err) {
-          console.error('err: ', err);
-        } else {
-          if (!res || !res.id) return;
-          if (res.html && res.js) {
-            this.show = true;
-            this.$nextTick(() => {
-              this.init(res);
-            });
-          }
+      this.pluginlists = JSON.parse(this.allPlugin);
+      this.pluginlists.forEach(item => {
+        if (this.pluginId === item.id) {
+          this.flag = true;
+          this.pluginInfo = item;
+          this.show = true;
         }
       });
+
+      if (this.flag) {
+        this.$nextTick(() => {
+          this.init(this.pluginInfo);
+        });
+      } else {
+        const params = { businessPluginId: this.businessPluginId };
+        this.$catchReq.getOtherPlugin(params, (err, res) => {
+          if (err) {
+            console.error('err: ', err);
+          } else {
+            if (!res) return;
+            if (res.html && res.js) {
+              this.show = true;
+              this.$nextTick(() => {
+                this.init(res);
+              });
+            }
+          }
+        });
+      }
     },
 
     init(res) {
-      const content = document.querySelector('.content');
+      const content = document.getElementById(`project-${this.task.id}`);
       content.innerHTML = res.html;
 
       const script = document.createElement('script');
diff --git a/hooks/project/useGenerateWebviewParam.js b/hooks/project/useGenerateWebviewParam.js
index a8697c1..6d1698b 100644
--- a/hooks/project/useGenerateWebviewParam.js
+++ b/hooks/project/useGenerateWebviewParam.js
@@ -3,12 +3,11 @@ import { useStore } from 'vuex';
 
 export default function useGenerateWebviewParam() {
   const store = useStore();
-  console.log('store: ', store);
 
   const projectId = computed(() => store.getters['project/projectId']);
   const token = computed(() => store.state.user.token);
   const projectName = computed(() => store.getters['project/projectName']);
-  console.log('projectName: ', projectName);
+  
   return {
     projectId: projectId.value,
     token: token.value,
diff --git a/pages.json b/pages.json
index a8bdd1a..fcb7318 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,5 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+	"pages": [
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -10,15 +10,13 @@
 		{
 			"path": "pages/workbench/workbench",
 			"style": {
-				"navigationBarText": "TALL",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "工作台"
 			}
 		},
 		{
 			"path": "pages/business/business",
 			"style": {
-				"navigationBarText": "业务列表",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "业务列表"
 			}
 		},
 		{
@@ -28,36 +26,28 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
-		// 用户名密码登录
 		{
 			"path": "pages/user/accountLogin",
 			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTextStyle": "white"
+				"navigationBarTitleText": "用户名登录"
 			}
 		},
-		// 手机号登录
 		{
 			"path": "pages/user/login",
 			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTextStyle": "white"
+				"navigationBarTitleText": "登录"
 			}
 		},
-		// 注册
 		{
 			"path": "pages/user/rigister",
 			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTextStyle": "white"
+				"navigationBarTitleText": "注册"
 			}
 		},
-		// 用户协议
 		{
 			"path": "pages/user/agreement",
 			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTextStyle": "white"
+				"navigationBarTitleText": "注册协议"
 			}
 		},
 		{
diff --git a/pages/project/project.vue b/pages/project/project.vue
index d1dba4c..8ef7203 100644
--- a/pages/project/project.vue
+++ b/pages/project/project.vue
@@ -41,6 +41,7 @@ const initHook = useInit();
 const getTasksHook = useGetTasks();
 const store = useStore();
 const projectId = computed(() => store.getters['project/projectId']);
+const userInfo = computed(() => store.state.user.user);
 const userId = computed(() => store.getters['user/userId']);
 const roleId = computed(() => store.state.role.roleId); // 当前展示查看的角色id
 const roleIndex = computed(() => store.state.role.roleIndex); // 时间轴角色索引
@@ -59,6 +60,13 @@ onMounted(() => {
   height.value = `${system.windowHeight}px`;
 });
 
+if (!userInfo.value) {
+  let res = uni.$storage.getStorageSync('user');
+  if (res) {
+    store.commit('user/setUser', JSON.parse(res));
+  }
+}
+
 /**
  * 当角色发生变化时
  * 重新查询永久日常任务和普通日常任务
@@ -189,12 +197,11 @@ function setScrollPosition() {
     store.commit('task/setScrollToTaskId', `a${taskId}`);
     uni.$storage.setStorageSync('taskId', ''); // 记录后即刻清除本地存储
   } else {
-    if (allTasks.value[roleIndex.value]) {
-      if (!(allTasks.value[roleIndex.value].task && allTasks.value[roleIndex.value].task.length)) {
-        allTasks.value[roleIndex.value].task = [];
-      }
-    }
+    if (!allTasks.value[roleIndex.value]) return;
 
+    if (allTasks.value[roleIndex.value] && !allTasks.value[roleIndex.value].task) {
+      allTasks.value[roleIndex.value].task = [];
+    }
 
     const item = allTasks.value[roleIndex.value].task.find(task => task.detailId);
     if (item) {
diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue
index 37e7c4e..fb4f315 100644
--- a/pages/workbench/workbench.vue
+++ b/pages/workbench/workbench.vue
@@ -1,5 +1,5 @@
 <template>
-  <image src="../../static/adv.jpg"></image>
+  <image src="../../static/work.png"></image>
 </template>
 
 <script>
@@ -8,7 +8,7 @@
 <style lang="scss" scoped>
   image {
     width: 100%;
-    height: calc(100vh - var(--status-bar-height));
+    height: calc(100% - var(--status-bar-height));
     object-fit: cover;
   }
 </style>
diff --git a/static/work.png b/static/work.png
new file mode 100644
index 0000000000000000000000000000000000000000..91d4033a29a764a422545b5b3298b7fa98485d7c
GIT binary patch
literal 25412
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

literal 0
HcmV?d00001

diff --git a/store/index.js b/store/index.js
index 8a35bc4..b39576a 100644
--- a/store/index.js
+++ b/store/index.js
@@ -18,8 +18,8 @@ const state = {
   domain: `${Config.apiUrl}/defaultwbs`, // 项目跳转域名
   guide: '', // 引导页图片json
   advs: '', // 广告图片json
-  businessPlugin: [], // 所有服务
-  allPlugin: [], // 所有插件
+  businessPlugin: '', // 所有服务
+  allPlugin: '', // 所有插件
   firstOpenApp: false, // 是否是第一次打开APP或者引导页有更新，false表示从未打开过，true表示打开过
   isOpenApp: true, // 是否打开APP
 };
@@ -128,8 +128,8 @@ const actions = {
   async getBusinessPlugin({ commit }, param) {
     try {
       const res = await uni.$u.api.getBusinessPlugin();
-      uni.$storage.setStorageSync('businessPlugin', res);
-      commit('setBusinessPlugin', res || []);
+      uni.$storage.setStorageSync('businessPlugin', JSON.stringify(res) || '');
+      commit('setBusinessPlugin', JSON.stringify(res) || '');
       return res;
     } catch (error) {
       uni.$ui.showToast(error.msg);
@@ -140,8 +140,8 @@ const actions = {
   async getAllPlugin({ commit }, param) {
     try {
       const res = await uni.$u.api.getAllPlugin();
-      uni.$storage.setStorageSync('allPlugin', res || []);
-      commit('setAllPlugin', res);
+      uni.$storage.setStorageSync('allPlugin', JSON.stringify(res) || '');
+      commit('setAllPlugin', JSON.stringify(res) || '');
       return res;
     } catch (error) {
       uni.$ui.showToast(error.msg);