消息推送功能优化/项目列表弹窗修改/加入项目功能完成

src/api/business/project.js

@@ -10,6 +10,9 @@ import { request } from "@/utils/request";
  * @method ProjectsWeekList 导入上一篇
  * @method ProjectsList 项目列表
  * @method ProjectsInsertUpdate 项目新增
+ * @method ProjectsDelete 项目删除
+ * @method ProjectsExit 项目退出
+ * @method ProjectsJoin 项目加入
  */
 export function projectApi() {
     return {
@@ -86,6 +89,12 @@ export function projectApi() {
                 url: '/service-iot/pmProject/exitProject?projectId=' + param,
                 method: 'GET',
             })
+        },
+        ProjectsJoin(param) {
+            return request({
+                url: '/service-iot/pmProject/joinProject?projectId=' + param,
+                method: 'GET',
+            })
         }
     }
 }

src/api/system/user.js

@@ -68,7 +68,7 @@ export function deptUserTreeSelect(query) {
 // 用户列表
 export function UserList(query) {
   return request({
-    url: '/system//user/list',
+    url: '/system/user/list',
     method: 'GET',
     params: query
   })

src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "综合智慧云",
     "appid" : "__UNI__36DE3A0",
     "description" : "综合智慧云APP，是一款助力于企业数字化的应用平台，帮助企业提升办公效率，实现组织数字化和业务数字化。",
-    "versionName" : "2.1.6",
-    "versionCode" : 16,
+    "versionName" : "2.1.9",
+    "versionCode" : 19,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -22,6 +22,12 @@
             "autoclose" : true,
             "delay" : 0
         },
+        "screenOrientation" : [
+            "portrait-primary",
+            "portrait-secondary",
+            "landscape-primary",
+            "landscape-secondary"
+        ],
         /* 模块配置 */
         "modules" : {
             "VideoPlayer" : {},
@@ -31,7 +37,8 @@
             "Barcode" : {},
             "Fingerprint" : {},
             "Push" : {},
-            "Camera" : {}
+            "Camera" : {},
+            "LivePusher" : {}
         },
         /* 应用发布信息 */
         "distribute" : {

src/pages/business/common/projectMange/list/index.vue

@@ -8,7 +8,7 @@
       </template>
       <template #right>
         <view class="u-navbar__content__right__item">
-          <u-icon name="list" size="20" color="#000" @click="handleSubmit('insert')" ></u-icon>
+          <u-icon name="plus" size="20" color="#000" @click="handleSubmit('insert')"></u-icon>
         </view>
       </template>
     </u-navbar>
@@ -49,14 +49,10 @@
       <view class="menu-list m0">
         <view class="list-cell" style="color: #666666; line-height: 25px" v-for="(base, index) in dataList" :key="index">
           <view class="content-area-top menu-item">
-            <view class="content-area-top-time"> </view>
-            <u-icon class="content-area-top-icon" name="man-delete" size="20" color="orange" @click="tips('warn',`确认退出名为 '${base.projectName}' 的项目？`,base,'exit')" 
-            v-if="base.projectHead != useStore.userId && base.createBy != useStore.name &&  base.projectMember.indexOf(useStore.userId) != -1"></u-icon>
-            <u-icon class="content-area-top-icon" name="edit-pen" size="20" color="rgb(20, 158, 255)" @click="handleSubmit('update',base)" v-if="base.projectHead == useStore.userId || base.createBy == useStore.name"></u-icon>
-            <u-icon class="content-area-top-icon" name="trash" size="20" color="red" @click="tips('error',`确认删除名为 '${base.projectName}' 的项目？`,base,'delete')" v-if="base.projectHead == useStore.userId || base.createBy == useStore.name"></u-icon>
+            <view class="content-area-top-name">{{ base.projectName }} </view>
+            <u-icon class="content-area-top-icon" name="more-dot-fill" size="20" color="#000" @click="moreClick(base)"></u-icon>
           </view>
           <view class="content-area-row_wrap menu-item">
-            <view class="content-area-row_wrap-view"> <strong>{{ base.projectName }}</strong> </view>
             <view class="content-area-row_wrap-view"> 负责人： {{ proxy.$common.mapping("nickName", "userId", base.projectHead, userDate) }} </view>
             <view class="content-area-row_wrap-view">
               状态：
@@ -76,10 +72,95 @@
   </oa-scroll>
 
   <oa-tabbar :tabbarValue="2" :tabbarList="proxy.$constData.projectTabbar" :isSwitchTab="false"></oa-tabbar>
-  <uni-popup ref="alertDialog" type="dialog">
-    <uni-popup-dialog :type="state.tip.type" cancelText="取消" confirmText="确定" title="操作提醒" :content="state.tip.content" @confirm="dialogConfirm"
-      @close="dialogClose"></uni-popup-dialog>
-  </uni-popup>
+
+  <u-popup :show="popup.show" mode="bottom" bgColor="#fff" :round="10" @close="popup.show = false">
+    <view
+      :style="{
+        borderTopLeftRadius: '10px',
+        borderTopRightRadius: '10px',
+        overflow: 'hidden',
+      }"
+    >
+      <u-button
+        class="custom-style"
+        type="info"
+        size="normal"
+        text="加入项目"
+        :customStyle="{
+          color: '#3c9cff',
+          borderWidth: 0,
+          borderRadius: 0,
+          borderBottomWidth: '1px',
+        }"
+        @click="handleModal('join', `确认加入名为 “ ${eventList.projectName} ” 的项目？`)"
+        v-if="eventList.projectMember.indexOf(useStore.userId) == -1"
+      ></u-button>
+      <u-button
+        class="custom-style"
+        type="info"
+        size="normal"
+        text="退出项目"
+        :customStyle="{
+          color: '#f9ae3d',
+          borderWidth: 0,
+          borderRadius: 0,
+          borderBottomWidth: '1px',
+        }"
+        @click="handleModal('exit', `确认退出名为 “ ${eventList.projectName} ” 的项目？`)"
+        v-if="eventList.projectMember.indexOf(useStore.userId) != -1"
+      ></u-button>
+      <u-button
+        class="custom-style"
+        type="info"
+        size="normal"
+        text="编辑项目"
+        :customStyle="{
+          color: '#3c9cff',
+          borderWidth: 0,
+          borderRadius: 0,
+          borderBottomWidth: '1px',
+        }"
+        @click="handleSubmit('update', eventList)"
+        v-if="eventList.projectHead == useStore.userId"
+      ></u-button>
+      <u-button
+        class="custom-style"
+        type="info"
+        size="normal"
+        text="删除项目"
+        :customStyle="{
+          color: '#f56c6c',
+          borderWidth: 0,
+          borderRadius: 0,
+          borderBottomWidth: '3px',
+        }"
+        @click="handleModal('delete', `确认删除名为 “ ${eventList.projectName} ” 的项目？`)"
+        v-if="eventList.projectHead == useStore.userId"
+      ></u-button>
+      <u-button
+        class="custom-style"
+        type="info"
+        size="normal"
+        text="取消"
+        :customStyle="{
+          color: '#3c9cff',
+          border: 'none',
+          borderRadius: 0,
+        }"
+        @click="popup.show = false"
+      ></u-button>
+    </view>
+  </u-popup>
+  <u-modal
+    :show="modal.show"
+    title="操作提醒"
+    :content="modal.content"
+    :showCancelButton="true"
+    :closeOnClickOverlay="true"
+    @confirm="handleSubmit(state.modal.type, eventList)"
+    @cancel="modal.show = false"
+    @close="modal.show = false"
+  ></u-modal>
 </template>
 
 <script setup>
