From 62672a5c091e16c9f64e6b150b000b19b9927272 Mon Sep 17 00:00:00 2001
From: xvv <cccccc420590@163.com>
Date: Wed, 25 Sep 2024 10:38:08 +0800
Subject: [PATCH] 9.25

---
 gasStation-uni/pages/index/index.vue     |   7 +-
 gasStation-uni/pagesMy/invite/invite.vue | 140 +++++++++++++++++++++--
 gasStation-uni/pagesMy/invite/list.vue   |  63 +++++++++-
 gasStation-uni/static/my/fzlj.png        | Bin 0 -> 1702 bytes
 gasStation-uni/static/my/fztp.png        | Bin 0 -> 1303 bytes
 5 files changed, 197 insertions(+), 13 deletions(-)
 create mode 100644 gasStation-uni/static/my/fzlj.png
 create mode 100644 gasStation-uni/static/my/fztp.png

diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index 336897b14..0a982d520 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -30,7 +30,7 @@
 					<image src="../../static/new/n5.png" mode=""></image>
 					<view class="">领券中心</view>
 				</view>
-				<view class="_bgox">
+				<view class="_bgox" @click="goInvite()">
 					<image src="../../static/new/n6.png" mode=""></image>
 					<view class="">邀请有礼</view>
 				</view>
