parent
							
								
									f256bb904d
								
							
						
					
					
						commit
						725a37eae5
					
				|  | @ -91,14 +91,14 @@ | ||||||
| 						</view> | 						</view> | ||||||
| 						<view class='bargainBnt' @tap='currentBargainUser'>我也要参与</view> | 						<view class='bargainBnt' @tap='currentBargainUser'>我也要参与</view> | ||||||
| 					</view> | 					</view> | ||||||
| 					<view v-if="startBargainUid != uid && bargainStatus==7"> | 					<view v-if="startBargainUid != uid && bargainStatus === 7"> | ||||||
| 						<view class='bargainSuccess'> | 						<view class='bargainSuccess'> | ||||||
| 							<image src="../static/cheng.png"></image> | 							<image src="../static/cheng.png"></image> | ||||||
| 							您已帮其他好友砍过此商品 | 							您已帮其他好友砍过此商品 | ||||||
| 						</view> | 						</view> | ||||||
| 						<view class='bargainBnt' @tap='currentBargainUser'>我也要参与</view> | 						<view class='bargainBnt' @tap='currentBargainUser'>我也要参与</view> | ||||||
| 					</view> | 					</view> | ||||||
| 					<view v-if="startBargainUid != uid && bargainStatus==6"> | 					<view v-if="startBargainUid !== uid && bargainStatus === 6"> | ||||||
| 						<view class='bargainSuccess'> | 						<view class='bargainSuccess'> | ||||||
| 							<image src="../static/chengh.png"></image> | 							<image src="../static/chengh.png"></image> | ||||||
| 							已成功帮助好友砍价 | 							已成功帮助好友砍价 | ||||||
|  | @ -203,7 +203,7 @@ | ||||||
| 				<view class='goodsDetails borRadius14'> | 				<view class='goodsDetails borRadius14'> | ||||||
| 					<view class='conter borRadius14'> | 					<view class='conter borRadius14'> | ||||||
| 						<jyf-parser v-if="bargainInfo.content" :html="bargainInfo.content" ref="article" | 						<jyf-parser v-if="bargainInfo.content" :html="bargainInfo.content" ref="article" | ||||||
| 							:tag-style="tagStyle"></jyf-parser> | 							:tag-style="tagStyle" /> | ||||||
| 						<view v-else class="contentNo"> | 						<view v-else class="contentNo"> | ||||||
| 							<text class="iconfont icon-xiaolian mr8"></text> | 							<text class="iconfont icon-xiaolian mr8"></text> | ||||||
| 							暂无商品详情 | 							暂无商品详情 | ||||||
|  | @ -211,7 +211,7 @@ | ||||||
| 					</view> | 					</view> | ||||||
| 				</view> | 				</view> | ||||||
| 
 | 
 | ||||||
