优化全局公共样式

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

@@ -1,7 +1,7 @@
 <template>
   <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
     <view class="alarmDetails-container">
-      <view class="flex bg-white padding-15 margin-b-15">
+      <view class="flex bg-white p15 mb15">
         <image style="width: 40px; height: 40px; margin: auto 15px auto 0" :src="dataArray.typeImg ? dataArray.typeImg : '/static/images/404.png'" mode="aspectFill"></image>
 
         <view style="margin: auto auto auto 0">
@@ -15,8 +15,8 @@
         </view>
       </view>
 
-      <view class="bg-white padding-15 margin-b-15">
-        <uni-section class="block margin-b-10" title="基本信息" type="line"></uni-section>
+      <view class="bg-white p15 mb15">
+        <uni-section class="block mb10" title="基本信息" type="line"></uni-section>
 
         <view class="tableType3 padding-0">
           <u-row v-for="da in dataList" :key="da">
@@ -30,8 +30,8 @@
         </view>
       </view>
 
-      <view class="bg-white padding-15 margin-b-15">
-        <uni-section class="block margin-b-10" title="处理内容" type="line"></uni-section>
+      <view class="bg-white p15 mb15">
+        <uni-section class="block mb10" title="处理内容" type="line"></uni-section>
 
         <view>
           <u-radio-group v-model="handleRange" placement="row" v-if="dataArray.handleStatus != 1">

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

@@ -18,8 +18,8 @@
         <u-grid :border="true">
           <u-grid-item v-for="(base, index) in dataList" :key="index" @click="handleToDetails(base.productCode, base.productName)">
             <u-badge type="primary" max="9999" :value="base.total" :showZero="true" :absolute="true" :offset="[10, 10, 0, 0]"></u-badge>
-            <image class="margin-b-15" style="width: 40px; height: 40px; margin-top: 35px" :src="base.typeImg" mode="aspectFill"></image>
-            <text class="margin-b-15 grid-text text-ellipsis">{{ base.productName }}</text>
+            <image class="mb15" style="width: 40px; height: 40px; margin-top: 35px" :src="base.typeImg" mode="aspectFill"></image>
+            <text class="mb15 grid-text text-ellipsis">{{ base.productName }}</text>
           </u-grid-item>
         </u-grid>
       </view>

src/pages/business/fireIot/deviceManage/components/deviceDetails.vue

@@ -1,7 +1,7 @@
 <template>
   <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
     <view class="deviceDetails-container">
-      <view class="flex bg-white padding-15 margin-b-15">
+      <view class="flex bg-white p15 mb15">
         <image style="width: 40px; height: 40px; margin: auto 15px auto 0" :src="'/static/images/404.png'" mode="aspectFill"></image>
 
         <view style="margin: auto auto auto 0">
@@ -15,8 +15,8 @@
         </view>
       </view>
 
-      <view class="bg-white padding-15 margin-b-15">
-        <uni-section class="block margin-b-10" title="基本信息" type="line"></uni-section>
+      <view class="bg-white p15 mb15">
+        <uni-section class="block mb10" title="基本信息" type="line"></uni-section>
 
         <view class="tableType3 padding-0">
           <u-empty v-if="dataList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
@@ -32,7 +32,7 @@
         </view>
       </view>
 
-      <view class="bg-white padding-15 margin-b-15">
+      <view class="bg-white p15 mb15">
         <!-- 分段器组件 -->
         <view class="app-subsection">
           <u-subsection :list="list" :current="tabPosition" inactiveColor="#303133" :activeColor="proxy.$settingStore.themeColor.color" @change="tabPositionChange" style="width: 100%"></u-subsection>
@@ -40,8 +40,8 @@
 
         <view v-if="tabPosition == 1">
           <view class="flex" :style="{ color: proxy.$settingStore.themeColor.color }">
-            <view class="margin-l-10" style="margin-left: auto" @click="open">选择时间</view>
-            <view class="margin-l-10" @click="modalShow = true">筛选</view>
+            <view class="ml10" style="margin-left: auto" @click="open">选择时间</view>
+            <view class="ml10" @click="modalShow = true">筛选</view>
           </view>
 
           <chart :currentDateList="currentDateList"></chart>
@@ -82,7 +82,7 @@
             "
             :activeColor="proxy.$settingStore.themeColor.color"
           >
-            <u-checkbox class="margin-b-10" v-for="option in checkboxDataList" :key="option" :label="option.attributeName" :name="option.attributeCode"> </u-checkbox>
+            <u-checkbox class="mb10" v-for="option in checkboxDataList" :key="option" :label="option.attributeName" :name="option.attributeCode"> </u-checkbox>
           </u-checkbox-group>
         </view>
       </u-modal>

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

