From 9146b40c913310ea74e9d67da8bc922ae613a15e Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Fri, 28 Jan 2022 16:06:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8F=92=E4=BB=B6=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                |  1 +
 components/Render/Render.vue                | 53 ++++++++++++++-------
 pages/checkLog/checkLog.vue                 |  2 +-
 pages/project/project.vue                   |  6 +++
 pages/submitLog/submitLog.vue               |  2 +-
 plugins/p-deliver-check/p-deliver-check.vue |  2 +-
 store/index.js                              | 12 ++---
 7 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b10620a..3709b8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
  - | 广告页、引导页 | [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)
+ - | 广告页时长 | [6c6ea6e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6c6ea6e)
  - | 缓存改变 | [9685d55](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9685d55)
  - | 获取交付物信息 | [5ae68e2](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5ae68e2)
  - | 获取手机唯一码 | [3f60cf8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3f60cf8)
diff --git a/components/Render/Render.vue b/components/Render/Render.vue
index e9f229c..a9f6a9d 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"
@@ -41,7 +41,7 @@
 </template>
 
 <script setup>
-import { computed, reactive } from 'vue';
+import { computed, reactive, watch, ref } from 'vue';
 import { useStore } from 'vuex';
 
 defineProps({
@@ -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/pages/checkLog/checkLog.vue b/pages/checkLog/checkLog.vue
index 11cd7cd..931084d 100644
--- a/pages/checkLog/checkLog.vue
+++ b/pages/checkLog/checkLog.vue
@@ -17,7 +17,7 @@
           <view class="mb-1 text-green-600" v-if="item.status === 1"> 已通过 </view>
           <view class="mb-1 text-red-600" v-if="item.status === 2"> 已驳回 </view>
           <view v-if="+item.score > 0">
-            <zwp-ring-timing mode="chart" :value="item.score" active-color="#F59E0B" radius="30" bar-width="4">
+            <zwp-ring-timing mode="chart" :value="item.score" active-color="#F59E0B" :radius="30" bar-width="4">
               <text class="text-yellow-500 font-medium">{{ item.score }}</text>
             </zwp-ring-timing>
           </view>
diff --git a/pages/project/project.vue b/pages/project/project.vue
index d1dba4c..fd6cdeb 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,11 @@ onMounted(() => {
   height.value = `${system.windowHeight}px`;
 });
 
+if (!userInfo.value) {
+  let res = uni.$storage.getStorageSync('user');
+  store.commit('user/setUser', JSON.parse(res));
+}
+
 /**
  * 当角色发生变化时
  * 重新查询永久日常任务和普通日常任务
diff --git a/pages/submitLog/submitLog.vue b/pages/submitLog/submitLog.vue
index 41ef2a1..e33d853 100644
--- a/pages/submitLog/submitLog.vue
+++ b/pages/submitLog/submitLog.vue
@@ -29,7 +29,7 @@
             <view v-else-if="checkItem.status === 1">
               <view class="text-green-600 mb-1">已通过</view>
 
-              <zwp-ring-timing mode="chart" :value="checkItem.score" active-color="#F59E0B" radius="30" bar-width="4">
+              <zwp-ring-timing mode="chart" :value="checkItem.score" active-color="#F59E0B" :radius="30" bar-width="4">
                 <text class="text-yellow-500 font-medium">{{ checkItem.score }}</text>
               </zwp-ring-timing>
             </view>
diff --git a/plugins/p-deliver-check/p-deliver-check.vue b/plugins/p-deliver-check/p-deliver-check.vue
index 28e3795..0deff17 100644
--- a/plugins/p-deliver-check/p-deliver-check.vue
+++ b/plugins/p-deliver-check/p-deliver-check.vue
@@ -59,7 +59,7 @@
               <text v-if="item.status === 1" class="text-green-600"> 已通过 </text>
               <text v-else-if="item.status === 2" class="text-red-600"> 已驳回 </text>
             </view>
-            <zwp-ring-timing mode="chart" :value="item.score" active-color="#F59E0B" radius="30" bar-width="4" v-if="item.score !== null">
+            <zwp-ring-timing mode="chart" :value="item.score" active-color="#F59E0B" :radius="30" bar-width="4" v-if="item.score !== null">
               <text class="text-yellow-500 font-medium">{{ item.score }}</text>
             </zwp-ring-timing>
           </view>
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);