| 				<view class='bargainTip' :class='active==true?"on":""'> | 				<view class='bargainTip' :class='active ? "on":""'> | ||||||
| 					<view class='pictrue'> | 					<view class='pictrue'> | ||||||
| 						<image src="../../../static/images/bargainBg.png"></image> | 						<image src="../../../static/images/bargainBg.png"></image> | ||||||
| 					</view> | 					</view> | ||||||
|  | @ -293,51 +293,25 @@ | ||||||
| 		postBargainHelp, | 		postBargainHelp, | ||||||
| 		getBargainUser | 		getBargainUser | ||||||
| 	} from '../../../api/activity.js'; | 	} from '../../../api/activity.js'; | ||||||
| 	import { | 	import { imageBase64 } from "@/api/public"; | ||||||
| 		imageBase64 |  | ||||||
| 	} from "@/api/public"; |  | ||||||
| 	import uQRCode from '@/js_sdk/Sansnn-uQRCode/uqrcode.js'; | 	import uQRCode from '@/js_sdk/Sansnn-uQRCode/uqrcode.js'; | ||||||
| 	import util from '../../../utils/util.js'; | 	import util from '../../../utils/util.js'; | ||||||
| 	import { | 	import { toLogin } from '@/libs/login.js'; | ||||||
| 		toLogin | 	import { mapGetters } from "vuex"; | ||||||
| 	} from '@/libs/login.js'; |  | ||||||
| 	import { |  | ||||||
| 		mapGetters |  | ||||||
| 	} from "vuex"; |  | ||||||
| 	// #ifdef MP |  | ||||||
| 	import authorize from '@/components/Authorize'; |  | ||||||
| 	// #endif |  | ||||||
| 	import countDown from '@/components/countDown'; | 	import countDown from '@/components/countDown'; | ||||||
| 	import home from '@/components/home'; | 	import home from '@/components/home'; | ||||||
| 	import parser from "@/components/jyf-parser/jyf-parser"; | 	import parser from "@/components/jyf-parser/jyf-parser"; | ||||||
| 	import { | 	import { silenceBindingSpread } from "@/utils"; | ||||||
| 		silenceBindingSpread |  | ||||||
| 	} from "@/utils"; |  | ||||||
| 	const app = getApp(); | 	const app = getApp(); | ||||||
| 
 |  | ||||||
