fix: 解决冲突

CHANGELOG.md

@@ -48,6 +48,7 @@
  - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e)
  - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5)
  - | 项目列表新 | [88cf48d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/88cf48d)
+ - | 小绿点隐藏 | [31f3dc7](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/31f3dc7)
  - | 引导页、广告页 | [4aa76ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/4aa76ff)
  - | 域名配置 | [b68272d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b68272d)
  - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e)

apis/finance.js

@@ -1,10 +1,12 @@
+import { computed } from 'vue';
 import store from '@/store/index';
 
-const fullPath = store.getters['finance/fullPath'];
+// const fullPath = store.getters['finance/fullPath'];
-console.log('fullPath: ', fullPath);
+// console.log('fullPath: ', fullPath);
+const domain = computed(() => store.state.domain);
 
 export function setupFinance(app) {
   uni.$u.api = { ...uni.$u.api } || {};
   // 根据任务id获取财务条信息
-  uni.$u.api.getFinanceByTask = taskDetailId => uni.$u.post(`${fullPath}/getByTask`, { taskDetailId });
+  uni.$u.api.getFinanceByTask = taskDetailId => uni.$u.post(`${domain.value}/finance/getByTask`, { taskDetailId });
 }

components/Plugin/Plugin.vue

@@ -22,7 +22,17 @@
     <p-source-manage v-else-if="pluginId === '16'" class="p-2" />
     <p-finance-audit v-else-if="pluginId === '17'" class="p-2" />
     <p-finance v-else-if="pluginId === '18'" class="p-2" />
-    <Render v-else :task="task" :pluginId="pluginId" :styleType="styleType" :pluginTaskId="pluginTaskId" :businessPluginId="businessPluginId" :param="param" />
+    <!-- TODO:需要新的id绑定  个人和终端按钮-->
+    <!-- <p-account-management /> -->
+    <Render
+      v-else
+      :task="task"
+      :pluginId="pluginId"
+      :styleType="styleType"
+      :pluginTaskId="pluginTaskId"
+      :businessPluginId="businessPluginId"
+      :param="param"
+    />
   </view>
 </template>
 

pages/detailWebview/detailWebview.vue

@@ -14,12 +14,11 @@ onLoad(options => {
     return;
   }
   if (options.url) {
+    console.log('options.url', options.url);
     src.value = options.url;
   }
   if (options.name) {
-    uni.setNavigationBarTitle({
+    uni.setNavigationBarTitle({ title: options.name || '详情页' });
-      title: options.name || '详情页',
-    });
   }
 });
 </script>

plugins/p-account-management/p-account-management.vue

@@ -0,0 +1,18 @@
+<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>
+</template>
+
+<script setup>
+// DEBUG:打开财务审批详情页
+function openAudit() {
+  uni.$ui.openDetail({ url: 'https://www.bilibili.com/', name: '个人账号管理' });
+}
+
+// DEBUG:打开财务统计详情页
+function openStatistical() {
+  uni.$ui.openDetail({ url: 'https://v.qq.com/', name: '终端UI配置' });
+}
+</script>

plugins/p-deliver-upload/p-deliver-upload.vue

@@ -185,6 +185,18 @@ async function uploadPhoto() {
   }
 }
 
+// 拍照上传
+// function photos (){
+//  uni.chooseImage({
+//      count: 1, //默认9
+//      sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+//      sourceType: ['album','camera'], //从相册选择
+//      success: function (res) {
+//          linkValue.value = JSON.stringify(res.tempFilePaths)
+//      }
+//  });
+// }
+
 // 确定修改交付物名称
 async function confirmEditDeliverName() {
   // TODO: 发请求 请求成功后更新task里的交付物信息

plugins/p-domain-source-manage/p-domain-source-manage.vue

@@ -0,0 +1,11 @@
+<!-- 资源管理 -->
+<template>
+  <button class="text-xs bg-blue-500 text-white leading-6" style="width: 500rpx" @click="openSourceManage">域资源管理</button>
+</template>
+
+<script setup>
+function openSourceManage() {
+  // DEBUG: 假数据 换成财务条 资源管理的地址
+  uni.$ui.openDetail({ url: 'https://www.taobao.com/', name: '域资源管理' });
+}
+</script>

plugins/p-finance-audit/p-finance-audit.vue

@@ -14,19 +14,11 @@ const { projectId, projectName, token } = useGenerateWebviewParam();
 
 // DEBUG:打开财务审批详情页
 function openAudit() {
-  uni.$ui.openDetail({
+  uni.$ui.openDetail({ url: `http://121.36.3.207/finance/index?name=财务审批&token=${token}&projectId=${projectId}&id=${task.id}&pn=${projectName}&tn=${task.name}` });
-    url: 'https://www.tall.wiki/finance/index',
-    name: '财务审批',
-    token,
-    projectId,
-    id: task.id,
-    pn: projectName,
-    tn: task.name,
-  });
 }
 
 // DEBUG:打开财务统计详情页
 function openStatistical() {
-  uni.$ui.openDetail({ url: 'https://www.taobao.com', name: '财务统计' });
+  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}` });
 }
 </script>

plugins/p-finance/p-finance.vue

@@ -37,7 +37,6 @@ const data = ref(null);
 // 查询任务上的财务条数据
 async function getFinanceByTaskData() {
   try {
-    console.log('task: ', task);
     const detailId = task.detailId;
     data.value = await uni.$u.api.getFinanceByTask(detailId);
   } catch (error) {

plugins/p-project version management/p-project version management.vue

@@ -0,0 +1,11 @@
+<!-- 资源管理 -->
+<template>
+  <button class="text-xs bg-blue-500 text-white leading-6" style="width: 500rpx" @click="openSourceManage">项目版本管理</button>
+</template>
+
+<script setup>
+function openSourceManage() {
+  // DEBUG: 假数据 换成财务条 资源管理的地址
+  uni.$ui.openDetail({ url: 'https://www.taobao.com/', name: '项目版本管理' });
+}
+</script>

utils/ui.js

@@ -67,7 +67,6 @@ export default {
       throw new Error('缺少url参数');
     }
     const query = stringify(options);
-    console.log('query: ', query);
     const path = `/pages/detailWebview/detailWebview?${query}`;
     uni.navigateTo({ url: path });
   },