浏览代码

关闭活动

zhengjinyi 8 月之前
父节点
当前提交
653c9b8c71

+ 13 - 9
pages/h5/activity/activity-entry.vue

@@ -159,15 +159,19 @@
 		methods:{
             // 初始化
             async initData(option) {
-            	const userInfo = await this.$api.getStorage()
-                this.params.ticket = option.ticket
-                this.voteTitle = option.voteType*1 === 1 ? '大会通票' : '学术套票'
-                console.log('userInfo',userInfo)
-                if(userInfo.userId){
-                    this.params.userId = userInfo.userId
-                    this.contentModalText = `您的采美帐号资料为【${userInfo.name}】,请确认并激活!`
-                }
-                this.getTicketDetails({ ticket: option.ticket ,userId: this.params.userId})
+                this.$util.msg('活动已结束', 2000)
+                setTimeout(() => {
+                    this.$api.switchTabTo('/pages/tabBar/home/index')
+                }, 2000)
+            // 	const userInfo = await this.$api.getStorage()
+            //     this.params.ticket = option.ticket
+            //     this.voteTitle = option.voteType*1 === 1 ? '大会通票' : '学术套票'
+            //     console.log('userInfo',userInfo)
+            //     if(userInfo.userId){
+            //         this.params.userId = userInfo.userId
+            //         this.contentModalText = `您的采美帐号资料为【${userInfo.name}】,请确认并激活!`
+            //     }
+            //     this.getTicketDetails({ ticket: option.ticket ,userId: this.params.userId})
             },
             // 查询门票信息
             async getTicketDetails(params){

+ 24 - 19
pages/h5/activity/activity-sign.vue

@@ -44,10 +44,7 @@
 			}
 		},
 		onLoad(option) {
-            wxLogin.wxLoginAuthorize()
-            setTimeout(()=>{
-               this.initData(option)
-            },2000)
+           this.initData(option)
 		},
         computed: {
             ...mapState(['hasLogin', 'userInfo', ])
@@ -55,10 +52,14 @@
 		methods:{
             // 初始化
             async initData(option) {
-            	const userInfo = await this.$api.getStorage()
-                this.params.shopId = option.id
-                this.params.userId = userInfo.userId ? userInfo.userId : 0
-                this.userShopDetail(this.params)
+                this.$util.msg('活动已结束', 2000)
+                setTimeout(() => {
+                    his.$api.switchTabTo('/pages/tabBar/home/index')
+                }, 2000)
+            	// const userInfo = await this.$api.getStorage()
+                //    this.params.shopId = option.id
+                //    this.params.userId = userInfo.userId ? userInfo.userId : 0
+                //    this.userShopDetail(this.params)
             },
             // 获取展台信息
             async userShopDetail(params){
@@ -75,17 +76,21 @@
             	}
             },
             handleEntry(){
-                if(!this.hasLogin){
-                    this.$util.msg('您还未登录,请先登录!', 2000)
-                    setTimeout(() => {
-                        const pages = getCurrentPages()
-                        const page = pages[pages.length - 1]
-                        uni.setStorageSync('LOGIN_REDIRECT_URL', page.$page.fullPath)
-                        this.$api.navigateTo('/pages/login/login')
-                    }, 2000)
-                    return
-                }
-                this.userTicketSign(this.params)
+                this.$util.msg('活动已结束', 2000)
+                setTimeout(() => {
+                    his.$api.switchTabTo('/pages/tabBar/home/index')
+                }, 2000)
+                // if(!this.hasLogin){
+                //     this.$util.msg('您还未登录,请先登录!', 2000)
+                //     setTimeout(() => {
+                //         const pages = getCurrentPages()
+                //         const page = pages[pages.length - 1]
+                //         uni.setStorageSync('LOGIN_REDIRECT_URL', page.$page.fullPath)
+                //         this.$api.navigateTo('/pages/login/login')
+                //     }, 2000)
+                //     return
+                // }
+                // this.userTicketSign(this.params)
             },
 			// 签到打卡
 			async userTicketSign(params){

+ 14 - 9
pages/user/coupon/coupon-collection.vue

@@ -6,7 +6,7 @@
 				<text class="error-text">暂无可领的优惠券~</text>
 			</view>
 			<template v-else>
-				<view v-for="(coupon, index) in coupinList" :key="index" :id="coupon.id" class="coupon-list">
+				<view v-for="(coupon, index) in coupinList" :key="index" :id="coupon.id" class="coupon-list" @click.stop="handleCouponDetails(coupon)">
 					<view class="list-cell-le">
 						<view class="coupon-maxMoney"> <text class="small">¥</text> {{ coupon.couponAmount }} </view>
 						<view class="coupon-minMoney"> 满{{ coupon.touchPrice }}可用 </view>
@@ -47,7 +47,7 @@
 									<template v-if="coupon.couponPayWay == 2">
 										<template v-if="coupon.couponBtnType == 0">
 											<view class="icon-used-text">{{ coupon.moneyCouponPrice }}采美豆</view>
-											<view class="icon-used-btn buy" @click="toDeductCoupon(coupon)"
+											<view class="icon-used-btn buy" @click.stop="toDeductCoupon(coupon)"
 												>抵扣</view
 											>
 										</template>
@@ -55,14 +55,14 @@
 											<view
 												class="icon-used-btn make"
 												v-if="coupon.couponBtnType == 1"
-												@click="toUseCoupon(coupon)"
+												@click.stop="toUseCoupon(coupon)"
 												>去使用</view
 											>
 										</template>
 									</template>								
 									<template v-else-if="coupon.couponPayWay == 1">
 										<view class="icon-used-text">购买</view>
-										<view class="icon-used-btn buy" @click="toPayCoupon(coupon)"
+										<view class="icon-used-btn buy" @click.stop="toPayCoupon(coupon)"
 											>¥{{ coupon.moneyCouponPrice }}</view
 										>
 									</template>
@@ -70,13 +70,13 @@
 										<view
 											class="icon-used-btn receive"
 											v-if="coupon.couponBtnType == 0"
-											@click="receiveCoupon(coupon)"
+											@click.stop="receiveCoupon(coupon)"
 											>领取</view
 										>
 										<view
 											class="icon-used-btn make"
 											v-if="coupon.couponBtnType == 1"
-											@click="toUseCoupon(coupon)"
+											@click.stop="toUseCoupon(coupon)"
 											>去使用</view
 										>
 									</template>
@@ -289,7 +289,11 @@ export default {
 			} else {
 				this.$api.navigateTo('/pages/login/login')
 			}
-		},
+		},
+        // 跳转优惠券详情
+        handleCouponDetails(coupon){
+            this.$api.navigateTo(`/pages/user/coupon/coupon-details?couponId=${coupon.couponId}&shareUserId=${this.listQuery.userId}`)
+        },
 		toUseCoupon(coupon) {
 			// 去使用跳转路径,友盟埋点收集去使用优惠券
 			if (process.env.NODE_ENV != 'development') {
@@ -371,8 +375,9 @@ export default {
 				if (this.userIdentity === 1 || this.userIdentity === 3) {
 					this.$util.msg('您的身份暂不支持领取优惠券', 2000)
 					return
-				}
-				this.createCouponRecord(coupon)
+				}
+                this.$api.navigateTo(`/pages/user/pay/card-coupon-under?amount=${coupon.moneyCouponPrice}`)
+				// this.createCouponRecord(coupon)
 			} else {
 				this.$api.navigateTo('/pages/login/login')
 			}

+ 2 - 2
pages/user/coupon/coupon-details.vue

@@ -144,8 +144,8 @@
                     this.$api.redirectTo('/pages/login/login')
 
                 } else {
-                    // this.$api.navigateTo(`/pages/user/pay/card-coupon-under?amount=${coupon.moneyCouponPrice}`)
-                    this.WeChatCouponRecord(coupon)
+                    this.$api.navigateTo(`/pages/user/pay/card-coupon-under?amount=${coupon.moneyCouponPrice}`)
+                    // this.WeChatCouponRecord(coupon)
                 }
             },
             // 调用查询购买

