页面样式优化

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

@@ -32,17 +32,3 @@ onReady(() => {});
 
 onMounted(() => {});
 </script>
-
-<style lang="scss">
-.coordination {
-}
-.headerTop {
-  display: flex;
-  background-color: transparent;
-  width: 100%;
-}
-
-.is-selected {
-  color: #1989fa;
-}
-</style>

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

@@ -15,9 +15,9 @@
     <view class="deviceManage" @touchstart="fingerstart" @touchend="fingerend">
       <uni-swipe-action>
         <uni-swipe-action-item class="bg-white">
-          <view class="content1">
-            <view style="padding: 10px">
-              <u-input style="border-radius: 50px" v-model="dataInput" @blur="blur" prefixIcon="search" prefixIconStyle="color: #0c7bf9" placeholder="请输入设备编号"> </u-input>
+          <view class="content">
+            <view class="padding-10">
+              <u-input v-model="dataInput" placeholder="请输入设备编号" @blur="blur" shape="circle" prefixIcon="search" prefixIconStyle="color: #0c7bf9"> </u-input>
             </view>
 
             <u-empty v-if="dataList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
@@ -25,29 +25,17 @@
             <u-collapse @change="change" @close="close" @open="open" accordion v-else>
               <u-collapse-item class="uCollapseItem" v-for="da in dataList" :key="da">
                 <template #title>
-                  <view style="display: flex">
+                  <view class="flex">
                     <view class="cu-avatar lg" style="margin: 0 10px auto 0; background-color: rgba(0, 0, 0, 0)">
                       <image class="image-bg" style="width: 80rpx; height: 80rpx" src="@/static/images/deviceManage/1.png"></image>
                     </view>
                     <view style="width: 100%">
-                      <view style="display: flex; color: #000000">
+                      <view class="flex" style="color: #000000">
                         <view>设备编号：{{ da.deviceCode }}</view>
-                        <view v-if="da.deviceStatus == 0" style="margin-left: 20px; font-size: 12px; background-color: #aeaeae; color: #ffffff; padding: 0 5px; border-radius: 20px; line-height: 20px">
-                          离线
-                        </view>
-                        <view
-                          v-else-if="da.deviceStatus == 1"
-                          style="margin-left: 20px; font-size: 12px; background-color: #12c100; color: #ffffff; padding: 0 5px; border-radius: 20px; line-height: 20px"
-                        >
-                          正常
-                        </view>
-                        <view
-                          v-else-if="da.deviceStatus == 2"
-                          style="margin-left: 20px; font-size: 12px; background-color: #ff1313; color: #ffffff; padding: 0 5px; border-radius: 20px; line-height: 20px"
-                        >
-                          故障
-                        </view>
-                        <view v-else style="margin-left: 20px; font-size: 12px; background-color: #0d88f0; color: #ffffff; padding: 0 5px; border-radius: 20px; line-height: 20px"> 告警 </view>
+                        <view class="deviceStatus" v-if="da.deviceStatus == 0" style="background-color: #aeaeae"> 离线 </view>
+                        <view class="deviceStatus" v-else-if="da.deviceStatus == 1" style="background-color: #12c100"> 正常 </view>
+                        <view class="deviceStatus" v-else-if="da.deviceStatus == 2" style="background-color: #ff1313"> 故障 </view>
+                        <view class="deviceStatus" v-else style="background-color: #0d88f0"> 告警 </view>
                       </view>
                       <view style="display: flex; font-size: 14px; color: #666666; margin: 10px 0">
                         <view style="width: 50%; word-break: break-all">监测对象：{{ da.installAddress }}</view>
@@ -63,11 +51,11 @@
 
                 <view class="u-collapse-content">
                   <!-- <view style="display: flex; flex-wrap: wrap; margin-left: 5%">
-                  <view style="width: 50%; height: 30px; line-height: 30px" v-for="ch in da.dataList" :key="ch">
-                    <span>{{ ch.label }}：</span>
-                    <span :style="ch.value === '正常' ? 'color:#12C100' : 'color:#FF0101'">{{ ch.value }}</span>
-                  </view>
-                </view> -->
+                    <view style="width: 50%; height: 30px; line-height: 30px" v-for="ch in da.dataList" :key="ch">
+                      <span>{{ ch.label }}：</span>
+                      <span :style="ch.value === '正常' ? 'color:#12C100' : 'color:#FF0101'">{{ ch.value }}</span>
+                    </view>
+                  </view> -->
                   <view style="display: flex; flex-wrap: wrap; margin-left: 5%">
                     <view style="width: 50%; height: 30px; line-height: 30px" v-for="ch in da.dataList" :key="ch">
                       <span>{{ ch.portName }}：</span>
