Merge branch 'master' of http://123.57.226.179:8080/yin_yu820/HS_MZAP

# Conflicts:
#	src/config/index.js

src/api/sys/userSets.js

@@ -40,6 +40,13 @@ export default class userSets {
             params
         )
     };
+	//盐政通测试用户同步规则
+	SchemaServiceTest(params) {
+	    return request.get(
+	        `/SchemaServiceTest`,
+	        params
+	    )
+	};
     //盐政通测试用户新建
     UserCreateService(params) {
         return request.post(

src/config/index.js

@@ -1,6 +1,6 @@
 var defaultConfig = {
 
-    //baseUrl : 'http://2.142.215.98:8010',
+    baseUrl : 'http://2.142.215.98:8010/hs',//政务网环境地址
 
     //baseUrl : 'http://192.168.1.102:3000',
 

src/utils/config.js

@@ -7,11 +7,11 @@ if (process.env.NODE_ENV === 'development') {
     //APP_SERVER_URL = 'http://192.168.139.77:8084'    
     //APP_SERVER_URL = 'http://localhost:8084'
     //测试线上
-    APP_SERVER_URL = 'http://112.3.63.60:58081'
+    APP_SERVER_URL = 'http://192.168.139.102:8084'
     
 } else {
     // 生产环境
-    APP_SERVER_URL = 'http://123.57.226.179:8010/hs'
+    APP_SERVER_URL = 'http://2.142.215.98:8010/hs'
 }
 
 // APP_SERVER_URL = APP_SERVER_URL + "/app"

src/views/activityMan/differentbelievers/ReligiousPeopleReportView.vue

@@ -229,10 +229,12 @@ export default {
       //删除文件操作
       for (let index = 0; index < fileList.value.length; index++) {
         if (file.file.name == fileList.value[index].file.name) {
-          let delurl = fileupList.value[index].url;
-          new tools().uploadFiledelete("", delurl).then(({ data }) => { });
-          fileupList.value.splice(index, 1);
           fileList.value.splice(index, 1);
+          if (fileupList.value[index]) {
+            let delurl = fileupList.value[index].url;
+            new tools().uploadFiledelete("", delurl).then(({ data }) => { });
+            fileupList.value.splice(index, 1);
+          }
         }
       }
     };

src/views/activityMan/nonReligiousInformation/nonReligiousInformationView.vue

@@ -109,7 +109,7 @@
         </van-popup>
       </van-cell-group>
 
-      <van-cell-group>
+      <!-- <van-cell-group>
         <van-field
           v-model="inputForm.placeDetailed"
           center
@@ -118,7 +118,15 @@
           input-align="right"
           right-icon="location"
         />
-      </van-cell-group>
+      </van-cell-group> -->
+	  
+	  <van-cell-group>
+	    <van-field v-model="inputForm.placeDetailed" center label="详细地址:" placeholder="请填写具体地址" input-align="right">
+	      <template #right-icon>
+	        <van-icon name="location" @click="getLocation" />
+	      </template>
+	    </van-field>
+	  </van-cell-group>
 
       <van-cell-group>
         <van-field label="事件内容:" label-align="top">
@@ -317,6 +325,12 @@ export default {
       }
 
     };
+	
+	const getLocation = () => {
+	  xm.getLocation().then(data => {
+	    inputForm.value.placeDetailed = data.POIName;
+	  })
+	}
     
 
     const submit = () => {
@@ -359,6 +373,7 @@ export default {
       fieldNames,
       options,
       onFinish,
+	  getLocation,
       cascaderValue,
       contentEditor,
       // change,

src/views/activityMan/placeactivity/placeActivityView.vue

@@ -109,7 +109,6 @@ import { useRoute } from "vue-router";
 import $base from "@/utils/config";
 // 富文本编辑器
 import WangEditor from "@/components/editor/WangEditor";
-import { xmNavTo } from "@/utils/onlineXm";
 
 export default {
   components: { personList, WangEditor },
@@ -224,7 +223,7 @@ export default {
     };
     const getLocation = () => {
       xm.getLocation().then(data => {
-        placeActivity.value.placeDel = data.AOIName;
+        placeActivity.value.placeDel = data.POIName;
       })
     }
     // 获取活动时间
@@ -297,10 +296,12 @@ export default {
       //删除文件操作
       for (let index = 0; index < fileList.value.length; index++) {
         if (file.file.name == fileList.value[index].file.name) {
-          let delurl = fileupList.value[index].url;
-          new tools().uploadFiledelete("", delurl).then(({ data }) => { });
-          fileupList.value.splice(index, 1);
           fileList.value.splice(index, 1);
+          if (fileupList.value[index]) {
+            let delurl = fileupList.value[index].url;
+            new tools().uploadFiledelete("", delurl).then(({ data }) => { });
+            fileupList.value.splice(index, 1);
+          }
         }
       }
     };

src/views/activityMan/religiousConference/religiousConferenceView.vue

@@ -35,7 +35,7 @@
           />
         </van-popup>
       </van-cell-group>
-      <van-cell-group>
+      <!-- <van-cell-group>
         <van-field
           v-model="inputForm.venueDetailed"
           center
@@ -44,7 +44,15 @@
           input-align="right"
           right-icon="location"
         />
-      </van-cell-group>
+      </van-cell-group> -->
+	  
+	  <van-cell-group>
+	    <van-field v-model="inputForm.venueDetailed" center label="详细地址:" placeholder="请填写具体地址" input-align="right">
+	      <template #right-icon>
+	        <van-icon name="location" @click="getLocation" />
+	      </template>
+	    </van-field>
+	  </van-cell-group>
 
       <van-cell-group>
         <van-field
@@ -300,6 +308,13 @@ export default {
       }
 
     };
+	
+	const getLocation = () => {
+	  xm.getLocation().then(data => {
+	    inputForm.value.venueDetailed = data.POIName;
+	  })
+	}
+	
     const submit = () => {
       isLoading.value = true;
       new religiousConferenceService().save(inputForm.value).then((res) => {
@@ -338,6 +353,7 @@ export default {
       fieldNames,
       options,
       onFinish,
+	  getLocation,
       cascaderValue,
       contentEditor,
       // change,

src/views/activityMan/siteInspection/siteInspectionView.vue

@@ -57,7 +57,7 @@
         </van-popup>
       </van-cell-group>
 
-      <van-cell-group>
+      <!-- <van-cell-group>
         <van-field
           v-model="siteInspection.placeDel"
           center
@@ -66,7 +66,16 @@
           input-align="right"
           right-icon="location"
         />
-      </van-cell-group>
+      </van-cell-group> -->
+	  
+	  <van-cell-group>
+	    <van-field v-model="siteInspection.placeDel" center label="详细地址:" placeholder="请填写具体地址" input-align="right">
+	      <template #right-icon>
+	        <van-icon name="location" @click="getLocation" />
+	      </template>
+	    </van-field>
+	  </van-cell-group>
+	  
       <van-cell-group>
         <van-field
           v-model="siteInspection.supervisionTime"
@@ -283,6 +292,12 @@ export default {
       }      
     };
     
+	const getLocation = () => {
+	  xm.getLocation().then(data => {
+	    siteInspection.value.placeDel = data.POIName;
+	  })
+	}
+	
     // 提交数据
     const submit = () => {
       //添加保存前判断
@@ -329,6 +344,8 @@ export default {
       options,
       onFinish,
       cascaderValue,
+	  
+	  getLocation,
       // 文件上传
       afterRead,
       fileList,

src/views/tab_a/tabAll.vue

@@ -48,26 +48,26 @@
 	</div>
 
 	<van-grid :border="false">
-		<van-grid-item icon="../../../loginbg/csdj.png" text="场所登记" @click="goPlaceRegister"/>
-		<van-grid-item icon="../../../loginbg/csry.png" text="场所人员信息" @click="goPlacePerson" />
-		<van-grid-item icon="../../../loginbg/cspw.png" text="牌位管理" @click="goPlaceTablet"/>
+		<van-grid-item icon="./loginbg/csdj.png" text="场所登记" @click="goPlaceRegister"/>
+		<van-grid-item icon="./loginbg/csry.png" text="场所人员信息" @click="goPlacePerson" />
+		<van-grid-item icon="./loginbg/cspw.png" text="牌位管理" @click="goPlaceTablet"/>
 	</van-grid>
 
 	<div class="hLine"></div>
 
 	<div class="tabtitlelay">
 		<div class="tabtitle1"></div>
-		<div class="tabtitle">活动管理</div>
+		<div class="tabtitle">{{testshow}}</div>
 	</div>
 
 	<van-grid :border="false" >
-		<van-grid-item icon="../../../loginbg/hd_cshd.png" @click="placeActivity" text="场所活动" />
-		<van-grid-item icon="../../../loginbg/hd_ssjhd.png" @click="selfMeetingList" text="私设聚会点" />
-		<van-grid-item icon="../../../loginbg/hd_xjqz.png" @click="abnormalCrowd" text="信教群众异常" />
-		<van-grid-item icon="../../../loginbg/hd_jc.png" text="场所检查" @click="tohd_jc" />
-		<van-grid-item icon="../../../loginbg/hd_af.png" text="安防设施异常" @click="tohd_af" />
-		<van-grid-item icon="../../../loginbg/hd_hy.png" text="负责人会议" @click="tohd_hy" />
-		<van-grid-item icon="../../../loginbg/hd_qt.png" to="/setting" text="其他" @click="tohd_qt" />
+		<van-grid-item icon="./loginbg/hd_cshd.png" @click="placeActivity" text="场所活动" />
+		<van-grid-item icon="./loginbg/hd_ssjhd.png" @click="selfMeetingList" text="私设聚会点" />
+		<van-grid-item icon="./loginbg/hd_xjqz.png" @click="abnormalCrowd" text="信教群众异常" />
+		<van-grid-item icon="./loginbg/hd_jc.png" text="场所检查" @click="tohd_jc" />
+		<van-grid-item icon="./loginbg/hd_af.png" text="安防设施异常" @click="tohd_af" />
+		<van-grid-item icon="./loginbg/hd_hy.png" text="负责人会议" @click="tohd_hy" />
+		<van-grid-item icon="./loginbg/hd_qt.png" text="其他" @click="tohd_qt" />
 	</van-grid>
 </div>
 </template>
@@ -88,6 +88,7 @@ import $base from "@/utils/config";
 				password2:"",
 				con1:0,
 				con2:0,
+				testshow:"活动管理",
 				sum:"0",
 				sum1:"0",
 				sum2:"0",
@@ -97,9 +98,8 @@ import $base from "@/utils/config";
 
 		created(){
 			let id=this.$route.query.id;
-			// window.xm.setNavigationBarTitle({ title: '智慧“和顺”'})
+			window.xm.setNavigationBarTitle({ title: '智慧“和顺”'})
 			this.TokenLogin2();
-			//this.dataNumber();
 		},
 
 		methods:{
@@ -133,7 +133,7 @@ import $base from "@/utils/config";
 				new toBeDone().list2().then((res1)=>{
 					this.sum2 = res1.records.length;
 					this.sum=this.sum1+this.sum2;
-					
+
 				})
 
 			},
@@ -192,9 +192,9 @@ import $base from "@/utils/config";
 				if(this.$store.state.pctoken==""||this.$store.state.pctoken==undefined){
 
 					//SDK中 getToken() 方法获取免登token
-					//window.xm.getToken().then(async function(token){//上线取消注释
-					let token="test";//上线注释
-
+					window.xm.getToken().then(async function(token){//上线取消注释
+					//let token="test";//上线注释	
+					
 
 					new userSets()
 					.TokenLogin({
@@ -208,7 +208,7 @@ import $base from "@/utils/config";
 						that.dataNumber();//获取待办事项数
 					});
 
-					//})//上线取消注释
+					})//上线取消注释
 
 				}else{
 					that.getBannerImg();//获取轮播图
@@ -245,7 +245,7 @@ import $base from "@/utils/config";
 				})
 				.then((res) => {
 					let bs=[];
-					
+
 					res.records[0].bannerImg.split("|").forEach((item) => {
 						if (item.trim().length > 0) {
 							bs.push($base + item.replace('程序附件//','程序附件/'),
@@ -274,15 +274,15 @@ import $base from "@/utils/config";
 				let that=this;
 
 				//SDK中 getToken() 方法获取免登token
-				window.xm.getToken().then(function(token){
-					console.log(token);
+				// window.xm.getToken().then(function(token){
+				// 	console.log(token);
 
-					that.con1="哈哈"+token;
-					window.xm.showToast({
-						message:that.con1
-					})
+				// 	that.con1="哈哈"+token;
+				// 	window.xm.showToast({
+				// 		message:that.con1
+				// 	})
 
-				})
+				// })
 
 				//测试数据同步接口的
 				const inputForm ={

vue.config.js

@@ -5,11 +5,11 @@ module.exports = defineConfig({
 
     // 代理服务，处理接口跨域请求
     devServer: {
-        port: '8080',
+        port: '8080',//
         proxy: {
             '/api': {
-                //target:'http://124.70.137.152:8095',// http://124.70.137.152:8095
-                target: 'http://0.0.0.0:8084', // 
+                //target:'http://124.70.137.152:8095',// http://2.142.215.98:8010
+                target: 'http://192.168.139.102:8084', // 
                 changeOrigin: true,
                 pathRewrite: {
                     '^/api': '/'