9.21

gasStation-uni/pages/my/my.vue

@@ -9,22 +9,18 @@
 				<view class="dis-box">
 					<view class="dis">
 						<view class="touxiang" @click="goSetup">
-							<image v-if="user.avatar!='' && user.avatar!=null && user.avatar!=undefined"
+
-								:src="baseUrl + user.avatar" mode="aspectFit"></image>
+							<image src="./icon/newmy.png" mode="aspectFit"></image>
-							<image v-else src="../../static/imgs/myx.png" mode="aspectFit"></image>
 						</view>
 						<view class="">
-							<view class="user-tel" @click="goSetup">{{user.mobile?user.mobile:"点击登录"}}</view>
+							<view class="user-tel">点击登录</view>
-							<view class="user-name" @click="gorefuel">
+
-								{{store.name}}{{store.description ? "("+store.description+")" : ""}}<uni-icons
-									type="right" color="#c1c1ff" size="12"></uni-icons>
 						</view>
 					</view>
+
 				</view>
-					<view class="vipnber" @click="govip()">会员等级 <uni-icons type="right" color="#ffffff"
-							size="16"></uni-icons></view>
 			</view>
-				<view class="my-top-box">
+			<view class="my-top-box" style="margin-top: 45px;">
 				<view class="jg-box" @click="goMony()">
 					<view class="jg-box-title">储值余额</view>
 					<view class="jg-box-nmb">{{cardBalance || 0 }}元</view>
@@ -34,7 +30,6 @@
 					<view class="jg-box-title">锁价次数</view>
 					<view class="jg-box-nmb">{{countList.length || 0 }}次</view>
 				</view>
-
 				<text style="color: #999999;">|</text>
 				<view class="jg-box" @click="toCoupons">
 					<view class="jg-box-title">卡券</view>
@@ -46,46 +41,9 @@
 					<view class="jg-box-nmb">{{myPoints || 0 }}</view>
 				</view>
 			</view>
-			</view>
-			<view class="my-top-box" style="margin-top: 45px;">
-				<view class="centenr-sx" @click="goMyOrder(0)">
-					<view class="centenr-img">
-						<image src="../../static/my/dingdan.png" mode="aspectFit"></image>
-					</view>
-					<view class="centenr-size">
-						我的订单
-					</view>
-				</view>
 
-
-				<view class="centenr-sx" @click="goMyOrder(1)">
-					<view class="centenr-img">
-						<image src="../../static/my/dsy.png" mode="aspectFit"></image>
-					</view>
-					<view class="centenr-size">
-						待支付
-					</view>
-				</view>
-
-				<view class="centenr-sx" @click="goMyOrder(2)">
-					<view class="centenr-img">
-						<image src="../../static/my/ywc.png" mode="aspectFit"></image>
-					</view>
-					<view class="centenr-size">
-						已完成
-					</view>
-				</view>
-				<view class="centenr-sx" @click="goMyOrder(3)">
-					<view class="centenr-img">
-						<image src="../../static/my/dpj.png" mode="aspectFit"></image>
-					</view>
-					<view class="centenr-size">
-						待评价
-					</view>
-				</view>
-			</view>
 			<view class="box-centenr">
-				<view class="box-centenr-title">我的服务</view>
+
 				<view class="wrap-box">
 					<view class="centenr-sx" @click="goReder">
 						<view class="centenr-img">
@@ -403,7 +361,7 @@
 	.my-header {
 		width: 100%;
 		height: 88px;
-		background: #304fff;
+		background: #FF9655;
 		display: flex;
 		align-items: center;
 		justify-content: center;
@@ -418,9 +376,9 @@
 	}
 
 	.my-top {
-		height: 150px;
+		height: 80px;
 		width: 100%;
-		background: #304fff;
+		background: #FF9655;
 		box-sizing: border-box;
 		padding-top: 1px;
 	}
