From d406fb97a0f04f091da5b7cadfbc31ec4fa0467c Mon Sep 17 00:00:00 2001
From: "@QQNZX" <cccccc420590@163.com>
Date: Fri, 19 Jan 2024 16:07:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gasStation-uni/components/tabbar/tabbar.vue   | 21 ++++++++++---------
 gasStation-uni/config.js                      |  9 +-------
 gasStation-uni/mini.project.json              |  3 +++
 gasStation-uni/pages/index/index.vue          | 20 +++++++++---------
 gasStation-uni/pages/my/my.vue                | 16 +++++++-------
 gasStation-uni/pages/refuel/refuel.vue        |  4 ++--
 gasStation-uni/pagesHome/MyCard/MyCard.vue    |  6 +++---
 .../PointsGoodsDetails/PointsGoodsDetails.vue |  2 +-
 .../pagesHome/PointsMall/PointsMall.vue       |  6 +++---
 .../pagesHome/myPointsOrder/myPointsOrder.vue |  2 +-
 gasStation-uni/pagesHome/order/order.vue      |  4 ++--
 gasStation-uni/pagesLogin/login/webview.vue   |  8 +++++++
 gasStation-uni/pagesMy/Coupons/Coupons.vue    |  2 +-
 gasStation-uni/pagesMy/VIP/vip.vue            |  4 ++--
 gasStation-uni/pagesMy/comment/comment.vue    |  2 +-
 gasStation-uni/pagesMy/invite/invite.vue      |  4 ++--
 gasStation-uni/pagesMy/setup/index.vue        |  4 ++--
 .../pagesRefuel/pagesRefuel/index.vue         |  6 +++---
 18 files changed, 64 insertions(+), 59 deletions(-)
 create mode 100644 gasStation-uni/mini.project.json
 create mode 100644 gasStation-uni/pagesLogin/login/webview.vue

diff --git a/gasStation-uni/components/tabbar/tabbar.vue b/gasStation-uni/components/tabbar/tabbar.vue
index e14e8549e..6545edf9c 100644
--- a/gasStation-uni/components/tabbar/tabbar.vue
+++ b/gasStation-uni/components/tabbar/tabbar.vue
@@ -2,26 +2,27 @@
 	<view class="bar">
 		<view class="barbox" @click="gogogo(1)">
 			<view class="bar-img">
-				<image v-show="actindex == 1" src="../../static/imgs/homex.png" mode=""></image>
-				<image v-show="actindex != 1" src="../../static/imgs/home.png" mode=""></image>
+				<image v-if="actindex == 1" src="../../static/imgs/homex.png" mode="aspectFit"></image>
+				<image v-if="actindex != 1" src="../../static/imgs/home.png" mode="aspectFit"></image>
 			</view>
 			<view class="">首页</view>
 		</view>
 		<view class="barbox" @click="gogogo(2)">
 			<view class="centerbox">
 				<view class="qiu">
-					<image src="../../static/imgs/jy.png" mode=""></image>
+					<image src="../../static/imgs/jy.png" mode="aspectFit"></image>
 				</view>
 			</view>
 			<view class="">一键加油</view>
 		</view>
 		<view class="barbox" @click="gogogo(3)">
 			<view class="bar-img">
-				<image v-show="actindex == 3" src="../../static/imgs/myx.png" mode=""></image>
-				<image v-show="actindex != 3" src="../../static/imgs/my.png" mode=""></image>
+				<image v-if="actindex == 3" src="../../static/imgs/myx.png" mode="aspectFit"></image>
+				<image v-if="actindex != 3" src="../../static/imgs/my.png" mode="aspectFit"></image>
 			</view>
 			<view class="">我的</view>
 		</view>
+
 	</view>
 </template>
 