@@ -289,7 +277,7 @@ onMounted(() => {});
   height: calc(100% - 45px);
   background-color: #ffffff;
 
-  .content1 {
+  .content {
     .u-row {
       .u-col {
         border: 1px #e4e3e3 solid;
@@ -308,14 +296,16 @@ onMounted(() => {});
       }
     }
   }
-}
-</style>
 
-<style scoped>
-body,
-uni-page-body,
-uni-page-refresh,
-.grayBackgroundColor {
-  background: rgb(241, 241, 241);
+  .uCollapseItem {
+    .deviceStatus {
+      margin-left: 20px;
+      font-size: 12px;
+      color: #ffffff;
+      padding: 0 5px;
+      border-radius: 20px;
+      line-height: 20px;
+    }
+  }
 }
 </style>

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

@@ -3,12 +3,12 @@
     <u-tabs :list="list" :current="current" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }"></u-tabs>
   </u-sticky>
 
-  <view class="informationSelect" @touchstart="fingerstart" @touchend="fingerend" style="background-color: #ffffff">
+  <view class="bg-white informationSelect" @touchstart="fingerstart" @touchend="fingerend">
     <uni-swipe-action>
       <uni-swipe-action-item>
         <!-- 各类查询 start -->
-        <view class="content">
-          <u-input style="border-radius: 50px; margin-bottom: 10px" @blur="blur" v-model="dataInput" prefixIcon="search" prefixIconStyle="color: #0c7bf9" :placeholder="placeholderText"> </u-input>
+        <view class="tableType3">
+          <u-input style="margin-bottom: 10px" v-model="dataInput" :placeholder="placeholderText" @blur="blur" shape="circle" prefixIcon="search" prefixIconStyle="color: #0c7bf9"> </u-input>
           <u-empty v-if="!dataRes" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
           <view v-if="current == 8">
             <view class="con">

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

@@ -4,12 +4,12 @@
   </u-sticky>
 
   <scroll-view class="bg-white scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name" style="padding-bottom: 44px">
-    <view class="bg-white informationSelect" @touchstart="fingerstart" @touchend="fingerend">
+    <view class="informationSelect" @touchstart="fingerstart" @touchend="fingerend">
       <uni-swipe-action>
         <uni-swipe-action-item>
           <!-- 各类查询 start -->
-          <view class="content">
-            <u-input style="border-radius: 50px; margin-bottom: 10px" @blur="blur" v-model="dataInput" prefixIcon="search" prefixIconStyle="color: #0c7bf9" :placeholder="placeholderText"> </u-input>
+          <view class="tableType3">
+            <u-input style="margin-bottom: 10px" v-model="dataInput" :placeholder="placeholderText" @blur="blur" shape="circle" prefixIcon="search" prefixIconStyle="color: #0c7bf9"> </u-input>
             <u-empty v-if="!dataRes" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
             <view v-if="current == 8">
               <view class="con">
@@ -674,58 +674,10 @@ onMounted(() => {});
 .uni-swipe {
   overflow: visible;
 }
-body {
-  background: #fff;
-}
-.is-selected {
-  color: #1989fa;
-}
-
-.informationSelect {
-  height: calc(100vh - 88px);
-  background-color: #ffffff;
-  .content {
-    padding: 10px;
-    .u-row {
-      height: 36px;
-      line-height: 36px;
-      .u-col {
-        border: 1px #e4e3e3 solid;
-        border-right: 0px;
-        border-bottom: 0px;
-        text-align: center;
-
-        view {
-          padding: 0 10px;
-          min-height: 36px;
-          overflow: hidden; //超出的文本隐藏
-          // text-overflow: ellipsis; //溢出用省略号显示
-          overflow: auto;
-          white-space: nowrap; // 默认不换行；
-          font-size: 14px;
-        }
-      }
-
-      .u-col:last-child {
-        border-right: 1px #e4e3e3 solid;
-      }
-    }
-
-    .u-row:last-child {
-      .u-col {
-        border-bottom: 1px #e4e3e3 solid;
-      }
-    }
-  }
-}
 </style>
 
