Merge branch 'master' of http://192.168.1.218:3000/liyingqu/cyzh-SoundOfMusic-H5

common/http/http.api.js

@@ -38,7 +38,8 @@ let pointsUrl = {
 }
 
 let boostUrl = {
-	listUrl: '/cyzh-helpRecord/helprecord/list2',
+	list:'/cyzh_hotDetail/hotdetail/list',
+	// listUrl: '/cyzh-helpRecord/helprecord/list2',
 	doHitUrl: '/cyzh-helpRecord/helprecord/doHit',
 	myBoostUrl : 'cyzh-helpRecord/helprecord/selectHelpRecordVoPage',
 	billRecordUrl: 'cyzh-billRecord/billrecord/submit',
@@ -132,7 +133,7 @@ const install = (Vue, vm) => {
 	}
 	
 	let boost = {
-		list:(params = {}) => vm.$u.get(boostUrl.listUrl, params),
+		list:(params = {}) => vm.$u.get(boostUrl.list, params),
 		doHit:(params = {}) => vm.$u.post(boostUrl.doHitUrl, params),
 		myBoost:(params = {}) => vm.$u.get(boostUrl.myBoostUrl, params),
 		billRecord:(params = {}) => vm.$u.post(boostUrl.billRecordUrl, params),

pages/activityList/mine/boostDetail.vue

@@ -8,15 +8,17 @@
 				<view class="flex align-center justify-between boder">
 					<view class="flex align-center" style="width: 55%;">
 						<view class="padding-sm">
-							<u-avatar :src="item.avatar" size="82"></u-avatar>
+							<u-avatar :src="item.loginWebVO.avatar" size="82"></u-avatar>
 						</view>
 						<view>
-							<view class="name">{{item.nickName}}</view>
+							<view class="name">{{item.loginWebVO.nickName}}</view>
 							<view class="time padding-top-xs">{{item.createTime}}</view>
 						</view>
 					</view>
-					<view class="text-sm" style="color: #757575;">{{item.typeSub == 1 ? '打榜' : '打赏'}}</view>
-					<view class="name padding-right flex justify-end" style="width: 180upx;">{{+item.totalHotValue}}热力值</view>
+					<view class="text-sm" style="color: #757575;" v-if="item.type==1">{{item.note}}</view>
+					<view class="text-sm" style="color: #757575;" v-if="item.type==2">商品兑换</view>
+					<view class="text-sm" style="color: #757575;" v-if="item.type==3">奖金提现</view>
+					<view class="name padding-right flex justify-end" style="width: 180upx;">{{+item.hotValue}}热力值</view>
 				</view>
 			</block>
 			<view style="height: 80rpx;" v-if="status">
@@ -50,7 +52,7 @@
 		},
 		methods: {
 			getBoostDetail() {
-				this.$u.api.boost.list({receiverId: this.userId, current: this.current, size: this.size}).then(res => {
+				this.$u.api.boost.list({userId: this.userId, current: this.current, size: this.size}).then(res => {
 					this.boostList = [...this.boostList,...res.records];
 				})
 			}