更新

2023-09-08 09:18:12 +08:00 · 2023-09-08 09:17:52 +08:00 · 2023-09-08 09:11:35 +08:00 · 2023-09-08 00:31:40 +00:00
2 changed files with 302 additions and 285 deletions
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content my-bg">
-		<cu-custom class="main-topbar bg-main-oil" @showLists='showLists' :isChange='true'  bgColor="bg-main-oil">
+		<cu-custom class="main-topbar bg-main-oil" @showLists='showLists' :isChange='true' bgColor="bg-main-oil">
 			<block slot="changeChannel">切换</block>
 			<block slot="content">{{'星油云站'}}</block>
 		</cu-custom>
@@ -10,9 +10,10 @@
 				<view class="flex-sub text-center padding-top-lg">
 					<view class="txet-xxs">
 						<text class="text-white">今日收款</text>
-					</view> 
+					</view>
 					<!-- <view class=""  @tap='changess'>butns</view> -->
-					<view class=" text-sl padding padding-top-xs"><text class="text-white">￥{{userAccount.totalMoney|numberFilter}}</text></view>
+					<view class=" text-sl padding padding-top-xs"><text
+							class="text-white">￥{{userAccount.totalMoney|numberFilter}}</text></view>
 				</view>
 			</view>
 		</view>
@@ -24,9 +25,9 @@
 					@tap="routerTo('/packageOrders/pages/orderList/dailyOrder/dailyOrder')">
 					<text>今日收款笔数</text>
 					<view class="padding-sm">
-						<text class="oil-main-color">{{userAccount.totalCount}}</text>
+						<text class="oil-main-color">{{userAccount.totalCount || 0}}</text>
 					</view>
-				<!-- <button class="cu-btn bg-main-oil  text-white text-sm ">
+					<!-- <button class="cu-btn bg-main-oil  text-white text-sm ">
 						查看明细
 					</button> -->
 				</view>
@@ -43,11 +44,15 @@
 		</view>
 		<view class="showMainBox cu-list bg-white margin radius " style='z-index: 0;'>
 			<view class="foldOrExpand" v-if='SiteOliInfo.length>2'>
-				<view class="fold checkF"  v-if='checkForE' @click='showOrNo(false) '>折叠 <image src="../../static/img/zdU.png" mode="" class="showMainBox_item_top_img"></image></view>
-				<view class="Expand checkF" v-if='!checkForE'  @click='showOrNo(true) '>展开 <image src="../../static/img/zdD.png" mode="" class="showMainBox_item_top_img"></image></view>
+				<view class="fold checkF" v-if='checkForE' @click='showOrNo(false) '>折叠 <image
+						src="../../static/img/zdU.png" mode="" class="showMainBox_item_top_img"></image>
+				</view>
+				<view class="Expand checkF" v-if='!checkForE' @click='showOrNo(true) '>展开 <image
+						src="../../static/img/zdD.png" mode="" class="showMainBox_item_top_img"></image>
+				</view>
 			</view>
-			<view class="showMainBox_main" :style="{ height: showHeight}" >
-				<view class="showMainBox_item" v-for='(item,i) in SiteOliInfo' :key='i' v-if='SiteOliInfo.length'>
+			<view v-if='SiteOliInfo.length' class="showMainBox_main" :style="{ height: showHeight}">
+				<view class="showMainBox_item" v-for='(item,i) in SiteOliInfo' :key='i'>
 					<view class="showMainBox_item_left">
 						<view class="showMainBox_item_left_title">{{item.oilProductCode}} 油</view>
 						<view class="showMainBox_item_left_tag">
@@ -55,7 +60,7 @@
 								发改委价: <text class='color-red'>&yen;{{item.marketPrice}} </text>
 							</view>
 							<view class="showMainBox_item_left_tag_money">
-								油站价:	<text class='color-red'>&yen;{{item.sitePrice}}</text>
+								油站价: <text class='color-red'>&yen;{{item.sitePrice}}</text>
 							</view>
 						</view>
 					</view>
@@ -63,36 +68,40 @@
 						<image src="../../static/img/kfrx.png" mode="" class="showMainBox_item_right_img"></image>
 					</view>
 				</view>
