فهرست منبع

自定义tabbar/整合iconfont图标/修复依赖BUG

fanghuisheng 1 سال پیش
والد
کامیت
8de791a6f1

+ 3 - 3
package.json

@@ -32,7 +32,7 @@
         "build:quickapp-webview": "uni build -p quickapp-webview",
         "build:quickapp-webview-huawei": "uni build -p quickapp-webview-huawei",
         "build:quickapp-webview-union": "uni build -p quickapp-webview-union",
-        "clear": "rimraf node_modules && cnpm install",
+        "clear": "rimraf node_modules && npm install",
         "clean": "npm cache clean --force"
     },
     "dependencies": {
@@ -51,8 +51,8 @@
         "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-3050320220729001",
         "echarts": "^5.3.3",
         "node-sass": "^7.0.1",
-        "pinia": "^2.0.34",
-        "pinia-plugin-persistedstate": "^2.1.1",
+        "pinia": "^2.0.14",
+        "pinia-plugin-persistedstate": "^2.0.14",
         "vue": "^3.2.47",
         "vue-echarts": "^6.2.3",
         "vue-i18n": "^9.1.9",

+ 11 - 4
src/App.vue

@@ -41,6 +41,8 @@ watchEffect(() => {
 
 onLaunch(() => {
   console.log("App Launch");
+  uni.hideTabBar(); //隐藏自带tabbar
+
   // #ifdef APP-PLUS
   plus.screen.lockOrientation("portrait-primary"); //设置不可横屏
   // #endif
@@ -51,14 +53,17 @@ onLaunch(() => {
   }
 
   // setToken(
-  //   "eyJhbGciOiJIUzUxMiJ9.eyIiOjEwMzIsInVzZXJfaWQiOjYzLCJ1c2VyX2tleSI6IjU3ODkxOTMxNDRiMjRhMTI4MzUyZjk3YTM1MjhlYjkyIiwidXNlcm5hbWUiOiJmaHMxIn0.VOaV8pB_yDn1sYxiYK3NlyzsD_65fjEaQrIhD1QitRFCmASnEOuVgKz_msGiQXtperasBfRTzyJDwE9T9Sw2Zw"
+  //   "eyJhbGciOiJIUzUxMiJ9.eyIiOjEwMzIsInVzZXJfaWQiOjYzLCJ1c2VyX2tleSI6IjExYWI0ODcyMWNhODQ4MDBiM2IzNzU1MTkzMDViMjI2IiwidXNlcm5hbWUiOiJmaHMxIn0.Q1dNUsk-cIpHRCTJV9ekoprLd7Q0ggrfirX_zo8EtO-FydtmRxlHZaBYkYWbsyvEGNN6b3O_s8ZOChXwTExnDg"
   // );
   // proxy.$tab.reLaunch("/pages/mine/index");
   // proxy.$tab.reLaunch("/pages/index");
+  // proxy.$tab.reLaunch("/pages/info/info");
 
   initApp();
 });
 
+onLoad(() => {});
+
 onReady(() => {});
 
 onShow(() => {
@@ -72,8 +77,6 @@ onHide(() => {
 
 <style lang="scss">
 @import "@/static/scss/index.scss";
-@import "@/static/scss/public.scss";
-@import "static/iconfont/iconfont.css";
 </style>
 
 <style lang="scss">
@@ -92,7 +95,7 @@ uni-page-refresh {
 //默认头部导航title样式
 :deep(.uni-page-head__title) {
   font-size: 16px;
-  font-weight: bold;
+  font-weight: 600;
 }
 
 //uview-plus导航栏title样式
@@ -100,4 +103,8 @@ uni-page-refresh {
   font-size: 16px;
   font-weight: bold;
 }
+
+:deep(.u-nav-slot .u-navbar__content__title) {
+  font-size: 18px;
+}
 </style>

+ 57 - 0
src/components/oa-tabbar/index.vue

@@ -0,0 +1,57 @@
+<template>
+  <u-tabbar :value="proxy.$settingStore.tabbarValue" @change="tabbarChange" :fixed="true" :placeholder="true" :safeAreaInsetBottom="true" :activeColor="proxy.$settingStore.themeColor.color">
+    <u-tabbar-item :text="tab.text" v-for="(tab, index) in tabbarList" :key="index" :dot="tab.dot">
+      <template #active-icon>
+        <image style="width: 24px; height: 24px" :src="proxy.$settingStore.themeColor.tabList[index]"></image>
+      </template>
+      <template #inactive-icon>
+        <image style="width: 24px; height: 24px" :src="tab.iconPath"></image>
+      </template>
+    </u-tabbar-item>
+  </u-tabbar>
+</template>
+<script setup>
+import { onReady, onLoad, onShow, onNavigationBarButtonTap, onPullDownRefresh, onReachBottom } from "@dcloudio/uni-app";
+import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance } from "vue";
+
+const { proxy } = getCurrentInstance();
+
+const props = defineProps({});
+
+const tabbarList = ref([
+  {
+    pagePath: "/pages/index",
+    iconPath: "/static/images/tabBar/tab-home.png",
+    selectedIconPath: "/static/images/tabBar/tab-home-blue.png",
+    text: "工作台",
+    dot: true,
+  },
+  // {
+  //   "pagePath": "pages/analyse/analyse",
+  //   "iconPath": "/static/images/tabBar/analyse.png",
+  //   "selectedIconPath": "/static/images/tabBar/analyse-selected.png",
+  //   "text": "分析"
+  // },
+  {
+    pagePath: "/pages/info/info",
+    iconPath: "/static/images/tabBar/tab-info.png",
+    selectedIconPath: "/static/images/tabBar/tab-info-blue.png",
+    text: "消息",
+    dot: true,
+  },
+  {
+    pagePath: "/pages/mine/index",
+    iconPath: "/static/images/tabBar/tab-my.png",
+    selectedIconPath: "/static/images/tabBar/tab-my-blue.png",
+    text: "我的",
+    dot: false,
+  },
+]);
+
+function tabbarChange(e) {
+  proxy.$settingStore.tabbarValue = e;
+  proxy.$tab.switchTab(tabbarList.value[e].pagePath);
+}
+
+onLoad((option) => {});
+</script>

+ 2 - 0
src/main.js

@@ -14,6 +14,7 @@ import JsonExcel from "vue-json-excel";
 // 引入UI组件
 import uviewPlus from "@/uni_modules/uview-plus";
 import oaCalendar from "@/components/oa-calendar/uni-calendar";
+import oaTabbar from "@/components/oa-tabbar/index";
 
 
 export function createApp() {
@@ -21,6 +22,7 @@ export function createApp() {
 
   //挂载全局组件
   app.component('oa-calendar', oaCalendar)
+  app.component('oa-tabbar', oaTabbar)
 
   // 挂载全局json导出
   app.component("downloadExcel", JsonExcel);

+ 2 - 13
src/pages.json

@@ -40,21 +40,10 @@
       "style": {
         // "disableScroll": true,
         "navigationBarTitleText": "我的",
+        "navigationStyle": "custom",
         "app-plus": {
           "bounce": "none",
-          "titleNView": {
-            "type": "transparent",
-            "buttons": [
-              {
-                "fontSrc": "/static/iconfont/iconfont.ttf",
-                "text": "\ue70f",
-                "fontSize": "24px",
-                "color": "#ffffff",
-                "float": "right",
-                "background": "rgba(0,0,0,0)"
-              }
-            ]
-          }
+          "titleNView": false
         }
       }
     },

+ 1 - 0
src/pages/business/mhxf/xunJian/collect/index.vue

@@ -212,6 +212,7 @@ uni-page-refresh,
 .grayBackgroundColor {
   background: rgb(241, 241, 241);
 }
+
 .whiteBackgroundColor {
   background-color: #ffffff;
 }

+ 12 - 26
src/pages/index.vue

@@ -1,20 +1,16 @@
 <template>
   <!-- <u-sticky bgColor="#fff"> </u-sticky> -->
 
-  <u-navbar
-    :titleStyle="{ color: '#fff' }"
-    :autoBack="false"
-    :title="useStore.$state.loginTitle"
-    :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>
       <view class="u-nav-slot">
-        <u-icon name="arrow-left" size="19" color="#fff" style="display: none"></u-icon>
+        <!-- <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>
     </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"></u-icon>
@@ -23,7 +19,7 @@
   </u-navbar>
 
   <!-- <pagesHarder></pagesHarder> -->
-  <view class="home-container" :style="{ height: `calc(100vh - ${proxy.$settingStore.barHightTop})` }">
+  <view class="home-container" :style="{ height: `calc(100vh - ${proxy.$settingStore.barHightTop} )` }">
     <!-- <u-loadmore :status="arrayList.loadStatus" loadingText="" loadmoreText="" :icon="true" /> -->
     <view class="uni-content-body">
       <!-- 下拉列表 开始 -->
@@ -61,7 +57,7 @@
       <!-- 轮播图 结束 -->
 
       <!-- 宫格列表 -->
-      <view class="section2 section bg-white" style="margin-bottom: 10px" v-if="arrayList.recentlyUsed.length > 0">
+      <view class="section2 section bg-white margin-bottom-sm" v-if="arrayList.recentlyUsed.length > 0">
         <view style="color: #000000; font-size: 14px; padding: 10px 10px 5px 10px">最近使用</view>
         <view class="cu-list grid col-5 no-border">
           <view class="cu-item justify-center align-center" @tap="navItemClick(item)" v-for="(item, index) in arrayList.recentlyUsed.slice(0, 5)" :key="index">
@@ -91,6 +87,8 @@
       <!-- 宫格列表 end -->
     </view>
   </view>
+
+  <oa-tabbar></oa-tabbar>
 </template>
 
 <script setup>
@@ -198,16 +196,7 @@ function getMobileBannerApi() {
 }
 
 onLoad((option) => {
-  //获取首页标题
-  if (useStore.$state.loginTitle) {
-    uni.setNavigationBarTitle({
-      title: useStore.$state.loginTitle,
-    });
-  } else {
-    uni.setNavigationBarTitle({
-      title: "首页",
-    });
-  }
+  uni.hideTabBar(); //隐藏自带tabbar
 
   if (uni.getStorageSync(useStore.$state.name + useStore.$state.tenantId)) {
     arrayList.recentlyUsed = uni.getStorageSync(useStore.$state.name + useStore.$state.tenantId);
@@ -356,10 +345,7 @@ function getAppRoutersData() {
   });
 }
 
-onShow(() => {
-  //调用系统主题颜色
-  proxy.$settingStore.systemThemeColor([1, 2]);
-});
+onShow(() => {});
 
 // 自定义导航事件
 onNavigationBarButtonTap((e) => {

+ 53 - 57
src/pages/info/info.vue

@@ -1,48 +1,52 @@
 <template>
-  <view class="info-wrapper" style="height: 100%">
-    <u-navbar
-      :titleStyle="{ color: '#fff' }"
-      :autoBack="false"
-      title="消息"
-      :placeholder="true"
-      :safeAreaInsetTop="true"
-      :bgColor="proxy.$settingStore.themeColor.color"
-      @rightClick="rightButtonClick()"
-    >
-      <template #left>
-        <view class="u-nav-slot">
-          <u-icon name="arrow-left" size="19" color="#fff" style="display: none"></u-icon>
-        </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 :autoBack="false" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color" @rightClick="rightButtonClick()">
+    <template #left>
+      <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>
+    </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>
 
-    <view class="uni-content-header"></view>
-    <view class="uni-content-body">
-      <view class="justify-center align-center text-center">
-        <u-image src="@/static/images/info/info-bg.png" width="100%" height="292rpx" :showLoading="false" :fade="false"></u-image>
+  <scroll-view class="bg-white info-wrapper" scroll-y style="height: calc(100vh - 94.67px)">
+    <u-sticky style="top: 0px">
+      <view class="padding-sm" :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>
       </view>
+    </u-sticky>
+    <!-- <view class="uni-content-header">
+      <view class="padding-lr-sm padding-top-sm" style="width: 100%; height: 290rpx">
+        <image class="radius" style="width: 100%; height: 100%" src="@/static/images/info/info-bg.png" mode="scaleToFill"></image>
+      </view>
+    </view> -->
 
-      <scroll-view scroll-y style="height: calc(100% - 292rpx)">
-        <view class="cu-list menu-avatar padding-lr-sm padding-top-sm">
-          <view class="cu-item margin-bottom-sm" @tap="goFireBase()">
-            <view class="cu-avatar">
-              <image class="image-bg" src="@/static/images/info/fireBase.png" />
-            </view>
-            <view class="content">
-              <view class="">消防知识库</view>
-            </view>
-            <view class="nav-right">
-              <view class="text-grey">
-                <text class="icon iconfont margin-right-xs margin-left-lg"> &#xe629; </text>
-              </view>
+    <view class="uni-content-body">
+      <view class="cu-list menu-avatar padding-lr-sm padding-top-sm">
+        <view class="cu-item margin-bottom-sm" @tap="goFireBase()">
+          <view class="cu-avatar">
+            <image class="image-bg" src="@/static/images/info/fireBase.png" />
+          </view>
+          <view class="content">
+            <view class="">消防知识库</view>
+          </view>
+          <view class="nav-right">
+            <view class="text-grey">
+              <text class="icon iconfont margin-right-xs margin-left-lg"> &#xe629; </text>
             </view>
           </view>
-          <!-- <view class="cu-item " @tap="goPushList()">
+        </view>
+
+        <!-- <view style="height: 800px"></view> -->
+
+        <!-- <view class="cu-item " @tap="goPushList()">
 				<view class="cu-avatar " style="background-image:url(@/static/images/info/pushList.png)"></view>
 				<view class="content">
 					<view class="">消息推送</view>
@@ -53,10 +57,11 @@
 					</view>
 				</view>
 			</view> -->
-        </view>
-      </scroll-view>
+      </view>
     </view>
-  </view>
+  </scroll-view>
+
+  <oa-tabbar></oa-tabbar>
 </template>
 
 <script setup>
@@ -75,25 +80,16 @@ const data = reactive({
 const { indexBackgroundImage } = toRefs(data);
 
 function goFireBase() {
-  uni.navigateTo({
-    url: "/pages/info/fireBase/fireBase",
-    success: (res) => {},
-    fail: () => {},
-    complete: () => {},
-  });
+  proxy.$tab.navigateTo("/pages/info/fireBase/fireBase");
 }
 function goPushList() {
-  uni.navigateTo({
-    url: "/pages/info/pushList/pushList",
-    success: (res) => {},
-    fail: () => {},
-    complete: () => {},
-  });
+  proxy.$tab.navigateTo("/pages/info/pushList/pushList");
 }
 
-onShow(() => {
-  //调用系统主题颜色
-  proxy.$settingStore.systemThemeColor([1, 2]);
+onShow(() => {});
+
+onLoad((options) => {
+  uni.hideTabBar(); //隐藏自带tabbar
 });
 </script>
 

+ 5 - 5
src/pages/mine/avatar/index.vue

@@ -42,9 +42,9 @@
           </view>
         </view>
       </view>
-      <view class="cropper-config">
-        <button type="primary reverse" @click="getImage" style="margin-top: 30rpx">选择头像</button>
-        <button type="primary" @click="getImageInfo" style="margin-top: 30rpx">提交</button>
+      <view class="padding-sm">
+        <button type="default" class="margin-top-sm round text-dfl" @click="getImage" style="border: 1px rgb(0, 0, 0, 0.1) solid">选择头像</button>
+        <button type="primary" class="margin-top-sm round text-dfl" @click="getImageInfo">提交</button>
       </view>
       <canvas canvas-id="myCanvas" :style="'position:absolute;border: 1px solid red; width:' + imageW + 'px;height:' + imageH + 'px;top:-9999px;left:-9999px;'"></canvas>
     </view>
@@ -400,8 +400,8 @@ onShow(() => {
 /* pages/uni-cropper/index.wxss */
 
 .avatar-container {
-  .cropper-config {
-    padding: 20rpx 40rpx;
+  uni-button:after {
+    border: 0;
   }
 
   .cropper-content {

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

@@ -52,7 +52,7 @@ const data = reactive({
     //   }]
     // },
     {
-      icon: "iconfont icon-help",
+      icon: "iconfont ucicon-Help",
       title: "其他问题",
       childList: [
         {

+ 31 - 19
src/pages/mine/index.vue

@@ -1,11 +1,11 @@
 <template>
   <view class="mine-container">
     <!--顶部个人信息栏-->
-    <view class="header-section" :class="'bg-' + proxy.$settingStore.themeColor.name" :style="{ paddingTop: proxy.$settingStore.StatusBar ? proxy.$settingStore.StatusBar + 44 + 'px' : '55px' }">
+    <view class="header-section" :class="'bg-' + proxy.$settingStore.themeColor.name" :style="{ paddingTop: proxy.$settingStore.StatusBar ? proxy.$settingStore.StatusBar + 20 + 'px' : '55px' }">
       <view class="flex padding justify-between">
         <view class="flex align-center">
           <view v-if="!avatar" class="cu-avatar xl round bg-white" @click="handleToAvatar(1)">
-            <view class="iconfont icon-people text-gray icon"></view>
+            <view class="iconfont ucicon-people text-gray icon"></view>
           </view>
           <image v-if="avatar" @click="handleToAvatar(2)" :src="avatar" class="cu-avatar xl round"> </image>
           <view v-if="!data.name" @click="handleToLogin" class="login-tip"> 点击登录 </view>
@@ -37,13 +37,13 @@
       <view class="menu-list">
         <view class="list-cell list-cell-arrow" @click="handleToEditInfo">
           <view class="menu-item-box">
-            <view class="iconfont icon-user menu-icon"></view>
+            <view class="iconfont ucicon-user menu-icon"></view>
             <view>个人资料</view>
           </view>
         </view>
         <view class="list-cell list-cell-arrow" @click="handleToPwd">
           <view class="menu-item-box">
-            <view class="iconfont icon-password menu-icon"></view>
+            <view class="iconfont ucicon-password menu-icon"></view>
             <view>修改密码</view>
           </view>
         </view>
@@ -52,47 +52,53 @@
       <view class="menu-list">
         <view class="list-cell list-cell-arrow" @click="handleAbout">
           <view class="menu-item-box">
-            <view class="iconfont icon-aixin menu-icon"></view>
+            <view class="iconfont ucicon-aixin menu-icon"></view>
             <view>关于我们</view>
           </view>
         </view>
         <view class="list-cell list-cell-arrow" @click="handleHelp">
           <view class="menu-item-box">
-            <view class="iconfont icon-help menu-icon"></view>
+            <view class="iconfont ucicon-Help menu-icon"></view>
             <view>常见问题</view>
           </view>
         </view>
         <view class="list-cell list-cell-arrow" @click="handleCleanTmp">
           <view class="menu-item-box">
-            <view class="iconfont icon-clean menu-icon"></view>
+            <view class="iconfont ucicon-qinglihuancun menu-icon"></view>
             <view>清理缓存</view>
             <view style="margin: 0 15px 0 auto; font-size: 14px; color: #909399">{{ proxy.$settingStore.currentSize }}</view>
           </view>
         </view>
         <view class="list-cell list-cell-arrow" @click="handleToUpgrade">
           <view class="menu-item-box">
-            <view class="iconfont icon-refresh menu-icon"></view>
+            <view class="iconfont ucicon-jianchagengxin menu-icon"></view>
             <view>检查更新</view>
           </view>
         </view>
+        <view class="list-cell list-cell-arrow" @click="handleSetting">
+          <view class="menu-item-box">
+            <view class="iconfont ucicon-shezhi menu-icon"></view>
+            <view>设置</view>
+          </view>
+        </view>
       </view>
 
       <view class="menu-list">
         <!-- <view class="list-cell list-cell-arrow" @click="goMessagePush()">
           <view class="menu-item-box">
-            <view class="iconfont icon-aixin menu-icon"></view>
+            <view class="iconfont ucicon-aixin menu-icon"></view>
             <view>推送设置</view>
           </view>
         </view> -->
         <!-- <view class="list-cell list-cell-arrow" @click="goBuilding()">
           <view class="menu-item-box">
-            <view class="iconfont icon-help menu-icon"></view>
+            <view class="iconfont ucicon-aixin menu-icon"></view>
             <view>建筑管理</view>
           </view>
         </view> -->
         <!-- <view class="list-cell list-cell-arrow" @click="goFunReport()">
           <view class="menu-item-box">
-            <view class="iconfont icon-clean menu-icon"></view>
+            <view class="iconfont ucicon-aixin menu-icon"></view>
             <view>功能报备</view>
           </view>
         </view> -->
@@ -170,6 +176,8 @@
       </view>
     </view>
   </view>
+
+  <oa-tabbar></oa-tabbar>
 </template>
 
 <script setup>
@@ -217,6 +225,13 @@ function getAuthorizationApi(params) {
   });
 }
 
+/**
+ * @设置
+ */
+function handleSetting() {
+  proxy.$tab.navigateTo("/pages/mine/setting/index");
+}
+
 /**
  * @推送设置
  */
@@ -393,12 +408,11 @@ function coverTouchend() {
 
 onShow(() => {});
 
-onReady(() => {
-  //调用系统主题颜色
-  proxy.$settingStore.systemThemeColor([1, 2]);
-});
+onReady(() => {});
 
-onLoad((options) => {});
+onLoad((options) => {
+  uni.hideTabBar(); //隐藏自带tabbar
+});
 
 // 自定义导航事件
 onNavigationBarButtonTap((e) => {
@@ -412,11 +426,9 @@ onNavigationBarButtonTap((e) => {
 .mine-container {
   width: 100%;
   height: 100vh;
-  background-color: #f8f8f8;
 
   .header-section {
     padding: 55px 15px 0 15px;
-    color: white;
 
     .login-tip {
       font-size: 18px;
@@ -460,7 +472,7 @@ onNavigationBarButtonTap((e) => {
     // #ifdef H5
     padding-bottom: 50px;
     // #endif
-    background-color: #f8f8f8;
+    background-color: #f5f6f7;
 
     .mine-image {
       position: absolute;

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

@@ -32,7 +32,7 @@
           <uni-data-checkbox v-model="user.sex" :localdata="sexs" />
         </uni-forms-item>
       </uni-forms>
-      <button type="primary" class="edtiButtom" @click="submit">修改资料</button>
+      <button type="primary" class="round text-dfl" @click="submit">修改资料</button>
     </view>
   </view>
 </template>
@@ -218,11 +218,6 @@ page {
   .example {
     padding: 15px;
     background-color: #fff;
-
-    .edtiButtom {
-      font-size: 15px;
-      border-radius: 100px;
-    }
   }
 
   .segmented-control {

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

@@ -20,7 +20,7 @@
         <uni-forms-item name="confirmPassword" label="确认密码">
           <uni-easyinput type="password" v-model="user.confirmPassword" placeholder="请确认新密码" />
         </uni-forms-item>
-        <button type="primary" @click="submit">提交</button>
+        <button type="primary" class="round text-dfl" @click="submit">提交</button>
       </uni-forms>
     </view>
   </view>

+ 6 - 6
src/pages/mine/setting/index.vue

@@ -3,13 +3,13 @@
     <view class="menu-list">
       <view class="list-cell list-cell-arrow" @click="handleToEditInfo">
         <view class="menu-item-box">
-          <view class="iconfont icon-user menu-icon"></view>
+          <view class="iconfont ucicon-user menu-icon"></view>
           <view>个人资料</view>
         </view>
       </view>
       <view class="list-cell list-cell-arrow" @click="handleToPwd">
         <view class="menu-item-box">
-          <view class="iconfont icon-password menu-icon"></view>
+          <view class="iconfont ucicon-password menu-icon"></view>
           <view>修改密码</view>
         </view>
       </view>
@@ -18,26 +18,26 @@
     <view class="menu-list">
       <view class="list-cell list-cell-arrow" @click="handleAbout">
         <view class="menu-item-box">
-          <view class="iconfont icon-aixin menu-icon"></view>
+          <view class="iconfont ucicon-aixin menu-icon"></view>
           <view>关于我们</view>
         </view>
       </view>
       <view class="list-cell list-cell-arrow" @click="handleHelp">
         <view class="menu-item-box">
-          <view class="iconfont icon-help menu-icon"></view>
+          <view class="iconfont ucicon-Help menu-icon"></view>
           <view>常见问题</view>
         </view>
       </view>
       <view class="list-cell list-cell-arrow" @click="handleCleanTmp">
         <view class="menu-item-box">
-          <view class="iconfont icon-clean menu-icon"></view>
+          <view class="iconfont ucicon-qinglihuancun menu-icon"></view>
           <view>清理缓存</view>
           <view style="margin: 0 15px 0 auto; font-size: 14px; color: #909399">{{ proxy.$settingStore.currentSize }}</view>
         </view>
       </view>
       <view class="list-cell list-cell-arrow" @click="handleToUpgrade">
         <view class="menu-item-box">
-          <view class="iconfont icon-refresh menu-icon"></view>
+          <view class="iconfont ucicon-jianchagengxin menu-icon"></view>
           <view>检查更新</view>
         </view>
       </view>

BIN
src/static/images/mine/arc1.png


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

@@ -8,6 +8,7 @@ const settingStore = defineStore("setting", {
         currentSize: "",//APP缓存
 
         themeColor: storage.get(constant.themeColor),//主题
+        tabbarValue: 0,
 
         barHeight: 0,
         StatusBar: 0,
@@ -71,6 +72,8 @@ const settingStore = defineStore("setting", {
             let CustomBar = custom.bottom + custom.top - systemInfo.statusBarHeight;
             this.barHeight = CustomBar || 0
             //#endif
+
+            console.log(systemInfo)
         },
 
         SET_THEMECOLOR(themeColor) {