Merge pull request #35 from SunJackson/subscribe

修复不能给多人发送订阅BUG，添加首页排序功能，优化缓存openid，优化取消订阅显示

.gitignore

@@ -13,3 +13,4 @@ yarn-error.log*
 *.ntvs*
 *.njsproj
 *.sln
+manifest.json

App.vue

@@ -15,7 +15,10 @@ export default {
 			openid: 'https://88d58ce0-c72d-4ad5-9ad5-5196f032ef71.bspapp.com/http/api/openid',
 		},
 		subscribe: 'https://88d58ce0-c72d-4ad5-9ad5-5196f032ef71.bspapp.com/http/subscribe',
-	}
+		openid: '',
+	},
+
+	
 
 };
 </script>

cloudfunctions-aliyun/api/models/home.js

@@ -6,7 +6,7 @@ var home = {
 		return tabs
 	},
 	coupons: () => {
-		let coupons = db.collection('coupon').get();
+		let coupons = db.collection('coupon').orderBy("sort", "desc").get();
 		return coupons
 	},
 }

cloudfunctions-aliyun/db_init.json

@@ -1,87 +1,101 @@
-// 在本文件中可配置云数据库初始化，数据格式见：https://uniapp.dcloud.io/uniCloud/cf-database?id=db_init
-
-// 编写完毕后对本文件点右键，可按配置规则创建表和添加数据
-
 {
-	"coupon": { // 集合（表名）
+    "coupon": {
-		"data": [ // 数据
+        "data": [
             {
-				"name": "饿了么红包",
+                "_id": {
-				"icon": "/static/coupon/ele.png",
+                    "$oid": "5fe62b3eee98e30001cb59d0"
-				"bannerPic": "/static/coupon/ele_banner.png",
-				"url": "https://s.click.ele.me/frZOjvu",
-				"type": 1,
-				"tabId": 1,
-				"minapp": {
-					"appid": "wxece3a9a4c82f58c9",
-					"path": "pages/sharePid/web/index?scene=https://s.click.ele.me/wR9ecuu"
-				}
                 },
-			{
-				"name": "美团外卖红包",
-				"icon": "/static/coupon/meituan.png",
                 "bannerPic": "/static/coupon/meituan_banner.png",
-				"url": "https://runion.meituan.com/url?key=cd23768d09c339d1641b2738df39aa67&url=https%3A%2F%2Fi.meituan.com%2Fawp%2Fhfe%2Fblock%2Fa945391288b790d558b7%2F78716%2Findex.html%3Fappkey%3Dcd23768d09c339d1641b2738df39aa67%3Ajuhe&sid=juhe",
+                "icon": "/static/coupon/meituan.png",
-				"type": 1,
-				"tabId": 2,
                 "minapp": {
                     "appid": "wxde8ac0a21135c07d",
                     "path": "/index/pages/h5/h5?weburl=https%3A%2F%2Frunion.meituan.com%2Furl%3Fkey%3D591ec05930c57331c1212b936e6785c1%26url%3Dhttps%253A%252F%252Fi.meituan.com%252Fawp%252Fhfe%252Fblock%252Fa13b87919a9ace9cfab4%252F89400%252Findex.html%253Fappkey%253D591ec05930c57331c1212b936e6785c1%253A000001%26sid%3D000001&lch=cps:waimai:5:591ec05930c57331c1212b936e6785c1:000001&f_token=1&f_userId=1"
-				}
+                },
+                "name": "美团外卖红包",
+                "tabId": 2,
+                "type": 1,
+                "url": "https://runion.meituan.com/url?key=cd23768d09c339d1641b2738df39aa67&url=https%3A%2F%2Fi.meituan.com%2Fawp%2Fhfe%2Fblock%2Fa945391288b790d558b7%2F78716%2Findex.html%3Fappkey%3Dcd23768d09c339d1641b2738df39aa67%3Ajuhe&sid=juhe",
+                "sort": 100
             },
             {
-				"name": "三只松鼠大礼包",
+                "_id": {
-				"icon": "/static/coupon/jd.png",
+                    "$oid": "5fe62b3eee98e30001cb59cf"
+                },
+                "bannerPic": "/static/coupon/ele_banner.png",
+                "icon": "/static/coupon/ele.png",
+                "minapp": {
+                    "appid": "wxece3a9a4c82f58c9",
+                    "path": "pages/sharePid/web/index?scene=https://s.click.ele.me/wR9ecuu"
+                },
+                "name": "饿了么红包",
+                "tabId": 1,
+                "type": 1,
+                "url": "https://s.click.ele.me/frZOjvu",
+                "sort": 99
+            },
+            {
+                "_id": {
+                    "$oid": "5fe62b3eee98e30001cb59d1"
+                },
                 "bannerPic": "/static/coupon/sanzhisongshu.png",
-				"url":"https://u.jd.com/tFDejq",
+                "icon": "/static/coupon/jd.png",
-				"type": 0,
-				"tabId": 3,
                 "minapp": {
                     "appid": "wx91d27dbf599dff74",
                     "path": "pages/proxy/union/union"
-				}
+                },
+                "name": "三只松鼠大礼包",
+                "tabId": 3,
+                "type": 0,
+                "url": "https://u.jd.com/tFDejq",
+                "sort": 110
             }
         ],
         "schema": {
             "bsonType": "object",
             "permission": {
-				".read": true,
                 ".create": false,
-				".update": false,
+                ".delete": false,
-				".delete": false
+                ".read": true,
+                ".update": false
             }
         }
     },
-	"tab": { // 集合（表名）
+    "messages": {
-		"data": [ // 数据
+        "data": [
             {
-				"icon": "/static/all.png",
+                "_id": {
-				"text": "全部",
+                    "$oid": "5fe63c00646351000153d6a8"
-				"tabId": 0
+                },
+                "touser": "o8Pqo5Ac9_ntJ7cOdhYVcF5QaAVg",
+                "page": "pages/index/index",
+                "data": "外卖领券提醒, 快来领优惠券啦！",
+                "templateId": "hLV31-w38lq0yq8p6GEQUtBU7brtMrCFmaCCyxbU4xI",
+                "subscribeDate": "2020-12-26",
+                "sendDate": "2020-12-27",
+                "send": true
             },
             {
-				"icon": "/static/ele.png",
+                "_id": {
-				"text": "饿了么",
+                    "$oid": "5fe8a6c9fb0f85000120f7ee"
-				"tabId": 1
                 },
-			{
+                "touser": "o8Pqo5B3v9GtB3lCx0EujzSUs-v4",
-				"icon": "/static/meituan.png",
+                "page": "pages/index/index",
-				"text": "美团",
+                "data": "外卖领券提醒, 快来领优惠券啦！",
-				"tabId": 2
+                "templateId": "hLV31-w38lq0yq8p6GEQUtBU7brtMrCFmaCCyxbU4xI",
-			},
+                "subscribeDate": "2020-12-28",
-			{
+                "sendDate": "2020-12-27",
-				"icon": "/static/jd.png",
+                "send": true
-				"text": "京东",
-				"tabId": 3
             }
-		],
+        ]
+    },
+    "tab": {
         "schema": {
             "bsonType": "object",
             "permission": {
-				".read": true,
                 ".create": false,
-				".update": false,
+                ".delete": false,
-				".delete": false
+                ".read": true,
+                ".update": false
             }
         }
     }

cloudfunctions-aliyun/send/index.js

@@ -35,16 +35,21 @@ exports.main = async (event, context) => {
 	  // 从云开发数据库中查询等待发送的消息列表
 	const messages = await db
 	.collection('messages')
-	// 查询条件这里做了简化，只查找了状态为未发送的消息
-	// 在真正的生产环境，可以根据开课日期等条件筛选应该发送哪些消息
 	.where({
 	  send: false,
 	})
 	.get();
 	const now_date = getFormatDate(0);
+	let sendArr = [];
 	// 循环消息列表
 	const sendPromises = messages.data.map(async message => {
 	// 发送订阅消息
+	try{
+		if (sendArr.includes(message.touser)){
+			console.log('该用户已发送！')
+		}else
+		{
+		sendArr.push(message.touser);
 		const sendUrl = 'https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=' + access_token;
 		let send_data = {
 				touser: message.touser,
@@ -63,6 +68,7 @@ exports.main = async (event, context) => {
 				template_id: message.templateId,
 				};
 		console.log(send_data);
+		
 		// uniCloud.httpclient 发起请求
 		const sendres = await uniCloud.httpclient.request(sendUrl,
 		{	
@@ -70,20 +76,24 @@ exports.main = async (event, context) => {
 		method: 'POST',
 		contentType: 'json',
 		dataType:"json",
-	},
+		});
-	 function(error, response, body) {  
+		console.log('发送成功');
-	    if (!error && response.statusCode == 200) {  
+		console.log(message);
-	        console.log(response) // 请求成功的处理逻辑
 		// 发送成功后将消息的状态改为已发送
-			db.collection('messages')
+		return await db.collection('messages')
 					.doc(message._id)
 					.update({
-			  data: {
 						send: true,
-			  },
+						sendDate: now_date,
+					  }
+					)
+		}
+	}catch(e){
+		//TODO handle the exception
+		console.log('发送失败');
+		console.log(message);
+	}
 	});
-	    }  
+	return Promise.all(sendPromises)
-	}
+	
-	);
-})
 };

pages/index/index.vue

@@ -21,6 +21,8 @@
 </template>
 
 <script>
+
+
 export default {
 	data() {
 		return {
@@ -38,7 +40,7 @@ export default {
 		//#endif
 		//#ifdef MP-WEIXIN
 		let tabId = e.tabId ? parseInt(e.tabId) : 0
-		this.onSubscribe();
+		this.onSubscribe()
 		//#endif
 		for(let i in this.tabs){
 			if(tabId == this.tabs[i].tabId){
@@ -80,22 +82,11 @@ export default {
 	},
 	methods: {
 		onSubscribe() {
-			uni.login({
+			try {
-				success: function(res) {
+			    const openid = uni.getStorageSync('openid');
-					if (res.code) {
+			    if (openid) {
-						uni.getUserInfo({
+					console.log('获取缓存openid');
-							success: function(res)  {
+			        console.log(openid);
-								console.log('存在code');
-							}
-						});
-						uni.request({
-						    url: getApp().globalData.api.openid,
-							data:{
-								jsCode: res.code
-							},
-						    success: (res) => {
-								console.log(res.data);
-						        const openid = res.data.data.openid;
 					uni.showModal({
 					    title: '订阅提示',
 					    content: '点击一下订阅，避免错过一个亿!',
@@ -119,7 +110,93 @@ export default {
 					            });
 								setTimeout(function () {
 								    uni.hideLoading();
-											}, 15000);
+								}, 5000);
+					            // 调用微信 API 申请发送订阅消息
+					            wx.requestSubscribeMessage({
+					            	// 传入订阅消息的模板id，模板 id 可在小程序管理后台申请
+					            	tmplIds: [lessonTmplId],
+					            	success(res) {
+					            	  // 申请订阅成功
+					            	  if (res.errMsg === 'requestSubscribeMessage:ok') {
+					            		uni.request({
+					            		  url: getApp().globalData.subscribe,
+					            		  data: data,
+					            		  success: (res) => {
+					            			  wx.showToast({
+					            				title: '订阅完成',
+					            				image: '../../static/error.png',
+					            				duration: 2000,
+					            			  });
+					            			},
+					            		  fail(res) {
+					            			console.log(res)
+					            			wx.showToast({
+					            			  title: '订阅失败',
+					            			  icon: 'error',
+					            			  duration: 2000,
+					            			});
+					            		  }
+					            		});
+					            	  }
+					            	},
+					            	
+					            });
+					        } else if (res.cancel) {
+					            console.log('用户点击取消');
+								wx.showToast({
+								  title: '订阅失败',
+								  image: '../../static/error.png',
+								  duration: 2000,
+								});
+					        }
+					    }
+					});
+			    }else{
+					console.log('本地未获取到openid');
+					uni.login({
+						success: function(res) {
+							if (res.code) {
+								uni.getUserInfo({
+									success: function(res)  {
+										console.log('存在code');
+									}
+								});
+								uni.request({
+								    url: getApp().globalData.api.openid,
+									data:{
+										jsCode: res.code
+									},
+								    success: (res) => {
+										console.log(res.data);
+								        const openid = res.data.data.openid;
+										uni.setStorage({
+											key:"openid",
+											data: openid
+										});
+										uni.showModal({
+										    title: '订阅提示',
+										    content: '点击一下订阅，避免错过一个亿!',
+											cancelText: '不差钱',
+											cancelColor: '#BEBEBE',
+											confirmText: '订阅',
+											confirmColor: '#007AFF',
+										    success: function (res) {
+										        if (res.confirm) {
+										            console.log('订阅开始')
+													// 活动开始提醒 模板
+										            const lessonTmplId = 'hLV31-w38lq0yq8p6GEQUtBU7brtMrCFmaCCyxbU4xI';
+													const data = {
+										            		data: '外卖领券提醒, 快来领优惠券啦！',
+										            		templateId: lessonTmplId,
+										            		openid: openid,
+										            		  };
+										            console.log(data)
+										            uni.showLoading({
+										              title: '订阅中...',
+										            });
+													setTimeout(function () {
+													    uni.hideLoading();
+													}, 5000);
 										            // 调用微信 API 申请发送订阅消息
 										            wx.requestSubscribeMessage({
 										            	// 传入订阅消息的模板id，模板 id 可在小程序管理后台申请
@@ -141,7 +218,7 @@ export default {
 										            			console.log(res)
 										            			wx.showToast({
 										            			  title: '订阅失败',
-								            			  icon: 'error',
+										            			  image: '../../static/error.png',
 										            			  duration: 2000,
 										            			});
 										            		  }
@@ -152,6 +229,11 @@ export default {
 										            });
 										        } else if (res.cancel) {
 										            console.log('用户点击取消');
+													wx.showToast({
+													  title: '订阅失败',
+													  image: '../../static/error.png',
+													  duration: 2000,
+													});
 										        }
 										    }
 										});
@@ -162,6 +244,11 @@ export default {
 							}
 						}
 					});
+				}
+			} catch (e) {
+			    console.log('获取openid失败');
+			}
+			
 		},
 		changeTab(index) {
 			console.log('当前选中的项：' + index);