@@ -14,7 +14,7 @@
   >
     <template #default>
       <view class="deviceDetailsList-container">
-        <view class="flex bg-white padding-10" style="position: relative">
+        <view class="flex bg-white p10" style="position: relative">
           <u--input
             style="width: 100%"
             v-model="deviceName"
@@ -25,7 +25,7 @@
             @confirm="dmpDeviceInfoApi()"
             clearable
           ></u--input>
-          <view class="margin-l-10" style="margin-top: auto; margin-bottom: auto; white-space: nowrap" @click="dropdownShow = !dropdownShow">筛选</view>
+          <view class="ml10" style="margin-top: auto; margin-bottom: auto; white-space: nowrap" @click="dropdownShow = !dropdownShow">筛选</view>
         </view>
 
         <oa-dropdown :dropdownShow="dropdownShow" :closeOnClickOverlay="true" @close="dropdownShow = false">

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

@@ -18,8 +18,8 @@
         <u-grid :border="true">
           <u-grid-item v-for="(base, index) in dataList" :key="index" @click="handleToDevice(base.id, base.productName)">
             <u-badge type="primary" max="9999" :value="base.deviceCount" :showZero="true" :absolute="true" :offset="[10, 10, 0, 0]"></u-badge>
-            <image class="margin-b-15" style="width: 40px; height: 40px; margin-top: 35px" :src="base.typeImg" mode="aspectFill"></image>
-            <view class="margin-b-15 text-ellipsis" style="width: 100%; text-align: center">{{ base.productName }}</view>
+            <image class="mb15" style="width: 40px; height: 40px; margin-top: 35px" :src="base.typeImg" mode="aspectFill"></image>
+            <view class="mb15 text-ellipsis" style="width: 100%; text-align: center">{{ base.productName }}</view>
           </u-grid-item>
         </u-grid>
       </view>

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

@@ -87,13 +87,13 @@
         </view>
       </u--form>
 
-      <view class="app-padding-bottom"> </view>
-
-      <view class="app-button-fixed">
-        <view class="app-flex">
-          <u-button class="app-buttom" style="margin-right: 15px" @click="handleSubmit('取消')" shape="circle"> 取消 </u-button>
-
-          <u-button class="app-buttom" type="primary" @click="handleSubmit('提交')" shape="circle"> 提交 </u-button>
+      <view class="app-button">
+        <view class="app-button-padding"></view>
+        <view class="app-button-fixed">
+          <view class="app-flex">
+            <u-button class="app-buttom" style="margin-right: 15px" @click="handleSubmit('取消')" shape="circle"> 取消 </u-button>
+            <u-button class="app-buttom" type="primary" @click="handleSubmit('提交')" shape="circle"> 提交 </u-button>
+          </view>
         </view>
       </view>
     </view>

src/pages/business/fireIot/facilitiesManage/facilitiesDetails.vue

@@ -1,7 +1,7 @@
 <template>
   <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
     <view class="facilitiesDetails-container">
-      <view class="flex bg-white padding-15 margin-b-15">
+      <view class="flex bg-white p15 mb15">
         <image style="width: 40px; height: 40px; margin: auto 15px auto 0" :src="dataArray.imagesUrl ? dataArray.imagesUrl : '/static/images/404.png'" mode="aspectFill"></image>
 
         <view style="margin: auto auto auto 0">
@@ -17,8 +17,8 @@
         </view>
       </view>
 
-      <view class="bg-white padding-15 margin-b-15">
-        <uni-section class="block margin-b-10" title="基本信息" type="line"></uni-section>
+      <view class="bg-white p15 mb15">
+        <uni-section class="block mb10" title="基本信息" type="line"></uni-section>
 
         <view class="tableType3 padding-0">
           <u-empty v-if="dataList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
@@ -34,8 +34,8 @@
         </view>
       </view>
 
-      <view class="bg-white padding-15 margin-b-15">
-        <uni-section class="block margin-b-10" title="关联设备" type="line"></uni-section>
+      <view class="bg-white p15 mb15">
+        <uni-section class="block mb10" title="关联设备" type="line"></uni-section>
 
         <view class="flex margin-bottom-sm" style="height: 35px; line-height: 35px">
           <u-input v-model="deviceId" placeholder="设备编号" @change="deviceInfoApi()" disabledColor="transparent" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" clearable />
@@ -73,8 +73,8 @@
         </view>
       </view>
 
