fix: 解决冲突

4 years ago · f372036fac
22 changed files with 156 additions and 48 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -43,6 +43,7 @@
 - | 手机号登录 | [a198527](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a198527)
 - | 手机号登录 | [8f455da](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f455da)
 - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b)
+ - | 刷新页面store数据清空 | [17869db](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/17869db)
 - | 刷新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)
--- a/common/styles/theme/default.scss
+++ b/common/styles/theme/default.scss
@ -1,6 +1,7 @@
 // 默认主题文件
 .theme-default {
  background-color: #f3f3f3;
+
  .u-card {
    font-size: 16px !important;
    background-color: #f3f3f3 !important;
--- a/components/Render/Render.vue
+++ b/components/Render/Render.vue
@ -3,7 +3,7 @@
    <!-- #ifdef H5 -->
    <view
      class="content"
-      style="border-radius: 8px;"
+      style="border-radius: 8px"
      :id="`project-${task.id}`"
      :data-did="task.detailId"
      :data-param="param"
@ -41,7 +41,7 @@
 </template>

 <script setup>
-import { computed, reactive } from 'vue';
+import { computed, reactive, watch, ref } from 'vue';
 import { useStore } from 'vuex';

 defineProps({
@ -70,7 +70,7 @@ export default {
      pluginContent: null,
      pluginJs: null,
      show: false,
-      pluginlists: [],
+      pluginLists: [],
      flag: false,
      pluginInfo: {}
    };
@ -85,8 +85,8 @@ export default {
  methods: {
    // 获取插件信息
    async getPlugin() {
-      this.pluginlists = JSON.parse(this.allPlugin);
-      this.pluginlists.forEach(item => {
+      this.pluginLists = JSON.parse(this.allPlugin);
+      this.pluginLists.forEach(item => {
        if (this.pluginId === item.id) {
          this.flag = true;
          this.pluginInfo = item;
@ -129,14 +129,14 @@ export default {
 </script>

 <style scoped lang="scss">
-  .render-box{
-    border-radius: 8px;
-    background: #fff;
-    padding: 16px;
-    overflow: hidden;
-  }
+.render-box {
+  border-radius: 8px;
+  background: #fff;
+  padding: 16px;
+  overflow: hidden;
+}

-  button{
-    border: none!important;
-  }
+button {
+  border: none !important;
+}
 </style>
--- a/hooks/project/useGenerateWebviewParam.js
+++ b/hooks/project/useGenerateWebviewParam.js
@ -3,11 +3,9 @@ import { useStore } from 'vuex';

 export default function useGenerateWebviewParam() {
  const store = useStore();
-
  const projectId = computed(() => store.getters['project/projectId']);
  const token = computed(() => store.state.user.token);
  const projectName = computed(() => store.getters['project/projectName']);
-  
  return {
    projectId: projectId.value,
    token: token.value,
--- a/pages.json
+++ b/pages.json
@ -74,7 +74,43 @@
 				"navigationBarTitleText": "404"
 			}
 		}
-	],
+	    ,{
+            "path" : "pages/audit/audit",
+            "style" :
+            {
+                "navigationBarTitleText": "个人管理",
+                "enablePullDownRefresh": false
+            }
+
+        }
+        ,{
+            "path" : "pages/uidispose/uidispose",
+            "style" :
+            {
+                "navigationBarTitleText": "ui配置",
+                "enablePullDownRefresh": false
+            }
+
+        }
+        ,{
+            "path" : "pages/exarresources/exarresources",
+            "style" :
+            {
+                "navigationBarTitleText": "域资源管理",
+                "enablePullDownRefresh": false
+            }
+
+        }
+        ,{
+            "path" : "pages/projectVersion/projectVersion",
+            "style" :
+            {
+                "navigationBarTitleText": "项目版本管理",
+                "enablePullDownRefresh": false
+            }
+
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "TALL",
@ -89,4 +125,4 @@
 			"theme": "@/components/Theme/Theme.vue"
 		}
 	}
-}
+}
--- a/pages/audit/audit.vue
+++ b/pages/audit/audit.vue
@ -0,0 +1,13 @@
+<template>
+  <image src="../../static/personal.png"></image>
+</template>
+
+<script></script>
+
+<style lang="scss" scoped>
+image {
+  width: 100%;
+  height: 50vh;
+  object-fit: cover;
+}
+</style>
--- 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>
--- a/pages/exarresources/exarresources.vue
+++ b/pages/exarresources/exarresources.vue
@ -0,0 +1,13 @@
+<template>
+  <image src="../../static/exarresources.png"></image>
+</template>
+
+<script></script>
+
+<style lang="scss" scoped>
+image {
+  width: 100%;
+  height: 100vh;
+  object-fit: cover;
+}
+</style>
--- a/pages/project/project.vue
+++ b/pages/project/project.vue
@ -61,7 +61,7 @@ onMounted(() => {
 });

 if (!userInfo.value) {
-  let res = uni.$storage.getStorageSync('user');
+  const res = uni.$storage.getStorageSync('user');
  if (res) {
    store.commit('user/setUser', JSON.parse(res));
  }
@ -76,7 +76,12 @@ if (!userInfo.value) {
 watch(roleId, newValue => {
  if (newValue) {
    // 判断如果allTasks里有就不用加了
-    if (allTasks.value.length && allTasks.value[roleIndex.value] && allTasks.value[roleIndex.value].global && allTasks.value[roleIndex.value].task) return;
+    if (
+      allTasks.value.length
+      && allTasks.value[roleIndex.value]
+      && allTasks.value[roleIndex.value].global
+      && allTasks.value[roleIndex.value].task
+    ) return;

    console.log('当角色发生变化时', newValue);
    store.commit('task/setTimeNode', Date.now());
--- a/pages/projectVersion/projectVersion.vue
+++ b/pages/projectVersion/projectVersion.vue
@ -0,0 +1,13 @@
+<template>
+  <image src="../../static/projectVersion.png"></image>
+</template>
+
+<script></script>
+
+<style lang="scss" scoped>
+image {
+  width: 100%;
+  height: 90vh;
+  object-fit: cover;
+}
+</style>
--- 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>
--- a/pages/uidispose/uidispose.vue
+++ b/pages/uidispose/uidispose.vue
@ -0,0 +1,13 @@
+<template>
+  <image src="../../static/uidispose.png"></image>
+</template>
+
+<script></script>
+
+<style lang="scss" scoped>
+image {
+  width: 100%;
+  height: 40vh;
+  object-fit: cover;
+}
+</style>
--- a/plugins/p-account-management/p-account-management.vue
+++ b/plugins/p-account-management/p-account-management.vue
@ -1,18 +1,19 @@
 <template>
-  <div class="flex justify-around">
-    <button class="text-xs bg-blue-500 text-white leading-6" style="width: 250rpx" @click="openAudit">个人账号管理</button>
-    <button class="text-xs bg-blue-500 text-white leading-6" style="width: 250rpx" @click="openStatistical">终端UI配置</button>
-  </div>
+  <view class="flex justify-around">
+    <button class="text-xs bg-blue-500 text-white leading-6" style="width: 250rpx" @click="openAudit">账号管理</button>
+    <button class="text-xs bg-blue-500 text-white leading-6" style="width: 250rpx" @click="openStatistical">UI配置</button>
+  </view>
 </template>

 <script setup>
 // DEBUG:打开财务审批详情页
+
 function openAudit() {
-  uni.$ui.openDetail({ url: 'https://www.bilibili.com/', name: '个人账号管理' });
+  uni.navigateTo({ url: '/pages/audit/audit' });
 }

 // DEBUG:打开财务统计详情页
 function openStatistical() {
-  uni.$ui.openDetail({ url: 'https://v.qq.com/', name: '终端UI配置' });
+  uni.navigateTo({ url: '/pages/uidispose/uidispose' });
 }
 </script>
--- a/plugins/p-domain-source-manage/p-domain-source-manage.vue
+++ b/plugins/p-domain-source-manage/p-domain-source-manage.vue
@ -1,10 +1,12 @@
 <!-- 域资源管理 -->
 <template>
-  <button class="text-xs bg-blue-500 text-white leading-6" style="width: 500rpx" @click="openSourceManage">域资源管理</button>
+  <view class="px-5 py-3">
+    <button class="text-xs bg-blue-500 text-white leading-6" style="width: 500rpx" @click="openSourceManage">域资源管理</button>
+  </view>
 </template>

 <script setup>
 function openSourceManage() {
-  uni.$ui.openDetail({ url: 'https://www.taobao.com/', name: '域资源管理' });
+  uni.navigateTo({ url: '/pages/exarresources/exarresources' });
 }
 </script>
--- a/plugins/p-finance-audit/p-finance-audit.vue
+++ b/plugins/p-finance-audit/p-finance-audit.vue
@ -14,11 +14,17 @@ const { projectId, projectName, token } = useGenerateWebviewParam();

 // DEBUG:打开财务审批详情页
 function openAudit() {
-  uni.$ui.openDetail({ url: `http://121.36.3.207/finance/index?name=财务审批&token=${token}&projectId=${projectId}&id=${task.id}&pn=${projectName}&tn=${task.name}` });
+  uni.$ui.openDetail({
+    url: `http://121.36.3.207/finance/index?name=财务审批&token=${token}&projectId=${projectId}&id=${task.detailId}&pn=${projectName}&tn=${task.name}`,
+    name: '财务审批',
+  });
 }

 // DEBUG:打开财务统计详情页
 function openStatistical() {
-  uni.$ui.openDetail({ url: `http://121.36.3.207/finance/financial-approval?name=财务统计&token=${token}&projectId=${projectId}&id=${task.id}&pn=${projectName}&tn=${task.name}` });
+  uni.$ui.openDetail({
+    url: `http://121.36.3.207/finance/financial-approval?name=财务统计&token=${token}&projectId=${projectId}&id=${task.detailId}&pn=${projectName}&tn=${task.name}`,
+    name: '财务统计',
+  });
 }
 </script>
--- a/plugins/p-finance/p-finance.vue
+++ b/plugins/p-finance/p-finance.vue
@ -3,10 +3,16 @@
  <view class="finance-wrap" v-if="data" @click="openFinance">
    <!-- 预算和奖金 -->
    <view class="finance-row">
-      <view class="finance-item" :style="{ width: `${(data.budget * 100) / (data.budget + data.bonus)}%`, 'background-color': '#93C5FD' }">
+      <view
+        class="finance-item"
+        :style="{ width: `${(+data.budget * 100) / (+data.budget + +data.bonus)}%`, 'background-color': '#93C5FD' }"
+      >
        预算{{ data.budget / 100 }}
      </view>
-      <view class="finance-item" :style="{ width: `${(data.bonus * 100) / (data.budget + data.bonus)}%`, 'background-color': '#12c77e' }">
+      <view
+        class="finance-item"
+        :style="{ width: `${(+data.bonus * 100) / (+data.budget + +data.bonus)}%`, 'background-color': '#12c77e' }"
+      >
        奖金{{ data.bonus / 100 }}
      </view>
    </view>
@ -14,15 +20,15 @@
    <view class="finance-row">
      <view
        class="finance-item"
-        :style="{ width: `${(data.projectExpend * 100) / (data.projectExpend + data.dailyExpend)}%`, 'background-color': '#FBBF24' }"
+        :style="{ width: `${(+data.projectExpend * 100) / (+data.projectExpend + +data.dailyExpend)}%`, 'background-color': '#FBBF24' }"
      >
        项目采购{{ data.dailyExpend / 100 }}
      </view>
      <view
        class="finance-item"
-        :style="{ width: `${(data.dailyExpend * 100) / (data.projectExpend + data.dailyExpend)}%`, 'background-color': '#a1fd93' }"
+        :style="{ width: `${(+data.dailyExpend * 100) / (+data.projectExpend + +data.dailyExpend)}%`, 'background-color': '#a1fd93' }"
      >
-        日常采购{{ data.dailyExpend / 100 }}
+        日常采购{{ +data.dailyExpend / 100 }}
      </view>
    </view>
  </view>
@ -51,7 +57,9 @@ getFinanceByTaskData();
 // 打开详情页
 function openFinance() {
  // DEBUG: 假数据 换成财务条详情页的地址
-  uni.$ui.openDetail({ url: `http://121.36.3.207/finance/applicant?name=财务&token=${token}&projectId=${projectId}&id=${task.id}&pn=${projectName}&tn=${task.name}` });
+  uni.$ui.openDetail({
+    url: `http://121.36.3.207/finance/applicant?name=财务&token=${token}&projectId=${projectId}&id=${task.detailId}&pn=${projectName}&tn=${task.name}`,
+  });
 }
 </script>

--- a/plugins/p-project-version-management/p-project-version-management.vue
+++ b/plugins/p-project-version-management/p-project-version-management.vue
@ -1,10 +1,12 @@
 <!-- 项目版本管理 -->
 <template>
-  <button class="text-xs bg-blue-500 text-white leading-6" style="width: 500rpx" @click="openSourceManage">项目版本管理</button>
+  <view class="px-5 py-3">
+    <button class="text-xs bg-blue-500 text-white leading-6" style="width: 500rpx" @click="openSourceManage">项目版本管理</button>
+  </view>
 </template>

 <script setup>
 function openSourceManage() {
-  uni.$ui.openDetail({ url: 'https://www.taobao.com/', name: '项目版本管理' });
+  uni.navigateTo({ url: '/pages/projectVersion/projectVersion' });
 }
 </script>
--- a/plugins/p-source-manage/p-source-manage.vue
+++ b/plugins/p-source-manage/p-source-manage.vue
@ -1,6 +1,8 @@
 <!-- 资源管理 -->
 <template>
-  <button class="text-xs bg-blue-500 text-white leading-6" style="width: 500rpx" @click="openSourceManage">资源管理</button>
+  <view>
+    <button class="text-xs bg-blue-500 text-white leading-6" style="width: 500rpx" @click="openSourceManage">资源管理</button>
+  </view>
 </template>

 <script setup>
@ -11,15 +13,9 @@ const task = inject('task');
 const { projectId, projectName, token } = useGenerateWebviewParam();

 function openSourceManage() {
-  // DEBUG: 假数据 换成财务条 资源管理的地址
  uni.$ui.openDetail({
-    url: 'https://www.tall.wiki/finance/index',
+    url: `http://121.36.3.207/finance/index?name=资源管理&token=${token}&projectId=${projectId}&id=${task.detailId}&pn=${projectName}&tn=${task.name}`,
    name: '资源管理',
-    token,
-    projectId,
-    id: task.value.id,
-    pn: projectName,
-    tn: task.value.name,
  });
 }
 </script>
--- a/static/exarresources.png
+++ b/static/exarresources.png
--- a/static/personal.png
+++ b/static/personal.png
--- a/static/projectVersion.png
+++ b/static/projectVersion.png
--- a/static/uidispose.png
+++ b/static/uidispose.png