fanghuisheng 1 år sedan
förälder
incheckning
b034ebee44

+ 2 - 2
src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "综合智慧云",
     "name" : "综合智慧云",
     "appid" : "__UNI__36DE3A0",
     "appid" : "__UNI__36DE3A0",
     "description" : "综合智慧云app,助力企业数字化转型升级",
     "description" : "综合智慧云app,助力企业数字化转型升级",
-    "versionName" : "2.0.6",
-    "versionCode" : 8,
+    "versionName" : "2.0.7",
+    "versionCode" : 9,
     "transformPx" : false,
     "transformPx" : false,
     /* 5+App特有相关 */
     /* 5+App特有相关 */
     "app-plus" : {
     "app-plus" : {

+ 1 - 1
src/pages/business/fireIot/facilitiesManage/index.vue

@@ -24,7 +24,7 @@
 
 
         <view style="width: 100%" @click="handleToDevice(data.id, data.typeName)">
         <view style="width: 100%" @click="handleToDevice(data.id, data.typeName)">
           <view class="flex margin-bottom-xl">
           <view class="flex margin-bottom-xl">
-            <view class="text-dfl text-bold">{{ data.typeName }}</view>
+            <view class="font30 text-bold">{{ data.typeName }}</view>
             <view style="font-size: 14px; margin-top: auto; margin-right: auto">({{ data.typeFacilityNum || 0 }})</view>
             <view style="font-size: 14px; margin-top: auto; margin-right: auto">({{ data.typeFacilityNum || 0 }})</view>
           </view>
           </view>
           <view>
           <view>

+ 4 - 4
src/pages/common/applicationInfo/index.vue

@@ -8,22 +8,22 @@
       <view class="content-area" v-show="tabsCurrent == 0">
       <view class="content-area" v-show="tabsCurrent == 0">
         <u-empty v-show="allInfoList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
         <u-empty v-show="allInfoList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
         <view :id="index == allInfoList.length - 1 ? 'bottomInfo' : ''" v-for="(all, index) in allInfoList" :key="index" v-show="allInfoList.length > 0" @click="goContentDetails(all)">
         <view :id="index == allInfoList.length - 1 ? 'bottomInfo' : ''" v-for="(all, index) in allInfoList" :key="index" v-show="allInfoList.length > 0" @click="goContentDetails(all)">
-          <view class="content-area-time text-sm">{{ all.listTime }}</view>
+          <view class="content-area-time font24">{{ all.listTime }}</view>
           <view class="content-area-center radius bg-white">
           <view class="content-area-center radius bg-white">
             <view class="content-area-center-title">{{ all.typeTitle }}</view>
             <view class="content-area-center-title">{{ all.typeTitle }}</view>
             <view class="content-area-center-cont">{{ all.listTitle }}</view>
             <view class="content-area-center-cont">{{ all.listTitle }}</view>
-            <view class="content-area-center-buttom text-sm">查看详情 </view>
+            <view class="content-area-center-buttom font24">查看详情 </view>
           </view>
           </view>
         </view>
         </view>
       </view>
       </view>
       <view class="content-area" v-show="tabsCurrent == 1">
       <view class="content-area" v-show="tabsCurrent == 1">
         <u-empty v-show="noticeList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
         <u-empty v-show="noticeList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
         <view :id="index == noticeList.length - 1 ? 'bottomInfo' : ''" v-for="(all, index) in noticeList" :key="index" v-show="noticeList.length > 0" @click="goContentDetails(all)">
         <view :id="index == noticeList.length - 1 ? 'bottomInfo' : ''" v-for="(all, index) in noticeList" :key="index" v-show="noticeList.length > 0" @click="goContentDetails(all)">
-          <view class="content-area-time text-sm">{{ all.listTime }}</view>
+          <view class="content-area-time font24">{{ all.listTime }}</view>
           <view class="content-area-center radius bg-white">
           <view class="content-area-center radius bg-white">
             <view class="content-area-center-title">{{ all.typeTitle }}</view>
             <view class="content-area-center-title">{{ all.typeTitle }}</view>
             <view class="content-area-center-cont">{{ all.listTitle }}</view>
             <view class="content-area-center-cont">{{ all.listTitle }}</view>
-            <view class="content-area-center-buttom text-sm">查看详情 </view>
+            <view class="content-area-center-buttom font24">查看详情 </view>
           </view>
           </view>
         </view>
         </view>
       </view>
       </view>

+ 3 - 4
src/pages/index.vue

@@ -54,10 +54,10 @@
         <view class="app-common-notice bg-white radius shadow-default margin-lr-sm margin-bottom-sm" v-if="weatherData.length != 0">
         <view class="app-common-notice bg-white radius shadow-default margin-lr-sm margin-bottom-sm" v-if="weatherData.length != 0">
           <!-- <view class="info">
           <!-- <view class="info">
             <view class="info-header">
             <view class="info-header">
-              <view class="info-title text-df">综合智慧云</view>
-              <view class="info-time text-sm">07-25 19:23</view>
+              <view class="info-title font28">综合智慧云</view>
+              <view class="info-time font24">07-25 19:23</view>
             </view>
             </view>
-            <view class="info-center text-sm">综合智慧云app,助力企业数字化转型升级,超多业务功能,全新部署上线,操作简单流畅...</view>
+            <view class="info-center font24">综合智慧云app,助力企业数字化转型升级,超多业务功能,全新部署上线,操作简单流畅...</view>
           </view> -->
           </view> -->
 
 
           <view class="weather radius">
           <view class="weather radius">
@@ -120,7 +120,6 @@ import * as jwx from "@/utils/jssdk.js"; //引入js sdk的封装
 
 
 const useStore = useStores();
 const useStore = useStores();
 const publicStore = publicStores(); //全局公共Store
 const publicStore = publicStores(); //全局公共Store
-const BASE_URL = inject("$BASE_URL");
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 
 
 const arrayList = reactive({
 const arrayList = reactive({

+ 58 - 77
src/pages/info.vue

@@ -2,85 +2,67 @@
   <u-navbar :autoBack="false" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color" @rightClick="rightButtonClick()">
   <u-navbar :autoBack="false" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color" @rightClick="rightButtonClick()">
     <template #left>
     <template #left>
       <view class="u-nav-slot">
       <view class="u-nav-slot">
-        <!-- <u-icon name="arrow-left" size="19" color="#fff" style="display: none"></u-icon> -->
         <view class="u-navbar__content__title" style="color: #fff">消息</view>
         <view class="u-navbar__content__title" style="color: #fff">消息</view>
       </view>
       </view>
     </template>
     </template>
-    <template #center>
-      <view class="u-nav-slot"> </view>
-    </template>
-    <template #right>
-      <view class="u-nav-slot">
-        <u-icon name="plus" size="19" color="#fff" style="display: none"></u-icon>
-      </view>
-    </template>
   </u-navbar>
   </u-navbar>
 
 
   <u-sticky style="top: 0px">
   <u-sticky style="top: 0px">
-    <view class="padding-lr ptb10" :class="'bg-' + proxy.$settingStore.themeColor.name">
+    <view class="plr13 ptb10" :class="'bg-' + proxy.$settingStore.themeColor.name">
       <u--input placeholder="搜索" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" customStyle="height:35px;background-color:#f5f6fa;"></u--input>
       <u--input placeholder="搜索" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" customStyle="height:35px;background-color:#f5f6fa;"></u--input>
     </view>
     </view>
   </u-sticky>
   </u-sticky>
 
 
-  <scroll-view class="bg-white info-wrapper" scroll-y :style="`height: calc(100vh - (105px + ${proxy.$settingStore.barHightTop} + ${proxy.$settingStore.tabBarHeight}))`">
-    <view class="uni-content-body">
-      <view class="uni-list padding" @tap="goApplicationInfo()">
-        <view class="uni-avatar">
-          <image class="image-bg" src="@/static/images/common/applicationInfo.png" />
-        </view>
-        <view class="uni-content">
-          <view class="uni-item">
-            <view class="uni-item-cont text-dfl" style="color: #000000">应用消息</view>
-            <!-- <view class="uni-item-right text-sm" style="color: #909399">5月15日</view> -->
-          </view>
-          <view class="flex uni-item">
-            <view class="uni-item-cont text-df" style="color: #909399">您收到一条最新消息,请及时查看</view>
-            <!-- <view class="uni-item-right text-df" style="margin: auto 0">
-              <u-badge numberType="overflow" max="99" :value="1"></u-badge>
-            </view> -->
-          </view>
-        </view>
+  <scroll-view class="info-container bg-white" scroll-y :style="`height: calc(100vh - (105px + ${proxy.$settingStore.barHightTop} + ${proxy.$settingStore.tabBarHeight}))`">
+    <view class="content-area p13" v-for="item in infoList" :key="item" @tap="goApplicationInfo()">
+      <view class="content-area-avatar">
+        <image class="image-bg" src="@/static/images/common/applicationInfo.png" />
       </view>
       </view>
-    </view>
-
-    <!-- <view class="uni-content-body">
-      <view class="uni-list padding" @tap="goFireBase()">
-        <view class="uni-avatar">
-          <image class="image-bg" src="@/static/images/info/fireBase.png" />
+      <view class="content-area-child">
+        <view class="uni-item">
+          <view class="uni-item-text font30" style="color: #000000">{{ item.label }}</view>
+          <!-- <view class="uni-item-right font24" style="color: #909399">{{ item.time }}</view> -->
         </view>
         </view>
-        <view class="uni-content">
-          <view class="uni-item">
-            <view class="uni-item-cont text-dfl" style="color: #000000">消防知识库</view>
-            <view class="uni-item-right text-sm" style="color: #909399">5月15日</view>
-          </view>
-          <view class="flex uni-item">
-            <view class="uni-item-cont text-df" style="color: #909399">您收到一条最新消息,请及时查看</view>
-            <view class="uni-item-right text-df" style="margin: auto 0">
-              <u-badge numberType="overflow" max="99" :value="1"></u-badge>
-            </view>
+        <view class="uni-item">
+          <view class="uni-item-text font28" style="color: #909399">{{ item.cont }}</view>
+          <view class="uni-item-right font28" style="margin: auto 0">
+            <u-badge numberType="overflow" max="99" :value="item.badge"></u-badge>
           </view>
           </view>
         </view>
         </view>
       </view>
       </view>
-    </view> -->
+    </view>
   </scroll-view>
   </scroll-view>
 
 
   <oa-tabbar :tabbarValue="1"></oa-tabbar>
   <oa-tabbar :tabbarValue="1"></oa-tabbar>
 </template>
 </template>
 
 
 <script setup>
 <script setup>
-import fireBase from "@/static/images/info/fireBase.png";
 import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
 import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
 
 
+//引用API
 import {} from "@/api/mine/info.js";
 import {} from "@/api/mine/info.js";
 
 
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 
 
 const data = reactive({
 const data = reactive({
-  indexBackgroundImage: fireBase,
+  infoList: [
+    {
+      label: "应用消息",
+      time: "5月15日",
+      cont: "您收到一条最新消息,请及时查看",
+      badge: 0,
+    },
+    // {
+    //   label: "消防知识库",
+    //   time: "5月15日",
+    //   cont: "您收到一条最新消息,请及时查看",
+    //   badge: 0,
+    // },
+  ],
 });
 });
 
 
-const { indexBackgroundImage } = toRefs(data);
+const { infoList } = toRefs(data);
 
 
 function goApplicationInfo() {
 function goApplicationInfo() {
   proxy.$tab.navigateTo("/pages/common/applicationInfo/index");
   proxy.$tab.navigateTo("/pages/common/applicationInfo/index");
@@ -89,6 +71,7 @@ function goApplicationInfo() {
 function goFireBase() {
 function goFireBase() {
   proxy.$tab.navigateTo("/pages/info/fireBase/fireBase");
   proxy.$tab.navigateTo("/pages/info/fireBase/fireBase");
 }
 }
+
 function goPushList() {
 function goPushList() {
   proxy.$tab.navigateTo("/pages/info/pushList/pushList");
   proxy.$tab.navigateTo("/pages/info/pushList/pushList");
 }
 }
@@ -101,37 +84,35 @@ onLoad((options) => {
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
-:deep(.u-navbar__content__left) {
-  padding: 30upx;
-}
-
-.uni-list {
-  display: flex;
-
-  .uni-avatar {
-    margin: auto 20upx auto 0;
-    .image-bg {
-      width: 32px;
-      height: 32px;
-    }
-  }
-
-  .uni-content {
-    width: calc(100% - (32px + 0.625rem));
-    .uni-item {
-      display: flex;
-      line-height: 25px;
-      white-space: nowrap;
-
-      .uni-item-cont {
-        margin-right: auto;
-        overflow: hidden;
-        text-overflow: ellipsis;
+.info-container {
+  .content-area {
+    display: flex;
+
+    &-avatar {
+      margin: auto 20upx auto 0;
+      .image-bg {
+        width: 32px;
+        height: 32px;
       }
       }
+    }
 
 
-      .uni-item-right {
-        width: auto;
-        text-align: right;
+    &-child {
+      width: calc(100% - (32px + 0.625rem));
+      .uni-item {
+        display: flex;
+        line-height: 25px;
+        white-space: nowrap;
+
+        .uni-item-text {
+          margin-right: auto;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+
+        .uni-item-right {
+          width: auto;
+          text-align: right;
+        }
       }
       }
     }
     }
   }
   }

+ 1 - 1
src/pages/info/fireBashDetail/fireBashDetail.vue

@@ -7,7 +7,7 @@
 
 
         <image class="cu-avatar round" src="@/static/images/info/fireBase.png" />
         <image class="cu-avatar round" src="@/static/images/info/fireBase.png" />
 
 
-        <text class="margin-left-sm margin-right-sm text-sm">{{ getData.author }}</text>
+        <text class="margin-left-sm margin-right-sm font24">{{ getData.author }}</text>
         <text>{{ getData.release_time }}</text>
         <text>{{ getData.release_time }}</text>
       </view>
       </view>
       <view style="color: #999">阅读:{{ getData.frequency }}</view>
       <view style="color: #999">阅读:{{ getData.frequency }}</view>

+ 13 - 11
src/pages/mine/help/index.vue

@@ -10,12 +10,15 @@
 
 
     <view class="uni-content-header"></view>
     <view class="uni-content-header"></view>
     <view class="uni-content-body">
     <view class="uni-content-body">
-      <view class="list-item" v-for="(item, findex) in list" :key="findex" :title="item.title">
-        <view class="list-item-title"> <view :class="item.icon"></view>{{ item.title }} </view>
-        <view class="list-item-child">
-          <view class="question" hover-class="hover" v-for="(child, zindex) in item.childList" :key="zindex" @click="handleText(child)">
-            <view class="text-item">{{ child.title }}</view>
-            <view class="line" v-if="zindex !== item.childList.length - 1"></view>
+      <view class="uni-list" v-for="(item, findex) in list" :key="findex" :title="item.title">
+        <view class="uni-list-title">
+          <view :class="item.icon"></view>
+          {{ item.title }}
+        </view>
+        <view class="uni-list-child">
+          <view class="uni-list-child-item" hover-class="hover" v-for="(child, zindex) in item.childList" :key="zindex" @click="handleText(child)">
+            <view class="uni-list-child-item-title">{{ child.title }}</view>
+            <view class="uni-list-child-item-line" v-if="zindex !== item.childList.length - 1"></view>
           </view>
           </view>
         </view>
         </view>
       </view>
       </view>
@@ -29,7 +32,6 @@ import { ref, onMounted, inject, computed, shallowRef, reactive, getCurrentInsta
 import { publicStores, useStores } from "@/store/modules/index";
 import { publicStores, useStores } from "@/store/modules/index";
 
 
 const useStore = useStores();
 const useStore = useStores();
-
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 
 
 const data = reactive({
 const data = reactive({
@@ -72,7 +74,7 @@ onShow(() => {
   .uni-content-body {
   .uni-content-body {
     padding: 30rpx;
     padding: 30rpx;
 
 
-    .list-item {
+    .uni-list {
       margin-bottom: 30rpx;
       margin-bottom: 30rpx;
 
 
       &-title {
       &-title {
@@ -94,16 +96,16 @@ onShow(() => {
         border-radius: 16rpx;
         border-radius: 16rpx;
         margin-top: 10rpx;
         margin-top: 10rpx;
 
 
-        .question {
+        &-item {
           color: #606266;
           color: #606266;
           font-size: 28rpx;
           font-size: 28rpx;
 
 
-          .text-item {
+          &-title {
             font-size: 28rpx;
             font-size: 28rpx;
             padding: 24rpx;
             padding: 24rpx;
           }
           }
 
 
-          .line {
+          &-line {
             width: 100%;
             width: 100%;
             height: 1rpx;
             height: 1rpx;
             background-color: #f5f5f5;
             background-color: #f5f5f5;

+ 1 - 1
src/pages/mine/info/index.vue

@@ -89,7 +89,7 @@
           <uni-data-checkbox v-model="user.sex" :localdata="sexs" />
           <uni-data-checkbox v-model="user.sex" :localdata="sexs" />
         </uni-forms-item>
         </uni-forms-item>
       </uni-forms>
       </uni-forms>
-      <button type="primary" class="round text-dfl" @click="submit">修改资料</button>
+      <button type="primary" class="round font30" @click="submit">修改资料</button>
     </view> -->
     </view> -->
   </view>
   </view>
 
 

+ 0 - 40
src/static/scss/colorui.css

@@ -3768,46 +3768,6 @@ scroll-view.cu-steps .cu-item {
   pointer-events: none;
   pointer-events: none;
 }
 }
 
 
-/* ==================
-          文本
- ==================== */
-
-.text-xs {
-  font-size: 20upx;
-}
-
-.text-sm {
-  font-size: 24upx;
-}
-
-.text-df {
-  font-size: 28upx;
-}
-
-.text-dfl {
-  font-size: 30upx;
-}
-
-.text-lg {
-  font-size: 32upx;
-}
-
-.text-xl {
-  font-size: 36upx;
-}
-
-.text-xxl {
-  font-size: 44upx;
-}
-
-.text-sl {
-  font-size: 80upx;
-}
-
-.text-xsl {
-  font-size: 120upx;
-}
-
 .text-Abc {
 .text-Abc {
   text-transform: Capitalize;
   text-transform: Capitalize;
 }
 }

+ 8 - 0
src/static/scss/index.scss

@@ -87,6 +87,14 @@
     }
     }
 }
 }
 
 
+/* 文本
+------------------------------- */
+@for $i from 10 through 500 {
+    .font#{$i} {
+        font-size: #{$i}upx;
+    }
+}
+
 .text-ellipsis {
 .text-ellipsis {
     overflow: hidden; //超出的文本隐藏
     overflow: hidden; //超出的文本隐藏
     text-overflow: ellipsis; //溢出用省略号显示
     text-overflow: ellipsis; //溢出用省略号显示

+ 0 - 4
src/store/modules/setting.js

@@ -103,8 +103,6 @@ const settingStore = defineStore("setting", {
          * @清理缓存
          * @清理缓存
          */
          */
         handleCleanTmp() {
         handleCleanTmp() {
-            const useStore = useStores();
-
             // #ifdef H5
             // #ifdef H5
             uni.showToast({
             uni.showToast({
                 title: "缓存清理完成",
                 title: "缓存清理完成",
@@ -116,8 +114,6 @@ const settingStore = defineStore("setting", {
             // #ifdef APP-PLUS
             // #ifdef APP-PLUS
             setting.clearCache();//清除应用访问缓存
             setting.clearCache();//清除应用访问缓存
             // #endif
             // #endif
-
-            uni.removeStorageSync(useStore.$state.nickName + useStore.$state.tenantId);//清除首页宫格缓存
         },
         },
 
 
         /**
         /**