-<style scoped>
-body,
-uni-page-body,
-uni-page-refresh,
-.grayBackgroundColor {
-  background: rgb(241, 241, 241);
+<style lang="scss" scoped>
+.informationSelect {
 }
 
 .time {
@@ -740,10 +692,4 @@ uni-page-refresh,
   text-align: center;
   position: relative;
 }
-.bg-white {
-  background-color: #ffffff;
-}
-body {
-  background: #fff;
-}
 </style>

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

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

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

@@ -1,6 +1,6 @@
 <template>
   <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
-    <view class="bg-white" style="padding: 15px 15px 15px 15px">
+    <view class="bg-white padding-15">
       <u-form ref="form" labelPosition="left" :model="model" :rules="rules" labelWidth="82">
         <u-form-item label="地点号码：" prop="siteNubmber">
           <u-input v-model="model.siteNubmber" disabled></u-input>
@@ -13,7 +13,7 @@
         </u-form-item>
       </u-form>
 
-      <u-button type="primary" style="width: 100%; height: 40px; font-size: 14px; margin-top: 15px" @click="handleInsert()" shape="circle"> 保存 </u-button>
+      <u-button type="primary" class="margin-t-15" style="width: 100%; height: 40px; font-size: 14px" @click="handleInsert()" shape="circle"> 保存 </u-button>
     </view>
   </scroll-view>
 </template>

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

@@ -3,8 +3,8 @@
     <view class="example-body" v-if="show">
       <uni-datetime-picker v-model="datetimerange" type="daterange" rangeSeparator="~" @change="confirm" />
     </view>
-    <view v-for="(cu, index) in dataList.siteList" :key="index" class="bg-white" style="display: flex; padding: 15px 0px 15px 15px; margin-bottom: 15px">
-      <view class="flex margin-right-15">
+    <view v-for="(cu, index) in dataList.siteList" :key="index" class="flex bg-white padding-15 padding-r-0 margin-b-15">
+      <view class="flex margin-r-15">
         <u-image style="margin: auto" width="40" height="40" src="@/static/images/xunjian/scan.png" v-if="cu.siteType == 1" shape="circle"></u-image>
 
         <u-image style="margin: auto" width="40" height="40" src="@/static/images/xunjian/NFC.png" v-if="cu.siteType == 2" shape="circle"></u-image>
@@ -21,7 +21,7 @@
       <view style="margin: auto"></view>
       <view class="reportRight">
         <view style="margin: auto">
-          <view style="padding: 0; font-size: 14px; color: #a1a1a1"> 已提交 </view>
+          <view class="padding-0" style="font-size: 14px; color: #a1a1a1"> 已提交 </view>
         </view>
       </view>
     </view>

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

@@ -3,15 +3,15 @@
     <!-- 按组使用 -->
     <uni-swipe-action>
       <uni-swipe-action-item
+        class="margin-b-15"
         v-for="(cu, index) in xunJianStore.collectDataList"
         :key="index"
         :right-options="options"
         @click="bindClick($event, index)"
         @change="swipeChange($event, index)"
-        style="margin-bottom: 15px"
       >
-        <view class="flex bg-white" style="padding: 15px 0px 15px 15px">
-          <view class="flex margin-right-15">
+        <view class="flex bg-white padding-15 padding-r-0">
+          <view class="flex margin-r-15">
             <u-image style="margin: auto" width="40" height="40" src="@/static/images/xunjian/scan.png" v-if="cu.siteType == 1" shape="circle"></u-image>
 
             <u-image style="margin: auto" width="40" height="40" src="@/static/images/xunjian/NFC.png" v-if="cu.siteType == 2" shape="circle"></u-image>
@@ -35,7 +35,7 @@
       </uni-swipe-action-item>
     </uni-swipe-action>
 
-    <view style="position: fixed; right: 0; bottom: 50px">
+    <view class="app-scan-fixed">
       <u-image width="67" height="67" src="@/static/images/xunjian/plan-scan.png" shape="circle" @click="scanClick()"></u-image>
     </view>
 

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

@@ -1,7 +1,7 @@
 <template>
   <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
     <view class="xunjian-plan-content">
-      <view class="bg-white padding-15 margin-bottom-15" v-for="(con, index) in contentList" :key="index">
+      <view class="bg-white padding-15 margin-b-15" v-for="(con, index) in contentList" :key="index">
         <view class="flex margin-bottom-10">
           <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 class="margin-top-15" v-if="con.submissionMethod == 1">
+          <view class="margin-t-15" v-if="con.submissionMethod == 1">
             <u-checkbox-group
               v-model="con.contentOptionListValue1"
               @change="
@@ -22,7 +22,7 @@
               :activeColor="proxy.$settingStore.themeColor.color"
             >
               <u-row style="width: 100%; flex-wrap: wrap">
-                <u-col class="margin-bottom-15" v-for="option in con.contentOptionList" :key="option" :span="6">
+                <u-col class="margin-b-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>
@@ -34,10 +34,10 @@
               <u-input v-model="con.remarks" placeholder="请输入备注" :disabled="xunJianStore.contentArray.siteList.inspectionStatus == 2"></u-input>
             </view>
           </view>
-          <view class="margin-top-15" v-if="con.submissionMethod == 2">
+          <view class="margin-t-15" v-if="con.submissionMethod == 2">
             <u-radio-group placement="row" v-model="con.contentOptionListValue" :activeColor="proxy.$settingStore.themeColor.color">
               <u-row style="width: 100%; flex-wrap: wrap">
-                <u-col class="margin-bottom-15" v-for="option in con.contentOptionList" :key="option" :span="6">
+                <u-col class="margin-b-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>
@@ -48,9 +48,9 @@
               <u-input v-model="con.remarks" placeholder="请输入备注" :disabled="xunJianStore.contentArray.siteList.inspectionStatus == 2"></u-input>
             </view>
           </view>
-          <view class="margin-top-15" v-if="con.submissionMethod == 3">
+          <view class="margin-t-15" v-if="con.submissionMethod == 3">
             <u-textarea
-              class="margin-bottom-15"
+              class="margin-b-15"
               v-model="con.contentOptionListValue"
               placeholder="请输入"
               maxlength="30"
@@ -65,7 +65,7 @@
         </view>
       </view>
     </view>
-    <view class="app-position-fixed">
+    <view class="app-button-fixed">
       <u-button class="app-buttom" v-if="xunJianStore.contentArray.siteList.inspectionStatus == 1" type="primary" 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(2)"> 提交 </u-button>

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

@@ -1,11 +1,11 @@
 <template>
   <u-popup :show="scanBool" @close="close" @open="open" mode="bottom" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
     <template #default>
-      <view class="margin-bottom-15 margin-top-15">
+      <view class="margin-b-15 margin-t-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>
-      <scroll-view scroll-y style="padding-left: 15px; padding-right: 15px; height: calc(100vh - 30rem)">
+      <scroll-view scroll-y class="padding-l-15 padding-r-15" style="height: calc(100vh - 30rem)">
         <view v-for="(scan, index) in scanArray" :key="index">
           <view style="display: flex; font-size: 15px; height: 50px; line-height: 50px">
             <view style="margin-right: 15px">

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

@@ -1,7 +1,7 @@
 <template>
   <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
-    <view class="flex margin-bottom-15 bg-white" style="padding: 15px 0px 15px 15px" v-for="cu in currentDateList" :key="cu">
-      <view class="flex margin-right-15" @click="pulicClick(cu)">
+    <view class="flex margin-b-15 bg-white" style="padding: 15px 0px 15px 15px" v-for="cu in currentDateList" :key="cu">
+      <view class="flex margin-r-15" @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>
 
         <u-image style="margin: auto" width="40" height="40" src="@/static/images/xunjian/NFC.png" v-if="cu.siteType == 2" shape="circle"></u-image>
@@ -30,7 +30,6 @@
           {{ cu.inspectionTime == "" || cu.inspectionTime == null ? "无" : cu.inspectionTime }}
         </view>
       </view>
-      <view style="margin: auto" @click="pulicClick(cu)"></view>
       <view class="reportRight">
         <view
           class="rightChild"
@@ -53,7 +52,7 @@
         </view>
       </view>
     </view>
-    <view style="position: fixed; right: 0; bottom: 50px">
+    <view class="app-scan-fixed">
       <u-image width="67" height="67" src="@/static/images/xunjian/plan-scan.png" shape="circle" @click="scanClick()"></u-image>
     </view>
   </scroll-view>
@@ -195,21 +194,25 @@ onShow(() => {
 onMounted(() => {});
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .is-selected {
   color: #1989fa;
 }
-</style>
 
-<style scoped>
-.reportCenter .centerSiteName {
-  font-size: 15px;
-  margin-bottom: 5px;
-  height: 20px;
-  line-height: 20px;
-  display: flex;
+.reportCenter {
+  margin-right: auto;
+
+  .centerSiteName {
+    font-size: 15px;
+    margin-bottom: 5px;
+    height: 20px;
+    line-height: 20px;
+    display: flex;
+  }
 }
+</style>
 
+<style scoped>
 .reportRight {
   display: flex;
   background-color: rgba(238, 238, 238, 0.3);

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

@@ -1,7 +1,7 @@
 <template>
   <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
     <view class="xunjian-plan-siteDetails">
-      <view class="flex bg-white padding-15 margin-bottom-15">
+      <view class="flex bg-white padding-15 margin-b-15">
         <u-image style="margin: auto 15px auto 0" width="40" height="40" src="@/static/images/xunjian/scan.png" v-if="siteList.siteType == 1" shape="circle"></u-image>
         <u-image style="margin: auto 15px auto 0" width="40" height="40" src="@/static/images/xunjian/NFC.png" v-if="siteList.siteType == 2" shape="circle"></u-image>
 
@@ -17,7 +17,7 @@
         </view>
       </view>
 
-      <view class="bg-white padding-15 margin-bottom-15">
+      <view class="bg-white padding-15 margin-b-15">
         <uni-section class="margin-bottom-10" title="上报现场" type="line"></uni-section>
 
         <view class="flex flex-wrap">
@@ -36,7 +36,7 @@
         </view>
       </view>
 
-      <view class="bg-white padding-15 margin-bottom-15" style="height: 170px; max-height: 170px">
+      <view class="bg-white padding-15 margin-b-15" style="height: 170px; max-height: 170px">
         <uni-section class="margin-bottom-10" title="备注" type="line"></uni-section>
 
         <view style="height: calc(100% - 25px)">
@@ -48,13 +48,13 @@
         </view>
       </view>
 
-      <view class="bg-white padding-15 margin-bottom-15">
+      <view class="bg-white padding-15 margin-b-15">
         <uni-section class="margin-bottom-10" title="消防设施分布图" type="line"></uni-section>
 
         <u-image width="100%" :src="siteList.pictureUrl"></u-image>
       </view>
     </view>
-    <view class="app-position-fixed">
+    <view class="app-button-fixed">
       <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" class="app-buttom" type="primary" @click="buttonClick()" shape="circle"> 查看巡检项 </u-button>

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

@@ -94,7 +94,7 @@
       <view id="planTimeline" style="text-align: center; color: #bdbdbd; font-size: 14px" v-else> 暂无数据 </view>
     </view>
 
-    <view style="position: fixed; right: 0; bottom: 50px">
+    <view class="app-scan-fixed">
       <u-image width="67" height="67" src="@/static/images/xunjian/plan-scan.png" shape="circle" @click="scanClick()"></u-image>
     </view>
 

src/pages/info/info.vue

@@ -17,7 +17,7 @@
   </u-navbar>
 
   <u-sticky style="top: 0px">
-    <view class="padding-lr" :class="'bg-' + proxy.$settingStore.themeColor.name" style="padding-top: 10px; padding-bottom: 10px">
+    <view class="padding-lr padding-tb-10" :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>
@@ -39,7 +39,7 @@
             <view class="uni-item-cont text-dfl" style="color: #000000">消防知识库</view>
             <view class="uni-item-right text-sm" style="color: #909399">5月15日</view>
           </view>
-          <view class="uni-item" style="display: flex">
+          <view class="flex uni-item">
             <view class="uni-item-cont text-df" style="color: #909399">您收到一条最新消息，请及时查看</view>
             <view class="uni-item-right text-df" style="margin: auto 0">
               <u-badge numberType="overflow" max="99" :value="1"></u-badge>
@@ -47,24 +47,6 @@
           </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/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>
 
@@ -105,30 +87,6 @@ onLoad((options) => {
   padding: 30upx;
 }
 
-//消息页面
-.info-wrapper {
-  .cu-list.menu-avatar .cu-item {
-    border-radius: 5px;
-    padding: 30rpx 0;
-    box-shadow: 1px 1px 4px rgb(26 26 26 / 10%);
-    .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;
 

src/pages/mine/avatar/index.vue

@@ -35,7 +35,7 @@
         </view>
       </view>
 
-      <view class="app-position-fixed">
+      <view class="app-button-fixed">
         <view class="app-flex">
           <u-button class="app-buttom" style="margin-right: 15px" @click="getImage" shape="circle"> 选择头像 </u-button>
 

src/pages/mine/info/index.vue

@@ -5,7 +5,7 @@
     </u-sticky>
 
     <view class="content-section" v-show="tabsCurrent == 0">
-      <view class="menu-list margin-top-0 margin-lr-0">
+      <view class="menu-list margin-t-0 margin-lr-0">
         <view class="list-cell list-cell-arrow" @click="proxy.$settingStore.handleToAvatar(2)">
           <view class="menu-item-box">
             <view class="title">头像</view>
@@ -43,7 +43,7 @@
         </view>
       </view>
 
-      <view class="menu-list margin-top-0 margin-lr-0">
+      <view class="menu-list margin-t-0 margin-lr-0">
         <view class="list-cell list-cell-arrow" @click="proxy.$modal.showToast('模块建设中~')">
           <view class="menu-item-box">
             <view>个人实名认证</view>
@@ -95,7 +95,7 @@
 
   <u-modal :show="modalShow" :showConfirmButton="true" :showCancelButton="true" @cancel="modalShow = false" @confirm="handleConfirm">
     <view class="slot-content" style="width: 100%">
-      <view class="margin-bottom-15" style="color: #909399">{{ modalTitle }}</view>
+      <view class="margin-b-15" style="color: #909399">{{ modalTitle }}</view>
 
       <view v-if="modalTitle === '修改昵称'">
         <u--input v-model="userArr.nickName" :maxlength="5" :placeholder="modalTitle" border="bottom" clearable></u--input>

src/pages/mine/secure/index.vue

@@ -1,12 +1,12 @@
 <template>
   <view :data-theme="'theme-' + proxy.$settingStore.themeColor.name" class="secure-container">
     <view class="content-section">
-      <view class="menu-list margin-top-0 margin-lr-0">
+      <view class="menu-list margin-t-0 margin-lr-0">
         <view></view>
         <image style="width: 100%; height: 160px" src="@/static/images/index/banner2.jpg" mode="widthFix"></image>
       </view>
 
-      <view class="menu-list margin-top-0 margin-lr-0">
+      <view class="menu-list margin-t-0 margin-lr-0">
         <view class="list-cell list-cell-arrow" @click="handleUserModal('修改手机号')">
           <view class="menu-item-box">
             <view class="title">手机号码</view>
@@ -21,7 +21,7 @@
         </view>
       </view>
 
-      <view class="menu-list margin-top-0 margin-lr-0">
+      <view class="menu-list margin-t-0 margin-lr-0">
         <view class="list-cell list-cell-arrow" @click="proxy.$modal.showToast('模块建设中~')">
           <view class="menu-item-box">
             <view class="title">指纹登录</view>
@@ -39,7 +39,7 @@
         </view>
       </view>
 
-      <view class="menu-list margin-top-0 margin-lr-0">
+      <view class="menu-list margin-t-0 margin-lr-0">
         <view class="list-cell list-cell-arrow" @click="proxy.$modal.showToast('模块建设中~')">
           <view class="menu-item-box">
             <view class="title">常用设备管理</view>
@@ -51,20 +51,20 @@
 
   <u-modal :show="modalShow" :showConfirmButton="true" :showCancelButton="true" @cancel="modalShow = false" @confirm="handleConfirm">
     <view class="slot-content" style="width: 100%">
-      <view class="margin-bottom-15" style="color: #909399">{{ modalTitle }}</view>
+      <view class="margin-b-15" style="color: #909399">{{ modalTitle }}</view>
 
       <view v-if="modalTitle === '修改手机号'">
         <u--input v-model="userArr.phonenumber" :maxlength="11" :placeholder="modalTitle" border="bottom" clearable></u--input>
       </view>
 
       <view v-if="modalTitle === '修改密码'">
-        <u-input class="margin-bottom-15" v-model="oldPassword" placeholder="请输入旧密码" :password="oldPasswordBool" border="bottom">
+        <u-input class="margin-b-15" v-model="oldPassword" placeholder="请输入旧密码" :password="oldPasswordBool" border="bottom">
           <template #suffix>
             <text :class="!oldPasswordBool ? 'iconfont ucicon-eye' : 'iconfont ucicon-eye-close'" @click="oldPasswordBool = !oldPasswordBool"></text>
           </template>
         </u-input>
 
-        <u-input class="margin-bottom-15" v-model="oldPassword" placeholder="请输入新密码" :password="newPasswordBool" border="bottom">
+        <u-input class="margin-b-15" v-model="oldPassword" placeholder="请输入新密码" :password="newPasswordBool" border="bottom">
           <template #suffix>
             <text :class="!newPasswordBool ? 'iconfont ucicon-eye' : 'iconfont ucicon-eye-close'" @click="newPasswordBool = !newPasswordBool"></text>
           </template>

src/pages/mine/setting/index.vue

@@ -9,7 +9,7 @@
       </view>
     </view>
 
-    <view class="menu-list margin-top-0 margin-lr-0">
+    <view class="menu-list margin-t-0 margin-lr-0">
       <view class="list-cell list-cell-arrow" @click="proxy.$settingStore.handleAbout()">
         <view class="menu-item-box">
           <view class="iconfont ucicon-aixin menu-icon"></view>

src/static/icons/index/APP-sbcx.svg

@@ -0,0 +1,9 @@
+<svg 
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="117px" height="117px">
+<path fill-rule="evenodd"  fill="rgb(110, 173, 251)"
+ d="M27.972,0.371 L89.083,0.371 C104.425,0.371 116.861,12.808 116.861,28.149 L116.861,89.231 C116.861,104.572 104.425,117.009 89.083,117.009 L27.972,117.009 C12.631,117.009 0.194,104.572 0.194,89.231 L0.194,28.149 C0.194,12.808 12.631,0.371 27.972,0.371 Z"/>
+<path fill-rule="evenodd"  fill="rgb(255, 255, 255)"
+ d="M82.328,88.985 L35.664,88.985 C32.000,88.985 29.000,86.020 29.000,82.398 L29.000,38.860 C29.000,35.238 32.000,32.273 35.664,32.273 L42.328,32.273 C42.328,30.458 43.828,28.975 45.664,28.975 C47.500,28.975 49.000,30.458 49.000,32.273 L69.000,32.273 C69.000,30.458 70.500,28.975 72.336,28.975 C74.172,28.975 75.672,30.458 75.672,32.273 L82.336,32.273 C86.000,32.273 89.000,35.238 88.992,38.860 L88.992,82.398 C88.992,86.020 85.992,88.985 82.328,88.985 ZM57.828,79.232 C60.297,79.232 62.578,78.529 64.562,77.371 L67.828,80.599 C69.125,81.881 71.242,81.881 72.539,80.599 C73.836,79.325 73.836,77.224 72.547,75.935 L69.281,72.707 C70.445,70.745 71.164,68.490 71.164,66.050 C71.164,58.768 65.195,52.868 57.828,52.868 C50.461,52.868 44.492,58.768 44.492,66.050 C44.492,73.332 50.461,79.232 57.828,79.232 ZM79.000,38.860 L75.680,38.860 C75.680,40.675 74.180,42.157 72.344,42.157 C70.508,42.157 69.008,40.675 69.008,38.860 L49.008,38.860 C49.008,40.675 47.508,42.157 45.672,42.157 C43.836,42.157 42.336,40.675 42.336,38.860 L39.000,38.860 C37.164,38.860 35.664,40.343 35.664,42.157 C35.664,43.972 37.164,45.455 39.000,45.455 L79.000,45.455 C80.836,45.455 82.336,43.972 82.336,42.157 C82.336,40.343 80.836,38.860 79.000,38.860 ZM57.820,59.471 C61.501,59.471 64.484,62.420 64.484,66.058 C64.484,66.060 64.484,66.063 64.484,66.066 C64.482,69.703 61.497,72.651 57.817,72.649 C54.136,72.647 51.154,69.696 51.156,66.058 C51.156,62.420 54.140,59.471 57.820,59.471 Z"/>
+</svg>

src/static/scss/colorui.css

@@ -3153,7 +3153,7 @@ scroll-view.cu-steps .cu-item {
 }
 
 .padding-0 {
-  padding: 0;
+  padding: 0 !important;
 }
 
 .padding-xs {

src/static/scss/index.scss

@@ -10,17 +10,85 @@
 @import "./sidebar.scss";
 
 
+.divider-default {
+    width: 0.5px;
+    background-color: #333;
+}
+
 .shadow-default {
     box-shadow: 1px 1px 4px rgb(26 26 26 / 10%)
 }
 
-//padding
+//padding-0
+.padding-t-0 {
+    padding-top: 0px;
+}
+
+.padding-b-0 {
+    padding-bottom: 0px
+}
+
+.padding-l-0 {
+    padding-left: 0px;
+}
+
+.padding-r-0 {
+    padding-right: 0px
+}
+
+.padding-lr-0 {
+    padding-left: 0px;
+    padding-right: 0px
+}
+
+.padding-tb-0 {
+    padding-top: 0px;
+    padding-bottom: 0px
+}
+
+//padding-10
+.padding-10 {
+    padding: 10px;
+}
+
+.padding-tb-10 {
+    padding-top: 10px;
+    padding-bottom: 10px
+}
+
+//padding-15
 .padding-15 {
     padding: 15px;
 }
 
-//margin
-.margin-top-0 {
+.padding-t-15 {
+    padding-top: 15px;
+}
+
+.padding-r-15 {
+    padding-right: 15px
+}
+
+.padding-l-15 {
+    padding-left: 15px;
+}
+
+.padding-b-15 {
+    padding-bottom: 15px
+}
+
+.padding-lr-15 {
+    padding-left: 15px;
+    padding-right: 15px
+}
+
+.padding-tb-15 {
+    padding-top: 15px;
+    padding-bottom: 15px
+}
+
+//margin-0
+.margin-t-0 {
     margin-top: 0px;
 }
 
@@ -29,22 +97,24 @@
     margin-right: 0px
 }
 
-.margin-top-15 {
+//margin-10
+.margin-bottom-10 {
+    margin-bottom: 10px
+}
+
+//margin-15
+.margin-t-15 {
     margin-top: 15px
 }
 
-.margin-left-15 {
+.margin-l-15 {
     margin-left: 15px;
 }
 
-.margin-right-15 {
+.margin-r-15 {
     margin-right: 15px;
 }
 
-.margin-bottom-10 {
-    margin-bottom: 10px
-}
-
-.margin-bottom-15 {
+.margin-b-15 {
     margin-bottom: 15px
 }

src/static/scss/public.scss

@@ -1,6 +1,4 @@
-/*
- * @日期选择器样式 开始
- */
+// 日期选择器样式 开始
 .el-calendar-table,
 tr,
 td,
@@ -33,25 +31,18 @@ th {
   background-color: #1989fa;
 }
 
-/*
- * @日期选择器样式 结束
- */
+//日期选择器样式 结束
 
 
-/*
- * @抽屉样式 开始
- */
+//抽屉样式 开始
 .el-drawer__header {
   margin-bottom: 0px !important;
 }
 
-/*
- * @抽屉样式 结束
- */
+//抽屉样式 结束
 
-/*
- * @图片上传样式 开始
- */
+
+//图片上传样式 开始
 .el-upload-list {
   display: flex !important;
 }
@@ -80,44 +71,33 @@ th {
   border-color: #409eff;
 }
 
-/*
- * @图片上传样式 结束
- */
+//图片上传样式 结束
+
 
-/*
- * @消息弹出框样式 开始
- */
+//消息弹出框样式 开始
 .el-message-box {
   margin-top: 70%;
 }
 
-/*
- * @消息弹出框样式 结束
- */
+//消息弹出框样式 结束
 
-/*
- * @uni-textarea 文本域样式 开始
- */
 
+//uni-textarea 文本域样式 开始
 uni-textarea {
   border: 0px solid #ededed;
   padding: 0;
 }
 
-/*
- * @uni-textarea 文本域样式 结束
- */
+//uni-textarea 文本域样式 结束
 
-/*
- * @全局input样式 开始
- */
+
+//全局input样式 开始
 uni-input {
   background-color: transparent;
 }
 
-/*
- * @全局input样式 结束
- */
+//全局input样式 结束
+
 
 //折叠面板样式 开始
 .u-cell__body {
@@ -194,6 +174,44 @@ uni-input {
   }
 }
 
+//自写table表格样式-纵向
+.tableType3 {
+  padding: 10px;
+
+  .u-row {
+    height: 36px;
+    line-height: 36px;
+
+    .u-col {
+      border: 1px #e4e3e3 solid;
+      border-right: 0px;
+      border-bottom: 0px;
+      text-align: center;
+
+      view {
+        padding: 0 10px;
+        min-height: 36px;
+        overflow: hidden; //超出的文本隐藏
+        // text-overflow: ellipsis; //溢出用省略号显示
+        overflow: auto;
+        white-space: nowrap; // 默认不换行；
+        font-size: 14px;
+      }
+    }
+
+    .u-col:last-child {
+      border-right: 1px #e4e3e3 solid;
+    }
+  }
+
+  .u-row:last-child {
+    .u-col {
+      border-bottom: 1px #e4e3e3 solid;
+    }
+  }
+}
+
+
 //ios底部安全距离
 .ios-padding-bottom {
   /*兼容 IOS<11.2*/
@@ -203,7 +221,7 @@ uni-input {
 }
 
 //公共按钮绝对定位
-.app-position-fixed {
+.app-button-fixed {
   position: fixed;
   left: 0;
   right: 0;
@@ -232,6 +250,13 @@ uni-input {
   }
 }
 
+//公共扫码按钮绝对定位
+.app-scan-fixed {
+  position: fixed;
+  right: 0;
+  bottom: 50px
+}
+
 //公共scroll-view样式
 .scroll-height {
   //#ifdef H5
@@ -268,4 +293,17 @@ uni-input {
 
     color: #909399
   }
+}
+
+//公共分页功能样式
+.app-pagination {
+  padding-bottom: 10px;
+  padding-top: 10px;
+  padding-left: 10px;
+  padding-right: 10px;
+
+  //#ifdef APP-PLUS
+  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
+  //#endif
 }