更新代码

2026-04-23 12:08:33 +08:00 · 2021-02-06 17:25:18 +08:00
parent d5353ccbdc
commit 1df499236d
40 changed files with 2294 additions and 2338 deletions
--- a/app/pages/activity/goods_bargain_details/index.vue
+++ b/app/pages/activity/goods_bargain_details/index.vue
@@ -8,17 +8,6 @@
 					<!-- :style="'top:'+navH/2+'rpx'" -->
 					{{bargainCount.lookCount || 0}}人查看 丨 {{bargainCount.shareCount || 0}}人分享 丨 {{bargainCount.userCount || 0}}人参与
 				</view>
-				<!-- <view class='time font-color' v-if="bargainUid == userInfo.uid">
-					倒计时
-					<text>{{countDownDay}}</text>
-					天
-					<text>{{countDownHour}}</text>
-					时
-					<text>{{countDownMinute}}</text>
-					分
-					<text>{{countDownSecond}}</text>
-					秒
-				</view> -->
 				<countDown :tipText="'倒计时'" :dayText="'天'" :hourText="'时'" :minuteText="'分'" :secondText="'秒'" :datatime="datatime" :isDay="true" v-if="bargainUid == userInfo.uid"></countDown>
 				<view v-if="bargainUid != userInfo.uid" class='pictxt acea-row row-center-wrapper'>
 					<view class='pictrue'>
--- a/app/pages/activity/goods_combination_details/index.vue
+++ b/app/pages/activity/goods_combination_details/index.vue
@@ -22,7 +22,7 @@
 					<view class='wrapper'>
 						<view class='share acea-row row-between row-bottom'>
 							<view class='money font-color'>
-								￥<text class='num'>{{storeInfo.price || 0}}</text><text class='y-money'>￥{{storeInfo.product_price || 0}}</text>
+								￥<text class='num'>{{storeInfo.price || 0}}</text><text class='y-money'>￥{{storeInfo.otPrice || 0}}</text>
 							</view>
 							<view class='iconfont icon-fenxiang' @click="listenerActionSheet"></view>
 						</view>
@@ -120,8 +120,7 @@
 				<view class='product-intro' id="past2">
 					<view class='title'>产品介绍</view>
 					<view class='conter'>
-						<!-- <rich-text :nodes="storeInfo.description" class="conter"></rich-text> -->
-						<jyf-parser :html="storeInfo.description" ref="article" :tag-style="tagStyle"></jyf-parser>
+						<jyf-parser :html="storeInfo.content" ref="article" :tag-style="tagStyle"></jyf-parser>
 					</view>
 				</view>
 				<view style='height:120rpx;'></view>
@@ -198,8 +197,6 @@
 		<view class="share-box" v-if="H5ShareBox">
 			<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
 		</view>
-		<!-- <view class='mask' v-if="posterImageStatus"></view>
-		<canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas> -->
 		<!-- #ifdef MP -->
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
 		<!-- #endif -->
@@ -212,12 +209,11 @@
 <script>
 	const app = getApp();
 	import uQRCode from '@/js_sdk/Sansnn-uQRCode/uqrcode.js'
-	
-	import { base64src } from '@/utils/base64src.js'
 	import {
 		mapGetters
 	} from "vuex";
 	// #ifdef MP
