样式优化

src/components/oa-tabbar/index.vue

@@ -1,6 +1,6 @@
 <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">
+    <u-tabbar-item :text="tab.text" :name="tab.pagePath" 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>
@@ -24,7 +24,7 @@ const tabbarList = ref([
     iconPath: "/static/images/tabBar/tab-home.png",
     selectedIconPath: "/static/images/tabBar/tab-home-blue.png",
     text: "工作台",
-    dot: true,
+    dot: false,
   },
   // {
   //   "pagePath": "pages/analyse/analyse",
@@ -50,7 +50,7 @@ const tabbarList = ref([
 
 function tabbarChange(e) {
   proxy.$settingStore.tabbarValue = e;
-  proxy.$tab.switchTab(tabbarList.value[e].pagePath);
+  proxy.$tab.switchTab(e);
 }
 
 onLoad((option) => {});

src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "综合智慧云",
     "appid" : "__UNI__36DE3A0",
     "description" : "综合智慧云",
-    "versionName" : "2.0.0",
-    "versionCode" : 2,
+    "versionName" : "2.0.2",
+    "versionCode" : 4,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -150,6 +150,9 @@
                     "hdpi" : "src/static/images/wt/bg.png"
                 }
             }
+        },
+        "safearea" : {
+            "offset" : "none"
         }
     },
     /* 快应用特有相关 */

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

@@ -5,9 +5,9 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs, nextTick } from "vue";
+import { publicStores, useStores } from "@/store/modules/index";
 
-import publicStore from "@/store/modules/public";
-const publicStores = publicStore(); //全局公共Store
+const publicStore = publicStores(); //全局公共Store
 
 const { proxy } = getCurrentInstance();
 

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

@@ -77,11 +77,11 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentInstance, toRefs } from "vue";
+import { publicStores, useStores } from "@/store/modules/index";
 
 import { dataRtList } from "@/api/business/mhxf/deviceManage";
 
-import publicStore from "@/store/modules/public";
-const publicStores = publicStore(); //全局公共Store
+const publicStore = publicStores(); //全局公共Store
 
 const { proxy } = getCurrentInstance();
 

src/pages/business/mhxf/fireReport/components/detailed.vue

@@ -378,7 +378,7 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentInstance, toRefs } from "vue";
-import publicStore from "@/store/modules/public";
+import { publicStores, useStores } from "@/store/modules/index";
 
 import lineEcharts from "./echarts.vue";
 
@@ -386,7 +386,7 @@ import {} from "@/api/business/mhxf/informationSelect";
 
 const { proxy } = getCurrentInstance();
 
-const publicStores = publicStore(); //全局公共Store
+const publicStore = publicStores(); //全局公共Store
 
 const dataList = reactive({
   content1: [],

src/pages/business/mhxf/fireReport/components/detailedPath.vue

@@ -9,7 +9,7 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentInstance, toRefs } from "vue";
-import publicStore from "@/store/modules/public";
+import { publicStores, useStores } from "@/store/modules/index";
 
 import lineEcharts from "./echarts.vue";
 
@@ -17,7 +17,7 @@ import {} from "@/api/business/mhxf/informationSelect";
 
 const { proxy } = getCurrentInstance();
 
-const publicStores = publicStore(); //全局公共Store
+const publicStore = publicStores(); //全局公共Store
 
 const dataList = reactive({
   pathUrl: "",

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

@@ -21,13 +21,13 @@
 <script setup>
 import { onReady, onLoad, onShow, onReachBottom, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentInstance } from "vue";
-import publicStore from "@/store/modules/public";
+import { publicStores, useStores } from "@/store/modules/index";
 
 import { reportInfoList } from "@/api/business/mhxf/fireReport";
 
-const { proxy } = getCurrentInstance();
+const publicStore = publicStores(); //全局公共Store
 
-const publicStores = publicStore(); //全局公共Store
+const { proxy } = getCurrentInstance();
 
 const dataRes = ref(true);
 const dataList = ref([]);

src/pages/business/mhxf/informationSelect-test/index.vue

@@ -36,13 +36,13 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentInstance } from "vue";
-import publicStore from "@/store/modules/public";
+import { publicStores, useStores } from "@/store/modules/index";
 
 import { dataList } from "@/api/business/mhxf/informationSelect";
 
-const { proxy } = getCurrentInstance();
+const publicStore = publicStores(); //全局公共Stores
 
-const publicStores = publicStore(); //全局公共Store
+const { proxy } = getCurrentInstance();
 
 const dataInput = ref("");
 const current = ref(0);

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

@@ -36,13 +36,13 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentInstance } from "vue";
-import publicStore from "@/store/modules/public";
+import { publicStores, useStores } from "@/store/modules/index";
 
 import { dataList } from "@/api/business/mhxf/informationSelect";
 
 const { proxy } = getCurrentInstance();
 
-const publicStores = publicStore(); //全局公共Store
+const publicStore = publicStores(); //全局公共Store
 
 const dataInput = ref("");
 const current = ref(0);

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

@@ -164,15 +164,14 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentInstance } from "vue";
-import useStores from "@/store/modules/user.js";
-import publicStore from "@/store/modules/public";
+import { publicStores, useStores } from "@/store/modules/index";
 
 import { mobileScheduleList, updateMobileReformStatus, uploadAvatar, addReformMaterial } from "@/api/business/mhxf/needMatter";
 
 const { proxy } = getCurrentInstance();
 
 const useStore = useStores();
-const publicStores = publicStore(); //全局公共Store
+const publicStore = publicStores(); //全局公共Store
 
 const current = ref(0);
 const classifyData = ref([]);

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

@@ -185,15 +185,14 @@
 <script setup>
 import { onLoad, onShow, onHide, onLaunch, onReady } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, getCurrentInstance } from "vue";
+import { publicStores, useStores } from "@/store/modules/index";
 import { getToken } from "@/utils/auth";
 
-import publicStore from "@/store/modules/public.js";
-
 import { companyByNameSelect, addBaseCompany, delBaseBuild } from "@/api/business/mhxf/unitInfoCollection";
 
 const { proxy } = getCurrentInstance();
 
