Browse Source

Squashed commit of the following:

commit a998c1c181187a266260511aec0223c2f6646135
Author: yin_yu820 <895937358@qq.com>
Date:   Wed Mar 29 22:08:45 2023 +0800

    调整
LuChongMei 2 years ago
parent
commit
0e0825b7b3

+ 1 - 1
public/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">	  
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= htmlWebpackPlugin.options.title %></title>
 
     <!--小程序SDK 只有在小程序容器中才能加载到 -->

BIN
public/loginbg/csdj.png


BIN
public/loginbg/cspw.png


BIN
public/loginbg/csry.png


BIN
public/loginbg/hd_af.png


BIN
public/loginbg/hd_cshd.png


BIN
public/loginbg/hd_hy.png


BIN
public/loginbg/hd_jc.png


BIN
public/loginbg/hd_qt.png


BIN
public/loginbg/hd_ssjhd.png


BIN
public/loginbg/hd_xjqz.png


+ 17 - 3
src/api/index.js

@@ -12,6 +12,20 @@ export default  {
         }
     },
     my: {
+        BannerImg : {
+            url:`${config.baseUrl}/banner/bannerImg/list`,
+            name:'轮播图',
+            get : function(params){
+                return http.get(this.url,params)
+            }
+        },
+        SelectColor : {
+            url:`${config.baseUrl}/selectapp/selectColor/list`,
+            name:'主题颜色',
+            get : function(params){
+                return http.get(this.url,params)
+            }
+        },
         OrderList : {
             url:`${config.baseUrl}/Mobile/OrderList`,
             name:'测试',
@@ -35,8 +49,8 @@ export default  {
                 return http.get(this.url,params)
             }
         }
-        
-        
+
+
     },
     yin : {
         TokenLogin : {
@@ -74,7 +88,7 @@ export default  {
                 return http.post(this.url,params)
             }
         }
-        
+
     },
 }
 

+ 10 - 0
src/api/toBeDone/toBeDone.js

@@ -0,0 +1,10 @@
+import request from "@/utils/httpRequest";
+
+export default class toBeDone {
+    list(params) {
+        return request.get(
+            ``,
+            params
+        )
+    }
+}

+ 10 - 0
src/api/user/UserManage.js

@@ -0,0 +1,10 @@
+import request from "@/utils/request";
+
+export default class UserManage {
+    list(params) {
+        return request.get(
+            `/user/usermanagement/userManagement/list`,
+            params
+        )
+    }
+}

+ 3 - 1
src/main.js

@@ -8,7 +8,7 @@ import axios from 'axios';
 
 
 
-import { NavBar, Button, Form, Field, CellGroup, Tabbar, TabbarItem, Icon, Toast, Image as VanImage, Grid, GridItem, Row, Col, Tab, Tabs, Popup, PickerGroup, DatePicker, TimePicker, Picker, Uploader, Dialog, List, Cell, Cascader, Search, RadioGroup, Radio, DropdownMenu, DropdownItem, SwipeCell, Checkbox, CheckboxGroup } from 'vant';
+import { NavBar, Button, Form, Field, CellGroup, Tabbar, TabbarItem, Icon, Toast, Image as VanImage, Grid, GridItem, Row, Col, Tab, Tabs, Popup, PickerGroup, DatePicker, TimePicker, Picker, Uploader, Dialog, List, Cell, Cascader, Search, RadioGroup, Radio, DropdownMenu, DropdownItem, SwipeCell, Checkbox, CheckboxGroup,Swipe, SwipeItem } from 'vant';
 import 'vant/lib/index.css';
 import store from './store';
 
@@ -50,6 +50,8 @@ app.use(router)
     .use(SwipeCell)
     .use(Checkbox)
     .use(CheckboxGroup)
+    .use(Swipe)
+    .use(SwipeItem)
 
 app.config.globalProperties.$API = api
 app.config.globalProperties.$axios = axios

+ 24 - 0
src/router/index.js

