Merge branch 'master' of http://121.196.213.68:3000/caoliancun/LSM_OIL_SITE_zhongping into caolc

api/oli-user.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-const service_name ='oil-user'
+const service_name ='xkhl-user'
 const group_name ='oilCustomerChannelRelation'
 const change_phone ='sysCustomerInfo'
 export default{

packageSecurity/setPassword/setPassword.vue

@@ -53,6 +53,8 @@
 				frozen: false, // 验证码冷却时间
 				auth: {},
 				verifyCodeToken:'',
+        pwd:"",
+        authpwd:"",
 				loginUser: uni.getStorageSync('loginUser')
 			}
 		},

pages/index/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page-content " :class="(PageCur=='home'||PageCur=='scan')?'my-bg':''">
 		<!-- <uni-nav-bar left-icon="back" left-text="返回" right-text="菜单" title="导航栏组件"></uni-nav-bar> -->
-		<home ref='homecheck' v-if="PageCur=='home'||PageCur=='scan'" :user-account="userAccount"  @changMenus='changMenus' :site="userAccount" :menusList = 'menusList' :checkUser = 'checkUser'></home>
+		<home ref='homecheck' v-if="PageCur==='home'||PageCur==='scan'" :user-account="userAccount"  @changMenus='changMenus' :site="userAccount" :menusList = 'menusList' :checkUser = 'checkUser'></home>
 		<setup v-if="PageCur=='setup'"></setup>
 		<view class="bottom-view">
 			<view class="padding-top radius shadow bottom-bar-fixed">
@@ -134,23 +134,23 @@
 				this.menusList =data
 			},
 			longiCheck(){
-				let userInfo = uni.getStorageSync('loginUser'),
+				let userInfo = uni.getStorageSync('loginUser')
-				_that =this
+				const _that = this
 				//console.log(userInfo)
 				oliUserApi.getByPhone(userInfo.userPhone).then((res)=>{
 					//console.log('调用')
 					if(res.code == 20000){
-						_that.checkList = 'show'
             _that.oliList = res.data
+            _that.checkList = 'show'
 						_that.changeChannel.username = _that.loginUser.userPhone
 						_that.changeChannel.unionId = uni.getStorageSync('unionId')
+            this.$refs.homecheck.oliList = res.data
 					}else{
 						uni.showToast({
 							title:'请求失败,请稍后再试',
 							icon:'none'
 						})
 					}
-				
 				})
 			},
 			Splicing(list){