部分页面代码优化/逻辑完善

src/api/business/fireIot/alarmManage.js

@@ -9,7 +9,6 @@ export function dmpProductInfo(param) {
     });
 }
 
-
 // 告警类型列表
 export function baseAlarmTypeList(param) {
     return request({

src/components/oa-scroll/index.vue

@@ -1,5 +1,7 @@
 <template>
   <scroll-view
+    :class="customClass"
+    :style="customStyle"
     :scroll-y="true"
     scroll-with-animation
     :refresher-threshold="refresherThreshold"
@@ -60,6 +62,16 @@ const props = defineProps({
     type: String,
     default: "",
   },
+  //设置外部class
+  customClass: {
+    type: String,
+    default: "",
+  },
+  //设置外部style
+  customStyle: {
+    type: String || Object,
+    default: "" || {},
+  },
   //是否开启上拉加载
   refresherLoad: {
     type: Boolean,
@@ -97,7 +109,7 @@ const props = defineProps({
   },
 });
 
-const { pageSize, total, scrollTop, refresherLoad, lowerThreshold, refresherEnabled, refresherThreshold, refresherDefaultStyle, refresherBackground } = toRefs(props);
+const { pageSize, total, scrollTop, customClass, customStyle, refresherLoad, lowerThreshold, refresherEnabled, refresherThreshold, refresherDefaultStyle, refresherBackground } = toRefs(props);
 
 const defaultOption = reactive({});
 

src/config.js

@@ -1,7 +1,7 @@
 // 应用全局配置
 export default {
   //#ifdef APP-PLUS || MP-WEIXIN
-  baseUrl: "http://mobile.usky.cn:8099/prod-api",
+  baseUrl: "http://manager.usky.cn/prod-api",
   //#endif
 
   //#ifdef H5

src/pages/business/fireIot/alarmManage/alarmDetailsList/index.vue

@@ -4,7 +4,7 @@
   </u-sticky>
 
   <oa-scroll
-    class="scroll-height"
+    customClass=" scroll-height"
     :pageSize="pageSize"
     :total="total"
     :refresherLoad="true"

src/pages/business/fireIot/alarmManage/index.vue

@@ -1,6 +1,6 @@
 <template>
   <oa-scroll
-    class="bg-white scroll-height"
+    customClass="bg-white scroll-height"
     :pageSize="pageSize"
     :total="total"
     :refresherLoad="true"

src/pages/business/fireIot/deviceSelect/components/deviceDetailsList.vue

@@ -14,7 +14,7 @@
   </u-sticky>
 
   <oa-scroll
-    class="scroll-height"
+    customClass="scroll-height"
     :pageSize="pageSize"
     :total="total"
     :refresherLoad="true"

src/pages/business/fireIot/deviceSelect/index.vue

@@ -1,6 +1,6 @@
 <template>
   <oa-scroll
-    class="bg-white scroll-height"
+    customClass="bg-white scroll-height"
     :pageSize="pageSize"
     :total="total"
     :refresherLoad="true"

src/pages/business/fireIot/facilitiesGather/index.vue

@@ -1,6 +1,6 @@
 <template>
   <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
-    <view id="facilitiesGather" v-if="!successBool">
+    <view id="facilitiesGather">
       <view class="centerOne">
         <!-- <view class="title"> </view> -->
 
@@ -85,7 +85,7 @@
           </view>
         </u--form>
 
-        <view style="padding-bottom: 100px"> </view>
+        <view class="app-padding-bottom"> </view>
 
         <view class="app-button-fixed">
           <view class="app-flex">
@@ -110,13 +110,6 @@
         @change="changeHandler"
       ></u-picker>
     </view>
-
-    <view v-else>
-      <view style="display: flex">
-        <image style="width: 120px; height: 120px; margin: 50px auto 20px auto" src="@/static/images/unitInfoCollection/success.png" />
-      </view>
-      <view style="text-align: center; font-weight: 600">提交成功</view>
-    </view>
   </scroll-view>
 </template>
 
@@ -247,7 +240,6 @@ const dataList = reactive({
 const { sexList, form, rules, actionIndex, actionIndex1, actionTitle, actionShow, actionDefaultIndex, actionsList } = toRefs(dataList);
 
 const uForm = ref(null);
-const successBool = ref(false);
 
 /**
  * @初始化
@@ -387,7 +379,11 @@ function handleSubmit(type) {
           param.extendData.push({ key: el.key, value: el.value });
         });
 
-        add(param).then((requset) => {});
+        add(param).then((requset) => {
+          if (requset.status === "SUCCESS") {
+            proxy.$tab.navigateTo(`/pages/common/success/index?showNow=${false}`);
+          }
+        });
       })
       .catch((errors) => {
         uni.$u.toast("校验失败");

src/pages/business/fireIot/facilitiesView/facilitiesDetailsList.vue

@@ -14,7 +14,7 @@
   </u-sticky>
 
   <oa-scroll
-    class="scroll-height"
+    customClass="scroll-height"
     :pageSize="pageSize"
     :total="total"
     :refresherLoad="true"

src/pages/business/fireIot/facilitiesView/index.vue

@@ -1,6 +1,6 @@
 <template>
   <oa-scroll
-    class="scroll-height"
+    customClass="scroll-height"
     :refresherLoad="false"
     :refresherLoadTitle="false"
     :refresherEnabled="true"
@@ -19,7 +19,7 @@
 
       <view class="flex bg-white margin-lr-sm margin-top-sm padding-sm shadow-default radius" v-for="(data, index) in dataList" :key="index">
         <view class="margin-right-sm" style="margin-top: auto; margin-bottom: auto" @click="handleToDevice(data.id, data.typeName)">
-          <image style="width: 40px; height: 40px" :src="data.typeImg ? data.typeImg : '/static/images/404.png'" mode="aspectFill"></image>
+          <image style="width: 40px" :src="data.typeImg ? data.typeImg : '/static/images/404.png'" mode="widthFix"></image>
         </view>
 
         <view style="width: 100%" @click="handleToDevice(data.id, data.typeName)">

src/pages/business/mhxf/deviceManage/index.vue

@@ -215,7 +215,7 @@ onMounted(() => {});
 }
 
 .deviceManage {
-  height: calc(100% - 45px);
+  height: 100%;
   background-color: #ffffff;
 
   .content {

src/pages/business/mhxf/fireReport/index.vue

@@ -1,6 +1,6 @@
 <template>
   <oa-scroll
-    class="scroll-height"
+    customClass="scroll-height"
     :pageSize="pageSize"
     :total="total"
     :refresherLoad="true"

src/pages/business/mhxf/unitInfoCollection/index.vue

@@ -63,7 +63,7 @@
           </view>
         </u--form>
 
-        <view style="padding-bottom: 70px"> </view>
+        <view class="app-padding-bottom"> </view>
 
         <view class="app-button-fixed">
           <u-button class="app-buttom" type="primary" @click="handleSubmit('下一步')" shape="circle"> 下一步 </u-button>
@@ -244,7 +244,7 @@
           </view>
         </u--form>
 
-        <view style="padding-bottom: 70px">
+        <view class="app-padding-bottom">
           <u-button type="primary" style="width: 25%; height: 25px; margin-top: 10px" @click="addSubmit('建筑')" shape="circle" icon="plus" size="mini"> 添加建筑 </u-button>
         </view>
 

src/pages/common/customManage/index.vue

@@ -1,6 +1,6 @@
 <template>
   <oa-scroll
-    class="scroll-height"
+    customClass=" scroll-height"
     :pageSize="pageSize"
     :total="total"
     :refresherLoad="true"

src/pages/common/invoicing/index.vue

@@ -31,6 +31,7 @@
           </view>
           <view class="menu-item-box">
             <view> 客服电话：021-65376655</view>
+            <view class="iconfont ucicon-dial menu-icon" style="font-size: 14px; color: #909399; margin-left: 5px" @click="proxy.$common.makePhoneCall('02165376655')"> </view>
           </view>
           <view class="menu-item-box">
             <view> 公司邮箱：admin@chinausky.com</view>
@@ -107,7 +108,7 @@
         </view>
       </view>
 
-      <view style="padding-bottom: 105px"> </view>
+      <view class="app-padding-bottom"> </view>
 
       <view class="app-button-fixed">
         <u-button class="app-buttom" type="primary" @click="handleSubmit('提交')" shape="circle"> 提交 </u-button>
@@ -135,7 +136,7 @@
           <view class="menu-item-box">
             <view style="width: 90px">开户行</view>
             <view style="color: #666666">上海银行徐家汇支行</view>
-          </view> 
+          </view>
         </view>
         <view class="list-cell">
           <view class="menu-item-box">
@@ -145,7 +146,7 @@
         </view>
 
         <view class="list-cell">
-          <view class="menu-item-box">
+          <view class="menu-item-box" style="justify-content: center">
             <u-button style="width: auto" @click="copy(`上海永天科技股份有限公司\n16523652265865685\n上海银行徐家汇支行`)" shape="circle"> 复制汇款信息 </u-button>
           </view>
         </view>
@@ -407,5 +408,6 @@ onNavigationBarButtonTap((e) => {
 }
 
 .invoicing-container {
+  height: calc(100vh - env(safe-area-inset-top) - 44px) !important;
 }
 </style>

src/pages/common/success/index.vue

@@ -7,7 +7,7 @@
       <view style="text-align: center; font-weight: 600">提交成功</view>
     </view>
 
-    <view class="app-button-fixed">
+    <view class="app-button-fixed" v-if="showNow" style="box-shadow: 0px 0px 15px 0 rgba(0, 0, 0, 0)">
       <u-button class="app-buttom" type="primary" @click="navigateTo()" shape="circle"> 返回 </u-button>
     </view>
   </view>
@@ -23,6 +23,7 @@ import { getToken, setToken, removeToken } from "@/utils/auth";
 const publicStore = publicStores();
 
 const { proxy } = getCurrentInstance();
+const showNow = ref(true);
 
 /**
  * @返回上一级
@@ -31,7 +32,11 @@ function navigateTo() {
   proxy.$tab.navigateBack(1);
 }
 
-onLoad((options) => {});
+onLoad((options) => {
+  if ("showNow" in options) {
+    showNow.value = options.showNow;
+  }
+});
 </script>
 
 <style lang="scss" scoped>

src/pages/index.vue

@@ -19,8 +19,8 @@
   <!-- <pagesHarder></pagesHarder> -->
 
   <oa-scroll
-    class="scroll-height"
-    :style="{ height: `calc(100vh - (50px + ${proxy.$settingStore.barHightTop} + ${proxy.$settingStore.tabBarHeight}))` }"
+    customClass="scroll-height"
+    :customStyle="{ height: `calc(100vh - (50px + ${proxy.$settingStore.barHightTop} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="true"
     :refresherDefaultStyle="'none'"

src/pages/login.vue

@@ -191,6 +191,7 @@ function env() {
     useStore.GetMobileTenantConfig({ url: linkUrl.value });
   } else {
     uni.setStorageSync("serveUrl", "manager.usky.cn");
+    publicStore.setServeList("manager.usky.cn", "");
     linkUrl.value = uni.getStorageSync("serveUrl");
     useStore.GetMobileTenantConfig({ url: linkUrl.value });
   }

src/pages/mine/secure/loginLog/index.vue

@@ -1,6 +1,6 @@
 <template>
   <oa-scroll
-    class="scroll-height"
+    customClass="scroll-height"
     :pageSize="pageSize"
     :total="total"
     :refresherLoad="true"

src/pages/serveConfig.vue

@@ -111,10 +111,10 @@ function handleSubmit() {
 
   if (!port.value) {
     uni.setStorageSync("serveUrl", linkUrl.value);
-    publicStore.getServeList(linkUrl.value, content.value);
+    publicStore.setServeList(linkUrl.value, content.value);
   } else {
     uni.setStorageSync("serveUrl", linkUrl.value + ":" + port.value);
-    publicStore.getServeList(linkUrl.value + ":" + port.value, content.value);
+    publicStore.setServeList(linkUrl.value + ":" + port.value, content.value);
   }
 
   config.baseUrl = "http://" + uni.getStorageSync("serveUrl") + "/prod-api";

src/pages/serveConfigSelect.vue

@@ -104,7 +104,7 @@ function serveClick(type) {
           icon: "none",
         });
 
-        publicStore.getServeList(e.result, "");
+        publicStore.setServeList(e.result, "");
 
         init();
 
@@ -159,6 +159,7 @@ function navigateTo() {
  */
 function init() {
   let serveList = uni.getStorageSync("serveList");
+  console.log(serveList);
   if (serveList.length > 0) {
     radiolist.value = serveList[0].radiolist;
     radiovalue.value = serveList[0].radiovalue;

src/static/scss/public.scss

@@ -214,12 +214,10 @@ uni-input {
 }
 
 
-//ios底部安全距离
-.ios-padding-bottom {
-  /*兼容 IOS<11.2*/
-  padding-bottom: constant(safe-area-inset-bottom) !important;
-  /*兼容 IOS>11.2*/
-  padding-bottom: env(safe-area-inset-bottom) !important;
+//APP底部安全距离
+.app-padding-bottom {
+  padding-bottom: calc(constant(safe-area-inset-bottom) + 20px + 40px) !important;
+  padding-bottom: calc(env(safe-area-inset-bottom) + 20px + 40px) !important;
 }
 
 //公共按钮绝对定位
@@ -228,11 +226,9 @@ uni-input {
   left: 0;
   right: 0;
   bottom: 0;
-  //#ifdef APP-PLUS || MP-WEIXIN
-  bottom: constant(safe-area-inset-bottom);
-  bottom: calc(env(safe-area-inset-bottom) - 25px);
-  //#endif
-  padding: 0px 15px 0px 15px;
+  padding: 10px 15px 10px 15px;
+  background-color: #fff;
+  box-shadow: 0px 0px 15px 0 rgba(0, 0, 0, 0.1);
   z-index: 50;
 
   .app-buttom {
@@ -240,7 +236,10 @@ uni-input {
     width: 100%;
     height: 40px;
     font-size: 14px;
-    margin-bottom: 15px
+    //#ifdef APP-PLUS || MP-WEIXIN
+    margin-bottom: constant(safe-area-inset-bottom);
+    margin-bottom: env(safe-area-inset-bottom);
+    //#endif
   }
 
   .app-flex {
@@ -267,7 +266,7 @@ uni-input {
   height: calc(100vh - 44px);
   //#endif
 
-  //#ifdef APP-PLUS
+  //#ifdef APP-PLUS || MP-WEIXIN
   height: calc(100vh - constant(safe-area-inset-top));
   height: calc(100vh - env(safe-area-inset-top));
   //#endif
@@ -297,17 +296,4 @@ uni-input {
 
     color: #909399
   }
-}
-
-//公共分页功能样式
-.app-pagination {
-  padding-bottom: 10px;
-  padding-top: 10px;
-  padding-left: 10px;
-  padding-right: 10px;
-
-  //#ifdef APP-PLUS
-  padding-bottom: constant(safe-area-inset-bottom);
-  padding-bottom: env(safe-area-inset-bottom);
-  //#endif
 }

src/store/modules/public.js

@@ -315,7 +315,7 @@ const publicStore = defineStore("public", {
     /**
      * @公共添加服务器列表
      */
-    getServeList(linkUrl, content) {
+    setServeList(linkUrl, content) {
       let serveList = uni.getStorageSync("serveList");
       if (serveList.length <= 0) {
         uni.setStorageSync("serveList", [