From 014d19782d262ba7c6303a62ecd1f60d7f5abef6 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 27 Apr 2023 11:17:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=AD=A6=E4=B9=A0=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/modules/article.js           |  4 ++++
 config/request.js                 |  6 ++---
 order/orderDetail/orderDetail.vue | 21 ++++++++++++++---
 pages/study/study.vue             | 18 +++++++++++----
 team/article/article.vue          | 38 ++++++++++---------------------
 5 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/apis/modules/article.js b/apis/modules/article.js
index a3683b2..c67ac27 100644
--- a/apis/modules/article.js
+++ b/apis/modules/article.js
@@ -19,4 +19,8 @@ export const schemeList = data => {
 
 export const schemeFindById = id => {
   return post('nakadai/nakadai/partner/schemeManagement/findById?id=' + id)
+}
+
+export const collectCourse = (id, state) => {
+  return post('nakadai/nakadai/partner/article/management/collectCourse?contentId=' + id + '&state=' + state)
 }
\ No newline at end of file
diff --git a/config/request.js b/config/request.js
index 1d9b09f..6748186 100644
--- a/config/request.js
+++ b/config/request.js
@@ -5,9 +5,9 @@
  */
 
 export default {
-  // baseURL: 'https://huorantech.cn/',
-  // baseURL: 'http://192.168.31.117:9000/',
-  baseURL: 'http://121.37.12.51/',
+  baseURL: 'https://huorantech.cn/',
+  // baseURL: 'http://192.168.31.151:9000/',
+  // baseURL: 'http://121.37.12.51/',
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'
   },
diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue
index b5cb1f5..3ff63d2 100644
--- a/order/orderDetail/orderDetail.vue
+++ b/order/orderDetail/orderDetail.vue
@@ -505,6 +505,23 @@
 			handleErr(val) {
 				if (val === this.err) this.err = ''
 			},
+			// 消息推送授权
+			publicNotice() {
+				uni.requestSubscribeMessage({
+					tmplIds: ['8pDVfWYqh9c-nn3CeA1NXM58pmoyQXZzkVnRFKy_l2A'],
+					success: (res) => {
+						uni.navigateBack()
+					},
+					fail: function(err) {
+						uni.showToast({
+							title: err,
+							duration: 2000,
+							icon: 'error'
+						});
+					}
+				})
+					
+			},
 			// 提交
 			submit() {
 				const { form, courses } = this
@@ -542,9 +559,7 @@
 					add(data).then(res => {
 						uni.hideLoading()
 						this.$util.sucMsg('添加成功')
-						setTimeout(() => {
-							uni.navigateBack()
-						}, 1500)
+						this.publicNotice()
 					}).catch(res => {
 						uni.hideLoading()
 					})
diff --git a/pages/study/study.vue b/pages/study/study.vue
index ee95ad9..721db2b 100644
--- a/pages/study/study.vue
+++ b/pages/study/study.vue
@@ -27,10 +27,10 @@
 								<uni-icons class="icon" type="eye" size="22" color="#007FFF"></uni-icons>
 								{{ item.learnerNumber }}人学过
 							</view>
-							<!-- <view class="meta">
-								<uni-icons class="icon" type="star" size="22" color="#007eff"></uni-icons>
-								123
-							</view> -->
+							<view class="meta" @click.stop="collect(item)">
+								<uni-icons class="icon" :type="item.collectionStatus ? 'star-filled' : 'star'" size="22" color="#007eff"></uni-icons>
+								{{ item.collectionNumber }}
+							</view>
 						</view>
 						<view v-if="item.lastReading" class="last">上次阅读</view>
 					</view>
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-	import { partnerOperatingList, queryClassificationByType } from '@/apis/modules/article.js'
+	import { partnerOperatingList, queryClassificationByType, collectCourse } from '@/apis/modules/article.js'
 	export default {
 		data() {
 			return {
@@ -168,6 +168,14 @@
 				this.articleNameSort = this.articleNameSort === 'desc' ? 'asc' : 'desc'
 				this.initList()
 			},
+			// 收藏
+			collect(item) {
+				const state = item.collectionStatus ? 0 : 1
+				collectCourse(item.id, state).then(({ data }) => {
+					item.collectionStatus = state
+					state ? ++item.collectionNumber : --item.collectionNumber
+				}).catch(e => {})
+			},
 			// 跳转详情
 			toDetail(item) {
 				this.$util.to(`/team/article/article?id=` + item.id)
diff --git a/team/article/article.vue b/team/article/article.vue
index f854fa6..56460b8 100644
--- a/team/article/article.vue
+++ b/team/article/article.vue
@@ -12,6 +12,9 @@
 					<uni-icons class="icon" type="eye" size="22" color="#007FFF"></uni-icons>
 					{{ form.totalBrowsing }}人学过
 				</view>
+				<!-- <view class="meta" @click.stop="collect">
+					<uni-icons class="icon" :type="form.collectionStatus ? 'star-filled' : 'star'" size="22" color="#007eff"></uni-icons>
+				</view> -->
 				<view v-if="form.labelNameList" class="labels">
 					<view v-for="(label, j) in form.labelNameList" :key="j" class="label">{{ label }}</view>
 				</view>
@@ -32,7 +35,7 @@
 </template>
 
 <script>
-	import { findById } from '@/apis/modules/article.js'
+	import { findById, collectCourse } from '@/apis/modules/article.js'
 	import uParse from '@/components/gaoyia-parse/parse.vue'
 	export default {
 		data() {
@@ -117,31 +120,14 @@
 			// 下载附件
 			download(item) {
 				this.$util.to(`../send/send?url=${item.filePath}&copyWriting=${item.fileName}`)
-				// uni.showLoading({
-				// 	title: '正在下载...',
-				// 	mask: true
-				// })
-				// const url = item.filePath
-				// const that = this
-				// // 下载文件资源到本地
-				// uni.downloadFile({
-				// 	url,
-				// 	success: function(res) {
-				// 		console.log(444, res)
-				// 		uni.saveFile({
-				// 			tempFilePath: res.tempFilePath,
-				// 			success: function(res) {
-				// 				console.log(555, res)
-				// 				uni.hideLoading()
-				// 				that.$util.sucMsg('文件已保存！')
-				// 			}
-				// 		})
-				// 	},
-				// 	fail: function(err) {
-				// 		uni.hideLoading()
-				// 	}
-				// })
-			}
+			},
+			// 收藏
+			collect() {
+				const state = this.form.collectionStatus ? 0 : 1
+				collectCourse(this.form.id, state).then(({ data }) => {
+					this.form.collectionStatus = state
+				}).catch(e => {})
+			},
 		}
 	}
 </script>