1004749546@qq.com 4 lat temu
rodzic
commit
3b38eea94d
1 zmienionych plików z 24 dodań i 25 usunięć
  1. 24 25
      pages/index/index.vue

+ 24 - 25
pages/index/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<!-- 顶部导航 -->
-		<uni-nav-bar :border="false" @clickLeft="toOtherWX" background-color="#fff" title="智能快洗" :status-bar="true" :fixed="true"
+		<uni-nav-bar :border="false" @clickLeft="toUserCenter" background-color="#fff" title="智能快洗" :status-bar="true" :fixed="true"
 		 color="rgb(255,0,0)">
 			<view style="padding-left: 20rpx;" slot="left">
 				<u-image width="40rpx" height="60rpx" mode="aspectFit" src="/static/img/person.png"></u-image>
@@ -9,7 +9,7 @@
 		</uni-nav-bar>
 		<!-- 页面主体 -->
 		<view class="pageContent">
-			<map id="map" :latitude="lat" :longitude="lng" scale="10" show-compass :markers="markers" @markertap="toOtherWX"
+			<map id="map" :latitude="lat" :longitude="lng" scale="10" show-compass :markers="markers" @markertap="markertap"
 			 show-location style="width: 100%; height:100%;">
 				<!-- 信息提示 -->
 				<cover-view class="work-message" v-if="workStatus=='show'" @click="toWork">
@@ -21,11 +21,11 @@
 				<!-- 左边控件 -->
 				<view class="cover-view">
 					<view class="flex-wrp">
-						<cover-view @click="toOtherWX" class="flex-item">
+						<cover-view @click="intoList" class="flex-item">
 							<cover-image class="img" src="/static/img/index-list.png"></cover-image>
 							<cover-view>网点列表</cover-view>
 						</cover-view>
-						<cover-view @click="toOtherWX" class="flex-item">
+						<cover-view @click="openPop" class="flex-item">
 							<cover-image class="img" src="/static/img/index-call.png"></cover-image>
 							<cover-view>联系客服</cover-view>
 						</cover-view>
@@ -40,7 +40,7 @@
 					<cover-image class="img" @click="moveToLocation" src="/static/img/location.png"></cover-image>
 				</view>
 				<view class="cover-bottom">
-					<button @click="toOtherWX" type="warn">
+					<button @click="scanCode" type="warn">
 						<u-icon name="scan" color="#fff" size="38"></u-icon>
 						扫码洗车
 					</button>
@@ -291,26 +291,25 @@
 			},
 			// 进入个人中心
 			toUserCenter() {
-				this.toOtherWX()
-				// uni.showLoading({
-				// 	title: "正在加载..."
-				// })
-				// // 检验是否登录或登录是否过期
-				// checkLogin().then(res => {
-				// 	console.log(res)
-				// 	uni.hideLoading()
-				// 	if (res.status == '200') {
-				// 		uni.navigateTo({
-				// 			url: '/pages/userCenter/index'
-				// 		})
-				// 	} else if (res.status == '9001') {
-				// 		uni.navigateTo({
-				// 			url: `/pages/login/login?lanuch=${false}&path=` + encodeURIComponent('/pages/userCenter/index')
-				// 		})
-				// 	}else if (res.status == '6000'){
-				// 		this.toashMsg(res.message)
-				// 	}
-				// })
+				uni.showLoading({
+					title: "正在加载..."
+				})
+				// 检验是否登录或登录是否过期
+				checkLogin().then(res => {
+					console.log(res)
+					uni.hideLoading()
+					if (res.status == '200') {
+						uni.navigateTo({
+							url: '/pages/userCenter/index'
+						})
+					} else if (res.status == '9001') {
+						uni.navigateTo({
+							url: `/pages/login/login?lanuch=${false}&path=` + encodeURIComponent('/pages/userCenter/index')
+						})
+					}else if (res.status == '6000'){
+						this.toashMsg(res.message)
+					}
+				})
 			},
 			// 打开网点列表
 			intoList() {