-			</view> 
+			</view>
 		</view>
 		<view class="cu-list grid col-3 no-border listBox margin  radius  " style='z-index: 0;'>
 			<view class="cu-item" @tap="routerTo('/pages/station-info/station-info')">
 				<view :class="['cuIcon-' + cuIconList[0].cuIcon, 'text-' + cuIconList[0].color]" class="text-sl">
 					<view class="cu-tag badge" v-if="cuIconList[0].badge != 0">
 						<block v-if="cuIconList[0].badge != 1">
-							{{ cuIconList[0].badge > 99 ? '99+' : cuIconList[0].badge }}</block>
+							{{ cuIconList[0].badge > 99 ? '99+' : cuIconList[0].badge }}
+						</block>
 					</view>
 				</view>
 				<text>{{ cuIconList[0].name }}</text>
 			</view>
-			<view class="cu-item" v-for="(item,index) in menusList" :key="index" @tap="routerTo(item.path)" v-if=' item.name != "星油云站超级管理员"' >
+			<view class="cu-item" v-for="(item,index) in menusList" :key="index" @tap="routerTo(item.path)"
+				v-if=' item.name != "星油云站超级管理员"'>
 				<view :class="['cuIcon-' + item.cuIcon, 'text-' + cuIconList[index+1].color]" class="text-sl">
 					<view class="cu-tag badge" v-if="item.badge != 0">
 						<block v-if="item.badge != 1">{{ item.badge > 99 ? '99+' : item.badge }}</block>
 					</view>
-				</view> 
+				</view>
 				<text>{{ item.name }}</text>
 			</view>
 			<view class="cu-item" @tap="routerTo('/pages/station-price/station-price')">
 				<view :class="['cuIcon-' + cuIconList[1].cuIcon, 'text-' + cuIconList[1].color]" class="text-sl">
 					<view class="cu-tag badge" v-if="cuIconList[1].badge != 0">
 						<block v-if="cuIconList[1].badge != 1">
-							{{ cuIconList[1].badge > 99 ? '99+' : cuIconList[1].badge }}</block>
+							{{ cuIconList[1].badge > 99 ? '99+' : cuIconList[1].badge }}
+						</block>
 					</view>
 				</view>
 				<text>{{ cuIconList[1].name }}</text>
 			</view>
-			<view style="height: 180rpx;display: flex;justify-content: flex-end;" class="cu-item" @tap="routerTo('/pages/escalation/escalation')">
+			<view style="height: 180rpx;display: flex;justify-content: flex-end;" class="cu-item"
+				@tap="routerTo('/pages/escalation/escalation')">
 				<!-- <view :class="['cuIcon-' + cuIconList[2].cuIcon, 'text-' + cuIconList[2].color]" class="text-sl">
 					<view class="cu-tag badge" v-if="cuIconList[2].badge != 0">
 						<block v-if="cuIconList[2].badge != 1">
@@ -113,14 +122,14 @@
 				</view>
 				<text>交易统计</text>
 			</view> -->
-			
-		<!-- 	<view class="cu-item" @tap="scanQr">
+
+			<!-- 	<view class="cu-item" @tap="scanQr">
 				<view class="text-sl cuIcon-scan text-yellow">

 				</view>
 				<text>扫星油云</text>
 			</view> -->
-		<!-- 	<view class="cu-item" @tap="showLists"> 
+			<!-- 	<view class="cu-item" @tap="showLists"> 
 				<view  :class="['cuIcon-' + cuIconList[0].cuIcon, 'text-' + cuIconList[0].color]" class="text-sl">
 					<view class="cu-tag badge"  > 
 					</view>
@@ -129,52 +138,56 @@
 			</view> -->
 			<view class="padding-bottom-xl">
 			</view>
-	</view>
-	<view class="cu-modal" :class="checkList">
-		<view class="cu-dialog">
-			<view class="cu-bar bg-red  justify-end">
-				<view class="content ">
-					{{'选择登录油站'}}
+		</view>
+		<view class="cu-modal" :class="checkList">
+			<view class="cu-dialog">
+				<view class="cu-bar bg-red  justify-end">
+					<view class="content ">
+						{{'选择登录油站'}}
+					</view>
+					<view class="action" @tap="hidecheckList">
+						<text class="cuIcon-close text-white"></text>
+					</view>
 				</view>
