瀏覽代碼

no message

xiaoxin 1 年之前
父節點
當前提交
604c218fe7
共有 7 個文件被更改,包括 558 次插入436 次删除
  1. 335 375
      App.vue
  2. 2 7
      common/config.js
  3. 8 1
      my/other/cashDetail.vue
  4. 7 2
      my/store/index.vue
  5. 44 44
      pages/index/index.vue
  6. 74 2
      pages/my/index.vue
  7. 88 5
      pages/order/index.vue

+ 335 - 375
App.vue

@@ -1,375 +1,335 @@
-<script>
-	export default {
-		data() {
-			return {
-
-			}
-		},
-		onLaunch: function() {
-			setInterval(d => { //定时器,定时去调取聊天未读消息
-				console.log(uni.getStorageSync('shopToken'),'初始化')
-				let shopToken = uni.getStorageSync('shopToken')
-				if (shopToken) {
-					let shopId = uni.getStorageSync('shopId')
-					let data={
-						shopId:shopId
-					}
-					
-					this.$Request.get('/shop/ordersChat/selectShopAllUnreadCount',data).then(res => {
-						if (res.code === 0) {
-							// let chatCount = res.data
-							let messageCount = res.data
-
-							uni.setStorageSync('messageCount', messageCount)
-
-							let num =  messageCount
-							if (num == 0) {
-								uni.removeTabBarBadge({
-									index: 2
-								})
-								return;
-							}
-							
-							uni.setTabBarBadge({
-								index: 2,
-								text: num + ""
-							})
-
-						}
-					});
-				}
-			}, 3000);
-
-			//#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 => {
-					//请求后台接口 解析数据 对比版本
-					// let data = {
-					// 	classify: 1
-					// }
-					that.$Request.getT('/app/user/selectNewApp').then(res => {
-						res = res.data[2];
-						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
-		},
-		onShow: function() {
-			console.log('App Show')
-			let updateManager = uni.getUpdateManager();
-			if (!updateManager) {
-			  return;
-			} else {
-			  //新版本更新
-			  if (uni.canIUse("getUpdateManager")) {
-				//判断当前微信版本是否支持版本更新
-		 
-				updateManager.onCheckForUpdate(function (res) {
-				  if (res.hasUpdate) {
-					// 请求完新版本信息的回调
-					updateManager.onUpdateReady(function () {
-						//新的版本已经下载好,调用 applyUpdate 应用新版本并重启
-						updateManager.applyUpdate();
-					 //  uni.showModal({
-						// title: "更新提示",
-						// content: "新版本已经准备好,是否重启应用?",
-						// success: function (res) {
-						//   if (res.confirm) {
-						// 	// 新的版本已经下载好,调用 applyUpdate 应用新版本并重启
-						// 	updateManager.applyUpdate();
-						//   }
-						// },
-					 //  });
-					});
-					// updateManager.onUpdateFailed(function () {
-					//   uni.showModal({
-					// 	// 新的版本下载失败
-					// 	title: "已经有新版本了哟~",
-					// 	content:
-					// 	  "新版本已经上线啦~,请您删除当前小程序,到微信 “发现-小程序” 页,重新搜索打开哦~",
-					//   });
-					// });
-				  } else {
-				  }
-				});
-			  } else {
-				uni.showModal({
-				  // 如果希望用户在最新版本的客户端上体验您的小程序,可以这样子提示
-				  title: "溫馨提示",
-				  content:
-					"当前微信版本过低,部分功能无法使用,请升级到最新微信版本后重试。",
-				});
-			  }
-			}
-				
-			this.$Request.get('/app/common/type/323').then(res => {
-				if (res.code == 0) {
-					// #ifdef MP-WEIXIN
-					this.$queue.setData('XCXIsSelect', res.data.value);
-					// #endif
-					// #ifndef MP-WEIXIN
-					this.$queue.setData('XCXIsSelect', '是');
-					// #endif
-				}
-			});
-			
-			// #ifdef APP-PLUS
-			if (uni.getSystemInfoSync().platform == 'android') {
-				let clientid = plus.push.getClientInfo().clientid;
-			
-				let userId = this.$queue.getData('userId');
-				if (userId) {
-					this.$Request.postT('/user/updateShopClientId?clientId=' + clientid).then(
-						res => {});
-				}
-			}
-			//#endif
-			
-		},
-		methods: {
-
-		},
-		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>
+<script>
+export default {
+	data() {
+		return {}
+	},
+	onLaunch: function () {
+		setInterval((d) => {
+			//定时器,定时去调取聊天未读消息
+			console.log(uni.getStorageSync('shopToken'), '初始化')
+			let shopToken = uni.getStorageSync('shopToken')
+			if (shopToken) {
+				let shopId = uni.getStorageSync('shopId')
+				let data = {
+					shopId: shopId
+				}
+
+				this.$Request.get('/shop/ordersChat/selectShopAllUnreadCount', data).then((res) => {
+					if (res.code === 0) {
+						// let chatCount = res.data
+						let messageCount = res.data
+
+						uni.setStorageSync('messageCount', messageCount)
+
+						let num = messageCount
+						if (num == 0) {
+							uni.removeTabBarBadge({
+								index: 2
+							})
+							return
+						}
+
+						uni.setTabBarBadge({
+							index: 2,
+							text: num + ''
+						})
+					}
+				})
+			}
+		}, 3000)
+
+		//#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) => {
+				//请求后台接口 解析数据 对比版本
+				// let data = {
+				// 	classify: 1
+				// }
+				that.$Request.getT('/app/user/selectNewApp').then((res) => {
+					res = res.data[2]
+					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
+	},
+	onShow: function () {
+		console.log('App Show')
+		let updateManager = uni.getUpdateManager()
+		if (!updateManager) {
+			return
+		} else {
+			//新版本更新
+			if (uni.canIUse('getUpdateManager')) {
+				//判断当前微信版本是否支持版本更新
+
+				updateManager.onCheckForUpdate(function (res) {
+					if (res.hasUpdate) {
+						// 请求完新版本信息的回调
+						updateManager.onUpdateReady(function () {
+							//新的版本已经下载好,调用 applyUpdate 应用新版本并重启
+							updateManager.applyUpdate()
+							//  uni.showModal({
+							// title: "更新提示",
+							// content: "新版本已经准备好,是否重启应用?",
+							// success: function (res) {
+							//   if (res.confirm) {
+							// 	// 新的版本已经下载好,调用 applyUpdate 应用新版本并重启
+							// 	updateManager.applyUpdate();
+							//   }
+							// },
+							//  });
+						})
+						// updateManager.onUpdateFailed(function () {
+						//   uni.showModal({
+						// 	// 新的版本下载失败
+						// 	title: "已经有新版本了哟~",
+						// 	content:
+						// 	  "新版本已经上线啦~,请您删除当前小程序,到微信 “发现-小程序” 页,重新搜索打开哦~",
+						//   });
+						// });
+					} else {
+					}
+				})
+			} else {
+				uni.showModal({
+					// 如果希望用户在最新版本的客户端上体验您的小程序,可以这样子提示
+					title: '溫馨提示',
+					content: '当前微信版本过低,部分功能无法使用,请升级到最新微信版本后重试。'
+				})
+			}
+		}
+
+		this.$Request.get('/app/common/type/323').then((res) => {
+			if (res.code == 0) {
+				// #ifdef MP-WEIXIN
+				this.$queue.setData('XCXIsSelect', res.data.value)
+				// #endif
+				// #ifndef MP-WEIXIN
+				this.$queue.setData('XCXIsSelect', '是')
+				// #endif
+			}
+		})
+
+		// #ifdef APP-PLUS
+		if (uni.getSystemInfoSync().platform == 'android') {
+			let clientid = plus.push.getClientInfo().clientid
+
+			let userId = this.$queue.getData('userId')
+			if (userId) {
+				this.$Request.postT('/user/updateShopClientId?clientId=' + clientid).then((res) => {})
+			}
+		}
+		//#endif
+	},
+	methods: {},
+	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>

+ 2 - 7
common/config.js

@@ -1,15 +1,10 @@
-// const ROOTPATHA = "https://mxys.chuanghai-tech.com/sqx_fast";//https://tcwm.xianmaxiong.com  //https://mxys.chuanghai-tech.com/sqx_fast
-// // const ROOTPATHA = "https://www.daweilinli.com/sqx_fast";
+// const ROOTPATHA = "https://mxys.chuanghai-tech.com/sqx_fast";
 // const ROOTPATHASSS = "https://mxys.chuanghai-tech.com";
 // const ROOTPATHASSS = "https://mxys.chuanghai-tech.com";
-// // const ROOTPATHASSS = "https://www.daweilinli.com";
 // const ROOTPATH = "https://mxys.chuanghai-tech.com/sqx_fast";
 // const ROOTPATH = "https://mxys.chuanghai-tech.com/sqx_fast";
-// // const ROOTPATH = "https://www.daweilinli.com/sqx_fast";
 // const ROOTPATH1 = "https://mxys.chuanghai-tech.com/sqx_fast";
 // const ROOTPATH1 = "https://mxys.chuanghai-tech.com/sqx_fast";
-// const ROOTPATH1 = "https://www.daweilinli.com/sqx_fast";
 // const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"; //联系客服
 // const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"; //联系客服
-// const ROOTPATH2 = "wss://www.daweilinli.com/wss/websocket/"; //联系客服
 // const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"; //聊天
 // const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"; //聊天
-// const ROOTPATH3 = "wss://www.daweilinli.com/wss/ordersChat/"; //聊天
+
 
 
 const ROOTPATHA = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
 const ROOTPATHA = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
 const ROOTPATHASSS = "https://mxys.chuanghai-tech.com/wm-test/wm-api";
 const ROOTPATHASSS = "https://mxys.chuanghai-tech.com/wm-test/wm-api";

+ 8 - 1
my/other/cashDetail.vue

@@ -54,6 +54,10 @@
 					开户人姓名:
 					开户人姓名:
 					<text class="yinghang2">{{ yingPeople }}</text>
 					<text class="yinghang2">{{ yingPeople }}</text>
 				</view>
 				</view>
+				<view style="color: #333333; text-align: left">
+					商户号:
+					<text class="yinghang2">{{ yingNumber }}</text>
+				</view>
 				<!-- <view class="flex justify-between margin-bottom-xl" v-for="(item,index) in openLists" :key="index">
 				<!-- <view class="flex justify-between margin-bottom-xl" v-for="(item,index) in openLists" :key="index">
 					<view class="flex align-center">
 					<view class="flex align-center">
 						<image :src="item.image" style="width:23px;height:20px"></image>
 						<image :src="item.image" style="width:23px;height:20px"></image>
@@ -161,13 +165,14 @@ export default {
 			yingName: '',
 			yingName: '',
 			yingNo: '',
 			yingNo: '',
 			yingPeople: '',
 			yingPeople: '',
+			yingNumber: '',
 			//画板边长默认是屏幕宽度,正方形画布
 			//画板边长默认是屏幕宽度,正方形画布
 			cw: uni.getSystemInfoSync().windowWidth
 			cw: uni.getSystemInfoSync().windowWidth
 		}
 		}
 	},
 	},
 	onLoad() {
 	onLoad() {
 		this.getUserInfo()
 		this.getUserInfo()
-		this.getyinghanglist()
+		// this.getyinghanglist()
 		this.$Request.getT('/common/type/290').then((res) => {
 		this.$Request.getT('/common/type/290').then((res) => {
 			//判断微信提现方式
 			//判断微信提现方式
 			if (res.code == 0) {
 			if (res.code == 0) {
@@ -213,10 +218,12 @@ export default {
 				userId: this.$queue.getData('userId')
 				userId: this.$queue.getData('userId')
 			}
 			}
 			this.$Request.getA('/admin/shop/bank/get-by-user', data).then((res) => {
 			this.$Request.getA('/admin/shop/bank/get-by-user', data).then((res) => {
+				// console.log(res, '999')
 				if (res.msg == 'success') {
 				if (res.msg == 'success') {
 					this.yingName = res.data.openBank
 					this.yingName = res.data.openBank
 					this.yingNo = res.data.cardNo
 					this.yingNo = res.data.cardNo
 					this.yingPeople = res.data.realName
 					this.yingPeople = res.data.realName
+					this.yingNumber = res.data.mchId
 				} else if (res.msg == 'shopId对应的银行卡记录不存在') {
 				} else if (res.msg == 'shopId对应的银行卡记录不存在') {
 					uni.showToast({
 					uni.showToast({
 						icon: 'none',
 						icon: 'none',

+ 7 - 2
my/store/index.vue

@@ -80,6 +80,9 @@
 						<u-radio name="0">关闭</u-radio>
 						<u-radio name="0">关闭</u-radio>
 					</u-radio-group>
 					</u-radio-group>
 				</u-form-item>
 				</u-form-item>
+				<u-form-item label="商铺商户号">
+					{{ shop.mchId }}
+				</u-form-item>
 			</u-form>
 			</u-form>
 		</view>
 		</view>
 
 
@@ -204,7 +207,8 @@ export default {
 				reservationOpenFlag: 0,
 				reservationOpenFlag: 0,
 				facility: 1,
 				facility: 1,
 				snCode: '',
 				snCode: '',
-				value: ''
+				value: '',
+				mchId: ''
 			},
 			},
 			// facility:1,
 			// facility:1,
 			startShow: false,
 			startShow: false,
@@ -274,7 +278,6 @@ export default {
 
 
 		this.getShopList()
 		this.getShopList()
 	},
 	},
-	onShow() {},
 	methods: {
 	methods: {
 		gokefu() {
 		gokefu() {
 			uni.navigateTo({
 			uni.navigateTo({
@@ -299,8 +302,10 @@ export default {
 				shopId: this.$queue.getData('shopId')
 				shopId: this.$queue.getData('shopId')
 			}
 			}
 			this.$Request.getA('/app/shop/selectShopMessage', data).then((res) => {
 			this.$Request.getA('/app/shop/selectShopMessage', data).then((res) => {
+				console.log(res)
 				if (res.code == 0) {
 				if (res.code == 0) {
 					uni.hideLoading()
 					uni.hideLoading()
+					this.shop.mchId = res.data.mchId
 					this.shop.shopName = res.data.shopName
 					this.shop.shopName = res.data.shopName
 					this.shop.detailedAddress = res.data.detailedAddress
 					this.shop.detailedAddress = res.data.detailedAddress
 					this.shop.businessHours = res.data.businessHours
 					this.shop.businessHours = res.data.businessHours

文件差異過大導致無法顯示
+ 44 - 44
pages/index/index.vue


+ 74 - 2
pages/my/index.vue

@@ -318,7 +318,10 @@ export default {
 			arr: [],
 			arr: [],
 			messageCount: '',
 			messageCount: '',
 			isChecked: false,
 			isChecked: false,
-			userId: ''
+			userId: '',
+			messageConfiguration: '',
+			timer: null,
+			errCount: 0
 		}
 		}
 	},
 	},
 	onLoad() {
 	onLoad() {
@@ -392,6 +395,11 @@ export default {
 			this.getSetData()
 			this.getSetData()
 		}
 		}
 	},
 	},
+	onHide() {
+		if (this.timer) {
+			clearInterval(this.timer)
+		}
+	},
 	methods: {
 	methods: {
 		getSetData() {
 		getSetData() {
 			// 获取订阅消息配置
 			// 获取订阅消息配置
@@ -399,13 +407,74 @@ export default {
 				shopId: uni.getStorageSync('shopId')
 				shopId: uni.getStorageSync('shopId')
 			}
 			}
 			this.$Request.getT('/app/goods/selectGoodShop', data).then((res) => {
 			this.$Request.getT('/app/goods/selectGoodShop', data).then((res) => {
-				// console.log(res, '666')
+				// console.log(res, '888')
 				if (res.code == 0) {
 				if (res.code == 0) {
 					if (res.data.messageConfiguration == 1) {
 					if (res.data.messageConfiguration == 1) {
 						this.isChecked = false
 						this.isChecked = false
 					} else {
 					} else {
 						this.isChecked = true
 						this.isChecked = true
 					}
 					}
+
+					this.messageConfiguration = res.data.messageConfiguration
+
+					if (this.messageConfiguration == 0) {
+						this.timer = setInterval(() => {
+							// 订单消息提醒
+							let data = {
+								shopIds: this.$queue.getData('shopId')
+							}
+							this.$Request.post('/admin/ordermessage/selectReadFlagCount', data).then((res) => {
+								console.log(res, '999')
+								if (res.code === 0) {
+									if (res.data > 0) {
+										if (this.errCount != res.data) {
+											this.errCount = res.data
+											this.aplayAudio()
+											uni.showModal({
+												title: '消息',
+												content: '有' + res.data + '条订单,请前往订单中心处理。',
+												success: (ret) => {
+													if (ret.confirm) {
+														uni.switchTab({
+															url: '/pages/order/index'
+														})
+													} else {
+														console.log('else', ret)
+														this.defineCallBack()
+													}
+												}
+											})
+											// this.chatNum = data.data
+										}
+									} else {
+										this.errCount = 0
+									}
+								}
+							})
+						}, 10000)
+					}
+				}
+			})
+		},
+		aplayAudio() {
+			const innerAudioContext = uni.createInnerAudioContext()
+			innerAudioContext.autoplay = true
+			innerAudioContext.src = 'https://pw.xianmxkj.com/file/uploadPath/2022/01/19/0753211f78d718d44ee6372e33eae9ee.mp3'
+			innerAudioContext.onPlay(() => {
+				console.log('开始播放')
+			})
+			innerAudioContext.onError((res) => {
+				console.log(res.errMsg)
+				console.log(res.errCode)
+			})
+		},
+		defineCallBack() {
+			let data = {
+				shopIds: this.$queue.getData('shopId')
+			}
+			this.$Request.post('/admin/ordermessage/allcheckOrderMessage', data).then((res) => {
+				if (res.code === 0) {
+					this.errCount = 0
 				}
 				}
 			})
 			})
 		},
 		},
@@ -755,6 +824,9 @@ export default {
 					})
 					})
 
 
 					setTimeout(() => {
 					setTimeout(() => {
+						if (this.timer) {
+							clearInterval(this.timer)
+						}
 						this.getSetData()
 						this.getSetData()
 					}, 1500)
 					}, 1500)
 				}
 				}

+ 88 - 5
pages/order/index.vue

@@ -344,7 +344,10 @@
 				failYuanyin:'',//短信发送失败原因
 				failYuanyin:'',//短信发送失败原因
 				xuePhone:'',//当前用户
 				xuePhone:'',//当前用户
 				//画板边长默认是屏幕宽度,正方形画布
 				//画板边长默认是屏幕宽度,正方形画布
-				cw: uni.getSystemInfoSync().windowWidth
+				cw: uni.getSystemInfoSync().windowWidth,
+				messageConfiguration:'',
+				timer:null,
+				errCount:0
 			};
 			};
 		},
 		},
 		onLoad(option) {
 		onLoad(option) {
@@ -379,16 +382,96 @@
 			}
 			}
 		},
 		},
 		onShow() {
 		onShow() {
-			let shopId = uni.getStorageSync('shopId');
-			if(shopId){
-				this.getPhone(shopId)
+			this.shopId = uni.getStorageSync('shopId');
+			if(this.shopId){
+				this.getPhone(this.shopId)
+			}
+			
+			let userId = uni.getStorageSync('userId')
+			if(userId){
+				this.getSetData()
 			}
 			}
 			
 			
-			this.shopId = uni.getStorageSync('shopId');
 			this.getOrderList();
 			this.getOrderList();
 			this.clearOrderMsg();
 			this.clearOrderMsg();
 		},
 		},
+		onHide() {
+			if (this.timer) {
+				clearInterval(this.timer)
+			}
+		},
 		methods: {
 		methods: {
+			getSetData() {
+				// 获取订阅消息配置
+				let data = {
+					shopId: uni.getStorageSync('shopId')
+				}
+				this.$Request.getT('/app/goods/selectGoodShop', data).then((res) => {
+					// console.log(res, '888')
+					if (res.code == 0) {
+						this.messageConfiguration = res.data.messageConfiguration
+			
+						if (this.messageConfiguration == 0) {
+							this.timer = setInterval(() => {
+								// 订单消息提醒
+								let data = {
+									shopIds: this.$queue.getData('shopId')
+								}
+								this.$Request.post('/admin/ordermessage/selectReadFlagCount', data).then((res) => {
+									console.log(res, '999')
+									if (res.code === 0) {
+										if (res.data > 0) {
+											if (this.errCount != res.data) {
+												this.errCount = res.data
+												this.aplayAudio()
+												uni.showModal({
+													title: '消息',
+													content: '有' + res.data + '条订单,请前往订单中心处理。',
+													success: (ret) => {
+														if (ret.confirm) {
+															uni.switchTab({
+																url: '/pages/order/index'
+															})
+														} else {
+															console.log('else', ret)
+															this.defineCallBack()
+														}
+													}
+												})
+												// this.chatNum = data.data
+											}
+										} else {
+											this.errCount = 0
+										}
+									}
+								})
+							}, 10000)
+						}
+					}
+				})
+			},
+			aplayAudio() {
+				const innerAudioContext = uni.createInnerAudioContext()
+				innerAudioContext.autoplay = true
+				innerAudioContext.src = 'https://pw.xianmxkj.com/file/uploadPath/2022/01/19/0753211f78d718d44ee6372e33eae9ee.mp3'
+				innerAudioContext.onPlay(() => {
+					console.log('开始播放')
+				})
+				innerAudioContext.onError((res) => {
+					console.log(res.errMsg)
+					console.log(res.errCode)
+				})
+			},
+			defineCallBack() {
+				let data = {
+					shopIds: this.$queue.getData('shopId')
+				}
+				this.$Request.post('/admin/ordermessage/allcheckOrderMessage', data).then((res) => {
+					if (res.code === 0) {
+						this.errCount = 0
+					}
+				})
+			},
 			getPhone(shopId){
 			getPhone(shopId){
 				let data = {
 				let data = {
 					shopId
 					shopId