-      <view class="bg-white padding-15 margin-b-15">
-        <uni-section class="block margin-b-10" title="关联建筑" type="line"></uni-section>
+      <view class="bg-white p15 mb15">
+        <uni-section class="block mb10" title="关联建筑" type="line"></uni-section>
 
         <view class="flex margin-bottom-sm" style="height: 35px; line-height: 35px">
           <u-input v-model="buildNum" placeholder="建筑编号" @change="buildInfoApi()" disabledColor="transparent" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" clearable />

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

@@ -14,7 +14,7 @@
   >
     <template #default>
       <view class="facilitiesDetailsList-container">
-        <view class="flex bg-white padding-10" style="position: relative">
+        <view class="flex bg-white p10" style="position: relative">
           <u--input
             style="width: 100%"
             v-model="facilityName"
@@ -25,7 +25,7 @@
             @confirm="init()"
             clearable
           ></u--input>
-          <view class="margin-l-10" style="margin-top: auto; margin-bottom: auto; white-space: nowrap" @click="init()">筛选</view>
+          <view class="ml10" style="margin-top: auto; margin-bottom: auto; white-space: nowrap" @click="init()">筛选</view>
         </view>
 
         <view class="menu-list margin-0">

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

@@ -17,7 +17,7 @@
         <uni-swipe-action>
           <uni-swipe-action-item class="bg-white">
             <view class="content">
-              <view class="block padding-10">
+              <view class="block p10">
                 <u-input v-model="dataInput" placeholder="请输入设备编号" @blur="blur" shape="circle" prefixIcon="search" prefixIconStyle="color: #0c7bf9"> </u-input>
               </view>
 

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

@@ -7,7 +7,7 @@
       </view>
 
       <view class="content1">
-        <uni-section class="block margin-b-10" title="消防安全风险提示" type="line" titleFontSize="15px"> </uni-section>
+        <uni-section class="block mb10" title="消防安全风险提示" type="line" titleFontSize="15px"> </uni-section>
         <view class="price1">
           <view>
             上海XX公司：
@@ -54,7 +54,7 @@
       </view>
 
       <view class="content2">
-        <uni-section class="block margin-b-10" title="基本情况" type="line" titleFontSize="15px"></uni-section>
+        <uni-section class="block mb10" title="基本情况" type="line" titleFontSize="15px"></uni-section>
         <view class="tableType2 price2">
           <u-row>
             <u-col span="3">
@@ -77,7 +77,7 @@
       </view>
 
       <view class="content2">
-        <uni-section class="block margin-b-10" title="存在问题" type="line" titleFontSize="15px">
+        <uni-section class="block mb10" title="存在问题" type="line" titleFontSize="15px">
           <template v-slot:right>
             <view style="color: #666666; font-size: 14px">整改期限：2023-02-02</view>
           </template>
@@ -109,7 +109,7 @@
       </view>
 
       <view class="content2">
-        <uni-section class="block margin-b-10" title="整体指数分析" type="line" titleFontSize="15px"> </uni-section>
+        <uni-section class="block mb10" title="整体指数分析" type="line" titleFontSize="15px"> </uni-section>
         <view class="tableType1 price2">
           <u-row>
             <u-col span="4">
@@ -153,14 +153,14 @@
       </view>
 
       <view class="content2">
-        <uni-section class="block margin-b-10" title="整体指数分析" type="line" titleFontSize="15px"> </uni-section>
+        <uni-section class="block mb10" title="整体指数分析" type="line" titleFontSize="15px"> </uni-section>
         <view>
           <line-echarts :xAxisDataList="['1月', '2月', '3月', '4月', '5月', '6月']" :seriesDataList="[50, 20, 30, 10, 80, 80]"></line-echarts>
         </view>
       </view>
 
       <view class="content2">
-        <uni-section class="block margin-b-10" title="设备设施状况" type="line" titleFontSize="15px"> </uni-section>
+        <uni-section class="block mb10" title="设备设施状况" type="line" titleFontSize="15px"> </uni-section>
         <view>
           <view style="color: #666666; text-align: center; font-size: 14px">近一周设备在线率</view>
           <line-echarts :xAxisDataList="['周一', '周二', '周三', '周四', '周五', '周六', '周日']" :seriesDataList="[50, 20, 30, 10, 80, 80, 20]"></line-echarts>
@@ -224,7 +224,7 @@
       </view>
 
       <view class="content2">
-        <uni-section class="block margin-b-10" title="监督执法情况" type="line" titleFontSize="15px"> </uni-section>
+        <uni-section class="block mb10" title="监督执法情况" type="line" titleFontSize="15px"> </uni-section>
 
         <view class="tableType2 price2">
           <u-row>
