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

# Conflicts:
#	src/views/tab_a/tabAll.vue

src/api/placeRegister/placeRegister.js

@@ -41,4 +41,5 @@ export default class placeRegister {
             params
         )
     }
+
 }

src/views/activityMan/personList.vue

@@ -1,56 +1,21 @@
 <template>
   <div class="personList">
-    <van-search
-      v-model="searchVal"
-      clearable
-      show-action
-      shape="round"
-      placeholder="请输入搜索关键词"
-      input-align="center"
-      @search="onSearch"
-      @cancel="onCancel"
-    />
-    <van-list
-      v-model:loading="loading"
-      :finished="finished"
-      finished-text="没有更多了"
-      @load="onLoad"
-    >
-      <van-checkbox-group
-        v-if="type == 1"
-        v-model="checked"
-        ref="checkboxGroup"
-      >
-        <van-button type="primary" size="mini" @click="checkAll"
-          >全选</van-button
-        >
+    <van-search v-model="searchVal" clearable show-action shape="round" placeholder="请输入搜索关键词" input-align="center"
+      @search="onSearch" @cancel="onCancel" />
+    <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+      <van-checkbox-group v-if="type == 1" v-model="checked" ref="checkboxGroup">
+        <van-button type="primary" size="mini" @click="checkAll">全选</van-button>
         <van-cell-group inset>
-          <van-cell
-            v-for="(item, index) in list"
-            clickable
-            :key="item"
-            :title="item.name"
-            @click="toggle(index)"
-          >
+          <van-cell v-for="(item, index) in list" clickable :key="item" :title="item.name" @click="toggle(index)">
             <template #right-icon>
-              <van-checkbox
-                shape="square"
-                :name="item"
-                :ref="(el) => (checkboxRefs[index] = el)"
-              />
+              <van-checkbox shape="square" :name="item" :ref="(el) => (checkboxRefs[index] = el)" />
             </template>
           </van-cell>
         </van-cell-group>
       </van-checkbox-group>
       <van-radio-group v-if="type == 0" v-model="checked">
         <van-cell-group inset>
-          <van-cell
-            v-for="item in list"
-            clickable
-            :key="item"
-            :title="item.name"
-            @click="selectes(item)"
-          >
+          <van-cell v-for="item in list" clickable :key="item" :title="item.name" @click="selectes(item)">
             <template #right-icon>
               <van-radio :name="item" />
             </template>