@@ -111,19 +192,19 @@ const state = reactive({
   current: 1,
   total: 0,
   userDate: [],
-  modalShow: false,
-  modalType: "",
-  modalEvent: {},
-  msgContent:undefined,
-  tip:{
-    type:undefined,//弹框类型
-    content:"",//提示信息
-    data:{},//带入数据
-    operation:undefined,//操作类型
-  }
+  popup: {
+    show: false, //弹窗显示
+    content: "", //提示信息
+  },
+  modal: {
+    type: "", //操作类型
+    show: false, //弹窗显示
+    content: "", //提示信息
+  },
+  eventList: {}, //数据存储
 });
 
-const { tabsList, tabsCurrent, dataList, pageSize, current, total, userDate, modalShow, modalType, modalEvent } = toRefs(state);
+const { tabsList, tabsCurrent, dataList, pageSize, current, total, userDate, popup, modal, eventList } = toRefs(state);
 
 /**
  * @页面初始化
@@ -134,34 +215,20 @@ function init() {
   });
   selectListApi();
 }
+
 /**
  * 操作弹框提醒
- * @param type  弹框类型
+ * @param type  操作类型
  * @param content 提示内容
- * @param item 带入数据
- * @param operation 操作类型
  */
-function tips(type,content,item,operation){
-  state.tip.type=type
-  state.tip.content=content
-  state.tip.data=item
-  state.tip.operation=operation
-  proxy.$refs.alertDialog.open()
+function handleModal(type, content) {
+  state.modal.show = true;
+  state.modal.type = type;
+  state.modal.content = content;
 }
-/**弹框确定操作 */
-function dialogConfirm(){
-  if(state.tip.operation =='delete'){
-    handleSubmit('delete',state.tip.data)
-  }
-  if(state.tip.operation=='exit'){
-    handleSubmit('exit',state.tip.data)
-  }
-}
-/**弹框取消操作 */
-function dialogClose(){
-  proxy.$refs.alertDialog.close()
-}
-function handleSubmit(type,item) {
+
+/** 确定按钮点击事件 */
+function handleSubmit(type, item) {
   if (type === "insert") {
     proxy.$tab.navigateTo(`/pages/business/common/projectMange/list/addEdit`);
   } else if (type === "update") {
@@ -171,9 +238,13 @@ function handleSubmit(type,item) {
       .ProjectsDelete(item.id)
       .then(() => {
         proxy.$modal.msg("项目删除成功！");
+        state.modal.show = false;
+        state.popup.show = false;
         selectListApi();
       })
       .catch((errors) => {
+        state.modal.show = false;
+        state.popup.show = false;
         proxy.$modal.msg(errors);
       });
   } else if (type === "exit") {
@@ -181,21 +252,37 @@ function handleSubmit(type,item) {
       .ProjectsExit(item.id)
       .then(() => {
         proxy.$modal.msg("项目退出成功！");
+        state.modal.show = false;
+        state.popup.show = false;
         selectListApi();
       })
       .catch((errors) => {
+        state.modal.show = false;
+        state.popup.show = false;
+        proxy.$modal.msg(errors);
+      });
+  } else if (type === "join") {
+    console.log("join");
+    projectApi()
+      .ProjectsJoin(item.id)
+      .then(() => {
+        proxy.$modal.msg("项目加入成功！");
+        state.modal.show = false;
+        state.popup.show = false;
+        selectListApi();
+      })
+      .catch((errors) => {
+        state.modal.show = false;
+        state.popup.show = false;
         proxy.$modal.msg(errors);
       });
   }
-
-  state.modalShow = false;
 }
 
 /** 更多按钮点击事件 */
-function moreClick(type, event) {
-  state.modalShow = true;
-  state.modalType = type;
-  state.modalEvent = event;
+function moreClick(event) {
+  state.popup.show = true;
+  state.eventList = event;
 }
 
 /**
@@ -271,7 +358,7 @@ onLoad((options) => {
       font-size: 16px;
       font-weight: 600;
       color: #000000;
-      width:30%;
+      width: 100%;
       float: right;
       &-time {
         max-width: 70%;
@@ -281,7 +368,9 @@ onLoad((options) => {
       }
 
       &-name {
+        font-size: 14px;
         max-width: 70%;
+        text-align: left;
         color: #000;
       }
 

src/pages/business/common/projectMange/record/details.vue

@@ -38,14 +38,14 @@
             :bgColor="proxy.$settingStore.themeColor.color"
           ></u-avatar>
           <view>
-            <view class="content-area-header-title font16 mb5">{{ item.createBy }}</view>
-            <view class="content-area-header-time font14">{{ item.createTime.replace("T", " ") }}</view>
+            <view class="content-area-header-title font16 mb5">{{ item.createBy ? item.createBy : " " }}</view>
+            <view class="content-area-header-time font14">{{ item.submitDate ? item.submitDate.replace("T", " ") : " " }}</view>
           </view>
         </view>
 
         <view class="content-area-center mb10" v-for="child in item.workContents" :key="child">
           <view class="content-area-center-top flex">
-            <view class="content-area-center-top-title mr10">{{ child.projectName }}</view>
+            <view class="content-area-center-top-title mr10">{{ child.projectName ? child.projectName : " " }}</view>
             <view class="content-area-center-top-time" :style="{ color: proxy.$settingStore.themeColor.color }">{{ child.workTime }}h</view>
           </view>
           <u-text :text="child.workContent" color="#000000" size="14"></u-text>

src/pages/business/common/projectMange/write/components/template1.vue

@@ -294,8 +294,6 @@ function handleSubmit() {
 watch(
   () => props.projectList,
   (val) => {
-    console.log(val)
-
     state.userList = [];
     state.projectsCheck = [];
     state.projectsList = [];

src/pages/business/common/projectMange/write/insert.vue

@@ -72,7 +72,7 @@ function moreClick() {
   state.modalShow = true;
 }
 
-function handleSubmit(type,id) {
+function handleSubmit(type, id) {
   if (type === "importPrevious") {
     projectApi()
       .ProjectsWeekList({
@@ -117,9 +117,9 @@ function handleSubmit(type,id) {
 onReady(() => {});
 
 onShow(() => {
-  console.log("onShow",pages[pages.length - 1].options)
-  if(pages[pages.length - 1]?.options?.templateId && pages[pages.length - 1]?.options?.id){
-    handleSubmit("update",pages[pages.length - 1]?.options?.id)
+  console.log("onShow", pages[pages.length - 1].options);
+  if (pages[pages.length - 1]?.options?.templateId && pages[pages.length - 1]?.options?.id) {
+    handleSubmit("update", pages[pages.length - 1]?.options?.id);
   }
 
   //调用系统主题颜色

src/store/modules/setting.js

@@ -138,19 +138,22 @@ const settingStores = defineStore("storage-setting", {
             const platform = uni.getSystemInfoSync().platform;
             // 接收推送信息  在线
             plus.push.addEventListener("receive", (res) => {
+                console.log(res)
                 uni.createPushMessage({
                     title: res.title,
                     content: res.content,
+                    payload: res.payload
                 });
             });
             // 点击推送信息
             plus.push.addEventListener("click", (res) => {
                 console.log(res);
-                if (res.aps) {
-                    if ("url" in res.payload) {
-                    } else {
+                if ("payload" in res) {
+                    if ("infoType" in res.payload) {
+                        if (res.payload.infoType == 5) {
+                            tab.navigateTo(`/pages/business/common/projectMange/record/details?reportId=${res.payload.moduleId}`);
+                        }
                     }
-                    console.log(res.payload);
                 }
             });
         },