From ebc873320675a795c7ddb0327d8b212526e5465d Mon Sep 17 00:00:00 2001
From: zyh94946 <zyh94946@gmail.com>
Date: Fri, 29 Jan 2021 16:04:38 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=B0=86=E5=B0=81=E9=9D=A2=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E6=8F=92=E5=B1=8F=E5=B9=BF=E5=91=8A=E7=A7=BB?=
 =?UTF-8?q?=E5=88=B0=E4=BA=86=E9=A6=96=E9=A1=B5=EF=BC=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=AF=BC=E8=87=B4=E5=B9=BF=E5=91=8A=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E9=A9=B3=E5=9B=9E=E7=9A=84=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/detail/detail.vue                       |  1 -
 pages/index/index.vue                         | 20 +++++++++++++++++++
 uniCloud-aliyun/cloudfunctions/api/index.js   |  1 +
 .../cloudfunctions/api/models/cover.js        |  8 ++++++++
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/pages/detail/detail.vue b/pages/detail/detail.vue
index e713344..20e832f 100644
--- a/pages/detail/detail.vue
+++ b/pages/detail/detail.vue
@@ -17,7 +17,6 @@
 				领取封面
 			</button>
 		</view>
-		<view class="recommand">更多封面👇👇👇</view>
 		<ad-custom :unit-id="ad.three" v-if="ad.three"></ad-custom>
 		<ad :unit-id="ad.four" ad-type="video" ad-theme="white" v-if="ad.four"></ad>
 		<view class="modal" @touchmove.stop="handle" @click="closeModal" v-if="modalShow">
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 61bcc97..ff8fde0 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -29,6 +29,7 @@
 
 <script>
 	import { cover } from '../../request'
