bihuisong 1 anno fa
parent
commit
d368ac4add
3 ha cambiato i file con 84 aggiunte e 128 eliminazioni
  1. 2 29
      api/knowledge/knowledge.js
  2. 40 24
      pages/highServer/knowledge/knowledge.vue
  3. 42 75
      pages/index/index.vue

+ 2 - 29
api/knowledge/knowledge.js

@@ -23,37 +23,10 @@ export function popularKnowledgeList(query) {
 /**
  * 验证积分是否充足
  */
-export function verifyScore(query) {
+export function knowledgePay(query) {
   return request({
-    url: '/score/verifyScore',
+    url: '/knowledge/base/knowledgePay',
     method: 'get',
 	params:query
   })
-}
-/**
- * 减少积分
- */
-export function reduceScore(data) {
-  return request({
-    url: '/score/reduceScore',
-    method: 'post',
-	data:data
-  })
-}
-/**
- * 增加积分
- */
-export function addScore(data) {
-  return request({
-    url: '/score/addScore',
-    method: 'post',
-	data:data
-  })
-}
-export function addKnowledge(data) {
-  return request({
-    url: '/knowledge/base',
-    method: 'post',
-	data:data
-  })
 }

+ 40 - 24
pages/highServer/knowledge/knowledge.vue

@@ -2,7 +2,7 @@
 	<!-- 知识库列表 -->
 	<view class="container">
 		<view class="rnwdList">
-			<view class="list" @tap="goDetails(item.id)" v-for="(item, index1) in dataSource" :key="index1">
+			<view class="list" @tap="goDetails(item)" v-for="(item, index1) in dataSource" :key="index1">
 				<span class="listTitle">{{ item.titleName }}</span>
 
 				<view class="onePic">
@@ -13,18 +13,13 @@
 				<view class="jlSj">
 					<view class="ck">
 						<span>
-							<em class="iconfont icon-chakan"></em>
-							{{ item.likeNum }}
+							<em class="iconfont icon-shoucang"></em>
+							{{ item.watchNum }}
 						</span>
-<!--						<span>-->
-<!--							<em class="iconfont icon-shoucang"></em>-->
-<!--							{{ item.watchNum }}-->
-<!--						</span>-->
 					</view>
 				</view>
 			</view>
-			<uni-fab ref="fab" :horizontal="right" :vertical="bottom"
-			         @fabClick="fabClick()"/>
+			<uni-fab ref="fab" :horizontal="right" :vertical="bottom" @fabClick="fabClick()" />
 		</view>
 
 	</view>
@@ -32,7 +27,8 @@
 
 <script>
 	import {
-		list
+		list,
+		knowledgePay 
 	} from '@/api/knowledge/knowledge.js';
 	export default {
 		data() {
@@ -59,15 +55,15 @@
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad(options) {
-			this.getList(1)
+			this.getList()
 		},
-		onReachBottom(){
+		onReachBottom() {
 			let pageNum = this.queryParams.pageNum
 			let pageSize = this.queryParams.pageSize
 			let total = this.total
-			if(pageNum * pageSize >= total){
+			if (pageNum * pageSize >= total) {
 				uni.showToast({
-					title:'暂无更多数据'
+					title: '暂无更多数据'
 				})
 				return
 			} else {
@@ -76,20 +72,40 @@
 			}
 		},
 		methods: {
-			goDetails(id) {
-				uni.navigateTo({
-					url: '/pages/highServer/knowledgeDetails/knowledgeDetails?id=' + id,
-				});
+			goDetails(item) {
+				this.isKnowledgePay(item)
+			},
+			isKnowledgePay(item) {
+				let params = {
+					//减少积分人id
+					userId: getApp().globalData.userId,
+					//增加积分人id
+					createId: item.createId,
+					integral: item.integral,
+					id: item.id,
+					relevance: "1",
+				}
+				knowledgePay(params).then(res => {
+					if (res.code == 200) {
+						uni.navigateTo({
+							url: '/pages/highServer/knowledgeDetails/knowledgeDetails?id=' + item.id,
+						});
+					} else {
+						uni.showToast({
+							title: res.msg
+						})
+					}
+				})
 			},
 			// 分页触发
 			change(e) {
 				this.getList(e.current);
 			},
 			// 获取数据
-			getList(pageNum) {
+			getList() {
 				let params = {
 					pageSize: this.queryParams.pageSize,
-					pageNum: pageNum
+					pageNum: this.queryParams.pageNum
 				}
 				list(params).then(res => {
 					if (res.code == 200) {
@@ -100,9 +116,9 @@
 			},
 			//悬浮按钮点击事件
 			fabClick() {
-			  uni.navigateTo({
-			    url: '../knowledge/knowledgeForm'
-			  });
+				uni.navigateTo({
+					url: '../knowledge/knowledgeForm'
+				});
 			},
 		}
 	}
@@ -110,4 +126,4 @@
 
 <style>
 	@import './knowledge.css';
-</style>
+</style>

+ 42 - 75
pages/index/index.vue

@@ -226,9 +226,7 @@
 	} from '@/api/information/information.js';
 	import {
 		popularKnowledgeList,
-		verifyScore,
-		reduceScore,
-		addScore
+		knowledgePay
 	} from '@/api/knowledge/knowledge.js'
 	export default {
 		data() {
@@ -306,7 +304,7 @@
 							}
 						],
 						jf: '300',
-            pl: '30',
+						pl: '30',
 						title: '探索乡村能源供给新模式 绘就乡村振兴美丽新画卷'
 					},
 					{
@@ -377,9 +375,9 @@
 		},
 		methods: {
 			// 跳转至更多高频服务页面
-			toMore(){
+			toMore() {
 				uni.navigateTo({
-					url:"/pages/highServer/service/service"
+					url: "/pages/highServer/service/service"
 				})
 			},
 			goZcDetail(e) {
@@ -400,27 +398,27 @@
 			},
 			// 热门知识获取数据
 			getList() {
-        popularKnowledgeList(this.knowledgeParams).then(res => {
-          if (res.code == 200) {
-            this.dataSource = this.cutarray([...this.dataSource,...res.rows])
-            this.total = res.total
-            console.log("this.dataSource", this.dataSource)
-          }
-        })
+				popularKnowledgeList(this.knowledgeParams).then(res => {
+					if (res.code == 200) {
+						this.dataSource = this.cutarray([...this.dataSource, ...res.rows])
+						this.total = res.total
+						console.log("this.dataSource", this.dataSource)
+					}
+				})
+			},
+			cutarray(arr) { //数组去重
+				let obj = {}; //obj用来记录该项重复出现了几次
+				let brr = []; //brr是去重后的数组
+				arr.forEach((item) => {
+					if (obj[item.id] == undefined) {
+						obj[item.id] = 1;
+						brr.push(item);
+					} else {
+						obj[item.id] += 1;
+					}
+				});
+				return brr;
 			},
-      cutarray(arr) {//数组去重
-        let obj = {};    //obj用来记录该项重复出现了几次
-        let brr = [];    //brr是去重后的数组
-        arr.forEach((item) => {
-          if (obj[item.id] == undefined) {
-            obj[item.id] = 1;
-            brr.push(item);
-          } else {
-            obj[item.id] += 1;
-          }
-        });
-        return brr;
-      },
 			toLegal() {
 				uni.navigateTo({
 					url: '/pages/information/toLegal/toLegal'
@@ -564,64 +562,33 @@
 				});
 			},
 			goKnowledgeDetails(item) {
-				console.log(item)
-				let params = {
-					userId: getApp().globalData.userId,
-					scoreNum: item.integral
-				};
-				if (item.purchaseStatus != "1") {
-					verifyScore(params).then((res) => {
-						if (!res.data) {
-							uni.showToast({
-								title: '您的积分不足'
-							})
-						} else {
-							this.reduceScore(item)
-							this.addScore(item)
-							uni.navigateTo({
-								url: '/pages/highServer/knowledgeDetails/knowledgeDetails?id=' + item.id,
-							});
-              this.getList()
-						}
-					});
-				}else{
-          this.getList()
-          uni.navigateTo({
-            url: '/pages/highServer/knowledgeDetails/knowledgeDetails?id=' + item.id,
-          });
-        }
+				this.isKnowledgePay(item)
 			},
-			/**
-			 * 减少积分
-			 */
-			reduceScore(item) {
+			isKnowledgePay(item) {
 				let params = {
+					//减少积分人id
 					userId: getApp().globalData.userId,
-					scoreNum: item.integral,
-					relevanceDataId: item.id,
+					//增加积分人id
+					createId: item.createId,
+					integral: item.integral,
+					id: item.id,
 					relevance: "1",
 				}
-				reduceScore(params).then((res) => {
-					console.log("reduceScore", res)
+				knowledgePay(params).then(res => {
+					if (res.code == 200) {
+						uni.navigateTo({
+							url: '/pages/highServer/knowledgeDetails/knowledgeDetails?id=' + item.id,
+						});
+					} else {
+						uni.showToast({
+							title: res.msg
+						})
+					}
 				})
 			},
-			/**
-			 * 增加积分
-			 */
-			addScore(item) {
-				let params = {
-					userId: item.createId,
-					scoreNum: item.integral,
-					relevanceDataId: item.id,
-					relevance: "1",
-				}
-				addScore(params).then((res) => {
-					console.log("addScore", res)
-				})
-			}
 		}
 	};
 </script>
 <style>
 	@import './index.css';
-</style>
+</style>