lyqu 4 年之前
父節點
當前提交
3c53c73701

+ 2 - 0
common/http/http.api.js

@@ -42,6 +42,7 @@ let boostUrl = {
 	myBoostUrl : 'cyzh-helpRecord/helprecord/selectHelpRecordVoPage',
 	billRecordUrl: 'cyzh-billRecord/billrecord/submit',
 	doRewardUrl: 'cyzh-helpRecord/helprecord/doReward',
+	presentDetailUrl: 'cyzh-present/present/detail'
 }
 
 let productionUrl = {
@@ -122,6 +123,7 @@ const install = (Vue, vm) => {
 		myBoost:(params = {}) => vm.$u.get(boostUrl.myBoostUrl, params),
 		billRecord:(params = {}) => vm.$u.post(boostUrl.billRecordUrl, params),
 		doReward:(params = {}) => vm.$u.post(boostUrl.doRewardUrl, params),
+		presentDetail:(params = {}) => vm.$u.get(boostUrl.presentDetailUrl, params),
 	}
 	
 	let production = {

+ 6 - 0
components/goods/goods.vue

@@ -1,5 +1,8 @@
 <template>
 	<view >
+<!-- 		<view class="padding-tb bg-white">
+			<u-image width="100%" height="350" src="https://upload-file-data.obs.cn-south-1.myhuaweicloud.com/998ed30b0aa24201bdd9aba608fbfab0-banner2.jpg" @click="navByImg"></u-image>
+		</view> -->
 		<view class="recommend-info" style="background-image: -webkit-gradient(linear, 0 0, 0 bottom, from(#ffffff), to(#f1f1f1))">
 		  <view class="goods-list">
 		    <view  class="list" v-for="(item,index) in goodsList" :key="index">
@@ -50,6 +53,9 @@
 				uni.navigateTo({
 					url:"/pages/activityList/goods/detail?id=" + id + "&activityId=" + this.activityId
 				})
+			},
+			navByImg() {
+				
 			}
 		}
 	}

+ 0 - 1
components/homeViews/mine-view.vue

@@ -5,7 +5,6 @@
 				<view class="padding-left">
 					<view class="text-black text-bold text-xl">
 						{{userData.nickName}}
-						<u-button @click="logout" size="mini" style="margin-left: 10rpx;">退出</u-button>
 					</view>
 					<view class="flex align-center padding-top-sm">
 						<view>

+ 14 - 5
pages/activityList/activity/authorBoost.vue

@@ -72,7 +72,7 @@
 					<input type="number" class="text-center input" v-model="count" />
 					<view class="padding-left-sm" @click="plus"> <u-icon name="plus-circle-fill" color="#5a3ee8" size="36"></u-icon> </view>
 				</view>
-				<button style="width: 150upx;" class="margin-left cu-btn round theme-bg-color text-white text-sm" @click="dialogShow = true">助力</button>
+				<button style="width: 150upx;" class="margin-left cu-btn round theme-bg-color text-white text-sm" @click="presentBoost(boostDetail.presentList[current].id)">助力</button>
 			</view>
 		</view>
 		<u-popup v-model="shareShow" mode="bottom" height="460rpx" border-radius="30">
@@ -95,8 +95,8 @@
 				<view style="height: 120upx;"></view>
 				<u-avatar src="/static/avatar.png" size="160"></u-avatar>
 				<view class="margin-top" style="font-size: 24upx;font-family: PingFang SC;font-weight: bold;color: #323035;">你将为{{boostDetail.nickName}}增加{{+boostDetail.presentList[current].hotValue * count}}热力值</view>
-				<view class="text-gray text-sm">公益勋章X1</view>
-				<view class="text-gray text-sm">立白助力礼包A</view>
+				<view class="text-gray text-sm" v-if="presentDetail.isGiveMedal == 1">公益勋章X {{count}}</view>
+				<view class="text-gray text-sm" v-if="presentDetail.isSendGoods == 1">{{presentDetail.goodsName}} X {{count}}</view>
 				<view class="text-gray text-sm">可得{{+boostDetail.presentList[current].pointsValue * count}}积分,可用于国信商城兑换</view>
 				<view class="padding">
 					<u-button class="custom-style" shape="circle" @click="pay">去支付</u-button>
@@ -130,6 +130,7 @@
 </template>
 
 <script>