+ 6 - 7
pages/user/pay/card-coupon-under.vue

@@ -35,24 +35,23 @@
 			<view class="pay-bring-wrapper clearfix" v-else>
 				<view class="pay-bring-content">
 					<view class="text-title">
-						<image
+<!-- 						<image
                             v-if="payableAmount < 5000"
 							src="https://static.caimei365.com/app/img/icon/icon-vxPaycode@2x.jpg"
 							mode=""
 							@click="previewImg(1)"
-						></image>
+						></image> -->
 						<image
-                            v-else
 							src="https://static.caimei365.com/app/img/icon/icon-vxkecode.png"
 							mode=""
 							@click="previewImg(2)"
 						></image>
 					</view>
-                    <view class="text-content"  v-if="payableAmount < 5000"
+<!--                    <view class="text-content"  v-if="payableAmount < 5000"
                     	>请点击上方二维码,长按识别后输入待付金额金额付款。</view
-                    >
-					<view class="text-content" v-else
-						>请点击上方二维码,长按保存后,使用微信扫码添加采美客服,客服会为您推荐最合适的线下转账方式。</view
+                    > -->
+					<view class="text-content"
+						>请点击上方二维码,长按识别后添加采美客服,客服会为您推荐付款方式。</view
 					>
 				</view>
 			</view>