@@ -40,6 +40,30 @@ const routes = [{
         meta: {
             isShowTarbar: true,
         }
+    },{
+        path: '/securityFacilitiesErrList',
+        name: 'securityFacilitiesErrList',
+        component: () =>
+            import ('../views/activityMan/securityFacilitiesErr/securityFacilitiesErrList.vue'),
+        meta: {
+            isShowTarbar: true,
+        }
+    },{
+        path: '/religiousConferenceList',
+        name: 'religiousConferenceList',
+        component: () =>
+            import ('../views/activityMan/religiousConference/religiousConferenceList.vue'),
+        meta: {
+            isShowTarbar: true,
+        }
+    },{
+        path: '/nonReligiousInformationList',
+        name: 'nonReligiousInformationList',
+        component: () =>
+            import ('../views/activityMan/nonReligiousInformation/nonReligiousInformationList.vue'),
+        meta: {
+            isShowTarbar: true,
+        }
     },{
         path: '/toBeDone',
         name: 'toBeDone',

+ 7 - 1
src/store/index.js

@@ -1,10 +1,12 @@
 import { createStore } from "vuex";
 const TOKEN_Key="MZ_USER";
 const PCTOKEN_Key="MZ_TOKEN";
+const COLOR_Key="MZ_COLOR";
 const store =createStore({
     state:{
         user:window.localStorage.getItem(TOKEN_Key),
-        pctoken:window.localStorage.getItem(PCTOKEN_Key)
+        pctoken:window.localStorage.getItem(PCTOKEN_Key),
+        selectcolor:window.localStorage.getItem(COLOR_Key)
     },
     mutations:{
         setUser(state,data){
@@ -15,6 +17,10 @@ const store =createStore({
             state.pctoken=data;
             window.localStorage.setItem(PCTOKEN_Key,state.pctoken);
         },
+        setSelectColor(state,data){
+            state.selectcolor=data;
+            window.localStorage.setItem(COLOR_Key,state.selectcolor);
+        },
     },
 });
 export default store;

+ 13 - 0
src/utils/onlineXm.js

@@ -0,0 +1,13 @@
+
+function xmNavTo(to){
+	// xm.navigateTo({
+    //     url: to,
+    //     navibarColor: this.$store.state.selectcolor
+    // })
+
+    console.log(to);
+    console.log(this.$store.state.selectcolor);
+}
+export{
+    xmNavTo
+}

+ 6 - 0
src/views/activityMan/nonReligiousInformation/nonReligiousInformationList.vue

@@ -0,0 +1,6 @@
+<template>
+    <div class="about">
+      <h1>This is an about page</h1>
+    </div>
+  </template>
+  

+ 6 - 0
src/views/activityMan/nonReligiousInformation/nonReligiousInformationView.vue

@@ -0,0 +1,6 @@
+<template>
+    <div class="about">
+      <h1>This is an about page</h1>
+    </div>
+  </template>
+  

+ 6 - 0
src/views/activityMan/religiousConference/religiousConferenceList.vue

@@ -0,0 +1,6 @@
+<template>
+    <div class="about">
+      <h1>This is an about page</h1>
+    </div>
+  </template>
+  

+ 6 - 0
src/views/activityMan/religiousConference/religiousConferenceView.vue

@@ -0,0 +1,6 @@
+<template>
+    <div class="about">
+      <h1>This is an about page</h1>
+    </div>
+  </template>
+  

+ 87 - 0
src/views/activityMan/securityFacilitiesErr/securityFacilitiesErrList.vue

@@ -0,0 +1,87 @@
+<template>
+    <van-nav-bar
+      title="安防设施异常"
+      left-text=""
+      left-arrow
+      @click-left="onClickLeft"
+    />
+    <van-search
+    v-model="value"
+    shape="round"
+    placeholder="请输入搜索关键词"
+  />
+    <van-list
+      v-model:loading="loading"
+      :finished="finished"
+      finished-text="没有更多了"
+    >
+      <van-button type="primary" size="small" to="/placeActivity">新增</van-button>
+      <van-cell v-for="item in list" :key="item" :title="item" label="2222" is-link>
+        <template #value>
+          11111
+        </template>
+      </van-cell>
+    </van-list>
+  </template>
+
+  <script>
+  import  qs  from "qs";
+
+  export default {
+		data() {
+			return{
+        value:"",
+        list:[],
+        loading:false,
+        finished:false,
+        title:'民宗干事',
+				username:"",
+				sms:"",
+				password:"",
+				password2:"",
+				con1:"0",
+        searchForm: {
+            siteName: {
+                id: ''
+            }
+        },
+			}
+		},
+
+		async created(){
+			let aa=qs.stringify({
+            'current': 1,
+            'size': 10,
+            'orders': [],
+            ...this.searchForm
+            },  { allowDots: true, arrayFormat: 'indices' })
+
+			let id=this.$route.query.id;
+
+			var res = await this.$API.activityMan.siteInspectionList.get(aa);
+      console.log(res);
+
+		},
+
+		methods:{
+        onClickLeft(){
+          history.back();
+        },
+      },
+  };
+
+
+
+  </script>
+
+  <style>
+  .van-button {
+    top: -5px;
+  }
+
+  .van-list {
+    height: 80%;
+    margin-top: 5px;
+  }
+
+  </style>

+ 6 - 0
src/views/activityMan/securityFacilitiesErr/securityFacilitiesErrView.vue

@@ -0,0 +1,6 @@
+<template>
+    <div class="about">
+      <h1>This is an about page</h1>
+    </div>
+  </template>
+  

+ 22 - 24
src/views/activityMan/siteInspection/siteInspectionList.vue

@@ -14,7 +14,6 @@
       v-model:loading="loading"
       :finished="finished"
       finished-text="没有更多了"
-      @load="onLoad"
     >
       <van-button type="primary" size="small" to="/placeActivity">新增</van-button>
       <van-cell v-for="item in list" :key="item" :title="item" label="2222" is-link>
@@ -24,25 +23,28 @@
       </van-cell>
     </van-list>
   </template>
-  
+
   <script>
-  import { ref } from "vue";
   import  qs  from "qs";
 
   export default {
 		data() {
 			return{
-                title:'民宗干事',
+        value:"",
+        list:[],
+        loading:false,
+        finished:false,
+        title:'民宗干事',
 				username:"",
 				sms:"",
 				password:"",
 				password2:"",
 				con1:"0",
-                searchForm: {
-                    siteName: {
-                        id: ''
-                    }
-                },
+        searchForm: {
+            siteName: {
+                id: ''
+            }
+        },
 			}
 		},
 
@@ -53,37 +55,33 @@
             'orders': [],
             ...this.searchForm
             },  { allowDots: true, arrayFormat: 'indices' })
-      
-			console.log(aa);
-			let id=this.$route.query.id;
 
-      
+			let id=this.$route.query.id;
 
 			var res = await this.$API.activityMan.siteInspectionList.get(aa);
-            console.log(res);
-
+      console.log(res);
 
 		},
 
 		methods:{
-			onClickLeft(){
-				history.back();
-			},
+        onClickLeft(){
+          history.back();
         },
-    };
+      },
+  };
+
 
 
-  
   </script>
