1.修改分享领取优惠券功能

pages.json

@@ -507,13 +507,13 @@
 
 		, {
 			"path": "components/postion/postion",
-            "style" :                                                                                    
+			"style": {
-            {
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
 
 		}
+
 	],
 	"subpackages": [{
 		"root": "subPages",
@@ -819,6 +819,13 @@
 					}
 				}
 
+			}, { 
+			"path": "shareCounpon/shareCounpon",
+			"style": {
+				"navigationBarTitleText": "分享领取优惠券",
+				"enablePullDownRefresh": false
+			}
+
 		}
 		]
 	}, {

pages/goods/externalCoupon/externalCoupon.vue

@@ -92,7 +92,7 @@
 							        font-size: 16px;
 							        }
 								</style>
-							 <button class="download" style="height:40px;line-height: 40PX;width:100%;border:none;">立即使用</button>
+							 <button class="download" style="height:40px;line-height: 40PX;width:100%;border:none;">去使用</button>
 						</script>
 				</wx-open-launch-weapp>
 
@@ -177,7 +177,9 @@
 		onLoad() {
 			var arr1 = window.location.href;
 			var arr2 = arr1.split('=');
+			if(!app.globalData.openId){
 				this.getH5AccessToken(arr2[1]);
+			}
 			this.getDiscountByQrCode();
 
 		},
@@ -214,7 +216,7 @@
 			getDiscountByQrCode() {
 				let that = this;
 				uni.getStorage({
-					key: 'h5code',
+					key: 'staffCode',
 					success: (res) => {
 						let params = {
 							code: res.data

pages/order/confirmation.vue

@@ -288,7 +288,7 @@
 				radioStatus: true,
 				memDiscountId: '',
 				user: '',
-				paytype: 'weixin',
+				paytype: '2',
 				PaymentPassword: '',
 				orderId: '',
 				jumpType: '',

pages/tabBar/home/home.vue

@@ -517,6 +517,8 @@
 									// 008  工会卡卡券
 									// 009  分销推广优选商品
 									// 0010 只跳首页
+									// 0011 扫码领取优惠券
+									
 									if (e.data == '000000#/' && app.globalData.h5code) {
 										uni.navigateTo({
 											url: '../../goods/refuel-details/refuel-details'
@@ -573,6 +575,11 @@
 											url: '/subPages/selectEntry/selectEntry'
 										})
 									}
+									if (e.data == '0000011&key' && app.globalData.h5code) {
+										uni.navigateTo({
+											url: '../../goods/externalCoupon/externalCoupon'
+										})
+									}
 								}
 							}
 						})

pages/welcome/welcome.vue

@@ -24,6 +24,9 @@
 			uni.switchTab({
 				url: '../tabBar/home/home'
 			})
+			// uni.navigateTo({
+			// 	url:'/subPages/shareCounpon/shareCounpon'
+			// })
 			// #endif
 			// #ifdef H5
 			var arr1 = window.location.href;

subPages/recharge-centre/recharge-centre.vue

@@ -131,7 +131,7 @@
 				notice: '', //警告
 				textcont: '', // 富文本
 				explainReceiptTime: '', //时间到账 
-				time: 0,
+				time: 20,
 
 				//导航
 				scrollIntoView: 0, //设置哪个方向可滚动，则在哪个方向滚动到该元素
@@ -160,17 +160,18 @@
 			this.findSecConfigByTypewap();
 		},
 		mounted() {
-			let scroll_width = 0;
+			// let scroll_width = 0;
-			const query = uni.createSelectorQuery().in(this);
+			// const query = uni.createSelectorQuery().in(this);
-			query.select('.right-left-scroll').boundingClientRect(data => {
+			// query.select('.right-left-scroll').boundingClientRect(data => {
-				scroll_width = (data.width).toFixed(2);
+			// 	scroll_width = (data.width).toFixed(2);
-			}).exec();
+			// }).exec();
-
+
-			query.select('.right-left-scroll .content').boundingClientRect(data => {
+			// query.select('.right-left-scroll .content').boundingClientRect(data => {
-				if (data.width - scroll_width > 0) {
+			// 	if (data.width - scroll_width > 0) {
-					this.time = (9 * data.width / scroll_width).toFixed(2);
+			// 		this.time = (9 * data.width / scroll_width).toFixed(2);
-				}
+			// 		console.log('=====' + this.time);
-			}).exec();
+			// 	}
+			// }).exec();
 		},
 		methods: {
 			//查询弹窗

subPages/shareCounpon/shareCounpon.vue

@@ -0,0 +1,90 @@
+<template>
+	<view>
+		<view class="imgshead"></view>
+		<view class="imgscontent">
+			<view class="conts paddtop13">
+				<view v-for="(item,index) in couponList" :key="index" class="conpon border-r height90 flleft marb10 ">
+					<view class="width94 font15 fontwig6 fotlt fcorfff mart5">
+						96折星巴克优惠券
+					</view>
+					<view class="width80 fotct backcor99 mart5 linec6" style="opacity: 0.2;"></view>
+
+					<view class="width90 font10 fotlt fcorfff mart3">
+						满30-5元
+					</view>
+					<view class="width90 font10 fotlt fcorfff mart3">
+						有效时间: 30天
+					</view>
+					<view class="width90 font10 fotlt fcorfff mart3">
+						截止时间:2023年2月31日
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="imgsfoot">
+			<view class="width100 height50"></view>
+			<view class="couponBtn fontlet font24 fotct fontwig6 width60w  height45l">一键领取</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	let app = getApp();
+	export default {
+		data() {
+			return {
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres: 'share1.png',
+				imgadres1: 'share2.png',
+				couponList: [1, 2, 3, 4, 5, 6]
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.imgshead {
+		background-image: url(https://hsgcs.dctpay.com/filesystem/wxApplets/share1.png);
+		background-size: 100% 230px;
+		height: 230px;
+		background-repeat: no-repeat;
+	}
+
+	.imgscontent {
+		background-image: url(https://hsgcs.dctpay.com/filesystem/wxApplets/share2.png);
+		background-size: 100% 320px;
+		height: 320px;
+		background-repeat: no-repeat;
+
+		.conts {
+			width: 74%;
+			margin-left: 13%;
+		}
+	}
+
+	.imgsfoot {
+		background-image: url(https://hsgcs.dctpay.com/filesystem/wxApplets/share3.png);
+		background-size: 100% 250px;
+		height: 250px;
+		background-repeat: no-repeat;
+	}
+
+
+	.conpon {
+		background: linear-gradient(to bottom, #fe8e3f, #f14f21);
+		width: 48%;
+		margin-right: 1%;
+		margin-left: 1%;
+	}
+
+	.couponBtn {
+		letter-spacing: 3px;
+		color: #ff482d;
+		border-radius: 25px;
+		background: linear-gradient(to right, #fea03c, #f7dd6a);
+	}
+</style>

uni.scss

@@ -76,6 +76,9 @@ $uni-color-paragraph: #3F536E; // 文章段落颜色
 $uni-font-size-paragraph:30upx;
 
 /* 字体大小 */
+.font10 {
+  font-size: 10px;
+}
 .font11 {
   font-size: 11px;
 }
@@ -660,6 +663,9 @@ $uni-font-size-paragraph:30upx;
   margin-top: 5px;
 }
 
+.mart3 {
+  margin-top: 3px;
+}
 .mart1 {
   margin-top: 1px;
 }
@@ -843,10 +849,6 @@ $uni-font-size-paragraph:30upx;
 	display: flex;
 }
 
-.font12{
-	font-size: 12px;
-}
-
 
 .aliitem{
 	align-items: center;