@@ -322,7 +322,7 @@
       </view>
 
       <view class="content2">
-        <uni-section class="block margin-b-10" title="火灾情况分析" type="line" titleFontSize="15px"> </uni-section>
+        <uni-section class="block mb10" title="火灾情况分析" type="line" titleFontSize="15px"> </uni-section>
 
         <view class="tableType2 price2">
           <u-row>

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

@@ -10,7 +10,7 @@
           <uni-swipe-action-item>
             <!-- 各类查询 start -->
             <view class="tableType3">
-              <u-input class="block margin-b-10" v-model="dataInput" :placeholder="placeholderText" @blur="blur" shape="circle" prefixIcon="search" prefixIconStyle="color: #0c7bf9"> </u-input>
+              <u-input class="block mb10" 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/needMatter/index.vue

@@ -170,10 +170,10 @@
               @confirm="handleConfirm"
             >
               <view style="width: 100%">
-                <uni-section class="block margin-b-10" title="图片上传：" type="line">
+                <uni-section class="block mb10" title="图片上传：" type="line">
                   <u-upload :fileList="fileList" name="6" @afterRead="afterRead" multiple :maxCount="5" width="80" height="80"> </u-upload>
                 </uni-section>
-                <uni-section class="block margin-b-10" title="备注：" type="line">
+                <uni-section class="block mb10" title="备注：" type="line">
                   <u--textarea v-model="textValue" placeholder="请输入内容"></u--textarea>
                 </uni-section>
               </view>

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

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

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 padding-15">
+    <view class="bg-white p15">
       <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" class="margin-t-15" style="width: 100%; height: 40px; font-size: 14px" @click="handleInsert()" shape="circle"> 保存 </u-button>
+      <u-button type="primary" class="mt15" 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="flex bg-white padding-15 padding-r-0 margin-b-15">
-      <view class="flex margin-r-15">
+    <view v-for="(cu, index) in dataList.siteList" :key="index" class="flex bg-white p15 pt0 mb15">
+      <view class="flex mr15">
         <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>

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

@@ -3,15 +3,15 @@
     <!-- 按组使用 -->
     <uni-swipe-action>
       <uni-swipe-action-item
-        class="margin-b-15"
+        class="mb15"
         v-for="(cu, index) in xunJianStore.collectDataList"
         :key="index"
         :right-options="options"
         @click="bindClick($event, index)"
         @change="swipeChange($event, index)"
       >
-        <view class="flex bg-white padding-15 padding-r-0">
-          <view class="flex margin-r-15">
+        <view class="flex bg-white p15 pt0">
+          <view class="flex mr15">
             <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>

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

@@ -1,16 +1,16 @@
 <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-b-15" v-for="(con, index) in contentList" :key="index">
-        <view class="flex margin-b-10">
-          <uni-section class="block margin-b-10" :title="con.contentTitle" type="line"></uni-section>
+      <view class="bg-white p15 mb15" v-for="(con, index) in contentList" :key="index">
+        <view class="flex mb10">
+          <uni-section class="block mb10" :title="con.contentTitle" type="line"></uni-section>
 
           <view style="margin: auto"> </view>
 
           <u-button v-if="con.remarksBool == false" type="primary" icon="list-dot" shape="circle" @click="remarksClick(index)" customStyle="width: 18px;height: 18px;padding: 0;margin: 0;"> </u-button>
         </view>
         <view>
-          <view class="margin-t-15" v-if="con.submissionMethod == 1">
+          <view class="mt15" v-if="con.submissionMethod == 1">
             <u-checkbox-group
               v-model="con.contentOptionListValue1"
               @change="
@@ -22,7 +22,7 @@
               :activeColor="proxy.$settingStore.themeColor.color"
             >
               <view class="flex" style="width: 100%; flex-wrap: wrap">
-                <view class="margin-b-15" style="width: 50%" v-for="option in con.contentOptionList" :key="option">
+                <view class="mb15" style="width: 50%" v-for="option in con.contentOptionList" :key="option">
                   <u-checkbox :label="option.optionName" :name="option.id" :checked="con.contentOptionListValue1.length > 0 ? con.contentOptionListValue1.indexOf(option.id) >= 0 : false">
                   </u-checkbox>
                 </view>
@@ -34,10 +34,10 @@
               <u-input v-model="con.remarks" placeholder="请输入备注" :disabled="xunJianStore.contentArray.siteList.inspectionStatus == 2" customStyle="height:32px;"></u-input>
             </view>
           </view>