-const publicStores = publicStore();
+const publicStore = publicStores();
 
 const dataList = reactive({
   form: {
@@ -841,7 +840,7 @@ function handleDateTime(value, index, time) {
  * @确定按钮事件
  */
 function timeSubmit(data) {
-  let time = publicStores.formatterDateTime(data.value);
+  let time = publicStore.formatterDateTime(data.value);
   let timeData = time.split(" ")[0];
   if (timeTitle.value == "成立时间") {
     form.value.foundTime = timeData;

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

@@ -316,15 +316,14 @@
 <script setup>
 import { onLoad, onShow, onHide, onLaunch, onReady } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, getCurrentInstance } from "vue";
+import { publicStores, useStores } from "@/store/modules/index";
 import { getToken } from "@/utils/auth";
 
-import publicStore from "@/store/modules/public.js";
-
 import { companyByNameSelect, addBaseCompany, delBaseBuild, delBaseBuildExtinguish } from "@/api/business/mhxf/unitInfoCollection";
 
 const { proxy } = getCurrentInstance();
 
-const publicStores = publicStore();
+const publicStore = publicStores();
 
 const checkboxValue = ref([]);
 
@@ -1205,7 +1204,7 @@ function handleDateTime(value, index, time) {
  * @确定按钮事件
  */
 function timeSubmit(data) {
-  let time = publicStores.formatterDateTime(data.value);
+  let time = publicStore.formatterDateTime(data.value);
   let timeData = time.split(" ")[0];
   if (timeTitle.value == "成立时间") {
     form.value.foundTime = timeData;

src/pages/business/mhxf/xunJian/collect/components/collectDetail.vue

@@ -28,12 +28,10 @@ import {
   onNavigationBarButtonTap,
 } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
+import { publicStores, xunJianStores } from "@/store/modules/index";
 
-import publicStore from "@/store/modules/public";
-import xunJianStore from "@/store/modules/xunJian";
-
-const publicStores = publicStore(); //全局公共Store
-const xunjianStore = xunJianStore(); //全局变量值Store
+const publicStore = publicStores(); //全局公共Store
+const xunJianStore = xunJianStore(); //全局变量值Store
 
 const { proxy } = getCurrentInstance();
 
@@ -67,9 +65,9 @@ function handleInsert() {
     .validate()
     .then((res) => {
       let endTime = new Date();
-      model.siteTime = publicStores.formatterDate(endTime, "yyyy-MM-dd hh:mm:ss");
+      model.siteTime = publicStore.formatterDate(endTime, "yyyy-MM-dd hh:mm:ss");
 
-      xunjianStore.collectDataList.push(model);
+      xunJianStore.collectDataList.push(model);
 
       //   uni.navigateTo({
       //     url: "/pages/business/mhxf/xunJian/collect/index",

src/pages/business/mhxf/xunJian/collect/components/collectRecord.vue

@@ -33,11 +33,11 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
-import xunJianStore from "@/store/modules/xunJian";
+import { xunJianStores } from "@/store/modules/index";
 
 import { siteList } from "@/api/business/mhxf/xunJian/collect.js";
 
-const xunjianStore = xunJianStore(); //全局变量值Store
+const xunJianStore = xunJianStores(); //全局变量值Store
 
 const { proxy } = getCurrentInstance();
 

src/pages/business/mhxf/xunJian/collect/index.vue

@@ -3,7 +3,7 @@
     <!-- 按组使用 -->
     <uni-swipe-action>
       <uni-swipe-action-item
-        v-for="(cu, index) in xunjianStore.collectDataList"
+        v-for="(cu, index) in xunJianStore.collectDataList"
         :key="index"
         :right-options="options"
         @click="bindClick($event, index)"
@@ -51,19 +51,18 @@
       ></uni-popup-message>
     </uni-popup>
 
-    <u-empty marginTop="20%" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" v-if="xunjianStore.collectDataList.length <= 0"> </u-empty>
+    <u-empty marginTop="20%" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" v-if="xunJianStore.collectDataList.length <= 0"> </u-empty>
   </scroll-view>
 </template>
 
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
+import { xunJianStores } from "@/store/modules/index";
 
 import { addSite } from "@/api/business/mhxf/xunJian/collect.js";
 
-import xunJianStore from "@/store/modules/xunJian";
-const xunjianStore = xunJianStore(); //全局变量值Store
-
+const xunJianStore = xunJianStores(); //全局变量值Store
 const { proxy } = getCurrentInstance();
 
 /**
@@ -143,7 +142,7 @@ function handleInsert(e) {
         messageList.color = "#09bb07";
         message.value.open();
 
-        xunjianStore.collectDataList.splice(xunjianStore.collectDataList.indexOf(e), 1);
+        xunJianStore.collectDataList.splice(xunJianStore.collectDataList.indexOf(e), 1);
       } else {
       }
     });
@@ -163,7 +162,7 @@ const options = ref([
  * @左滑删除点击事件
  */
 function bindClick(e, index) {
-  xunjianStore.collectDataList.splice(index, 1);
+  xunJianStore.collectDataList.splice(index, 1);
 }
 
 /**
@@ -171,9 +170,9 @@ function bindClick(e, index) {
  */
 function swipeChange(e, index) {
   if (e == "right") {
-    xunjianStore.collectDataList[index].swipeBool = true;
+    xunJianStore.collectDataList[index].swipeBool = true;
   } else {
-    xunjianStore.collectDataList[index].swipeBool = false;
+    xunJianStore.collectDataList[index].swipeBool = false;
   }
 }
 
@@ -206,13 +205,6 @@ onMounted(() => {});
 </style>
 
 <style scoped>
-body,
-uni-page-body,
-uni-page-refresh,
-.grayBackgroundColor {
-  background: rgb(241, 241, 241);
-}
-
 .whiteBackgroundColor {
   background-color: #ffffff;
 }

src/pages/business/mhxf/xunJian/plan/components/content.vue

@@ -1,7 +1,7 @@
 <template>
   <scroll-view scroll-y>
-    <view>
-      <view class="whiteBackgroundColor" style="padding: 15px; margin-bottom: 15px" v-for="(con, index) in contentList" :key="index">
+    <view style="margin-bottom: 130px">
+      <view class="padding-15 margin-bottom-15 whiteBackgroundColor" v-for="(con, index) in contentList" :key="index">
         <view class="siteHeader">
           <uni-section :title="con.contentTitle" type="line"></uni-section>
 
@@ -10,7 +10,7 @@
           <u-button v-if="con.remarksBool == false" type="primary" icon="list-dot" style="width: 18px; height: 18px; padding: 0; margin: 0" shape="circle" @click="remarksClick(index)"> </u-button>
         </view>
         <view>
-          <view v-if="con.submissionMethod == 1" style="margin-top: 15px">
+          <view class="margin-top-15" v-if="con.submissionMethod == 1">
             <u-checkbox-group
               v-model="con.contentOptionListValue1"
               @change="
@@ -18,10 +18,10 @@
                   checkboxChange(val, index);
                 }
               "
-              :disabled="xunjianStore.contentArray.siteList.inspectionStatus == 2"
+              :disabled="xunJianStore.contentArray.siteList.inspectionStatus == 2"
             >
               <u-row style="width: 100%; flex-wrap: wrap">
-                <u-col v-for="option in con.contentOptionList" :key="option" span="6" style="margin-bottom: 15px">
+                <u-col class="margin-bottom-15" v-for="option in con.contentOptionList" :key="option" span="6">
                   <u-checkbox :label="option.optionName" :name="option.id" :checked="con.contentOptionListValue1.length > 0 ? con.contentOptionListValue1.indexOf(option.id) >= 0 : false">
                   </u-checkbox>
                 </u-col>
@@ -29,53 +29,47 @@
             </u-checkbox-group>
 
             <view v-if="con.remarksBool == true" style="display: flex; height: 32px; line-height: 32px; white-space: nowrap">
-              <span style="">备注：</span>
-              <u-input v-model="con.remarks" placeholder="请输入备注" :disabled="xunjianStore.contentArray.siteList.inspectionStatus == 2"></u-input>
+              <span>备注：</span>
+              <u-input v-model="con.remarks" placeholder="请输入备注" :disabled="xunJianStore.contentArray.siteList.inspectionStatus == 2"></u-input>
             </view>
           </view>
-          <view v-if="con.submissionMethod == 2" style="margin-top: 15px">
+          <view class="margin-top-15" v-if="con.submissionMethod == 2">
             <u-radio-group placement="row" v-model="con.contentOptionListValue">
               <u-row style="width: 100%; flex-wrap: wrap">
-                <u-col v-for="option in con.contentOptionList" :key="option" :span="6" style="margin-bottom: 15px">
-                  <u-radio :disabled="xunjianStore.contentArray.siteList.inspectionStatus == 2" :label="option.optionName" :name="option.id"> </u-radio>
+                <u-col class="margin-bottom-15" v-for="option in con.contentOptionList" :key="option" :span="6">
+                  <u-radio :disabled="xunJianStore.contentArray.siteList.inspectionStatus == 2" :label="option.optionName" :name="option.id"> </u-radio>
                 </u-col>
               </u-row>
             </u-radio-group>
 
             <view v-if="con.remarksBool == true" style="display: flex; height: 32px; line-height: 32px; white-space: nowrap">
-              <span style="">备注：</span>
-              <u-input v-model="con.remarks" placeholder="请输入备注" :disabled="xunjianStore.contentArray.siteList.inspectionStatus == 2"></u-input>
+              <span>备注：</span>
+              <u-input v-model="con.remarks" placeholder="请输入备注" :disabled="xunJianStore.contentArray.siteList.inspectionStatus == 2"></u-input>
             </view>
           </view>
-          <view v-if="con.submissionMethod == 3" style="margin-top: 15px">
-            <u-textarea v-model="con.contentOptionListValue" placeholder="请输入" maxlength="30" :disabled="xunjianStore.contentArray.siteList.inspectionStatus == 2"></u-textarea>
+          <view class="margin-top-15" v-if="con.submissionMethod == 3">
+            <u-textarea
+              class="margin-bottom-15"
+              v-model="con.contentOptionListValue"
+              placeholder="请输入"
+              maxlength="30"
+              :disabled="xunJianStore.contentArray.siteList.inspectionStatus == 2"
+            ></u-textarea>
 
-            <view v-if="con.remarksBool == true" style="display: flex; margin-top: 15px; height: 32px; line-height: 32px; white-space: nowrap">
-              <span style="">备注：</span>
-              <u-input v-model="con.remarks" placeholder="请输入备注" :disabled="xunjianStore.contentArray.siteList.inspectionStatus == 2"></u-input>
+            <view v-if="con.remarksBool == true" style="display: flex; height: 32px; line-height: 32px; white-space: nowrap">
+              <span>备注：</span>
+              <u-input v-model="con.remarks" placeholder="请输入备注" :disabled="xunJianStore.contentArray.siteList.inspectionStatus == 2"></u-input>
             </view>
           </view>
         </view>
       </view>
-
-      <view style="margin-bottom: 125px"></view>
     </view>
-    <view style="position: fixed; left: 0; right: 0; bottom: 0; padding: 15px">
+    <view class="app-position-fixed">
       <view>
-        <u-button
-          v-if="xunjianStore.contentArray.siteList.inspectionStatus == 1"
-          type="primary"
-          style="width: 100%; height: 40px; font-size: 14px; margin-bottom: 15px"
-          shape="circle"
-          @click="buttonClick(1)"
-        >
-          上一步
-        </u-button>
+        <u-button class="app-buttom" v-if="xunJianStore.contentArray.siteList.inspectionStatus == 1" type="primary" shape="circle" @click="buttonClick(1)"> 上一步 </u-button>
       </view>
       <view>
-        <u-button v-if="xunjianStore.contentArray.siteList.inspectionStatus == 1" type="primary" style="width: 100%; height: 40px; font-size: 14px" shape="circle" @click="buttonClick(2)">
-          提交
-        </u-button>
+        <u-button class="app-buttom" v-if="xunJianStore.contentArray.siteList.inspectionStatus == 1" type="primary" shape="circle" @click="buttonClick(2)"> 提交 </u-button>
       </view>
     </view>
 
@@ -86,13 +80,12 @@
 <script setup>
 import { onLoad, onShow } from "@dcloudio/uni-app";
 import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
+import { publicStores, xunJianStores } from "@/store/modules/index";
 
 import { updatePlan } from "@/api/business/mhxf/xunJian/plan.js";
 
-import xunJianStore from "@/store/modules/xunJian";
-
 const BASE_URL = inject("$BASE_URL");
-const xunjianStore = xunJianStore(); //全局变量值Store
+const xunJianStore = xunJianStores(); //全局变量值Store
 
 const { proxy } = getCurrentInstance();
 
@@ -106,7 +99,7 @@ function checkboxChange(value, index) {
  * @备注显示事件
  */
 function remarksClick(index) {
-  xunjianStore.contentArray.contentList[index].remarksBool = true;
+  xunJianStore.contentArray.contentList[index].remarksBool = true;
 }
 
 /**
@@ -170,15 +163,15 @@ async function buttonClick(type) {
     }
 
     const array = {
-      siteType: xunjianStore.contentArray.siteList.siteType,
-      siteNubmber: xunjianStore.contentArray.siteList.siteNubmber,
-      siteName: xunjianStore.contentArray.siteList.siteName,
+      siteType: xunJianStore.contentArray.siteList.siteType,
+      siteNubmber: xunJianStore.contentArray.siteList.siteNubmber,
+      siteName: xunJianStore.contentArray.siteList.siteName,
       siteStatus: 1, //定位 （0：未定位 1：已定位）
-      longitude: xunjianStore.contentArray.siteList.longitude,
-      latitude: xunjianStore.contentArray.siteList.latitude,
-      planSonId: xunjianStore.contentArray.siteList.planSonId,
-      siteId: xunjianStore.contentArray.siteList.id,
-      recordPictureList: xunjianStore.contentArray.siteList.recordPictureList,
+      longitude: xunJianStore.contentArray.siteList.longitude,
+      latitude: xunJianStore.contentArray.siteList.latitude,
+      planSonId: xunJianStore.contentArray.siteList.planSonId,
+      siteId: xunJianStore.contentArray.siteList.id,
+      recordPictureList: xunJianStore.contentArray.siteList.recordPictureList,
       recordOptionList: recordOptionList,
     };
 
@@ -194,9 +187,9 @@ async function buttonClick(type) {
 }
 
 onLoad((options) => {
-  contentList.value = xunjianStore.contentArray.contentList;
+  contentList.value = xunJianStore.contentArray.contentList;
 
-  if (xunjianStore.contentArray.siteList.inspectionStatus == 2) {
+  if (xunJianStore.contentArray.siteList.inspectionStatus == 2) {
     if (contentList.value.length > 0) {
       contentList.value.forEach((el) => {
         el.contentOptionListValue1 = [];

src/pages/business/mhxf/xunJian/plan/components/drawer.vue

@@ -1,7 +1,7 @@
 <template>
   <u-popup :show="scanBool" @close="close" @open="open" mode="bottom">
     <template #default>
-      <view style="margin-bottom: 15px; margin-top: 15px">
+      <view class="margin-bottom-15 margin-top-15">
         <h4 style="font-size: 16px; color: #149eff; text-align: center; margin-bottom: 10px">请选择计划</h4>
         <view style="font-size: 12px; color: #b7b7b7; text-align: center"> 当前地点存在于多个计划,请选择目标计划 </view>
       </view>
@@ -28,9 +28,9 @@
 <script setup>
 import { onLoad, onShow } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, watchEffect } from "vue";
+import { publicStores, xunJianStores } from "@/store/modules/index";
 
-import xunJianStore from "@/store/modules/xunJian";
-const xunjianStore = xunJianStore(); //全局变量值Store
+const xunJianStore = xunJianStores(); //全局变量值Store
 
 const props = defineProps({
   scanArray: {
@@ -52,10 +52,10 @@ const scanBool = ref(false);
  * @按钮点击事件
  */
 function reportClick(siteId, planSonId) {
-  xunjianStore.contentArray = {};
-  xunjianStore.siteNubmber = undefined;
-  xunjianStore.siteId = siteId;
-  xunjianStore.planSonId = planSonId;
+  xunJianStore.contentArray = {};
+  xunJianStore.siteNubmber = undefined;
+  xunJianStore.siteId = siteId;
+  xunJianStore.planSonId = planSonId;
 
   uni.navigateTo({
     url: "/pages/business/mhxf/xunJian/plan/components/siteDetails",

src/pages/business/mhxf/xunJian/plan/components/report.vue

@@ -1,6 +1,6 @@
 <template>
   <scroll-view scroll-y>
-    <view class="whiteBackgroundColor" style="display: flex; padding: 15px 0px 15px 15px; margin-bottom: 15px" v-for="cu in currentDateList" :key="cu">
+    <view class="margin-bottom-15 whiteBackgroundColor" style="display: flex; padding: 15px 0px 15px 15px" v-for="cu in currentDateList" :key="cu">
       <view class="reportLeft" @click="pulicClick(cu)">
         <u-image style="margin: auto" width="40" height="40" src="@/static/images/xunjian/scan.png" v-if="cu.siteType == 1" shape="circle"></u-image>
 
@@ -63,11 +63,11 @@
 <script setup>
 import { onLoad, onShow } from "@dcloudio/uni-app";
 import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
+import { publicStores, xunJianStores } from "@/store/modules/index";
 
 import { recordList, recordOption, siteDetails, planSonSiteDetails } from "@/api/business/mhxf/xunJian/plan.js";
 
-import xunJianStore from "@/store/modules/xunJian";
-const xunjianStore = xunJianStore(); //全局变量值Store
+const xunJianStore = xunJianStores(); //全局变量值Store
 
 const { proxy } = getCurrentInstance();
 
@@ -75,7 +75,7 @@ function pulicClick(obj) {
   if (obj.inspectionStatus == 2) {
     recordList({
       siteId: obj.id,
-      planSonId: xunjianStore.planSonId,
+      planSonId: xunJianStore.planSonId,
     }).then((res) => {
       if (res.status == "SUCCESS") {
         if (res.data.length > 0) {
@@ -86,21 +86,21 @@ function pulicClick(obj) {
             res.data[0].inspectionStatus = 2;
             res.data[0].pictureUrl = obj.pictureUrl;
 
-            xunjianStore.contentArray = {
+            xunJianStore.contentArray = {
               contentList: [res1.data.contentList],
               siteList: res.data[0],
             };
-            xunjianStore.siteId = undefined;
-            xunjianStore.siteNubmber = undefined;
+            xunJianStore.siteId = undefined;
+            xunJianStore.siteNubmber = undefined;
           });
         }
       } else {
       }
     });
   } else {
-    xunjianStore.contentArray = {};
-    xunjianStore.siteId = obj.id;
-    xunjianStore.siteNubmber = undefined;
+    xunJianStore.contentArray = {};
+    xunJianStore.siteId = obj.id;
+    xunJianStore.siteNubmber = undefined;
   }
 
   uni.navigateTo({
@@ -122,14 +122,14 @@ async function scanClick() {
         icon: "none",
       });
 
-      xunjianStore.contentArray = {};
-      xunjianStore.siteId = undefined;
-      xunjianStore.siteNubmber = e.result;
+      xunJianStore.contentArray = {};
+      xunJianStore.siteId = undefined;
+      xunJianStore.siteNubmber = e.result;
 
       siteDetails({
-        siteId: xunjianStore.siteId,
-        siteNubmber: xunjianStore.siteNubmber,
-        planSonId: xunjianStore.planSonId,
+        siteId: xunJianStore.siteId,
+        siteNubmber: xunJianStore.siteNubmber,
+        planSonId: xunJianStore.planSonId,
       }).then((res) => {
         if (res.status == "SUCCESS") {
           currentDateList.value.forEach((e) => {
@@ -163,7 +163,7 @@ async function scanClick() {
 const currentDateList = ref([]); //地点列表list数据存储
 function currentApi() {
   planSonSiteDetails({
-    planSonId: xunjianStore.planSonId,
+    planSonId: xunJianStore.planSonId,
   }).then((res) => {
     if (res.status == "SUCCESS") {
       currentDateList.value = res.data;

src/pages/business/mhxf/xunJian/plan/components/siteDetails.vue

@@ -1,7 +1,7 @@
 <template>
   <scroll-view scroll-y>
-    <view>
-      <view class="whiteBackgroundColor" style="display: flex; padding: 15px; margin-bottom: 15px">
+    <view style="margin-bottom: 75px">
+      <view class="padding-15 margin-bottom-15 whiteBackgroundColor" style="display: flex">
         <view style="margin-right: 15px; display: flex">
           <u-image style="margin: auto" width="40" height="40" src="@/static/images/xunjian/scan.png" v-if="siteList.siteType == 1" shape="circle"></u-image>
 
@@ -21,7 +21,7 @@
         </view>
       </view>
 
-      <view class="whiteBackgroundColor" style="margin-bottom: 15px; padding: 15px">
+      <view class="padding-15 margin-bottom-15 whiteBackgroundColor">
         <view class="siteHeader">
           <uni-section title="上报现场" type="line"></uni-section>
         </view>
@@ -41,7 +41,7 @@
         </view>
       </view>
 
-      <view class="whiteBackgroundColor" style="margin-bottom: 15px; padding: 15px; height: 170px; max-height: 170px">
+      <view class="padding-15 margin-bottom-15 whiteBackgroundColor" style="height: 170px; max-height: 170px">
         <view class="siteHeader">
           <uni-section title="备注" type="line"></uni-section>
         </view>
@@ -54,7 +54,7 @@
         </view>
       </view>
 
-      <view class="whiteBackgroundColor" style="padding: 15px">
+      <view class="padding-15 whiteBackgroundColor">
         <view class="siteHeader">
           <uni-section title="消防设施分布图" type="line"></uni-section>
         </view>
@@ -62,14 +62,12 @@
           <u-image width="100%" :src="siteList.pictureUrl"></u-image>
         </view>
       </view>
-
-      <view style="margin-bottom: 70px"></view>
     </view>
-    <view style="position: fixed; left: 0; right: 0; bottom: 0; padding: 15px">
+    <view class="app-position-fixed">
       <view>
-        <u-button v-if="siteList.inspectionStatus == 1" type="primary" style="width: 100%; height: 40px; font-size: 14px" @click="buttonClick()" shape="circle"> 下一步 </u-button>
+        <u-button v-if="siteList.inspectionStatus == 1" class="app-buttom" type="primary" @click="buttonClick()" shape="circle"> 下一步 </u-button>
 
-        <u-button v-if="siteList.inspectionStatus == 2" type="primary" style="width: 100%; height: 40px; font-size: 14px" @click="buttonClick()" shape="circle"> 查看巡检项 </u-button>
+        <u-button v-if="siteList.inspectionStatus == 2" class="app-buttom" type="primary" @click="buttonClick()" shape="circle"> 查看巡检项 </u-button>
       </view>
     </view>
   </scroll-view>
@@ -78,11 +76,11 @@
 <script setup>
 import { onLoad, onShow } from "@dcloudio/uni-app";
 import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
+import { publicStores, xunJianStores } from "@/store/modules/index";
 
 import { uploadAvatar, siteDetails } from "@/api/business/mhxf/xunJian/plan.js";
 
-import xunJianStore from "@/store/modules/xunJian";
-const xunjianStore = xunJianStore(); //全局变量值Store
+const xunJianStore = xunJianStores(); //全局变量值Store
 
 const { proxy } = getCurrentInstance();
 
@@ -96,9 +94,9 @@ const siteList = ref([]);
 const contentList = ref([]);
 function selectAPI() {
   siteDetails({
-    siteId: xunjianStore.siteId,
-    siteNubmber: xunjianStore.siteNubmber,
-    planSonId: xunjianStore.planSonId,
+    siteId: xunJianStore.siteId,
+    siteNubmber: xunJianStore.siteNubmber,
+    planSonId: xunJianStore.planSonId,
   }).then((res) => {
     if (res.status == "SUCCESS") {
       contentList.value = res.data.contentList;
@@ -121,7 +119,7 @@ function selectAPI() {
  * @查看巡检项
  */
 function buttonClick() {
-  xunjianStore.contentArray = {
+  xunJianStore.contentArray = {
     contentList: contentList.value,
     siteList: siteList.value,
   };
@@ -170,11 +168,11 @@ function uploadViewClose(el) {
 }
 
 onLoad((options) => {
-  if (JSON.stringify(xunjianStore.contentArray) == "{}") {
+  if (JSON.stringify(xunJianStore.contentArray) == "{}") {
     selectAPI();
   } else {
-    contentList.value = xunjianStore.contentArray.contentList[0];
-    siteList.value = xunjianStore.contentArray.siteList;
+    contentList.value = xunJianStore.contentArray.contentList[0];
+    siteList.value = xunJianStore.contentArray.siteList;
   }
 });
 

src/pages/business/mhxf/xunJian/plan/index.vue

@@ -40,9 +40,7 @@
                     </view>
                     <view style="margin: auto"></view>
                     <view style="display: flex">
-                      <gb-progress originalColor="#f5f7fa" processColor="#20a0ff" innerbgColor="#fff" :process="activity.completion" :startPosDegree="60" :radius="50" :barWidth="10">
-                        {{ activity.completion + "%" }}
-                      </gb-progress>
+                      <c-progress-circle style="margin: auto" :progress="activity.completion / 100" color="#20a0ff" size="100rpx" boderWidth="100rpx"></c-progress-circle>
                     </view>
                   </view>
                   <view style="display: flex" v-if="activity.planStatus == 1">
@@ -53,9 +51,7 @@
                     </view>
                     <view style="margin: auto"></view>
                     <view style="display: flex">
-                      <gb-progress originalColor="#f5f7fa" processColor="#20a0ff" innerbgColor="#fff" :process="activity.completion" :startPosDegree="60" :radius="50" :barWidth="10">
-                        {{ activity.completion + "%" }}
-                      </gb-progress>
+                      <c-progress-circle style="margin: auto" :progress="activity.completion / 100" color="#20a0ff" size="100rpx" boderWidth="100rpx"></c-progress-circle>
                     </view>
                   </view>
                   <view style="display: flex" v-if="activity.planStatus == 3">
@@ -79,9 +75,7 @@
                     </view>
                     <view style="margin: auto"></view>
                     <view style="display: flex">
-                      <gb-progress originalColor="#f5f7fa" processColor="#20a0ff" innerbgColor="#fff" :process="activity.completion" :startPosDegree="60" :radius="50" :barWidth="10">
-                        {{ activity.completion + "%" }}
-                      </gb-progress>
+                      <c-progress-circle style="margin: auto" :progress="activity.completion / 100" color="#20a0ff" size="100rpx" boderWidth="100rpx"></c-progress-circle>
                     </view>
                   </view>
                 </view>
@@ -145,14 +139,12 @@ import drawer from "./components/drawer.vue";
 
 import { onLoad, onShow, onLaunch } from "@dcloudio/uni-app";
 import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
+import { publicStores, xunJianStores } from "@/store/modules/index";
 
 import { recordList, recordOption, planList, patrolInspectionPlan, appPlanStatistics } from "@/api/business/mhxf/xunJian/plan.js";
 
-import publicStore from "@/store/modules/public";
-import xunJianStore from "@/store/modules/xunJian";
-
-const publicStores = publicStore(); //全局公共Store
-const xunjianStore = xunJianStore(); //全局变量值Store
+const publicStore = publicStores(); //全局公共Store
+const xunJianStore = xunJianStores(); //全局变量值Store
 
 const { proxy } = getCurrentInstance();
 
@@ -186,7 +178,7 @@ function monthSwitch(e) {
  */
 function reportClick(obj) {
   if (tabPosition.value == 0) {
-    xunjianStore.planSonId = obj.id;
+    xunJianStore.planSonId = obj.id;
     uni.navigateTo({
       url: "/pages/business/mhxf/xunJian/plan/components/report",
     });
@@ -204,12 +196,12 @@ function reportClick(obj) {
             res.data[0].inspectionStatus = 2;
             res.data[0].pictureUrl = obj.pictureUrl;
 
-            xunjianStore.contentArray = {
+            xunJianStore.contentArray = {
               contentList: [res1.data.contentList],
               siteList: res.data[0],
             };
-            xunjianStore.siteId = undefined;
-            xunjianStore.siteNubmber = undefined;
+            xunJianStore.siteId = undefined;
+            xunJianStore.siteNubmber = undefined;
 
             uni.navigateTo({
               url: "/pages/business/mhxf/xunJian/plan/components/siteDetails",
@@ -235,7 +227,7 @@ function scanClick() {
         title: "扫码成功",
         icon: "none",
       });
-      xunjianStore.inspectionStatus = 1;
+      xunJianStore.inspectionStatus = 1;
 
       planList({
         siteNubmber: e.result,
@@ -335,7 +327,7 @@ function activitiesApi() {
  * @统计
  * @api接口请求
  */
-const currentDate = ref(publicStores.getDate().year + "-" + publicStores.getDate().month + "-" + publicStores.getDate().dates); //统计时间数据存储
+const currentDate = ref(publicStore.getDate().year + "-" + publicStore.getDate().month + "-" + publicStore.getDate().dates); //统计时间数据存储
 const currentDatevalue = ref(new Date());
 const currentDateList = ref({}); //统计list数据存储
 function currentApi() {
@@ -366,7 +358,7 @@ function activitiesSortClick() {
  * @tabs切换change事件
  */
 const list = ref(["巡检任务", "巡检记录"]);
-const tabPosition = ref(xunjianStore.planTabs);
+const tabPosition = ref(xunJianStore.planTabs);
 function tabPositionChange(index) {
   tabPosition.value = index;
   activitiesApi();

src/pages/business/mhxf/xunJian/record/recordDetail/index.vue

@@ -87,8 +87,7 @@
 <script setup>
 import { onLoad, onShow, onLaunch } from "@dcloudio/uni-app";
 import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
-
-import xunJianStore from "@/store/modules/xunJian";
+import { publicStores, xunJianStores } from "@/store/modules/index";
 
 import { getInspectionRecordDetails } from "@/api/business/mhxf/xunJian/record.js";
 

src/pages/business/mhxf/xunJian/xunJian.vue

@@ -44,30 +44,29 @@
 <script setup>
 import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
 import { ref, reactive, computed, onMounted, getCurrentInstance, toRefs, inject } from "vue";
+import { xunJianStores, publicStores } from "@/store/modules/index";
 
 import chart from "./components/echarts/chart.vue";
 import json from "@/static/js/json.js";
 
 import { appPlanStatistics } from "@/api/business/mhxf/xunJian/index.js";
 
-import publicStore from "@/store/modules/public";
-import xunJianStore from "@/store/modules/xunJian";
-const publicStores = publicStore(); //全局公共Store
-const xunjianStore = xunJianStore(); //全局变量值Store
+const publicStore = publicStores(); //全局公共Store
+const xunJianStore = xunJianStores(); //全局变量值Store
 
 const { proxy } = getCurrentInstance();
 
 const inspectList = json.xunJianList; //九宫格json数据
 
-const currentDate = publicStores.getDate().year + "-" + publicStores.getDate().month + "-" + publicStores.getDate().dates;
+const currentDate = publicStore.getDate().year + "-" + publicStore.getDate().month + "-" + publicStore.getDate().dates;
 const currentDateList = ref([]);
 
 function navItemClick(url, id) {
   if (url) {
     if (id == 1) {
-      xunjianStore.planTabs = 0;
+      xunJianStore.planTabs = 0;
     } else if (id == 2) {
-      xunjianStore.planTabs = 1;
+      xunJianStore.planTabs = 1;
     }
 
     uni.navigateTo({

src/pages/business/zhxf/building/index.vue

@@ -98,10 +98,10 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, getCurrentInstance } from "vue";
+import { publicStores, useStores } from "@/store/modules/index";
 
 import { getBuildingManagement } from "@/api/setting/building.js";
 
-import useStores from "@/store/modules/user.js";
 const useStore = useStores();
 
 const { proxy } = getCurrentInstance();

src/pages/business/zhxf/funReport/funcAdd/index.vue

@@ -49,10 +49,10 @@
 <script setup>
 import { onLoad, onShow, onReady, onHide, onLaunch, onReachBottom, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, watchEffect, getCurrentInstance, watch } from "vue";
+import { publicStores, useStores } from "@/store/modules/index";
 
 import { del, index } from "@/api/setting/funReport.js";
 
-import useStores from "@/store/modules/user.js";
 const useStore = useStores();
 
 const { proxy } = getCurrentInstance();

src/pages/business/zhxf/funReport/index.vue

@@ -69,10 +69,10 @@
 import json from "@/static/js/json.js";
 import { onLoad, onShow, onReady, onHide, onLaunch, onReachBottom, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, watchEffect, getCurrentInstance } from "vue";
+import { publicStores, useStores } from "@/store/modules/index";
 
 import { del, index } from "@/api/setting/funReport.js";
 
-import useStores from "@/store/modules/user.js";
 const useStore = useStores();
 
 const { proxy } = getCurrentInstance();

src/pages/business/zhxf/messagePush/index.vue

@@ -20,10 +20,10 @@
 <script setup>
 import { onLoad, onShow, onHide, onLaunch, onReady } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, getCurrentInstance } from "vue";
+import { publicStores, useStores } from "@/store/modules/index";
 
 import { setperm } from "@/api/setting/index.js";
 
-import useStores from "@/store/modules/user.js";
 const useStore = useStores();
 
 const { proxy } = getCurrentInstance();
@@ -207,7 +207,4 @@ onReady(() => {
     margin-left: 10rpx;
   }
 }
-
-.padding-sm {
-}
 </style>

src/pages/common/export/index.vue

@@ -53,8 +53,8 @@
 import config from "@/config";
 import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject, watchEffect } from "vue";
+import { publicStores, useStores } from "@/store/modules/index";
 
-import useStores from "@/store/modules/user.js";
 const useStore = useStores();
 
 const { proxy } = getCurrentInstance();

src/pages/common/textview/index.vue

@@ -9,8 +9,8 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
+import { publicStores, useStores } from "@/store/modules/index";
 
-import useStores from "@/store/modules/user.js";
 const useStore = useStores();
 
 const { proxy } = getCurrentInstance();

src/pages/common/textview/index1.vue

@@ -7,8 +7,8 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
+import { publicStores, useStores } from "@/store/modules/index";
 
-import useStores from "@/store/modules/user.js";
 const useStore = useStores();
 
 const { proxy } = getCurrentInstance();

src/pages/common/webview/index.vue

@@ -7,8 +7,8 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
+import { publicStores, useStores } from "@/store/modules/index";
 
-import useStores from "@/store/modules/user.js";
 const useStore = useStores();
 
 const { proxy } = getCurrentInstance();

src/pages/index.vue

@@ -19,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 - (50.67px + ${proxy.$settingStore.barHightTop}))` }">
     <!-- <u-loadmore :status="arrayList.loadStatus" loadingText="" loadmoreText="" :icon="true" /> -->
     <view class="uni-content-body">
       <!-- 下拉列表 开始 -->
@@ -101,13 +101,12 @@ import * as jwx from "@/utils/jssdk.js"; //引入js sdk的封装
 import { onReady, onLoad, onShow, onNavigationBarButtonTap, onPullDownRefresh, onReachBottom } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance } from "vue";
 import { getToken } from "@/utils/auth";
-import useStores from "@/store/modules/user.js";
-import publicStore from "@/store/modules/public";
+import { useStores, publicStores } from "@/store/modules/index";
 
 import { scan_push, getHomePageData, getFunctionalModuleStatistics, getAppRouters, qrCodeSend, getMobileBanner } from "@/api/index";
 
 const useStore = useStores();
-const publicStores = publicStore(); //全局公共Store
+const publicStore = publicStores(); //全局公共Store
 const BASE_URL = inject("$BASE_URL");
 const { proxy } = getCurrentInstance();
 
@@ -296,7 +295,7 @@ function navItemClick(item) {
       });
     }
 
-    arrayList.recentlyUsed = publicStores.sortEvent(arrayList.recentlyUsed, 1);
+    arrayList.recentlyUsed = publicStore.sortEvent(arrayList.recentlyUsed, 1);
 
     uni.setStorageSync(useStore.$state.name + useStore.$state.tenantId, arrayList.recentlyUsed);
 

src/pages/info/info.vue

@@ -16,12 +16,13 @@
     </template>
   </u-navbar>
 
-  <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>
+  <u-sticky style="top: 0px">
+    <view class="padding-lr" :class="'bg-' + proxy.$settingStore.themeColor.name" style="padding-top: 10px; padding-bottom: 10px">
+      <u--input placeholder="搜索" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" customStyle="height:35px;background-color:#f5f6fa;"></u--input>
+    </view>
+  </u-sticky>
+
+  <scroll-view class="bg-white info-wrapper" scroll-y :style="`height: calc(100vh - (105.67px + ${proxy.$settingStore.barHightTop}))`">
     <!-- <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>
@@ -29,35 +30,39 @@
     </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="uni-list padding" @tap="goFireBase()">
+        <view class="uni-avatar">
+          <image class="image-bg" src="@/static/images/info/fireBase.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: #666666">5月15日</view>
+          </view>
+          <view class="uni-item" style="display: flex">
+            <view class="uni-item-cont text-df" style="color: #666666">您收到一条最新消息，请及时查看</view>
+            <view class="uni-item-right text-df" style="color: #666666">1</view>
+          </view>
+        </view>
+      </view>
+
+      <!-- <view class="cu-list menu-avatar padding-lr-sm padding-top-sm">
+        <view class="cu-item" @tap="goPushList()">
           <view class="cu-avatar">
-            <image class="image-bg" src="@/static/images/info/fireBase.png" />
+            <image class="image-bg" src="@/static/images/info/pushList.png" />
           </view>
           <view class="content">
-            <view class="">消防知识库</view>
+            <view class="">消息推送</view>
           </view>
           <view class="nav-right">
             <view class="text-grey">
-              <text class="icon iconfont margin-right-xs margin-left-lg"> &#xe629; </text>
+              <text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
             </view>
           </view>
         </view>
+      </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>
-				</view>
-				<view class="nav-right">
-					<view class="text-grey">
-						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
-					</view>
-				</view>
-			</view> -->
-      </view>
+      <!-- <view style="height: 800px"></view> -->
     </view>
   </scroll-view>
 
@@ -93,14 +98,12 @@ onLoad((options) => {
 });
 </script>
 
-<style lang="scss">
-//消息页面
-.image-bg {
-  width: 100%;
-  height: 100%;
+<style lang="scss" scoped>
+:deep(.u-navbar__content__left) {
+  padding: 30upx;
 }
 
-//分析页面
+//消息页面
 .info-wrapper {
   .cu-list.menu-avatar .cu-item {
     border-radius: 5px;
@@ -109,12 +112,50 @@ onLoad((options) => {
     .cu-avatar {
       background-color: rgba(0, 0, 0, 0);
       left: 26rpx;
+
+      .image-bg {
+        width: 100%;
+        height: 100%;
+      }
     }
 
     .content {
+      // width: 100%;
       left: 130rpx;
       font-size: 32rpx;
     }
   }
 }
+
+.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;
+      }
+
+      .uni-item-right {
+        width: auto;
+        text-align: right;
+      }
+    }
+  }
+}
 </style>

src/pages/login.vue

@@ -47,7 +47,6 @@
         </u-input>
       </view>
 
-      <!--  -->
       <button class="submit" @click="submitRes">登 录</button>
 
       <view class="switchText">
@@ -75,14 +74,12 @@
 <script setup>
 import { onLoad, onShow, onHide, onLaunch, onReady } from "@dcloudio/uni-app";
 import { reactive, getCurrentInstance, toRefs, inject } from "vue";
+import { publicStores, useStores } from "@/store/modules/index";
 import { getToken, setToken, removeToken } from "@/utils/auth";
 import { getCodeImg } from "@/api/login";
 
-import publicStore from "@/store/modules/public.js";
-
-import useStores from "@/store/modules/user.js";
 const useStore = useStores();
-const publicStores = publicStore();
+const publicStore = publicStores();
 
 const { proxy } = getCurrentInstance();
 
@@ -270,6 +267,7 @@ function login(data) {
     /** 获取用户信息 */
     proxy.$modal.closeLoading();
     useStore.GetInfo().then((res) => {
+      proxy.$settingStore.tabbarValue = "/pages/index";
       proxy.$tab.reLaunch("/pages/index");
     });
   });
@@ -400,7 +398,9 @@ onLoad(() => {
         font-size: 20px;
         color: #000;
         max-width: 50%;
-        white-space: nowrap;
+        // white-space: nowrap;
+        // overflow: hidden; //超出的文本隐藏
+        // text-overflow: ellipsis; //溢出用省略号显示
       }
     }
 
@@ -492,7 +492,7 @@ onLoad(() => {
   .bottom {
     position: fixed;
     width: 100%;
-    bottom: 10px;
+    bottom: 20px;
     .title {
       text-align: center;
       color: #96a6b5;

src/pages/mine/about/index.vue

@@ -55,8 +55,8 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
+import { publicStores, useStores } from "@/store/modules/index";
 
-import useStores from "@/store/modules/user.js";
 const useStore = useStores();
 
 const { proxy } = getCurrentInstance();

src/pages/mine/avatar/index.vue

@@ -55,10 +55,10 @@
 import config from "@/config";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
 import { onReady, onShow } from "@dcloudio/uni-app";
+import { publicStores, useStores } from "@/store/modules/index";
 
 import { uploadAvatar, updateUserProfile } from "@/api/system/user";
 
-import useStores from "@/store/modules/user.js";
 const useStore = useStores();
 
 const { proxy } = getCurrentInstance();

src/pages/mine/help/index.vue

@@ -26,8 +26,8 @@
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, computed, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
+import { publicStores, useStores } from "@/store/modules/index";
 
-import useStores from "@/store/modules/user.js";
 const useStore = useStores();
 
 const { proxy } = getCurrentInstance();
@@ -107,6 +107,7 @@ onShow(() => {
     }
 
     .text-title {
+      display: flex;
       color: #303133;
       font-size: 32rpx;
       font-weight: bold;
@@ -114,7 +115,7 @@ onShow(() => {
 
       .iconfont {
         font-size: 16px;
-        margin-right: 10rpx;
+        margin: auto 10rpx auto 0;
       }
     }
 

src/pages/serveConfig.vue

@@ -28,9 +28,10 @@
 import config from "@/config";
 import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, getCurrentInstance } from "vue";
+import { publicStores, useStores } from "@/store/modules/index";
 import { getToken, setToken, removeToken } from "@/utils/auth";
-import publicStore from "@/store/modules/public.js";
-const publicStores = publicStore();
+
+const publicStore = publicStores();
 
 const { proxy } = getCurrentInstance();
 
@@ -97,10 +98,10 @@ function handleSubmit() {
 
   if (!port.value) {
     uni.setStorageSync("serveUrl", linkUrl.value);
-    publicStores.getServeList(linkUrl.value, content.value);
+    publicStore.getServeList(linkUrl.value, content.value);
   } else {
     uni.setStorageSync("serveUrl", linkUrl.value + ":" + port.value);
-    publicStores.getServeList(linkUrl.value + ":" + port.value, content.value);
+    publicStore.getServeList(linkUrl.value + ":" + port.value, content.value);
   }
 
   config.baseUrl = "http://" + uni.getStorageSync("serveUrl") + "/prod-api";

src/pages/serveConfigSelect.vue

@@ -38,8 +38,9 @@ import config from "@/config";
 import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, getCurrentInstance, watchEffect } from "vue";
 import { getToken, setToken, removeToken } from "@/utils/auth";
-import publicStore from "@/store/modules/public.js";
-const publicStores = publicStore();
+import { publicStores, useStores } from "@/store/modules/index";
+
+const publicStore = publicStores();
 
 const { proxy } = getCurrentInstance();
 
@@ -91,7 +92,7 @@ function serveClick(type) {
           icon: "none",
         });
 
-        publicStores.getServeList(e.result, "");
+        publicStore.getServeList(e.result, "");
 
         init();
       },

src/permission.js

@@ -24,7 +24,7 @@ list.forEach((item) => {
 
       if (getToken()) {
         if (to.url === loginPage) {
-          uni.reLaunch({ url: "/" });
+          uni.reLaunch({ url: "/pages/index" });
         }
         return true;
       } else {

src/plugins/index.js

@@ -4,7 +4,7 @@ import modal from "./modal.plugins";
 import common from "./common.plugins";
 import setting from "./setting.plugins";
 import constData from "./constData.plugins.js";
-import settingStore from "@/store/modules/setting.js";
+import { settingStores } from "@/store/modules/index";
 
 export default {
   install(app) {
@@ -27,7 +27,7 @@ export default {
     app.provide("$constData", constData);
     app.config.globalProperties.$constData = constData;
     // 公共设置stroe
-    app.provide("$settingStore", settingStore());
-    app.config.globalProperties.$settingStore = settingStore();
+    app.provide("$settingStore", settingStores());
+    app.config.globalProperties.$settingStore = settingStores();
   },
 };

src/plugins/setting.plugins.js

@@ -1,4 +1,4 @@
-import settingStore from "@/store/modules/setting.js";
+import { settingStores } from "@/store/modules/index";
 
 /**
  * @获取缓存
@@ -19,7 +19,7 @@ const formatSize = () => {
       v = (sizeCache / 1073741824).toFixed(2) + "GB";
     }
 
-    settingStore().$state.currentSize = currentSize
+    settingStores().$state.currentSize = currentSize
   });
   return currentSize;
 };

src/static/scss/colorui.css

@@ -3948,4 +3948,4 @@ scroll-view.cu-steps .cu-item {
 .line-white,
 .lines-white {
   color: #ffffff;
-}
+}

src/static/scss/public.scss

@@ -2,6 +2,7 @@
 .whiteBackgroundColor {
   background-color: #ffffff;
 }
+
 //全局背景颜色 结束
 
 /*
@@ -147,6 +148,7 @@ uni-input {
 .u-cell__body {
   padding: 10px 10px !important;
 }
+
 //折叠面板样式 结束
 
 //步骤条样式 开始
@@ -157,44 +159,8 @@ uni-input {
     }
   }
 }
-//步骤条样式 结束
-
-/*
- * 页面样式 开始
- * @/pages/xunJian/plan/components/siteDetails.vue
- * @/pages/xunJian/plan/components/content.vue
- */
-
-.siteHeader {
-  .u-icon__icon {
-    font-size: 14px !important;
-    line-height: 14px !important;
-    margin: auto !important;
-  }
-
-  .uni-section .uni-section-header {
-    padding: 0 !important;
-
-    .uni-section-header__decoration {
-      height: 14px !important;
-      background-color: #149eff;
-    }
 
-    .uni-section-header__content {
-      uni-text {
-        font-size: 15px !important;
-        color: #149eff !important;
-        font-weight: 600 !important;
-      }
-    }
-  }
-}
-
-/*
- * 页面样式 结束
- * @/pages/xunJian/plan/components/siteDetails.vue
- * @/pages/xunJian/plan/components/content.vue
- */
+//步骤条样式 结束
 
 //自写table表格样式-普通
 .tableType1 {
@@ -251,4 +217,31 @@ uni-input {
   .u-row:last-child {
     border-bottom: 1px #e5e5e5 solid;
   }
+}
+
+//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-position-fixed {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0px;
+  //#ifdef APP-PLUS
+  bottom: 5px;
+  //#endif
+  padding: 0px 15px 0px 15px;
+
+  .app-buttom {
+    width: 100%;
+    height: 40px;
+    font-size: 14px;
+    margin-bottom: 15px
+  }
 }

src/store/modules/index.js

@@ -0,0 +1,11 @@
+import useStores from "@/store/modules/user.js";
+import publicStores from "@/store/modules/public.js";
+import settingStores from "@/store/modules/setting.js";
+import xunJianStores from "@/store/modules/xunJian.js";
+
+export {
+    useStores,
+    publicStores,
+    settingStores,
+    xunJianStores
+};

src/uni_modules/c-progress-circle/changelog.md

@@ -0,0 +1,6 @@
+## 1.0.2（2023-04-13）
+新增boderWidth属性 可设置边框宽度
+## 1.0.1（2023-03-27）
+兼容vue2
+## 1.0.0（2023-01-05）
+初次提交

src/uni_modules/c-progress-circle/components/c-progress-circle/c-progress-circle.vue

@@ -0,0 +1,185 @@
+<template>
+	<view class='container' :style="{width:size,height:size}">
+		<view class="left">
+			<view class="leftcircle" :style="leftcircleStyle">
+			</view>
+		</view>
+		<view class="right">
+			<view class="rightcircle" :style="rightcircleStyle"></view>
+		</view>
+		<view class="cneter-box">
+			<slot>
+				{{progress*100}}%
+			</slot>
+		</view>
+	</view>
+</template>
+<script>
+	/**
+	 * c-lockScreen 环形进度条
+	 * @property {Number} progress 进度 0-1 默认0
+	 * @property {String} color 进度条颜色 默认#3ec3c1
+	 * @property {String} size 进度条尺寸 单位rpx 默认200rpx
+	 * @property {String} boderWidth 边框宽度 单位rpx 默认200rpx
+	 * */
+	 export default {
+	 	props:{
+			progress: {
+				type: Number,
+				default: 0
+			},
+			color: {
+				type: String,
+				default: '#3ec3c1'
+			},
+			size: {
+				type: String,
+				default: "200rpx"
+			},
+			boderWidth:{
+				type: String,
+				default: "200rpx"
+			}
+		},
+		computed:{
+			leftcircleStyle(){
+				return `border-width: calc(${this.boderWidth} * 0.1);
+				border-bottom-color:${this.color};
+				border-left-color:${this.color};
+				transform: rotate(${this.leftAngle});
+				`
+			},
+			rightcircleStyle(){
+				return `border-width: calc(${this.boderWidth} * 0.1);
+				border-top-color:${this.color};
+				border-right-color:${this.color};
+				transform: rotate(${this.rightAngle});`
+			},
+			rightAngle(){
+				if (this.progress >= 0.5) {
+					return 45+'deg'
+				} else {
+					return -135 + 180 * this.progress * 2+'deg'
+				}
+			},
+			leftAngle(){
+				if (this.progress < 0.5) {
+					return -135+'deg'
+				} else {
+					return -315 + 180 * this.progress * 2+'deg'
+				}
+			}
+		}
+	 }
+</script>
+<style lang="scss" scoped>
+	view{
+		box-sizing: border-box;
+	}
+	.container {
+		display: flex;
+		position: relative;
+		// width: v-bind(size);
+		// height: v-bind(size);
+		.left {
+			width: 50%;
+			height: 100%;
+			position: relative;
+			overflow: hidden;
+			top: 0;
+			left: 0;
+
+			.leftcircle {
+				width: 200%;
+				height: 100%;
+				border-color:#f5f7fa;
+				border-style: solid;
+				position: absolute;
+				border-radius: 50%;
+				left: 0px;
+				top: 0px;
+				transition: transform 0.2s;
+				//vue3
+				// border-width: calc(v-bind(size) * 0.1);
+				// border-bottom-color:v-bind(color);
+				// border-left-color:v-bind(color);
+				// transform: rotate(v-bind(leftAngle));
+
+				// animation-name: circle_left;
+				// animation-duration: 2s;
+				// animation-timing-function: linear;
+				// animation-iteration-count: infinite;
+
+			}
+
+		}
+
+		.right {
+			width: 50%;
+			height: 100%;
+			position: relative;
+			overflow: hidden;
+			top: 0;
+			right: 0;
+		}
+
+		.rightcircle {
+			width: 200%;
+			height: 100%;
+			border-radius: 50%;
+			border-color:#f5f7fa;
+			border-style: solid;
+			position: absolute;
+			
+			right: 0px;
+			top: 0px;
+			// animation-name: circle_right;
+			// animation-duration: 2s;
+			// animation-timing-function: linear;
+			// animation-iteration-count: infinite;
+			transition: transform 0.2s;
+			//vue3
+			// border-width: calc(v-bind(size) * 0.1);
+			// border-top-color:v-bind(color);
+			// border-right-color:v-bind(color);
+			// transform: rotate(v-bind(rightAngle));
+		}
+		.cneter-box{
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			font-size: 24rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
+
+
+
+
+
+
+	// @keyframes circle_right {
+	// 	0% {
+	// 		transform: rotate(-135deg);
+	// 	}
+
+	// 	50%,
+	// 	100% {
+	// 		transform: rotate(45deg);
+	// 	}
+	// }
+
+	// @keyframes circle_left {
+
+	// 	0%,
+	// 	50% {
+	// 		transform: rotate(-135deg);
+	// 	}
+
+	// 	100% {
+	// 		transform: rotate(45deg);
+	// 	}
+	// }
+</style>

src/uni_modules/gb-progress/package.json → src/uni_modules/c-progress-circle/package.json

@@ -1,18 +1,15 @@
 {
-  "id": "gb-progress",
-  "displayName": "支持nvue的环形进度条圆形进度条非常简单粗暴",
-  "version": "1.0.0",
-  "description": "非常简单粗暴，支持vue和nvue，没有任何bug，导入就能用，简单粗暴为主",
+  "id": "c-progress-circle",
+  "displayName": "c-design c-progress-circle",
+  "version": "1.0.2",
+  "description": "环形进度条",
   "keywords": [
-    "进度条",
-    "nvue",
-    "vue",
-    "环形进度条",
-    "组件"
+    "c-progress-circle",
+    "环形进度条"
 ],
-  "repository": "",
+  "repository": "https://gitee.com/wangziwl/c-designc.git",
   "engines": {
-    "HBuilderX": "^3.3.13"
+    "HBuilderX": "^3.6.15"
   },
   "dcloudext": {
     "type": "component-vue",
@@ -49,7 +46,7 @@
         },
         "App": {
           "app-vue": "y",
-          "app-nvue": "y"
+          "app-nvue": "n"
         },
         "H5-mobile": {
           "Safari": "y",
@@ -59,25 +56,25 @@
         },
         "H5-pc": {
           "Chrome": "y",
-          "IE": "y",
+          "IE": "u",
           "Edge": "y",
           "Firefox": "y",
           "Safari": "y"
         },
         "小程序": {
           "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y",
-          "钉钉": "y",
-          "快手": "y",
-          "飞书": "y",
-          "京东": "y"
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "钉钉": "u",
+          "快手": "u",
+          "飞书": "u",
+          "京东": "u"
         },
         "快应用": {
-          "华为": "y",
-          "联盟": "y"
+          "华为": "u",
+          "联盟": "u"
         }
       }
     }

src/uni_modules/c-progress-circle/readme.md

@@ -0,0 +1,98 @@
+# c-progress-circle
+
+### 
+- c-progress-circle 环形进度条
+
+### c-design交流群号：330647926
+
+### 示例预览
+[https://cloud.vuedata.wang/cdesign/#/pages/progress-circle/progress-circle](https://cloud.vuedata.wang/cdesign/#/pages/progress-circle/progress-circle)
+
+### 一、使用示例
+```html
+<template>
+	<view class="content">
+		<c-progress-circle :progress='progress' :color='color' :size='size' :boderWidth="boderWidth"></c-progress-circle>
+		<view class="btnBox">
+			<button size="mini" @click="add">+</button>
+			<view style="width: 100rpx;text-align: center;">
+				{{progress}}
+			</view>
+			<button size="mini" @click="reduce" type="default">-</button>
+		</view>
+		<view class="btnBox" style="padding-left: 100rpx;">边框颜色</view>
+		<view class="btnBox">
+			<button size="mini" @click="color='red'">红色</button>
+			<button size="mini" @click="color='green'">绿色</button>
+			<button size="mini" @click="color='orange'">橙色</button>
+		</view>
+		<view class="btnBox" style="padding-left: 100rpx;">进度条尺寸</view>
+		<view class="btnBox">
+			<button size="mini" @click="size='200rpx'">200rpx</button>
+			<button size="mini" @click="size='400rpx'">400rpx</button>
+			<button size="mini" @click="size='600rpx'">600rpx</button>
+		</view>
+		<view class="btnBox" style="padding-left: 100rpx;">边框宽度</view>
+		<view class="btnBox">
+			<button  size="mini" @click="boderWidth='200rpx'">200rpx</button>
+			<button  size="mini" @click="boderWidth='400rpx'">400rpx</button>
+			<button  size="mini" @click="boderWidth='600rpx'">600rpx</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				progress: 0.2,
+				color:'red',
+				size:'200rpx',
+				boderWidth:'200rpx'
+			}
+		},
+		methods: {
+			add() {
+				if(this.progress<1){
+					this.progress +=0.1
+					this.progress=this.progress.toFixed(1)*1
+				}
+			},
+			reduce(){
+				if(this.progress>0){
+					this.progress -=0.1
+					this.progress=this.progress.toFixed(1)*1	
+				}
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.content{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding-top: 20rpx;
+		font-size: 28rpx;
+	}
+	.btnBox{
+		width: 100%;
+		display: flex;
+		align-items: center;
+		margin-top:30rpx;
+	}
+</style>
+```
+
+
+
+
+### 二、属性介绍
+
+| 字段			| 类型		| 必填	| 默认值				| 描述								|
+| -----------	| --------	| ----	| ----------------------| -------------------------------	|
+| progress		| Number	| 否	|  0					| 进度 0-1							|
+| color			| String	| 否	|  #3ec3c1				| 进度条颜色						|
+| size			| String	| 否	|  200rpx				| 进度条尺寸 单位rpx				|
+| boderWidth	| String	| 否	|  200rpx				| 边框宽度 单位rpx					|

src/uni_modules/gb-progress/changelog.md

@@ -1,2 +0,0 @@
-## 1.0.0（2023-04-16）
-首次上传，助力快速开发

src/uni_modules/gb-progress/components/gb-progress/gb-progress.vue

@@ -1,157 +0,0 @@
-<template> 
-    <view class="gb_parent" :style="parentCss">
-        <view class="gb_process" :style="processCss"></view>
-        <view class="gb_left_part" :style="leftCss"></view>
-        <view class="gb_right_part" :style="rightCss"></view> 
-        <view class="gb_inner_circle" :style="innerCircleCss">
-		   <slot></slot> 
-        </view>
-    </view> 
-</template>
-
-<script>  
-export default {
-    data () {
-        return{ 
-			
-        }
-    },
-    props: {
-		// 圈底色
-        processColor: {
-            type: String,
-            default: '#42b983'  
-        },
-		// 进度色
-        originalColor: {
-            type: String,
-            default: '#EEEEEE'
-        },
-		// 圈内色
-		innerbgColor:{
-			type: String,
-			default: '#FFFFFF'
-		}, 
-		// 进度
-        process: {
-            type: Number,
-            default: 0
-        },
-		// 半径 单位rpx
-        radius: {
-            type: Number,
-            default: 100
-        },
-		// 进度条宽 单位rpx
-        barWidth: {
-            type: Number,
-            default: 3
-        },
-		// 起始弧度从顶开始顺时钟
-		startPosDegree:{
-			type:Number,
-			default:0
-		}
-    },
-    computed: {
-	  processCss() {
-	   const { radius, processColor } = this;
-	   return { 
-	 	   borderRadius: `${radius}rpx`,
-	       height: `${radius * 2}rpx`,
-	       width: `${radius * 2}rpx`,
-	       backgroundColor: processColor,
-	   }
-	  },
-      parentCss() {
-        const { radius,startPosDegree } = this;
-        return { 
-			borderRadius: `${radius}rpx`,
-            height: `${radius * 2}rpx`,
-            width: `${radius * 2}rpx`,
-			transform: 'rotate('+ startPosDegree +'deg )',
-        }
-      }, 
-      leftCss() {
-        let { radius, originalColor,process  } = this;
-		let leftTransformerDegree = (process>50? ((process>100?100:process) - 50) * 3.6:0)+ 'deg';
-        return {
-            height: `${radius * 2}rpx`,
-            width: `${radius}rpx`,
-			backgroundColor: originalColor,
-			transform: 'rotate('+ leftTransformerDegree +')',
-			transformOrigin: 'right center', 
-            borderTopLeftRadius: `${radius}rpx`,
-            borderBottomLeftRadius: `${radius}rpx`,
-			left:0,
-			top:0
-        }
-      },
-      rightCss() {
-        let { radius, processColor,originalColor,process } = this;
-		let rightTransformerDegree = ((process > 50 ? 0 : process) * 3.6) + 'deg';
-		
-        return {
-            height: `${radius * 2}rpx`,
-            width: `${radius}rpx`,
-            backgroundColor: process > 50 ?processColor:originalColor,
-			transform: 'rotate('+rightTransformerDegree+')',
-			transformOrigin: 'left center',
-            borderTopRightRadius: `${radius}rpx`,
-            borderBottomRightRadius: `${radius}rpx`,
-			left:`${radius}rpx`,
-			top:0
-        }
-	  },
-	  innerCircleCss() {
-	    const { radius, innerbgColor,barWidth ,startPosDegree} = this;
-	    return { 
-	  		borderRadius: `${radius - barWidth}rpx`,
-	        height: `${(radius - barWidth) * 2}rpx`,
-	        width: `${(radius - barWidth) * 2}rpx`,
-			transform: 'rotate('+ (0-startPosDegree) +'deg )',
-	        backgroundColor: innerbgColor,
-			left:`${barWidth}rpx`,
-			top:`${barWidth}rpx`,
-	    }
-	  }, 
-    },
-    mounted() {
-        
-    }, 
-    methods: {
-    }
-}
-</script>
-
-<style scoped>
-  .gb_component {
-    justify-content: center;
-    align-items: center;
-  }
-  .gb_parent {
-    justify-content: center;
-    align-items: center;
-    overflow: hidden;
-  }
-  .gb_process {
-    justify-content: center;
-    align-items: center;
-    overflow: hidden;
-  }
-  .gb_inner_circle {
-    justify-content: center;
-    align-items: center;
-    overflow: hidden;
-    position: absolute; 
-	display: flex;
-  }
-  .gb_left_part {
-    overflow: hidden;
-    position: absolute; 
-  }
-  .gb_right_part {
-    overflow: hidden;
-    position: absolute; 
-  }
-</style>

src/uni_modules/gb-progress/readme.md

@@ -1,111 +0,0 @@
-##简单粗暴的纯css实现环形的倒计时，适合兼容vue和nvue,主要用途用于uniad的短视频联盟倒计时发放奖励的机制，
-
-##步骤
-
-1.导入
-
-2.使用示例
-```html
-<template>
-	<view>
-		<view class="zcolor-while wh-w750" style="position:sticky;">
-			<view style="height: 80rpx;"></view>
-			<view class="flex-row justify-space-between align-center wh-w750" style="height: 100rpx;">
-				<view class="flex-row align-center pa-20-0">
-					<text class="fs-40 f-w mar-l30">视频</text>
-				</view>
-			</view>
-		</view>
-		<view>
-			<ad-content-page :style="{height:swiperheight+'px'}" ref="adContentPage" @load="onadload" @error="onaderror"
-				adpid="1111111112"></ad-content-page>
-		</view>
-
-		<view style="position: fixed; top: 200rpx; left: 20rpx; background-color: rgba(0, 0, 0, 0.4);"
-			class=" justify-center align-center bor-r50" v-if="!iserr">
-			<gb-progress originalColor="#222222" processColor="#FF672D" innerbgColor="#222222" :process="process"
-				:startPosDegree="60" :radius="50" :barWidth="5">
-				<image src="../../static/hbbs.png" mode="widthFix" class="wh-80"></image>
-			</gb-progress>
-		</view>
-	</view>
-</template>
-
-<script>
-	
-	export default {
-		
-		data() {
-			return {
-				swiperheight: 0,
-				countdown: 0,
-				isback: true,
-				noClick: true,
-				interval: '',
-				iserr: false,
-				timer: '',
-				process: 0,
-				finishing: false,
-				p: 0
-			}
-		},
-		onLoad() {
-	
-			let res = uni.getSystemInfoSync()
-			console.log(res.screenHeight)
-			this.swiperheight = res.windowHeight - uni.upx2px(182)
-			
-		},
-		onShow() {
-			this.$nextTick(() => {
-				this.$refs.adContentPage.show();
-				this.isback = true
-			})
-		},
-		onHide() {
-			this.$refs.adContentPage.hide();
-			this.isback = false
-		},
-		
-		methods: {
-	
-			// 加载
-			onadload(e) {
-				console.log("onload");
-				this.getBrowse()
-			},
-			onaderror(e) {
-				this.iserr = true
-				clearInterval(this.interval);
-				console.log(e);
-			},
-			// 倒计时
-			getBrowse() {
-				this.interval = setInterval(() => {
-					if (this.process < 100) {
-						if (this.isback) {
-							this.process = this.process + 2;
-						}
-					} else {
-						clearInterval(this.interval);
-						// 页面返回后停止，往下执行
-						if (this.isback) {
-							this.process = 0
-							this.getBrowse()
-						}
-					}
-				}, 1000)
-			}
-	
-		}
-	}
-</script>
-
-<style>
-
-</style>
-
-
-
-
-```

src/utils/request.js

@@ -1,4 +1,4 @@
-import useStores from "@/store/modules/user.js";
+import { useStores } from "@/store/modules/index";
 import configs from "@/config";
 import { getToken } from "@/utils/auth";
 import modal from "@/plugins/modal.plugins";

src/utils/upload.js

@@ -1,4 +1,4 @@
-import useStores from "@/store/modules/user.js";
+import { useStores } from "@/store/modules/index";
 import configs from "@/config";
 import { getToken } from "@/utils/auth";
 import modal from "@/plugins/modal.plugins";