@@ -261,6 +261,11 @@
 			tabbar
 		},
 		methods: {
+			goInvite() {
+				uni.navigateTo({
+					url: '/pagesMy/invite/invite'
+				})
+			},
 			goMyCard() {
 				uni.navigateTo({
 					url: '/pagesHome/MyCard/MyCard'
diff --git a/gasStation-uni/pagesMy/invite/invite.vue b/gasStation-uni/pagesMy/invite/invite.vue
index bc11379a9..a0ba378a6 100644
--- a/gasStation-uni/pagesMy/invite/invite.vue
+++ b/gasStation-uni/pagesMy/invite/invite.vue
@@ -14,7 +14,7 @@
 						<image src="../../static/new/fxrwm.png" mode=""></image>
 						<view class="min-size">分享二维码</view>
 					</view>
-					<view class="or-box">
+					<view class="or-box" @click="goList()">
 						<image src="../../static/new/jljl.png" mode=""></image>
 						<view class="min-size">奖励记录</view>
 					</view>
@@ -25,7 +25,7 @@
 			</view>
 			<view class="h_bs">
 				<view class="title_">推荐会员消费有礼</view>
-				<view class="d-s">
+				<view class="d-s" @click="goDetails()">
 					<view class="hui-size">详情</view>
 					<u-icon name="arrow-right" color="#999999" size="12"></u-icon>
 				</view>
@@ -56,7 +56,7 @@
 			<view class="si_t">
 				<view style="display: flex; align-items: center; justify-content: space-between; margin-bottom: 10px; ">
 					<view class="title_">适用门店</view>
-					<view class="d-s" style=" color: #FF2828; ">
+					<view class="d-s" style=" color: #FF2828; margin: 0px; ">
 						<image src="../../static/icon/reddh.png" style="width: 14px; height: 14px; "></image> 导航
 					</view>
 				</view>
@@ -65,11 +65,55 @@
 			</view>
 			<!-- 顶部区域 -->
 
-			<u-popup :show="show" mode="center" :round="10" @close="close" @open="open">
-				<view class="popup_box">
-					<w-qrcode :options="options"></w-qrcode>
+			<u-overlay :show="show" @click="show = false">
+				<view class="warp">
+					<view class="warp-cent" @tap.stop>
+						<view class="title_or">扫码领会员</view>
+						<view class="d-s">
+							<view class="touxiang">
+								<image src="../../static/logo.png" mode=""></image>
+							</view>
+							<view class="">
+								<view class="tiitle_">百业兴加油站</view>
+								<view class="size_">油站会员卡</view>
+							</view>
+						</view>
+						<view style="width: 100%;display: flex;justify-content: center; ">
+							<w-qrcode :options="options"></w-qrcode>
+						</view>
+
+					</view>
+					<view class="warp-bottom" @tap.stop>
+						<view class="bott_box">
+							<view class=""></view>
+							<view class="">选择方式</view>
+							<view class="" @click="show = false">
+								<u-icon name="close" size="16"></u-icon>
+							</view>
+						</view>
+						<view class="bott-box">
+							<view class="">
+								<view class="">
+									<image src="../../static/my/fztp.png" style="width: 40px; height: 40px; "></image>
+								</view>
+								<view class="">
+									保存图片
+								</view>
+
+							</view>
+							<view class="">
+								<view class="">
+									<image src="../../static/my/fzlj.png" style="width: 40px; height: 40px; "></image>
+								</view>
+								<view class="">
+									复制链接
+								</view>
+
+							</view>
+						</view>
+					</view>
 				</view>
-			</u-popup>
+			</u-overlay>
 
 
 		</view>
@@ -90,13 +134,13 @@
 				title: '',
 				userId: '',
 				storeId: '',
-				show: false,
+				show: true,
 				options: {
 					code: 'https://oilapi.youkerr.com/oily?storeId=' + uni.getStorageSync('storeId') + '&userId=' + uni
 						.getStorageSync('userId') + '&type=yaoqingyouli',
 					// code: 'https://www.tuofeng.cc/oily?storeId=' + uni.getStorageSync('storeId') + ' &userId=' + uni
 					// 	.getStorageSync('userId'), // 生成二维码的值
-					size: 500, // 460代表生成的二维码的宽高均为460rpx
+					size: 400, // 460代表生成的二维码的宽高均为460rpx
 				},
 
 			}
@@ -166,6 +210,16 @@
 			this.getActiveRecommendRecords();
 		},
 		methods: {
+			goList() {
+				uni.navigateTo({
+					url: '/pagesMy/invite/list'
+				})
+			},
+			goDetails() {
+				uni.navigateTo({
+					url: '/pagesMy/invite/details'
+				})
+			},
 			// https://www.tuofeng.cc/oilStation?storeId=19&staffId=45
 			close() {
 				this.show = false
@@ -466,6 +520,8 @@
 	.d-s {
 		display: flex;
 		align-items: center;
+		justify-content: center;
+		margin: 15px auto;
 	}
 
 	.backf {
@@ -485,4 +541,68 @@
 		border-bottom: 1px solid #EEEEEE;
 		width: 100%;
 	}
-</style>
+
+	.warp {
+		width: 100%;
+		height: 100vh;
+		position: relative;
+	}
+
+	.warp-bottom {
+		position: absolute;
+		left: 0px;
+		bottom: 0px;
+		background: #fff;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 10px;
+		border-radius: 10px 10px 10px 10px;
+		text-align: center;
+
+	}
+
+	.bott-box {
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		box-sizing: border-box;
+		padding-bottom: 15px;
+		border-top: 1px solid #eee;
+		padding-top: 10px;
+	}
+
+	.bott_box {
+		box-sizing: border-box;
+		padding: 5px;
+		padding-bottom: 15px;
+
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.warp-cent {
+		width: 85%;
+		background: #333;
+		position: absolute;
+		color: #fff;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		bottom: -5%;
+		box-sizing: border-box;
+		padding: 10px;
+		padding-bottom: 60px;
+	}
+
+	.tiitle_ {
+		font-weight: 600;
+		font-size: 16px;
+		color: #FFFFFF;
+	}
+
+	.title_or {
+		color: #eeb668;
+		text-align: center;
+		font-size: 28px;
+	}
+</style>
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/invite/list.vue b/gasStation-uni/pagesMy/invite/list.vue
index 4cd7bccc8..9beca08e8 100644
--- a/gasStation-uni/pagesMy/invite/list.vue
+++ b/gasStation-uni/pagesMy/invite/list.vue
@@ -12,8 +12,25 @@
 				</view>
 			</view>
 			<view class="tab_">
-				<view class="t-box" :class="{'orsize' : tindex == index  }" v-for="(item,index) in tabList"
-					:key="index">{{item.name}}</view>
+				<view class="t-box" :class="{'orsize' : tindex == index  }" v-for="(item,index) in tabList" :key="index"
+					@click="setIndex(index)">{{item.name}}</view>
+			</view>
+			<view class="whit-box" v-if="tindex == 1">
+				<view class="one_h" v-for="(item,index) in 4" :key="index">
+					<view class="">券名称</view>
+					<view class="">2024-8-7</view>
+				</view>
+			</view>
+			<view class="whit-box" v-else>
+				<view class="one_h" v-for="(item,index) in 4" :key="index">
+					<view class="d-s">
+						<view class="touxiang">
+							<image src="../../static/logo.png" mode=""></image>
+						</view>
+						<view class="">名字</view>
+					</view>
+					<view class="">2024-8-7</view>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -67,6 +84,9 @@
 
 		},
 		methods: {
+			setIndex(num) {
+				this.tindex = num
+			},
 			//滞空方法
 			resetting() {
 				this.pageNo = 1
@@ -151,11 +171,50 @@
 		font-weight: 600;
 		font-size: 16px;
 		color: #333333;
+		box-sizing: border-box;
+		padding-bottom: 10px;
 		border-bottom: 1px solid transparent;
+
 	}
 
 	.orsize {
 		color: #FA6400;
 		border-bottom: 1px solid #FA6400;
 	}
+
+	.whit-box {
+		width: 95%;
+		background: #fff;
+		margin: 15px;
+
+	}
+
+	.one_h {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 10px;
+		border-bottom: 1px solid #eee;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.touxiang {
+		width: 40px;
+		height: 40px;
+		overflow: hidden;
+		border-radius: 50%;
+		margin-right: 10px;
+
+		image {
+			width: 40px;
+			height: 40px;
+
+		}
+	}
+
+	.d-s {
+		display: flex;
+		align-items: center;
+	}
 </style>
\ No newline at end of file
diff --git a/gasStation-uni/static/my/fzlj.png b/gasStation-uni/static/my/fzlj.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0f3ed1a02061187ee5cd1d84c5153013483edcd
GIT binary patch
literal 1702
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
P84#KS-M;LIZ{mLe+fv2V

literal 0
HcmV?d00001

diff --git a/gasStation-uni/static/my/fztp.png b/gasStation-uni/static/my/fztp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f48c9ef51a56b73019aef5936aeba0fb6385b3f
GIT binary patch
literal 1303
zcmZXTdsNbA7{`CW$ueiH(vD&Cf}UJSp|wrV$y7=smLU?|rZJkyT)D2+$qOgVtu$|l
zrdT0qqQxfSyyOM#Vh)Q`)J#;AQq;VL(?v<}4BJls?3~a0e4pq0Jm-D?c+ZnWrI0L_
zVwWNaVoBcRM>8pP;Vi+JVoe)bU=q|>8fiNsZe2TO%DL14y1&T;6LGG<b%wOH3#4Fy
zYYQA4a2z4c0XTLGq}f4+{m0TCI41K`w1;%N|1g>9|6-aq4SeK3=TqzdiRm`Sh37Jy
zAj28B>mc(>$XXBA@Q_1*9CzTkL+)2_!vk(^1-=O{$nyq)FXZolLNW+<L(v{63WVZ7
z5bcAK5D*`RQYJ`_fFu;kjzYyTs6Gufkx+XMq*3r79v)nRhY9fLGBjR+rWBB+!;>s{
zngenkwA_GJ0kjD~kq?RjP~3(NA#~n>=Xc?S7?fquQvp4d&|3+8)zDuD{ZbgHhk*uA
z--p2_7?i<KGiaW|upCBOV6+Whcfgbi-l#!42!D;h>?q8QgH8+YXJP(tn12g;9T@ar
z_y9%&7>xknqOL4A{mO<&8f7nnGFxoE(rT@pi;sW6o}loE(`gx*Hzj4YO^Wu8F4chg
z)$qg{?aVuaQFaE^h#+VK*^fv+*w~ai_C1YgbvgZNqC=UJLv#@JB{TQCnhNaHPpet<
z-fwTT?~KX)^_Bjjj)<QTV}?p~L#L)2`7v$mwr6W_p*@EOn1zAlqE51quyU?;^0_qP
z#6^5#OjgqS{wh}Z&#el#iEvL%#Hz>VE|@8)n7m~fHS?F1^c~*vEpLL9+$_7@o+REz
z*Gae0FLss1(G~}snu^C;thWvK7(BQ0(7|>Jn{mL$Bj31b8$;*dA$)j(uRqR}dEJRh
z=NnWN^IzwM#$*Lk=>{=I#YKx^TdT~TO+PtBx*ALu&A3huXLt3zB;bj4Qdv<mvH?D{
z%V-+?gbr);s+YvdedQLNSi6S3)?OmPpZh(I6tr}?cZKCev-fu0R$=ks8;eCDeU*y4
z^TkofwSxAnWNTzrWWo3Iv!bOQh_f#Dkf7=G1V<dMFY#C`hPN3*LD`O5$E7B!#+k?n
zxnPZE9qv9cqJi3Mfin16b*A$17~d!wV&nA3kCCDBzOkUy2y0T)k=lZ(q}?^slwf-N
z8U0E$^@mNUMW|ajm(Ii!uQv0~{4$8w($W~xs>ri5PgA_zDCSkyzmX*i?u|D{jM|&a
z+=%3=Y-M@daZAQ5!<JWAQ7J2@FNzzlBi&2ZF-p7hu{lL0D3?6coq8!<_gs~$-*=eV
zf!1n+5&O~e%UfPk4!JKLVIb98du_IeE$Jy8EK)a0CE;CRM<*Gky4y-mW{>i61NX;o
zeX%NdwDY%##;_5W2gM05e72Q3etsePtw$Bbf|roS=JRX>_4CzBZ<$F~mJu)sVcu_<
z7D#Kd&F@5WCaXb<dFQ=>hW;$sYKvf=7Hs88V};ErRy^E%%r-mZwUFSiA!HX4Mhgj^
z!-OOup?CPCYvIY*#78BwkMwm>Sq=5q?xS+lIL^Rhj+&LBUcyz2xaxpR^>n71<BYrF
zD;IXp_*}2mE6!)DZA$M=ljg#m221p8&k!a1!-_!X&atDo6T|O@mWO!5Gkw1~$Fx2O
M*`MMk-p;)A4+x;oegFUf

literal 0
HcmV?d00001