From 137adad6807b6d64df79870130719f211fc72e0f Mon Sep 17 00:00:00 2001
From: Loki <654612@qq.com>
Date: Fri, 12 Nov 2021 14:49:30 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                |  1 +
 common/notifyMsg.js       | 55 +++++++++++++++++++++++++++++++++++++++
 pages/activity/index.vue  |  2 +-
 pages/index/addShop.vue   | 52 +++---------------------------------
 pages/index/addTask.vue   | 46 +-------------------------------
 pages/index/shopIndex.vue | 55 +++------------------------------------
 pages/member/chongzhi.vue |  2 +-
 pages/my/index.vue        |  2 +-
 pages/my/ranking.vue      |  2 +-
 pages/my/toExamine.vue    |  2 +-
 pages/my/withdrawal.vue   | 53 +++----------------------------------
 pages/public/login.vue    |  4 +--
 pages/public/mobile.vue   |  2 +-
 13 files changed, 75 insertions(+), 203 deletions(-)
 create mode 100644 common/notifyMsg.js

diff --git a/.gitignore b/.gitignore
index 61e18fd..04df119 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .idea
 unpackage
+node_modules
\ No newline at end of file
diff --git a/common/notifyMsg.js b/common/notifyMsg.js
new file mode 100644
index 0000000..03ebdf4
--- /dev/null
+++ b/common/notifyMsg.js
@@ -0,0 +1,55 @@
+export default {
+	
+	openMsg(){
+		var that = this
+		
+		
+		return console.log("test...");
+		
+		wx.getSetting({
+			withSubscriptions: true, //是否获取用户订阅消息的订阅状态，默认false不返回
+			success(ret) {
+				// console.log(ret,'------------------')
+				// console.log(Object.keys(ret.subscriptionsSetting.itemSettings).length)
+				// if (JSON.stringify(ret.subscriptionsSetting.itemSettings).indexOf('accept')!=-1) {
+				if (ret.subscriptionsSetting.itemSettings) {
+					uni.setStorageSync('sendtaskMsg', true)
+					uni.openSetting({ // 打开设置页 
+						success(rea) {
+							console.log(rea.authSetting)
+						}
+					});
+				} else { // 用户没有点击“总是保持以上，不再询问”则每次都会调起订阅消息
+					uni.setStorageSync('sendtaskMsg', false)
+					uni.showModal({
+						title: '提示',
+						content: '为了更好的体验,请绑定消息推送',
+						confirmText: '确定',
+						cancelText: '取消',
+						success: function(res) {
+							if (res.confirm) {
+								uni.requestSubscribeMessage({
+									tmplIds: that.arr,
+									success(re) {
+										// console.log(re,'**********')
+										var datas = JSON.stringify(re);
+										if (datas.indexOf("accept") != -1) {
+											console.log(re)
+										}
+									},
+									fail: (res) => {
+										console.log(res)
+									}
+								})
+								that.showModal = false
+							} else if (res.cancel) {
+								that.showModal = true
+							}
+						}
+					})
+				}
+			}
+		})
+	}
+	
+}
\ No newline at end of file
diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index b3369d6..dc24ca6 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -50,7 +50,7 @@
 		},
 		data() {
 			return {
-				merchantLogo: '../../static/img/logo.jpg',
+				merchantLogo: 'https://download.cyjyyjy.com/fq-logo.jpg',
 				colors: '#FF4701',
 				title: '暂无店铺',
 				merchantId: 0,
diff --git a/pages/index/addShop.vue b/pages/index/addShop.vue
index 9517b5f..b01910c 100644
--- a/pages/index/addShop.vue
+++ b/pages/index/addShop.vue
@@ -65,6 +65,7 @@
 
 <script>
 	import shmilyDragImage from '@/components/shmily-drag-image/shmily-drag-image.vue'
+	import notifyMsg from "@/common/notifyMsg.js"
 	var QQMapWX = require('@/js_sdk/qqmap-wx-jssdk1.2/qqmap-wx-jssdk.js');
 	var qqmapsdk;
 	export default {
@@ -167,65 +168,18 @@
 				this.getUserInfo(userId);
 				//订阅
 				if (this.showModal) {
-					this.openMsg()
+					notifyMsg.openMsg();
 				}
 			}
 		},
 		methods: {
 			// 开启订阅消息
-			openMsg() {
-				var that = this
-				wx.getSetting({
-					withSubscriptions: true, //是否获取用户订阅消息的订阅状态，默认false不返回
-					success(ret) {
-						// console.log(ret,'------------------')
-						// console.log(Object.keys(ret.subscriptionsSetting.itemSettings).length)
-						// if (JSON.stringify(ret.subscriptionsSetting.itemSettings).indexOf('accept')!=-1) {
-						if (ret.subscriptionsSetting.itemSettings) {
-							uni.setStorageSync('sendshopMsg', true)
-							uni.openSetting({ // 打开设置页 
-								success(rea) {
-									console.log(rea.authSetting)
-								}
-							});
-						} else { // 用户没有点击“总是保持以上，不再询问”则每次都会调起订阅消息
-							uni.setStorageSync('sendshopMsg', false)
-							uni.showModal({
-								title: '提示',
-								content: '为了更好的体验,请绑定消息推送',
-								confirmText: '确定',
-								cancelText: '取消',
-								success: function(res) {
-									if (res.confirm) {
-										uni.requestSubscribeMessage({
-											tmplIds: that.arr,
-											success(re) {
-												// console.log(re,'**********')
-												var datas = JSON.stringify(re);
-												if (datas.indexOf("accept") != -1) {
-													console.log(re)
-												}
-											},
-											fail: (res) => {
-												console.log(res)
-											}
-										})
-										that.showModal = false
-									} else if (res.cancel) {
-										that.showModal = true
-									}
-								}
-							})
-						}
-					}
-				})
-			},
 			getUserInfo(userId) {
 				this.$Request.postT("/app/selectUserById?userId=" + userId).then(res => {
 					if (res.code === 0) {
 						this.myphone = res.data.phone;
 						this.$queue.setData("avatar", res.data.imageUrl ? res.data.imageUrl :
-							'/static/img/logo.jpg');
+							'https://download.cyjyyjy.com/fq-logo.jpg');
 						this.$queue.setData("nickName", res.data.nickName ? res.data.nickName : res.data.phone);
 						this.$queue.setData("mobile", res.data.phone);
 						this.$queue.setData("invitationCode", res.data.invitationCode);
diff --git a/pages/index/addTask.vue b/pages/index/addTask.vue
index 40fb27b..e06d772 100644
--- a/pages/index/addTask.vue
+++ b/pages/index/addTask.vue
@@ -243,51 +243,7 @@
 		methods: {
 			// 开启订阅消息
 			openMsg() {
-				var that = this
-				wx.getSetting({
-					withSubscriptions: true, //是否获取用户订阅消息的订阅状态，默认false不返回
-					success(ret) {
-						// console.log(ret,'------------------')
-						// console.log(Object.keys(ret.subscriptionsSetting.itemSettings).length)
-						// if (JSON.stringify(ret.subscriptionsSetting.itemSettings).indexOf('accept')!=-1) {
-						if (ret.subscriptionsSetting.itemSettings) {
-							uni.setStorageSync('sendtaskMsg', true)
-							uni.openSetting({ // 打开设置页 
-								success(rea) {
-									console.log(rea.authSetting)
-								}
-							});
-						} else { // 用户没有点击“总是保持以上，不再询问”则每次都会调起订阅消息
-							uni.setStorageSync('sendtaskMsg', false)
-							uni.showModal({
-								title: '提示',
-								content: '为了更好的体验,请绑定消息推送',
-								confirmText: '确定',
-								cancelText: '取消',
-								success: function(res) {
-									if (res.confirm) {
-										uni.requestSubscribeMessage({
-											tmplIds: that.arr,
-											success(re) {
-												// console.log(re,'**********')
-												var datas = JSON.stringify(re);
-												if (datas.indexOf("accept") != -1) {
-													console.log(re)
-												}
-											},
-											fail: (res) => {
-												console.log(res)
-											}
-										})
-										that.showModal = false
-									} else if (res.cancel) {
-										that.showModal = true
-									}
-								}
-							})
-						}
-					}
-				})
+				
 			},
 			checkMerchant() {
 				let userId = this.$queue.getData('userId');
diff --git a/pages/index/shopIndex.vue b/pages/index/shopIndex.vue
index fd46dcf..fa1bb39 100644
--- a/pages/index/shopIndex.vue
+++ b/pages/index/shopIndex.vue
@@ -118,6 +118,7 @@
 <script>
 	import RenDropdownFilter from '@/components/ren-dropdown-filter/ren-dropdown-filter.vue'
 	import wPicker from "@/components/w-picker/w-picker.vue";
+	import notifyMsg from "@/common/notifyMsg.js"
 	export default {
 		components: {
 			wPicker,
@@ -251,61 +252,13 @@
 			if (userId) {
 				this.getShopList(userId);
 				//订阅
-				// if (this.showModal) {
-				// 	this.openMsg()
-				// }
+				if (this.showModal) {
+					notifyMsg.openMsg();
+				}
 			}
 			this.getBannerList();
 		},
 		methods: {
-			// 开启订阅消息
-			openMsg() {
-				var that = this
-				wx.getSetting({
-					withSubscriptions: true, //是否获取用户订阅消息的订阅状态，默认false不返回
-					success(ret) {
-						// console.log(ret,'------------------')
-						// console.log(Object.keys(ret.subscriptionsSetting.itemSettings).length)
-						// if (JSON.stringify(ret.subscriptionsSetting.itemSettings).indexOf('accept')!=-1) {
-						if (ret.subscriptionsSetting.itemSettings) {
-							uni.setStorageSync('sendindexMsg', true)
-							uni.openSetting({ // 打开设置页 
-								success(rea) {
-									console.log(rea.authSetting)
-								}
-							});
-						} else { // 用户没有点击“总是保持以上，不再询问”则每次都会调起订阅消息
-							uni.setStorageSync('sendindexMsg', false)
-							uni.showModal({
-								title: '提示',
-								content: '为了更好的体验,请绑定消息推送',
-								confirmText: '确定',
-								cancelText: '取消',
-								success: function(res) {
-									if (res.confirm) {
-										uni.requestSubscribeMessage({
-											tmplIds: that.arr,
-											success(re) {
-												// console.log(re,'**********')
-												var datas = JSON.stringify(re);
-												if (datas.indexOf("accept") != -1) {
-													console.log(re)
-												}
-											},
-											fail: (res) => {
-												console.log(res)
-											}
-										})
-										that.showModal = false
-									} else if (res.cancel) {
-										that.showModal = true
-									}
-								}
-							})
-						}
-					}
-				})
-			},
 			getBannerList() {
 				this.$Request.getT('/banner/selectBannerList?state=-1&classify=7').then(res => {
 					if (res.code === 0) {
diff --git a/pages/member/chongzhi.vue b/pages/member/chongzhi.vue
index 18d6ab2..cb08c60 100644
--- a/pages/member/chongzhi.vue
+++ b/pages/member/chongzhi.vue
@@ -81,7 +81,7 @@
 			if (avatar && avatar !== 'undefined') {
 				this.avatar = avatar;
 			} else {
-				this.avatar = '/static/img/logo.jpg';
+				this.avatar = 'https://download.cyjyyjy.com/fq-logo.jpg';
 			}
 			let nickName = this.$queue.getData('nickName');
 			if (nickName && nickName !== 'undefined') {
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 4175bb5..d5e0adf 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -314,7 +314,7 @@
 						this.sex = res.data.sex;
 						this.phone = res.data.phone;
 						this.$queue.setData("avatar", res.data.imageUrl ? res.data.imageUrl :
-							'/static/img/logo.jpg');
+							'https://download.cyjyyjy.com/fq-logo.jpg');
 						this.$queue.setData("nickName", res.data.nickName ? res.data.nickName : res.data.phone);
 						this.$queue.setData("mobile", res.data.phone);
 						this.$queue.setData("invitationCode", res.data.invitationCode);
diff --git a/pages/my/ranking.vue b/pages/my/ranking.vue
index 75d697e..cbac91f 100644
--- a/pages/my/ranking.vue
+++ b/pages/my/ranking.vue
@@ -43,7 +43,7 @@
 		data() {
 			return {
 				rankingList: [],
-				imageUrl: '/static/img/logo.jpg',
+				imageUrl: 'https://download.cyjyyjy.com/fq-logo.jpg',
 				money: 0,
 				page: 1,
 				limit: 20,
diff --git a/pages/my/toExamine.vue b/pages/my/toExamine.vue
index bcfec84..7c421fd 100644
--- a/pages/my/toExamine.vue
+++ b/pages/my/toExamine.vue
@@ -57,7 +57,7 @@
 		data() {
 			return {
 				colors: '#FF4701',
-				merchantLogo: '../../static/img/logo.jpg',
+				merchantLogo: 'https://download.cyjyyjy.com/fq-logo.jpg',
 				merchantId: 0,
 				startDate: 0,
 				endDate: 0,
diff --git a/pages/my/withdrawal.vue b/pages/my/withdrawal.vue
index a1cdb49..25bda9c 100644
--- a/pages/my/withdrawal.vue
+++ b/pages/my/withdrawal.vue
@@ -44,6 +44,7 @@
 </template>
 
 <script>
+	import notifyMsg from "@/common/notifyMsg.js"
 	export default {
 		data() {
 			return {
@@ -92,60 +93,12 @@
 				this.zhifubaoName = this.$queue.getData("zhifubaoName");
 				//订阅
 				if (this.showModal) {
-					this.openMsg()
+					notifyMsg.openMsg();
 				}
 			}
 			this.getasdas();
 		},
 		methods: {
-			// 开启订阅消息
-			openMsg() {
-				var that = this
-				wx.getSetting({
-					withSubscriptions: true, //是否获取用户订阅消息的订阅状态，默认false不返回
-					success(ret) {
-						// console.log(ret,'------------------')
-						// console.log(Object.keys(ret.subscriptionsSetting.itemSettings).length)
-						// if (JSON.stringify(ret.subscriptionsSetting.itemSettings).indexOf('accept')!=-1) {
-						if (ret.subscriptionsSetting.itemSettings) {
-							uni.setStorageSync('sendjifenMsg', true)
-							uni.openSetting({ // 打开设置页 
-								success(rea) {
-									console.log(rea.authSetting)
-								}
-							});
-						} else { // 用户没有点击“总是保持以上，不再询问”则每次都会调起订阅消息
-							uni.setStorageSync('sendjifenMsg', false)
-							uni.showModal({
-								title: '提示',
-								content: '为了更好的体验,请绑定消息推送',
-								confirmText: '确定',
-								cancelText: '取消',
-								success: function(res) {
-									if (res.confirm) {
-										uni.requestSubscribeMessage({
-											tmplIds: that.arr,
-											success(re) {
-												// console.log(re,'**********')
-												var datas = JSON.stringify(re);
-												if (datas.indexOf("accept") != -1) {
-													console.log(re)
-												}
-											},
-											fail: (res) => {
-												console.log(res)
-											}
-										})
-										that.showModal = false
-									} else if (res.cancel) {
-										that.showModal = true
-									}
-								}
-							})
-						}
-					}
-				})
-			},
 			typeSelect(type) {
 				if (uni.getStorageSync('sendjifenMsg')) {
 					uni.requestSubscribeMessage({
@@ -173,7 +126,7 @@
 				this.$Request.postT("/app/selectUserById?userId=" + userId).then(res => {
 					if (res.code === 0) {
 						this.$queue.setData("avatar", res.data.imageUrl ? res.data.imageUrl :
-							'/static/img/logo.jpg');
+							'https://download.cyjyyjy.com/fq-logo.jpg');
 						this.$queue.setData("nickName", res.data.nickName ? res.data.nickName : res.data.phone);
 						this.$queue.setData("mobile", res.data.phone);
 						this.$queue.setData("invitationCode", res.data.invitationCode);
diff --git a/pages/public/login.vue b/pages/public/login.vue
index 988c714..97b2521 100644
--- a/pages/public/login.vue
+++ b/pages/public/login.vue
@@ -140,7 +140,7 @@
 						that.$queue.setData('userId', res.user.userId);
 
 						that.$queue.setData("avatar", res.user.imageUrl ? res.user.imageUrl :
-							'/static/img/logo.jpg');
+							'https://download.cyjyyjy.com/fq-logo.jpg');
 						that.$queue.setData("nickName", res.user.nickName ? res.user.nickName : res.user.phone);
 						that.$queue.setData("mobile", res.user.phone);
 						that.$queue.setData("invitationCode", res.user.invitationCode);
@@ -266,7 +266,7 @@
 				this.$Request.postT('/app/selectUserById?userId=' + userId).then(res => {
 					if (res.code === 0) {
 						this.$queue.setData('avatar', res.data.imageUrl ? res.data.imageUrl :
-							'/static/img/logo.jpg');
+							'https://download.cyjyyjy.com/fq-logo.jpg');
 						this.$queue.setData('nickName', res.data.nickName ? res.data.nickName : res.data.phone);
 						this.$queue.setData('mobile', res.data.phone);
 						this.$queue.setData('invitationCode', res.data.invitationCode);
diff --git a/pages/public/mobile.vue b/pages/public/mobile.vue
index 42785bb..8e57261 100644
--- a/pages/public/mobile.vue
+++ b/pages/public/mobile.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view style="display: flex;margin: 40upx;">
-			<image src="../../static/img/logo.jpg" mode="aspectFit" style="width: 140upx;height: 140upx;border-radius: 16upx;"></image>
+			<image src="https://download.cyjyyjy.com/fq-logo.jpg" mode="aspectFit" style="width: 140upx;height: 140upx;border-radius: 16upx;"></image>
 			<view style="margin-left: 32upx;">
 				<view style="color: #e10a07;font-size: 32upx;">实名提醒</view>
 				<view style="margin-right: 120upx;font-size: 28upx;color: #999999;margin-top: 16upx;">应国家法律要求全面实行实名制须绑定手机完成认证</view>