+	var interstitialAd = null
 	export default {
 		data() {
 			return {
@@ -57,8 +58,27 @@
 				this.couponList = res.result.data.couponList
 				this.coverList = res.result.data.coverList
 				this.tips = res.result.data.tips
+				this.ads = res.data.data.ads
+				if(this.ads && this.ads.one){
+					this.adinsertInit(this.ads.one)
+				}
 				uni.hideLoading()
 			},
+			//初始化插屏广告
+			adinsertInit(adUnitId) {
+				if (wx.createInterstitialAd) {
+					interstitialAd = wx.createInterstitialAd({
+						adUnitId: adUnitId
+					})
+					interstitialAd.onLoad(() => {
+						interstitialAd.show().catch((err) => {
+							console.error(err)
+						})
+					})
+					interstitialAd.onError((err) => {})
+					interstitialAd.onClose(() => {})
+				}
+			},
 			toCoupon(i){
 				console.log(this.couponList[i])
 				if(this.couponList[i].minapp){
diff --git a/uniCloud-aliyun/cloudfunctions/api/index.js b/uniCloud-aliyun/cloudfunctions/api/index.js
index 53b908f..4cdf981 100644
--- a/uniCloud-aliyun/cloudfunctions/api/index.js
+++ b/uniCloud-aliyun/cloudfunctions/api/index.js
@@ -22,6 +22,7 @@ exports.main = async (event, context) => {
 			resp.couponList = await coverModel.coupons()
 			resp.coverList = await coverModel.list()
 			resp.tips = await coverModel.tips()
+			resp.ads = await coverModel.ads()
 			return response.success(resp)
 			break;
 		//封面详情
diff --git a/uniCloud-aliyun/cloudfunctions/api/models/cover.js b/uniCloud-aliyun/cloudfunctions/api/models/cover.js
index c48b866..328aa6a 100644
--- a/uniCloud-aliyun/cloudfunctions/api/models/cover.js
+++ b/uniCloud-aliyun/cloudfunctions/api/models/cover.js
@@ -15,6 +15,12 @@ var cover = {
 		}).get();
 		return tips.data[0].value
 	},
+	ads: async () => {
+		let ads = await db.collection('config').where({
+			name: "ad"
+		}).get();
+		return ads.data[0].value.detail
+	},
 	detail: async (req) => {
 		let detail = await db.collection('cover').doc(req.id).get();
 		let adLookVideo = await db.collection('ad').where({
@@ -38,6 +44,8 @@ var cover = {
 			name: "ad"
 		}).get();
 		let ad = adConfig.data[0].value.detail
+		//详情页不显示插屏
+		ad.one = ""
 		detail.data[0].getDesc += "\n" + req.openid
 		return {
 			coverDetail: detail.data[0],

From 68799807c8cd1aaba2c7e9e1a25b3bb6a2e71042 Mon Sep 17 00:00:00 2001
From: zyh94946 <zyh94946@gmail.com>
Date: Mon, 1 Feb 2021 17:13:17 +0800
Subject: [PATCH 2/4] =?UTF-8?q?-=20=E5=B0=81=E9=9D=A2=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E6=8F=92=E5=B1=8F=E5=B9=BF=E5=91=8A=E7=A7=BB=E8=87=B3?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=EF=BC=88=E8=AF=A6=E6=83=85=E9=A1=B5=E6=83=B3?=
 =?UTF-8?q?=E5=BC=80=E5=8F=AF=E4=BB=A5=E8=87=AA=E5=B7=B1=E5=BC=80=EF=BC=89?=
 =?UTF-8?q?=20-=20=E7=94=A8=E6=88=B7=E8=B6=85=E9=A2=9D=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A4=84=E7=90=86=EF=BC=88=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=2033/10=EF=BC=89=20-=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E4=B8=8E=E5=A4=84=E7=90=86=E5=8A=9F=E8=83=BD=20-=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E5=B0=81=E9=9D=A2=E9=A2=86?=
 =?UTF-8?q?=E5=8F=96=E8=AE=B0=E5=BD=95=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 32 +++++++++
 uniCloud-aliyun/cloudfunctions/api/index.js   | 12 ++++
 .../cloudfunctions/api/models/cover.js        | 69 ++++++++++++++++++-
 3 files changed, 112 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e132129..8f962a8 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,35 @@
+### 魔改版说明
+
+#### 改进
+
+- 封面详情页插屏广告移至首页（详情页想开可以自己开）
+- 用户超额完成任务处理（防止出现 33/10）
+- 增加用户完成情况查看与处理功能
+- 增加用户封面领取记录表
+
+#### 已知问题
+
+- 由于网络抖动等原因领取记录表可能会出现重复数据，目测不影响
+- 用户领取完成情况查看和处理从浏览器打开返回结果会当作json文件下载，curl无此问题（待大佬修复）
+
+#### 使用说明
+
+使用魔改版请在云数据库创建 `cover_code` 领取记录表。
+
+用户完成情况查看与处理使用：
+
+1.查看用户完成情况
+```shell
+$ curl https://{云空间spaceid}.bspapp.com/http/api/view?openid={用户openid}
+openid:用户openid
+codeId:领取id coverId:封面id invite:所邀请人数 ad:视频观看数 code:兑换码 useTime:领取时间
+```
+
+2.更新用户领取封面的兑换码或其它领取字样，标记该用户已领取此封面。防openid冒领。
+```shell
+$ curl https://{云空间spaceid}.bspapp.com/http/api/view?codeid={codeId}&code={兑换码或者其它已领取字样}
+update success
+```
 
 ### 微信红包封面领取小程序，用户观看视频广告或者邀请新用户可获取微信红包封面序列号，还可给外卖优惠券引流
 
diff --git a/uniCloud-aliyun/cloudfunctions/api/index.js b/uniCloud-aliyun/cloudfunctions/api/index.js
index 4cdf981..6f079ea 100644
--- a/uniCloud-aliyun/cloudfunctions/api/index.js
+++ b/uniCloud-aliyun/cloudfunctions/api/index.js
@@ -43,6 +43,18 @@ exports.main = async (event, context) => {
 			resp = inviteAdd
 			return response.success(resp)
 			break;
+		//完成情况
+		case '/view':
+			var view = await coverModel.view(event.queryStringParameters)
+			return {
+				mpserverlessComposedResponse: true,
+				statusCode: 200,
+				headers: {
+					'content-type': 'text/html'
+				},
+				body: view
+			}
+			break;
 		default:
 
 	}
diff --git a/uniCloud-aliyun/cloudfunctions/api/models/cover.js b/uniCloud-aliyun/cloudfunctions/api/models/cover.js
index 328aa6a..16b548c 100644
--- a/uniCloud-aliyun/cloudfunctions/api/models/cover.js
+++ b/uniCloud-aliyun/cloudfunctions/api/models/cover.js
@@ -39,6 +39,35 @@ var cover = {
 		}else{
 			var isLocked = false
 		}
+
+		//超额完成任务处理
+		if (lookVideoLockNum > detail.data[0].lookVideoLockNum) {
+			lookVideoLockNum = detail.data[0].lookVideoLockNum
+		}
+		if (inviteLockNum > detail.data[0].inviteLockNum) {
+			inviteLockNum = detail.data[0].inviteLockNum
+		}
+
+		//已解锁创建领取记录
+		if (isLocked) {
+			let hasExistCoverCode = await db.collection('cover_code').where({
+				coverId: req.id,
+				bindOpenid: req.openid
+			}).limit(1).get()
+			if (hasExistCoverCode.affectedDocs == 0) {
+				let ins_res = await db.collection('cover_code').add({
+					coverId: req.id,
+					code: "",
+					bindOpenid: req.openid,
+					useTime: new Date().toLocaleString('zh', {hour12: false, timeZone: 'Asia/Shanghai'}),
+					isUse: true
+				})
+			}
+
+			//附加openid
+			detail.data[0].getDesc += "\n" + req.openid
+		}
+
 		//广告位配置
 		let adConfig = await db.collection('config').where({
 			name: "ad"
@@ -46,7 +75,7 @@ var cover = {
 		let ad = adConfig.data[0].value.detail
 		//详情页不显示插屏
 		ad.one = ""
-		detail.data[0].getDesc += "\n" + req.openid
+
 		return {
 			coverDetail: detail.data[0],
 			lockEdInfo: {
@@ -57,6 +86,44 @@ var cover = {
 			ad,
 		}
 	},
+    view: async (req) => {
+		let return_str = ""
+		if (req.openid) {
+			return_str = "openid:"+req.openid+"\n"
+			let user_info = await db.collection('user').where({
+				openid: req.openid,
+			}).get();
+			if(user_info.affectedDocs == 0){
+				return_str += "用户信息不存在！注意伪造openid！\n"
+			}
+			let cover_code_list = await db.collection('cover_code').where({bindOpenid:req.openid}).field({'_id':true,'coverId':true,'code':true,'useTime':true}).get();
+			if (cover_code_list.affectedDocs) {
+				for (let cover_code of cover_code_list.data) {
+					var adLookVideo = await db.collection('ad').where({
+						openid: req.openid,
+						id: cover_code.coverId,
+						isEnded: "true",
+					}).count()
+					var invite = await db.collection('invite').where({
+						inviteOpenid: req.openid,
+						id: cover_code.coverId,
+					}).count()
+					return_str += "codeId:"+cover_code._id+" coverId:"+cover_code.coverId+" invite:"+invite.total+" ad:"+adLookVideo.total+" code:"+cover_code.code+" useTime:"+cover_code.useTime+"\n"
+				}
+
+			}
+
+		}
+
+		if (req.code && req.codeid) {
+			await db.collection('cover_code').doc(req.codeid).update({
+				code : req.code,
+			})
+			return_str += "update success\n"
+		}
+
+		return return_str
+	},
 }
 
 module.exports = cover;

From 5a2be6f79efb24ee4ab2e18b91f53add2632d2c8 Mon Sep 17 00:00:00 2001
From: Zhongyang Hao <zyh94946@gmail.com>
Date: Mon, 1 Feb 2021 17:21:07 +0800
Subject: [PATCH 3/4] Update README.md

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 8f962a8..097b414 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,10 @@
 
 #### 改进
 
-- 封面详情页插屏广告移至首页（详情页想开可以自己开）
-- 用户超额完成任务处理（防止出现 33/10）
-- 增加用户完成情况查看与处理功能
-- 增加用户封面领取记录表
+- 封面详情页插屏广告移至首页（详情页想开可以自己开）需发版
+- 用户超额完成任务处理（防止出现 33/10）需发版
+- 增加用户完成情况查看与处理功能 无需发版，更新云函数即可
+- 增加用户封面领取记录表 无需发版，更新云函数即可
 
 #### 已知问题
 

From 8070d4e1f4ab2f0091002108c446858d6349b9ab Mon Sep 17 00:00:00 2001
From: Zhongyang Hao <zyh94946@gmail.com>
Date: Mon, 1 Feb 2021 23:08:33 +0800
Subject: [PATCH 4/4] Update cover.js

---
 uniCloud-aliyun/cloudfunctions/api/models/cover.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uniCloud-aliyun/cloudfunctions/api/models/cover.js b/uniCloud-aliyun/cloudfunctions/api/models/cover.js
index 16b548c..037d599 100644
--- a/uniCloud-aliyun/cloudfunctions/api/models/cover.js
+++ b/uniCloud-aliyun/cloudfunctions/api/models/cover.js
@@ -123,7 +123,7 @@ var cover = {
 		}
 
 		return return_str
-	},
+	}
 }
 
 module.exports = cover;