-          <view class="margin-t-15" v-if="con.submissionMethod == 2">
+          <view class="mt15" v-if="con.submissionMethod == 2">
             <u-radio-group placement="row" v-model="con.contentOptionListValue" :activeColor="proxy.$settingStore.themeColor.color">
               <view class="flex" style="width: 100%; flex-wrap: wrap">
-                <view class="margin-b-15" style="width: 50%" v-for="option in con.contentOptionList" :key="option">
+                <view class="mb15" style="width: 50%" v-for="option in con.contentOptionList" :key="option">
                   <u-radio :disabled="xunJianStore.contentArray.siteList.inspectionStatus == 2" :label="option.optionName" :name="option.id"> </u-radio>
                 </view>
               </view>
@@ -48,8 +48,8 @@
               <u-input v-model="con.remarks" placeholder="请输入备注" :disabled="xunJianStore.contentArray.siteList.inspectionStatus == 2" customStyle="height:32px;"></u-input>
             </view>
           </view>
-          <view class="margin-t-15" v-if="con.submissionMethod == 3">
-            <view class="margin-b-15">
+          <view class="mt15" v-if="con.submissionMethod == 3">
+            <view class="mb15">
               <u-textarea v-model="con.contentOptionListValue" placeholder="请输入" maxlength="30" :disabled="xunJianStore.contentArray.siteList.inspectionStatus == 2"></u-textarea>
             </view>
 

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-b-15 margin-t-15">
+      <view class="mb15 mt15">
         <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 class="padding-l-15 padding-r-15" style="height: calc(100vh - 30rem)">
+      <scroll-view scroll-y class="pl15 pr15" 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-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)">
+    <view class="flex mb15 bg-white" style="padding: 15px 0px 15px 15px" v-for="cu in currentDateList" :key="cu">
+      <view class="flex mr15" @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>

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-b-15">
+      <view class="flex bg-white p15 mb15">
         <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,8 +17,8 @@
         </view>
       </view>
 
-      <view class="bg-white padding-15 margin-b-15">
-        <uni-section class="block margin-b-10" title="上报现场" type="line"></uni-section>
+      <view class="bg-white p15 mb15">
+        <uni-section class="block mb10" title="上报现场" type="line"></uni-section>
 
         <oa-upload
           :uploadCount="9"
@@ -33,8 +33,8 @@
         ></oa-upload>
       </view>
 
-      <view class="bg-white padding-15 margin-b-15" style="height: 170px; max-height: 170px">
-        <uni-section class="block margin-b-10" title="备注" type="line"></uni-section>
+      <view class="bg-white p15 mb15" style="height: 170px; max-height: 170px">
+        <uni-section class="block mb10" title="备注" type="line"></uni-section>
 
         <view style="height: calc(100% - 25px)">
           <span v-if="siteList.inspectionStatus == 2">
@@ -45,8 +45,8 @@
         </view>
       </view>
 
-      <view class="bg-white padding-15 margin-b-15">
-        <uni-section class="block margin-b-10" title="消防设施分布图" type="line"></uni-section>
+      <view class="bg-white p15 mb15">
+        <uni-section class="block mb10" title="消防设施分布图" type="line"></uni-section>
 
         <u-image width="100%" :src="siteList.pictureUrl"></u-image>
       </view>

src/pages/common/customManage/index.vue

@@ -1,6 +1,6 @@
 <template>
   <oa-scroll
-    customClass=" scroll-height"
+    customClass="customManage-container scroll-height"
     :pageSize="pageSize"
     :total="total"
     :refresherLoad="true"
@@ -10,57 +10,54 @@
     :refresherBackground="'#f5f6f7'"
     @load="load"
     @refresh="refresh"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
   >
     <template #default>
-      <view class="customManage-container" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
-        <view class="flex bg-white padding-10" style="position: relative">
-          <u--input
-            style="width: 100%"
-            v-model="projectName"
-            placeholder="搜索"
-            prefixIcon="search"
-            prefixIconStyle="font-size: 22px;color: #909399"
-            customStyle="height:30px;background-color:#f5f6fa; "
-            @confirm="selectListApi()"
-            clearable
-          ></u--input>
-          <view class="margin-l-10" style="margin-top: auto; margin-bottom: auto; white-space: nowrap" @click="dropdownShow = !dropdownShow">筛选</view>
-        </view>
+      <view class="search-area flex bg-white p10">
+        <u--input
+          style="width: 100%"
+          v-model="projectName"
+          placeholder="搜索"
+          prefixIcon="search"
+          prefixIconStyle="font-size: 22px;color: #909399"
+          customStyle="height:30px;background-color:#f5f6fa; "
+          @confirm="selectListApi()"
+          clearable
+        ></u--input>
+        <view class="search-area-buttom ml10" @click="dropdownShow = !dropdownShow">筛选</view>
+      </view>
 