-  
+
   <style>
   .van-button {
     top: -5px;
   }
-  
+
   .van-list {
     height: 80%;
     margin-top: 5px;
   }
-  
-  </style>
+
+  </style>

+ 117 - 84
src/views/placeManage/placePerson.vue

@@ -11,30 +11,44 @@
       <template #action>
         <div @click="onClickButton">
           <van-dropdown-menu>
-            <van-dropdown-item overlay="false" v-model="value1" :options="option1" />
+            <van-dropdown-item
+              overlay="false"
+              v-model="value1"
+              :options="option1"
+            />
           </van-dropdown-menu>
         </div>
       </template>
     </van-search>
   </div>
   <div class="PersonList">
-    <div class="PersonItem" v-for="item in Person.PersonList" :key="item.id" @click="goPlacePersonInfo">
+    <div
+      class="PersonItem"
+      v-for="item in Person.PersonList"
+      :key="item.id"
+      @click="goPlacePersonInfo"
+    >
       <van-row>
         <van-col span="18">
-            <p>{{item.name}}(<span style="color:#36a7f3;">{{item.id}}</span>)</p>
+          <p>
+            {{ item.name }}(<span style="color: #36a7f3">{{ item.idcard }}</span
+            >)
+          </p>
         </van-col>
         <van-col span="6">
-            <p v-if="item.church == '基督教'" style="color:#36a7f3;">基督教</p>
-            <p v-else-if="item.church == '佛教'" style="color:#e4dd65;">佛教</p>
-            <p v-else-if="item.church == '伊斯兰教'" style="color:#52ca7d;">伊斯兰教</p>
+          <p v-if="item.church == '基督教'" style="color: #36a7f3">基督教</p>
+          <p v-else-if="item.church == '佛教'" style="color: #e4dd65">佛教</p>
+          <p v-else-if="item.church == '伊斯兰教'" style="color: #52ca7d">
+            伊斯兰教
+          </p>
         </van-col>
       </van-row>
       <van-row>
         <van-col span="18">