| 	export default { | 	export default { | ||||||
| 		components: { | 		components: { | ||||||
| 			countDown, | 			countDown, | ||||||
| 			// #ifdef MP |  | ||||||
| 			authorize, |  | ||||||
| 			// #endif |  | ||||||
| 			home, | 			home, | ||||||
| 			"jyf-parser": parser | 			"jyf-parser": parser | ||||||
| 		}, | 		}, | ||||||
| 		filters: { |  | ||||||
| 			picFilter(status) { |  | ||||||
| 				const statusMap = { |  | ||||||
| 					'0': 'num1', |  | ||||||
| 					'1': 'num2', |  | ||||||
| 					'2': 'num3' |  | ||||||
| 				} |  | ||||||
| 				return statusMap[status] |  | ||||||
| 			} |  | ||||||
| 		}, |  | ||||||
| 		/** | 		/** | ||||||
| 		 * 页面的初始数据 | 		 * 页面的初始数据 | ||||||
| 		 */ | 		 */ | ||||||
| 
 |  | ||||||
| 		data() { | 		data() { | ||||||
| 			return { | 			return { | ||||||
| 				bgColor: { | 				bgColor: { | ||||||
|  | @ -382,8 +356,6 @@ | ||||||
| 				}, | 				}, | ||||||
| 				H5ShareBox: false, //公众号分享图片 | 				H5ShareBox: false, //公众号分享图片 | ||||||
| 				systemH: 0, | 				systemH: 0, | ||||||
| 				isAuto: false, //没有授权的不会自动授权 |  | ||||||
| 				isShowAuth: false, //是否隐藏授权 |  | ||||||
| 				pages: '', | 				pages: '', | ||||||
| 				couponsHidden: true, | 				couponsHidden: true, | ||||||
| 				loading: false, | 				loading: false, | ||||||
|  | @ -397,7 +369,6 @@ | ||||||
| 				imgTop: '', //商品图base64位 | 				imgTop: '', //商品图base64位 | ||||||
| 				imagePath: '' // 海报图片 | 				imagePath: '' // 海报图片 | ||||||
| 			} | 			} | ||||||
| 
 |  | ||||||
| 		}, | 		}, | ||||||
| 		computed: mapGetters(['isLogin', 'userInfo', 'uid']), | 		computed: mapGetters(['isLogin', 'userInfo', 'uid']), | ||||||
| 		/** | 		/** | ||||||
|  | @ -414,8 +385,6 @@ | ||||||
| 				} | 				} | ||||||
| 			}) | 			}) | ||||||
| 			// #endif | 			// #endif | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| 			var pages = getCurrentPages(); | 			var pages = getCurrentPages(); | ||||||
| 			if (pages.length <= 1) { | 			if (pages.length <= 1) { | ||||||
| 				that.retunTop = false | 				that.retunTop = false | ||||||
|  | @ -439,18 +408,14 @@ | ||||||
| 			if (options.hasOwnProperty('id')) { | 			if (options.hasOwnProperty('id')) { | ||||||
| 				options.id ? that.id = options.id : that.id = '' | 				options.id ? that.id = options.id : that.id = '' | ||||||
| 			} | 			} | ||||||
| 			options.startBargainUid == 'undefined' ? that.startBargainUid = 0 : that.startBargainUid = Number(options | 			options.startBargainUid === 'undefined' ? that.startBargainUid = 0 : that.startBargainUid = Number(options | ||||||
| 				.startBargainUid); | 				.startBargainUid); | ||||||
| 			if (this.isLogin) { | 			if (this.isLogin) { | ||||||
| 				if (that.startBargainUid == 0) { | 				if (that.startBargainUid === 0) { | ||||||
| 					that.startBargainUid = Number(that.$store.state.app.uid) | 					that.startBargainUid = Number(that.$store.state.app.uid) | ||||||
| 				} | 				} | ||||||
| 				this.storeBargainId = options.storeBargainId ? Number(options.storeBargainId) : 0; | 				this.storeBargainId = options.storeBargainId ? Number(options.storeBargainId) : 0; | ||||||
| 				this.page = 1; | 				this.page = 1; | ||||||
| 				//this.getBargainDetails(); |  | ||||||
| 				// app.globalData.openPages = '/pages/activity/goods_bargain_details/index?id=' + this.id + '&bargain=' + this.bargainUid + |  | ||||||
| 				// 	'&spid=' + e.detail.uid; |  | ||||||
| 				// this.$set(that, 'bargainPartake', e.detail.uid); |  | ||||||
| 			} else { | 			} else { | ||||||
| 				this.$Cache.set('login_back_url', | 				this.$Cache.set('login_back_url', | ||||||
| 					'/pages/activity/goods_bargain_details/index?id=' + options.id + | 					'/pages/activity/goods_bargain_details/index?id=' + options.id + | ||||||
|  | @ -520,13 +485,12 @@ | ||||||
| 			}, | 			}, | ||||||
| 			// 自己砍价; | 			// 自己砍价; | ||||||
| 			userBargain: function() { | 			userBargain: function() { | ||||||
| 				if (this.uid == this.startBargainUid) { | 				if (this.uid === this.startBargainUid) { | ||||||
| 					this.setBargain(); | 					this.setBargain(); | ||||||
| 				} | 				} | ||||||
| 			}, | 			}, | ||||||
| 			goBack: function() { | 			goBack: function() { | ||||||
| 				uni.navigateBack({ | 				uni.navigateBack({ | ||||||
| 
 |  | ||||||
| 					delta: 1 | 					delta: 1 | ||||||
| 				}) | 				}) | ||||||
| 			}, | 			}, | ||||||
|  | @ -682,14 +646,12 @@ | ||||||
| 				}) | 				}) | ||||||
| 			}, | 			}, | ||||||
| 			getBargainUserBargainPricePoster: function() { | 			getBargainUserBargainPricePoster: function() { | ||||||
| 				var that = this; |  | ||||||
| 				this.active = false | 				this.active = false | ||||||
| 				uni.showLoading({ | 				uni.showLoading({ | ||||||
| 					title: '海报生成中', | 					title: '海报生成中', | ||||||
| 					mask: true | 					mask: true | ||||||
| 				}); | 				}); | ||||||
| 				this.posters = false; | 				this.posters = false; | ||||||
| 				let arrImagesUrl = ''; |  | ||||||
| 				let arrImagesUrlTop = ''; | 				let arrImagesUrlTop = ''; | ||||||
| 				if (!this.PromotionCode) { | 				if (!this.PromotionCode) { | ||||||
| 					uni.hideLoading(); | 					uni.hideLoading(); | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 YunaiV
						YunaiV