-        <oa-dropdown :dropdownShow="dropdownShow" :closeOnClickOverlay="true" @close="dropdownShow = false">
-          <template #content>
-            <u-radio-group v-model="radioValue" placement="column" iconPlacement="right" @change="radioChange">
-              <u-radio v-for="ra in radioList" :key="ra" :activeColor="proxy.$settingStore.themeColor.color" :label="ra.label" :name="ra.value"></u-radio>
-            </u-radio-group>
-          </template>
-        </oa-dropdown>
-
-        <view class="container-area menu-list margin-lr-0" v-for="data in dataList" :key="data">
-          <view class="list-cell" style="color: #666666; line-height: 30px">
-            <view class="menu-item-box" style="font-size: 16px; font-weight: 600; color: #000000">
-              <view> {{ data.projectName }} </view>
+      <oa-dropdown :dropdownShow="dropdownShow" :closeOnClickOverlay="true" @close="dropdownShow = false">
+        <template #content>
+          <u-radio-group v-model="radioValue" placement="column" iconPlacement="right" @change="radioChange">
+            <u-radio v-for="ra in radioList" :key="ra" :activeColor="proxy.$settingStore.themeColor.color" :label="ra.label" :name="ra.value"></u-radio>
+          </u-radio-group>
+        </template>
+      </oa-dropdown>
+
+      <view class="content-area menu-list mlr0" v-for="data in dataList" :key="data">
+        <view class="list-cell" style="color: #666666; line-height: 30px">
+          <view class="content-area-top menu-item-box">
+            <view> {{ data.projectName }} </view>
+          </view>
+          <view class="content-area-row_wrap menu-item-box">
+            <view class="content-area-row_wrap-view"> 项目编号：{{ data.projectId }} </view>
+            <view class="content-area-row_wrap-view"> 到期时间：{{ data.expireTime ? data.expireTime.split("T")[0] : "" }} </view>
+            <view class="content-area-row_wrap-view"> 客户负责人：{{ data.customPerson }} </view>
+            <view class="content-area-row_wrap-view">
+              维保费：<span style="color: red">￥{{ data.maintainAmount }}</span>
             </view>
-            <view class="menu-item-box" style="font-size: 13px; flex-flow: row wrap">
-              <view style="min-width: 50%"> 项目编号：{{ data.projectId }} </view>
-              <view style="min-width: 50%"> 到期时间：{{ data.expireTime ? data.expireTime.split("T")[0] : "" }} </view>
-              <view style="min-width: 50%"> 客户负责人：{{ data.customPerson }} </view>
-              <view style="min-width: 50%">
-                维保费：<span style="color: red">￥{{ data.maintainAmount }}</span>
-              </view>
-              <view style="min-width: 50%; display: flex; white-space: nowrap">
-                <view style="margin-right: 5px">客户电话：{{ data.phone }}</view>
-                <view class="iconfont ucicon-a-copy menu-icon" style="font-size: 14px; color: #909399; margin-left: 5px" @click="copy(data.phone)"> </view>
-                <view class="iconfont ucicon-dial menu-icon" style="font-size: 14px; color: #909399; margin-left: 5px" @click="proxy.$common.makePhoneCall(data.phone)"> </view>
-              </view>
-              <view style="min-width: 50%">
-                状态：
-                <span :style="`color: ${data.maintainStatus == 1 ? '#16bf00' : 'red'} `">
-                  {{ data.maintainStatus == 1 ? "使用中" : "已到期" }}
-                </span>
-              </view>
-              <view style="min-width: 50%"> 客户地址： {{ data.customAddress }} </view>
-              <view style="min-width: 50%">销售负责人：{{ data.salePerson }}</view>
+            <view class="content-area-row_wrap-view">
+              <view style="margin-right: 5px">客户电话：{{ data.phone }}</view>
+              <view class="iconfont ucicon-a-copy menu-icon" @click="copy(data.phone)"> </view>
+              <view class="iconfont ucicon-dial menu-icon" @click="proxy.$common.makePhoneCall(data.phone)"> </view>
             </view>
+            <view class="content-area-row_wrap-view">
+              <view>状态：</view>
+              <view :style="`color: ${data.maintainStatus == 1 ? '#16bf00' : 'red'} `"> {{ data.maintainStatus == 1 ? "使用中" : "已到期" }}</view>
+            </view>
+            <view class="content-area-row_wrap-view"> 客户地址： {{ data.customAddress }} </view>
+            <view class="content-area-row_wrap-view">销售负责人：{{ data.salePerson }}</view>
           </view>
         </view>
       </view>
