工作报告功能优化/新增ios跳转appStore方法/退出功能修复

src/api/login.js

@@ -21,10 +21,11 @@ export function getInfo() {
 }
 
 // 退出方法
-export function logout(params) {
+export function logout(data) {
   return request({
-    url: "/system/logout" + "?openId=" + params.openId,
+    url: "/system/logout",
     method: "delete",
+    params: data
   });
 }
 

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

@@ -274,19 +274,19 @@ function selectListApi() {
 function handleSubmit(value) {
   if (!state.form.projectName) {
     proxy.$modal.msg("请输入项目名称！");
-    return false;
+    return;
   }
   if (!state.form.projectType) {
     proxy.$modal.msg("请选择项目类型！");
-    return false;
+    return;
   }
   if (!state.form.projectStatus) {
     proxy.$modal.msg("请选择项目状态！");
-    return false;
+    return;
   }
   if (state.projectHeadList.length <= 0) {
     proxy.$modal.msg("请选择项目负责人！");
-    return false;
+    return;
   }
 
   state.form.projectHead = state.projectHeadList[0].id;
@@ -333,8 +333,8 @@ function handleSubmit(value) {
 }
 
 onLoad((options) => {
-  dUserList({ pageNum: "1", pageSize: "10000" }).then((res) => {
-    state.userDate = res.data.rows;
+  dUserList().then((res) => {
+    state.userDate = res.data;
   });
 
   if ("id" in options) {

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

@@ -215,8 +215,8 @@ const { tabsList, tabsCurrent, dataList, pageSize, current, total, userDate, pop
  * @页面初始化
  */
 function init() {
-  dUserList({ pageNum: "1", pageSize: "10000" }).then((res) => {
-    state.userDate = res.data.rows;
+  dUserList().then((res) => {
+    state.userDate = res.data;
   });
   selectListApi();
 }
@@ -259,7 +259,6 @@ function handleSubmit(type, item) {
         proxy.$modal.msg(errors);
       });
   } else if (type === "join") {
-    console.log("join");
     projectApi()
       .ProjectsJoin(item.id)
       .then(() => {
@@ -286,7 +285,6 @@ function moreClick(event) {
  * @api接口查询
  */
 function selectListApi() {
-  state.dataList = [];
   state.loading = true;
 
   projectApi()

src/pages/business/common/projectMange/mall/components/mall-list.vue

@@ -155,7 +155,7 @@ export default {
     handleSubmit() {
       if (this.checkboxList.length > this.activeUserNumber) {
         this.$modal.msg(`最多选择${this.activeUserNumber}人！`);
-        return false;
+        return;
       }
       this.$emit("submit", this.checkboxUserData);
     },

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

@@ -1,6 +1,6 @@
 <template>
   <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
-    <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="选择接收人" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
+    <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="选择人员" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
       <template #left>
         <view class="u-navbar__content__left__item">
           <u-icon name="arrow-left" size="20" color="#000"></u-icon>

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

@@ -193,8 +193,8 @@ const { form, projectsCheck, projectsList, userList, userDate, saveTime } = toRe
  * @初始化
  */
 function init() {
-  dUserList({ pageNum: "1", pageSize: "10000" }).then((res) => {
-    state.userDate = res.data.rows;
+  dUserList().then((res) => {
+    state.userDate = res.data;
   });
 
   projectApi()

src/plugins/common.plugins.js

@@ -50,6 +50,7 @@ export default {
 
       return returnValue;
     } else {
+      if (!data) return;
       for (let i = 0; i < data.length; i++) {
         if (value == data[i][isKey]) {
           return data[i][reKey];

src/store/modules/setting.js

@@ -291,17 +291,15 @@ const settingStores = defineStore("storage-setting", {
          * @检查更新
          */
         handleToUpgrade({ success, error }) {
+            let platform = uni.getSystemInfoSync().platform; //手机平台
             let data = {
                 _api_key: "fba7440cd37400b6ff46e303896af4df",
-                appKey: "cbd3508235d03365f4253f6aae6b68ab",
-                buildVersion: config.appInfo.version,
+                appKey: platform === "android" ? "cbd3508235d03365f4253f6aae6b68ab" : "4b858fce6367652f5c0959a0444a4bea",
+                buildVersion: "2.1.7",
             };
-
             modal.loading("加载中");
             checkUpdates(data).then((res) => {
                 if (res.code == 0) {
-                    let platform = uni.getSystemInfoSync().platform; //手机平台
-
                     if (res.data.buildHaveNewVersion == true) {
                         //安卓手机弹窗升级
                         if (platform === "android") {
@@ -309,16 +307,14 @@ const settingStores = defineStore("storage-setting", {
                         }
                         //IOS无法在线升级提示到商店下载
                         else {
-                            uni.showModal({
-                                title: "发现新版本 " + res.data.buildVersion,
-                                content: "请到App store进行升级",
-                                showCancel: false,
-                            });
+                            let appleId = 6449016600
+                            plus.runtime.launchApplication({
+                                action: `itms-apps://itunes.apple.com/cn/app/id${appleId}`,
+                            })
                         }
                     } else {
                         modal.msg("您的软件版本已是最新");
                     }
-
                     modal.closeLoading();
                 }
             });

src/store/modules/user.js

@@ -285,7 +285,12 @@ const useStores = defineStore("useStores", {
     // 退出系统
     LogOut() {
       return new Promise((resolve, reject) => {
-        logout({openId:localStorage.getItem("wxOpenId") ? localStorage.getItem("wxOpenId") : ""})
+        const openId = null;
+        // #ifdef H5
+        openId = localStorage.getItem("wxOpenId") ? localStorage.getItem("wxOpenId") : ""
+        // #endif
+
+        logout({ openId: openId })
           .then(() => {
             setting.setBadge(0); // 设置角标值
 
@@ -294,7 +299,6 @@ const useStores = defineStore("useStores", {
             this.SET_PERMISSIONS([]);
             removeToken();
             storage.clean();
-            localStorage.removeItem("App-Token");
             resolve();
           })
           .catch((error) => {
@@ -310,10 +314,10 @@ const useStores = defineStore("useStores", {
     GetWxOpenId(type, options) {
       let url = "https://manager.usky.cn/mobile/#/"
       if (type == 1 && common.isWechatMp()) {
-        if(localStorage.getItem("wxOpenId")){
-          if(localStorage.getItem("App-Token")){
+        if (localStorage.getItem("wxOpenId")) {
+          if (localStorage.getItem("App-Token")) {
             window.location.href = `${url}pages/index`;
-          }else{
+          } else {
             getPageAuthorization({ openId: localStorage.getItem("wxOpenId") }).then((res) => {
               if (res?.data?.openid && res?.data?.accessToken) {
                 localStorage.setItem("App-Token", res.data.accessToken)
@@ -322,7 +326,7 @@ const useStores = defineStore("useStores", {
               }
             })
           }
-        }else{
+        } else {
           if (window.location.href.indexOf("openId=") == -1) {
             window.location.href = config.baseUrl + "/service-iot/weChat/getFirst1";
           } else {
@@ -331,8 +335,8 @@ const useStores = defineStore("useStores", {
           }
         }
       } else if (type == 2 && common.isWechatMp()) {
-        if(localStorage.getItem("wxOpenId")){
-          if(!localStorage.getItem("App-Token")){
+        if (localStorage.getItem("wxOpenId")) {
+          if (!localStorage.getItem("App-Token")) {
             getPageAuthorization({ openId: localStorage.getItem("wxOpenId") }).then((res) => {
               if (res?.data?.openid && res?.data?.accessToken) {
                 localStorage.setItem("App-Token", res.data.accessToken)
@@ -343,10 +347,10 @@ const useStores = defineStore("useStores", {
                 })
               }
             })
-          }else{
+          } else {
             this.GetInfo()
           }
-        }else{
+        } else {
           window.location.href = config.baseUrl + "/service-iot/weChat/getFirst1";
         }
       }