lilei 4 rokov pred
rodič
commit
a78e90fe91

+ 2 - 2
pages/index/index.vue

@@ -297,7 +297,7 @@
 			// 电话客服
 			callPhone() {
 				uni.makePhoneCall({
-					phoneNumber: '114'
+					phoneNumber: '18237162131'
 				})
 			},
 			// 扫码洗车
@@ -322,7 +322,7 @@
 									url: res.result
 								})
 								// uni.navigateTo({
-								// 	url: `/pages/getOrder/getOrder?scene=100032,9691`
+								// 	url: `/pages/getOrder/getOrder?scene=100060,2000`
 								// })
 						    }
 						});

+ 26 - 22
pages/work/index/index.vue

@@ -56,7 +56,7 @@
 					</view>
 					<view v-else>
 						<view>设备启动中请注意安全,如果设备工作中出现故障,请按紧急停止按钮或联系客服。</view>
-						<view @click="callPhone">如有疑问,请联系客服:<text>400-xxx-xxx</text> </view>
+						<view @click="callPhone">如有疑问,请联系客服:<text>18237162131</text> </view>
 					</view>
 				</view>
 			</view>
@@ -83,11 +83,14 @@
 			</view>
 		</u-popup>
 		<!-- 错误提示 -->
-		<u-popup v-model="showError" :mask-close-able="false" border-radius="10" mode="center" width="500rpx" height="400rpx">
+		<u-popup v-model="showError" :mask-close-able="false" border-radius="10" mode="center" width="500rpx">
 			<view style="padding: 30rpx;display: flex;justify-content: center;text-align: center;">
 				<view>
-					<u-image width="216px" height="120px" src="/static/img/start.png"></u-image>
-					<view style="padding: 15rpx;">{{curWorkStutesText}}</view>
+					<u-image width="64px" height="64px" src="/static/img/end.png"></u-image>
+					<view style="padding: 10px 0 20px;">洗车已完成</view>
+					<view>
+						<u-button long type="success">确定</u-button>
+					</view>
 				</view>
 			</view>
 		</u-popup>
@@ -146,10 +149,10 @@ export default {
 		console.log("onLoad")
 		// 创建websocket
 		this.$store.commit('$webSocket')
-		uni.showLoading({
-			title: '正在连接...',
-			mask: true
-		})
+		// uni.showLoading({
+		// 	title: '正在连接...',
+		// 	mask: true
+		// })
 		
 		// 第一次进入洗车页面
 		if(this.$store.state.vuex_orderDjs == 0){
@@ -174,7 +177,7 @@ export default {
 		// 电话客服
 		callPhone () {
 			uni.makePhoneCall({
-			    phoneNumber: '114' 
+			    phoneNumber: '18237162131' 
 			})
 		},
 		// 更新当前倒计时
@@ -403,19 +406,20 @@ export default {
 			this.$store.state.vuex_workStatus = 'end';
 			this.curWorkStutesText='洗车已结束';
 			this.resetLoadingStatus();
-			uni.showModal({
-			    title: '提示',
-			    content: '洗车已结束',
-				showCancel: false,
-			    success: function (res) {
-			        if (res.confirm) {
-						// 跳转到成功页面
-						uni.redirectTo({
-							url:"/pages/work/success/success?type=0"
-						})
-			        }
-			    }
-			});
+			// uni.showModal({
+			//     title: '提示',
+			//     content: '洗车已结束',
+			// 	showCancel: false,
+			//     success: function (res) {
+			//         if (res.confirm) {
+			// 			// 跳转到成功页面
+			// 			uni.redirectTo({
+			// 				url:"/pages/work/success/success?type=0"
+			// 			})
+			//         }
+			//     }
+			// });
+			this.showError = true
 			// 关闭socket
 			this.$store.commit("$closeWebsocket")
 		},

+ 2 - 2
pages/work/success/success.vue

@@ -11,7 +11,7 @@
 		<view class="infos">
 			<view>操作说明:</view>
 			<view>【重新扫码洗车】需要再次支付洗车费用,如果遇到非个人原因导致洗车机中途归位,客服会在7个工作日内核实情况后,将已付费用按原支付渠道退款给付款账户。带来不便,敬请谅解。</view>
-			<view @click="callPhone">如有疑问,请联系客服:<text>400-xxx-xxx</text> </view>
+			<view @click="callPhone">如有疑问,请联系客服:<text>18237162131</text> </view>
 		</view>
 	</view>
 </template>
@@ -30,7 +30,7 @@
 			// 电话客服
 			callPhone () {
 				uni.makePhoneCall({
-				    phoneNumber: '114' 
+				    phoneNumber: '18237162131' 
 				})
 			},
 			// 返回首页

BIN
static/img/dky.png


BIN
static/img/end.png


BIN
static/img/ygb.png


BIN
static/img/yyz.png


+ 8 - 7
store/index.js

@@ -21,8 +21,8 @@ let saveStateKeys = [
 	'vuex_storeLabel',
 	'vuex_orderInfo',
 	'vuex_workStatus',
-	'orderDjs',
-	'loadingDjs',
+	'vuex_orderDjs',
+	'vuex_workStep',
 ];
 
 // 保存变量到本地存储中
@@ -108,11 +108,11 @@ const store = new Vuex.Store({
 		vuex_wsMessageData: '',
 		vuex_heartInterId: null,
 		// 当前网络连接状态
-		netStatus: '',
+		vuex_netStatus: '',
 		// 设备是否正在运行中
-		vuex_workStatus: 'linking',
+		vuex_workStatus: lifeData.vuex_workStatus ? lifeData.vuex_workStatus : 'linking',
 		// 订单信息
-		vuex_orderInfo: {
+		vuex_orderInfo: lifeData.vuex_orderInfo ? lifeData.vuex_orderInfo : {
 			storeId: '', // 网点id
 			bizId: '', // 设备编号
 			itemCode: '', // 服务类型
@@ -121,8 +121,8 @@ const store = new Vuex.Store({
 			orderStatus: '' // 订单状态
 		},
 		// 设备运行页面的计时器
-		vuex_orderDjs: 0, // 订单完成倒计时
-		vuex_workStep: 0, // 进度条步骤
+		vuex_orderDjs: lifeData.vuex_orderDjs ? lifeData.vuex_orderDjs : 0, // 订单完成倒计时
+		vuex_workStep: lifeData.vuex_workStep ? lifeData.vuex_workStep : 0, // 进度条步骤
 		// 优惠券相关信息
 		vuex_couponInfo: {
 			storeId: '', // 网点id
@@ -157,6 +157,7 @@ const store = new Vuex.Store({
 			let url = getApp().globalData.baseUrl
 			let wsBaseUrl = url.indexOf("https:") >= 0 ? url.replace("https:", "wss:") : url.replace("http:", "ws:")
 			let wsUrl = wsBaseUrl + 'websocket/weixin/' + state.vuex_orderInfo.bizId
+			console.log(wsUrl,'wsUrl')
 			SocketInit(_this,state,wsUrl)
 		},
 		// 关闭websocket