@@ -207,5 +204,38 @@ onNavigationBarButtonTap((e) => {
 }
 
 .customManage-container {
+  .search-area {
+    position: relative;
+
+    &-buttom {
+      margin-top: auto;
+      margin-bottom: auto;
+      white-space: nowrap;
+    }
+  }
+
+  .content-area {
+    &-top {
+      font-size: 16px;
+      font-weight: 600;
+      color: #000000;
+    }
+
+    &-row_wrap {
+      font-size: 13px;
+      flex-flow: row wrap;
+
+      &-view {
+        display: flex;
+        min-width: 50%;
+        white-space: nowrap;
+        > .iconfont {
+          font-size: 14px;
+          color: #909399;
+          margin-left: 5px;
+        }
+      }
+    }
+  }
 }
 </style>

src/pages/common/invoicing/index.vue

@@ -3,7 +3,17 @@
     <u-tabs :list="tabsList" :current="tabsCurrent" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }" :scrollable="false"></u-tabs>
   </u-sticky>
 
-  <scroll-view class="invoicing-container scroll-height" :scroll-y="true" :scroll-into-view="scrollIntoView" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
+  <oa-scroll
+    customClass="invoicing-container scroll-height"
+    :customStyle="{}"
+    :refresherLoad="false"
+    :refresherEnabled="false"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    :scrollIntoView="scrollIntoView"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
     <view v-show="tabsCurrent == 0">
       <u-notice-bar id="noticeBar" v-if="promptStatus" text="注：查询到您近期有开票记录，请勿重复开票" :duration="9000" color="#FF0000" bgColor="#FFFFFF"></u-notice-bar>
 
@@ -108,15 +118,16 @@
         </view>
       </view>
 
-      <view class="app-padding-bottom"> </view>
-
-      <view class="app-button-fixed">
-        <u-button class="app-buttom" type="primary" @click="handleSubmit('提交')" shape="circle"> 提交 </u-button>
+      <view class="app-button">
+        <view class="app-button-padding" :style="{ paddingBottom: `calc(60px +  44px + ${proxy.$settingStore.tabBarHeight}) !important` }"></view>
+        <view class="app-button-fixed">
+          <u-button class="app-buttom" type="primary" @click="handleSubmit('提交')" shape="circle"> 提交 </u-button>
+        </view>
       </view>
     </view>
 
     <view v-show="tabsCurrent == 1">
-      <view class="menu-list margin-t-0 margin-lr-0" style="padding: 0.625rem">
+      <view class="menu-list mt0 mlr0" style="padding: 0.625rem">
         <view class="list-cell">
           <view class="menu-item-box" style="justify-content: center; margin-bottom: 15px; font-size: 15px">
             <view>对公转账</view>
@@ -152,7 +163,7 @@
         </view>
       </view>
     </view>
-  </scroll-view>
+  </oa-scroll>
 </template>
 
 <script setup>
@@ -406,8 +417,4 @@ onNavigationBarButtonTap((e) => {
 :deep(.uni-page-head__title) {
   opacity: 1 !important;
 }
-
-.invoicing-container {
-  height: calc(100vh - env(safe-area-inset-top) - 44px) !important;
-}
 </style>

src/pages/info.vue

@@ -17,7 +17,7 @@
   </u-navbar>
 
   <u-sticky style="top: 0px">
-    <view class="padding-lr padding-tb-10" :class="'bg-' + proxy.$settingStore.themeColor.name">
+    <view class="padding-lr ptb10" :class="'bg-' + proxy.$settingStore.themeColor.name">
       <u--input placeholder="搜索" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" customStyle="height:35px;background-color:#f5f6fa;"></u--input>
     </view>
   </u-sticky>

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-t-0 margin-lr-0">
+      <view class="menu-list mt0 mlr0">
         <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-t-0 margin-lr-0">
+      <view class="menu-list mt0 mlr0">
         <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-b-15" style="color: #909399">{{ modalTitle }}</view>
+      <view class="mb15" 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/setting/index.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="setting-container" :style="{ height: `${windowHeight}px` }">
-    <view class="menu-list margin-lr-0">
+    <view class="menu-list mlr0">
       <view class="list-cell list-cell-arrow" @click="proxy.$settingStore.handleToEditInfo()">
         <view class="menu-item-box">
           <view class="iconfont ucicon-user menu-icon"></view>
@@ -9,7 +9,7 @@
       </view>
     </view>
 
-    <view class="menu-list margin-t-0 margin-lr-0">
+    <view class="menu-list mt0 mlr0">
       <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/scss/index.scss

@@ -19,112 +19,72 @@
     box-shadow: 1px 1px 4px rgb(26 26 26 / 10%)
 }
 
-//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;
-}
-
-.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;
-}
-
-.margin-lr-0 {
-    margin-left: 0px;
-    margin-right: 0px
-}
-
-//margin-10
-.margin-b-10 {
-    margin-bottom: 10px
-}
-
-.margin-l-10 {
-    margin-left: 10px;
-}
-
-.margin-r-10 {
-    margin-right: 10px;
-}
-
-//margin-15
-.margin-t-15 {
-    margin-top: 15px
-}
-
-.margin-l-15 {
-    margin-left: 15px;
-}
-
-.margin-r-15 {
-    margin-right: 15px;
-}
 