-            <p>{{item.address}}</p>
+          <p>{{ item.nativePlace }}</p>
         </van-col>
         <van-col span="6">
-            <p>{{item.position}}</p>
+          <p>{{ item.position }}</p>
         </van-col>
       </van-row>
     </div>
@@ -42,8 +56,10 @@
 </template>
 
 <script>
-import { reactive,ref } from "vue";
-import { useRouter } from 'vue-router'
+import { reactive, ref } from "vue";
+import { useRouter } from "vue-router";
+import UserManage from "@/api/user/UserManage";
+import { List } from 'vant';
 export default {
   setup() {
     const value = ref("");
@@ -55,49 +71,65 @@ export default {
       { text: "伊斯兰教", value: 3 },
     ];
     const Person = reactive({
-        PersonList:[
-            {
-                name:'孙辉',
-                id:'320902198901523010',
-                church:'基督教',
-                address:'盐都基督教总教',
-                position:'教职人员'
-            },
-            {
-                name:'孙辉',
-                id:'320902198901523010',
-                church:'佛教',
-                address:'盐城永宁寺',
-                position:'教职人员'
-            },
-            {
-                name:'孙辉',
-                id:'320902198901523010',
-                church:'基督教',
-                address:'盐都基督教总教',
-                position:'教职人员'
-            },
-            {
-                name:'孙辉',
-                id:'320902198901523010',
-                church:'基督教',
-                address:'盐都基督教总教',
-                position:'教职人员'
-            },
-            {
-                name:'孙辉',
-                id:'320902198901523010',
-                church:'伊斯兰教',
-                address:'盐都清真寺',
-                position:'教职人员'
-            },
-        ]
-    })
+      PersonList: [
+        {
+          name: "孙辉",
+          id: "320902198901523010",
+          church: "基督教",
+          address: "盐都基督教总教",
+          position: "教职人员",
+        },
+        {
+          name: "孙辉",
+          id: "320902198901523010",
+          church: "佛教",
+          address: "盐城永宁寺",
+          position: "教职人员",
+        },
+        {
+          name: "孙辉",
+          id: "320902198901523010",
+          church: "基督教",
+          address: "盐都基督教总教",
+          position: "教职人员",
+        },
+        {
+          name: "孙辉",
+          id: "320902198901523010",
+          church: "基督教",
+          address: "盐都基督教总教",
+          position: "教职人员",
+        },
+        {
+          name: "孙辉",
+          id: "320902198901523010",
+          church: "伊斯兰教",
+          address: "盐都清真寺",
+          position: "教职人员",
+        },
+      ],
+    });
     //跳转
-    let router = useRouter()
-    const goPlacePersonInfo = ()=>{
-      router.push("/placePersoninfo")
-    }
+    let router = useRouter();
+    const goPlacePersonInfo = () => {
+      router.push("/placePersoninfo");
+    };
+
+    //数据获取
+    let list = ref([])
+    const loading = ref(false);
+    const finished = ref(false);
+    new UserManage()
+      .list({
+        current:  1,
+        size: 10,
+      })
+      .then((res) => {
+        // console.log(res);
+        list.value.push(...res.records)
+        Person.PersonList = list
+      });
+
     //返回
     const goback = () => {
       history.back();
@@ -108,7 +140,9 @@ export default {
       value1,
       option1,
       Person,
-      goPlacePersonInfo
+      loading,
+      finished,
+      goPlacePersonInfo,
     };
   },
 };