-				<view class="action" @tap="hidecheckList">
-					<text class="cuIcon-close text-white"></text>
+				<view class="text-left padding-xl padding-bottom padding-top bg-white">
+					<view class="flex align-center justify-between margin-bottom-sm  " v-for="(list,i) in oliList"
+						:key='list'>
+						<view class=""> {{list.otherSiteName}}</view>
+						<view class="">
+							<view class=" bg-red cu-btn text-white text-center btn-radius-10 text-sm"
+								@tap="checkLists(list)">
+								进入
+							</view>
+						</view>
+					</view>
 				</view>
 			</view>
-			<view class="text-left padding-xl padding-bottom padding-top bg-white">
-				<view class="flex align-center justify-between margin-bottom-sm  " v-for="(list,i) in oliList" :key='list'>
-					<view class=""> {{list.otherSiteName}}</view>
-					<view class="">
-						<view class=" bg-red cu-btn text-white text-center btn-radius-10 text-sm" @tap="checkLists(list)">
-							进入
+		</view>
+		<view class="cu-modal" :class="[checkFirst ? 'show':'']">
+			<view class="cu-dialog">
+				<view class="cu-bar bg-red  justify-end">
+					<view class="content ">
+						{{'选择登录油站'}}
+					</view>
+					<view class="action" @tap="hidecheckList">
+						<text class="cuIcon-close text-white"></text>
+					</view>
+				</view>
+				<view class="text-left padding-xl padding-bottom padding-top bg-white">
+					<view class="flex align-center justify-between margin-bottom-sm  " v-for="(list,i) in oliList"
+						:key='list'>
+						<view class=""> {{list.otherSiteName}}</view>
+						<view class="">
+							<view class=" bg-red cu-btn text-white text-center btn-radius-10 text-sm"
+								@tap="checkLists(list)">
+								进入
+							</view>
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
 	</view>
-	<view class="cu-modal" :class="[checkFirst ? 'show':'']" >
-		<view class="cu-dialog">
-			<view class="cu-bar bg-red  justify-end">
-				<view class="content ">
-					{{'选择登录油站'}}
-				</view>
-				<view class="action" @tap="hidecheckList">
-					<text class="cuIcon-close text-white"></text>
-				</view>
-			</view>
-			<view class="text-left padding-xl padding-bottom padding-top bg-white">
-				<view class="flex align-center justify-between margin-bottom-sm  " v-for="(list,i) in oliList" :key='list'>
-					<view class=""> {{list.otherSiteName}}</view>
-					<view class="">
-						<view class=" bg-red cu-btn text-white text-center btn-radius-10 text-sm" @tap="checkLists(list)">
-							进入
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</view>
 </template>

 <script>
@@ -192,32 +205,32 @@
 			// 	type:Array,
 			// 	default(){}
 			// },
-			checkUser:{
-				type:Boolean,
-				default(){}
+			checkUser: {
+				type: Boolean,
+				default () {}
 			}
-		}, 
+		},
 		data() {
 			return {
-				showHeight:'340rpx',
-				checkForE:false,
-				sitInfo:{},
-				SiteOliInfo:[],
-				accountName:uni.getStorageSync('siteOli'),
-				userAccount:uni.getStorageSync('ueserList'),
-				checkList:'',
-				scanUrl: '', 
-				menusList:uni.getStorageSync('menusChangeList'),
-				oliList:uni.getStorageSync('oliList'),
+				showHeight: '340rpx',
+				checkForE: false,
+				sitInfo: {},
+				SiteOliInfo: [],
+				accountName: uni.getStorageSync('siteOli'),
+				userAccount: uni.getStorageSync('ueserList'),
+				checkList: '',
+				scanUrl: '',
+				menusList: uni.getStorageSync('menusChangeList'),
+				oliList: uni.getStorageSync('oliList'),
 				userMenu: uni.getStorageSync('userMenu'),
-				loginUser: uni.getStorageSync('loginUser'), 
-				checkFirst:uni.getStorageSync('checkFirst'), 
+				loginUser: uni.getStorageSync('loginUser'),
+				checkFirst: uni.getStorageSync('checkFirst'),
 				title: 'Hello',
-				changeChannel:{
-					username:'',
-					channelId:'',
-					unionId:''
-				}, 
+				changeChannel: {
+					username: '',
+					channelId: '',
+					unionId: ''
+				},
 				cuIconList: [{
 						cuIcon: 'location',
 						path: '/pages/station-info/station-info',
@@ -292,12 +305,12 @@

 				]
 			};
-		}, 
+		},
 		onLoad() {
 			//console.log('这里是home')
 			const Menus = uni.getStorageSync('userMenu')
-			this.fistCheck() 
-			
+			this.fistCheck()
+
 		},
 		filters: {
 			numberFilter(value) {
@@ -309,14 +322,14 @@
 				}
 			}
 		},