-.margin-b-15 {
-    margin-bottom: 15px
+/* 外边距、内边距全局样式
+------------------------------- */
+@for $i from 0 through 100 {
+
+    // margin
+    .m#{$i} {
+        margin: #{$i}px !important;
+    }
+
+    .mt#{$i} {
+        margin-top: #{$i}px !important;
+    }
+
+    .mr#{$i} {
+        margin-right: #{$i}px !important;
+    }
+
+    .mb#{$i} {
+        margin-bottom: #{$i}px !important;
+    }
+
+    .ml#{$i} {
+        margin-left: #{$i}px !important;
+    }
+
+    .mlr#{$i} {
+        margin-left: #{$i}px !important;
+        margin-right: #{$i}px !important;
+    }
+
+    .mtb#{$i} {
+        margin-top: #{$i}px !important;
+        margin-bottom: #{$i}px !important;
+    }
+
+    // padding
+    .p#{$i} {
+        padding: #{$i}px !important;
+    }
+
+    .pt#{$i} {
+        padding-top: #{$i}px !important;
+    }
+
+    .pr#{$i} {
+        padding-right: #{$i}px !important;
+    }
+
+    .pb#{$i} {
+        padding-bottom: #{$i}px !important;
+    }
+
+    .pl#{$i} {
+        padding-left: #{$i}px !important;
+    }
+
+    .plr#{$i} {
+        padding-left: #{$i}px !important;
+        padding-right: #{$i}px !important;
+    }
+
+    .ptb#{$i} {
+        padding-top: #{$i}px !important;
+        padding-bottom: #{$i}px !important;
+    }
 }
 
 .text-ellipsis {

src/static/scss/public.scss

@@ -214,41 +214,45 @@ uni-input {
 }
 
 
-//APP底部安全距离
-.app-padding-bottom {
-  padding-bottom: calc(constant(safe-area-inset-bottom) + 20px + 40px) !important;
-  padding-bottom: calc(env(safe-area-inset-bottom) + 20px + 40px) !important;
-}
-
-//公共按钮绝对定位
-.app-button-fixed {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  padding: 10px 15px 10px 15px;
-  background-color: #fff;
-  box-shadow: 0px 0px 15px 0 rgba(0, 0, 0, 0.1);
-  z-index: 50;
+//公共按钮样式
+.app-button {
 
-  .app-buttom {
-    display: block;
-    width: 100%;
-    height: 40px;
-    font-size: 14px;
-    //#ifdef APP-PLUS || MP-WEIXIN
-    margin-bottom: constant(safe-area-inset-bottom);
-    margin-bottom: env(safe-area-inset-bottom);
-    //#endif
+  //按钮底部安全距离
+  &-padding {
+    padding-bottom: calc(constant(safe-area-inset-bottom) + 20px + 40px) !important;
+    padding-bottom: calc(env(safe-area-inset-bottom) + 20px + 40px) !important;
   }
 
-  .app-flex {
-    display: flex;
+  //公共按钮绝对定位
+  &-fixed {
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    padding: 10px 15px 10px 15px;
+    background-color: #fff;
+    box-shadow: 0px 0px 15px 0 rgba(0, 0, 0, 0.1);
+    z-index: 50;
 
     .app-buttom {
-      width: 50%;
+      display: block;
+      width: 100%;
       height: 40px;
       font-size: 14px;
+      //#ifdef APP-PLUS || MP-WEIXIN
+      margin-bottom: constant(safe-area-inset-bottom);
+      margin-bottom: env(safe-area-inset-bottom);
+      //#endif
+    }
+
+    .app-flex {
+      display: flex;
+
+      .app-buttom {
+        width: 50%;
+        height: 40px;
+        font-size: 14px;
+      }
     }
   }
 }