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

api/oli-user.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
-const service_name ='oil-user'
-const group_name ='oilCustomerChannelRelation' 
+const service_name ='xkhl-user'
+const group_name ='oilCustomerChannelRelation'
 const change_phone ='sysCustomerInfo'
 export default{
 	//根据用户手机查询油站
@@ -91,7 +91,7 @@ export default{
 	initCouldUser(){
 		 return request({
 		   url: `/${service_name}/sysCustomerInfo/initCouldUser/initCouldUser`,
-		   method: 'GET' 
+		   method: 'GET'
 		})
 	},
-}
+}

packageSecurity/setPassword/setPassword.vue

@@ -52,7 +52,9 @@
 				tips: '发送验证码',
 				frozen: false, // 验证码冷却时间
 				auth: {},
-				verifyCodeToken:'', 
+				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">
@@ -11,7 +11,7 @@
 						<text :class="PageCur=='home'?'text-blue':'text-gray'">
 							加油站
 						</text>
-					</view> 
+					</view>
 					<view class="action text-gray add-action" @tap="NavChange" data-cur="scan">
 						<button class="cu-btn cuIcon-scan sl shadow" :class="PageCur=='scan'?'bg-main-oil':'bg-gradual-orange'"></button>
 						<text :class="PageCur=='scan'?'text-blue':'text-gray'">
@@ -30,11 +30,11 @@
 	</view>
 </template>
 
-<script> 
+<script>
 	import cloudSiteApi from '@/api/cloud-site.js'
 	import oliSiteApi from '@/api/oli-site.js'
 	import oliUserApi from '@/api/oli-user.js'
-	export default { 
+	export default {
 		data() {
 			return {
 				checkUser:false,
@@ -48,7 +48,7 @@
 					totalCount: 0,
 					totalMoney: 0.00
 				},
-				loginUser: uni.getStorageSync('loginUser'), 
+				loginUser: uni.getStorageSync('loginUser'),
 				channelId:uni.getStorageSync('channelId'),
 				menusList:[],
 				site: {},
@@ -62,10 +62,10 @@
 				url: '../../packageOrders/pages/printTicket/printTicket'
 			})
 		},
-		onShow() { 
+		onShow() {
 			const token = uni.getStorageSync('Authorization')
-			const openid = uni.getStorageSync('device') 
-			if (token && openid) { 
+			const openid = uni.getStorageSync('device')
+			if (token && openid) {
 			} else {
 				uni.showToast({
 					title: '您还没有登录哦',
@@ -74,9 +74,9 @@
 				setTimeout(function() {
 					uni.reLaunch({
 						url: '/pages/login/boforeLogin/boforeLogin',
-						success: () => { 
+						success: () => {
 						},
-						fail: (err) => { 
+						fail: (err) => {
 						}
 					})
 				}, 1500);
@@ -99,10 +99,10 @@
 					// this.Splicing(item)
 					menusList.push(this.Splicing(item))
 				}
-			}) 
+			})
 			//console.log('这里是menusLisPush',menusList)
 			// uni.setStorageSync('menusLists',menusList)
-			let check = uni.getStorageSync('checkFirst') 
+			let check = uni.getStorageSync('checkFirst')
 			//console.log(check)
 			if(check){
 				 _that.checkUser = true
@@ -110,7 +110,7 @@
 			uni.setStorageSync('menusChangeList',menusList)
 			this.menusList = menusList
 			//console.log('这里是menusfor循环完成处',this.menusList)
-			// this.getUserInfo() 
+			// this.getUserInfo()
 			this.longiCheck()
 			// //console.log('++++++++')
 			//console.log('这里是传值处menus',this.menusList)
@@ -134,26 +134,26 @@
 				this.menusList =data
 			},
 			longiCheck(){
-				let userInfo = uni.getStorageSync('loginUser'),
-				_that =this
+				let userInfo = uni.getStorageSync('loginUser')
+				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.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){ 
+			Splicing(list){
 				let obj = {
 					cuIcon: '',
 					path: '',
@@ -226,7 +226,7 @@
 			// getUserInfo() {
 			// 	// 获取云站当前登录用户的基础资料
 			// 	oliSiteApi.getSiteBasicData(this.channelId).then(res => {
-			// 		//console.log('用户资料', res) 
+			// 		//console.log('用户资料', res)
 			// 		uni.stopPullDownRefresh();
 			// 		if (res.code === 20000) {
 			// 			uni.setStorageSync('ueserList',res.data)