@@ -436,11 +394,15 @@
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
+		background: #fff;
+		border-radius: 4px;
+		box-sizing: border-box;
+		padding: 20px;
 	}
 
 	.touxiang {
-		width: 65px;
+		width: 50px;
-		height: 65px;
+		height: 50px;
 		border-radius: 50%;
 		background-color: #ebf5ff;
 		overflow: hidden;
@@ -455,8 +417,9 @@
 	.user-tel {
 		font-weight: bold;
 		font-size: 20px;
-		color: white;
+
 		margin-bottom: 5px;
+
 	}
 
 	.user-name {
@@ -520,6 +483,7 @@
 		align-items: center;
 		justify-content: space-between;
 		color: #404041;
+
 	}
 
 	.wrap-box {
@@ -540,7 +504,6 @@
 	}
 
 	.centenr-img {
-
 		margin: 2px auto;
 
 		image {

gasStation-uni/pages/refuel/refuel.vue

@@ -5,6 +5,7 @@
 				<view class="my-text">一键加油</view>
 			</view> -->
 			<view class="top">
+
 				<view class="dis">
 					<view class="top-img">
 						<image v-if="!store.logo" src="../../static/logo.png" mode="aspectFit"></image>
@@ -22,14 +23,18 @@
 						选择油品油枪
 					</view>
 					<view class="input_kuang">
-						<view class="leftIput">汽油92#1号枪</view>
+						<view class="leftIput" @click="selectShow = true">汽油92#1号枪</view>
-						<view class="rr_box">小王</view>
+						<view class="rr_box" @click="Selectemployees = true">小王</view>
 					</view>
+					<view style="display: flex;justify-content: space-between;">
 						<view class="title_">
 							加油金额
 						</view>
+						<view class="sm_r-zie" style="font-weight: bold;">7.26元/L</view>
+					</view>
 					<view class="input_kuang">
-						<view class="leftIput">￥200</view>
+						<view class="leftIput">￥<input style="width: 100%;" type="text" placeholder="请输入金额" />
+						</view>
 						<view class="rr_box">36.55L</view>
 					</view>
 					<view class="title_">
@@ -49,23 +54,41 @@
 						<view class="br-box">
 							<view style="font-size: 14px;">
 								<view class="">会员卡类型</view>
-								<view class="">储值卡（余额：6532.89）</view>
+								<view class="d-bs" style="align-items: center;border-bottom: none;"
+									@click="cardType = true">
+									<view style="font-size: 12px;">储值卡（余额：6532.89）</view>
+									<view style="line-height: 20px;">
+										<u-icon name="arrow-right" size="12px"></u-icon>
+									</view>
+
+								</view>
+							</view>
+							<!-- <view style="display: flex;align-items: center;">
+								<view class="anxuan">
+									<view class="dian"></view>
 								</view>
 								<u-icon name="arrow-right"></u-icon>
+							</view> -->
+							<view class="anxuan">
+								<view class="dian"></view>
+							</view>
+
 						</view>
 					</view>
 					<view class="d-bs">
 						<image src="../../static/icon/wz.png" style="width: 35px; height: 35px; "></image>
 						<view class="br-box">
 							<view class="">微信</view>
-							<u-icon name="arrow-right"></u-icon>
+							<view class="anxuan">
+								<view class="dian"></view>
+							</view>
 						</view>
 					</view>
 					<view class="title_">
 						优惠信息
 					</view>
 				</view>
-				<view class="d-bs" style="box-sizing: border-box; padding: 20px;">
+				<view class="d-bs" style="box-sizing: border-box; padding: 20px;" @click="selectCoupon = true">
 					<view class="">优惠券</view>
 					<view class="d-s">
 						<view class="">-20.00</view>
@@ -185,18 +208,17 @@
 					</keyboard>
 				</uni-popup>
 			</view>
-
 			<view>
-
 				<u-popup :show="selectCoupon" closeable="true" mode="bottom" :round="10" @close="Couponclose">
 					<view class="popup-box">
 						<view class="p_title">选择优惠券</view>
 						<view class="p-tab">
-							<view :class="{'or' :tabIndex ==index }" v-for=" (item,index) in tabList" :key="index">
+							<view :class="{'or' :tabIndex ==index }" v-for=" (item,index) in tabList"
+								@click="setabIndex(index)" :key="index">
 								<text>{{item.name}}</text> <text>( {{item.num}} )</text>
 							</view>
 						</view>
-						<view class="couponBox">
+						<view class="couponBox" v-if="tabIndex == 0">
 							<view class="cou_top">
 								<view class="d-s">
 									<view class="qaz"></view>
@@ -208,6 +230,42 @@
 								<view class="sm_size">有效期：2024-08-05 14:15:12~2024-08-15 14:15:11</view>
 								<view class="sm_r-zie">满200可用</view>
 							</view>
+							<view class="dashed_box"></view>
+							<view class="cou_top">
+								<view class="sb_size" :class="{ 'sb_xl' : RandR == true  }">
+									以下支付方式可用：微信、支付宝、云闪付、pos刷卡、会以下支付方式可用：微信、支付宝、云闪付、pos刷卡、会以下支付方式可用：微信、支付宝、云闪付、pos刷卡、会以下支付方式可用：微信、支付宝、云闪付、pos刷卡、会以下支付方式可用：微信、支付宝、云闪付、pos刷卡、会以下支付方式可用：微信、支付宝、云闪付、pos刷卡、会以下支付方式可用：微信、支付宝、云闪付、pos刷卡
+								</view>
+								<view class="sm_r-zie" style="height: 14px; " @click="RandR =! RandR">适用详情 <u-icon
+										name="arrow-right" color="#E02020" size="10"></u-icon> </view>
+							</view>
+						</view>
+						<view class="couponBox_h" v-if="tabIndex == 1">
+							<view class="cou_top">
+								<view class="d-s">
+									<view class="qaz"></view>
+									<view class="c_title">油品消费满减券</view>
+								</view>
+								<view class="c-h-num">¥10</view>
+							</view>
+							<view class="cou_top">
+								<view class="sm_size">有效期：2024-08-05 14:15:12~2024-08-15 14:15:11</view>
+								<view class="sm_h-zie">满200可用</view>
+							</view>
+							<view class="dashed_box_h"></view>
+							<view class="cou_top">
+								<view class="sb_size" :class="{ 'sb_xl' : RandR == true  }">
+									以下支付方式可用：微信、支付宝、云闪付、pos刷卡、会以下支付方式可用：微信、支付宝、云闪付、pos刷卡、会以下支付方式可用：微信、支付宝、云闪付、pos刷卡、会以下支付方式可用：微信、支付宝、云闪付、pos刷卡、会以下支付方式可用：微信、支付宝、云闪付、pos刷卡、会以下支付方式可用：微信、支付宝、云闪付、pos刷卡、会以下支付方式可用：微信、支付宝、云闪付、pos刷卡
+								</view>
+								<view class="sm_h-zie" style="height: 14px; " @click="RandR =! RandR">适用详情 <u-icon
+										name="arrow-right" color="#999" size="10"></u-icon> </view>
+							</view>
+							<view class="dashed_box_h"></view>
+							<view class="sm_r-zie" style="height: 14px; margin-bottom: 10px; " @click="RandR =! RandR">
+								不可用原因 <u-icon name="arrow-right" color="#E02020" size="10"></u-icon> </view>
+							<view class="sb_size">
+								不满足优惠券使用时间
+								不与其他优惠同时使用
+							</view>
 						</view>
 					</view>
 				</u-popup>
@@ -349,7 +407,7 @@
 	export default {
 		data() {
 			return {
-				selectCoupon: true,
+				selectCoupon: false,
 				cardType: false,
 				selectShow: false,
 				Selectemployees: false,
@@ -358,6 +416,7 @@
 				anIndex: 0,
 				qhindex: 0,
 				msg: "2",
+				RandR: false,
 				tabList: [{
 						name: '可用优惠券',
 						num: 1
@@ -487,6 +546,12 @@
 		},
 
 		methods: {
+			Couponclose() {
+				this.selectCoupon = false
+			},
+			setabIndex(index) {
+				this.tabIndex = index
+			},
 			cardTypeclose() {
 				this.cardType = false
 			},
@@ -512,7 +577,7 @@
 
 			},
 			Selectclose() {
-				this.ConfirmPayment = false
+				this.Selectemployees = false
 			},
 			closePayment() {
 				this.ConfirmPayment = false
@@ -1216,6 +1281,8 @@
 	.leftIput {
 		box-sizing: border-box;
 		padding-left: 10px;
+		display: flex;
+		align-items: center;
 	}
 
 	.rr_box {
@@ -1492,10 +1559,17 @@
 		border: 1px solid #FA6400;
 	}
 
+	.couponBox_h {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 10px;
+		margin: 15px auto;
+		border: 1px solid #999;
+	}
+
 	.cou_top {
 		width: 100%;
 		display: flex;
-		align-items: center;
 		justify-content: space-between;
 	}
 
@@ -1505,14 +1579,20 @@
 		color: #E02020;
 	}
 
+	.c-h-num {
+		font-weight: 600;
+		font-size: 16px;
+		color: #999;
+	}
+
 	.c_title {
 		font-size: 14px;
 		color: #333333;
 	}
 
 	.qaz {
-		width: 14px;
+		width: 12px;
-		height: 14px;
+		height: 12px;
 		border-radius: 50%;
 		border: 1px solid #999999;
 		margin-right: 5px;
@@ -1522,10 +1602,52 @@
 		font-weight: 400;
 		font-size: 10px;
 		color: #E02020;
+		display: flex;
+		align-items: center;
+
+	}
+
+	.sm_h-zie {
+		font-weight: 400;
+		font-size: 10px;
+		color: #999;
+		display: flex;
+		align-items: center;
+
 	}
 
 	.sm_size {
 		font-size: 10px;
 		color: #333333;
+		width: 80%;
+		white-space: nowrap;
+		//不换行
+		overflow: hidden; //超出部分隐藏
+		text-overflow: ellipsis; //文本溢出显示省略号
+	}
+
+	.sb_size {
+		font-size: 10px;
+		color: #333333;
+		width: 80%;
+		white-space: nowrap; //不换行
+		overflow: hidden; //超出部分隐藏
+		text-overflow: ellipsis; //文本溢出显示省略号
+	}
+
+	.sb_xl {
+		white-space: pre-wrap !important;
+	}
+
+	.dashed_box {
+		width: 100%;
+		border-bottom: 1px dashed #E02020;
+		margin: 10px auto;
+	}
+
+	.dashed_box_h {
+		width: 100%;
+		border-bottom: 1px dashed #999;
+		margin: 10px auto;
 	}
 </style>

gasStation-uni/pagesLogin/login/login.vue

@@ -1,14 +1,13 @@
 <template>
 	<view class="content">
 		<view class="container">
-			<view class="my-header">
+			<!-- <view class="my-header">
 				<view class="my-icons"> </view>
 				<view class="my-text"></view>
 				<view class="my-icons"></view>
-			</view>
+			</view> -->
 			<view class="top-box"></view>
 			<!-- 顶部区域 -->
-
 			<!-- #ifdef MP-WEIXIN -->
 			<button class="dl-box" open-type='getPhoneNumber' @getphonenumber="getPhone">手机号快捷登录</button>
 			<!-- #endif -->
@@ -242,13 +241,12 @@
 		width: 100%;
 		height: 100vh;
 		box-sizing: border-box;
-		padding-top: 88px;
+		// padding-top: 88px;
 	}
 
 	.my-header {
 		width: 100%;
 		height: 88px;
-		background: #3c91f4;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
@@ -260,7 +258,6 @@
 
 		.my-icons {
 			width: 20px;
-
 		}
 
 		position: fixed;
@@ -269,25 +266,22 @@
 
 	.dl {
 		height: 40px;
-		background: #2F72F7;
+		background: #FF9655;
 		border-radius: 50px;
-
-
 	}
 
 	.top-box {
 		width: 100%;
-		height: 60vh;
+		height: 580px;
-		background: url('http://47.95.206.185:83/lgoin.png')center no-repeat;
+		background: url('http://47.94.122.58:83/loginBack.png') no-repeat;
 		background-size: 100% 100%;
-		background-attachment: fixed;
+		margin-bottom: 25px;
-
 	}
 
 	.dl-box {
 		width: 80%;
 		height: 45px;
-		background: #2F72F7;
+		background: #FF9655;
 		color: white;
 		border-radius: 50px;
 		margin: 0 auto;
@@ -327,15 +321,15 @@
 	.lanquanzi {
 		width: 14px;
 		height: 14px;
-		border: 1px solid #0078FF;
+		border: 1px solid #FF9655;
 		border-radius: 50%;
 		margin-right: 10px;
-		background: #0078FF;
+		background: #FF9655;
 		color: white;
 	}
 
 	.lan {
-		color: #0078FF;
+		color: #FF9655;
 	}
 
 	.jiuzhong {