-		methods: {  
-			showOrNo(type){
+		methods: {
+			showOrNo(type) {
 				this.checkForE = type
 			},
-			markerPhone(){
+			markerPhone() {
 				if (this.sitInfo.phone) {
 					uni.makePhoneCall({
-						phoneNumber:'4008-56-5355'
+						phoneNumber: '4008-56-5355'
 					})
 				} else {
 					uni.showToast({
@@ -325,196 +338,179 @@
 					});
 				}
 			},
-			changess(){
-				oliUserApi.initCouldUser().then(res=>{
+			changess() {
+				oliUserApi.initCouldUser().then(res => {
 					//console.log(res)
 				})
 			},
-			changeMenuList(data){ //这里是切换处 更新权限menus处
-				const Menus =data
-				console.log(data,'1111111111111111111111111111111111111111')
-				console.log('这里是接收menus处',Menus)
+			changeMenuList(data) { //这里是切换处 更新权限menus处
+				const Menus = data
 				let menusList = []
-				Menus.forEach((item,index,Menus)=>{
-					if(item.roleName != 'ROOT' ){
-						// this.Splicing(item)
+				Menus.forEach((item, index, Menus) => {
+					if (item.roleName != 'ROOT') {
 						menusList.push(this.Splicing(item)) //根据menus做处理
 					}
-				}) 
-				uni.setStorageSync('menusChangeList',menusList) 
-				this.menusList =uni.getStorageSync('menusChangeList')
-				
-				// this.$emit('changMenus',menusList)
-				//console.log('这里是切换处',menusList)
+				})
+				uni.setStorageSync('menusChangeList', menusList)
+				this.menusList = uni.getStorageSync('menusChangeList')
 			},
-			Splicing(list){
+			Splicing(list) {
 				let obj = {
 					cuIcon: '',
 					path: '',
 					color: '',
 					badge: 0,
-					name:''
+					name: ''
 				}
-				if(list.roleName == '扫码加油'){
+				if (list.roleName == '扫码加油') {
 					obj.cuIcon = 'scan',
-					obj.path= '/pages/station-info/scan-camera/scan-camera',
-					obj.color= 'olive',
-					obj.badge= 0,
-					obj.name=list.roleName
-				}else if(list.roleName == '经营分析'){
+						obj.path = '/pages/station-info/scan-camera/scan-camera',
+						obj.color = 'olive',
+						obj.badge = 0,
+						obj.name = list.roleName
+				} else if (list.roleName == '经营分析') {
 					obj.cuIcon = 'new',
-					obj.path= '',
-					obj.color= 'orange',
-					obj.badge= 0,
-					obj.name=list.roleName
-				}else if(list.roleName == '加油订单'){
+						obj.path = '',
+						obj.color = 'orange',
+						obj.badge = 0,
+						obj.name = list.roleName
+				} else if (list.roleName == '加油订单') {
 					obj.cuIcon = 'form',
-					obj.path= '/packageOrders/pages/orderList/orderList',
-					obj.color= 'yellow',
-					obj.badge= 0,
-					obj.name=list.roleName
-				}else if(list.roleName == '油站二维码'){
+						obj.path = '/packageOrders/pages/orderList/orderList',
+						obj.color = 'yellow',
+						obj.badge = 0,
+						obj.name = list.roleName
+				} else if (list.roleName == '油站二维码') {
 					obj.cuIcon = 'qr_code',
-					obj.path= '/packageQr/pages/qrsite/QrCode_xy',
-					obj.color= 'cyan',
-					obj.badge= 0,
-					obj.name=list.roleName
-				}else if(list.roleName == '员工管理'){
+						obj.path = '/packageQr/pages/qrsite/QrCode_xy',
+						obj.color = 'cyan',
+						obj.badge = 0,
+						obj.name = list.roleName
+				} else if (list.roleName == '员工管理') {
 					obj.cuIcon = 'expressman',
-					obj.path= '/packageStaff/pages/staff/List/List',
-					obj.color= 'mauve',
-					obj.badge= 0,
-					obj.name=list.roleName
-				}else if(list.roleName == '油站信息'){
+						obj.path = '/packageStaff/pages/staff/List/List',
+						obj.color = 'mauve',
+						obj.badge = 0,
+						obj.name = list.roleName
+				} else if (list.roleName == '油站信息') {
 					obj.cuIcon = 'punch',
-					obj.path= '/packageQr/pages/partnership/partnership',
-					obj.color= 'blue',
-					obj.badge= 0,
-					obj.name=list.roleName
-				}else if(list.roleName == '交易统计'){
+						obj.path = '/packageQr/pages/partnership/partnership',
+						obj.color = 'blue',
+						obj.badge = 0,
+						obj.name = list.roleName
+				} else if (list.roleName == '交易统计') {
 					obj.cuIcon = 'punch',
-					obj.path= '/pages/TransactionStatistics/TransactionStatistics',
-					obj.color= 'blue',
-					obj.badge= 0,
-					obj.name=list.roleName
-				}else if(list.roleName == '星油云站超级管理员'){
+						obj.path = '/pages/TransactionStatistics/TransactionStatistics',
+						obj.color = 'blue',
+						obj.badge = 0,
+						obj.name = list.roleName
+				} else if (list.roleName == '星油云站超级管理员') {
 					obj.cuIcon = 'punch',
-					obj.path= ' ',
-					obj.color= 'blue',
-					obj.badge= 0,
-					obj.name=list.roleName
+						obj.path = ' ',
+						obj.color = 'blue',
+						obj.badge = 0,
+						obj.name = list.roleName
 				}
 				return obj
 			},
-			checkInfo(){
+			checkInfo() {
 				let id = uni.getStorageSync('channelId')
-				if(id){
+				if (id) {
 					this.getUserInfo(id)
 					//console.log(this.menusList)
 					this.getSiteInfo(id)
-				} 
+				}
 			},
 			// 获取油站信息
 			getSiteInfo(channelId) {
-				console.log('获取油站信息')
 				oliSiteApi.getSiteDetail(channelId).then(res => {
 					// //console.log(res)
 					if (res.code === 20000) {
 						console.log(res.data.oil)
-						this.sitInfo=  res.data.site
+						this.sitInfo = res.data.site
 						this.SiteOliInfo = res.data.oil
-						if(res.data.oil.length <3){
+						if (res.data.oil.length < 3) {
 							this.showHeight = ' auto'
-						}else{	
+						} else {
 							this.showHeight = '340rpx'
 						}
-						uni.setStorageSync('oilSitePriceId',res.data.site.id)
-						uni.setStorageSync('oilSitePriceName',res.data.site.siteName)
+						uni.setStorageSync('oilSitePriceId', res.data.site.id)
+						uni.setStorageSync('oilSitePriceName', res.data.site.siteName)
 					}
 				})
 			},
-			hidecheckList(){
-				//console.log('')
+			hidecheckList() {
 				this.checkList = ''
 				this.checkFirst = false
-			}, 
-			checkLists(items){
-				// //console.log(items)
+			},
+			checkLists(items) {
 				let id = items.channelId
 				this.changeChannel.channelId = items.channelId
 				this.changeChannel.unionId = uni.getStorageSync('unionId')
 				this.changeChannel.username = this.loginUser.userPhone
-				uni.setStorageSync('channelId',items.channelId)  
-				oilIdentityApi.changeChannelLogin(this.changeChannel).then((res)=>{
-					// //console.log(res)
-					if(res.code == 20000){
-						uni.setStorageSync('siteOli',items.otherSiteName)  
+				uni.setStorageSync('channelId', items.channelId)
+				oilIdentityApi.changeChannelLogin(this.changeChannel).then((res) => {
+					if (res.code == 20000) {
+						uni.setStorageSync('siteOli', items.otherSiteName)
 						this.accountName = items.otherSiteName
 						this.checkList = ''
 						this.checkFirst = false
-						uni.setStorageSync('checkFirst',false)
-						uni.setStorageSync('Authorization',res.data.authTokenDTO.accessToken)	  
-						this.checkForE =false
+						uni.setStorageSync('checkFirst', false)
+						uni.setStorageSync('Authorization', res.data.authTokenDTO.accessToken)
+						this.checkForE = false
 						uni.setStorageSync('userMenu', res.data.authTokenDTO.loginUser.roleMenus)
 						uni.setStorageSync('loginUser', {
 							id: res.data.authTokenDTO.loginUser.id,
 							name: res.data.authTokenDTO.loginUser.name,
 							userPhone: res.data.authTokenDTO.loginUser.userPhone
 						})
-						//console.log(res.data.authTokenDTO.loginUser.channelId)
 						this.getSiteInfo(res.data.authTokenDTO.loginUser.channelId)
 						this.getUserInfo(id)
 						this.changeMenuList(res.data.authTokenDTO.loginUser.roleMenus)
-					}else if(res.code == 40000){
+					} else if (res.code == 40000) {
 						uni.navigateTo({
-							url:'/pages/login/boforeLogin/boforeLogin'
+							url: '/pages/login/boforeLogin/boforeLogin'
 						})
 					}
 				})
-			}, 
+			},
 			//获取油站基本资料
 			getUserInfo(id) {
-				console.log('获取油站基本资料')
 				// 获取云站当前登录用户的基础资料
 				oliSiteApi.getSiteBasicData(id).then(res => {
-					//console.log('用户资料', res) 
 					uni.stopPullDownRefresh();
 					if (res.code === 20000) {
-						uni.setStorageSync('ueserList',res.data)
+						uni.setStorageSync('ueserList', res.data)
 						this.userAccount = res.data
 					}
 				})
-			}, 
-			showLists(){
-				let phoneNumber = this.loginUser.userPhone ,
-					_that =this
-				oliUserApi.getByPhone(phoneNumber).then((res)=>{ 
-					//console.log('调用')
-					//console.log('这里是切换',res)
-					
-					if(res.code == 20000){
-						//console.log(res.data.length)
-						if(res.data.length < 2){
+			},
+			showLists() {
+				if (!this.checkLogin()) return
+				let phoneNumber = this.loginUser.userPhone,
+					_that = this
+				oliUserApi.getByPhone(phoneNumber).then((res) => {
+					if (res.code == 20000) {
+						if (res.data.length < 2) {
 							uni.showToast({
-								title:'当前只有一个油站，不可切换',
-								icon:'none'
+								title: '当前只有一个油站，不可切换',
+								icon: 'none'
 							})
 							return
-						} 
+						}
 						_that.checkList = 'show'
 						_that.oliList = res.data
 						_that.changeChannel.username = _that.loginUser.userPhone
 						_that.changeChannel.unionId = uni.getStorageSync('unionId')
-						
-					}else{
+
+					} else {
 						uni.showToast({
-							title:'请求失败,请稍后再试',
-							icon:'none'
+							title: '请求失败,请稍后再试',
+							icon: 'none'
 						})
 					}
-				
+
 				})
-				//console.log(this.loginUser)
 			},
 			scanQr() {
 				var scanUrl
@@ -542,13 +538,30 @@
 			// 		}
 			// 	})
 			// },
+			checkLogin() {
+				const token = uni.getStorageSync('Authorization')
+				if (!token) {
+					uni.showModal({
+						content: '您还没有登录哦',
+						confirmText: '前往登录',
+						success: res => {
+							if (res.confirm) {
+								uni.reLaunch({
+									url: '/pages/login/boforeLogin/boforeLogin'
+								})
+							}
+						}
+					})
+					return false
+				}
+				return true
+			},
 			routerTo(url, name) {
-				//console.log(url,name)
-				console.log(url)
-				if(url == ''){
+				if (!this.checkLogin()) return
+				if (url == '') {
 					uni.showToast({
-						title:'暂时无法使用...',
-						icon:'none'
+						title: '暂时无法使用...',
+						icon: 'none'
 					})
 					return
 				}
@@ -562,72 +575,79 @@
 				}

 			}
-		}
-		,onShow() {
+		},
+		onShow() {
 			//console.log('这里是show') 
 		},
-		watch:{
-			checkForE(newValue,oldValue){
+		watch: {
+			checkForE(newValue, oldValue) {
 				console.log(newValue)
 				console.log(oldValue)
-				if(newValue && this.SiteOliInfo.length>2){
+				if (newValue && this.SiteOliInfo.length > 2) {
 					this.showHeight = ' auto'
-				}else if(!newValue && this.SiteOliInfo.length>2){
+				} else if (!newValue && this.SiteOliInfo.length > 2) {
 					this.showHeight = '340rpx'
-				}else if (this.SiteOliInfo.length==2 || this.SiteOliInfo.length<2  ){
+				} else if (this.SiteOliInfo.length == 2 || this.SiteOliInfo.length < 2) {
 					this.showHeight = ' auto'
 				}
-			
+
 			}
 		},
-		created(){
+		created() {
 			// 此页面onshow无法执行生命周期需要,需要走created
 			//console.log('这里是created')
 			//console.log(this.menusList)
 			this.checkInfo()
-			
-		} 
-			
+
+		}
+
 	};
 </script>

 <style scoped>
-	.showMainBox_main{
+	.showMainBox_main {
 		width: 100%;
 	}
-	.showMainBox_item_top_img{
-		    width: 40rpx;
-		    height: 40rpx;
-		    margin-left: 2%;
-		 
+
+	.showMainBox_item_top_img {
+		width: 40rpx;
+		height: 40rpx;
+		margin-left: 2%;
+
 	}
-	.foldOrExpand{
+
+	.foldOrExpand {
 		width: 100%;
-		    padding: 2% 3%;
-			    border-bottom: 1px solid #eeee;
+		padding: 2% 3%;
+		border-bottom: 1px solid #eeee;
 	}
-	.foldOrExpand .checkF{
-		    display: flex;
-		    justify-content: flex-end;
-		    align-items: center;
-			transition: all linear .3s;
+
+	.foldOrExpand .checkF {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		transition: all linear .3s;
 	}
-	.color-red{
+
+	.color-red {
 		color: #f70e0e;
 		font-weight: 700;
 		font-size: 35rpx;
 		margin-left: 3%;
 	}
-	.showMainBox_item_right_img{
+
+	.showMainBox_item_right_img {
 		width: 70rpx;
 		height: 70rpx;
 	}
-	.showMainBox_item_left_tag_money{
+
+	.showMainBox_item_left_tag_money {
 		font-size: 25rpx;
-		    width: 47%;
-		 
+		width: 47%;
+
 	}
-	.showMainBox_item{
+
+	.showMainBox_item {
 		display: flex;
 		justify-content: space-between;
 		align-items: flex-end;
@@ -636,19 +656,22 @@
 		box-sizing: border-box;
 		border-bottom: 2rpx solid #eee;
 	}
-	.showMainBox_item_left_tag{
+
+	.showMainBox_item_left_tag {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 		width: 90%;
-		margin-top:2%;
+		margin-top: 2%;
 	}
-	.showMainBox_item_left_title{
-		    color: #333;
-		    font-size:36rpx;
-		  
+
+	.showMainBox_item_left_title {
+		color: #333;
+		font-size: 36rpx;
+
 	}
-	.showMainBox_item_left{
+
+	.showMainBox_item_left {
 		display: flex;
 		justify-content: flex-start;
 		align-items: flex-start;
@@ -656,20 +679,24 @@
 		width: 90%;
 		flex: 0 0 auto;
 	}
-	.showMainBox{
+
+	.showMainBox {
 		display: flex;
 		flex-direction: column;
 		justify-content: flex-start;
 		align-items: flex-start;
 	}
+
 	.content {
 		height: 100%;
 	}
-	.listBox{
+
+	.listBox {
 		display: flex;
 		justify-content: flex-start;
 		align-items: center;
 	}
+
 	.bottom-bar {
 		position: relative;
 		padding-top: 50px;
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -64,75 +64,73 @@
 			})
 		},
 		onShow() {
-			// uni.showToast({
-			// 	title:'这里是show'
-			// })
-			//console.log('这里是indexonshow')
 			uni.setStorageSync('orderType',null)
 			// uni.preloadPage({url: "/pages/station-info/scan-camera/scan-camera"});
 			const token = uni.getStorageSync('Authorization')
 			const openid = uni.getStorageSync('device')
-			// //console.log('++++++++++++')
-			// //console.log(token)
-			// //console.log(openid)
-			// //console.log('++++++++++++')
 			if (token && openid) {
 				// this.getUserInfo()
 				// this.getSiteInfo()
 			} else {
-				uni.showToast({
-					title: '您还没有登录哦',
-					icon: "none"
-				})
-				setTimeout(function() {
-					uni.reLaunch({
-						url: '/pages/login/boforeLogin/boforeLogin',
-						success: () => {
-							//console.log('跳转成功')
-						},
-						fail: (err) => {
-							//console.log(err)
-						}
-					})
-				}, 1500);
+				// uni.showToast({
+				// 	title: '您还没有登录哦',
+				// 	icon: "none"
+				// })
+				// setTimeout(function() {
+				// 	uni.reLaunch({
+				// 		url: '/pages/login/boforeLogin/boforeLogin',
+				// 		success: () => {
+				// 			//console.log('跳转成功')
+				// 		},
+				// 		fail: (err) => {
+				// 			//console.log(err)
+				// 		}
+				// 	})
+				// }, 1500);

 			}
 		},
 		onLoad() {
-			// uni.showToast({
-			// 	title:'这里是onLoad'
-			// })
-			// uni.navigateTo({
-			// 	url:'/pages/stationDetail/ZYSite'
-			// })
+			const token = uni.getStorageSync('Authorization')
+			if(!token) return 
 			let _that =this
 			const Menus = uni.getStorageSync('userMenu')
-			//console.log('这里是接收menus处',Menus)
 			let menusList = []
 			Menus.forEach((item,index,Menus)=>{
 				if(item.roleName != 'ROOT' ){
-					// this.Splicing(item)
 					menusList.push(this.Splicing(item))
 				}
 			}) 
-			//console.log('这里是menusLisPush',menusList)
-			// uni.setStorageSync('menusLists',menusList)
 			let check = uni.getStorageSync('checkFirst') 
-			//console.log(check)
 			if(check){
 				 _that.checkUser = true
 			}
 			uni.setStorageSync('menusChangeList',menusList)
 			this.menusList = menusList
-			//console.log('这里是menusfor循环完成处',this.menusList)
-			// this.getUserInfo() 
 			this.longiCheck()
-			// //console.log('++++++++')
-			//console.log('这里是传值处menus',this.menusList)
 			this.getPosition()
 		},
 		methods: {
+			checkLogin() {
+				const token = uni.getStorageSync('Authorization')
+				if (!token) {
+					uni.showModal({
+						content: '您还没有登录哦',
+						confirmText: '前往登录',
+						success: res => {
+							if (res.confirm) {
+								uni.reLaunch({
+									url: '/pages/login/boforeLogin/boforeLogin'
+								})
+							}
+						}
+					})
+					return false
+				}
+				return true
+			},
 			getPosition(){
+				console.log('getPositiongetPositiongetPositiongetPosition')
 				let that = this
 				uni.getLocation({
 					type: 'gcj02',
@@ -145,15 +143,12 @@
 				});
 			},
 			changMenus(data){
-				//console.log('这里是获取子级数据的地方+++++',data)
 				this.menusList =data
 			},
 			longiCheck(){
 				let userInfo = uni.getStorageSync('loginUser'),
 				_that =this
-				//console.log(userInfo)
 				oliUserApi.getByPhone(userInfo.userPhone).then((res)=>{
-					//console.log('调用')
 					if(res.code == 20000){
 						_that.checkList = 'show'
 						_that.oliList = res.data
@@ -251,6 +246,7 @@

 			// },
 			NavChange: function(e) {
+				if(!this.checkLogin()) return
 				this.PageCur = e.currentTarget.dataset.cur
 				if (this.PageCur == "scan") {
 					this.scanQr()
@@ -261,21 +257,15 @@
 				var scanUrl
 				let _that = this
 				this.menusList.forEach((item, index) => {
-					//console.log('1')
-					//console.log(index)
-					//console.log(_that.userMenu)
-					//console.log(item.name)
-					//console.log('2')
 					if (item.name === '扫码加油') {
-						// scanUrl = item.path
 						scanUrl = '/pages/station-info/scan-camera/scan-camera'
 						uni.navigateTo({
 							url: scanUrl,
 							fail: (err) => {
-								// //console.log(err)
+		
 							},
 							success: (res) => {
-								// //console.log('chengg', res)
+		
 							}
 						})
 					}
Author	SHA1	Message	Date
xiaozhiyong	036b09f772	更新	2023-09-08 09:18:12 +08:00
xiaozhiyong	db756b317b	更新	2023-09-08 09:17:52 +08:00
xiaozhiyong	1f3346e209	更新	2023-09-08 09:11:35 +08:00
zhangyouji	075e37929e	Merge pull request 'zyj' (#6 ) from zyj into master Reviewed-on: #6	2023-09-08 00:31:40 +00:00