Merge branch 'master' of http://47.114.134.244:3000/chenkainan/tongli_WeChat

compoents/userReviews.vue

@@ -31,7 +31,7 @@
 
 <script>
 	export default {
-		props:['goodsId'],
+		props:['goodsId','goodsType'],
 		data() {
 			return {
 				commentList: [],
@@ -46,18 +46,20 @@
 				this.commentList = []
 				this.commentNum = 0
 				if (!this.goodsId)  return
-				this.Post({
+				let query = {offset: 0,limit: 2}
-					goods_id: this.goodsId,
+				if (this.goodsType=='goodsId') {
-					offset: 0,
+					query.goods_id = this.goodsId
-					limit: 2
+				} else {
-				}, '/api/scenic/getGoodsCommentByScenicId').then(res => {
+					query.scenic_id = this.goodsId
+				}
+				this.Post(query, '/api/scenic/getGoodsCommentByScenicId').then(res => {
 					this.commentList = res.data
 					this.commentNum = res.msg
 				})
 			},
 			viewAll () {
 				uni.navigateTo({
-					url:'/subPackages/eventCalendar/detail?id='+this.id
+					url:`/subPackages/order/commentList?${this.goodsType}=`+this.goodsId
 				})
 			},
 			

subPackages/hotelHomestay/detail.vue

@@ -133,7 +133,7 @@
 			</view>
 			
 			<template v-if="id">
-				<userReviewsVue  :goodsId="id"></userReviewsVue>
+				<userReviewsVue  :goodsId="id" goodsType="scenicId"></userReviewsVue>
 				<moreGoodsVue  :goodsId="id"></moreGoodsVue>
 			</template>
 			

subPackages/line/detail.vue

@@ -42,7 +42,7 @@
 			</view>
 			
 			<template v-if="id">
-				<userReviewsVue  :goodsId="id"></userReviewsVue>
+				<userReviewsVue  :goodsId="id" goodsType="goodsId"></userReviewsVue>
 				<moreGoodsVue  :goodsId="id"></moreGoodsVue>
 			</template>
 		</view>

subPackages/order/commentList.vue

@@ -51,10 +51,8 @@
 </template>
 
 <script>
-	import Base from "@/components/Base";
 	export default {
 		name: "commentList",
-		extends: Base,
 		data() {
 			return {
 				id: null,

subPackages/techan/detail.vue

@@ -55,7 +55,7 @@
 			</view>
 			
 			<template v-if="id">
-				<userReviewsVue  :goodsId="id"></userReviewsVue>
+				<userReviewsVue  :goodsId="id" ></userReviewsVue>
 				<moreGoodsVue  :goodsId="id"></moreGoodsVue>
 			</template>
 		</view>

subPackages/ticketBooking/detail.vue

@@ -122,7 +122,7 @@
 			</view>
 			
 			<template v-if="id">
-				<userReviewsVue  :goodsId="id"></userReviewsVue>
+				<userReviewsVue  :goodsId="id" goodsType="scenicId"></userReviewsVue>
 				<moreGoodsVue  :goodsId="id"></moreGoodsVue>
 			</template>