@@ -114,13 +115,13 @@
 	}
 
 	.bar-img {
-		width: 25px;
-		height: 25px;
+		width: 50rpx;
+		height: 50rpx;
 		margin: 0px auto;
 
 		image {
-			width: 100%;
-			height: 100%;
+			width: 50rpx;
+			height: 50rpx;
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/gasStation-uni/config.js b/gasStation-uni/config.js
index 9ed5b9493..f9c37c3d1 100644
--- a/gasStation-uni/config.js
+++ b/gasStation-uni/config.js
@@ -1,14 +1,7 @@
 // 应用全局配置
 module.exports = {
 	// baseUrl: 'https://vue.ruoyi.vip/prod-api',
-	// baseUrl: 'http://192.168.0.196:8081/',
-	// baseUrl: 'http://192.168.1.4:8080/',
-<<<<<<< HEAD
-	baseUrl: 'http://192.168.0.178:8008/',
-
-=======
 	baseUrl: 'http://192.168.0.138:8008/',
->>>>>>> 0ec2ff3c9193e4196b86613616f090a7bfc9f75a
 	// baseUrl: 'http://192.168.1.5:8002/cdJdc',
 	imagesUrl: 'http://www.nuoyunr.com/lananRsc',
 	// 应用信息
@@ -32,4 +25,4 @@ module.exports = {
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/gasStation-uni/mini.project.json b/gasStation-uni/mini.project.json
new file mode 100644
index 000000000..ecd9fe6cd
--- /dev/null
+++ b/gasStation-uni/mini.project.json
@@ -0,0 +1,3 @@
+{
+  "format": 2
+}
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index 77b4a6a7d..80a1ea0bc 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -28,25 +28,25 @@
 				<view class="conttainer-jg">
 					<view class="jg-box" @click="toQRcode">
 						<view class="jg-img">
-							<image src="../../static/imgs/viprwm.png" mode=""></image>
+							<image src="../../static/imgs/viprwm.png" mode="aspectFit"></image>
 						</view>
 						<view class="jg-size">二维码</view>
 					</view>
 					<view class="jg-box" @click="goActivity()">
 						<view class="jg-img">
-							<image src="../../static/imgs/bzhd.png" mode=""></image>
+							<image src="../../static/imgs/bzhd.png" mode="aspectFit"></image>
 						</view>
 						<view class="jg-size">本站活动</view>
 					</view>
 					<view class="jg-box" @click="goCard()">
 						<view class="jg-img">
-							<image src="../../static/imgs/ykcz.png" mode=""></image>
+							<image src="../../static/imgs/ykcz.png" mode="aspectFit"></image>
 						</view>
 						<view class="jg-size">油卡充值</view>
 					</view>
 					<view class="jg-box" @click="goMall()">
 						<view class="jg-img">
-							<image src="../../static/imgs/jfsc.png" mode=""></image>
+							<image src="../../static/imgs/jfsc.png" mode="aspectFit"></image>
 						</view>
 						<view class="jg-size">积分商城</view>
 					</view>
@@ -385,8 +385,8 @@
 					// 谷歌使用wgs84  其他使用gcj02
 					type: 'gcj02', // 使用国测局坐标系
 					success: function(res) {
-						if (_this.longitude=="" && _this.latitude =="") {
-								
+						if (_this.longitude == "" && _this.latitude == "") {
+
 							_this.longitude = res.longitude;
 							_this.latitude = res.latitude
 						}
@@ -398,7 +398,7 @@
 							data: {
 								"lon": _this.longitude,
 								"lat": _this.latitude,
-								"storeId":storeId
+								"storeId": storeId
 							},
 						}).then((response) => {
 							_this.distance = (Math.ceil(response.data.distance))
@@ -517,7 +517,7 @@
 						longitude
 					}) => { // 选择位置完成后的处理 
 						// this.addressName = address;
-						console.log(name,address,latitude,longitude);
+						console.log(name, address, latitude, longitude);
 						this.longitude = longitude;
 						this.latitude = latitude;
 						this.getAddress()
@@ -639,8 +639,8 @@
 		height: 38px;
 
 		image {
-			width: 100%;
-			height: 100%;
+			width: 38px;
+			height: 38px;
 		}
 
 		margin: 5px auto;
diff --git a/gasStation-uni/pages/my/my.vue b/gasStation-uni/pages/my/my.vue
index cff283d99..d14899f7d 100644
--- a/gasStation-uni/pages/my/my.vue
+++ b/gasStation-uni/pages/my/my.vue
@@ -10,8 +10,8 @@
 					<view class="dis">
 						<view class="touxiang" @click="goSetup">
 							<image v-if="user.avatar!='' && user.avatar!=null && user.avatar!=undefined"
-								:src="baseUrl + user.avatar" mode=""></image>
-							<image v-else src="../../static/imgs/myx.png" mode=""></image>
+								:src="baseUrl + user.avatar"  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}}</view>
@@ -48,7 +48,7 @@
 			<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=""></image>
+						<image src="../../static/my/dingdan.png"  mode="aspectFit"></image>
 					</view>
 					<view class="centenr-size">
 						我的订单
@@ -58,7 +58,7 @@
 
 				<view class="centenr-sx" @click="goMyOrder(1)">
 					<view class="centenr-img">
-						<image src="../../static/my/dsy.png" mode=""></image>
+						<image src="../../static/my/dsy.png"  mode="aspectFit"></image>
 					</view>
 					<view class="centenr-size">
 						待使用
@@ -67,7 +67,7 @@
 
 				<view class="centenr-sx" @click="goMyOrder(2)">
 					<view class="centenr-img">
-						<image src="../../static/my/ywc.png" mode=""></image>
+						<image src="../../static/my/ywc.png"  mode="aspectFit"></image>
 					</view>
 					<view class="centenr-size">
 						已完成
@@ -75,7 +75,7 @@
 				</view>
 				<view class="centenr-sx" @click="goMyOrder(3)">
 					<view class="centenr-img">
-						<image src="../../static/my/dpj.png" mode=""></image>
+						<image src="../../static/my/dpj.png"  mode="aspectFit"></image>
 					</view>
 					<view class="centenr-size">
 						待评价
@@ -95,7 +95,7 @@
 					</view>
 					<view class="centenr-sx" @click="goToDaby">
 						<view class="centenr-img">
-							<image src="../../static/my/jryj.png" mode=""></image>
+							<image src="../../static/my/jryj.png"  mode="aspectFit"></image>
 						</view>
 						<view class="centenr-size">
 							今日油价
@@ -105,7 +105,7 @@
 
 					<view class="centenr-sx" @click="goWriteoff()">
 						<view class="centenr-img">
-							<image src="../../static/my/jl.png" mode=""></image>
+							<image src="../../static/my/jl.png"  mode="aspectFit"></image>
 						</view>
 						<view class="centenr-size">
 							核销记录
diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue
index c5288b8ec..916607285 100644
--- a/gasStation-uni/pages/refuel/refuel.vue
+++ b/gasStation-uni/pages/refuel/refuel.vue
@@ -8,8 +8,8 @@
 				<view class="top-box">
 					<view class="dis" style="width: 78%;">
 						<view class="top-img">
-							<image v-if="store.logo==''||store.logo==null||store.logo==undefined" src="../../static/logo.png" mode=""></image>
-							<image v-else :src="baseUrl+store.logo" mode=""></image>
+							<image v-if="store.logo==''||store.logo==null||store.logo==undefined" src="../../static/logo.png"  mode="aspectFit"></image>
+							<image v-else :src="baseUrl+store.logo"  mode="aspectFit"></image>
 						</view>
 						<view style="width: 80%;">
 							<view class="top-title">{{store.name}}{{store.description ? "("+store.description+")" : ""}}
diff --git a/gasStation-uni/pagesHome/MyCard/MyCard.vue b/gasStation-uni/pagesHome/MyCard/MyCard.vue
index 770da90ca..042e5a490 100644
--- a/gasStation-uni/pagesHome/MyCard/MyCard.vue
+++ b/gasStation-uni/pagesHome/MyCard/MyCard.vue
@@ -15,7 +15,7 @@
 			<view class="card-cz">
 				<view class="card-top">
 					<view class="cardimg">
-						<image src="../../static/imgs/jyz.png" mode=""></image>
+						<image src="../../static/imgs/jyz.png"  mode="aspectFit"></image>
 					</view>
 					<!-- <text>油站名称</text> -->
 				</view>
@@ -48,7 +48,7 @@
 			<view class="card-ty">
 				<view class="card-top">
 					<view class="cardimg">
-						<image src="../../static/imgs/jyzb.png" mode=""></image>
+						<image src="../../static/imgs/jyzb.png"  mode="aspectFit"></image>
 					</view>
 					<!-- <text style="color: #ffffff;">油站名称</text> -->
 				</view>
@@ -84,7 +84,7 @@
 			<view class="card-lp">
 				<view class="card-top">
 					<view class="cardimg">
-						<image src="../../static/imgs/jyzb.png" mode=""></image>
+						<image src="../../static/imgs/jyzb.png"  mode="aspectFit"></image>
 					</view>
 					<!-- <text style="color: #ffffff;">油站名称</text> -->
 				</view>
diff --git a/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue b/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue
index 85c0e6984..43e4f27ce 100644
--- a/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue
+++ b/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue
@@ -20,7 +20,7 @@
 
 				<view class="t-b-box">
 					<view class="goodsimg">
-						<image :src="baseUrl+form.coverImage" mode=""></image>
+						<image :src="baseUrl+form.coverImage"  mode="aspectFit"></image>
 					</view>
 					<view class="right-r-box">
 						<view class="-title">{{form.giftName}}</view>
diff --git a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue
index 041f53efa..db0f34105 100644
--- a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue
+++ b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue
@@ -19,7 +19,7 @@
 						</view>
 					</view>
 					<view class="tp">
-						<image src="../../static/imgs/hby.png" mode=""></image>
+						<image src="../../static/imgs/hby.png"  mode="aspectFit"></image>
 					</view>
 
 				</view>
@@ -70,7 +70,7 @@
 						<view class="box-goods" v-for="(item,index) in integralGiftList" :key="index"
 							@click="godetails(item)">
 							<view class="goods-img">
-								<image :src="baseUrl+item.coverImage" mode=""></image>
+								<image :src="baseUrl+item.coverImage"  mode="aspectFit"></image>
 							</view>
 							<view class="goods-title">
 								{{item.giftName}}
@@ -78,7 +78,7 @@
 							<view class="good-red">
 								<view style="display: flex;align-items: center;">
 									<view class="bi" v-if="item.exchangeMethod != '金额'">
-										<image src="../../static/imgs/jb.png" mode=""></image>
+										<image src="../../static/imgs/jb.png"  mode="aspectFit"></image>
 									</view>
 									<view style="color: #FC1708;font-weight: bold;">
 										<span
diff --git a/gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue b/gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue
index 1ea134c44..62fad1667 100644
--- a/gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue
+++ b/gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue
@@ -22,7 +22,7 @@
 			<view class="goods-box" v-for="(item,index) in orderList" :key="item.id" @click="orderDetails(item)">
 				<view class="goods-top">
 					<view class="goods-img">
-						<image :src="baseUrl+item.coverImage" mode=""></image>
+						<image :src="baseUrl+item.coverImage"  mode="aspectFit"></image>
 					</view>
 					<view class="nr-tip">
 						<view class="title-s">{{item.giftName}}</view>
diff --git a/gasStation-uni/pagesHome/order/order.vue b/gasStation-uni/pagesHome/order/order.vue
index 32efc8284..a3df1cc06 100644
--- a/gasStation-uni/pagesHome/order/order.vue
+++ b/gasStation-uni/pagesHome/order/order.vue
@@ -17,7 +17,7 @@
 				<view class="dis">
 					<!-- <uni-icons type="location-filled" size="20"></uni-icons> -->
 					<view class="boximg">
-						<image :src="logo?baseUrl+logo:'../../static/logo.png'" mode=""></image>
+						<image :src="logo?baseUrl+logo:'../../static/logo.png'"  mode="aspectFit"></image>
 					</view>
 					<view class="">
 						<view class="">{{storeName}}</view>
@@ -52,7 +52,7 @@
 			<view class="box-bait">
 				<view class="dis-box">
 					<view class="goodsimg">
-						<image :src='baseUrl+goodsInfo.coverImage' mode=""></image>
+						<image :src='baseUrl+goodsInfo.coverImage'  mode="aspectFit"></image>
 					</view>
 					<view class="">
 						<view class="">{{goodsInfo.giftName}}</view>
diff --git a/gasStation-uni/pagesLogin/login/webview.vue b/gasStation-uni/pagesLogin/login/webview.vue
new file mode 100644
index 000000000..48d48ea8a
--- /dev/null
+++ b/gasStation-uni/pagesLogin/login/webview.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
diff --git a/gasStation-uni/pagesMy/Coupons/Coupons.vue b/gasStation-uni/pagesMy/Coupons/Coupons.vue
index ec1f0ae93..8f8f772d6 100644
--- a/gasStation-uni/pagesMy/Coupons/Coupons.vue
+++ b/gasStation-uni/pagesMy/Coupons/Coupons.vue
@@ -20,7 +20,7 @@
 				<view class="left-img">
 					<view class="huiz" v-if="item.couponType == '优惠券'">￥{{item.couponAmount}}</view>
 					<view class="hui-icon" v-if="item.couponType != '优惠券'">
-						<image src="../../static/imgs/iconcar.png" mode=""></image>
+						<image src="../../static/imgs/iconcar.png"  mode="aspectFit"></image>
 					</view>
 					<view class="cbai">{{item.couponType}}</view>
 				</view>
diff --git a/gasStation-uni/pagesMy/VIP/vip.vue b/gasStation-uni/pagesMy/VIP/vip.vue
index 367ba6429..3dbd230d6 100644
--- a/gasStation-uni/pagesMy/VIP/vip.vue
+++ b/gasStation-uni/pagesMy/VIP/vip.vue
@@ -32,7 +32,7 @@
 									<u-line-progress :percentage="30" activeColor="#2F72F7"></u-line-progress>
 								</view>
 								<view class="right-img">
-									<image src="../../static/imgs/vipxz.png" mode=""></image>
+									<image src="../../static/imgs/vipxz.png"  mode="aspectFit"></image>
 								</view>
 							</view>
 						</view>
@@ -44,7 +44,7 @@
 
 								<view class="box-ba" v-for="(item,index) in oilNameList" :key="index">
 									<view class="min-box">
-										<image :src="item.imgurl" mode=""></image>
+										<image :src="item.imgurl"  mode="aspectFit"></image>
 									</view>
 									<view class="mu_">{{item.name}}</view>
 								</view>
diff --git a/gasStation-uni/pagesMy/comment/comment.vue b/gasStation-uni/pagesMy/comment/comment.vue
index 1d912b356..2f850f8ec 100644
--- a/gasStation-uni/pagesMy/comment/comment.vue
+++ b/gasStation-uni/pagesMy/comment/comment.vue
@@ -13,7 +13,7 @@
 				<view class="c-box-top">您对工作人员满意吗</view>
 				<view class="dis">
 					<view class="touxiang">
-						<image src="../../static/imgs/myx.png" mode=""></image>
+						<image src="../../static/imgs/myx.png"  mode="aspectFit"></image>
 					</view>
 					<view class="">
 						<view class="username">username(13583017106)</view>
diff --git a/gasStation-uni/pagesMy/invite/invite.vue b/gasStation-uni/pagesMy/invite/invite.vue
index e6db534db..01129112a 100644
--- a/gasStation-uni/pagesMy/invite/invite.vue
+++ b/gasStation-uni/pagesMy/invite/invite.vue
@@ -9,7 +9,7 @@
 			</view>
 			<view class="faimg">
 				<view class="box-img">
-					<image src="../../static/imgs/fmbj.png" mode=""></image>
+					<image src="../../static/imgs/fmbj.png"  mode="aspectFit"></image>
 				</view>
 				<view class="hbbox">
 					<view class="h-box">
@@ -45,7 +45,7 @@
 				<view class="t-box" v-for="(item,index) in activeRecommendRecordsList" :key="index">
 					<view class="diss">
 						<view class="touxiang">
-							<image src="../../static/imgs/myx.png" mode=""></image>
+							<image src="../../static/imgs/myx.png"  mode="aspectFit"></image>
 						</view>
 						<view class="">
 							<view class="name-t">{{item.inviteeUserName}}</view>
diff --git a/gasStation-uni/pagesMy/setup/index.vue b/gasStation-uni/pagesMy/setup/index.vue
index 96a8e5580..812a98274 100644
--- a/gasStation-uni/pagesMy/setup/index.vue
+++ b/gasStation-uni/pagesMy/setup/index.vue
@@ -10,8 +10,8 @@
 			<button class="box-hang" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
 				<view class="">头像</view>
 				<view class="touxiang">
-					<image class="touxiang" v-if="user.avatar!='' && user.avatar!=null && user.avatar!=undefined" :src="baseUrl + user.avatar" mode=""></image>
-					<image class="touxiang" v-else src="@/static/imgs/myx.png" mode=""></image>
+					<image class="touxiang" v-if="user.avatar!='' && user.avatar!=null && user.avatar!=undefined" :src="baseUrl + user.avatar"  mode="aspectFit"></image>
+					<image class="touxiang" v-else src="@/static/imgs/myx.png"  mode="aspectFit"></image>
 				</view>
 			</button>
 			<view class="box-hang" @click="goEdit(0)">
diff --git a/gasStation-uni/pagesRefuel/pagesRefuel/index.vue b/gasStation-uni/pagesRefuel/pagesRefuel/index.vue
index 5803c06f2..ecfe59bd4 100644
--- a/gasStation-uni/pagesRefuel/pagesRefuel/index.vue
+++ b/gasStation-uni/pagesRefuel/pagesRefuel/index.vue
@@ -19,7 +19,7 @@
 					<view class="box-top">
 						<view class="dis">
 							<view class="touxiang">
-								<image src="../../static/imgs/bzhd.png" mode=""></image>
+								<image src="../../static/imgs/bzhd.png"  mode="aspectFit"></image>
 							</view>
 							<view class="box-top-size">
 								<view class="box-title">
@@ -52,7 +52,7 @@
 					<view class="box-bottom">
 						<view class="box-bottom-anniu">
 							<view class="bottom-icon">
-								<image src="../../static/icon/daohang.png" mode=""></image>
+								<image src="../../static/icon/daohang.png"  mode="aspectFit"></image>
 							</view>
 							<view class="">到这去</view>
 						</view>
@@ -61,7 +61,7 @@
 						</view>
 						<view class="box-bottom-anniu">
 							<view class="bottom-icon">
-								<image src="../../static/icon/jiayou.png" mode=""></image>
+								<image src="../../static/icon/jiayou.png"  mode="aspectFit"></image>
 							</view>
 							<view class="" @click="toRefuel(item.store)">去加油</view>
 						</view>