+	import { base64src } from '@/utils/base64src.js'
 	import authorize from '@/components/Authorize';
 	import {
 		getQrcode
@@ -645,7 +641,7 @@
 			 * 购物车数量加和数量减
 			 * 
 			 */
-		ChangeCartNum: function(changeValue) {
+		    ChangeCartNum: function(changeValue) {
 			//changeValue:是否 加|减
 			//获取当前变动属性
 			let productSelect = this.productValue[this.attrValue];
@@ -667,7 +663,7 @@
 			let nums = this.storeInfo.onceNum || 0;
 		//设置默认数据
 			if (productSelect.cart_num == undefined) productSelect.cart_num = 1;
-				if (changeValue) {
+			if (changeValue) {
 					if (num.cart_num === this.onceNum) {
 						return this.$util.Tips({
 							title: `该商品每次限购${this.onceNum}${this.storeInfo.unitName}`
@@ -809,7 +805,7 @@
 			},
 			// 分享关闭
 			listenerActionClose: function() {
-				this.posters = false;
+				this.canvasStatus = false;
 			},
 			//隐藏海报
 			posterImageClose: function() {
@@ -1039,8 +1035,9 @@
 		},
 		//#ifdef MP
 		onShareAppMessage() {
+			let that = this;
 			return {
-				title: this.storeInfo.title,
+				title: that.storeInfo.title,
 				path: app.globalData.openPages,
 				imageUrl: that.storeInfo.image
 			};
@@ -1399,8 +1396,8 @@
 	}

 	.canvas {
-		width: 750px;
-		height: 1190px;
+		position:fixed;
+		z-index: -5;
 		opacity: 0;
 	}

--- a/app/pages/activity/goods_seckill_details/index.vue
+++ b/app/pages/activity/goods_seckill_details/index.vue
@@ -163,7 +163,6 @@
 <script>
 	const app = getApp();
 	import uQRCode from '@/js_sdk/Sansnn-uQRCode/uqrcode.js'
-	import { base64src } from '@/utils/base64src.js'
 	import {
 		mapGetters
 	} from "vuex";
@@ -183,6 +182,7 @@
 	import userEvaluation from '@/components/userEvaluation/index.vue'
 	// #ifdef MP
 	import authorize from '@/components/Authorize';
+	import { base64src } from '@/utils/base64src.js'
 	import {
 		getQrcode
 	} from '@/api/api.js';
@@ -199,7 +199,6 @@
 	} from '@/libs/login.js';
 	import { silenceBindingSpread } from "@/utils";
 	export default {
-		computed: mapGetters(['isLogin']),
 		data() {
 			return {
 				id: 0,
@@ -310,9 +309,9 @@
 			
 			//扫码携带参数处理
 			if (options.scene) {
-				let value = this.$util.getUrlParams(decodeURIComponent(options.scene));
-				if (value.id){
-					this.id = value.id;
+			//	let value = this.$util.getUrlParams(decodeURIComponent(options));
+				if (options.id){
+					this.id = options.id;
 				}else{
 					return this.$util.Tips({
 						title: '缺少参数无法查看商品'
@@ -322,8 +321,8 @@
 					});
 				} 
 				//记录推广人uid
-				if (value.pid) app.globalData.spid = value.pid;
-				if (value.time) this.datatime = value.time
+				if (options.pid) app.globalData.spid = options.pid;
+				if (options.time) this.datatime = options.time
 			}
 			// #endif
 			
@@ -423,8 +422,8 @@
 					setTimeout(function() {
 						that.infoScroll();
 					}, 500);
-					app.globalData.openPages = '/pages/activity/goods_seckill_details/index?id=' + that.id + '&time=' + that.time +
-					'&status=' + that.status + '&scene=' + that.storeInfo.uid;
+					app.globalData.openPages = '/pages/activity/goods_seckill_details/index?id=' + that.id + '&time=' + that.datatime +
+					'&status=' + that.status + '&scene=' + that.uid + '&productId=' + that.storeInfo.productId;
 				
 				}).catch(err => {
 					that.$util.Tips({
@@ -956,7 +955,17 @@
 					});
 				}
 			},
-		}
+		},
+	    //#ifdef MP
+	    onShareAppMessage() {
+	    	let that = this;
+	    	return {
+	    		title: that.storeInfo.title,
+	    		path: app.globalData.openPages,
+	    		imageUrl: that.storeInfo.image
+	    	};
+	    },
+	    //#endif
 	}
 </script>

--- a/app/pages/activity/poster-poster/index.vue
+++ b/app/pages/activity/poster-poster/index.vue
@@ -135,7 +135,9 @@
 						let people = this.storeCombination.storeCombination.people;
 						let otPrice = this.storeCombination.storeCombination.otPrice;
 						let count = this.storeCombination.count;
-						this.PosterCanvas(arrImages, storeName, price, people,otPrice,count);
+						setTimeout(() => {
+							this.PosterCanvas(arrImages, storeName, price, people,otPrice,count);
+						}, 300);
 					},
 					complete: () => {
 					},
@@ -162,7 +164,7 @@
 								context.setFontSize(36);
 								context.setTextAlign('center');
 								context.setFillStyle('#282828');
-								let maxText = 17;
+								let maxText = 20;
 								let text = storeName;
 								let topText = '';
 								let bottomText = '';
@@ -190,7 +192,7 @@
 								
 								context.setFontSize(72);
 								context.setFillStyle('#fc4141');
-								context.fillText(price, 220, 210);
+								context.fillText(price, 250, 210);
 								
 								context.setFontSize(32);
 								context.setFillStyle('#FFFFFF');