@@ -139,48 +173,47 @@ html {
 .PersonList {
   background-color: #fff;
   margin-top: 20px;
-  height: 600px;
-  p{
+  height: 100vh;
+  p {
     margin: 0;
     padding: 0;
   }
-  .PersonItem{
+  .PersonItem {
     padding: 10px 10px;
     font-size: 16px;
     border-bottom: 1px solid #f2f2f2;
-    .van-row{
-        &:nth-child(1){
-            margin-bottom: 10px;
-            .van-col{
-                &:nth-child(1){
-                    p{
-                        font-weight: 700;
-                    }
-                }
-                &:nth-child(2){
-                    p{
-                        text-align: right;
-                    }
-                }
+    .van-row {
+      &:nth-child(1) {
+        margin-bottom: 10px;
+        .van-col {
+          &:nth-child(1) {
+            p {
+              font-weight: 700;
+            }
+          }
+          &:nth-child(2) {
+            p {
+              text-align: right;
             }
+          }
         }
-        &:nth-child(2){
-            .van-col{
-                &:nth-child(1){
-                    p{
-                        color: #d0d0d0;
-                    }
-                }
-                &:nth-child(2){
-                    p{
-                        text-align: right;
-                        color: #d0d0d0;
-                    }
-                }
+      }
+      &:nth-child(2) {
+        .van-col {
+          &:nth-child(1) {
+            p {
+              color: #d0d0d0;
+            }
+          }
+          &:nth-child(2) {
+            p {
+              text-align: right;
+              color: #d0d0d0;
             }
+          }
         }
+      }
     }
   }
-  
 }
 </style>

+ 13 - 1
src/views/placeManage/placePersoninfo.vue

@@ -227,7 +227,19 @@
 </template>
 
 <script>
-export default {};
+import { reactive,ref } from "vue";
+export default {
+  setup(){
+    
+    //返回
+    const goback = () => {
+      history.back();
+    };
+    return{
+      goback
+    }
+  }
+};
 </script>
 
 <style lang="less">

+ 87 - 64
src/views/tab_a/tabAll.vue

@@ -6,12 +6,18 @@
 	  @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">
 		<div class="tabtitle1"></div>
@@ -41,9 +47,9 @@
 	</div>
 
 	<van-grid :border="false">
-		<van-grid-item icon="photo-o" text="场所登记" @click="getsome2" />
-		<van-grid-item icon="photo-o" text="场所人员信息" @click="getsome3" />
-		<van-grid-item icon="photo-o" text="牌位管理" />
+		<van-grid-item icon="../../../loginbg/csdj.png" text="场所登记"  />
+		<van-grid-item icon="../../../loginbg/csry.png" text="场所人员信息"  />
+		<van-grid-item icon="../../../loginbg/cspw.png" text="牌位管理" />
 	</van-grid>
 
 	<div class="hLine"></div>
@@ -54,19 +60,20 @@
 	</div>
 
 	<van-grid :border="false" >
-		<van-grid-item icon="photo-o" to="/placeActivityList" text="场所活动" />
-		<van-grid-item icon="photo-o" to="/selfMeetingList" text="私设聚会点" />
-		<van-grid-item icon="photo-o" to="/abnormalCrowd" text="信教群众异常" />
-		<van-grid-item icon="photo-o" text="场所检查" />
-		<van-grid-item icon="photo-o" text="安防设施异常" />
-		<van-grid-item icon="photo-o" text="负责人会议" />
-		<van-grid-item icon="photo-o" to="/setting" text="其他" />
+		<van-grid-item icon="../../../loginbg/hd_cshd.png" to="/placeActivityList" text="场所活动" />
+		<van-grid-item icon="../../../loginbg/hd_ssjhd.png" to="/selfMeetingList" text="私设聚会点" />
+		<van-grid-item icon="../../../loginbg/hd_xjqz.png" to="/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>
 </template>
 
 <script>
 import tool from "@/tool";
 import  qs  from "qs";
+import onlineXm from "../../utils/onlineXm"
 
 	export default {
 		data() {
@@ -77,15 +84,15 @@ import  qs  from "qs";
 				password:"",
 				password2:"",
 				con1:"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;
-			this.getSome();
 			this.TokenLogin();
-
-
+			this.getBannerImg();//获取轮播图
+			this.getSelectColor();//获取主题颜色
 		},
 
 		methods:{
@@ -96,59 +103,82 @@ import  qs  from "qs";
 			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("/securityFacilitiesErrList");
+			},
 
 			async TokenLogin(){
 
 				let that=this;
 
-				//SDK中 getToken() 方法获取免登token
-				// window.xm.getToken().then(async function(token){
-				// 	console.log(token);
-
-				// 	const inputForm ={
-				// 	'token': token
-				// 	}
-				// 	var res = await this.$API.yin.TokenLogin.get(inputForm);
-
-				// })
-
-
-
 				//添加PCtoken过期判断,(请求拦截到token过期,会设置PCtoken为空,为空的时候再调用免登功能)
 				if(this.$store.state.pctoken==""||this.$store.state.pctoken==undefined){
-					const inputForm =qs.stringify({
-					'token': "ssssssss"
-					},  { allowDots: true, arrayFormat: 'indices' })
-					var res = await this.$API.yin.TokenLogin.get(inputForm);
-					//console.log(res);
-					//存PCtoken
-					this.$store.commit('setPcToken',res.PcToken);
-					this.$store.commit('setUser',res.account);
-				}
 
+					//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);
 
-				//this.$store.commit('setUser',data);
-				// if (res.type == 1) {
-				// 	this.$router.replace({
-				// 		path: "/main",
-				// 	});
-				// } else {
-				// 	Toast.fail(res.message);
-				// }
+					//})//上线取消注释
+
+				}
 
 			},
 
+			//获取轮播图
+			async getBannerImg(){
+				const inputForm =qs.stringify({
+					'current': 1,
+					'size': 5,
+					'orders':[],
+					},  { allowDots: true, arrayFormat: 'indices' })
+				var res = await this.$API.my.BannerImg.get(inputForm);
+				let bs=[];
+				for(let i=0;i<res.records.length;i++){
+					bs.push(res.records[i].bannerImg);
+				}
+				//需添加url拼接
+				//this.BannerImgurls=bs;
+				//console.log(this.BannerImgurls);
+			},
 
-			getSome(){
+			//获取主题颜色
+			async getSelectColor(){
+				const inputForm =qs.stringify({
+					'current': 1,
+					'size': 5,
+					'orders':[],
+					},  { allowDots: true, arrayFormat: 'indices' })
+				var res = await this.$API.my.SelectColor.get(inputForm);
+				//默认取出列表第一条的色值使用,注意轻应用文档中(后面直接跟6位十六进制色值,不需要#)
+				console.log(res.records[0].selectColor.substring(1, 7));
+				//存PCtoken
+				this.$store.commit('setSelectColor',res.records[0].selectColor.substring(1, 7));
 
 
 			},
 
-			async getsome2(){
-
+			//测试接口,可删除
+			async gettest(){
 				let that=this;
-				this.$router.push("/placeRegister");
+
 				//SDK中 getToken() 方法获取免登token
 				window.xm.getToken().then(function(token){
 					console.log(token);
@@ -160,18 +190,13 @@ import  qs  from "qs";
 
 				})
 
+				//测试数据同步接口的
 				const inputForm ={
 					'iamRequestId': '120010',
 					'iamRemoteUser': 'admin12022',
 					'iamRemotePwd': ''
-				  }
-				// login(inputForm).then(({data}) => {
-				// 	this.$store.commit('setUser',data);
-			   	// })
-
-				//var res = await this.$API.yin.TokenLogin.post(inputForm);
+				}
 				var res = await this.$API.yin.SchemaService.post(inputForm);
-
                 if (res.type == 1) {
                     this.$router.replace({
                         path: "/main",
@@ -182,9 +207,8 @@ import  qs  from "qs";
 
 			},
 
-			async getsome3(){
-				console.log("11");
-				this.$router.push("/placePerson");
+			//测试接口,可删除
+			async gettest2(){
 				var datas = {
 					username: "admin",
             	};
@@ -195,7 +219,7 @@ import  qs  from "qs";
 
 
 			//用户数据同步测试用(用户保存)
-			async getUser1(){
+			async gettestUser1(){
 				const inputForm ={
 					'iamRequestId': '120010',
 					'iamRemoteUser': 'admin',
@@ -212,11 +236,10 @@ import  qs  from "qs";
 					'sign': '个性签名2',
 				  }
 				var res = await this.$API.yin.UserCreateService.post(inputForm);
-
                 console.log(res);
 			},
 			//(用户更新)
-			async getUser2(){
+			async gettestUser2(){
 				const inputForm ={
 					'iamRequestId': '120010',
 					'iamRemoteUser': 'admin',
@@ -238,7 +261,7 @@ import  qs  from "qs";
 
 			},
 			//(用户删除)
-			async getUser3(){
+			async gettestUser3(){
 				const inputForm ={
 					'iamRequestId': '120010',
 					'iamRemoteUser': 'admin',
@@ -247,7 +270,6 @@ import  qs  from "qs";
 				  }
 				var res = await this.$API.yin.UserDeleteService.post(inputForm);
                 console.log(res);
-
 			},
 
 		},
@@ -257,4 +279,5 @@ import  qs  from "qs";
 
 <style>
 
+
 </style>