no message

App.vue

@@ -1,421 +1,376 @@
-<script>
-	export default {
-		onLaunch: function() {
-			setInterval(d => { //定时器，定时去调取聊天未读消息
-				let userId = uni.getStorageSync('userId')
-				if (userId) {
-					this.$Request.getMsg('/app/ordersChat/selectUserAllUnreadCount').then(res => {
-						if (res.code === 0) {
-
-							let messageCount = res.data
-
-							uni.setStorageSync('messageCount', messageCount)
-
-							let num = messageCount
-							// console.log(num, '未读消息数')
-							if (num == 0) {
-								uni.removeTabBarBadge({
-									index: 2
-								})
-								return;
-							}
-							uni.setTabBarBadge({
-								index: 2,
-								text: num + ''
-							})
-
-						}
-					});
-				}
-			}, 3000);
-			// 是否开启总送跑腿新用户红包 256
-			this.$Request.get('/app/common/type/256').then(res => {
-				if (res.code == 0) {
-					this.$queue.setData('paotuiHB', res.data.value);
-				}
-			});
-
-			// 是否开启赠送外卖新用户红包 324
-			this.$Request.get('/app/common/type/324').then(res => {
-				if (res.code == 0) {
-					this.$queue.setData('waimaiHB', res.data.value);
-				}
-			});
-			//小程序上线开关
-			console.log('App Launch')
-			// this.$Request.get('/app/common/type/261').then(res => {
-			// 	if (res.code == 0) {
-			// 		// #ifdef MP-WEIXIN
-			// 		this.$queue.setData('XCXIsSelect', res.data.value);
-			// 		this.$queue.setData('shangxianSelect', res.data.value);
-			// 		// #endif
-			// 		// #ifndef MP-WEIXIN
-			// 		this.$queue.setData('XCXIsSelect', '是');
-			// 		this.$queue.setData('shangxianSelect', '是');
-			// 		// #endif
-			// 	}
-			// });
-			this.$Request.get('/app/common/type/264').then(res => {
-				if (res.code == 0) {
-					// #ifdef MP-WEIXIN
-					this.$queue.setData('XCXIsSelect', res.data.value);
-					this.$queue.setData('shangxianSelect', res.data.value);
-					// #endif
-					// #ifndef MP-WEIXIN
-					this.$queue.setData('XCXIsSelect', '是');
-					this.$queue.setData('shangxianSelect', '是');
-					// #endif
-				}
-			});
-			//#ifdef APP-PLUS
-			// APP检测更新 具体打包流程可以参考：https://ask.dcloud.net.cn/article/35667
-			plus.screen.lockOrientation('portrait-primary'); //竖屏正方向锁定
-			//获取是否热更新过
-			const updated = uni.getStorageSync('updated'); // 尝试读取storage
-			let that = this;
-			if (updated.completed === true) {
-				// 如果上次刚更新过
-				// 删除安装包及安装记录
-				console.log('安装记录被删除，更新成功');
-				uni.removeSavedFile({
-					filePath: updated.packgePath,
-					success: res => {
-						uni.removeStorageSync('updated');
-					}
-				});
-			} else if (updated.completed === false) {
-				uni.removeStorageSync('updated');
-				plus.runtime.install(updated.packgePath, {
-					force: true
-				});
-				uni.setStorage({
-					key: 'updated',
-					data: {
-						completed: true,
-						packgePath: updated.packgePath
-					},
-					success: res => {
-						console.log('成功安装上次的更新，应用需要重启才能继续完成');
-					}
-				});
-				uni.showModal({
-					title: '温馨提示',
-					content: '应用将重启以完成更新',
-					showCancel: false,
-					complete: () => {
-						plus.runtime.restart();
-					}
-				});
-			} else {
-				//获取当前系统版本信息
-				plus.runtime.getProperty(plus.runtime.appid, widgetInfo => {
-					//请求后台接口 解析数据 对比版本
-					that.$Request.getT('/app/user/selectNewApp').then(res => {
-						res = res.data[0];
-						if (res.wgtUrl && widgetInfo.version < res.version) {
-							let downloadLink = '';
-							let androidLink = res.androidWgtUrl;
-							let iosLink = res.iosWgtUrl;
-							let ready = false;
-							//校验是是不是热更新
-							if (res.wgtUrl.match(RegExp(/.wgt/))) {
-								// 判断系统类型
-								if (plus.os.name.toLowerCase() === 'android') {
-									console.log('安卓系统');
-									if (androidLink && androidLink !== '#') {
-										// 我这里默认#也是没有地址，请根据业务自行修改
-										console.log('发现下载地址');
-										// 安卓：创建下载任务
-										if (androidLink.match(RegExp(/.wgt/))) {
-											console.log('确认wgt热更新包');
-											downloadLink = androidLink;
-											ready = true;
-										} else {
-											console.log('安卓推荐.wgt强制更新，.apk的强制更新请您自行修改程序');
-										}
-									} else {
-										console.log('下载地址是空的，无法继续');
-									}
-								} else {
-									console.log('苹果系统');
-									if (iosLink && iosLink !== '#') {
-										// 我这里默认#也是没有地址，请根据业务自行修改
-										console.log('发现下载地址');
-										// 苹果(A)：进行热更新（如果iosLink是wgt更新包的下载地址）判断文件名中是否含有.wgt
-										if (iosLink.match(RegExp(/.wgt/))) {
-											console.log('确认wgt热更新包');
-											downloadLink = iosLink;
-											ready = true;
-										} else {
-											console.log('苹果只支持.wgt强制更新');
-										}
-									} else {
-										console.log('下载地址是空的，无法继续');
-									}
-								}
-								if (ready) {
-									console.log('任务开始');
-									let downloadTask = uni.downloadFile({
-										url: downloadLink,
-										success: res => {
-											if (res.statusCode === 200) {
-												// 保存下载的安装包
-												console.log('保存安装包');
-												uni.saveFile({
-													tempFilePath: res.tempFilePath,
-													success: res => {
-														const packgePath = res
-															.savedFilePath;
-														// 保存更新记录到stroage，下次启动app时安装更新
-														uni.setStorage({
-															key: 'updated',
-															data: {
-																completed: false,
-																packgePath: packgePath
-															},
-															success: () => {
-																console
-																	.log(
-																		'成功保存记录'
-																	);
-															}
-														});
-														// 任务完成，关闭下载任务
-														console.log(
-															'任务完成，关闭下载任务，下一次启动应用时将安装更新'
-														);
-														downloadTask.abort();
-														downloadTask = null;
-													}
-												});
-											}
-										}
-									});
-								} else {
-									console.log('下载地址未准备，无法开启下载任务');
-								}
-							} else {
-								//不是热更新是在线更新 校验是否强制升级
-								if (res.method == 'true') {
-									uni.showModal({
-										showCancel: false,
-										confirmText: '立即更新',
-										title: '发现新版本',
-										content: res.des,
-										success: res => {
-											if (res.confirm) {
-												that.$queue.showLoading('下载中...');
-												if (uni.getSystemInfoSync().platform ==
-													'android') {
-													uni.downloadFile({
-														url: androidLink,
-														success: downloadResult => {
-															if (downloadResult
-																.statusCode ===
-																200) {
-																plus.runtime
-																	.install(
-																		downloadResult
-																		.tempFilePath, {
-																			force: false
-																		},
-																		d => {
-																			console
-																				.log(
-																					'install success...'
-																				);
-																			plus.runtime
-																				.restart();
-																		},
-																		e => {
-																			console
-																				.error(
-																					'install fail...'
-																				);
-																		}
-																	);
-															}
-														}
-													});
-												}
-												if (uni.getSystemInfoSync().platform ==
-													'ios') {
-													plus.runtime.openURL(iosLink, function(
-														res) {});
-												}
-											} else if (res.cancel) {
-												console.log('取消');
-											}
-										}
-									});
-								} else {
-									uni.showModal({
-										title: '发现新版本',
-										confirmText: '立即更新',
-										cancelText: '下次更新',
-										content: res.des,
-										success: res => {
-											if (res.confirm) {
-												that.$queue.showLoading('下载中...');
-												if (uni.getSystemInfoSync().platform ==
-													'android') {
-													uni.downloadFile({
-														url: androidLink,
-														success: downloadResult => {
-															if (downloadResult
-																.statusCode ===
-																200) {
-																plus.runtime
-																	.install(
-																		downloadResult
-																		.tempFilePath, {
-																			force: false
-																		},
-																		d => {
-																			console
-																				.log(
-																					'install success...'
-																				);
-																			plus.runtime
-																				.restart();
-																		},
-																		e => {
-																			console
-																				.error(
-																					'install fail...'
-																				);
-																		}
-																	);
-															}
-														}
-													});
-												}
-												if (uni.getSystemInfoSync().platform ==
-													'ios') {
-													plus.runtime.openURL(iosLink, function(
-														res) {});
-												}
-											} else if (res.cancel) {
-												console.log('取消');
-											}
-										}
-									});
-								}
-							}
-						}
-					});
-				});
-			}
-			//#endif
-			
-			//#ifdef H5
-			let ua = navigator.userAgent.toLowerCase();
-			if (ua.indexOf('micromessenger') !== -1) {
-				let openid = uni.getStorageSync('openid');
-				let userId = uni.getStorageSync('userId');
-				let that = this;
-				console.log(openid)
-				if (!openid) {
-					if (window.location.href.indexOf('?code=') !== -1 || window.location.href.indexOf('&code=') !==
-						-1) {
-						let code;
-						if (window.location.href.indexOf('?code=') !== -1) {
-							code = window.location.href.split('?code=')[1].split('&')[0];
-						} else {
-							code = window.location.href.split('&code=')[1].split('&')[0];
-						}
-						let data = {
-							code: code
-							
-						}
-						this.$Request.get('/app/Login/getOpenId',data).then(ret => {
-							this.$queue.setData('openid', ret.data)
-							let data2 = {
-								openId: ret.data,
-								userType:1
-							}
-							this.$Request.get('/app/Login/wxOpenIdLogin',data2)
-								.then(res => {
-									console.error(res)
-									if (res.code == 0) {
-										this.$queue.setData("token", res.token);
-										this.$queue.setData("userId", res.user.userId);
-										this.$queue.setData("phone", res.user.phone);
-
-										uni.setStorageSync('userName', res.user.userName)
-										uni.setStorageSync('avatar', res.user.avatar)
-										uni.setStorageSync('phone', res.user.phone)
-										uni.setStorageSync('sex', res.user.sex)
-										uni.setStorageSync('userId', res.user.userId)
-										uni.setStorageSync('wxCode', res.user.wxCode)
-										uni.setStorageSync('wxQrCode', res.user.wxQrCode)
-										uni.setStorageSync('zhiFuBao', res.user.zhiFuBao)
-										uni.setStorageSync('zhiFuBaoName', res.user.zhiFuBaoName)
-
-									}
-
-
-								});
-						});
-					} else {
-						window.location.href =
-							'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' +
-							that.$queue.getWxAppid() +
-							'&redirect_uri=' +
-							window.location.href.split('#')[0] +
-							'&response_type=code&scope=snsapi_base#wechat_redirect';
-					}
-				} else {
-					this.$Request.get('/app/Login/wxOpenIdLogin?openId=' + openid + '&userType=1').then(res => {
-						if (res.code == 0) {
-							this.$queue.setData("token", res.token);
-							this.$queue.setData("userId", res.user.userId);
-							this.$queue.setData("phone", res.user.phone);
-
-							uni.setStorageSync('userName', res.user.userName)
-							uni.setStorageSync('avatar', res.user.avatar)
-							uni.setStorageSync('phone', res.user.phone)
-							uni.setStorageSync('sex', res.user.sex)
-							uni.setStorageSync('userId', res.user.userId)
-							uni.setStorageSync('wxCode', res.user.wxCode)
-							uni.setStorageSync('wxQrCode', res.user.wxQrCode)
-							uni.setStorageSync('zhiFuBao', res.user.zhiFuBao)
-							uni.setStorageSync('zhiFuBaoName', res.user.zhiFuBaoName)
-
-						}
-
-					});
-				}
-			}
-			//#endif
-		},
-		onShow: function() {
-			console.log('App Show')
-			// #ifdef APP-PLUS
-			if (uni.getSystemInfoSync().platform == 'android') {
-				let clientid = plus.push.getClientInfo().clientid;
-
-				let userId = this.$queue.getData('userId');
-				if (userId) {
-					console.log(clientid, '----', userId)
-					this.$Request.postT('/app/user/updateClientId?clientId=' + clientid).then(
-						res => {});
-				}
-			}
-			//#endif
-
-
-
-		},
-		onHide: function() {
-			console.log('App Hide')
-		}
-	}
-</script>
-
-<style lang="scss">
-	/*每个页面公共css */
-	@import "uview-ui/index.scss";
-	@import 'components/colorui/main.css';
-	@import 'components/colorui/icon.css';
+<script>
+export default {
+	onLaunch: function () {
+		setInterval((d) => {
+			//定时器，定时去调取聊天未读消息
+			let userId = uni.getStorageSync('userId')
+			if (userId) {
+				this.$Request.getMsg('/app/ordersChat/selectUserAllUnreadCount').then((res) => {
+					if (res.code === 0) {
+						let messageCount = res.data
+
+						uni.setStorageSync('messageCount', messageCount)
+
+						let num = messageCount
+						// console.log(num, '未读消息数')
+						if (num == 0) {
+							uni.removeTabBarBadge({
+								index: 2
+							})
+							return
+						}
+						uni.setTabBarBadge({
+							index: 2,
+							text: num + ''
+						})
+					}
+				})
+			}
+		}, 3000)
+		// 是否开启总送跑腿新用户红包 256
+		this.$Request.get('/app/common/type/256').then((res) => {
+			if (res.code == 0) {
+				this.$queue.setData('paotuiHB', res.data.value)
+			}
+		})
+
+		// 是否开启赠送外卖新用户红包 324
+		this.$Request.get('/app/common/type/324').then((res) => {
+			if (res.code == 0) {
+				this.$queue.setData('waimaiHB', res.data.value)
+			}
+		})
+		//小程序上线开关
+		console.log('App Launch')
+		// this.$Request.get('/app/common/type/261').then(res => {
+		// 	if (res.code == 0) {
+		// 		// #ifdef MP-WEIXIN
+		// 		this.$queue.setData('XCXIsSelect', res.data.value);
+		// 		this.$queue.setData('shangxianSelect', res.data.value);
+		// 		// #endif
+		// 		// #ifndef MP-WEIXIN
+		// 		this.$queue.setData('XCXIsSelect', '是');
+		// 		this.$queue.setData('shangxianSelect', '是');
+		// 		// #endif
+		// 	}
+		// });
+		this.$Request.get('/app/common/type/264').then((res) => {
+			if (res.code == 0) {
+				// #ifdef MP-WEIXIN
+				this.$queue.setData('XCXIsSelect', res.data.value)
+				this.$queue.setData('shangxianSelect', res.data.value)
+				// #endif
+				// #ifndef MP-WEIXIN
+				this.$queue.setData('XCXIsSelect', '是')
+				this.$queue.setData('shangxianSelect', '是')
+				// #endif
+			}
+		})
+		//#ifdef APP-PLUS
+		// APP检测更新 具体打包流程可以参考：https://ask.dcloud.net.cn/article/35667
+		plus.screen.lockOrientation('portrait-primary') //竖屏正方向锁定
+		//获取是否热更新过
+		const updated = uni.getStorageSync('updated') // 尝试读取storage
+		let that = this
+		if (updated.completed === true) {
+			// 如果上次刚更新过
+			// 删除安装包及安装记录
+			console.log('安装记录被删除，更新成功')
+			uni.removeSavedFile({
+				filePath: updated.packgePath,
+				success: (res) => {
+					uni.removeStorageSync('updated')
+				}
+			})
+		} else if (updated.completed === false) {
+			uni.removeStorageSync('updated')
+			plus.runtime.install(updated.packgePath, {
+				force: true
+			})
+			uni.setStorage({
+				key: 'updated',
+				data: {
+					completed: true,
+					packgePath: updated.packgePath
+				},
+				success: (res) => {
+					console.log('成功安装上次的更新，应用需要重启才能继续完成')
+				}
+			})
+			uni.showModal({
+				title: '温馨提示',
+				content: '应用将重启以完成更新',
+				showCancel: false,
+				complete: () => {
+					plus.runtime.restart()
+				}
+			})
+		} else {
+			//获取当前系统版本信息
+			plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => {
+				//请求后台接口 解析数据 对比版本
+				that.$Request.getT('/app/user/selectNewApp').then((res) => {
+					res = res.data[0]
+					if (res.wgtUrl && widgetInfo.version < res.version) {
+						let downloadLink = ''
+						let androidLink = res.androidWgtUrl
+						let iosLink = res.iosWgtUrl
+						let ready = false
+						//校验是是不是热更新
+						if (res.wgtUrl.match(RegExp(/.wgt/))) {
+							// 判断系统类型
+							if (plus.os.name.toLowerCase() === 'android') {
+								console.log('安卓系统')
+								if (androidLink && androidLink !== '#') {
+									// 我这里默认#也是没有地址，请根据业务自行修改
+									console.log('发现下载地址')
+									// 安卓：创建下载任务
+									if (androidLink.match(RegExp(/.wgt/))) {
+										console.log('确认wgt热更新包')
+										downloadLink = androidLink
+										ready = true
+									} else {
+										console.log('安卓推荐.wgt强制更新，.apk的强制更新请您自行修改程序')
+									}
+								} else {
+									console.log('下载地址是空的，无法继续')
+								}
+							} else {
+								console.log('苹果系统')
+								if (iosLink && iosLink !== '#') {
+									// 我这里默认#也是没有地址，请根据业务自行修改
+									console.log('发现下载地址')
+									// 苹果(A)：进行热更新（如果iosLink是wgt更新包的下载地址）判断文件名中是否含有.wgt
+									if (iosLink.match(RegExp(/.wgt/))) {
+										console.log('确认wgt热更新包')
+										downloadLink = iosLink
+										ready = true
+									} else {
+										console.log('苹果只支持.wgt强制更新')
+									}
+								} else {
+									console.log('下载地址是空的，无法继续')
+								}
+							}
+							if (ready) {
+								console.log('任务开始')
+								let downloadTask = uni.downloadFile({
+									url: downloadLink,
+									success: (res) => {
+										if (res.statusCode === 200) {
+											// 保存下载的安装包
+											console.log('保存安装包')
+											uni.saveFile({
+												tempFilePath: res.tempFilePath,
+												success: (res) => {
+													const packgePath = res.savedFilePath
+													// 保存更新记录到stroage，下次启动app时安装更新
+													uni.setStorage({
+														key: 'updated',
+														data: {
+															completed: false,
+															packgePath: packgePath
+														},
+														success: () => {
+															console.log('成功保存记录')
+														}
+													})
+													// 任务完成，关闭下载任务
+													console.log('任务完成，关闭下载任务，下一次启动应用时将安装更新')
+													downloadTask.abort()
+													downloadTask = null
+												}
+											})
+										}
+									}
+								})
+							} else {
+								console.log('下载地址未准备，无法开启下载任务')
+							}
+						} else {
+							//不是热更新是在线更新 校验是否强制升级
+							if (res.method == 'true') {
+								uni.showModal({
+									showCancel: false,
+									confirmText: '立即更新',
+									title: '发现新版本',
+									content: res.des,
+									success: (res) => {
+										if (res.confirm) {
+											that.$queue.showLoading('下载中...')
+											if (uni.getSystemInfoSync().platform == 'android') {
+												uni.downloadFile({
+													url: androidLink,
+													success: (downloadResult) => {
+														if (downloadResult.statusCode === 200) {
+															plus.runtime.install(
+																downloadResult.tempFilePath,
+																{
+																	force: false
+																},
+																(d) => {
+																	console.log('install success...')
+																	plus.runtime.restart()
+																},
+																(e) => {
+																	console.error('install fail...')
+																}
+															)
+														}
+													}
+												})
+											}
+											if (uni.getSystemInfoSync().platform == 'ios') {
+												plus.runtime.openURL(iosLink, function (res) {})
+											}
+										} else if (res.cancel) {
+											console.log('取消')
+										}
+									}
+								})
+							} else {
+								uni.showModal({
+									title: '发现新版本',
+									confirmText: '立即更新',
+									cancelText: '下次更新',
+									content: res.des,
+									success: (res) => {
+										if (res.confirm) {
+											that.$queue.showLoading('下载中...')
+											if (uni.getSystemInfoSync().platform == 'android') {
+												uni.downloadFile({
+													url: androidLink,
+													success: (downloadResult) => {
+														if (downloadResult.statusCode === 200) {
+															plus.runtime.install(
+																downloadResult.tempFilePath,
+																{
+																	force: false
+																},
+																(d) => {
+																	console.log('install success...')
+																	plus.runtime.restart()
+																},
+																(e) => {
+																	console.error('install fail...')
+																}
+															)
+														}
+													}
+												})
+											}
+											if (uni.getSystemInfoSync().platform == 'ios') {
+												plus.runtime.openURL(iosLink, function (res) {})
+											}
+										} else if (res.cancel) {
+											console.log('取消')
+										}
+									}
+								})
+							}
+						}
+					}
+				})
+			})
+		}
+		//#endif
+
+		//#ifdef H5
+		let ua = navigator.userAgent.toLowerCase()
+		if (ua.indexOf('micromessenger') !== -1) {
+			let openid = uni.getStorageSync('openid')
+			let userId = uni.getStorageSync('userId')
+			let that = this
+			console.log(openid)
+			if (!openid) {
+				if (window.location.href.indexOf('?code=') !== -1 || window.location.href.indexOf('&code=') !== -1) {
+					let code
+					if (window.location.href.indexOf('?code=') !== -1) {
+						code = window.location.href.split('?code=')[1].split('&')[0]
+					} else {
+						code = window.location.href.split('&code=')[1].split('&')[0]
+					}
+					let data = {
+						code: code
+					}
+					this.$Request.get('/app/Login/getOpenId', data).then((ret) => {
+						this.$queue.setData('openid', ret.data)
+						let data2 = {
+							openId: ret.data,
+							userType: 1
+						}
+						this.$Request.get('/app/Login/wxOpenIdLogin', data2).then((res) => {
+							console.error(res)
+							if (res.code == 0) {
+								this.$queue.setData('token', res.token)
+								this.$queue.setData('userId', res.user.userId)
+								this.$queue.setData('phone', res.user.phone)
+
+								uni.setStorageSync('userName', res.user.userName)
+								uni.setStorageSync('avatar', res.user.avatar)
+								uni.setStorageSync('phone', res.user.phone)
+								uni.setStorageSync('sex', res.user.sex)
+								uni.setStorageSync('userId', res.user.userId)
+								uni.setStorageSync('wxCode', res.user.wxCode)
+								uni.setStorageSync('wxQrCode', res.user.wxQrCode)
+								uni.setStorageSync('zhiFuBao', res.user.zhiFuBao)
+								uni.setStorageSync('zhiFuBaoName', res.user.zhiFuBaoName)
+							}
+						})
+					})
+				} else {
+					window.location.href =
+						'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' +
+						that.$queue.getWxAppid() +
+						'&redirect_uri=' +
+						window.location.href.split('#')[0] +
+						'&response_type=code&scope=snsapi_base#wechat_redirect'
+				}
+			} else {
+				this.$Request.get('/app/Login/wxOpenIdLogin?openId=' + openid + '&userType=1').then((res) => {
+					if (res.code == 0) {
+						this.$queue.setData('token', res.token)
+						this.$queue.setData('userId', res.user.userId)
+						this.$queue.setData('phone', res.user.phone)
+
+						uni.setStorageSync('userName', res.user.userName)
+						uni.setStorageSync('avatar', res.user.avatar)
+						uni.setStorageSync('phone', res.user.phone)
+						uni.setStorageSync('sex', res.user.sex)
+						uni.setStorageSync('userId', res.user.userId)
+						uni.setStorageSync('wxCode', res.user.wxCode)
+						uni.setStorageSync('wxQrCode', res.user.wxQrCode)
+						uni.setStorageSync('zhiFuBao', res.user.zhiFuBao)
+						uni.setStorageSync('zhiFuBaoName', res.user.zhiFuBaoName)
+					}
+				})
+			}
+		}
+		//#endif
+	},
+	onShow: function () {
+		console.log('App Show')
+		// #ifdef APP-PLUS
+		if (uni.getSystemInfoSync().platform == 'android') {
+			let clientid = plus.push.getClientInfo().clientid
+
+			let userId = this.$queue.getData('userId')
+			if (userId) {
+				console.log(clientid, '----', userId)
+				this.$Request.postT('/app/user/updateClientId?clientId=' + clientid).then((res) => {})
+			}
+		}
+		//#endif
+	},
+	onHide: function () {
+		console.log('App Hide')
+	}
+}
+</script>
+
+<style lang="scss">
+/*每个页面公共css */
+@import 'uview-ui/index.scss';
+@import 'components/colorui/main.css';
+@import 'components/colorui/icon.css';
 </style>