+	import {appId} from	'@/common/conf/config.js';
 	import {authUrl} from '@/common/conf/config.js';
 	import {getUrlParams} from '@/common/utils/utils.js';
 	export default {
@@ -148,6 +149,7 @@
 				type: '',
 				presentId:'',
 				successShow: false,
+				presentDetail: {},
 			}
 		},
 		onLoad(options) {
@@ -179,7 +181,7 @@
 			},
 			//礼物支付
 			async pay() {
-				if (this.$u.test.isEmpty(this.userId)) {
+				if (this.$u.test.isEmpty(this.senderId)) {
 					let path = 'pages/activityList/activity/authorBoost?activityId=' + this.activityId + '&receiverId=' + this.receiverId;
 					window.location.href = authUrl(path);
 				} else {
@@ -194,7 +196,7 @@
 							"fundProcessType": "",
 							"goodsName": this.boostDetail.presentList[this.current].name,
 							"memo": "",
-							"notifyUrl": "https://vote.guosen-fumao.cn/vote-h5/index.html",
+							"notifyUrl": "https://yyzs.nanyue6688.com/vote-h5/index.html",
 							"orderAmount": this.count * this.currentPresentSum,
 							"orderId": new Date().getTime(),
 							"payWay": "WECHAT_OFFIACCOUNT",
@@ -286,6 +288,7 @@
 							price: this.count * this.currentPresentSum,
 							presentId: this.presentId,
 							presentCount: this.count,
+							relationId: this.receiverId,
 							type: 2,
 							payStatus: 1,
 						}).then(res => {
@@ -315,6 +318,12 @@
 						console.log(res.err_msg);
 					}
 				});
+			},
+			presentBoost(id) {
+				this.$u.api.boost.presentDetail({id: id}).then(res => {
+					this.presentDetail = res;
+					this.dialogShow = true;
+				})
 			}
 		}
 	}

+ 13 - 5
pages/activityList/activity/musicBoost.vue

@@ -67,7 +67,7 @@
 					<input type="number" class="text-center input" v-model="count" />
 					<view class="padding-left-sm" @click="plus"> <u-icon name="plus-circle-fill" color="#5a3ee8" size="36"></u-icon> </view>
 				</view>
-				<button style="width: 150upx;" class="margin-left cu-btn round theme-bg-color text-white text-sm" @click="dialogShow = true">助力</button>
+				<button style="width: 150upx;" class="margin-left cu-btn round theme-bg-color text-white text-sm" @click="presentBoost(boostDetail.presentList[current].id)">助力</button>
 			</view>
 		</view>
 		<u-popup v-model="shareShow" mode="bottom" height="460rpx" border-radius="30">
@@ -90,9 +90,9 @@
 				<view style="height: 120upx;"></view>
 				<u-avatar src="/static/avatar.png" size="160"></u-avatar>
 				<view class="margin-top" style="font-size: 24upx;font-family: PingFang SC;font-weight: bold;color: #323035;">你将为{{boostDetail.title}}增加{{+boostDetail.presentList[current].hotValue * count}}热力值</view>
-				<view class="text-gray text-sm">公益勋章X1</view>
-				<view class="text-gray text-sm">立白助力礼包A</view>
-				<view class="text-gray text-sm">可得{{+boostDetail.presentList[current].pointsValue}}积分,可用于国信商城兑换</view>
+				<view class="text-gray text-sm" v-if="presentDetail.isGiveMedal == 1">公益勋章X {{count}}</view>
+				<view class="text-gray text-sm" v-if="presentDetail.isSendGoods == 1">{{presentDetail.goodsName}} X {{count}}</view>
+				<view class="text-gray text-sm">可得{{+boostDetail.presentList[current].pointsValue * count}}积分,可用于国信商城兑换</view>
 				<view class="padding">
 					<u-button class="custom-style" shape="circle" @click="pay">去支付</u-button>
 				</view>
@@ -144,6 +144,7 @@
 				type:'',
 				presentId: '',
 				successShow: false,
+				presentDetail: {},
 			}
 		},
 		onLoad(options) {
@@ -196,7 +197,7 @@
 							"fundProcessType": "",
 							"goodsName": this.boostDetail.presentList[this.current].name,
 							"memo": "",
-							"notifyUrl": "https://vote.guosen-fumao.cn/vote-h5/index.html",
+							"notifyUrl": "https://yyzs.nanyue6688.com/vote-h5/index.html",
 							"orderAmount": this.count * this.currentPresentSum,
 							"orderId": new Date().getTime(),
 							"payWay": "WECHAT_OFFIACCOUNT",
@@ -288,6 +289,7 @@
 							price: this.count * this.currentPresentSum,
 							presentId: this.presentId,
 							presentCount:  this.count,
+							relationId: this.productId,
 							type: 1,
 							payStatus: 1,
 						}).then(res => {
@@ -317,6 +319,12 @@
 						console.log(res.err_msg);
 					}
 				});
+			},
+			presentBoost(id) {
+				this.$u.api.boost.presentDetail({id: id}).then(res => {
+					this.presentDetail = res;
+					this.dialogShow = true;
+				})
 			}
 		}
 	}