@@ -79,6 +44,7 @@ export default {
         .list({
           current: index + 1,
           size: 10,
+          ...searchForm.value
         })
         .then(({ records }) => {
           list.value.push(...records);
@@ -94,12 +60,29 @@ export default {
     };
     // 搜索
     const searchVal = ref("");
+    let searchForm = ref({
+      name: "",
+      sex: "",
+      idType: "",
+      idcard: "",
+      phone: "",
+      location: {
+        id: ""
+      },
+      typeOfEmployees: "",
+      personnelType: "",
+      religion: "",
+      sjfw: [],
+      nativePlace: '',
+      currentResidence: ''
+    })
     const onSearch = () => {
+      searchForm.value.name = searchVal.value;
       new UserManage()
         .list({
           current: 1,
           size: 10000,
-          name: searchVal.value,
+          ...searchForm.value
         })
         .then(({ records }) => {
           list.value = [];
@@ -115,6 +98,7 @@ export default {
       list.value = [];
       index = 0;
       finished.value = false;
+      searchForm.value.name = ""
       onLoad();
     };
     // 选择人员
@@ -164,17 +148,21 @@ export default {
   overflow: auto;
   margin: 10px;
 }
+
 .van-button {
   top: -5px;
 }
+
 .search {
   height: 40px;
   line-height: 40px;
 }
+
 .van-list {
   height: 80%;
   margin-top: 5px;
 }
+
 .keyword {
   width: 70%;
   height: 25px;

src/views/placeManage/placePerson/placePerson.vue

@@ -213,6 +213,7 @@ export default {
       router.push({
         path: "/placePersoninfo",
         query: { data: data },
+        
       });
     };
     //进入场所录入页面

src/views/placeManage/placePerson/placePersonAdd.vue

@@ -279,6 +279,7 @@
       </van-cell-group>
       <van-cell-group>
         <van-field
+        
           v-model="placeActivity.nature"
           readonly
           label="宗教组织:"

src/views/placeManage/placePerson/placePersoninfo.vue

@@ -239,6 +239,7 @@
               clearable
               label="教职身份："
               input-align="right"
+              
             />
           </van-row>
         </van-col>

src/views/placeManage/placeRegister/placeRegister.vue

@@ -10,6 +10,7 @@
     <div class="formArea">
       <p class="miniTitle">场所信息</p>
       <van-cell-group>
+        
         <van-field
           v-model="placeActivity.placeData.religiousName"
           readonly

src/views/placeManage/placeRegister/placeRegisterInfo.vue

@@ -39,6 +39,7 @@
                   label="宗教类型:"
                   input-align="right"
                 >
+                
                   <template #input>
                     <span v-if="dataitem.religiousType == 1">伊斯兰教</span>
                     <span v-if="dataitem.religiousType == 2">基督教</span>

src/views/placeManage/placeRegister/placeRegisterList.vue

@@ -111,6 +111,7 @@ export default {
     const loading = ref(false);
     const finished = ref(false);
     const refreshing = ref(false);
+    
     let index = 0;
     const onLoad = () => {
       loading.value = true;

src/views/tab_a/tabAll.vue

@@ -1,380 +1,380 @@
 <template>
-<div class="bg">
-	<!-- <van-nav-bar
+	<div class="bg">
+		<!-- <van-nav-bar
 	  title="智慧“和顺”"
 	  left-text="民宗干事"
 	  left-arrow
 	  @click-left="onClickLeft"
 	/> -->
 
-	<!-- <van-image
+		<!-- <van-image
 		width="100%"
 		height="10rem"
 		fit="cover"
 		src="https://img1.baidu.com/it/u=2086445453,3056906789&fm=253&fmt=auto&app=138&f=GIF?w=1378&h=400"
 		/> -->
 
-	<van-swipe :autoplay="3000"  lazy-render>
-		<van-swipe-item v-for="image in BannerImgurls" :key="image" >
-			<van-image width="100%" height="10rem" fit="cover" :src="image" />
-		</van-swipe-item>
-	</van-swipe>
-
-	<div class="tabtitlelay" @click="goToBeDone">
-		<div class="tabtitle1"></div>
-		<div class="tabtitle">我的待办</div>
-		<div class="tabtitle2">（</div>
-		<div class="tabtitle3">{{sum}}</div>
-		<div class="tabtitle4">）</div>
-		<van-icon name="ellipsis" class="tabtitle5" />
-	</div>
+		<van-swipe :autoplay="3000" lazy-render>
+			<van-swipe-item v-for="image in BannerImgurls" :key="image">
+				<van-image width="100%" height="10rem" fit="cover" :src="image" />
+			</van-swipe-item>
+		</van-swipe>
+
+		<div class="tabtitlelay" @click="goToBeDone">
+			<div class="tabtitle1"></div>
+			<div class="tabtitle">我的待办</div>
+			<div class="tabtitle2">（</div>
+			<div class="tabtitle3">{{ sum }}</div>
+			<div class="tabtitle4">）</div>
+			<van-icon name="ellipsis" class="tabtitle5" />
+		</div>
 
-	<div class="flexll">
-		<div class="ffl2" id="0" @click="goToBeDone($event)">
-			<div class="textRegular" >待处理</div>
-			<div class="textRed">{{sum1?sum1:0}}</div>
+		<div class="flexll">
+			<div class="ffl2" id="0" @click="goToBeDone($event)">
+				<div class="textRegular">待处理</div>
+				<div class="textRed">{{ sum1 ? sum1 : 0 }}</div>
+			</div>
+			<div class="verticalLine"></div>
+			<div class="ffl2" id="1" @click="goToBeDone($event)">
+				<div class="textRegular">已处理</div>
+				<div class="textBlue">{{ sum2 ? sum2 : 0 }}</div>
+			</div>
 		</div>
-		<div class="verticalLine"></div>
-		<div class="ffl2" id="1" @click="goToBeDone($event)">
-			<div class="textRegular" >已处理</div>
-			<div class="textBlue">{{sum2?sum2:0}}</div>
+		<div class="hLine"></div>
+
+		<div class="tabtitlelay">
+			<div class="tabtitle1"></div>
+			<div class="tabtitle">场所管理</div>
 		</div>
-	</div>
-	<div class="hLine"></div>
 
-	<div class="tabtitlelay">
-		<div class="tabtitle1"></div>
-		<div class="tabtitle">场所管理</div>
-	</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>
 
-	<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>
+		<div class="hLine"></div>
 
-	<div class="hLine"></div>
+		<div class="tabtitlelay">
+			<div class="tabtitle1"></div>
+			<div class="tabtitle">{{ testshow }}</div>
+		</div>
 
-	<div class="tabtitlelay">
-		<div class="tabtitle1"></div>
-		<div class="tabtitle">{{testshow}}</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" text="其他" @click="tohd_qt" />
+		</van-grid>
 	</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" text="其他" @click="tohd_qt" />
-	</van-grid>
-</div>
 </template>
 
 <script>
 import tool from "@/tool";
-import  qs  from "qs";
+import qs from "qs";
 import userSets from "@/api/sys/userSets";
 import toBeDone from '@/api/toBeDone/toBeDone';
 import $base from "@/utils/config";
-	export default {
-		data() {
-			return{
-                title:'民宗干事',
-				username:"",
-				sms:"",
-				password:"",
-				password2:"",
-				con1:0,
-				con2:0,
-				testshow:"活动管理",
-				sum:"0",
-				sum1:"0",
-				sum2:"0",
-				BannerImgurls:['https://img1.baidu.com/it/u=2086445453,3056906789&fm=253&fmt=auto&app=138&f=GIF?w=1378&h=400','https://img1.baidu.com/it/u=2086445453,3056906789&fm=253&fmt=auto&app=138&f=GIF?w=1378&h=400']
-			}
+export default {
+	data() {
+		return {
+			title: '民宗干事',
+			username: "",
+			sms: "",
+			password: "",
+			password2: "",
+			con1: 0,
+			con2: 0,
+			testshow: "活动管理",
+			sum: "0",
+			sum1: "0",
+			sum2: "0",
+			BannerImgurls: ['https://img1.baidu.com/it/u=2086445453,3056906789&fm=253&fmt=auto&app=138&f=GIF?w=1378&h=400', 'https://img1.baidu.com/it/u=2086445453,3056906789&fm=253&fmt=auto&app=138&f=GIF?w=1378&h=400']
+		}
+	},
+
+	created() {
+		let id = this.$route.query.id;
+		window.xm.setNavigationBarTitle({ title: '智慧“和顺”' })
+		this.TokenLogin2();
+		this.$dictUtils.refreshDictList();
+	},
+
+	methods: {
+		// 待办跳转
+		goToBeDone(e) {
+			let value = JSON.stringify(e.currentTarget.id)
+			// console.log(e.currentTarget.id);
+			this.$router.push({
+				path: "/toBeDone",
+				query: { "name": value }
+			});
+		},
+		// 场所登记跳转
+		goPlaceRegister() {
+			this.$router.push("/placeRegisterList");
+		},
+		// 人员档案跳转
+		goPlacePerson() {
+			this.$router.push("/placePerson");
+		},
+		// 牌位管理跳转
+		goPlaceTablet() {
+			this.$router.push("/placeTablet");
 		},
+		//待办数据获取
+		dataNumber() {
+			new toBeDone().list().then((res) => {
+				this.sum1 = res.records.length;
+				this.sum = this.sum1 + this.sum2;
+			})
+			new toBeDone().list2().then((res1) => {
+				this.sum2 = res1.records.length;
+				this.sum = this.sum1 + this.sum2;
+
+			})
 
-		created(){
-			let id=this.$route.query.id;
-			// window.xm.setNavigationBarTitle({ title: '智慧“和顺”'})
-			this.TokenLogin2();
 		},
+		onClickLeft() {
+			history.back();
+		},
+		tohd_jc() {
+			//this.onlineXm.xmNavTo("../activityMan\siteInspection\siteInspectionList");
+			this.$router.push("/siteInspectionList");
+		},
+		tohd_af() {
+			this.$router.push("/securityFacilitiesErrList");
+		},
+		tohd_hy() {
+			this.$router.push("/religiousConferenceList");
+		},
+		tohd_qt() {
+			this.$router.push("/nonReligiousInformationList");
+		},
+		// 活动场所
+		placeActivity() {
+			this.$router.push("/placeActivityList")
+		},
+		selfMeetingList() {
+			this.$router.push("/selfMeetingList")
+		},
+		abnormalCrowd() {
+			this.$router.push("/differentbelieversList")
+		},
+		async TokenLogin() {
+			let that = this;
+			//添加PCtoken过期判断，（请求拦截到token过期，会设置PCtoken为空，为空的时候再调用免登功能）
+			if (this.$store.state.pctoken == "" || this.$store.state.pctoken == undefined) {
 
-		methods:{
-			// 待办跳转
-            goToBeDone(e) {
-				let value = JSON.stringify(e.currentTarget.id)
-				// console.log(e.currentTarget.id);
-              this.$router.push({
-				path:"/toBeDone",
-				query:{"name":value}
-			  });
-            },
-			// 场所登记跳转
-			goPlaceRegister() {
-              this.$router.push("/placeRegisterList");
-            },
-			// 人员档案跳转
-			goPlacePerson() {
-              this.$router.push("/placePerson");
-            },
-			// 牌位管理跳转
-			goPlaceTablet(){
-				this.$router.push("/placeTablet");
-			},
-			//待办数据获取
-			dataNumber(){
-				new toBeDone().list().then((res)=>{
-					this.sum1 = res.records.length;
-					this.sum=this.sum1+this.sum2;
-				})
-				new toBeDone().list2().then((res1)=>{
-					this.sum2 = res1.records.length;
-					this.sum=this.sum1+this.sum2;
+				//SDK中 getToken() 方法获取免登token
+				//window.xm.getToken().then(async function(token){//上线取消注释
+				let token = "test";//上线注释
 
-				})
+				const inputForm = qs.stringify({
+					'token': token
+				}, { allowDots: true, arrayFormat: 'indices' })
+				var res = await this.$API.yin.TokenLogin.get(inputForm);
+				//存PCtoken
+				this.$store.commit('setPcToken', res.PcToken);
+				this.$store.commit('setUser', res.account);
 
-			},
-			onClickLeft(){
-				history.back();
-			},
-			tohd_jc(){
-				//this.onlineXm.xmNavTo("../activityMan\siteInspection\siteInspectionList");
-				this.$router.push("/siteInspectionList");
-			},
-			tohd_af(){
-				this.$router.push("/securityFacilitiesErrList");
-			},
-			tohd_hy(){
-				this.$router.push("/religiousConferenceList");
-			},
-			tohd_qt(){
-				this.$router.push("/nonReligiousInformationList");
-			},
-			// 活动场所
-			placeActivity(){
-				this.$router.push("/placeActivityList")
-			},
-			selfMeetingList(){
-				this.$router.push("/selfMeetingList")
-			},
-			abnormalCrowd(){
-				this.$router.push("/differentbelieversList")
-			},
-			async TokenLogin(){
-				let that=this;
-				//添加PCtoken过期判断，（请求拦截到token过期，会设置PCtoken为空，为空的时候再调用免登功能）
-				if(this.$store.state.pctoken==""||this.$store.state.pctoken==undefined){
-
-					//SDK中 getToken() 方法获取免登token
-					//window.xm.getToken().then(async function(token){//上线取消注释
-					let token="test";//上线注释
-
-						const inputForm =qs.stringify({
-						'token': token
-						},  { allowDots: true, arrayFormat: 'indices' })
-						var res = await this.$API.yin.TokenLogin.get(inputForm);
-						//存PCtoken
-						this.$store.commit('setPcToken',res.PcToken);
-						this.$store.commit('setUser',res.account);
-
-					//})//上线取消注释
-
-				}
-
-			},
-
-			TokenLogin2(){
-				let that=this;
-				//添加PCtoken过期判断，（请求拦截到token过期，会设置PCtoken为空，为空的时候再调用免登功能）
-				if(this.$store.state.pctoken==""||this.$store.state.pctoken==undefined){
-
-					//SDK中 getToken() 方法获取免登token
-					// window.xm.getToken().then(async function(token){//上线取消注释
-					let token="test";//上线注释	
-					
+				//})//上线取消注释
 
-					new userSets()
-					.TokenLogin({
-						token: token
-					})
-					.then((res) => {
-						that.$store.commit('setPcToken',res.PcToken);
-						that.$store.commit('setUser',res.account);
-						that.getBannerImg();//获取轮播图
-						that.getSelectColor();//获取主题颜色
-						that.dataNumber();//获取待办事项数
-					});
+			}
+
+		},
+
+		TokenLogin2() {
+			let that = this;
+			//添加PCtoken过期判断，（请求拦截到token过期，会设置PCtoken为空，为空的时候再调用免登功能）
+			if (this.$store.state.pctoken == "" || this.$store.state.pctoken == undefined) {
 
-					// })//上线取消注释
+				//SDK中 getToken() 方法获取免登token
+				window.xm.getToken().then(async function (token) {//上线取消注释
+					// let token = "test";//上线注释	
 
-				}else{
-					that.getBannerImg();//获取轮播图
-					that.getSelectColor();//获取主题颜色
-					that.dataNumber();//获取待办事项数
-				}
 
+					new userSets()
+						.TokenLogin({
+							token: token
+						})
+						.then((res) => {
+							that.$store.commit('setPcToken', res.PcToken);
+							that.$store.commit('setUser', res.account);
+							that.getBannerImg();//获取轮播图
+							that.getSelectColor();//获取主题颜色
+							that.dataNumber();//获取待办事项数
+						});
+
+				})//上线取消注释
+
+			} else {
+				that.getBannerImg();//获取轮播图
+				that.getSelectColor();//获取主题颜色
+				that.dataNumber();//获取待办事项数
+			}
 
-			},
 
-			getStatistics(){
-				let that=this;
-				new userSets()
+		},
+
+		getStatistics() {
+			let that = this;
+			new userSets()
 				.Statistics()
 				.then((res) => {
-					if(res[0].sum!=undefined&&res[0].sum!=null&&res[0].sum!=""){
-						that.sum=res[0].sum;
+					if (res[0].sum != undefined && res[0].sum != null && res[0].sum != "") {
+						that.sum = res[0].sum;
 					}
-					if(res[0].sum1!=undefined&&res[0].sum1!=null&&res[0].sum1!=""){
-						that.sum1=res[0].sum1;
+					if (res[0].sum1 != undefined && res[0].sum1 != null && res[0].sum1 != "") {
+						that.sum1 = res[0].sum1;
 					}
-					if(res[0].sum2!=undefined&&res[0].sum2!=null&&res[0].sum2!=""){
-						that.sum2=res[0].sum2;
+					if (res[0].sum2 != undefined && res[0].sum2 != null && res[0].sum2 != "") {
+						that.sum2 = res[0].sum2;
 					}
 				});
-			},
+		},
 
-			getBannerImg(){
-				new userSets()
+		getBannerImg() {
+			new userSets()
 				.BannerImg({
 					'current': 1,
 					'size': 5,
-					'orders':[],
+					'orders': [],
 				})
 				.then((res) => {
-					let bs=[];
+					let bs = [];
 
 					res.records[0].bannerImg.split("|").forEach((item) => {
 						if (item.trim().length > 0) {
-							bs.push($base + item.replace('程序附件//','程序附件/'),
-						);
+							bs.push($base + item.replace('程序附件//', '程序附件/'),
+							);
 						}
 					});
-					this.BannerImgurls=bs;
+					this.BannerImgurls = bs;
 				});
-			},
+		},
 
-			getSelectColor(){
-				let that=this;
-				new userSets()
+		getSelectColor() {
+			let that = this;
+			new userSets()
 				.SelectColor()
 				.then((res) => {
 					//console.log(res.records[0].selectColor.substring(1, 7));
 					//存PCtoken
-					that.$store.commit('setSelectColor',res.默认);
+					that.$store.commit('setSelectColor', res.默认);
 				});
-			},
+		},
 
 
 
-			//测试接口，可删除
-			async gettest(){
-				let that=this;
+		//测试接口，可删除
+		async gettest() {
+			let that = this;
 
-				//SDK中 getToken() 方法获取免登token
-				// window.xm.getToken().then(function(token){
-				// 	console.log(token);
-
-				// 	that.con1="哈哈"+token;
-				// 	window.xm.showToast({
-				// 		message:that.con1
-				// 	})
-
-				// })
-
-				//测试数据同步接口的
-				const inputForm ={
-					'iamRequestId': '120010',
-					'iamRemoteUser': 'admin12022',
-					'iamRemotePwd': ''
-				}
-				var res = await this.$API.yin.SchemaService.post(inputForm);
-                if (res.type == 1) {
-                    this.$router.replace({
-                        path: "/main",
-                    });
-                } else {
-                    Toast.fail(res.message);
-                }
-
-			},
-
-			//测试接口，可删除
-			async gettest2(){
-				var datas = {
-					username: "admin",
-            	};
-				var res = await this.$API.my.OrderDetails.get(datas);
-				this.con1=res;
-                console.log(res);
-			},
-
-
-			//用户数据同步测试用(用户保存)
-			async gettestUser1(){
-				const inputForm ={
-					'iamRequestId': '120010',
-					'iamRemoteUser': 'admin',
-					'iamRemotePwd': '11',
-					'loginName': 'yzt2',
-					'name': '同步用户2',
-					'password': '111',
-					'idcard': '320911199010000002',
-					'email': '818166662@qq.com',
-					'phone': '88868882',
-					'mobile': '1829999992',
-					'loginFlag': '1',
-					'photo': '',
-					'sign': '个性签名2',
-				  }
-				var res = await this.$API.yin.UserCreateService.post(inputForm);
-                console.log(res);
-			},
-			//(用户更新)
-			async gettestUser2(){
-				const inputForm ={
-					'iamRequestId': '120010',
-					'iamRemoteUser': 'admin',
-					'iamRemotePwd': '11',
-					'uid': '1639158103696228354',
-					'loginName': 'yzt222',
-					'name': '11',
-					// 'password': '',
-					// 'idcard': '',
-					// 'email': '',
-					// 'phone': '',
-					// 'mobile': '',
-					// 'loginFlag': '',
-					// 'photo': '',
-					// 'sign': '',
-				  }
-				var res = await this.$API.yin.UserUpdateService.post(inputForm);
-				console.log(res);
-
-			},
-			//(用户删除)
-			async gettestUser3(){
-				const inputForm ={
-					'iamRequestId': '120010',
-					'iamRemoteUser': 'admin',
-					'iamRemotePwd': '111',
-					'uid': '1639158103696228354',
-				  }
-				var res = await this.$API.yin.UserDeleteService.post(inputForm);
-                console.log(res);
-			},
+			//SDK中 getToken() 方法获取免登token
+			// window.xm.getToken().then(function(token){
+			// 	console.log(token);
+
+			// 	that.con1="哈哈"+token;
+			// 	window.xm.showToast({
+			// 		message:that.con1
+			// 	})
+
+			// })
+
+			//测试数据同步接口的
+			const inputForm = {
+				'iamRequestId': '120010',
+				'iamRemoteUser': 'admin12022',
+				'iamRemotePwd': ''
+			}
+			var res = await this.$API.yin.SchemaService.post(inputForm);
+			if (res.type == 1) {
+				this.$router.replace({
+					path: "/main",
+				});
+			} else {
+				Toast.fail(res.message);
+			}
+
+		},
+
+		//测试接口，可删除
+		async gettest2() {
+			var datas = {
+				username: "admin",
+			};
+			var res = await this.$API.my.OrderDetails.get(datas);
+			this.con1 = res;
+			console.log(res);
+		},
+
+
+		//用户数据同步测试用(用户保存)
+		async gettestUser1() {
+			const inputForm = {
+				'iamRequestId': '120010',
+				'iamRemoteUser': 'admin',
+				'iamRemotePwd': '11',
+				'loginName': 'yzt2',
+				'name': '同步用户2',
+				'password': '111',
+				'idcard': '320911199010000002',
+				'email': '818166662@qq.com',
+				'phone': '88868882',
+				'mobile': '1829999992',
+				'loginFlag': '1',
+				'photo': '',
+				'sign': '个性签名2',
+			}
+			var res = await this.$API.yin.UserCreateService.post(inputForm);
+			console.log(res);
+		},
+		//(用户更新)
+		async gettestUser2() {
+			const inputForm = {
+				'iamRequestId': '120010',
+				'iamRemoteUser': 'admin',
+				'iamRemotePwd': '11',
+				'uid': '1639158103696228354',
+				'loginName': 'yzt222',
+				'name': '11',
+				// 'password': '',
+				// 'idcard': '',
+				// 'email': '',
+				// 'phone': '',
+				// 'mobile': '',
+				// 'loginFlag': '',
+				// 'photo': '',
+				// 'sign': '',
+			}
+			var res = await this.$API.yin.UserUpdateService.post(inputForm);
+			console.log(res);
 
 		},
+		//(用户删除)
+		async gettestUser3() {
+			const inputForm = {
+				'iamRequestId': '120010',
+				'iamRemoteUser': 'admin',
+				'iamRemotePwd': '111',
+				'uid': '1639158103696228354',
+			}
+			var res = await this.$API.yin.UserDeleteService.post(inputForm);
+			console.log(res);
+		},
+
+	},
 
-	};
+};
 </script>
 
 <style>
-.bg{
+.bg {
 	height: 100%;
 	background: #ffffff;
 }
-
 </style>