Merge remote-tracking branch 'HS_MZAP/master'

src/main.js

@@ -1,6 +1,7 @@
 import { createApp } from 'vue';
 import App from './App.vue';
 import router from './router';
+
 import './styles/index.css';
 
 import api from '@/api';

src/styles/style.css

@@ -0,0 +1,3 @@
+.van-field {
+    font-size: 14px;
+}

src/views/placeManage/ManageList.vue

@@ -26,8 +26,7 @@
               <van-checkbox
                 shape="square"
                 :name="item"
-                :ref="(el) => (checkboxRefs[index] = el)"
-              />
+                :ref="(el) => (checkboxRefs[index] = el)"/>
             </template>
           </van-cell>
         </van-cell-group>

src/views/placeManage/placePersoninfo.vue

@@ -262,18 +262,23 @@ html {
     &:nth-child(1) {
       margin-top: 0px;
       text-align: left;
+      font-size: 21pt;
     }
     &:nth-child(2) {
       text-align: center;
+      font-size: 21pt;
     }
     &:nth-child(3) {
       text-align: right;
+      font-size: 21pt;
     }
   }
 }
 .content {
   position: fixed;
-  width: 85%;
+  width: 90%;
+  // margin: 0 auto;
+  height: 600px;
   top: 140px;
   left: 50%;
   padding: 20px 10px;
@@ -281,7 +286,6 @@ html {
   background-color: #fff;
   border-radius: 10px;
   font-size: 16px;
-  height: 540px;
   overflow: auto;
   h3 {
     margin: 0;

src/views/placeManage/placeRegister.vue

@@ -15,7 +15,7 @@
         />
         <van-popup v-model:show="showPicker" round position="bottom">
           <van-picker
-            title="请选择宗教类型"
+            title="宗教类型"
             :columns="places"
             @cancel="showPicker = false"
             @confirm="getPlace"
@@ -35,7 +35,7 @@
         <van-field
           v-model="placeActivity.placeData.contact"
           center
-          label="场所联系人:"
+          label="场所联系人"
           placeholder="请填写场所联系人"
           input-align="right"
         />
@@ -44,7 +44,7 @@
         <van-field
           v-model="placeActivity.placeData.contactNumber"
           center
-          label="联系电话:"
+          label="联系电话"
           placeholder="请填写联系电话"
           input-align="right"
         />
@@ -54,8 +54,8 @@
           v-model="placeActivity.placeData.placeSelectName"
           center
           readonly
-          label="场所地点:"
-          placeholder="请填写场所地点"
+          label="场所地点"
+          placeholder="请填场所地点"
           input-align="right"
           right-icon="arrow-down"
           @click="showPlace1 = true"
@@ -74,8 +74,8 @@
         <van-field
           v-model="placeActivity.placeData.place"
           center
-          label="详细场所地点:"
-          placeholder="请填写详细场所地点"
+          label="详细场所"
+          placeholder="请填写详细场所"
           input-align="right"
           right-icon="location"
         />
@@ -84,7 +84,7 @@
         <van-field
           v-model="placeActivity.placeData.siteType"
           readonly
-          label="场所类型:"
+          label="场所类型"
           placeholder="请选择场所类型"
           input-align="right"
           right-icon="arrow-down"
@@ -92,7 +92,7 @@
         />
         <van-popup v-model:show="showPicker1" round position="bottom">
           <van-picker
-            title="请选择场所类型"
+            title="场所类型"
             :columns="placeType"
             @cancel="showPicker1 = false"
             @confirm="getplaceType"
@@ -103,7 +103,7 @@
         <van-field
           v-model="placeActivity.placeData.constructionStage"
           readonly
-          label="场所建设阶段:"
+          label="场所建设阶段"
           placeholder="请选择场所建设阶段"
           input-align="right"
           right-icon="arrow-down"
@@ -111,7 +111,7 @@
         />
         <van-popup v-model:show="showPicker2" round position="bottom">
           <van-picker
-            title="请选择场所建设阶段"
+            title="场所建设阶段"
             :columns="construction"
             @cancel="showPicker2 = false"
             @confirm="getConstruction"
@@ -122,7 +122,7 @@
         <van-field
           v-model="placeActivity.placeData.nature"
           readonly
-          label="场所性质:"
+          label="场所性质"
           placeholder="请选择场所性质"
           input-align="right"
           right-icon="arrow-down"
@@ -141,15 +141,15 @@
         <van-field
           v-model="placeActivity.placeData.religiousDeptManaUserName.name"
           center
-          label="宗教部门管理人员:"
-          placeholder="请填写宗教部门管理人员"
+          label="宗教管理人员"
+          placeholder="请填写宗教管理人员"
           input-align="right"
           right-icon="arrow-down"
           @click="showPerson = true"
         />
         <van-dialog
           v-model:show="showPerson"
-          title="选择宗教部门管理人员"
+          title="宗教部门管理人员"
           show-cancel-button
           @confirm="reselected"
         >
@@ -160,15 +160,15 @@
         <van-field
           v-model="placeActivity.placeData.securityDeptManaUserName.name"
           center
-          label="公安部门管理人员:"
-          placeholder="请填写公安部门管理人员"
+          label="公安管理人员"
+          placeholder="请填写公安管理人员"
           input-align="right"
           right-icon="arrow-down"
           @click="showReport = true"
         />  
         <van-dialog
           v-model:show="showReport"
-          title="选择公安部门管理人员"
+          title="公安部门管理人员"
           show-cancel-button
           @confirm="reselected"
         >
@@ -179,13 +179,13 @@
         <van-field
           v-model="placeActivity.placeData.peopleThreshold"
           center
-          label="场所活动人数阈值:"
-          placeholder="请填写场所活动人数阈值"
+          label="场所活动人数:"
+          placeholder="请填写场所活动人数"
           input-align="right"
         />
       </van-cell-group>
       <van-cell-group>
-        <van-field name="uploader" label="外景照片:">
+        <van-field name="uploader" label-align="top" label="外景照片:">
           <template #input>
             <van-uploader
               v-model="placeActivity.fileList1"
@@ -195,7 +195,7 @@
         </van-field>
       </van-cell-group>
       <van-cell-group>
-        <van-field name="uploader" label="内景照片:">
+        <van-field name="uploader" label-align="top" label="内景照片:">
           <template #input>
             <van-uploader
               v-model="placeActivity.fileList2"
@@ -399,6 +399,7 @@ export default {
 };
 </script>
 
+<style src="../../styles/style.css"  scoped></style>
 <style lang="less">
 * {
   margin: 0;
@@ -406,6 +407,7 @@ export default {
 }
 .main {
   background: #fff;
+  margin-top: 25pt;
 }
 .main p {
   height: 40px;
@@ -414,12 +416,12 @@ export default {
   border-bottom: 1px solid #eee;
 }
 .title {
-  font-size: 20px;
+  font-size: 17pt;
   font-weight: 700;
   padding-left: 20px;
 }
 .miniTitle {
-  font-size: 16px;
+  font-size: 14pt;
 }
 .formArea {
   padding: 0px 20px;

src/views/placeManage/placeTabletInfo.vue

@@ -189,25 +189,30 @@ html {
   }
 }
 .banner {
-  background-color: #36a7f3;
+  background-color: #36A7F3;
   padding: 20px 50px 40px 50px;
   color: #fff;
   h2 {
     &:nth-child(1) {
       margin-top: 0px;
       text-align: left;
+      font-size: 21pt;
     }
     &:nth-child(2) {
       text-align: center;
+      font-size: 21pt;
     }
     &:nth-child(3) {
       text-align: right;
+      font-size: 21pt;
     }
   }
 }
 .content {
   position: fixed;
-  width: 85%;
+  width: 90%;
+  // margin: 0 auto;
+  height: 600px;
   top: 140px;
   left: 50%;
   padding: 20px 10px;

src/views/tab_a/tabAll.vue

@@ -96,7 +96,7 @@ import toBeDone from '@/api/toBeDone/toBeDone';
 
 		created(){
 			let id=this.$route.query.id;
-			window.xm.setNavigationBarTitle({ title: '智慧“和顺”'})
+			// window.xm.setNavigationBarTitle({ title: '智慧“和顺”'})
 			this.TokenLogin2();
 			//this.dataNumber();
 		},

src/views/toBeDone/toBeDone_details.vue

@@ -152,8 +152,9 @@ html {
 }
 .content {
   position: fixed;
-  width: 85%;
-  height: 540px;
+  // width: 85%;
+  margin: 0 auto;
+  height: 600px;
   top: 140px;
   left: 50%;
   padding: 20px 10px;