common/httpRequest.js

@@ -1,64 +1,65 @@
 import configdata from './config'
 import cache from './cache'
-import { encrypt,
-		 decrypt,
-		 urlSafeBase64Decode,
-		 urlSafeBase64Encode } from '@/utils/cryptojs.js';
-var ifShangxian=1//1线上，0线下
+import {
+	encrypt,
+	decrypt,
+	urlSafeBase64Decode,
+	urlSafeBase64Encode
+} from '@/utils/cryptojs.js';
+var ifShangxian = 1 //1线上，0线下
 module.exports = {
-    config: function (name) {
-        var info = null;
-        if (name) {
-            var name2 = name.split("."); //字符分割
-            if (name2.length > 1) {
-                info = configdata[name2[0]][name2[1]] || null;
-            } else {
-                info = configdata[name] || null;
-            }
-            if (info == null) {
-                let web_config = cache.get("web_config");
-                if (web_config) {
-                    if (name2.length > 1) {
-                        info = web_config[name2[0]][name2[1]] || null;
-                    } else {
-                        info = web_config[name] || null;
-                    }
-                }
-            }
-        }
-        return info;
-    },
-    post: function (url, data, header) {
-		if(ifShangxian==1){
-			if(data){
-				var arr =Object.entries(data)//对象转为数组
-				var b=[]
-				arr.forEach((element, index) => {  
-					arr[index][1] = urlSafeBase64Encode(encrypt(element[1].toString()))
-				}); 
-				b=arr
-				data=Object.fromEntries(b)
-			}else{
+	config: function(name) {
+		var info = null;
+		if (name) {
+			var name2 = name.split("."); //字符分割
+			if (name2.length > 1) {
+				info = configdata[name2[0]][name2[1]] || null;
+			} else {
+				info = configdata[name] || null;
+			}
+			if (info == null) {
+				let web_config = cache.get("web_config");
+				if (web_config) {
+					if (name2.length > 1) {
+						info = web_config[name2[0]][name2[1]] || null;
+					} else {
+						info = web_config[name] || null;
+					}
+				}
 			}
 		}
-        header = header || "application/x-www-form-urlencoded";
-        url = this.config("APIHOST") + url;
+		return info;
+	},
+	post: function(url, data, header) {
+		if (ifShangxian == 1) {
+			if (data) {
+				var arr = Object.entries(data) //对象转为数组
+				var b = []
+				arr.forEach((element, index) => {
+					arr[index][1] = urlSafeBase64Encode(encrypt(element[1].toString()))
+				});
+				b = arr
+				data = Object.fromEntries(b)
+			} else {}
+		}
+		header = header || "application/x-www-form-urlencoded";
+		url = this.config("APIHOST") + url;
 		let token = uni.getStorageSync("token");
-        return new Promise((succ, error) => {
-            uni.request({
-                url: url,
-                data: data,
-                method: "POST",
-                header: {
-                    "content-type": header,
-					 "token": token
-                },
-                success: function (result) {
-					if(ifShangxian==1){
-						const decryptData =decrypt(urlSafeBase64Decode(result.data))
-						result.data=JSON.parse(decryptData)
+		return new Promise((succ, error) => {
+			uni.request({
+				url: url,
+				data: data,
+				method: "POST",
+				header: {
+					"content-type": header,
+					"token": token
+				},
+				success: function(result) {
+					if (ifShangxian == 1) {
+						const decryptData = decrypt(urlSafeBase64Decode(result.data))
+						result.data = JSON.parse(decryptData)
 					}
-					if(result.data.code == 401&&token) {
+					if (result.data.code == 401 && token) {
 						uni.removeStorageSync("token")
 						uni.removeStorageSync("userId")
 						uni.removeStorageSync("phone")
@@ -69,205 +70,202 @@ module.exports = {
 						uni.removeStorageSync("isInvitation")
 						uni.removeStorageSync("zhiFuBao")
 						uni.removeStorageSync("zhiFuBaoName")
-						
+
 						uni.showToast({
 							title: '用户信息失效，请重新登录！',
 							icon: 'none'
 						})
-					} 
-                    succ.call(self, result.data)
-                },
-                fail: function (e) {
-                    error.call(self, e)
-                }
-            })
-        })
-    },
-    postT: function (url, data, header) {
-		if(ifShangxian==1){
-			if(data){
-				var arr =Object.entries(data)//对象转为数组
-				var b=[]
-				arr.forEach((element, index) => {  
+					}
+					succ.call(self, result.data)
+				},
+				fail: function(e) {
+					error.call(self, e)
+				}
+			})
+		})
+	},
+	postT: function(url, data, header) {
+		if (ifShangxian == 1) {
+			if (data) {
+				var arr = Object.entries(data) //对象转为数组
+				var b = []
+				arr.forEach((element, index) => {
 					arr[index][1] = urlSafeBase64Encode(encrypt(element[1].toString()))
-				}); 
-				b=arr
-				data=Object.fromEntries(b)
-			}else{
-			}
+				});
+				b = arr
+				data = Object.fromEntries(b)
+			} else {}
 		}
-        header = header || "application/x-www-form-urlencoded";
-        url = this.config("APIHOST1") + url;
-        let token = uni.getStorageSync("token");
-        if (token) {
-            return new Promise((succ, error) => {
-                uni.request({
-                    url: url,
-                    data: data,
-                    method: "POST",
-                    header: {
-                        "content-type": header,
-                        "token": token
-                    },
-                    success: function (result) {
-						if(ifShangxian==1){
-							const decryptData =decrypt(urlSafeBase64Decode(result.data))
-							result.data=JSON.parse(decryptData)
+		header = header || "application/x-www-form-urlencoded";
+		url = this.config("APIHOST1") + url;
+		let token = uni.getStorageSync("token");
+		if (token) {
+			return new Promise((succ, error) => {
+				uni.request({
+					url: url,
+					data: data,
+					method: "POST",
+					header: {
+						"content-type": header,
+						"token": token
+					},
+					success: function(result) {
+						if (ifShangxian == 1) {
+							const decryptData = decrypt(urlSafeBase64Decode(result.data))
+							result.data = JSON.parse(decryptData)
 						}
-                        if(result.data.code == 401&&token) {
-                        	uni.removeStorageSync("token")
-                        	uni.removeStorageSync("userId")
-                        	uni.removeStorageSync("phone")
-                        	uni.removeStorageSync("openid")
-                        	uni.removeStorageSync("userName")
-                        	uni.removeStorageSync("relation")
-                        	uni.removeStorageSync("relation_id")
-                        	uni.removeStorageSync("isInvitation")
-                        	uni.removeStorageSync("zhiFuBao")
-                        	uni.removeStorageSync("zhiFuBaoName")
-                        	
-                        	uni.showToast({
-                        		title: '用户信息失效，请重新登录！',
-                        		icon: 'none'
-                        	})
-                        } 
-                        succ.call(self, result.data)
-                    },
-                    fail: function (e) {
-                        error.call(self, e)
-                    }
-                })
-            })
-        } else {
-            return new Promise((succ, error) => {
-                uni.request({
-                    url: url,
-                    data: data,
-                    method: "POST",
-                    header: {
-                        "content-type": header,
-                    },
-                    success: function (result) {
-						if(ifShangxian==1){
-							const decryptData =decrypt(urlSafeBase64Decode(result.data))
-							result.data=JSON.parse(decryptData)
+						if (result.data.code == 401 && token) {
+							uni.removeStorageSync("token")
+							uni.removeStorageSync("userId")
+							uni.removeStorageSync("phone")
+							uni.removeStorageSync("openid")
+							uni.removeStorageSync("userName")
+							uni.removeStorageSync("relation")
+							uni.removeStorageSync("relation_id")
+							uni.removeStorageSync("isInvitation")
+							uni.removeStorageSync("zhiFuBao")
+							uni.removeStorageSync("zhiFuBaoName")
+
+							uni.showToast({
+								title: '用户信息失效，请重新登录！',
+								icon: 'none'
+							})
 						}
-                        succ.call(self, result.data)
-                    },
-                    fail: function (e) {
-                        error.call(self, e)
-                    }
-                })
-            })
-        }
-    },
-    postJson: function (url, data, header) {
-		if(ifShangxian==1){
-			if(data){
-				var a=JSON.stringify(data)
-				data='"' + urlSafeBase64Encode(encrypt(a)) + '"'
-			}else{
-			}
+						succ.call(self, result.data)
+					},
+					fail: function(e) {
+						error.call(self, e)
+					}
+				})
+			})
+		} else {
+			return new Promise((succ, error) => {
+				uni.request({
+					url: url,
+					data: data,
+					method: "POST",
+					header: {
+						"content-type": header,
+					},
+					success: function(result) {
+						if (ifShangxian == 1) {
+							const decryptData = decrypt(urlSafeBase64Decode(result.data))
+							result.data = JSON.parse(decryptData)
+						}
+						succ.call(self, result.data)
+					},
+					fail: function(e) {
+						error.call(self, e)
+					}
+				})
+			})
+		}
+	},
+	postJson: function(url, data, header) {
+		if (ifShangxian == 1) {
+			if (data) {
+				var a = JSON.stringify(data)
+				data = '"' + urlSafeBase64Encode(encrypt(a)) + '"'
+			} else {}
 		}
-        header = header || "application/json";
-        url = this.config("APIHOST1") + url;
-        let token = uni.getStorageSync("token");
-        if (token) {
-            return new Promise((succ, error) => {
-                uni.request({
-                    url: url,
-                    data: data,
-                    method: "POST",
-                    header: {
-                        "content-type": header,
-                        "token": token
-                    },
-                    success: function (result) {
-						if(ifShangxian==1){
-							const decryptData =decrypt(urlSafeBase64Decode(result.data))
-							result.data=JSON.parse(decryptData)
+		header = header || "application/json";
+		url = this.config("APIHOST1") + url;
+		let token = uni.getStorageSync("token");
+		if (token) {
+			return new Promise((succ, error) => {
+				uni.request({
+					url: url,
+					data: data,
+					method: "POST",
+					header: {
+						"content-type": header,
+						"token": token
+					},
+					success: function(result) {
+						if (ifShangxian == 1) {
+							const decryptData = decrypt(urlSafeBase64Decode(result.data))
+							result.data = JSON.parse(decryptData)
 						}
-                        if(result.data.code == 401&&token) {
-                        	uni.removeStorageSync("token")
-                        	uni.removeStorageSync("userId")
-                        	uni.removeStorageSync("phone")
-                        	uni.removeStorageSync("openid")
-                        	uni.removeStorageSync("userName")
-                        	uni.removeStorageSync("relation")
-                        	uni.removeStorageSync("relation_id")
-                        	uni.removeStorageSync("isInvitation")
-                        	uni.removeStorageSync("zhiFuBao")
-                        	uni.removeStorageSync("zhiFuBaoName")
-                        	
-                        	uni.showToast({
-                        		title: '用户信息失效，请重新登录！',
-                        		icon: 'none'
-                        	})
-                        } 
-                        succ.call(self, result.data)
-                    },
-                    fail: function (e) {
-                        error.call(self, e)
-                    }
-                })
-            })
-        } else {
-            return new Promise((succ, error) => {
-                uni.request({
-                    url: url,
-                    data: data,
-                    method: "POST",
-                    header: {
-                        "content-type": header,
-                    },
-                    success: function (result) {
-						if(ifShangxian==1){
-							const decryptData =decrypt(urlSafeBase64Decode(result.data))
-							result.data=JSON.parse(decryptData)
+						if (result.data.code == 401 && token) {
+							uni.removeStorageSync("token")
+							uni.removeStorageSync("userId")
+							uni.removeStorageSync("phone")
+							uni.removeStorageSync("openid")
+							uni.removeStorageSync("userName")
+							uni.removeStorageSync("relation")
+							uni.removeStorageSync("relation_id")
+							uni.removeStorageSync("isInvitation")
+							uni.removeStorageSync("zhiFuBao")
+							uni.removeStorageSync("zhiFuBaoName")
+
+							uni.showToast({
+								title: '用户信息失效，请重新登录！',
+								icon: 'none'
+							})
 						}
-                        succ.call(self, result.data)
-                    },
-                    fail: function (e) {
-                        error.call(self, e)
-                    }
-                })
-            })
-        }
-    },
-    getT: function (url, data, header) {
-		if(ifShangxian==1){
-			if(data){
+						succ.call(self, result.data)
+					},
+					fail: function(e) {
+						error.call(self, e)
+					}
+				})
+			})
+		} else {
+			return new Promise((succ, error) => {
+				uni.request({
+					url: url,
+					data: data,
+					method: "POST",
+					header: {
+						"content-type": header,
+					},
+					success: function(result) {
+						if (ifShangxian == 1) {
+							const decryptData = decrypt(urlSafeBase64Decode(result.data))
+							result.data = JSON.parse(decryptData)
+						}
+						succ.call(self, result.data)
+					},
+					fail: function(e) {
+						error.call(self, e)
+					}
+				})
+			})
+		}
+	},
+	getT: function(url, data, header) {
+		if (ifShangxian == 1) {
+			if (data) {
 				// console.log(data,'l')
-				var arr =Object.entries(data)//对象转为数组
-				var b=[]
-				arr.forEach((element, index) => {  
+				var arr = Object.entries(data) //对象转为数组
+				var b = []
+				arr.forEach((element, index) => {
 					arr[index][1] = urlSafeBase64Encode(encrypt(element[1].toString()))
-				}); 
-				b=arr
-				data=Object.fromEntries(b)
+				});
+				b = arr
+				data = Object.fromEntries(b)
 				// console.log(data,'k')
-			}else{
-			}
+			} else {}
 		}
-        header = header || "application/x-www-form-urlencoded";
-        url = this.config("APIHOST1") + url;
-        let token = uni.getStorageSync("token");
-        if (token) {
-            return new Promise((succ, error) => {
-                uni.request({
-                    url: url,
-                    data: data,
-                    method: "GET",
-                    header: {
-                        "content-type": header,
-                        "token": token
-                    },
-                    success: function (result) {
-						if(ifShangxian==1){
-							const decryptData =decrypt(urlSafeBase64Decode(result.data))
-							result.data=JSON.parse(decryptData)
+		header = header || "application/x-www-form-urlencoded";
+		url = this.config("APIHOST1") + url;
+		let token = uni.getStorageSync("token");
+		if (token) {
+			return new Promise((succ, error) => {
+				uni.request({
+					url: url,
+					data: data,
+					method: "GET",
+					header: {
+						"content-type": header,
+						"token": token
+					},
+					success: function(result) {
+						if (ifShangxian == 1) {
+							const decryptData = decrypt(urlSafeBase64Decode(result.data))
+							result.data = JSON.parse(decryptData)
 						}
-						if(result.data.code == 401&&token) {
+						if (result.data.code == 401 && token) {
 							uni.removeStorageSync("token")
 							uni.removeStorageSync("userId")
 							uni.removeStorageSync("phone")
@@ -278,73 +276,72 @@ module.exports = {
 							uni.removeStorageSync("isInvitation")
 							uni.removeStorageSync("zhiFuBao")
 							uni.removeStorageSync("zhiFuBaoName")
-							
+
 							uni.showToast({
 								title: '用户信息失效，请重新登录！',
 								icon: 'none'
 							})
-						} 
-                        succ.call(self, result.data)
-                    },
-                    fail: function (e) {
-                        error.call(self, e)
-                    }
-                })
-            })
-        } else {
-            return new Promise((succ, error) => {
-                uni.request({
-                    url: url,
-                    data: data,
-                    method: "GET",
-                    header: {
-                        "content-type": header
-                    },
-                    success: function (result) {
-						if(ifShangxian==1){
-							const decryptData =decrypt(urlSafeBase64Decode(result.data))
-							result.data=JSON.parse(decryptData)
 						}
-                        succ.call(self, result.data)
-                    },
-                    fail: function (e) {
-                        error.call(self, e)
-                    }
-                })
-            })
-        }
-    },
-    get: function (url, data, header) {
-		if(ifShangxian==1){
-			if(data){
-				var arr =Object.entries(data)//对象转为数组
-				var b=[]
-				arr.forEach((element, index) => {  
+						succ.call(self, result.data)
+					},
+					fail: function(e) {
+						error.call(self, e)
+					}
+				})
+			})
+		} else {
+			return new Promise((succ, error) => {
+				uni.request({
+					url: url,
+					data: data,
+					method: "GET",
+					header: {
+						"content-type": header
+					},
+					success: function(result) {
+						if (ifShangxian == 1) {
+							const decryptData = decrypt(urlSafeBase64Decode(result.data))
+							result.data = JSON.parse(decryptData)
+						}
+						succ.call(self, result.data)
+					},
+					fail: function(e) {
+						error.call(self, e)
+					}
+				})
+			})
+		}
+	},
+	get: function(url, data, header) {
+		if (ifShangxian == 1) {
+			if (data) {
+				var arr = Object.entries(data) //对象转为数组
+				var b = []
+				arr.forEach((element, index) => {
 					arr[index][1] = urlSafeBase64Encode(encrypt(element[1].toString()))
-				}); 
-				b=arr
-				data=Object.fromEntries(b)
-			}else{
-			}
+				});
+				b = arr
+				data = Object.fromEntries(b)
+			} else {}
 		}
-        header = header || "application/x-www-form-urlencoded";
-        url = this.config("APIHOST") + url;
+		header = header || "application/x-www-form-urlencoded";
+		url = this.config("APIHOST") + url;
 		let token = uni.getStorageSync("token");
-        return new Promise((succ, error) => {
-            uni.request({
-                url: url,
-                data: data,
-                method: "GET",
-                header: {
-                    "content-type": header,
-					 "token": token
-                },
-                success: function (result) {
-					if(ifShangxian==1){
-						const decryptData =decrypt(urlSafeBase64Decode(result.data))
-						result.data=JSON.parse(decryptData)
+		return new Promise((succ, error) => {
+			uni.request({
+				url: url,
+				data: data,
+				method: "GET",
+				header: {
+					"content-type": header,
+					"token": token
+				},
+				success: function(result) {
+					if (ifShangxian == 1) {
+						const decryptData = decrypt(urlSafeBase64Decode(result.data))
+						result.data = JSON.parse(decryptData)
 					}
-					if(result.data.code == 401&&token) {
+					if (result.data.code == 401 && token) {
 						uni.removeStorageSync("token")
 						uni.removeStorageSync("userId")
 						uni.removeStorageSync("phone")
@@ -355,51 +352,50 @@ module.exports = {
 						uni.removeStorageSync("isInvitation")
 						uni.removeStorageSync("zhiFuBao")
 						uni.removeStorageSync("zhiFuBaoName")
-						
+
 						uni.showToast({
 							title: '用户信息失效，请重新登录！',
 							icon: 'none'
 						})
-					} 
+					}
 					succ.call(self, result.data)
-                },
-                fail: function (e) {
-                    error.call(self, e)
-                }
-            })
-        })
-    },
-	getMsg: function (url, data, header) {
-		if(ifShangxian==1){
-			if(data){
-				var arr =Object.entries(data)//对象转为数组
-				var b=[]
-				arr.forEach((element, index) => {  
+				},
+				fail: function(e) {
+					error.call(self, e)
+				}
+			})
+		})
+	},
+	getMsg: function(url, data, header) {
+		if (ifShangxian == 1) {
+			if (data) {
+				var arr = Object.entries(data) //对象转为数组
+				var b = []
+				arr.forEach((element, index) => {
 					arr[index][1] = urlSafeBase64Encode(encrypt(element[1].toString()))
-				}); 
-				b=arr
-				data=Object.fromEntries(b)
-			}else{
-			}
+				});
+				b = arr
+				data = Object.fromEntries(b)
+			} else {}
 		}
-	    header = header || "application/x-www-form-urlencoded";
-	    url = this.config("APIHOST") + url;
+		header = header || "application/x-www-form-urlencoded";
+		url = this.config("APIHOST") + url;
 		let token = uni.getStorageSync("token");
-	    return new Promise((succ, error) => {
-	        uni.request({
-	            url: url,
-	            data: data,
-	            method: "GET",
-	            header: {
-	                "content-type": header,
-					 "token": token
-	            },
-	            success: function (result) {
-					if(ifShangxian==1){
-						const decryptData =decrypt(urlSafeBase64Decode(result.data))
-						result.data=JSON.parse(decryptData)
+		return new Promise((succ, error) => {
+			uni.request({
+				url: url,
+				data: data,
+				method: "GET",
+				header: {
+					"content-type": header,
+					"token": token
+				},
+				success: function(result) {
+					if (ifShangxian == 1) {
+						const decryptData = decrypt(urlSafeBase64Decode(result.data))
+						result.data = JSON.parse(decryptData)
 					}
-					if(result.data.code == 401&&token) {
+					if (result.data.code == 401 && token) {
 						uni.removeStorageSync("token")
 						uni.removeStorageSync("userId")
 						uni.removeStorageSync("phone")
@@ -410,18 +406,18 @@ module.exports = {
 						uni.removeStorageSync("isInvitation")
 						uni.removeStorageSync("zhiFuBao")
 						uni.removeStorageSync("zhiFuBaoName")
-						
+
 						uni.showToast({
 							title: '用户信息失效，请重新登录！',
 							icon: 'none'
 						})
-					} 
-	                succ.call(self, result.data)
-	            },
-	            fail: function (e) {
-	                error.call(self, e)
-	            }
-	        })
-	    })
+					}
+					succ.call(self, result.data)
+				},
+				fail: function(e) {
+					error.call(self, e)
+				}
+			})
+		})
 	}
-}
+}

pages/index/shop/confirmOrder.vue

@@ -4,11 +4,11 @@
 		<view class="text-center text-red" v-if="isTrue && orderType == 2">超出配送距离</view>
 		<view class="food">
 			<view class="flex bg justify-between padding-lr-xl">
-				<view @click="switchTab(2)" :class="orderType == 2 ? 'select' : ''" class="tabBtn" v-if="XCXIsSelect == '是'">
+				<view @click="switchTab(2)" :class="orderType == 2 ? 'select' : ''" class="tabBtn" v-if="XCXIsSelect == '是' && showReach != 1">
 					<view class="title">外卖配送</view>
 					<view :class="orderType == 2 ? 'active' : ''"></view>
 				</view>
-				<view @click="switchTab(1)" :class="orderType == 1 ? 'select' : ''" class="tabBtn">
+				<view @click="switchTab(1)" :class="orderType == 1 ? 'select' : ''" class="tabBtn" v-if="showReach != 2">
 					<view class="title">到店自取</view>
 					<view :class="orderType == 1 ? 'active' : ''"></view>
 				</view>
@@ -344,11 +344,15 @@ export default {
 			timer: '', //定时器
 			autoSendOrder: 0, //autoSendOrder为1商家自配，0平台配送
 			reservationOpenFlag: 0, //1预约，0不预约
-			status: null
+			status: null,
+			showReach: null
 		}
 	},
 	onLoad(option) {
 		console.log(option, '256')
+		if (option.showReach) {
+			this.showReach = option.showReach
+		}
 		// #ifdef APP
 		this.openLists = [
 			{
@@ -414,6 +418,7 @@ export default {
 		if (option.status) {
 			this.status = option.status
 		}
+
 		// #ifndef H5
 		uni.getLocation({
 			type: 'gcj02', //返回可以用于uni.openLocation的经纬度
@@ -1216,6 +1221,7 @@ export default {
 				}
 
 				this.$Request.post('/app/wxPay/wxPayJsApiOrder', data).then((res) => {
+					console.log(res, '987')
 					// uni.hideLoading();
 					if (res.code == 0) {
 						uni.requestPayment({

pages/order/index.vue

@@ -72,7 +72,7 @@
 							<view v-if="item.status == 7" class="btn" @click.stop="cancel(item)">取消订单</view>
 						</view>
 						<view class="flex padding-tb-sm">
-							<view v-if="item.status == 0" class="btn" @click.stop="payFinishCancel(item.orderId)">取消订单</view>
+							<view style="margin-left: 225rpx" v-if="item.status == 0" class="btn" @click.stop="payFinishCancel(item.orderId)">取消订单</view>
 						</view>
 						<view v-if="item.status == 4 && item.commentFlag != 1" class="btn" @click.stop="pingjia(item)">评价订单</view>
 
@@ -984,7 +984,7 @@ export default {
 		}, 1000),
 		goPay(item) {
 			uni.navigateTo({
-				url: `/pages/index/shop/confirmOrder?shopId=${item.shopId}&orderType=${item.orderType}&orderId=${item.orderId}&status=${item.status}`
+				url: `/pages/index/shop/confirmOrder?shopId=${item.shopId}&orderType=${item.orderType}&orderId=${item.orderId}&status=${item.status}&showReach=${item.orderType}`
 			})
 		},
 		// 待结算订单取消接口 倒计时结束触发