From 46f9b1f1a00c09891ce2b0ae1ba57823e919f00b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B9=85=E4=BF=9D=E5=90=8C=E5=AD=A6?= <3228274159@qq.com>
Date: Thu, 27 Jun 2024 02:37:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                                    |   2 +-
 common/baseurl.js                             |   3 +-
 components/chepai/chepai.vue                  |  10 +-
 components/explain/explain.vue                |  40 ++--
 components/tabbar/tabbar.vue                  |   3 +-
 pages/addValidate/addValidate.vue             |   2 +-
 pages/balance/balance.vue                     |  97 +---------
 pages/handle/handle.vue                       |  18 +-
 pages/implement/implement.vue                 |  35 +++-
 pages/index/index.vue                         |  15 +-
 pages/integral/integral.vue                   |  39 +++-
 pages/my/my.vue                               |   2 +-
 pages/myIntegral/myIntegral.vue               |  20 +-
 pages/networkDetail/networkDetail.vue         |   4 +-
 pages/orderForm/orderForm.vue                 | 182 +++++++++++++++---
 pages/recharge/recharge.vue                   |   6 +-
 pages/rechargeNetwork/rechargeNetwork.vue     |  16 +-
 pages/secondaryCard/secondaryCard.vue         |  11 +-
 pages/tuan/tuan.vue                           |  65 +++++--
 pages/vehicle/vehicle.vue                     |  16 +-
 stor/getCard/getCard.js                       |   3 +-
 stor/index.js                                 |  52 ++---
 stor/operation/operation.js                   |   1 +
 stor/shop/shop.js                             |  13 +-
 unpackage/dist/dev/mp-weixin/api/api.js       |   2 +-
 .../dist/dev/mp-weixin/common/baseurl.js      |   4 +-
 .../dev/mp-weixin/components/chepai/chepai.js |  32 +--
 .../mp-weixin/components/chepai/chepai.wxml   |   2 +-
 .../mp-weixin/components/explain/explain.wxml |   2 +-
 .../mp-weixin/components/explain/explain.wxss |   5 +-
 .../mp-weixin/components/tabbar/tabbar.wxss   |   3 +-
 .../pages/addValidate/addValidate.wxml        |   2 +-
 .../dev/mp-weixin/pages/balance/balance.js    |  98 +---------
 .../dist/dev/mp-weixin/pages/handle/handle.js |   4 +-
 .../dev/mp-weixin/pages/handle/handle.wxml    |   2 +-
 .../dev/mp-weixin/pages/handle/handle.wxss    |   8 +-
 .../mp-weixin/pages/implement/implement.js    |  49 +++--
 .../mp-weixin/pages/implement/implement.wxml  |   2 +-
 .../dist/dev/mp-weixin/pages/index/index.js   |  28 ++-
 .../dist/dev/mp-weixin/pages/index/index.wxml |   2 +-
 .../dist/dev/mp-weixin/pages/index/index.wxss |   3 +-
 .../dev/mp-weixin/pages/integral/integral.js  |  33 +++-
 .../mp-weixin/pages/integral/integral.wxml    |   2 +-
 unpackage/dist/dev/mp-weixin/pages/my/my.wxml |   2 +-
 .../mp-weixin/pages/myIntegral/myIntegral.js  |  20 +-
 .../pages/networkDetail/networkDetail.js      |  42 ++--
 .../pages/networkDetail/networkDetail.wxml    |   2 +-
 .../mp-weixin/pages/orderForm/orderForm.js    | 169 ++++++++++------
 .../mp-weixin/pages/orderForm/orderForm.wxml  |   2 +-
 .../mp-weixin/pages/orderForm/orderForm.wxss  |  79 +++++++-
 .../mp-weixin/pages/recharge/recharge.wxss    |   6 +-
 .../pages/rechargeNetwork/rechargeNetwork.js  |   4 +-
 .../rechargeNetwork/rechargeNetwork.wxml      |   2 +-
 .../rechargeNetwork/rechargeNetwork.wxss      |   6 +-
 .../pages/secondaryCard/secondaryCard.js      |  11 +-
 .../pages/secondaryCard/secondaryCard.wxml    |   2 +-
 .../pages/secondaryCard/secondaryCard.wxss    |   2 +-
 .../dist/dev/mp-weixin/pages/tuan/tuan.js     |  37 +++-
 .../dist/dev/mp-weixin/pages/tuan/tuan.wxml   |   2 +-
 .../dist/dev/mp-weixin/pages/tuan/tuan.wxss   |   5 +-
 .../dev/mp-weixin/pages/vehicle/vehicle.js    |  25 ++-
 .../dev/mp-weixin/pages/vehicle/vehicle.wxml  |   2 +-
 .../dev/mp-weixin/stor/getCard/getCard.js     |   3 +-
 unpackage/dist/dev/mp-weixin/stor/index.js    |  50 ++---
 .../dev/mp-weixin/stor/operation/operation.js |   1 +
 .../dist/dev/mp-weixin/stor/shop/shop.js      |  10 +-
 unpackage/dist/dev/mp-weixin/utils/request.js |   4 +-
 utils/request.js                              |   6 +-
 68 files changed, 877 insertions(+), 555 deletions(-)

diff --git a/api/api.js b/api/api.js
index 1ede55d..cedfe52 100644
--- a/api/api.js
+++ b/api/api.js
@@ -95,7 +95,7 @@ export const getCommodityShop = (data)=>reqs(`shop/device-commodity/list`,data,"
 //售货机商品出货
 export const getexChange=(data)=>reqs(`shop/device-commodity/commodity-exchange`,data,"POST")
 //获取积分明细
-export const getCardUpdateInfo=(data)=>requests(`mobile/order/cardUpdateInfo`,data,"GET")
+export const getCardUpdateInfo=(data)=>requests(`mobile/order/pointsInfo`,data,"GET")
 //使用优惠券
 export const getyouHui=(data)=>requests(`mobile/coupon/useCoupon`,data,"GET")
 //获取停车场优惠券
diff --git a/common/baseurl.js b/common/baseurl.js
index 706f892..020a12f 100644
--- a/common/baseurl.js
+++ b/common/baseurl.js
@@ -4,8 +4,9 @@
 //基础地址
 // export const BASE_URL = 'https://h5.zhenpin.yhd.la/'
 // export const BASE_URL = 'https://h3.zhenpin.yhd.la/'
-export const BASE_URL = 'https://h5.zhenpin.yhd.la/'
+export const BASE_URL = 'https://h3.zhenpin.yhd.la/'
 export const BASE_URLS = 'http://47.97.35.139:19260/'
+export const BASE_URLSS = 'http://47.97.35.139:19270/'
 //微信appid
 export const appid = 'wxc5f11d5f96fbd989'
 //微信appsecret
diff --git a/components/chepai/chepai.vue b/components/chepai/chepai.vue
index d90f6a0..d3ac3b5 100644
--- a/components/chepai/chepai.vue
+++ b/components/chepai/chepai.vue
@@ -19,10 +19,10 @@
 			</view>
 		</view>
 		<view class="boxs">
-			<img class="boxs-i" src="https://www.jiubaotongxue.love/image/demo20.png" alt="" /><text class="txts">微信昵称</text>
+			<img class="boxs-i" src="https://www.jiubaotongxue.love/image/demo20.png" alt="" /><text class="txts">{{wxname ? wxname : '元芳'}}</text>
 		</view>
 		<view class="boxs">
-			<img class="boxs-i" src="https://www.jiubaotongxue.love/image/demo20.png" alt="" /><text class="txts">12312341234</text>
+			<img class="boxs-i" src="https://www.jiubaotongxue.love/image/demo20.png" alt="" /><text class="txts">{{tel ? tel :'暂无手机号码'}}</text>
 		</view>
 		<view class="ok" @click="fors">
 			点击绑定爱车
@@ -73,6 +73,12 @@
 	const actives = ref(100)
 	const props = defineProps(['chuanzi'])
 	const emit = defineEmits(['numString'])
+	const wxname = ref()
+	const wxImg = ref()
+	const tel = ref()
+	wxname.value=uni.getStorageSync('wxname')
+	wxImg.value=uni.getStorageSync('wxImg')
+	tel.value = uni.getStorageSync('phoneNumber')
 	const c = ref(1)
 	const d = ref(1)
 	const e = ref(1)
diff --git a/components/explain/explain.vue b/components/explain/explain.vue
index 5e2b540..5a42291 100644
--- a/components/explain/explain.vue
+++ b/components/explain/explain.vue
@@ -4,19 +4,32 @@
 		<view class="explain-box" scroll-y="true">
 
 			<view class="explain-box-title">
-				次卡说明
+				使用说明
 			</view>
 			<scroll-view class="explain-box-body" scroll-y="true">
-				<text class="txt">
-					说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明
-					说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明
-					说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明
-					说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明
-					说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明
-					说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明
-					说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明
-					说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明
-				</text>
+				<view class="txt">
+					<view class="zi">
+						1.购卡或充值后可进行自助洗车，支付后当天立即生效，可即时使用。
+					</view>
+					<view class="zi">
+						2.购卡享优惠，按次进行，用一次扣一次，扫码后选择【使用次卡】方式进行洗车。次卡有有效期，一般在有效期能都用完，请在有效期内使用。
+					</view>
+					<view class="zi">
+						3.充值送好礼，充值会有相应的现金赠送，赠送部分只能用于洗车不能兑现。扫码后选择【使用套餐】，选相应套餐后用账户余额进行支付。充值的金额可以【我的】【账户余额】中看到，长期有效；充值的余额确认不再使用时可联系客服进行退费（不含充值时赠送的金额）。
+					</view>
+					<view class="zi">
+						4.用户支付的次卡或账户余额仅供本人合规合法发使用，禁止用于商业或其他目的，如有发现违规违法行为，平台官方有权对违规账号封号处理。
+					</view>
+					<view class="zi">
+						5.在您成功支付或开始洗车后，表明您已预知洗车过程中的各种常识和安全问题，系统不对您洗车过程中车辆和人员的各类问题包括安全问题负责，您需要安全合规操作。
+					</view>
+					<view class="zi">
+						6.平台保留对相关条款的解释权，并将一如既往的为各位车主提供贴心周到的服务。
+					</view>
+					<view class="zi">
+						7.任何问题，可到【我的】页面，点击下方的客服，通过电话或在线的方式获得帮助。
+					</view>
+				</view>
 			</scroll-view>
 			<view class="explain-btn" @click="btns">
 				我知道了
@@ -69,8 +82,8 @@ const btns = ()=>{
 				// background-color: red;
 
 				.txt {
-					display: block;
 					width: 100%;
+					line-height: 30rpx;
 					font-size: 26rpx;
 					word-wrap: break-word;
 				}
@@ -78,7 +91,8 @@ const btns = ()=>{
 			.explain-btn{
 				width: 300rpx;
 				height: 70rpx;
-				background-color: #d9001b;
+				background: linear-gradient(135deg, #4D97FF 0%, #3377FF 100%), linear-gradient(276deg, #1C9FF7 0%, #1275F7 100%);
+				box-shadow: 0rpx 8rpx 18rpx 0rpx rgba(5, 128, 255, 0.2);
 				text-align: center;
 				position: relative;
 				margin-left: 50%;
diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index 6639ea6..bd39751 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -109,13 +109,14 @@
 					.images {
 						width: 100%;
 						height: 100%;
+						margin-top: 26rpx;
 					}
 				}
 
 
 				.txt {
 					box-sizing: border-box;
-					padding-top: 5rpx;
+					padding-top: 35rpx;
 					width: 100%;
 					height: 20rpx;
 					text-align: center;
diff --git a/pages/addValidate/addValidate.vue b/pages/addValidate/addValidate.vue
index 1a3ef61..fd5aba8 100644
--- a/pages/addValidate/addValidate.vue
+++ b/pages/addValidate/addValidate.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="navs">
 		<view class="navBgm">
-			<img class="left" src="https://www.jiubaotongxue.love/image/zuoBack.png" alt=""  @click="demos"/>
+			<img class="left" src="https://www.jiubaotongxue.love/image/nav10.png" alt=""  @click="demos"/>
 		绑定车辆
 		</view>
 	</view>
diff --git a/pages/balance/balance.vue b/pages/balance/balance.vue
index 557e48b..37d7811 100644
--- a/pages/balance/balance.vue
+++ b/pages/balance/balance.vue
@@ -65,7 +65,7 @@
 						<!-- <text class="flex-centers-txt" v-show="headerindex===1" >订单编号：{{items.orderId}}</text> -->
 						<text class="flex-centers-txt" v-show="headerindex===2" >订单编号：{{items.orderId}}</text>
 						<text class="flex-reds" v-show="headerindex===2&&items.useAmount>0"><text class="color-r">-{{items.useAmount}}</text> </text>
-						<text class="flex-reds" v-show="headerindex===2&&items.useAmount<0">￥{{items.amount+items.getAmount}} </text>
+						<text class="flex-reds" v-show="headerindex===2&&items.useAmount<=0">￥{{(items.amount+items.giveAmount).toFixed(2)}} </text>
 						<!-- <text v-show="headerindex===1"> <text class="flex-reds">￥{{items.amount}}</text> </text> -->
 					</view>
 					<view class="flex-bottoms">
@@ -101,101 +101,8 @@
 	const demos = ref([])
 	const remo = () => {
 		headerindex.value = 1
-		if (headerindex.value === 1) {
-			demos.value=[]
-			demos.value = [{
-					id: 1,
-					title: "本月",
-					sumPrice: 30,
-					sumNum: 15,
-					arrys: [{
-						id: 1,
-						orderId: 'xxxxxxxxxxxx',
-						ciKaTitle: "充30送5套餐",
-						price: 300,
-						oldDate: "2024-05-09 11:56:40",
-						newDate: "024-05-09"
-					}, {
-						id: 2,
-						orderId: 'xxxxxxxxxxxx',
-						ciKaTitle: "充30送5套餐",
-						price: 300,
-						oldDate: "2024-05-09 11:56:40",
-						newDate: "024-05-09"
-					}, {
-						id: 3,
-						orderId: 'xxxxxxxxxxxx',
-						ciKaTitle: "充30送5套餐",
-						price: 30,
-						oldDate: "2024-05-09 11:56:40",
-						newDate: "024-05-09"
-					}]
-				}, {
-					id: 2,
-					title: "2024年4月",
-					sumPrice: 30,
-					sumNum: 15,
-					arrys: [{
-						id: 1,
-						orderId: 'xxxxxxxxxxxx',
-						ciKaTitle: "充30送5套餐",
-						price: 30,
-						oldDate: "2024-05-09 11:56:40",
-						newDate: "024-05-09"
-					}, {
-						id: 2,
-						orderId: 'xxxxxxxxxxxx',
-						ciKaTitle: "充30送5套餐",
-						price: 30,
-						oldDate: "2024-05-09 11:56:40",
-						newDate: "024-05-09"
-					}, {
-						id: 3,
-						orderId: 'xxxxxxxxxxxx',
-						ciKaTitle: "充30送5套餐",
-						price: 30,
-						oldDate: "2024-05-09 11:56:40",
-						newDate: "024-05-09"
-					}]
-				},
-				{
-					id: 3,
-					title: "2024年3月",
-					sumPrice: 30,
-					sumNum: 15,
-					arrys: [{
-						id: 1,
-						orderId: 'xxxxxxxxxxxx',
-						ciKaTitle: "充30送5套餐",
-						price: 30,
-						oldDate: "2024-05-09 11:56:40",
-						newDate: "024-05-09"
-					}, {
-						id: 2,
-						orderId: 'xxxxxxxxxxxx',
-						ciKaTitle: "充30送5套餐",
-						price: 30,
-						oldDate: "2024-05-09 11:56:40",
-						newDate: "024-05-09"
-					}, {
-						id: 3,
-						orderId: 'xxxxxxxxxxxx',
-						ciKaTitle: "充30送5套餐",
-						price: 30,
-						oldDate: "2024-05-09 11:56:40",
-						newDate: "024-05-09"
-					}]
-				}
-			]
-		}else{
-			uni.showToast({
-				icon:"none",
-				title:"网络错误,请重新进入"
-			})
-		}
-
 	}
-	remo();
+	remo();	
 	const add = () => {
 		headerindex.value = 2
 		if(headerindex.value===2){
diff --git a/pages/handle/handle.vue b/pages/handle/handle.vue
index 350d648..0d134c7 100644
--- a/pages/handle/handle.vue
+++ b/pages/handle/handle.vue
@@ -24,18 +24,18 @@
 						<view class="title">
 							<text>{{item.networkName}}</text>
 							<view class="title-right">
-								<img class="title-right-i" src="https://www.jiubaotongxue.love/image/handle4.png"
+								<img class="title-right-i" src="https://www.jiubaotongxue.love/image/map2.png"
 									alt="" />
 								<text>{{item.gongli}}km</text>
 							</view>
 						</view>
 						<view class="centers">
-							<img class="centers-i" src="https://www.jiubaotongxue.love/image/handle3.png" alt="" />
+							<img class="centers-i" src="https://www.jiubaotongxue.love/image/handle4.png" alt="" />
 							<text class="flex-centers-txt">{{item.networkArea}}</text>
 						</view>
 						<view class="centers1">
 							<view class="centers-i-l">
-								<img class="centers-i-l-i" src="https://www.jiubaotongxue.love/image/handle3.png"
+								<img class="centers-i-l-i" src="https://www.jiubaotongxue.love/image/demo29.png"
 									alt="" />
 								<text class="txt">营业时间：00:00-23:59&nbsp;&nbsp;&nbsp;</text>
 							</view>
@@ -104,12 +104,12 @@
 	l.getNetworks()
 	console.log(netWorkList);
 	const active = ref(1)
-	const titles = ref("附近门点")
+	const titles = ref("附近门店")
 	const color = ref("#ffffff")
 	const demo = ref([0,1,2,3,4,5])
 	const networkIndex = ref(0)
 	onLoad(() => {
-		titles.value = "附近门点"
+		titles.value = "附近门店"
 		color.value = "#ffffff"
 	})
 	const promptbgk = ref(0)
@@ -228,8 +228,8 @@
 
 					.i {
 						width: 184rpx;
-						height: 184rpx;
-						margin-left: 30rpx;
+						height: 164rpx;
+						margin-left: 36rpx;
 						border-radius: 10rpx;
 					}
 
@@ -250,7 +250,7 @@
 							padding-right: 30rpx;
 
 							.title-right {
-								width: 120rpx;
+								width: 160rpx;
 								height: 42rpx;
 								display: flex;
 								align-items: center;
@@ -261,6 +261,8 @@
 									width: 28rpx;
 									height: 28rpx;
 									margin-right: 10rpx;
+									position: relative;
+									z-index: 100;
 								}
 							}
 						}
diff --git a/pages/implement/implement.vue b/pages/implement/implement.vue
index 1dba8d5..f33d90f 100644
--- a/pages/implement/implement.vue
+++ b/pages/implement/implement.vue
@@ -28,7 +28,8 @@
 			<view class="box" v-if="headerIndex===1">
 				<view class="cardTime" v-for="(item,index) in infos" :key="item.id" @click="yuChecks(index)">
 					<view class="cardCcc">
-						<text> <text class="color-r">{{item.minute}}</text>分钟 </text>
+						<text v-if="item.minute!=0"> <text class="color-r">{{item.minute}}</text>分钟 </text>
+						<text v-if="item.minute===0"> <text class="color-r">不限时套餐</text> </text>
 						<text class="cardTime-left"> <text class="color-r">￥{{item.amount}}</text></text>
 						<text class="cardTime-lefts">￥{{item.amount}}</text>
 					</view>
@@ -105,7 +106,7 @@
 
 <script setup>
 	import {
-		ref
+		ref,onMounted
 	} from 'vue'
 	import {
 		onLoad,onReady
@@ -122,9 +123,13 @@
 	import {
 		getCard
 	} from '../../stor/getCard/getCard.js'
+	import {balances}from '../../stor/balances/balances.js'
+	const b = balances()
 	const r = rechagePlay()
 	const s = storindex()
 	const g = getCard()
+	const {balance} =  storeToRefs(b)
+	b.getBalanceApi()
 	// const {}  =storeToRefs(s)
 	const {
 		infos,
@@ -166,7 +171,7 @@
 	const goCiPlay = (index) => {
 		if (cardIndex.value === index) {
 			// console.log("使用");
-			s.ciPlay(cardDataValidCards.value)
+			s.ciPlay(cardDataValidCards.value[index])
 		}
 	}
 	const yuChecks = (index) => {
@@ -182,18 +187,36 @@
 	}
 	const goPays = ()=>{
 		//微信支付
-		if(payIndexs.value===0){
+		if(payIndexs.value===0&&infos.value[yuIndex.value].amount>0){
 			s.wxPlay(infos.value[yuIndex.value])
 		}
 		//余额支付
 		else if(payIndexs.value===1){
-			s.yuePlay(infos.value[yuIndex.value])
+			console.log(balance.value.balance);
+			if(balance.value.balance>infos.value[yuIndex.value].amount){
+				s.yuePlay(infos.value[yuIndex.value])
+				// console.log(1);
+			}else{
+				uni.showToast({
+					icon:"none",
+					title:"余额不足",
+					duration:1000
+				})
+			}
 		} else{
-			
+			uni.showToast({
+				icon:"none",
+				title:"此套餐可能不能使用此支付方式",
+				duration:1000
+			})
 			console.log("错误");
 		}
 	}
 	// s.getMiaoshu(infos.value[yuIndex.value])
+	onMounted(()=>{
+		yuChecks(0)
+		console.log("触发");
+	})
 </script>
 
 <style lang="scss">
diff --git a/pages/index/index.vue b/pages/index/index.vue
index acc065d..6157474 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -75,9 +75,10 @@
 		</view>
 		<view class="body-data">
 			<view class="datas" v-for="(item,index) in netWorkList" :key="item.id" @click="netWorkDetails(index)">
-				<img class="datas-img"
-					src="https://www.chehaiyang.com/Content/Uploads/202004/b432bfc3-dc75-4135-beca-3941d42da88b.jpg"
-					alt="" />
+				<img class="datas-img" src="https://www.jiubaotongxue.love/image/demo100.png" alt="" v-if="index===0" />
+				<img class="datas-img" src="https://www.jiubaotongxue.love/image/demo101.png" alt="" v-if="index===1" />
+				<img class="datas-img" src="https://www.jiubaotongxue.love/image/demo102.png" alt="" v-if="index===2" />
+				<img class="datas-img" src="https://www.jiubaotongxue.love/image/demo103.png" alt="" v-if="index===3" />
 				<view class="datas-title">
 					{{item.networkName}}
 				</view>
@@ -98,7 +99,7 @@
 							class="colors">站点维修</text>
 					</view>
 					<view class="left-x" v-if="item.special===1">
-						<img class="i" src="https://www.jiubaotongxue.love/image/map2.png" alt="" /><text
+						<img class="i" src="https://www.jiubaotongxue.love/image/demo29.png" alt="" /><text
 							class="colors">24小时营业</text>
 					</view>
 				</view>
@@ -350,7 +351,11 @@
 	}
 
 	.navs {
-		background-color: #4475ee;
+
+		// background: linear-gradient(276deg, rgba(28, 159, 247, 1)  0%, rgba(18, 117, 247, 1) 100%);
+		background-color: white;
+		color: black;
+
 	}
 
 	.index {
diff --git a/pages/integral/integral.vue b/pages/integral/integral.vue
index a1372bb..c3f41bf 100644
--- a/pages/integral/integral.vue
+++ b/pages/integral/integral.vue
@@ -37,7 +37,7 @@
 			</view>
 		</view>
 		<view class="title-Stronge">
-			我能兑换
+			商品列表
 		</view>
 		<scroll-view class="auto-boxs" scroll-y="true">
 			<view class="dui-box">
@@ -96,7 +96,7 @@
 				<view class="cartWindow-title-right" style="display: flex;align-items: center;">
 					<img style="width: 24rpx;height: 24rpx;" src="https://www.jiubaotongxue.love/image/delete1.png"
 						alt="" />
-					<text style="display: block;margin-left: 10rpx;">清空</text>
+					<!-- <text style="display: block;margin-left: 10rpx;">清空</text> -->
 				</view>
 			</view>
 			<scroll-view scroll-y="true" class="autos">
@@ -186,9 +186,22 @@
 		demo.value = !demo.value
 	}
 	const succesBtn = () => {
-		console.log(1)
-		s.getChecks(carShop.value)
-		carShop.value=[]
+		
+	
+		if(Information.value.points>=sumJifen.value){
+			console.log(1)
+			s.getChecks(carShop.value)
+			carShop.value=[]
+			setTimeout(()=>{
+				m.getInformation()
+			},3000)
+		}else{
+			uni.showToast({
+				icon:"none",
+				title:'积分不足',
+				duration:1000
+			})
+		}
 	}
 	const btnBack = () => {
 		console.log(1);
@@ -208,10 +221,22 @@
 		console.log(carShop.value);
 	}
 	const add = (index) => {
-		carShop.value[index].num++
+		if(carShop.value[index].num<99){
+			carShop.value[index].num++
+		}else{
+			uni.showToast({
+				icon:"none",
+				title:"已经不能再多了",
+				duration:1000
+			})
+		}
 	}
 	const remove = (index) => {
-		carShop.value[index].num--
+		if(carShop.value[index].num<=1){
+			carShop.value.splice(index,1)
+		}else{
+			carShop.value[index].num--
+		}
 	}
 	const sumJifen = computed(() => {
 		if (carShop.value) {
diff --git a/pages/my/my.vue b/pages/my/my.vue
index e64d6c2..c62668e 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -9,7 +9,7 @@
 				<view class="header-box" @click="logins">
 					<view class="txt">
 						<text>{{wxname ? wxname :'元芳'}}</text>
-						<img class="txt-img" src="https://www.jiubaotongxue.love/image/demo33.png" alt="" />
+						<!-- <img class="txt-img" src="https://www.jiubaotongxue.love/image/demo33.png" alt="" /> -->
 					</view>
 					<view class="tel">
 						{{phoneNum ? phoneNum :''}}
diff --git a/pages/myIntegral/myIntegral.vue b/pages/myIntegral/myIntegral.vue
index 49921e9..bc36c87 100644
--- a/pages/myIntegral/myIntegral.vue
+++ b/pages/myIntegral/myIntegral.vue
@@ -30,33 +30,33 @@
 				</view>
 				<view class="title-zong" v-if="demo===1&&shopData.length>0">
 					<view class="z">
-						月总使用积分：{{shopData[mingXI].useNumber}}
+						月总使用积分：{{shopData[mingXI].total}}
 					</view>
 				</view>
 				<view class="title-zongs" v-if="demo===0&&shopData.length>0">
 					<view class="z">
-						月总获取积分：{{shopData[mingXI].getNumber}}
+						月总获取积分：{{shopData[mingXI].total}}
 					</view>
 				</view>
 				<view class="shangding">
 
 				</view>
-				<view class="box-flex" v-if="demo===0&&shopData.length>0" v-for="(item,index) in shopData[mingXI].cards" :key="item.id">
+				<view class="box-flex" v-if="demo===0&&shopData.length>0" v-for="(item,index) in shopData[mingXI].pointsList" :key="item.id">
 					<view class="lefts">
-						<text class="t">{{item.cardName}}</text>
-						<text class="d">{{item.startTime}}</text>
+						<text class="t">{{item.commodityName}}</text>
+						<text class="d">{{item.orderTime}}</text>
 					</view>
 					<view class="rightsa">
-						+{{item.getNumber}}
+						+{{item.updatePoints}}
 					</view>
 				</view>
-				<view class="box-flex" v-if="demo===1&&shopData.length>0" v-for="(item,index) in shopData[mingXI].cards" :key="item.id">
+				<view class="box-flex" v-if="demo===1&&shopData.length>0" v-for="(item,index) in shopData[mingXI].pointsList" :key="item.id">
 					<view class="lefts">
-						<text class="t">{{item.cardName}}</text>
-						<text class="d">{{item.startTime}}</text>
+						<text class="t">{{item.commodityName}}</text>
+						<text class="d">{{item.orderTime}}</text>
 					</view>
 					<view class="rights">
-						-{{item.useNumber}}
+						-{{item.updatePoints}}
 					</view>
 				</view>
 				<!-- <view class="ts">
diff --git a/pages/networkDetail/networkDetail.vue b/pages/networkDetail/networkDetail.vue
index 17ded3b..d6c09d8 100644
--- a/pages/networkDetail/networkDetail.vue
+++ b/pages/networkDetail/networkDetail.vue
@@ -8,7 +8,7 @@
 			<swiper class="swiper" :autoplay="true" :indicator-dots="true" indicator-color="rgba(220,192,203,1)"
 				indicator-active-color="rgba(255,255,255,1)">
 				<swiper-item class="swiper-item" v-for="(item,index) in banners" :key="index">
-					<img :src="BranchInformationList.image" class="img" alt="" />
+					<img src="https://www.jiubaotongxue.love/image/shou1.png" class="img" alt="" />
 				</swiper-item>
 			</swiper>
 		</view>
@@ -68,7 +68,7 @@
 				<view class="machine-flex" v-for="(item,index) in details" :key="item.id">
 					<img class="i" src="https://www.jiubaotongxue.love/image/demo27.png" alt="" />
 					<view class="t">
-						<text class="t-left">车位1</text>
+						<text class="t-left">车位{{index+1}}</text>
 						<text class="t-right" v-if="item.workStatus != 0&&item.workStatus != 1&&item.warnStatus===1">维修无法使用</text>
 						<text class="t-right" v-if="item.workStatus === 0">直接清洗</text>
 						<text class="t-right" v-if="item.workStatus === 1">正在清洗</text>
diff --git a/pages/orderForm/orderForm.vue b/pages/orderForm/orderForm.vue
index dec43a6..a6b5053 100644
--- a/pages/orderForm/orderForm.vue
+++ b/pages/orderForm/orderForm.vue
@@ -15,7 +15,7 @@
 		<view class="order-box" v-for="(item,index) in orders" :key="item.id" v-if="tagIndex===0">
 			<view class="orderForm-b" >
 				<view class="orderForm-b-t">
-					<text>订单:xxxxxxxxxxxxxx</text> <text class="blues" v-if="item.status===1">进行中</text>
+					<text>订单号:{{item.orderId}}</text> <text class="blues" v-if="item.status===1">进行中</text>
 					<text class="greens" v-if="item.status===2">已完成</text>
 					<text class="greensa" v-if="item.status===3">已退款</text>
 					<text class="reds" v-if="item.status===0">未支付</text>
@@ -27,21 +27,25 @@
 						<view class="b-b-r-t">
 							<text class="maxs">{{item.networkName}}</text>
 						</view>
-						<view class="b-b-r-b">
+						<view class="b-b-r-b" v-if="item.goodsName!='未查询到该商品'">
 							{{item.goodsName}}<text>X1</text>
 						</view>
+						<view class="b-b-r-b" v-if="item.goodsName==='未查询到该商品'">
+							不限时套餐<text>X1</text>
+						</view>
 						<view class="b-b-r-b">
 							{{item.orderTime}}
 						</view>
-						<view class="b-b-r-cs">
-							设备001
+						
+						<view class="b-b-r-cs" v-if="item.deviceId!=null">
+							{{item.deviceId ? item.deviceId :''}}
 						</view>
 					</view>
 				</view>
 				<view class="orderForm-b-m">
 					<text class="blacsa">原价￥ <text class="bla">{{item.amount}}</text> </text> <text class="blu">实付款￥<text
 							class="blues">{{item.amount}}</text> </text>
-					<view class="btns" v-if="item.status===1">
+					<view class="btns" v-if="item.status===1" @click="hujiao=1">
 						申请退款
 					</view>
 					<view class="btnas" v-if="item.status===2">
@@ -50,16 +54,16 @@
 					<view class="btnst" v-if="item.status===3">
 						<!-- 退款成功 -->
 					</view>
-					<view class="btnsc" v-if="item.status===0" @click="openClose">
+				<!-- 	<view class="btnsc" v-if="item.status===0" @click="openClose">
 						查看原因
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</view>
 		<view class="order-box" v-for="(item,index) in orders" :key="item.id" v-if="tagIndex===1">
 			<view class="orderForm-b" v-if="item.status===1" >
 				<view class="orderForm-b-t">
-					<text>订单:xxxxxxxxxxxxxx</text> <text class="blues" v-if="item.status===1">进行中</text>
+					<text>订单号:{{item.orderId}}</text> <text class="blues" v-if="item.status===1">进行中</text>
 			
 			
 				</view>
@@ -69,21 +73,24 @@
 						<view class="b-b-r-t">
 							<text class="maxs">{{item.networkName}}</text>
 						</view>
-						<view class="b-b-r-b">
+						<view class="b-b-r-b" v-if="item.goodsName!='未查询到该商品'">
 							{{item.goodsName}}<text>X1</text>
 						</view>
+						<view class="b-b-r-b" v-if="item.goodsName==='未查询到该商品'">
+							不限时套餐<text>X1</text>
+						</view>
 						<view class="b-b-r-b">
 							{{item.orderTime}}
 						</view>
-						<view class="b-b-r-cs">
-							设备001
+						<view class="b-b-r-cs" v-if="item.deviceId!=null">
+							{{item.deviceId ? item.deviceId :''}}
 						</view>
 					</view>
 				</view>
 				<view class="orderForm-b-m">
 					<text class="blacsa">原价￥ <text class="bla">{{item.amount}}</text> </text> <text class="blu">实付款￥<text
 							class="blues">{{item.amount}}</text> </text>
-					<view class="btns" v-if="item.status===1">
+					<view class="btns" v-if="item.status===1" @click="hujiao=1">
 						申请退款
 					</view>
 				</view>
@@ -92,7 +99,7 @@
 		<view class="order-box" v-for="(item,index) in orders" :key="item.id" v-if="tagIndex===2">
 			<view class="orderForm-b" v-if="item.status===2" >
 				<view class="orderForm-b-t">
-					<text>订单:xxxxxxxxxxxxxx</text> 
+					<text>订单号:{{item.orderId}}</text> 
 				<text class="greens" v-if="item.status===2">已完成</text>
 				</view>
 				<view class="orderForm-b-b">
@@ -101,14 +108,17 @@
 						<view class="b-b-r-t">
 							<text class="maxs">{{item.networkName}}</text>
 						</view>
-						<view class="b-b-r-b">
+						<view class="b-b-r-b" v-if="item.goodsName!='未查询到该商品'">
 							{{item.goodsName}}<text>X1</text>
 						</view>
+						<view class="b-b-r-b" v-if="item.goodsName==='未查询到该商品'">
+							不限时套餐<text>X1</text>
+						</view>
 						<view class="b-b-r-b">
 							{{item.orderTime}}
 						</view>
-						<view class="b-b-r-cs">
-							设备001
+						<view class="b-b-r-cs" v-if="item.deviceId!=null">
+							{{item.deviceId ? item.deviceId :''}}
 						</view>
 					</view>
 				</view>
@@ -124,7 +134,7 @@
 		<view class="order-box" v-for="(item,index) in orders" :key="item.id" v-if="tagIndex===3">
 			<view class="orderForm-b"  v-if="item.status===3">
 				<view class="orderForm-b-t">
-					<text>订单:xxxxxxxxxxxxxx</text>
+					<text>订单号:{{item.orderId}}</text>
 
 					<text class="greensa" v-if="item.status===3">已退款</text>
 		
@@ -136,14 +146,17 @@
 						<view class="b-b-r-t">
 							<text class="maxs">{{item.networkName}}</text>
 						</view>
-						<view class="b-b-r-b">
-							{{item.goodsName}}<text>X1</text>
-						</view>
+					<view class="b-b-r-b" v-if="item.goodsName!='未查询到该商品'">
+						{{item.goodsName}}<text>X1</text>
+					</view>
+					<view class="b-b-r-b" v-if="item.goodsName==='未查询到该商品'">
+						不限时套餐<text>X1</text>
+					</view>
 						<view class="b-b-r-b">
 							{{item.orderTime}}
 						</view>
-						<view class="b-b-r-cs">
-							设备001
+						<view class="b-b-r-cs" v-if="item.deviceId!=null">
+							{{item.deviceId ? item.deviceId :''}}
 						</view>
 					</view>
 				</view>
@@ -160,7 +173,7 @@
 		<view class="order-box" v-for="(item,index) in orders" :key="item.id" v-if="tagIndex===4">
 			<view class="orderForm-b" v-if="item.status===0">
 				<view class="orderForm-b-t">
-					<text>订单:xxxxxxxxxxxxxx</text> 
+					<text>订单号:{{item.orderId}}</text> 
 					<text class="reds" v-if="item.status===0">未支付</text>
 			
 				</view>
@@ -170,14 +183,17 @@
 						<view class="b-b-r-t">
 							<text class="maxs">{{item.networkName}}</text>
 						</view>
-						<view class="b-b-r-b">
+						<view class="b-b-r-b" v-if="item.goodsName!='未查询到该商品'">
 							{{item.goodsName}}<text>X1</text>
 						</view>
+						<view class="b-b-r-b" v-if="item.goodsName==='未查询到该商品'">
+							不限时套餐<text>X1</text>
+						</view>
 						<view class="b-b-r-b">
 							{{item.orderTime}}
 						</view>
-						<view class="b-b-r-cs">
-							设备001
+						<view class="b-b-r-cs" v-if="item.deviceId!=null">
+							{{item.deviceId ? item.deviceId :''}}
 						</view>
 					</view>
 				</view>
@@ -185,9 +201,9 @@
 					<text class="blacsa">原价￥ <text class="bla">{{item.amount}}</text> </text> <text class="blu">实付款￥<text
 							class="blues">{{item.amount}}</text> </text>
 					
-					<view class="btnsc" v-if="item.status===0" @click="openClose">
+					<!-- <view class="btnsc" v-if="item.status===0" @click="openClose">
 						查看原因
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</view>
@@ -205,6 +221,23 @@
 			<text class="tishiHuidu">很抱歉，由于您的信息有误，有部分退款失败,请您确认信息并重新提交</text>
 		</view>
 	</view>
+	<view class="hujiao" v-if="hujiao===1">
+		<view class="windows-hujiao">
+			<img class="i" src="https://www.jiubaotongxue.love/image/demo76.png" alt="" />
+			<view class="ke">
+				客服电话
+			</view>
+			<view class="ke1">
+				176-0532-6897
+			</view>
+			<view class="ke3">
+				<button class="lefts" @tap="hujiao=0">取消</button><button class="rights" @click="dianhua">立即呼叫</button>
+			</view>
+			<view class="ke4">
+				为了保证服务质量，您的通话可能会被录音
+			</view>
+		</view>
+	</view>
 </template>
 
 <script setup>
@@ -228,6 +261,7 @@
 	const bgcolor = ref('#fff')
 	const color = ref('#000')
 	const shibai = ref(0)
+	const hujiao = ref(0)
 	o.getOrders()
 
 	const closeShibai = () => {
@@ -239,6 +273,11 @@
 	const tagBtn = (index) => {
 		tagIndex.value = index
 	}
+	const dianhua = ()=>{
+		uni.makePhoneCall({
+			phoneNumber:'17605326897'
+		})
+	}
 </script>
 
 <style lang="scss">
@@ -373,7 +412,7 @@
 						}
 			
 						.b-b-r-cs {
-							width: 120rpx;
+						max-width: 260rpx;
 							// height: 60rpx;
 							font-size: 22rpx;
 							color: #169bd5;
@@ -515,4 +554,89 @@
 
 		}
 	}
+	.hujiao {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0rpx;
+		background-color: rgba(0, 0, 0, 0.5);
+		z-index: 99;
+	
+		.windows-hujiao {
+			width: 630rpx;
+			height: 614rpx;
+			background: #FFFFFF;
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+			border-radius: 20rpx 20rpx 20rpx 20rpx;
+	
+			.i {
+				width: 320rpx;
+				height: 258rpx;
+				margin-top: 40rpx;
+				transform: translateX(-50%);
+				margin-left: 50%;
+			}
+	
+			.ke {
+				width: 100%;
+				text-align: center;
+				height: 36rpx;
+				font-size: 26rpx;
+				color: #1276F7;
+				line-height: 36rpx;
+				margin-top: 24rpx;
+			}
+	
+			.ke1 {
+				width: 100%;
+				text-align: center;
+				height: 66rpx;
+				font-weight: 600;
+				font-size: 48rpx;
+				color: #222222;
+				line-height: 66rpx;
+				margin-top: 16rpx;
+			}
+	
+			.ke3 {
+				width: 90%;
+				height: 68rpx;
+				transform: translateX(-50%);
+				margin-left: 50%;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin-top: 24rpx;
+	
+				.lefts {
+					width: 266rpx;
+					height: 68rpx;
+					font-size: 26rpx;
+					background-color: #ffffff;
+					border: 1rpx solid #eee;
+				}
+	
+				.rights {
+					width: 266rpx;
+					height: 68rpx;
+					font-size: 26rpx;
+					background: linear-gradient(270deg, #25A5FF 0%, #0177FF 100%);
+					color: white;
+				}
+			}
+	
+			.ke4 {
+				width: 100%;
+				height: 32rpx;
+				font-size: 22rpx;
+				color: #666666;
+				line-height: 32rpx;
+				text-align: center;
+				margin-top: 20rpx;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/recharge/recharge.vue b/pages/recharge/recharge.vue
index d165ca6..9cc2459 100644
--- a/pages/recharge/recharge.vue
+++ b/pages/recharge/recharge.vue
@@ -458,9 +458,10 @@
 
 		.charge-btnPlay {
 			position: fixed;
-			bottom: 0rpx;
-			width: 100%;
+			width: 90%;
 			height: 100rpx;
+			transform: translateX(-50%);
+			margin-left: 50%;
 			background: linear-gradient(276deg, #1C9FF7 0%, #1275F7 100%);
 			box-shadow: 0rpx 8rpx 18rpx 0rpx rgba(5, 128, 255, 0.2);
 			border-radius: 50rpx;
@@ -470,6 +471,7 @@
 			line-height: 100rpx;
 			font-size: 30rpx;
 			color: white;
+			margin-bottom: 80rpx;
 
 		}
 	}
diff --git a/pages/rechargeNetwork/rechargeNetwork.vue b/pages/rechargeNetwork/rechargeNetwork.vue
index afdefce..2ee3121 100644
--- a/pages/rechargeNetwork/rechargeNetwork.vue
+++ b/pages/rechargeNetwork/rechargeNetwork.vue
@@ -24,18 +24,18 @@
 					<view class="title">
 						<text>{{item.networkName}}</text>
 						<view class="title-right">
-							<img class="title-right-i" src="https://www.jiubaotongxue.love/image/handle4.png"
+							<img class="title-right-i" src="https://www.jiubaotongxue.love/image/map2.png"
 								alt="" />
 							<text>{{item.gongli}}km</text>
 						</view>
 					</view>
 					<view class="centers">
-						<img class="centers-i" src="https://www.jiubaotongxue.love/image/handle3.png" alt="" />
+						<img class="centers-i" src="https://www.jiubaotongxue.love/image/handle4.png" alt="" />
 						<text class="flex-centers-txt">{{item.networkArea}}</text>
 					</view>
 					<view class="centers1">
 						<view class="centers-i-l">
-							<img class="centers-i-l-i" src="https://www.jiubaotongxue.love/image/handle3.png"
+							<img class="centers-i-l-i" src="https://www.jiubaotongxue.love/image/demo29.png"
 								alt="" />
 							<text class="txt">营业时间：00:00-23:59&nbsp;&nbsp;&nbsp;</text>
 						</view>
@@ -99,13 +99,13 @@
 		} = storeToRefs(l)
 		l.getNetworks()
 		console.log(netWorkList);
-		const titles = ref('附近洗车点')
+		const titles = ref('附近门店')
 		const bgcolor = ref('#aaa')
 		const color = ref('#000')
 		const demo = ref([0,1,2,3,4,5])
 		const networkIndex = ref(0)
 		onLoad(() => {
-			titles.value = '附近洗车点'
+			titles.value = '附近门店'
 			bgcolor.value = '#fff'
 			color.value = '#000'
 		})
@@ -225,8 +225,8 @@
 
 					.i {
 						width: 184rpx;
-						height: 184rpx;
-						margin-left: 30rpx;
+						height: 164rpx;
+						margin-left: 36rpx;
 						border-radius: 10rpx;
 					}
 
@@ -246,7 +246,7 @@
 							box-sizing: border-box;
 							padding-right: 30rpx;
 							.title-right {
-								width: 120rpx;
+								width: 160rpx;
 								height: 42rpx;
 								display: flex;
 								align-items: center;
diff --git a/pages/secondaryCard/secondaryCard.vue b/pages/secondaryCard/secondaryCard.vue
index 3450aec..4407011 100644
--- a/pages/secondaryCard/secondaryCard.vue
+++ b/pages/secondaryCard/secondaryCard.vue
@@ -40,7 +40,7 @@
 						生效中,有效期至 {{item.endTime}}
 					</view>
 				</view>
-				<view class="card-r" v-if="headerindex===1">
+				<view class="card-r" v-if="headerindex===1" @click="goSencd(index)">
 					使用
 				</view>
 				<view class="card-r1" v-if="headerindex===2">
@@ -85,6 +85,10 @@
 	} from 'vue'
 	import {getCard} from '../../stor/getCard/getCard.js'
 	import { storeToRefs } from 'pinia';
+	import {
+		home
+	} from '../../stor/home/home.js'
+	const h = home()
 	const c = getCard()
 	const {cardDataValidCards,cardDataInvalidCards} = storeToRefs(c)
 	c.getCards()
@@ -99,6 +103,9 @@
 		headerindex.value = 2
 	}
 	const demo = ref([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
+	const goSencd = ()=>{
+		h.scanQrcode()
+	}
 </script>
 
 <style lang="scss">
@@ -174,7 +181,7 @@
 
 			.headerActive {
 				// border-bottom: 6rpx solid #009dd9;
-				color: #009dd9;
+				color:#1378F7;
 			}
 		}
 
diff --git a/pages/tuan/tuan.vue b/pages/tuan/tuan.vue
index 3ba6160..469ed03 100644
--- a/pages/tuan/tuan.vue
+++ b/pages/tuan/tuan.vue
@@ -9,7 +9,7 @@
 			</view>
 			<view class="body-q">
 				<input class="q-input" type="text" placeholder="请输入兑换码" />
-				<img class="q-img" src="https://www.jiubaotongxue.love/image/demo12.png" alt="" />
+				<img class="q-img" src="https://www.jiubaotongxue.love/image/demo12.png" alt="" @click="add" />
 
 			</view>
 		</view>
@@ -18,55 +18,55 @@
 				<view class="seach">
 					<text class="lefts">请选择门店</text>
 					<view class="rights">
-						<img class="i" src="" alt="" />
+						<img class="i" src="https://www.jiubaotongxue.love/image/seach.png" alt="" />
 						<input class="inp" type="text" name="" id="" placeholder="请输入商家名称">
 					</view>
 				</view>
-				<view class="boxs-flex" v-for="(item,index) in demo" :key="index" @click="demos">
+				<view class="boxs-flex" v-for="(item,index) in netWorkList" :key="item.id" @click="demos(index)">
 					<view class="checkboxs">
-						<view class="actImg activeImg">
+						<view class="actImg " :class="{activeImg:listIndex===index}">
 							
 						</view>
 					</view>
 					<view class="boxs-flexs">
-						<img class="i" src="" alt="" />
+						<img class="i" :src="item.image" alt="" />
 						<view class="right-flex">
 							<view class="title">
-								<text>中石化顺达加油站</text>
+								<text>{{item.networkName}}</text>
 								<view class="title-right">
 									<img class="title-right-i" src="https://www.jiubaotongxue.love/image/handle4.png"
 										alt="" />
-									<text>5.4km</text>
+									<text>{{item.gongli}}</text>
 								</view>
 							</view>
 							<view class="centers">
-								<img class="centers-i" src="https://www.jiubaotongxue.love/image/handle3.png" alt="" />
-								<text class="flex-centers-txt">杭州市拱墅区丰庆路750号天悦时代代…</text>
+								<img class="centers-i" src="https://www.jiubaotongxue.love/image/map2.png" alt="" />
+								<text class="flex-centers-txt">{{item.networkArea}}</text>
 							</view>
 							<view class="centers1">
 								<view class="centers-i-l">
-									<img class="centers-i-l-i" src="https://www.jiubaotongxue.love/image/handle3.png"
+									<img class="centers-i-l-i" src="https://www.jiubaotongxue.love/image/demo29.png"
 										alt="" />
 									<text class="txt">营业时间：00:00-23:59&nbsp;&nbsp;&nbsp;</text>
 								</view>
-								<view class="centers-i-l">
+							<!-- 	<view class="centers-i-l">
 									<img class="centers-i-l-i" src="https://www.jiubaotongxue.love/image/handle3.png"
 										alt="" />
 									<text class="txts">站点维修</text>
-								</view>
+								</view> -->
 							</view>
 							<view class="bottoms">
 								<view class="lefta">
-									总工位:5
+										总工位:{{item.special+item.workDevice}}
 								</view>
 								<view class="righta">
-									空闲:5
+									空闲:{{item.special}}
 								</view>
 							</view>
 						</view>
-						<view class="abo">
+						<!-- <view class="abo">
 							暂停营业
-						</view>
+						</view> -->
 					</view>
 					
 				</view>
@@ -83,10 +83,34 @@
 	import {
 		onLoad
 	} from "@dcloudio/uni-app"
-	const demo = ref([0, 1, 2, 3, 4, 5])
-	const titles = ref('优惠详情')
+	import {
+		list
+	} from '../../stor/list/list.js'
+	import {
+		storeToRefs
+	} from 'pinia';
+	const l = list()
+	l.getNetworks()
+	const {
+		netWorkList,
+		markers,
+		BranchInformationList
+	} = storeToRefs(l)
+	console.log(netWorkList);
+	const titles = ref('团购兑换')
 	const bgcolor = ref('#fff')
 	const color = ref('#000')
+	const listIndex = ref(10)
+	const demos = (index)=>{
+		listIndex.value=index
+	}
+	const add = ()=>{
+		uni.showToast({
+			icon:"none",
+			title:"暂未开通",
+			duration:1000
+		})
+	}
 </script>
 
 <style lang="scss">
@@ -200,7 +224,6 @@
 							width: 34rpx;
 							height: 34rpx;
 							position: absolute;
-							background-color: red;
 							left: 30rpx;
 							top: 50%;
 							transform: translateY(-50%);
@@ -258,8 +281,8 @@
 						
 						.i {
 							width: 184rpx;
-							height: 184rpx;
-							margin-left: 30rpx;
+							height: 164rpx;
+							margin-left: 36rpx;
 						}
 						
 						.right-flex {
diff --git a/pages/vehicle/vehicle.vue b/pages/vehicle/vehicle.vue
index 38a285a..a56521b 100644
--- a/pages/vehicle/vehicle.vue
+++ b/pages/vehicle/vehicle.vue
@@ -4,7 +4,7 @@
 		<view class="tops"></view>
 		<view class="maxBox" v-if="carList.length>0">
 			<view class="vehicle-title">
-				已绑定2辆<text class="t">最多绑定3辆</text>
+				已绑定{{carList.length}}辆<text class="t">最多绑定3辆</text>
 			</view>
 		<view class="bigs"  v-for="(item,index) in carList" :key="item.id">
 			<view class="box" :class="{bgmActive:item.xin===0,bgmActives:item.xin===1}">
@@ -61,9 +61,17 @@
 	const color = ref('#000')
 	const isShow = ref(0)
 	const addValidate = () => {
-		uni.navigateTo({
-			url: "/pages/addValidate/addValidate"
-		})
+		if(carList.value.length>=3){
+			uni.showToast({
+				icon:"none",
+				title:"已达到最大绑定数量",
+				duration:1500
+			})
+		}else{
+			uni.navigateTo({
+				url: "/pages/addValidate/addValidate"
+			})
+		}
 	}
 	
 	const deletes = (index)=>{
diff --git a/stor/getCard/getCard.js b/stor/getCard/getCard.js
index b3d8e45..b2b3c2a 100644
--- a/stor/getCard/getCard.js
+++ b/stor/getCard/getCard.js
@@ -17,7 +17,8 @@ export const getCard = defineStore('getCard', () => {
 		// console.log(cardData.value);
 		cardDataInvalidCards.value=cardData.value.invalidCards
 		cardDataValidCards.value=cardData.value.validCards
-		console.log(cardDataInvalidCards.value,cardDataValidCards.value);
+		console.log(cardDataInvalidCards.value);
+		console.log(cardDataValidCards.value);
 	}
 	return {
 		cardDataInvalidCards,
diff --git a/stor/index.js b/stor/index.js
index a518cbe..4bf9987 100644
--- a/stor/index.js
+++ b/stor/index.js
@@ -89,13 +89,6 @@ export const storindex = defineStore('storindex', () => {
 			p.value = 0
 		} else {
 			console.log("out_trade_no", res);
-			const qaq = await getTincheCoupons({
-				phoneNumber: uni.getStorageSync('phoneNumber')
-			})
-			uni.showToast({
-				icon:"none",
-				title:`${qaq.data[0]}`
-			})
 			const res1 = await getWxPlay({
 				appId: appid,
 				phone: uni.getStorageSync('phoneNumber'),
@@ -158,7 +151,7 @@ export const storindex = defineStore('storindex', () => {
 							icon: 'none',
 							title: `${res4.data.statusText},请在我的页面联系客服解决`,
 							duration: 1200,
-							success: (res) => {
+							success: async(res) => {
 								p.value = 0
 								uni.setStorageSync(
 									'orderid',
@@ -168,6 +161,13 @@ export const storindex = defineStore('storindex', () => {
 									'msg',
 									descriptions
 									.value)
+									const qaq = await getTincheCoupons({
+										phoneNumber: uni.getStorageSync('phoneNumber')
+									})
+									uni.showToast({
+										icon:"none",
+										title:`${qaq.data[0]}`
+									})
 
 							}
 						})
@@ -361,14 +361,7 @@ export const storindex = defineStore('storindex', () => {
 			})
 			p.value = 0
 		} else {
-			const qaq = await getTincheCoupons({
-				phoneNumber: uni.getStorageSync('phoneNumber')
-			})
-			console.log(qaq);
-			uni.showToast({
-				icon:"none",
-				title:`${qaq.data[0]}`
-			})
+		
 			const res4 = await start({
 				mid: uni.getStorageSync('mid'),
 				price: 100,
@@ -386,13 +379,21 @@ export const storindex = defineStore('storindex', () => {
 					icon: 'none',
 					title: '启动设备成功',
 					duration: 1000,
-					success: (res) => {
+					success: async(res) => {
 						p.value = 0
 						uni.setStorageSync('orderid', orderid.value)
 						uni.setStorageSync('msg', descriptions.value)
 						uni.redirectTo({
 							url: '/pages/complete/complete'
 						})
+						const qaq = await getTincheCoupons({
+							phoneNumber: uni.getStorageSync('phoneNumber')
+						})
+						console.log(qaq);
+						uni.showToast({
+							icon:"none",
+							title:`${qaq.data[0]}`
+						})
 					}
 				})
 			} else {
@@ -431,13 +432,7 @@ export const storindex = defineStore('storindex', () => {
 			})
 			p.value = 0
 		} else {
-			const qaq = await getTincheCoupons({
-				phoneNumber: uni.getStorageSync('phoneNumber')
-			})
-			uni.showToast({
-				icon:"none",
-				title:`${qaq.data[0]}`
-			})
+			
 			const res4 = await start({
 				mid: uni.getStorageSync('mid'),
 				price: 100,
@@ -453,13 +448,20 @@ export const storindex = defineStore('storindex', () => {
 					icon: 'none',
 					title: '启动设备成功',
 					duration: 1000,
-					success: (res) => {
+					success: async(res) => {
 						p.value = 0
 						uni.setStorageSync('orderid', orderid.value)
 						uni.setStorageSync('msg', '次卡')
 						uni.redirectTo({
 							url: '/pages/complete/complete'
 						})
+						const qaq = await getTincheCoupons({
+							phoneNumber: uni.getStorageSync('phoneNumber')
+						})
+						uni.showToast({
+							icon:"none",
+							title:`${qaq.data[0]}`
+						})
 					}
 				})
 			} else {
diff --git a/stor/operation/operation.js b/stor/operation/operation.js
index 81bf34f..88632f0 100644
--- a/stor/operation/operation.js
+++ b/stor/operation/operation.js
@@ -50,6 +50,7 @@ export const operation = defineStore('operation',()=>{
 	const getCurrentOrderApi = async()=>{
 		
 		currentOrder.value= await getCurrenOrder({phoneNumber:uni.getStorageSync('phoneNumber')})
+		currentOrder.value=currentOrder.value.data
 		console.log(currentOrder.value);
 	}
 	
diff --git a/stor/shop/shop.js b/stor/shop/shop.js
index ab6a557..cff83c4 100644
--- a/stor/shop/shop.js
+++ b/stor/shop/shop.js
@@ -8,7 +8,8 @@
 	const shopData = ref([])
 	//获取商品状态码
 	const shopSucces = ref([])
-	//存储购物车
+	
+	const upponsit=ref()
 	const getShop = async(data)=>{
 		
 		shop.value= await getCommodityShop({deviceNum:"dev1234567"})
@@ -25,10 +26,16 @@
 		console.log(shopData.value);
 	}
 	const getShopDatas=async()=>{
-		//type1是积分获取明细
+		//type0是积分使用明细
 		shopData.value =await getCardUpdateInfo({phoneNumber:uni.getStorageSync('phoneNumber'),type:"0"})
-		shopData.value=shopData.value.data
+		if(shopData.value.code===500){
 		console.log(shopData.value);
+		
+		shopData.value=[]
+		}else{
+			shopData.value=shopData.value.data
+			console.log(shopData.value);
+		}
 	}
 
 	const getChecks = async (data) => {
diff --git a/unpackage/dist/dev/mp-weixin/api/api.js b/unpackage/dist/dev/mp-weixin/api/api.js
index b5389f0..8a59469 100644
--- a/unpackage/dist/dev/mp-weixin/api/api.js
+++ b/unpackage/dist/dev/mp-weixin/api/api.js
@@ -32,7 +32,7 @@ const getCardXi = (data) => utils_request.requests(`mobile/order/cardUpdateInfo`
 const getCurrenOrder = (data) => utils_request.requests(`mobile/order/getInfo`, data, "GET");
 const getCommodityShop = (data) => utils_request.reqs(`shop/device-commodity/list`, data, "GET");
 const getexChange = (data) => utils_request.reqs(`shop/device-commodity/commodity-exchange`, data, "POST");
-const getCardUpdateInfo = (data) => utils_request.requests(`mobile/order/cardUpdateInfo`, data, "GET");
+const getCardUpdateInfo = (data) => utils_request.requests(`mobile/order/pointsInfo`, data, "GET");
 const getyouHui = (data) => utils_request.requests(`mobile/coupon/useCoupon`, data, "GET");
 const getTincheCoupons = (data) => utils_request.reqs("shop/preferential-card/park-card-get", data, "GET");
 const getAdd = (data) => utils_request.requests("mobile/recommendation/add", data, "POST");
diff --git a/unpackage/dist/dev/mp-weixin/common/baseurl.js b/unpackage/dist/dev/mp-weixin/common/baseurl.js
index 9e527bd..17d5707 100644
--- a/unpackage/dist/dev/mp-weixin/common/baseurl.js
+++ b/unpackage/dist/dev/mp-weixin/common/baseurl.js
@@ -1,9 +1,11 @@
 "use strict";
-const BASE_URL = "https://h5.zhenpin.yhd.la/";
+const BASE_URL = "https://h3.zhenpin.yhd.la/";
 const BASE_URLS = "http://47.97.35.139:19260/";
+const BASE_URLSS = "http://47.97.35.139:19270/";
 const appid = "wxc5f11d5f96fbd989";
 const keyGps = "KLVBZ-GCSLC-MCB2J-AVCJB-SK5NZ-H4BGZ";
 exports.BASE_URL = BASE_URL;
 exports.BASE_URLS = BASE_URLS;
+exports.BASE_URLSS = BASE_URLSS;
 exports.appid = appid;
 exports.keyGps = keyGps;
diff --git a/unpackage/dist/dev/mp-weixin/components/chepai/chepai.js b/unpackage/dist/dev/mp-weixin/components/chepai/chepai.js
index e1ca933..3c9da9d 100644
--- a/unpackage/dist/dev/mp-weixin/components/chepai/chepai.js
+++ b/unpackage/dist/dev/mp-weixin/components/chepai/chepai.js
@@ -8,6 +8,12 @@ const _sfc_main = {
     const actives = common_vendor.ref(100);
     const props = __props;
     const emit = __emit;
+    const wxname = common_vendor.ref();
+    const wxImg = common_vendor.ref();
+    const tel = common_vendor.ref();
+    wxname.value = common_vendor.index.getStorageSync("wxname");
+    wxImg.value = common_vendor.index.getStorageSync("wxImg");
+    tel.value = common_vendor.index.getStorageSync("phoneNumber");
     const c = common_vendor.ref(1);
     const d = common_vendor.ref(1);
     const e = common_vendor.ref(1);
@@ -305,41 +311,43 @@ const _sfc_main = {
             d: common_vendor.o(($event) => ab(index), item.id)
           };
         }),
-        f: common_vendor.o(fors),
-        g: common_vendor.o(kongbai),
-        h: c.value === 0
+        f: common_vendor.t(wxname.value ? wxname.value : "元芳"),
+        g: common_vendor.t(tel.value ? tel.value : "暂无手机号码"),
+        h: common_vendor.o(fors),
+        i: common_vendor.o(kongbai),
+        j: c.value === 0
       }, c.value === 0 ? {
-        i: common_vendor.f(arry.value, (item, index, i0) => {
+        k: common_vendor.f(arry.value, (item, index, i0) => {
           return {
             a: common_vendor.t(item),
             b: index,
             c: common_vendor.o(($event) => ac(index), index)
           };
         }),
-        j: common_vendor.o(d1)
+        l: common_vendor.o(d1)
       } : {}, {
-        k: d.value === 0
+        m: d.value === 0
       }, d.value === 0 ? {
-        l: common_vendor.f(zimu.value, (item, index, i0) => {
+        n: common_vendor.f(zimu.value, (item, index, i0) => {
           return {
             a: common_vendor.t(item),
             b: index,
             c: common_vendor.o(($event) => av(index), index)
           };
         }),
-        m: common_vendor.o(d1)
+        o: common_vendor.o(d1)
       } : {}, {
-        n: e.value === 0
+        p: e.value === 0
       }, e.value === 0 ? {
-        o: common_vendor.f(zimushu.value, (item, index, i0) => {
+        q: common_vendor.f(zimushu.value, (item, index, i0) => {
           return {
             a: common_vendor.t(item),
             b: index,
             c: common_vendor.o(($event) => an(index), index)
           };
         }),
-        p: common_vendor.o(d1),
-        q: e.value === 0 ? 1 : ""
+        r: common_vendor.o(d1),
+        s: e.value === 0 ? 1 : ""
       } : {});
     };
   }
diff --git a/unpackage/dist/dev/mp-weixin/components/chepai/chepai.wxml b/unpackage/dist/dev/mp-weixin/components/chepai/chepai.wxml
index 3560327..bc8170f 100644
--- a/unpackage/dist/dev/mp-weixin/components/chepai/chepai.wxml
+++ b/unpackage/dist/dev/mp-weixin/components/chepai/chepai.wxml
@@ -1 +1 @@
-<view class="chepai"><view class="header"><view class="{{['header-left', a && 'headerActive']}}" bindtap="{{b}}"><image class="header-img" src="https://www.jiubaotongxue.love/image/demo13.png" alt=""/>普通车牌 </view><view class="{{['header-right', c && 'headerActives']}}" bindtap="{{d}}"><image class="header-img" src="https://www.jiubaotongxue.love/image/demo14.png" alt=""/>新能源车牌 </view></view><view class="titlea"> — <text class="t">请输入要绑定的车牌号</text> — </view><view class="body-a"><view wx:for="{{e}}" wx:for-item="item" wx:key="c" class="{{['a-b', item.b && 'active']}}" bindtap="{{item.d}}">{{item.a}}</view></view><view class="boxs"><image class="boxs-i" src="https://www.jiubaotongxue.love/image/demo20.png" alt=""/><text class="txts">微信昵称</text></view><view class="boxs"><image class="boxs-i" src="https://www.jiubaotongxue.love/image/demo20.png" alt=""/><text class="txts">12312341234</text></view><view class="ok" bindtap="{{f}}"> 点击绑定爱车 </view><view class="kongbai" bindtap="{{g}}"></view></view><view wx:if="{{h}}" class="dibu"><view class="dibus"><view wx:for="{{i}}" wx:for-item="item" wx:key="b" class="dibu-a" bindtap="{{item.c}}">{{item.a}}</view><view class="dibu-b" bindtap="{{j}}"></view></view></view><view wx:if="{{k}}" class="dibu"><view class="dibusa"><view wx:for="{{l}}" wx:for-item="item" wx:key="b" class="dibu-a" bindtap="{{item.c}}">{{item.a}}</view><view class="dibu-c" bindtap="{{m}}"></view></view></view><view wx:if="{{n}}" class="{{['dibu', q && 'q']}}"><view class="dibus"><view wx:for="{{o}}" wx:for-item="item" wx:key="b" class="dibu-a" bindtap="{{item.c}}">{{item.a}}</view><view class="dibu-b" bindtap="{{p}}"></view></view></view>
\ No newline at end of file
+<view class="chepai"><view class="header"><view class="{{['header-left', a && 'headerActive']}}" bindtap="{{b}}"><image class="header-img" src="https://www.jiubaotongxue.love/image/demo13.png" alt=""/>普通车牌 </view><view class="{{['header-right', c && 'headerActives']}}" bindtap="{{d}}"><image class="header-img" src="https://www.jiubaotongxue.love/image/demo14.png" alt=""/>新能源车牌 </view></view><view class="titlea"> — <text class="t">请输入要绑定的车牌号</text> — </view><view class="body-a"><view wx:for="{{e}}" wx:for-item="item" wx:key="c" class="{{['a-b', item.b && 'active']}}" bindtap="{{item.d}}">{{item.a}}</view></view><view class="boxs"><image class="boxs-i" src="https://www.jiubaotongxue.love/image/demo20.png" alt=""/><text class="txts">{{f}}</text></view><view class="boxs"><image class="boxs-i" src="https://www.jiubaotongxue.love/image/demo20.png" alt=""/><text class="txts">{{g}}</text></view><view class="ok" bindtap="{{h}}"> 点击绑定爱车 </view><view class="kongbai" bindtap="{{i}}"></view></view><view wx:if="{{j}}" class="dibu"><view class="dibus"><view wx:for="{{k}}" wx:for-item="item" wx:key="b" class="dibu-a" bindtap="{{item.c}}">{{item.a}}</view><view class="dibu-b" bindtap="{{l}}"></view></view></view><view wx:if="{{m}}" class="dibu"><view class="dibusa"><view wx:for="{{n}}" wx:for-item="item" wx:key="b" class="dibu-a" bindtap="{{item.c}}">{{item.a}}</view><view class="dibu-c" bindtap="{{o}}"></view></view></view><view wx:if="{{p}}" class="{{['dibu', s && 'q']}}"><view class="dibus"><view wx:for="{{q}}" wx:for-item="item" wx:key="b" class="dibu-a" bindtap="{{item.c}}">{{item.a}}</view><view class="dibu-b" bindtap="{{r}}"></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/components/explain/explain.wxml b/unpackage/dist/dev/mp-weixin/components/explain/explain.wxml
index 247bce8..3fa71d6 100644
--- a/unpackage/dist/dev/mp-weixin/components/explain/explain.wxml
+++ b/unpackage/dist/dev/mp-weixin/components/explain/explain.wxml
@@ -1 +1 @@
-<view class="explain"><view class="explain-box" scroll-y="true"><view class="explain-box-title"> 次卡说明 </view><scroll-view class="explain-box-body" scroll-y="true"><text class="txt"> 说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明 说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明 说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明 说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明 说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明 说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明 说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明 说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明 </text></scroll-view><view class="explain-btn" bindtap="{{a}}"> 我知道了 </view></view></view>
\ No newline at end of file
+<view class="explain"><view class="explain-box" scroll-y="true"><view class="explain-box-title"> 使用说明 </view><scroll-view class="explain-box-body" scroll-y="true"><view class="txt"><view class="zi"> 1.购卡或充值后可进行自助洗车，支付后当天立即生效，可即时使用。 </view><view class="zi"> 2.购卡享优惠，按次进行，用一次扣一次，扫码后选择【使用次卡】方式进行洗车。次卡有有效期，一般在有效期能都用完，请在有效期内使用。 </view><view class="zi"> 3.充值送好礼，充值会有相应的现金赠送，赠送部分只能用于洗车不能兑现。扫码后选择【使用套餐】，选相应套餐后用账户余额进行支付。充值的金额可以【我的】【账户余额】中看到，长期有效；充值的余额确认不再使用时可联系客服进行退费（不含充值时赠送的金额）。 </view><view class="zi"> 4.用户支付的次卡或账户余额仅供本人合规合法发使用，禁止用于商业或其他目的，如有发现违规违法行为，平台官方有权对违规账号封号处理。 </view><view class="zi"> 5.在您成功支付或开始洗车后，表明您已预知洗车过程中的各种常识和安全问题，系统不对您洗车过程中车辆和人员的各类问题包括安全问题负责，您需要安全合规操作。 </view><view class="zi"> 6.平台保留对相关条款的解释权，并将一如既往的为各位车主提供贴心周到的服务。 </view><view class="zi"> 7.任何问题，可到【我的】页面，点击下方的客服，通过电话或在线的方式获得帮助。 </view></view></scroll-view><view class="explain-btn" bindtap="{{a}}"> 我知道了 </view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/components/explain/explain.wxss b/unpackage/dist/dev/mp-weixin/components/explain/explain.wxss
index 1e0f72a..17c33c0 100644
--- a/unpackage/dist/dev/mp-weixin/components/explain/explain.wxss
+++ b/unpackage/dist/dev/mp-weixin/components/explain/explain.wxss
@@ -53,15 +53,16 @@
   transform: translateX(-50%);
 }
 .explain .explain-box .explain-box-body .txt {
-  display: block;
   width: 100%;
+  line-height: 30rpx;
   font-size: 26rpx;
   word-wrap: break-word;
 }
 .explain .explain-box .explain-btn {
   width: 300rpx;
   height: 70rpx;
-  background-color: #d9001b;
+  background: linear-gradient(135deg, #4D97FF 0%, #3377FF 100%), linear-gradient(276deg, #1C9FF7 0%, #1275F7 100%);
+  box-shadow: 0rpx 8rpx 18rpx 0rpx rgba(5, 128, 255, 0.2);
   text-align: center;
   position: relative;
   margin-left: 50%;
diff --git a/unpackage/dist/dev/mp-weixin/components/tabbar/tabbar.wxss b/unpackage/dist/dev/mp-weixin/components/tabbar/tabbar.wxss
index 3103924..bf0043d 100644
--- a/unpackage/dist/dev/mp-weixin/components/tabbar/tabbar.wxss
+++ b/unpackage/dist/dev/mp-weixin/components/tabbar/tabbar.wxss
@@ -57,10 +57,11 @@
 .tabbar .aaa .bbb .image .images {
   width: 100%;
   height: 100%;
+  margin-top: 26rpx;
 }
 .tabbar .aaa .bbb .txt {
   box-sizing: border-box;
-  padding-top: 5rpx;
+  padding-top: 35rpx;
   width: 100%;
   height: 20rpx;
   text-align: center;
diff --git a/unpackage/dist/dev/mp-weixin/pages/addValidate/addValidate.wxml b/unpackage/dist/dev/mp-weixin/pages/addValidate/addValidate.wxml
index 783e7cb..66b2f3e 100644
--- a/unpackage/dist/dev/mp-weixin/pages/addValidate/addValidate.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/addValidate/addValidate.wxml
@@ -1 +1 @@
-<view class="navs"><view class="navBgm"><image class="left" src="https://www.jiubaotongxue.love/image/zuoBack.png" alt="" bindtap="{{a}}"/> 绑定车辆 </view></view><view class="addchepai"><chepai wx:if="{{c}}" bindnumString="{{b}}" u-i="09088cc9-0" bind:__l="__l" u-p="{{c}}"></chepai></view><view wx:if="{{d}}" class="explain"><view class="explain-box" scroll-y="true"><view class="explain-box-title"> 温馨提示 </view><scroll-view class="explain-box-body" scroll-y="true"><text class="txt"> 添加车辆成功 </text></scroll-view><view class="explain-btn" bindtap="{{e}}"> 确定 </view></view></view>
\ No newline at end of file
+<view class="navs"><view class="navBgm"><image class="left" src="https://www.jiubaotongxue.love/image/nav10.png" alt="" bindtap="{{a}}"/> 绑定车辆 </view></view><view class="addchepai"><chepai wx:if="{{c}}" bindnumString="{{b}}" u-i="09088cc9-0" bind:__l="__l" u-p="{{c}}"></chepai></view><view wx:if="{{d}}" class="explain"><view class="explain-box" scroll-y="true"><view class="explain-box-title"> 温馨提示 </view><scroll-view class="explain-box-body" scroll-y="true"><text class="txt"> 添加车辆成功 </text></scroll-view><view class="explain-btn" bindtap="{{e}}"> 确定 </view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/balance/balance.js b/unpackage/dist/dev/mp-weixin/pages/balance/balance.js
index 17dd014..b3f8f20 100644
--- a/unpackage/dist/dev/mp-weixin/pages/balance/balance.js
+++ b/unpackage/dist/dev/mp-weixin/pages/balance/balance.js
@@ -23,100 +23,6 @@ const _sfc_main = {
     const demos = common_vendor.ref([]);
     const remo = () => {
       headerindex.value = 1;
-      if (headerindex.value === 1) {
-        demos.value = [];
-        demos.value = [
-          {
-            id: 1,
-            title: "本月",
-            sumPrice: 30,
-            sumNum: 15,
-            arrys: [{
-              id: 1,
-              orderId: "xxxxxxxxxxxx",
-              ciKaTitle: "充30送5套餐",
-              price: 300,
-              oldDate: "2024-05-09 11:56:40",
-              newDate: "024-05-09"
-            }, {
-              id: 2,
-              orderId: "xxxxxxxxxxxx",
-              ciKaTitle: "充30送5套餐",
-              price: 300,
-              oldDate: "2024-05-09 11:56:40",
-              newDate: "024-05-09"
-            }, {
-              id: 3,
-              orderId: "xxxxxxxxxxxx",
-              ciKaTitle: "充30送5套餐",
-              price: 30,
-              oldDate: "2024-05-09 11:56:40",
-              newDate: "024-05-09"
-            }]
-          },
-          {
-            id: 2,
-            title: "2024年4月",
-            sumPrice: 30,
-            sumNum: 15,
-            arrys: [{
-              id: 1,
-              orderId: "xxxxxxxxxxxx",
-              ciKaTitle: "充30送5套餐",
-              price: 30,
-              oldDate: "2024-05-09 11:56:40",
-              newDate: "024-05-09"
-            }, {
-              id: 2,
-              orderId: "xxxxxxxxxxxx",
-              ciKaTitle: "充30送5套餐",
-              price: 30,
-              oldDate: "2024-05-09 11:56:40",
-              newDate: "024-05-09"
-            }, {
-              id: 3,
-              orderId: "xxxxxxxxxxxx",
-              ciKaTitle: "充30送5套餐",
-              price: 30,
-              oldDate: "2024-05-09 11:56:40",
-              newDate: "024-05-09"
-            }]
-          },
-          {
-            id: 3,
-            title: "2024年3月",
-            sumPrice: 30,
-            sumNum: 15,
-            arrys: [{
-              id: 1,
-              orderId: "xxxxxxxxxxxx",
-              ciKaTitle: "充30送5套餐",
-              price: 30,
-              oldDate: "2024-05-09 11:56:40",
-              newDate: "024-05-09"
-            }, {
-              id: 2,
-              orderId: "xxxxxxxxxxxx",
-              ciKaTitle: "充30送5套餐",
-              price: 30,
-              oldDate: "2024-05-09 11:56:40",
-              newDate: "024-05-09"
-            }, {
-              id: 3,
-              orderId: "xxxxxxxxxxxx",
-              ciKaTitle: "充30送5套餐",
-              price: 30,
-              oldDate: "2024-05-09 11:56:40",
-              newDate: "024-05-09"
-            }]
-          }
-        ];
-      } else {
-        common_vendor.index.showToast({
-          icon: "none",
-          title: "网络错误,请重新进入"
-        });
-      }
     };
     remo();
     const add = () => {
@@ -271,8 +177,8 @@ const _sfc_main = {
                 b: common_vendor.t(items.orderId),
                 c: common_vendor.t(items.useAmount),
                 d: headerindex.value === 2 && items.useAmount > 0,
-                e: common_vendor.t(items.amount + items.getAmount),
-                f: headerindex.value === 2 && items.useAmount < 0,
+                e: common_vendor.t((items.amount + items.giveAmount).toFixed(2)),
+                f: headerindex.value === 2 && items.useAmount <= 0,
                 g: common_vendor.t(items.orderTime),
                 h: indexs < item.balance.length - 1
               }, indexs < item.balance.length - 1 ? {} : {}, {
diff --git a/unpackage/dist/dev/mp-weixin/pages/handle/handle.js b/unpackage/dist/dev/mp-weixin/pages/handle/handle.js
index 2c7d3ac..7e44b65 100644
--- a/unpackage/dist/dev/mp-weixin/pages/handle/handle.js
+++ b/unpackage/dist/dev/mp-weixin/pages/handle/handle.js
@@ -21,12 +21,12 @@ const _sfc_main = {
     l.getNetworks();
     console.log(netWorkList);
     const active = common_vendor.ref(1);
-    const titles = common_vendor.ref("附近门点");
+    const titles = common_vendor.ref("附近门店");
     const color = common_vendor.ref("#ffffff");
     common_vendor.ref([0, 1, 2, 3, 4, 5]);
     const networkIndex = common_vendor.ref(0);
     common_vendor.onLoad(() => {
-      titles.value = "附近门点";
+      titles.value = "附近门店";
       color.value = "#ffffff";
     });
     const promptbgk = common_vendor.ref(0);
diff --git a/unpackage/dist/dev/mp-weixin/pages/handle/handle.wxml b/unpackage/dist/dev/mp-weixin/pages/handle/handle.wxml
index 61d044a..866e1d9 100644
--- a/unpackage/dist/dev/mp-weixin/pages/handle/handle.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/handle/handle.wxml
@@ -1 +1 @@
-<navss wx:if="{{a}}" u-i="774bbb99-0" bind:__l="__l" u-p="{{a}}"></navss><view class="handle"><view class="top"></view><view class="header"><view class="seach"><text class="lefts">洗车</text><view class="rights"><image class="i" src="https://www.jiubaotongxue.love/image/seach.png" alt=""/><input class="inp" type="text" name="" id="" placeholder="请输入商家名称"></input></view></view></view><view class="header-two"></view><scroll-view scroll-y="true" class="auto-body"><view class="boxs"><view wx:for="{{b}}" wx:for-item="item" wx:key="g" class="boxs-flex" bindtap="{{item.h}}"><image class="i" src="{{item.a}}" alt=""/><view class="right-flex"><view class="title"><text>{{item.b}}</text><view class="title-right"><image class="title-right-i" src="https://www.jiubaotongxue.love/image/handle4.png" alt=""/><text>{{item.c}}km</text></view></view><view class="centers"><image class="centers-i" src="https://www.jiubaotongxue.love/image/handle3.png" alt=""/><text class="flex-centers-txt">{{item.d}}</text></view><view class="centers1"><view class="centers-i-l"><image class="centers-i-l-i" src="https://www.jiubaotongxue.love/image/handle3.png" alt=""/><text class="txt">营业时间：00:00-23:59   </text></view></view><view class="bottoms"><view class="lefta"> 总工位:{{item.e}}</view><view class="righta"> 空闲:{{item.f}}</view></view></view></view></view><view class="d" style="width:100%;height:9%;position:relative"></view></scroll-view></view><view wx:if="{{c}}" class="promptbgk"><view class="prompt"><view class="prompt-title"> 温馨提示 </view><view class="prompt-body"> 门店暂未开通次卡活动，请在平台上办理 </view><view class="prompt-bottom"><view class="left-btn" bindtap="{{d}}"> 取消 </view><view class="right-btn" bindtap="{{e}}"> 确定 </view></view></view></view><tabbar wx:if="{{f}}" u-i="774bbb99-1" bind:__l="__l" u-p="{{f}}"></tabbar>
\ No newline at end of file
+<navss wx:if="{{a}}" u-i="774bbb99-0" bind:__l="__l" u-p="{{a}}"></navss><view class="handle"><view class="top"></view><view class="header"><view class="seach"><text class="lefts">洗车</text><view class="rights"><image class="i" src="https://www.jiubaotongxue.love/image/seach.png" alt=""/><input class="inp" type="text" name="" id="" placeholder="请输入商家名称"></input></view></view></view><view class="header-two"></view><scroll-view scroll-y="true" class="auto-body"><view class="boxs"><view wx:for="{{b}}" wx:for-item="item" wx:key="g" class="boxs-flex" bindtap="{{item.h}}"><image class="i" src="{{item.a}}" alt=""/><view class="right-flex"><view class="title"><text>{{item.b}}</text><view class="title-right"><image class="title-right-i" src="https://www.jiubaotongxue.love/image/map2.png" alt=""/><text>{{item.c}}km</text></view></view><view class="centers"><image class="centers-i" src="https://www.jiubaotongxue.love/image/handle4.png" alt=""/><text class="flex-centers-txt">{{item.d}}</text></view><view class="centers1"><view class="centers-i-l"><image class="centers-i-l-i" src="https://www.jiubaotongxue.love/image/demo29.png" alt=""/><text class="txt">营业时间：00:00-23:59   </text></view></view><view class="bottoms"><view class="lefta"> 总工位:{{item.e}}</view><view class="righta"> 空闲:{{item.f}}</view></view></view></view></view><view class="d" style="width:100%;height:9%;position:relative"></view></scroll-view></view><view wx:if="{{c}}" class="promptbgk"><view class="prompt"><view class="prompt-title"> 温馨提示 </view><view class="prompt-body"> 门店暂未开通次卡活动，请在平台上办理 </view><view class="prompt-bottom"><view class="left-btn" bindtap="{{d}}"> 取消 </view><view class="right-btn" bindtap="{{e}}"> 确定 </view></view></view></view><tabbar wx:if="{{f}}" u-i="774bbb99-1" bind:__l="__l" u-p="{{f}}"></tabbar>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/handle/handle.wxss b/unpackage/dist/dev/mp-weixin/pages/handle/handle.wxss
index 61a1f66..14fe12a 100644
--- a/unpackage/dist/dev/mp-weixin/pages/handle/handle.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/handle/handle.wxss
@@ -113,8 +113,8 @@
 }
 .handle .auto-body .boxs .boxs-flex .i {
   width: 184rpx;
-  height: 184rpx;
-  margin-left: 30rpx;
+  height: 164rpx;
+  margin-left: 36rpx;
   border-radius: 10rpx;
 }
 .handle .auto-body .boxs .boxs-flex .right-flex {
@@ -134,7 +134,7 @@
   padding-right: 30rpx;
 }
 .handle .auto-body .boxs .boxs-flex .right-flex .title .title-right {
-  width: 120rpx;
+  width: 160rpx;
   height: 42rpx;
   display: flex;
   align-items: center;
@@ -145,6 +145,8 @@
   width: 28rpx;
   height: 28rpx;
   margin-right: 10rpx;
+  position: relative;
+  z-index: 100;
 }
 .handle .auto-body .boxs .boxs-flex .right-flex .centers {
   width: 100%;
diff --git a/unpackage/dist/dev/mp-weixin/pages/implement/implement.js b/unpackage/dist/dev/mp-weixin/pages/implement/implement.js
index 0745012..936bbf3 100644
--- a/unpackage/dist/dev/mp-weixin/pages/implement/implement.js
+++ b/unpackage/dist/dev/mp-weixin/pages/implement/implement.js
@@ -3,12 +3,16 @@ const common_vendor = require("../../common/vendor.js");
 const stor_rechagePlay_rechagePlay = require("../../stor/rechagePlay/rechagePlay.js");
 const stor_index = require("../../stor/index.js");
 const stor_getCard_getCard = require("../../stor/getCard/getCard.js");
+const stor_balances_balances = require("../../stor/balances/balances.js");
 const _sfc_main = {
   __name: "implement",
   setup(__props) {
+    const b = stor_balances_balances.balances();
     const r = stor_rechagePlay_rechagePlay.rechagePlay();
     const s = stor_index.storindex();
     const g = stor_getCard_getCard.getCard();
+    const { balance } = common_vendor.storeToRefs(b);
+    b.getBalanceApi();
     const {
       infos,
       rechageCardData
@@ -43,7 +47,7 @@ const _sfc_main = {
     };
     const goCiPlay = (index) => {
       if (cardIndex.value === index) {
-        s.ciPlay(cardDataValidCards.value);
+        s.ciPlay(cardDataValidCards.value[index]);
       }
     };
     const yuChecks = (index) => {
@@ -57,14 +61,32 @@ const _sfc_main = {
       payIndexs.value = 1;
     };
     const goPays = () => {
-      if (payIndexs.value === 0) {
+      if (payIndexs.value === 0 && infos.value[yuIndex.value].amount > 0) {
         s.wxPlay(infos.value[yuIndex.value]);
       } else if (payIndexs.value === 1) {
-        s.yuePlay(infos.value[yuIndex.value]);
+        console.log(balance.value.balance);
+        if (balance.value.balance > infos.value[yuIndex.value].amount) {
+          s.yuePlay(infos.value[yuIndex.value]);
+        } else {
+          common_vendor.index.showToast({
+            icon: "none",
+            title: "余额不足",
+            duration: 1e3
+          });
+        }
       } else {
+        common_vendor.index.showToast({
+          icon: "none",
+          title: "此套餐可能不能使用此支付方式",
+          duration: 1e3
+        });
         console.log("错误");
       }
     };
+    common_vendor.onMounted(() => {
+      yuChecks(0);
+      console.log("触发");
+    });
     return (_ctx, _cache) => {
       return common_vendor.e({
         a: common_vendor.o(getNavs),
@@ -79,14 +101,19 @@ const _sfc_main = {
         h: headerIndex.value === 1
       }, headerIndex.value === 1 ? {
         i: common_vendor.f(common_vendor.unref(infos), (item, index, i0) => {
-          return {
-            a: common_vendor.t(item.minute),
-            b: common_vendor.t(item.amount),
-            c: common_vendor.t(item.amount),
-            d: yuIndex.value === index ? 1 : "",
-            e: item.id,
-            f: common_vendor.o(($event) => yuChecks(index), item.id)
-          };
+          return common_vendor.e({
+            a: item.minute != 0
+          }, item.minute != 0 ? {
+            b: common_vendor.t(item.minute)
+          } : {}, {
+            c: item.minute === 0
+          }, item.minute === 0 ? {} : {}, {
+            d: common_vendor.t(item.amount),
+            e: common_vendor.t(item.amount),
+            f: yuIndex.value === index ? 1 : "",
+            g: item.id,
+            h: common_vendor.o(($event) => yuChecks(index), item.id)
+          });
         })
       } : {}, {
         j: headerIndex.value === 2
diff --git a/unpackage/dist/dev/mp-weixin/pages/implement/implement.wxml b/unpackage/dist/dev/mp-weixin/pages/implement/implement.wxml
index b031607..c417008 100644
--- a/unpackage/dist/dev/mp-weixin/pages/implement/implement.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/implement/implement.wxml
@@ -1 +1 @@
-<view class="navas"><image class="nav-lefts" src="https://www.jiubaotongxue.love/image/nav10.png" alt="" bindtap="{{a}}"/><view class="lefts-txt" style="font-size:36rpx"> 洗车付款 </view></view><view class="implement"><view class="tops"></view><view class="{{['title', f && 'titleActive', g && 'titleActives']}}"><view class="lefts" bindtap="{{c}}"> 购买套餐 <view wx:if="{{b}}" class="line"></view></view><view class="lefts" bindtap="{{e}}"> 使用次卡 <view wx:if="{{d}}" class="line"></view></view></view><view class="headers"><view wx:if="{{h}}" class="box"><view wx:for="{{i}}" wx:for-item="item" wx:key="e" class="cardTime" bindtap="{{item.f}}"><view class="cardCcc"><text><text class="color-r">{{item.a}}</text>分钟 </text><text class="cardTime-left"><text class="color-r">￥{{item.b}}</text></text><text class="cardTime-lefts">￥{{item.c}}</text></view><view class="chekcka"><text>10.0折</text><view class="{{['chekcka-i', item.d && 'iactive']}}"></view></view></view></view><scroll-view wx:if="{{j}}" class="secondaryCard-auto" scroll-y="true"><view wx:for="{{k}}" wx:for-item="item" wx:key="g" class="{{['card', item.f && 'cardA']}}" bindtap="{{item.h}}"><text class="reds">剩余<text class="color-r">{{item.a}}</text>次</text><image class="card-l" src="https://www.jiubaotongxue.love/image/demo73.png" alt=""/><view class="card-c"><view class="t"><text class="w"><text class="blacks">{{item.b}}</text>次洗车卡套餐</text></view><view class="c"> 每次上限使用{{item.c}}分钟 </view><view class="d"> 生效中,有效期至 {{item.d}}</view></view><view class="card-r" bindtap="{{item.e}}"> 使用 </view></view></scroll-view><view class="ding"></view></view><view wx:if="{{l}}" class="playCheck"><view class="palys" bindtap="{{n}}"><view class="play-left"><image class="i" src="https://www.jiubaotongxue.love/image/demo54.png" alt=""/><text class="txt">微信支付</text></view><view class="{{['right-i', m && 'iactive']}}"></view></view><view class="lines"></view><view class="palys" bindtap="{{p}}"><view class="play-left"><image class="i" src="https://www.jiubaotongxue.love/image/pay1.png" alt=""/><text class="txt">余额支付</text></view><view class="{{['right-i', o && 'iactive']}}"></view></view></view></view><view wx:if="{{q}}" class="bottoms"><text class="bottoms-left">合计实付： <text class="color-r">￥{{r}}</text></text><view class="btn" bindtap="{{s}}"> 结算 </view></view>
\ No newline at end of file
+<view class="navas"><image class="nav-lefts" src="https://www.jiubaotongxue.love/image/nav10.png" alt="" bindtap="{{a}}"/><view class="lefts-txt" style="font-size:36rpx"> 洗车付款 </view></view><view class="implement"><view class="tops"></view><view class="{{['title', f && 'titleActive', g && 'titleActives']}}"><view class="lefts" bindtap="{{c}}"> 购买套餐 <view wx:if="{{b}}" class="line"></view></view><view class="lefts" bindtap="{{e}}"> 使用次卡 <view wx:if="{{d}}" class="line"></view></view></view><view class="headers"><view wx:if="{{h}}" class="box"><view wx:for="{{i}}" wx:for-item="item" wx:key="g" class="cardTime" bindtap="{{item.h}}"><view class="cardCcc"><text wx:if="{{item.a}}"><text class="color-r">{{item.b}}</text>分钟 </text><text wx:if="{{item.c}}"><text class="color-r">不限时套餐</text></text><text class="cardTime-left"><text class="color-r">￥{{item.d}}</text></text><text class="cardTime-lefts">￥{{item.e}}</text></view><view class="chekcka"><text>10.0折</text><view class="{{['chekcka-i', item.f && 'iactive']}}"></view></view></view></view><scroll-view wx:if="{{j}}" class="secondaryCard-auto" scroll-y="true"><view wx:for="{{k}}" wx:for-item="item" wx:key="g" class="{{['card', item.f && 'cardA']}}" bindtap="{{item.h}}"><text class="reds">剩余<text class="color-r">{{item.a}}</text>次</text><image class="card-l" src="https://www.jiubaotongxue.love/image/demo73.png" alt=""/><view class="card-c"><view class="t"><text class="w"><text class="blacks">{{item.b}}</text>次洗车卡套餐</text></view><view class="c"> 每次上限使用{{item.c}}分钟 </view><view class="d"> 生效中,有效期至 {{item.d}}</view></view><view class="card-r" bindtap="{{item.e}}"> 使用 </view></view></scroll-view><view class="ding"></view></view><view wx:if="{{l}}" class="playCheck"><view class="palys" bindtap="{{n}}"><view class="play-left"><image class="i" src="https://www.jiubaotongxue.love/image/demo54.png" alt=""/><text class="txt">微信支付</text></view><view class="{{['right-i', m && 'iactive']}}"></view></view><view class="lines"></view><view class="palys" bindtap="{{p}}"><view class="play-left"><image class="i" src="https://www.jiubaotongxue.love/image/pay1.png" alt=""/><text class="txt">余额支付</text></view><view class="{{['right-i', o && 'iactive']}}"></view></view></view></view><view wx:if="{{q}}" class="bottoms"><text class="bottoms-left">合计实付： <text class="color-r">￥{{r}}</text></text><view class="btn" bindtap="{{s}}"> 结算 </view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.js b/unpackage/dist/dev/mp-weixin/pages/index/index.js
index 9b99fa9..540c084 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js
@@ -156,20 +156,28 @@ const _sfc_main = {
         h: common_vendor.o(gotoList),
         i: common_vendor.f(common_vendor.unref(netWorkList), (item, index, i0) => {
           return common_vendor.e({
-            a: common_vendor.t(item.networkName),
-            b: common_vendor.t(item.networkArea),
-            c: item.gongli > 0
+            a: index === 0
+          }, index === 0 ? {} : {}, {
+            b: index === 1
+          }, index === 1 ? {} : {}, {
+            c: index === 2
+          }, index === 2 ? {} : {}, {
+            d: index === 3
+          }, index === 3 ? {} : {}, {
+            e: common_vendor.t(item.networkName),
+            f: common_vendor.t(item.networkArea),
+            g: item.gongli > 0
           }, item.gongli > 0 ? {
-            d: common_vendor.t(item.gongli)
+            h: common_vendor.t(item.gongli)
           } : {}, {
-            e: item.special === 0
+            i: item.special === 0
           }, item.special === 0 ? {} : {}, {
-            f: item.special === 1
+            j: item.special === 1
           }, item.special === 1 ? {} : {}, {
-            g: common_vendor.t(item.special + item.workDevice),
-            h: common_vendor.t(item.workDevice),
-            i: item.id,
-            j: common_vendor.o(($event) => netWorkDetails(index), item.id)
+            k: common_vendor.t(item.special + item.workDevice),
+            l: common_vendor.t(item.workDevice),
+            m: item.id,
+            n: common_vendor.o(($event) => netWorkDetails(index), item.id)
           });
         }),
         j: common_vendor.unref(longitude),
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
index 8f077f9..a3f06c0 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
@@ -1 +1 @@
-<view class="{{['nav', a && 'navs']}}"><text class="ttt" style="font-size:36rpx">浙里洗</text></view><scroll-view class="index" scroll-y="true" bindscroll="{{w}}" ref="scroView"><view class="uni-margin-wrap"><swiper class="swiper" autoplay="{{true}}" indicator-dots="{{true}}" indicator-color="rgba(220,192,203,1)" indicator-active-color="rgba(255,255,255,1)"><swiper-item wx:for="{{b}}" wx:for-item="item" wx:key="b" class="swiper-item"><image src="{{item.a}}" class="img" alt=""/></swiper-item></swiper></view><view class="boxs"><view class="bodys-headers"><view class="header-a" bindtap="{{c}}"><view class="header-b"><view class="image"><image class="imagea" src="https://www.jiubaotongxue.love/image/demo1.png" alt=""/></view><view class="txt"> 我要洗车 </view></view></view><view class="header-a" bindtap="{{d}}"><view class="header-b"><view class="image"><image class="imagea" src="https://www.jiubaotongxue.love/image/demo2.png" alt=""/></view><view class="txt"> 充值优惠 </view></view></view><view class="header-a" bindtap="{{e}}"><view class="header-b"><view class="image"><image class="imagea" src="https://www.jiubaotongxue.love/image/demo3.png" alt=""/></view><view class="txt"> 绑定车辆 </view></view></view><view class="header-a" bindtap="{{f}}"><view class="header-b"><view class="image"><image class="imagea" src="https://www.jiubaotongxue.love/image/demo4.png" alt=""/></view><view class="txt"> 积分兑换 </view></view></view></view><view class="nav-title" bindtap="{{g}}"><image class="nav-img-left" src="https://www.jiubaotongxue.love/image/demo81.png" alt=""/><text class="t">团购核销入口</text><view class="nav-btn"> 进入 </view></view></view><view class="bodys-title"><view class="title-left"><image class="t" src="https://www.jiubaotongxue.love/image/demo80.png" alt=""/><text class="i">精选店铺</text></view><view class="title-right" bindtap="{{h}}"> 查看更多 </view></view><view class="body-data"><view wx:for="{{i}}" wx:for-item="item" wx:key="i" class="datas" bindtap="{{item.j}}"><image class="datas-img" src="https://www.chehaiyang.com/Content/Uploads/202004/b432bfc3-dc75-4135-beca-3941d42da88b.jpg" alt=""/><view class="datas-title">{{item.a}}</view><view class="datas-address"><image class="i" src="https://www.jiubaotongxue.love/image/handle4.png" alt=""/><view class="t">{{item.b}}</view></view><view class="datas-navigation"><view class="left-d"><image class="i" src="https://www.jiubaotongxue.love/image/map2.png" alt=""/><text wx:if="{{item.c}}" class="colors">{{item.d}}km</text></view><text class="l">|</text><view wx:if="{{item.e}}" class="left-x"><image class="i" src="https://www.jiubaotongxue.love/image/map2.png" alt=""/><text class="colors">站点维修</text></view><view wx:if="{{item.f}}" class="left-x"><image class="i" src="https://www.jiubaotongxue.love/image/map2.png" alt=""/><text class="colors">24小时营业</text></view></view><view class="datas-state"><view class="sum"> 总共位：{{item.g}}</view><view class="surplus"> 空闲：{{item.h}}</view></view></view></view><view class="maps-title"><view class="title-left"><image class="t" src="https://www.jiubaotongxue.love/image/map3.png" alt=""/><text class="i">网点展示</text></view><view class="map-container"><map id="map" longitude="{{j}}" latitude="{{k}}" show-location="{{true}}" scale="{{l}}" markers="{{m}}" bindmarkertap="{{n}}" bindonMyLocationTap="{{o}}" style="width:100%;height:100%"></map><image class="gps" src="https://www.jiubaotongxue.love/image/demo22.png" alt="" bindtap="{{p}}"/></view><view class="ding"></view></view><view wx:if="{{q}}" class="mapWindow"><view class="l"><view class="title"><text class="t">{{r}}</text><text class="r">正常营业</text></view><view class="c">{{s}}</view><view class="b"><image class="i" src="https://www.jiubaotongxue.love/image/map2.png" alt=""/><text class="times">{{t}}</text></view></view><view class="right-m" bindtap="{{v}}"><view class="box"><image class="ic" src="https://www.jiubaotongxue.love/image/demo10.png" alt=""/><view class="txt"> 导航 </view></view></view></view><view class="d" style="width:100%;height:9%;position:relative"></view></scroll-view><tabbar wx:if="{{x}}" u-i="023f227f-0" bind:__l="__l" u-p="{{x}}"></tabbar>
\ No newline at end of file
+<view class="{{['nav', a && 'navs']}}"><text class="ttt" style="font-size:36rpx">浙里洗</text></view><scroll-view class="index" scroll-y="true" bindscroll="{{w}}" ref="scroView"><view class="uni-margin-wrap"><swiper class="swiper" autoplay="{{true}}" indicator-dots="{{true}}" indicator-color="rgba(220,192,203,1)" indicator-active-color="rgba(255,255,255,1)"><swiper-item wx:for="{{b}}" wx:for-item="item" wx:key="b" class="swiper-item"><image src="{{item.a}}" class="img" alt=""/></swiper-item></swiper></view><view class="boxs"><view class="bodys-headers"><view class="header-a" bindtap="{{c}}"><view class="header-b"><view class="image"><image class="imagea" src="https://www.jiubaotongxue.love/image/demo1.png" alt=""/></view><view class="txt"> 我要洗车 </view></view></view><view class="header-a" bindtap="{{d}}"><view class="header-b"><view class="image"><image class="imagea" src="https://www.jiubaotongxue.love/image/demo2.png" alt=""/></view><view class="txt"> 充值优惠 </view></view></view><view class="header-a" bindtap="{{e}}"><view class="header-b"><view class="image"><image class="imagea" src="https://www.jiubaotongxue.love/image/demo3.png" alt=""/></view><view class="txt"> 绑定车辆 </view></view></view><view class="header-a" bindtap="{{f}}"><view class="header-b"><view class="image"><image class="imagea" src="https://www.jiubaotongxue.love/image/demo4.png" alt=""/></view><view class="txt"> 积分兑换 </view></view></view></view><view class="nav-title" bindtap="{{g}}"><image class="nav-img-left" src="https://www.jiubaotongxue.love/image/demo81.png" alt=""/><text class="t">团购核销入口</text><view class="nav-btn"> 进入 </view></view></view><view class="bodys-title"><view class="title-left"><image class="t" src="https://www.jiubaotongxue.love/image/demo80.png" alt=""/><text class="i">精选店铺</text></view><view class="title-right" bindtap="{{h}}"> 查看更多 </view></view><view class="body-data"><view wx:for="{{i}}" wx:for-item="item" wx:key="m" class="datas" bindtap="{{item.n}}"><image wx:if="{{item.a}}" class="datas-img" src="https://www.jiubaotongxue.love/image/demo100.png" alt=""/><image wx:if="{{item.b}}" class="datas-img" src="https://www.jiubaotongxue.love/image/demo101.png" alt=""/><image wx:if="{{item.c}}" class="datas-img" src="https://www.jiubaotongxue.love/image/demo102.png" alt=""/><image wx:if="{{item.d}}" class="datas-img" src="https://www.jiubaotongxue.love/image/demo103.png" alt=""/><view class="datas-title">{{item.e}}</view><view class="datas-address"><image class="i" src="https://www.jiubaotongxue.love/image/handle4.png" alt=""/><view class="t">{{item.f}}</view></view><view class="datas-navigation"><view class="left-d"><image class="i" src="https://www.jiubaotongxue.love/image/map2.png" alt=""/><text wx:if="{{item.g}}" class="colors">{{item.h}}km</text></view><text class="l">|</text><view wx:if="{{item.i}}" class="left-x"><image class="i" src="https://www.jiubaotongxue.love/image/map2.png" alt=""/><text class="colors">站点维修</text></view><view wx:if="{{item.j}}" class="left-x"><image class="i" src="https://www.jiubaotongxue.love/image/demo29.png" alt=""/><text class="colors">24小时营业</text></view></view><view class="datas-state"><view class="sum"> 总共位：{{item.k}}</view><view class="surplus"> 空闲：{{item.l}}</view></view></view></view><view class="maps-title"><view class="title-left"><image class="t" src="https://www.jiubaotongxue.love/image/map3.png" alt=""/><text class="i">网点展示</text></view><view class="map-container"><map id="map" longitude="{{j}}" latitude="{{k}}" show-location="{{true}}" scale="{{l}}" markers="{{m}}" bindmarkertap="{{n}}" bindonMyLocationTap="{{o}}" style="width:100%;height:100%"></map><image class="gps" src="https://www.jiubaotongxue.love/image/demo22.png" alt="" bindtap="{{p}}"/></view><view class="ding"></view></view><view wx:if="{{q}}" class="mapWindow"><view class="l"><view class="title"><text class="t">{{r}}</text><text class="r">正常营业</text></view><view class="c">{{s}}</view><view class="b"><image class="i" src="https://www.jiubaotongxue.love/image/map2.png" alt=""/><text class="times">{{t}}</text></view></view><view class="right-m" bindtap="{{v}}"><view class="box"><image class="ic" src="https://www.jiubaotongxue.love/image/demo10.png" alt=""/><view class="txt"> 导航 </view></view></view></view><view class="d" style="width:100%;height:9%;position:relative"></view></scroll-view><tabbar wx:if="{{x}}" u-i="023f227f-0" bind:__l="__l" u-p="{{x}}"></tabbar>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.wxss b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
index 6027d84..c195b77 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
@@ -39,7 +39,8 @@
   transform: translateX(-50%);
 }
 .navs {
-  background-color: #4475ee;
+  background-color: white;
+  color: black;
 }
 .index {
   width: 100%;
diff --git a/unpackage/dist/dev/mp-weixin/pages/integral/integral.js b/unpackage/dist/dev/mp-weixin/pages/integral/integral.js
index 7256f6a..f07436e 100644
--- a/unpackage/dist/dev/mp-weixin/pages/integral/integral.js
+++ b/unpackage/dist/dev/mp-weixin/pages/integral/integral.js
@@ -33,9 +33,20 @@ const _sfc_main = {
       demo.value = !demo.value;
     };
     const succesBtn = () => {
-      console.log(1);
-      s.getChecks(carShop.value);
-      carShop.value = [];
+      if (Information.value.points >= sumJifen.value) {
+        console.log(1);
+        s.getChecks(carShop.value);
+        carShop.value = [];
+        setTimeout(() => {
+          m.getInformation();
+        }, 3e3);
+      } else {
+        common_vendor.index.showToast({
+          icon: "none",
+          title: "积分不足",
+          duration: 1e3
+        });
+      }
     };
     const btnBack = () => {
       console.log(1);
@@ -53,10 +64,22 @@ const _sfc_main = {
       console.log(carShop.value);
     };
     const add = (index) => {
-      carShop.value[index].num++;
+      if (carShop.value[index].num < 99) {
+        carShop.value[index].num++;
+      } else {
+        common_vendor.index.showToast({
+          icon: "none",
+          title: "已经不能再多了",
+          duration: 1e3
+        });
+      }
     };
     const remove = (index) => {
-      carShop.value[index].num--;
+      if (carShop.value[index].num <= 1) {
+        carShop.value.splice(index, 1);
+      } else {
+        carShop.value[index].num--;
+      }
     };
     const sumJifen = common_vendor.computed(() => {
       if (carShop.value) {
diff --git a/unpackage/dist/dev/mp-weixin/pages/integral/integral.wxml b/unpackage/dist/dev/mp-weixin/pages/integral/integral.wxml
index fe98d51..c77dad2 100644
--- a/unpackage/dist/dev/mp-weixin/pages/integral/integral.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/integral/integral.wxml
@@ -1 +1 @@
-<scroll-view class="integral" scroll-y="true"><view class="navs"><image class="nav-i" src="https://www.jiubaotongxue.love/image/nav10.png" alt="" bindtap="{{a}}"/><view class="nav-txt" style="font-size:36rpx"> 积分换礼 </view></view><view class="top"></view><view class="integral-header"><image class="integral-header-i" src="{{b}}" alt=""/><view class="boxs"><text class="bosx-txt">{{c}}</text><view class="boxs-i"><image wx:if="{{d}}" class="boxs-img" src="https://www.jiubaotongxue.love/image/demo63.png" alt=""/><image wx:if="{{e}}" class="boxs-img" src="https://www.jiubaotongxue.love/image/zhizhun2.png" alt=""/></view></view></view><view class="integral-titles"><view class="title-fu"><view class="title-fu-t"><view class="title-l"><image class="title-img" src="https://www.jiubaotongxue.love/image/demo97.png" alt=""/><text class="txta">当前可用积分</text></view><text bindtap="{{f}}">查看积分明细</text></view><view class="jifen"><text>{{g}}</text><text class="jifen-right">本月失效积分：<text style="font-size:36rpx;color:black;font-weight:600">0</text></text></view></view></view><view class="title-Stronge"> 我能兑换 </view><scroll-view class="auto-boxs" scroll-y="true"><view class="dui-box"><view wx:for="{{h}}" wx:for-item="item" wx:key="e" class="dui"><image class="dui-img" src="{{item.a}}" alt=""/><view class="dui-txt">{{item.b}}</view><view class="dui-b"><view class="dui-l"><image style="width:24rpx;height:24rpx;display:block;margin-left:20rpx" src="https://www.jiubaotongxue.love/image/demo96.png" alt=""/><text class="big">{{item.c}}<text style="font-size:20rpx;color:#EE611B">积分</text></text></view><view class="qu" bindtap="{{item.d}}"> 去兑换 </view></view></view><view class="dings"></view></view></scroll-view></scroll-view><view class="cart"><view class="cart-lefts" bindtap="{{l}}"><image class="i1" src="https://www.jiubaotongxue.love/image/demo64.png" alt=""/><view class="cart-zhizun"><view class="xa"><text class="i2"><text style="font-size:22rpx"></text>{{i}}<text style="font-size:22rpx">积分</text></text><image style="width:24rpx;height:24rpx;display:block;margin-left:5rpx;margin-top:15rpx" src="https://www.jiubaotongxue.love/image/demo65.png" alt=""/></view><view wx:if="{{j}}" style="margin-left:20rpx;font-size:20rpx;color:#666"> 至尊会员优惠88折 </view></view><view style="position:absolute;top:14rpx;width:30rpx;height:30rpx;border-radius:50%;left:80rpx;background-color:red;line-height:30rpx;text-align:center;font-size:22rpx;color:white">{{k}}</view></view><view class="cart-rights" bindtap="{{m}}"> 结算 </view></view><view class="cartWindow" hidden="{{!p}}"><view class="cartWindow-Box"><view class="cartWindow-title"><text style="font-size:30rpx;color:black">已选 <text style="color:#666">({{n}})</text></text><view class="cartWindow-title-right" style="display:flex;align-items:center"><image style="width:24rpx;height:24rpx" src="https://www.jiubaotongxue.love/image/delete1.png" alt=""/><text style="display:block;margin-left:10rpx">清空</text></view></view><scroll-view scroll-y="true" class="autos"><view class="autoCartWindow"><view wx:for="{{o}}" wx:for-item="item" wx:key="g" class="shop"><view class="shop-left"><image class="shop-img" src="{{item.a}}" alt=""/><view class="shop-box"><view class="shop-txt">{{item.b}}</view><text class="xiaojifen">{{item.c}}<text style="font-size:22rpx;color:#EE611B">积分</text></text></view></view><view class="shop-right"><image class="btnA" src="https://www.jiubaotongxue.love/image/jian1.png" alt="" bindtap="{{item.d}}"/><text style="font-size:30rpx">{{item.e}}</text><image class="btnA" src="https://www.jiubaotongxue.love/image/jia1.png" alt="" bindtap="{{item.f}}"/></view></view></view></scroll-view></view></view><view wx:if="{{q}}" class="succes"><view class="succesBox"><image class="succesBox-img" src="{{r}}" alt=""/><view style="width:100%;text-align:center;margin-top:32rpx;font-size:32rpx">{{s}}</view><view style="width:100%;text-align:center;margin-top:24rpx;font-size:32rpx;color:#666666">{{t}}</view><view class="btns" bindtap="{{v}}"> 确定 </view></view></view>
\ No newline at end of file
+<scroll-view class="integral" scroll-y="true"><view class="navs"><image class="nav-i" src="https://www.jiubaotongxue.love/image/nav10.png" alt="" bindtap="{{a}}"/><view class="nav-txt" style="font-size:36rpx"> 积分换礼 </view></view><view class="top"></view><view class="integral-header"><image class="integral-header-i" src="{{b}}" alt=""/><view class="boxs"><text class="bosx-txt">{{c}}</text><view class="boxs-i"><image wx:if="{{d}}" class="boxs-img" src="https://www.jiubaotongxue.love/image/demo63.png" alt=""/><image wx:if="{{e}}" class="boxs-img" src="https://www.jiubaotongxue.love/image/zhizhun2.png" alt=""/></view></view></view><view class="integral-titles"><view class="title-fu"><view class="title-fu-t"><view class="title-l"><image class="title-img" src="https://www.jiubaotongxue.love/image/demo97.png" alt=""/><text class="txta">当前可用积分</text></view><text bindtap="{{f}}">查看积分明细</text></view><view class="jifen"><text>{{g}}</text><text class="jifen-right">本月失效积分：<text style="font-size:36rpx;color:black;font-weight:600">0</text></text></view></view></view><view class="title-Stronge"> 商品列表 </view><scroll-view class="auto-boxs" scroll-y="true"><view class="dui-box"><view wx:for="{{h}}" wx:for-item="item" wx:key="e" class="dui"><image class="dui-img" src="{{item.a}}" alt=""/><view class="dui-txt">{{item.b}}</view><view class="dui-b"><view class="dui-l"><image style="width:24rpx;height:24rpx;display:block;margin-left:20rpx" src="https://www.jiubaotongxue.love/image/demo96.png" alt=""/><text class="big">{{item.c}}<text style="font-size:20rpx;color:#EE611B">积分</text></text></view><view class="qu" bindtap="{{item.d}}"> 去兑换 </view></view></view><view class="dings"></view></view></scroll-view></scroll-view><view class="cart"><view class="cart-lefts" bindtap="{{l}}"><image class="i1" src="https://www.jiubaotongxue.love/image/demo64.png" alt=""/><view class="cart-zhizun"><view class="xa"><text class="i2"><text style="font-size:22rpx"></text>{{i}}<text style="font-size:22rpx">积分</text></text><image style="width:24rpx;height:24rpx;display:block;margin-left:5rpx;margin-top:15rpx" src="https://www.jiubaotongxue.love/image/demo65.png" alt=""/></view><view wx:if="{{j}}" style="margin-left:20rpx;font-size:20rpx;color:#666"> 至尊会员优惠88折 </view></view><view style="position:absolute;top:14rpx;width:30rpx;height:30rpx;border-radius:50%;left:80rpx;background-color:red;line-height:30rpx;text-align:center;font-size:22rpx;color:white">{{k}}</view></view><view class="cart-rights" bindtap="{{m}}"> 结算 </view></view><view class="cartWindow" hidden="{{!p}}"><view class="cartWindow-Box"><view class="cartWindow-title"><text style="font-size:30rpx;color:black">已选 <text style="color:#666">({{n}})</text></text><view class="cartWindow-title-right" style="display:flex;align-items:center"><image style="width:24rpx;height:24rpx" src="https://www.jiubaotongxue.love/image/delete1.png" alt=""/></view></view><scroll-view scroll-y="true" class="autos"><view class="autoCartWindow"><view wx:for="{{o}}" wx:for-item="item" wx:key="g" class="shop"><view class="shop-left"><image class="shop-img" src="{{item.a}}" alt=""/><view class="shop-box"><view class="shop-txt">{{item.b}}</view><text class="xiaojifen">{{item.c}}<text style="font-size:22rpx;color:#EE611B">积分</text></text></view></view><view class="shop-right"><image class="btnA" src="https://www.jiubaotongxue.love/image/jian1.png" alt="" bindtap="{{item.d}}"/><text style="font-size:30rpx">{{item.e}}</text><image class="btnA" src="https://www.jiubaotongxue.love/image/jia1.png" alt="" bindtap="{{item.f}}"/></view></view></view></scroll-view></view></view><view wx:if="{{q}}" class="succes"><view class="succesBox"><image class="succesBox-img" src="{{r}}" alt=""/><view style="width:100%;text-align:center;margin-top:32rpx;font-size:32rpx">{{s}}</view><view style="width:100%;text-align:center;margin-top:24rpx;font-size:32rpx;color:#666666">{{t}}</view><view class="btns" bindtap="{{v}}"> 确定 </view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/my/my.wxml b/unpackage/dist/dev/mp-weixin/pages/my/my.wxml
index 227ee81..6568ca5 100644
--- a/unpackage/dist/dev/mp-weixin/pages/my/my.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/my/my.wxml
@@ -1 +1 @@
-<view class="my"><view class="tops"><view class="title"> 我的 </view><view class="my-header"><image class="my-img" src="{{a}}" alt="" bindtap="{{b}}"/><view class="header-box" bindtap="{{e}}"><view class="txt"><text>{{c}}</text><image class="txt-img" src="https://www.jiubaotongxue.love/image/demo33.png" alt=""/></view><view class="tel">{{d}}</view></view><view class="tongbu" bindtap="{{f}}"><image class="i" src="https://www.jiubaotongxue.love/image/shua1.png" alt=""/>同步资料 </view></view><view class="my-header-flex"><view class="flex-header" bindtap="{{h}}"><text class="t">{{g}}</text><text class="b">洗车卡</text></view><view class="flex-header" bindtap="{{j}}"><text class="t">{{i}}</text><text class="b">券</text></view><view class="flex-header" bindtap="{{l}}"><text class="t">{{k}}</text><text class="b">积分</text></view></view><view class="{{['vip', p && 'vipActive', q && 'vipActives']}}"><view class="up"> 当前等级 </view><view class="vipBox"><view class="vipBox-left"><view wx:if="{{m}}" class="top-img"><image class="img-l" src="https://www.jiubaotongxue.love/image/vip1.png" alt=""/><image class="img-r" src="https://www.jiubaotongxue.love/image/vip2.png" alt=""/></view><view wx:if="{{n}}" class="top-img"><image class="img-l" src="https://www.jiubaotongxue.love/image/vip11.png" alt=""/><image class="img-r" src="https://www.jiubaotongxue.love/image/vip22.png" alt=""/></view><view class="txts"> 有效期：365天 </view><view class="txta"> NO:{{o}}</view></view><image class="vipBox-right" src="https://www.jiubaotongxue.love/image/demo36.png" alt=""/></view></view></view><view class="kongs"></view><view class="neirong"><view class="neirong-title"> 服务 </view><view class="flex-car" bindtap="{{r}}"><image class="flex-car-img" src="https://www.jiubaotongxue.love/image/flex1.png" alt=""/><text class="car-text">洗车订单</text></view><view class="flex-car" bindtap="{{s}}"><image class="flex-car-img" src="https://www.jiubaotongxue.love/image/flex2.png" alt=""/><text class="car-text">洗车次卡</text></view><view class="flex-car" bindtap="{{t}}"><image class="flex-car-img" src="https://www.jiubaotongxue.love/image/flex3.png" alt=""/><text class="car-text">我的余额</text></view><view class="flex-car" bindtap="{{v}}"><image class="flex-car-img" src="https://www.jiubaotongxue.love/image/flex4.png" alt=""/><text class="car-text">我的卡券</text></view></view><view class="neirong"><view class="neirong-title"> 工具 </view><view class="flex-car" bindtap="{{w}}"><image class="flex-car-img" src="https://www.jiubaotongxue.love/image/flex5.png" alt=""/><text class="car-text">关于我们</text></view><view class="flex-car" bindtap="{{x}}"><image class="flex-car-img" src="https://www.jiubaotongxue.love/image/flex6.png" alt=""/><text class="car-text">意见反馈</text></view><view class="flex-car" bindtap="{{y}}"><image class="flex-car-img" src="https://www.jiubaotongxue.love/image/flex7.png" alt=""/><text class="car-text">联系客服</text></view></view><view class="my-shop" bindtap="{{z}}"></view><view class="ding"></view><view class="d" style="width:100%;height:9%;position:relative"></view></view><view wx:if="{{A}}" class="gets"><form bindsubmit="{{E}}" name="id"><view class="bgn"><view class="title"> 同步微信信息 </view><image class="bgnImg" src="{{B}}"/><view class="inputs"><text></text> <input class="input" type="nickname" name="input" placeholder="获取昵称"></input></view><button class="getImgs" open-type="chooseAvatar" bindchooseavatar="{{C}}">获取头像</button><view class="btnView"><view class="left-btnView" bindtap="{{D}}"> 取消 </view><button class="left-btnViews" form-type="submit"> 确定 </button></view></view></form></view><view wx:if="{{F}}" class="hujiao"><view class="windows-hujiao"><image class="i" src="https://www.jiubaotongxue.love/image/demo76.png" alt=""/><view class="ke"> 客服电话 </view><view class="ke1"> 176-0532-6897 </view><view class="ke3"><button class="lefts" bindtap="{{G}}">取消</button><button class="rights" bindtap="{{H}}">立即呼叫</button></view><view class="ke4"> 为了保证服务质量，您的通话可能会被录音 </view></view></view><tabbar wx:if="{{I}}" u-i="5d20eace-0" bind:__l="__l" u-p="{{I}}"></tabbar>
\ No newline at end of file
+<view class="my"><view class="tops"><view class="title"> 我的 </view><view class="my-header"><image class="my-img" src="{{a}}" alt="" bindtap="{{b}}"/><view class="header-box" bindtap="{{e}}"><view class="txt"><text>{{c}}</text></view><view class="tel">{{d}}</view></view><view class="tongbu" bindtap="{{f}}"><image class="i" src="https://www.jiubaotongxue.love/image/shua1.png" alt=""/>同步资料 </view></view><view class="my-header-flex"><view class="flex-header" bindtap="{{h}}"><text class="t">{{g}}</text><text class="b">洗车卡</text></view><view class="flex-header" bindtap="{{j}}"><text class="t">{{i}}</text><text class="b">券</text></view><view class="flex-header" bindtap="{{l}}"><text class="t">{{k}}</text><text class="b">积分</text></view></view><view class="{{['vip', p && 'vipActive', q && 'vipActives']}}"><view class="up"> 当前等级 </view><view class="vipBox"><view class="vipBox-left"><view wx:if="{{m}}" class="top-img"><image class="img-l" src="https://www.jiubaotongxue.love/image/vip1.png" alt=""/><image class="img-r" src="https://www.jiubaotongxue.love/image/vip2.png" alt=""/></view><view wx:if="{{n}}" class="top-img"><image class="img-l" src="https://www.jiubaotongxue.love/image/vip11.png" alt=""/><image class="img-r" src="https://www.jiubaotongxue.love/image/vip22.png" alt=""/></view><view class="txts"> 有效期：365天 </view><view class="txta"> NO:{{o}}</view></view><image class="vipBox-right" src="https://www.jiubaotongxue.love/image/demo36.png" alt=""/></view></view></view><view class="kongs"></view><view class="neirong"><view class="neirong-title"> 服务 </view><view class="flex-car" bindtap="{{r}}"><image class="flex-car-img" src="https://www.jiubaotongxue.love/image/flex1.png" alt=""/><text class="car-text">洗车订单</text></view><view class="flex-car" bindtap="{{s}}"><image class="flex-car-img" src="https://www.jiubaotongxue.love/image/flex2.png" alt=""/><text class="car-text">洗车次卡</text></view><view class="flex-car" bindtap="{{t}}"><image class="flex-car-img" src="https://www.jiubaotongxue.love/image/flex3.png" alt=""/><text class="car-text">我的余额</text></view><view class="flex-car" bindtap="{{v}}"><image class="flex-car-img" src="https://www.jiubaotongxue.love/image/flex4.png" alt=""/><text class="car-text">我的卡券</text></view></view><view class="neirong"><view class="neirong-title"> 工具 </view><view class="flex-car" bindtap="{{w}}"><image class="flex-car-img" src="https://www.jiubaotongxue.love/image/flex5.png" alt=""/><text class="car-text">关于我们</text></view><view class="flex-car" bindtap="{{x}}"><image class="flex-car-img" src="https://www.jiubaotongxue.love/image/flex6.png" alt=""/><text class="car-text">意见反馈</text></view><view class="flex-car" bindtap="{{y}}"><image class="flex-car-img" src="https://www.jiubaotongxue.love/image/flex7.png" alt=""/><text class="car-text">联系客服</text></view></view><view class="my-shop" bindtap="{{z}}"></view><view class="ding"></view><view class="d" style="width:100%;height:9%;position:relative"></view></view><view wx:if="{{A}}" class="gets"><form bindsubmit="{{E}}" name="id"><view class="bgn"><view class="title"> 同步微信信息 </view><image class="bgnImg" src="{{B}}"/><view class="inputs"><text></text> <input class="input" type="nickname" name="input" placeholder="获取昵称"></input></view><button class="getImgs" open-type="chooseAvatar" bindchooseavatar="{{C}}">获取头像</button><view class="btnView"><view class="left-btnView" bindtap="{{D}}"> 取消 </view><button class="left-btnViews" form-type="submit"> 确定 </button></view></view></form></view><view wx:if="{{F}}" class="hujiao"><view class="windows-hujiao"><image class="i" src="https://www.jiubaotongxue.love/image/demo76.png" alt=""/><view class="ke"> 客服电话 </view><view class="ke1"> 176-0532-6897 </view><view class="ke3"><button class="lefts" bindtap="{{G}}">取消</button><button class="rights" bindtap="{{H}}">立即呼叫</button></view><view class="ke4"> 为了保证服务质量，您的通话可能会被录音 </view></view></view><tabbar wx:if="{{I}}" u-i="5d20eace-0" bind:__l="__l" u-p="{{I}}"></tabbar>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/myIntegral/myIntegral.js b/unpackage/dist/dev/mp-weixin/pages/myIntegral/myIntegral.js
index 628fb10..2d9432a 100644
--- a/unpackage/dist/dev/mp-weixin/pages/myIntegral/myIntegral.js
+++ b/unpackage/dist/dev/mp-weixin/pages/myIntegral/myIntegral.js
@@ -55,30 +55,30 @@ const _sfc_main = {
         i: common_vendor.o(removes),
         j: demo.value === 1 && common_vendor.unref(shopData).length > 0
       }, demo.value === 1 && common_vendor.unref(shopData).length > 0 ? {
-        k: common_vendor.t(common_vendor.unref(shopData)[mingXI.value].useNumber)
+        k: common_vendor.t(common_vendor.unref(shopData)[mingXI.value].total)
       } : {}, {
         l: demo.value === 0 && common_vendor.unref(shopData).length > 0
       }, demo.value === 0 && common_vendor.unref(shopData).length > 0 ? {
-        m: common_vendor.t(common_vendor.unref(shopData)[mingXI.value].getNumber)
+        m: common_vendor.t(common_vendor.unref(shopData)[mingXI.value].total)
       } : {}, {
         n: demo.value === 0 && common_vendor.unref(shopData).length > 0
       }, demo.value === 0 && common_vendor.unref(shopData).length > 0 ? {
-        o: common_vendor.f(common_vendor.unref(shopData)[mingXI.value].cards, (item, index, i0) => {
+        o: common_vendor.f(common_vendor.unref(shopData)[mingXI.value].pointsList, (item, index, i0) => {
           return {
-            a: common_vendor.t(item.cardName),
-            b: common_vendor.t(item.startTime),
-            c: common_vendor.t(item.getNumber),
+            a: common_vendor.t(item.commodityName),
+            b: common_vendor.t(item.orderTime),
+            c: common_vendor.t(item.updatePoints),
             d: item.id
           };
         })
       } : {}, {
         p: demo.value === 1 && common_vendor.unref(shopData).length > 0
       }, demo.value === 1 && common_vendor.unref(shopData).length > 0 ? {
-        q: common_vendor.f(common_vendor.unref(shopData)[mingXI.value].cards, (item, index, i0) => {
+        q: common_vendor.f(common_vendor.unref(shopData)[mingXI.value].pointsList, (item, index, i0) => {
           return {
-            a: common_vendor.t(item.cardName),
-            b: common_vendor.t(item.startTime),
-            c: common_vendor.t(item.useNumber),
+            a: common_vendor.t(item.commodityName),
+            b: common_vendor.t(item.orderTime),
+            c: common_vendor.t(item.updatePoints),
             d: item.id
           };
         })
diff --git a/unpackage/dist/dev/mp-weixin/pages/networkDetail/networkDetail.js b/unpackage/dist/dev/mp-weixin/pages/networkDetail/networkDetail.js
index 110adce..7fd7c0f 100644
--- a/unpackage/dist/dev/mp-weixin/pages/networkDetail/networkDetail.js
+++ b/unpackage/dist/dev/mp-weixin/pages/networkDetail/networkDetail.js
@@ -106,36 +106,36 @@ const _sfc_main = {
             a: index
           };
         }),
-        c: common_vendor.unref(BranchInformationList).image,
-        d: common_vendor.t(common_vendor.unref(BranchInformationList).networkName),
-        e: common_vendor.t(common_vendor.unref(BranchInformationList).networkArea),
-        f: common_vendor.o(isgetsetting),
-        g: common_vendor.t(gongli.value),
-        h: common_vendor.o(preferential),
-        i: common_vendor.f(common_vendor.unref(details), (item, index, i0) => {
+        c: common_vendor.t(common_vendor.unref(BranchInformationList).networkName),
+        d: common_vendor.t(common_vendor.unref(BranchInformationList).networkArea),
+        e: common_vendor.o(isgetsetting),
+        f: common_vendor.t(gongli.value),
+        g: common_vendor.o(preferential),
+        h: common_vendor.f(common_vendor.unref(details), (item, index, i0) => {
           return common_vendor.e({
-            a: item.workStatus != 0 && item.workStatus != 1 && item.warnStatus === 1
+            a: common_vendor.t(index + 1),
+            b: item.workStatus != 0 && item.workStatus != 1 && item.warnStatus === 1
           }, item.workStatus != 0 && item.workStatus != 1 && item.warnStatus === 1 ? {} : {}, {
-            b: item.workStatus === 0
+            c: item.workStatus === 0
           }, item.workStatus === 0 ? {} : {}, {
-            c: item.workStatus === 1
+            d: item.workStatus === 1
           }, item.workStatus === 1 ? {} : {}, {
-            d: item.workStatus === 0
+            e: item.workStatus === 0
           }, item.workStatus === 0 ? {} : {}, {
-            e: item.workStatus === 1
+            f: item.workStatus === 1
           }, item.workStatus === 1 ? {} : {}, {
-            f: item.workStatus === 0 ? 1 : "",
-            g: item.workStatus != 0 && item.workStatus != 1 && item.warnStatus === 1 ? 1 : "",
-            h: item.id
+            g: item.workStatus === 0 ? 1 : "",
+            h: item.workStatus != 0 && item.workStatus != 1 && item.warnStatus === 1 ? 1 : "",
+            i: item.id
           });
         }),
-        j: common_vendor.o(($event) => hujiao.value = 1),
-        k: common_vendor.o(goRecharge),
-        l: common_vendor.o(secnd),
-        m: hujiao.value === 1
+        i: common_vendor.o(($event) => hujiao.value = 1),
+        j: common_vendor.o(goRecharge),
+        k: common_vendor.o(secnd),
+        l: hujiao.value === 1
       }, hujiao.value === 1 ? {
-        n: common_vendor.o(($event) => hujiao.value = 0),
-        o: common_vendor.o(dianhua)
+        m: common_vendor.o(($event) => hujiao.value = 0),
+        n: common_vendor.o(dianhua)
       } : {});
     };
   }
diff --git a/unpackage/dist/dev/mp-weixin/pages/networkDetail/networkDetail.wxml b/unpackage/dist/dev/mp-weixin/pages/networkDetail/networkDetail.wxml
index 47bee93..da5b7ef 100644
--- a/unpackage/dist/dev/mp-weixin/pages/networkDetail/networkDetail.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/networkDetail/networkDetail.wxml
@@ -1 +1 @@
-<navigation-style wx:if="{{a}}" u-i="7e380b4e-0" bind:__l="__l" u-p="{{a}}"></navigation-style><scroll-view scroll-y="true" class="networkDetail"><view class="ding"></view><view class="uni-margin-wrap"><swiper class="swiper" autoplay="{{true}}" indicator-dots="{{true}}" indicator-color="rgba(220,192,203,1)" indicator-active-color="rgba(255,255,255,1)"><swiper-item wx:for="{{b}}" wx:for-item="item" wx:key="a" class="swiper-item"><image src="{{c}}" class="img" alt=""/></swiper-item></swiper></view><view class="boxs"><view class="mapWindow"><view class="l"><view class="title"><text class="t">{{d}}</text><text class="r">正常营业</text></view><view class="c"><image class="c-img" src="https://www.jiubaotongxue.love/image/demo28.png" alt=""/>{{e}}</view><view class="datas-navigation"><view class="left-d"><image class="i" src="https://www.jiubaotongxue.love/image/demo29.png" alt=""/><text class="colors">营业时间：08:12-12:23</text></view></view><view class="datas-state"><view class="sum"> 24小时营业 </view><view class="surplus"> 出入无忧 </view></view></view><view class="right-m" bindtap="{{f}}"><view class="box"><image class="ic" src="https://www.jiubaotongxue.love/image/demo10.png" alt=""/><view class="txt"> 导航 </view></view></view><view class="txtRight"> 距离您{{g}}km </view></view><view class="nav-title" bindtap="{{h}}"><image class="nav-img-left" src="https://www.jiubaotongxue.love/image/demo7.png" alt=""/><text class="t">团购核销入口</text><view class="nav-btn"> 进入 </view></view></view><view class="state"><view class="title"><view class="lines"></view><text class="txt">洗车工位</text></view><view class="machine"><view wx:for="{{i}}" wx:for-item="item" wx:key="h" class="machine-flex"><image class="i" src="https://www.jiubaotongxue.love/image/demo27.png" alt=""/><view class="t"><text class="t-left">车位1</text><text wx:if="{{item.a}}" class="t-right">维修无法使用</text><text wx:if="{{item.b}}" class="t-right">直接清洗</text><text wx:if="{{item.c}}" class="t-right">正在清洗</text></view><view class="{{['flex-box', item.f && 'iSshow1', item.g && 'iSshow2']}}"><text wx:if="{{item.d}}">空闲中</text><text wx:if="{{item.e}}">使用中</text></view></view><view class="ding"></view></view></view><view class="netBottom"><view class="netBottom-left" bindtap="{{j}}"><image class="left-img" src="https://www.jiubaotongxue.love/image/demo30.png" alt=""/><text>联系门店</text></view><view class="netBottom-right"><view class="left" bindtap="{{k}}"> 门店充值 </view><view class="right" bindtap="{{l}}"> 扫码下单 </view></view></view></scroll-view><view wx:if="{{m}}" class="hujiao"><view class="windows-hujiao"><image class="i" src="https://www.jiubaotongxue.love/image/demo76.png" alt=""/><view class="ke"> 客服电话 </view><view class="ke1"> 176-0532-6897 </view><view class="ke3"><button class="lefts" bindtap="{{n}}">取消</button><button class="rights" bindtap="{{o}}">立即呼叫</button></view><view class="ke4"> 为了保证服务质量，您的通话可能会被录音 </view></view></view>
\ No newline at end of file
+<navigation-style wx:if="{{a}}" u-i="7e380b4e-0" bind:__l="__l" u-p="{{a}}"></navigation-style><scroll-view scroll-y="true" class="networkDetail"><view class="ding"></view><view class="uni-margin-wrap"><swiper class="swiper" autoplay="{{true}}" indicator-dots="{{true}}" indicator-color="rgba(220,192,203,1)" indicator-active-color="rgba(255,255,255,1)"><swiper-item wx:for="{{b}}" wx:for-item="item" wx:key="a" class="swiper-item"><image src="https://www.jiubaotongxue.love/image/shou1.png" class="img" alt=""/></swiper-item></swiper></view><view class="boxs"><view class="mapWindow"><view class="l"><view class="title"><text class="t">{{c}}</text><text class="r">正常营业</text></view><view class="c"><image class="c-img" src="https://www.jiubaotongxue.love/image/demo28.png" alt=""/>{{d}}</view><view class="datas-navigation"><view class="left-d"><image class="i" src="https://www.jiubaotongxue.love/image/demo29.png" alt=""/><text class="colors">营业时间：08:12-12:23</text></view></view><view class="datas-state"><view class="sum"> 24小时营业 </view><view class="surplus"> 出入无忧 </view></view></view><view class="right-m" bindtap="{{e}}"><view class="box"><image class="ic" src="https://www.jiubaotongxue.love/image/demo10.png" alt=""/><view class="txt"> 导航 </view></view></view><view class="txtRight"> 距离您{{f}}km </view></view><view class="nav-title" bindtap="{{g}}"><image class="nav-img-left" src="https://www.jiubaotongxue.love/image/demo7.png" alt=""/><text class="t">团购核销入口</text><view class="nav-btn"> 进入 </view></view></view><view class="state"><view class="title"><view class="lines"></view><text class="txt">洗车工位</text></view><view class="machine"><view wx:for="{{h}}" wx:for-item="item" wx:key="i" class="machine-flex"><image class="i" src="https://www.jiubaotongxue.love/image/demo27.png" alt=""/><view class="t"><text class="t-left">车位{{item.a}}</text><text wx:if="{{item.b}}" class="t-right">维修无法使用</text><text wx:if="{{item.c}}" class="t-right">直接清洗</text><text wx:if="{{item.d}}" class="t-right">正在清洗</text></view><view class="{{['flex-box', item.g && 'iSshow1', item.h && 'iSshow2']}}"><text wx:if="{{item.e}}">空闲中</text><text wx:if="{{item.f}}">使用中</text></view></view><view class="ding"></view></view></view><view class="netBottom"><view class="netBottom-left" bindtap="{{i}}"><image class="left-img" src="https://www.jiubaotongxue.love/image/demo30.png" alt=""/><text>联系门店</text></view><view class="netBottom-right"><view class="left" bindtap="{{j}}"> 门店充值 </view><view class="right" bindtap="{{k}}"> 扫码下单 </view></view></view></scroll-view><view wx:if="{{l}}" class="hujiao"><view class="windows-hujiao"><image class="i" src="https://www.jiubaotongxue.love/image/demo76.png" alt=""/><view class="ke"> 客服电话 </view><view class="ke1"> 176-0532-6897 </view><view class="ke3"><button class="lefts" bindtap="{{m}}">取消</button><button class="rights" bindtap="{{n}}">立即呼叫</button></view><view class="ke4"> 为了保证服务质量，您的通话可能会被录音 </view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/orderForm/orderForm.js b/unpackage/dist/dev/mp-weixin/pages/orderForm/orderForm.js
index bfcdd82..649843b 100644
--- a/unpackage/dist/dev/mp-weixin/pages/orderForm/orderForm.js
+++ b/unpackage/dist/dev/mp-weixin/pages/orderForm/orderForm.js
@@ -23,16 +23,19 @@ const _sfc_main = {
     const bgcolor = common_vendor.ref("#fff");
     const color = common_vendor.ref("#000");
     const shibai = common_vendor.ref(0);
+    const hujiao = common_vendor.ref(0);
     o.getOrders();
     const closeShibai = () => {
       shibai.value = 0;
     };
-    const openClose = () => {
-      shibai.value = 1;
-    };
     const tagBtn = (index) => {
       tagIndex.value = index;
     };
+    const dianhua = () => {
+      common_vendor.index.makePhoneCall({
+        phoneNumber: "17605326897"
+      });
+    };
     return (_ctx, _cache) => {
       return common_vendor.e({
         a: common_vendor.p({
@@ -52,30 +55,38 @@ const _sfc_main = {
       }, tagIndex.value === 0 ? {
         d: common_vendor.f(common_vendor.unref(orders), (item, index, i0) => {
           return common_vendor.e({
-            a: item.status === 1
+            a: common_vendor.t(item.orderId),
+            b: item.status === 1
           }, item.status === 1 ? {} : {}, {
-            b: item.status === 2
+            c: item.status === 2
           }, item.status === 2 ? {} : {}, {
-            c: item.status === 3
+            d: item.status === 3
           }, item.status === 3 ? {} : {}, {
-            d: item.status === 0
+            e: item.status === 0
           }, item.status === 0 ? {} : {}, {
-            e: common_vendor.t(item.networkName),
-            f: common_vendor.t(item.goodsName),
-            g: common_vendor.t(item.orderTime),
-            h: common_vendor.t(item.amount),
-            i: common_vendor.t(item.amount),
-            j: item.status === 1
-          }, item.status === 1 ? {} : {}, {
-            k: item.status === 2
+            f: common_vendor.t(item.networkName),
+            g: item.goodsName != "未查询到该商品"
+          }, item.goodsName != "未查询到该商品" ? {
+            h: common_vendor.t(item.goodsName)
+          } : {}, {
+            i: item.goodsName === "未查询到该商品"
+          }, item.goodsName === "未查询到该商品" ? {} : {}, {
+            j: common_vendor.t(item.orderTime),
+            k: item.deviceId != null
+          }, item.deviceId != null ? {
+            l: common_vendor.t(item.deviceId ? item.deviceId : "")
+          } : {}, {
+            m: common_vendor.t(item.amount),
+            n: common_vendor.t(item.amount),
+            o: item.status === 1
+          }, item.status === 1 ? {
+            p: common_vendor.o(($event) => hujiao.value = 1, item.id)
+          } : {}, {
+            q: item.status === 2
           }, item.status === 2 ? {} : {}, {
-            l: item.status === 3
+            r: item.status === 3
           }, item.status === 3 ? {} : {}, {
-            m: item.status === 0
-          }, item.status === 0 ? {
-            n: common_vendor.o(openClose, item.id)
-          } : {}, {
-            o: item.id
+            s: item.id
           });
         })
       } : {}, {
@@ -85,16 +96,28 @@ const _sfc_main = {
           return common_vendor.e({
             a: item.status === 1
           }, item.status === 1 ? common_vendor.e({
-            b: item.status === 1
+            b: common_vendor.t(item.orderId),
+            c: item.status === 1
           }, item.status === 1 ? {} : {}, {
-            c: common_vendor.t(item.networkName),
-            d: common_vendor.t(item.goodsName),
-            e: common_vendor.t(item.orderTime),
-            f: common_vendor.t(item.amount),
-            g: common_vendor.t(item.amount),
-            h: item.status === 1
-          }, item.status === 1 ? {} : {}) : {}, {
-            i: item.id
+            d: common_vendor.t(item.networkName),
+            e: item.goodsName != "未查询到该商品"
+          }, item.goodsName != "未查询到该商品" ? {
+            f: common_vendor.t(item.goodsName)
+          } : {}, {
+            g: item.goodsName === "未查询到该商品"
+          }, item.goodsName === "未查询到该商品" ? {} : {}, {
+            h: common_vendor.t(item.orderTime),
+            i: item.deviceId != null
+          }, item.deviceId != null ? {
+            j: common_vendor.t(item.deviceId ? item.deviceId : "")
+          } : {}, {
+            k: common_vendor.t(item.amount),
+            l: common_vendor.t(item.amount),
+            m: item.status === 1
+          }, item.status === 1 ? {
+            n: common_vendor.o(($event) => hujiao.value = 1, item.id)
+          } : {}) : {}, {
+            o: item.id
           });
         })
       } : {}, {
@@ -104,16 +127,26 @@ const _sfc_main = {
           return common_vendor.e({
             a: item.status === 2
           }, item.status === 2 ? common_vendor.e({
-            b: item.status === 2
+            b: common_vendor.t(item.orderId),
+            c: item.status === 2
           }, item.status === 2 ? {} : {}, {
-            c: common_vendor.t(item.networkName),
-            d: common_vendor.t(item.goodsName),
-            e: common_vendor.t(item.orderTime),
-            f: common_vendor.t(item.amount),
-            g: common_vendor.t(item.amount),
-            h: item.status === 2
+            d: common_vendor.t(item.networkName),
+            e: item.goodsName != "未查询到该商品"
+          }, item.goodsName != "未查询到该商品" ? {
+            f: common_vendor.t(item.goodsName)
+          } : {}, {
+            g: item.goodsName === "未查询到该商品"
+          }, item.goodsName === "未查询到该商品" ? {} : {}, {
+            h: common_vendor.t(item.orderTime),
+            i: item.deviceId != null
+          }, item.deviceId != null ? {
+            j: common_vendor.t(item.deviceId ? item.deviceId : "")
+          } : {}, {
+            k: common_vendor.t(item.amount),
+            l: common_vendor.t(item.amount),
+            m: item.status === 2
           }, item.status === 2 ? {} : {}) : {}, {
-            i: item.id
+            n: item.id
           });
         })
       } : {}, {
@@ -123,16 +156,26 @@ const _sfc_main = {
           return common_vendor.e({
             a: item.status === 3
           }, item.status === 3 ? common_vendor.e({
-            b: item.status === 3
+            b: common_vendor.t(item.orderId),
+            c: item.status === 3
           }, item.status === 3 ? {} : {}, {
-            c: common_vendor.t(item.networkName),
-            d: common_vendor.t(item.goodsName),
-            e: common_vendor.t(item.orderTime),
-            f: common_vendor.t(item.amount),
-            g: common_vendor.t(item.amount),
-            h: item.status === 3
+            d: common_vendor.t(item.networkName),
+            e: item.goodsName != "未查询到该商品"
+          }, item.goodsName != "未查询到该商品" ? {
+            f: common_vendor.t(item.goodsName)
+          } : {}, {
+            g: item.goodsName === "未查询到该商品"
+          }, item.goodsName === "未查询到该商品" ? {} : {}, {
+            h: common_vendor.t(item.orderTime),
+            i: item.deviceId != null
+          }, item.deviceId != null ? {
+            j: common_vendor.t(item.deviceId ? item.deviceId : "")
+          } : {}, {
+            k: common_vendor.t(item.amount),
+            l: common_vendor.t(item.amount),
+            m: item.status === 3
           }, item.status === 3 ? {} : {}) : {}, {
-            i: item.id
+            n: item.id
           });
         })
       } : {}, {
@@ -142,24 +185,36 @@ const _sfc_main = {
           return common_vendor.e({
             a: item.status === 0
           }, item.status === 0 ? common_vendor.e({
-            b: item.status === 0
+            b: common_vendor.t(item.orderId),
+            c: item.status === 0
           }, item.status === 0 ? {} : {}, {
-            c: common_vendor.t(item.networkName),
-            d: common_vendor.t(item.goodsName),
-            e: common_vendor.t(item.orderTime),
-            f: common_vendor.t(item.amount),
-            g: common_vendor.t(item.amount),
-            h: item.status === 0
-          }, item.status === 0 ? {
-            i: common_vendor.o(openClose, item.id)
-          } : {}) : {}, {
-            j: item.id
+            d: common_vendor.t(item.networkName),
+            e: item.goodsName != "未查询到该商品"
+          }, item.goodsName != "未查询到该商品" ? {
+            f: common_vendor.t(item.goodsName)
+          } : {}, {
+            g: item.goodsName === "未查询到该商品"
+          }, item.goodsName === "未查询到该商品" ? {} : {}, {
+            h: common_vendor.t(item.orderTime),
+            i: item.deviceId != null
+          }, item.deviceId != null ? {
+            j: common_vendor.t(item.deviceId ? item.deviceId : "")
+          } : {}, {
+            k: common_vendor.t(item.amount),
+            l: common_vendor.t(item.amount)
+          }) : {}, {
+            m: item.id
           });
         })
       } : {}, {
         m: shibai.value === 1
       }, shibai.value === 1 ? {
         n: common_vendor.o(closeShibai)
+      } : {}, {
+        o: hujiao.value === 1
+      }, hujiao.value === 1 ? {
+        p: common_vendor.o(($event) => hujiao.value = 0),
+        q: common_vendor.o(dianhua)
       } : {});
     };
   }
diff --git a/unpackage/dist/dev/mp-weixin/pages/orderForm/orderForm.wxml b/unpackage/dist/dev/mp-weixin/pages/orderForm/orderForm.wxml
index 20ac0cd..11e18d8 100644
--- a/unpackage/dist/dev/mp-weixin/pages/orderForm/orderForm.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/orderForm/orderForm.wxml
@@ -1 +1 @@
-<navigation-style wx:if="{{a}}" u-i="27e66fbf-0" bind:__l="__l" u-p="{{a}}"></navigation-style><scroll-view class="orderForm" scroll-y="true"><view class="tops"></view><view class="orderForm-h"><view wx:for="{{b}}" wx:for-item="item" wx:key="c" class="txt" bindtap="{{item.d}}"><text class="{{['txt-a', item.b && 'active']}}">{{item.a}}</text></view></view><view class="ding-h"></view><block wx:if="{{c}}"><view wx:for="{{d}}" wx:for-item="item" wx:key="o" class="order-box"><view class="orderForm-b"><view class="orderForm-b-t"><text>订单:xxxxxxxxxxxxxx</text> <text wx:if="{{item.a}}" class="blues">进行中</text><text wx:if="{{item.b}}" class="greens">已完成</text><text wx:if="{{item.c}}" class="greensa">已退款</text><text wx:if="{{item.d}}" class="reds">未支付</text></view><view class="orderForm-b-b"><image class="b-b-i" src="https://www.jiubaotongxue.love/image/demo91.png" alt=""/><view class="b-b-r"><view class="b-b-r-t"><text class="maxs">{{item.e}}</text></view><view class="b-b-r-b">{{item.f}}<text>X1</text></view><view class="b-b-r-b">{{item.g}}</view><view class="b-b-r-cs"> 设备001 </view></view></view><view class="orderForm-b-m"><text class="blacsa">原价￥ <text class="bla">{{item.h}}</text></text> <text class="blu">实付款￥<text class="blues">{{item.i}}</text></text><view wx:if="{{item.j}}" class="btns"> 申请退款 </view><view wx:if="{{item.k}}" class="btnas"></view><view wx:if="{{item.l}}" class="btnst"></view><view wx:if="{{item.m}}" class="btnsc" bindtap="{{item.n}}"> 查看原因 </view></view></view></view></block><block wx:if="{{e}}"><view wx:for="{{f}}" wx:for-item="item" wx:key="i" class="order-box"><view wx:if="{{item.a}}" class="orderForm-b"><view class="orderForm-b-t"><text>订单:xxxxxxxxxxxxxx</text> <text wx:if="{{item.b}}" class="blues">进行中</text></view><view class="orderForm-b-b"><image class="b-b-i" src="https://www.jiubaotongxue.love/image/demo91.png" alt=""/><view class="b-b-r"><view class="b-b-r-t"><text class="maxs">{{item.c}}</text></view><view class="b-b-r-b">{{item.d}}<text>X1</text></view><view class="b-b-r-b">{{item.e}}</view><view class="b-b-r-cs"> 设备001 </view></view></view><view class="orderForm-b-m"><text class="blacsa">原价￥ <text class="bla">{{item.f}}</text></text> <text class="blu">实付款￥<text class="blues">{{item.g}}</text></text><view wx:if="{{item.h}}" class="btns"> 申请退款 </view></view></view></view></block><block wx:if="{{g}}"><view wx:for="{{h}}" wx:for-item="item" wx:key="i" class="order-box"><view wx:if="{{item.a}}" class="orderForm-b"><view class="orderForm-b-t"><text>订单:xxxxxxxxxxxxxx</text><text wx:if="{{item.b}}" class="greens">已完成</text></view><view class="orderForm-b-b"><image class="b-b-i" src="https://www.jiubaotongxue.love/image/demo91.png" alt=""/><view class="b-b-r"><view class="b-b-r-t"><text class="maxs">{{item.c}}</text></view><view class="b-b-r-b">{{item.d}}<text>X1</text></view><view class="b-b-r-b">{{item.e}}</view><view class="b-b-r-cs"> 设备001 </view></view></view><view class="orderForm-b-m"><text class="blacsa">原价￥ <text class="bla">{{item.f}}</text></text> <text class="blu">实付款￥<text class="blues">{{item.g}}</text></text><view wx:if="{{item.h}}" class="btnas"></view></view></view></view></block><block wx:if="{{i}}"><view wx:for="{{j}}" wx:for-item="item" wx:key="i" class="order-box"><view wx:if="{{item.a}}" class="orderForm-b"><view class="orderForm-b-t"><text>订单:xxxxxxxxxxxxxx</text><text wx:if="{{item.b}}" class="greensa">已退款</text></view><view class="orderForm-b-b"><image class="b-b-i" src="https://www.jiubaotongxue.love/image/demo91.png" alt=""/><view class="b-b-r"><view class="b-b-r-t"><text class="maxs">{{item.c}}</text></view><view class="b-b-r-b">{{item.d}}<text>X1</text></view><view class="b-b-r-b">{{item.e}}</view><view class="b-b-r-cs"> 设备001 </view></view></view><view class="orderForm-b-m"><text class="blacsa">原价￥ <text class="bla">{{item.f}}</text></text> <text class="blu">实付款￥<text class="blues">{{item.g}}</text></text><view wx:if="{{item.h}}" class="btnst"></view></view></view></view></block><block wx:if="{{k}}"><view wx:for="{{l}}" wx:for-item="item" wx:key="j" class="order-box"><view wx:if="{{item.a}}" class="orderForm-b"><view class="orderForm-b-t"><text>订单:xxxxxxxxxxxxxx</text><text wx:if="{{item.b}}" class="reds">未支付</text></view><view class="orderForm-b-b"><image class="b-b-i" src="https://www.jiubaotongxue.love/image/demo91.png" alt=""/><view class="b-b-r"><view class="b-b-r-t"><text class="maxs">{{item.c}}</text></view><view class="b-b-r-b">{{item.d}}<text>X1</text></view><view class="b-b-r-b">{{item.e}}</view><view class="b-b-r-cs"> 设备001 </view></view></view><view class="orderForm-b-m"><text class="blacsa">原价￥ <text class="bla">{{item.f}}</text></text> <text class="blu">实付款￥<text class="blues">{{item.g}}</text></text><view wx:if="{{item.h}}" class="btnsc" bindtap="{{item.i}}"> 查看原因 </view></view></view></view></block><view class="ding"></view></scroll-view><view wx:if="{{m}}" class="thishiWindow"><view class="tishi"><image class="pori" src="https://www.jiubaotongxue.love/image/demo41.png" alt="" bindtap="{{n}}"/><image class="tishi-Img" src="https://www.jiubaotongxue.love/image/demo40.png" alt=""/><text class="tishiTxt">失败原因</text><text class="tishiHuidu">很抱歉，由于您的信息有误，有部分退款失败,请您确认信息并重新提交</text></view></view>
\ No newline at end of file
+<navigation-style wx:if="{{a}}" u-i="27e66fbf-0" bind:__l="__l" u-p="{{a}}"></navigation-style><scroll-view class="orderForm" scroll-y="true"><view class="tops"></view><view class="orderForm-h"><view wx:for="{{b}}" wx:for-item="item" wx:key="c" class="txt" bindtap="{{item.d}}"><text class="{{['txt-a', item.b && 'active']}}">{{item.a}}</text></view></view><view class="ding-h"></view><block wx:if="{{c}}"><view wx:for="{{d}}" wx:for-item="item" wx:key="s" class="order-box"><view class="orderForm-b"><view class="orderForm-b-t"><text>订单号:{{item.a}}</text> <text wx:if="{{item.b}}" class="blues">进行中</text><text wx:if="{{item.c}}" class="greens">已完成</text><text wx:if="{{item.d}}" class="greensa">已退款</text><text wx:if="{{item.e}}" class="reds">未支付</text></view><view class="orderForm-b-b"><image class="b-b-i" src="https://www.jiubaotongxue.love/image/demo91.png" alt=""/><view class="b-b-r"><view class="b-b-r-t"><text class="maxs">{{item.f}}</text></view><view wx:if="{{item.g}}" class="b-b-r-b">{{item.h}}<text>X1</text></view><view wx:if="{{item.i}}" class="b-b-r-b"> 不限时套餐<text>X1</text></view><view class="b-b-r-b">{{item.j}}</view><view wx:if="{{item.k}}" class="b-b-r-cs">{{item.l}}</view></view></view><view class="orderForm-b-m"><text class="blacsa">原价￥ <text class="bla">{{item.m}}</text></text> <text class="blu">实付款￥<text class="blues">{{item.n}}</text></text><view wx:if="{{item.o}}" class="btns" bindtap="{{item.p}}"> 申请退款 </view><view wx:if="{{item.q}}" class="btnas"></view><view wx:if="{{item.r}}" class="btnst"></view></view></view></view></block><block wx:if="{{e}}"><view wx:for="{{f}}" wx:for-item="item" wx:key="o" class="order-box"><view wx:if="{{item.a}}" class="orderForm-b"><view class="orderForm-b-t"><text>订单号:{{item.b}}</text> <text wx:if="{{item.c}}" class="blues">进行中</text></view><view class="orderForm-b-b"><image class="b-b-i" src="https://www.jiubaotongxue.love/image/demo91.png" alt=""/><view class="b-b-r"><view class="b-b-r-t"><text class="maxs">{{item.d}}</text></view><view wx:if="{{item.e}}" class="b-b-r-b">{{item.f}}<text>X1</text></view><view wx:if="{{item.g}}" class="b-b-r-b"> 不限时套餐<text>X1</text></view><view class="b-b-r-b">{{item.h}}</view><view wx:if="{{item.i}}" class="b-b-r-cs">{{item.j}}</view></view></view><view class="orderForm-b-m"><text class="blacsa">原价￥ <text class="bla">{{item.k}}</text></text> <text class="blu">实付款￥<text class="blues">{{item.l}}</text></text><view wx:if="{{item.m}}" class="btns" bindtap="{{item.n}}"> 申请退款 </view></view></view></view></block><block wx:if="{{g}}"><view wx:for="{{h}}" wx:for-item="item" wx:key="n" class="order-box"><view wx:if="{{item.a}}" class="orderForm-b"><view class="orderForm-b-t"><text>订单号:{{item.b}}</text><text wx:if="{{item.c}}" class="greens">已完成</text></view><view class="orderForm-b-b"><image class="b-b-i" src="https://www.jiubaotongxue.love/image/demo91.png" alt=""/><view class="b-b-r"><view class="b-b-r-t"><text class="maxs">{{item.d}}</text></view><view wx:if="{{item.e}}" class="b-b-r-b">{{item.f}}<text>X1</text></view><view wx:if="{{item.g}}" class="b-b-r-b"> 不限时套餐<text>X1</text></view><view class="b-b-r-b">{{item.h}}</view><view wx:if="{{item.i}}" class="b-b-r-cs">{{item.j}}</view></view></view><view class="orderForm-b-m"><text class="blacsa">原价￥ <text class="bla">{{item.k}}</text></text> <text class="blu">实付款￥<text class="blues">{{item.l}}</text></text><view wx:if="{{item.m}}" class="btnas"></view></view></view></view></block><block wx:if="{{i}}"><view wx:for="{{j}}" wx:for-item="item" wx:key="n" class="order-box"><view wx:if="{{item.a}}" class="orderForm-b"><view class="orderForm-b-t"><text>订单号:{{item.b}}</text><text wx:if="{{item.c}}" class="greensa">已退款</text></view><view class="orderForm-b-b"><image class="b-b-i" src="https://www.jiubaotongxue.love/image/demo91.png" alt=""/><view class="b-b-r"><view class="b-b-r-t"><text class="maxs">{{item.d}}</text></view><view wx:if="{{item.e}}" class="b-b-r-b">{{item.f}}<text>X1</text></view><view wx:if="{{item.g}}" class="b-b-r-b"> 不限时套餐<text>X1</text></view><view class="b-b-r-b">{{item.h}}</view><view wx:if="{{item.i}}" class="b-b-r-cs">{{item.j}}</view></view></view><view class="orderForm-b-m"><text class="blacsa">原价￥ <text class="bla">{{item.k}}</text></text> <text class="blu">实付款￥<text class="blues">{{item.l}}</text></text><view wx:if="{{item.m}}" class="btnst"></view></view></view></view></block><block wx:if="{{k}}"><view wx:for="{{l}}" wx:for-item="item" wx:key="m" class="order-box"><view wx:if="{{item.a}}" class="orderForm-b"><view class="orderForm-b-t"><text>订单号:{{item.b}}</text><text wx:if="{{item.c}}" class="reds">未支付</text></view><view class="orderForm-b-b"><image class="b-b-i" src="https://www.jiubaotongxue.love/image/demo91.png" alt=""/><view class="b-b-r"><view class="b-b-r-t"><text class="maxs">{{item.d}}</text></view><view wx:if="{{item.e}}" class="b-b-r-b">{{item.f}}<text>X1</text></view><view wx:if="{{item.g}}" class="b-b-r-b"> 不限时套餐<text>X1</text></view><view class="b-b-r-b">{{item.h}}</view><view wx:if="{{item.i}}" class="b-b-r-cs">{{item.j}}</view></view></view><view class="orderForm-b-m"><text class="blacsa">原价￥ <text class="bla">{{item.k}}</text></text> <text class="blu">实付款￥<text class="blues">{{item.l}}</text></text></view></view></view></block><view class="ding"></view></scroll-view><view wx:if="{{m}}" class="thishiWindow"><view class="tishi"><image class="pori" src="https://www.jiubaotongxue.love/image/demo41.png" alt="" bindtap="{{n}}"/><image class="tishi-Img" src="https://www.jiubaotongxue.love/image/demo40.png" alt=""/><text class="tishiTxt">失败原因</text><text class="tishiHuidu">很抱歉，由于您的信息有误，有部分退款失败,请您确认信息并重新提交</text></view></view><view wx:if="{{o}}" class="hujiao"><view class="windows-hujiao"><image class="i" src="https://www.jiubaotongxue.love/image/demo76.png" alt=""/><view class="ke"> 客服电话 </view><view class="ke1"> 176-0532-6897 </view><view class="ke3"><button class="lefts" bindtap="{{p}}">取消</button><button class="rights" bindtap="{{q}}">立即呼叫</button></view><view class="ke4"> 为了保证服务质量，您的通话可能会被录音 </view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/orderForm/orderForm.wxss b/unpackage/dist/dev/mp-weixin/pages/orderForm/orderForm.wxss
index 0bf6c22..a3ad9d3 100644
--- a/unpackage/dist/dev/mp-weixin/pages/orderForm/orderForm.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/orderForm/orderForm.wxss
@@ -141,7 +141,7 @@
   color: #777;
 }
 .orderForm .order-box .orderForm-b .orderForm-b-b .b-b-r .b-b-r-cs {
-  width: 120rpx;
+  max-width: 260rpx;
   font-size: 22rpx;
   color: #169bd5;
   border: 1rpx solid #169bd5;
@@ -251,4 +251,81 @@
   box-sizing: border-box;
   padding-left: 40rpx;
   padding-right: 40rpx;
+}
+.hujiao {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0rpx;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 99;
+}
+.hujiao .windows-hujiao {
+  width: 630rpx;
+  height: 614rpx;
+  background: #FFFFFF;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  border-radius: 20rpx 20rpx 20rpx 20rpx;
+}
+.hujiao .windows-hujiao .i {
+  width: 320rpx;
+  height: 258rpx;
+  margin-top: 40rpx;
+  transform: translateX(-50%);
+  margin-left: 50%;
+}
+.hujiao .windows-hujiao .ke {
+  width: 100%;
+  text-align: center;
+  height: 36rpx;
+  font-size: 26rpx;
+  color: #1276F7;
+  line-height: 36rpx;
+  margin-top: 24rpx;
+}
+.hujiao .windows-hujiao .ke1 {
+  width: 100%;
+  text-align: center;
+  height: 66rpx;
+  font-weight: 600;
+  font-size: 48rpx;
+  color: #222222;
+  line-height: 66rpx;
+  margin-top: 16rpx;
+}
+.hujiao .windows-hujiao .ke3 {
+  width: 90%;
+  height: 68rpx;
+  transform: translateX(-50%);
+  margin-left: 50%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 24rpx;
+}
+.hujiao .windows-hujiao .ke3 .lefts {
+  width: 266rpx;
+  height: 68rpx;
+  font-size: 26rpx;
+  background-color: #ffffff;
+  border: 1rpx solid #eee;
+}
+.hujiao .windows-hujiao .ke3 .rights {
+  width: 266rpx;
+  height: 68rpx;
+  font-size: 26rpx;
+  background: linear-gradient(270deg, #25A5FF 0%, #0177FF 100%);
+  color: white;
+}
+.hujiao .windows-hujiao .ke4 {
+  width: 100%;
+  height: 32rpx;
+  font-size: 22rpx;
+  color: #666666;
+  line-height: 32rpx;
+  text-align: center;
+  margin-top: 20rpx;
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/recharge/recharge.wxss b/unpackage/dist/dev/mp-weixin/pages/recharge/recharge.wxss
index b6d8903..64d1273 100644
--- a/unpackage/dist/dev/mp-weixin/pages/recharge/recharge.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/recharge/recharge.wxss
@@ -294,9 +294,10 @@
 }
 .charge .charge-btnPlay {
   position: fixed;
-  bottom: 0rpx;
-  width: 100%;
+  width: 90%;
   height: 100rpx;
+  transform: translateX(-50%);
+  margin-left: 50%;
   background: linear-gradient(276deg, #1C9FF7 0%, #1275F7 100%);
   box-shadow: 0rpx 8rpx 18rpx 0rpx rgba(5, 128, 255, 0.2);
   border-radius: 50rpx;
@@ -306,4 +307,5 @@
   line-height: 100rpx;
   font-size: 30rpx;
   color: white;
+  margin-bottom: 80rpx;
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/rechargeNetwork/rechargeNetwork.js b/unpackage/dist/dev/mp-weixin/pages/rechargeNetwork/rechargeNetwork.js
index 074d270..b917e49 100644
--- a/unpackage/dist/dev/mp-weixin/pages/rechargeNetwork/rechargeNetwork.js
+++ b/unpackage/dist/dev/mp-weixin/pages/rechargeNetwork/rechargeNetwork.js
@@ -18,13 +18,13 @@ const _sfc_main = {
     } = common_vendor.storeToRefs(l);
     l.getNetworks();
     console.log(netWorkList);
-    const titles = common_vendor.ref("附近洗车点");
+    const titles = common_vendor.ref("附近门店");
     const bgcolor = common_vendor.ref("#aaa");
     const color = common_vendor.ref("#000");
     common_vendor.ref([0, 1, 2, 3, 4, 5]);
     const networkIndex = common_vendor.ref(0);
     common_vendor.onLoad(() => {
-      titles.value = "附近洗车点";
+      titles.value = "附近门店";
       bgcolor.value = "#fff";
       color.value = "#000";
     });
diff --git a/unpackage/dist/dev/mp-weixin/pages/rechargeNetwork/rechargeNetwork.wxml b/unpackage/dist/dev/mp-weixin/pages/rechargeNetwork/rechargeNetwork.wxml
index 0226f8d..2ebd151 100644
--- a/unpackage/dist/dev/mp-weixin/pages/rechargeNetwork/rechargeNetwork.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/rechargeNetwork/rechargeNetwork.wxml
@@ -1 +1 @@
-<navigation-style wx:if="{{a}}" u-i="9ec1dfae-0" bind:__l="__l" u-p="{{a}}"></navigation-style><view class="handle"><view class="top"></view><view class="header"><view class="seach"><text class="lefts">洗车</text><view class="rights"><image class="i" src="https://www.jiubaotongxue.love/image/seach.png" alt=""/><input class="inp" type="text" name="" id="" placeholder="请输入商家名称"></input></view></view></view><view class="header-two"></view><scroll-view scroll-y="true" class="auto-body"><view class="boxs"><view wx:for="{{b}}" wx:for-item="item" wx:key="g" class="boxs-flex" bindtap="{{item.h}}"><image class="i" src="{{item.a}}" alt=""/><view class="right-flex"><view class="title"><text>{{item.b}}</text><view class="title-right"><image class="title-right-i" src="https://www.jiubaotongxue.love/image/handle4.png" alt=""/><text>{{item.c}}km</text></view></view><view class="centers"><image class="centers-i" src="https://www.jiubaotongxue.love/image/handle3.png" alt=""/><text class="flex-centers-txt">{{item.d}}</text></view><view class="centers1"><view class="centers-i-l"><image class="centers-i-l-i" src="https://www.jiubaotongxue.love/image/handle3.png" alt=""/><text class="txt">营业时间：00:00-23:59   </text></view></view><view class="bottoms"><view class="lefta"> 总工位:{{item.e}}</view><view class="righta"> 空闲:{{item.f}}</view></view></view></view></view></scroll-view></view><view wx:if="{{c}}" class="promptbgk"><view class="prompt"><view class="prompt-title"> 温馨提示 </view><view class="prompt-body"> 门店暂未开通充值优惠，请在平台上办理 </view><view class="prompt-bottom"><view class="left-btn" bindtap="{{d}}"> 取消 </view><view class="right-btn" bindtap="{{e}}"> 确定 </view></view></view></view>
\ No newline at end of file
+<navigation-style wx:if="{{a}}" u-i="9ec1dfae-0" bind:__l="__l" u-p="{{a}}"></navigation-style><view class="handle"><view class="top"></view><view class="header"><view class="seach"><text class="lefts">洗车</text><view class="rights"><image class="i" src="https://www.jiubaotongxue.love/image/seach.png" alt=""/><input class="inp" type="text" name="" id="" placeholder="请输入商家名称"></input></view></view></view><view class="header-two"></view><scroll-view scroll-y="true" class="auto-body"><view class="boxs"><view wx:for="{{b}}" wx:for-item="item" wx:key="g" class="boxs-flex" bindtap="{{item.h}}"><image class="i" src="{{item.a}}" alt=""/><view class="right-flex"><view class="title"><text>{{item.b}}</text><view class="title-right"><image class="title-right-i" src="https://www.jiubaotongxue.love/image/map2.png" alt=""/><text>{{item.c}}km</text></view></view><view class="centers"><image class="centers-i" src="https://www.jiubaotongxue.love/image/handle4.png" alt=""/><text class="flex-centers-txt">{{item.d}}</text></view><view class="centers1"><view class="centers-i-l"><image class="centers-i-l-i" src="https://www.jiubaotongxue.love/image/demo29.png" alt=""/><text class="txt">营业时间：00:00-23:59   </text></view></view><view class="bottoms"><view class="lefta"> 总工位:{{item.e}}</view><view class="righta"> 空闲:{{item.f}}</view></view></view></view></view></scroll-view></view><view wx:if="{{c}}" class="promptbgk"><view class="prompt"><view class="prompt-title"> 温馨提示 </view><view class="prompt-body"> 门店暂未开通充值优惠，请在平台上办理 </view><view class="prompt-bottom"><view class="left-btn" bindtap="{{d}}"> 取消 </view><view class="right-btn" bindtap="{{e}}"> 确定 </view></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/rechargeNetwork/rechargeNetwork.wxss b/unpackage/dist/dev/mp-weixin/pages/rechargeNetwork/rechargeNetwork.wxss
index 61a1f66..80a0a98 100644
--- a/unpackage/dist/dev/mp-weixin/pages/rechargeNetwork/rechargeNetwork.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/rechargeNetwork/rechargeNetwork.wxss
@@ -113,8 +113,8 @@
 }
 .handle .auto-body .boxs .boxs-flex .i {
   width: 184rpx;
-  height: 184rpx;
-  margin-left: 30rpx;
+  height: 164rpx;
+  margin-left: 36rpx;
   border-radius: 10rpx;
 }
 .handle .auto-body .boxs .boxs-flex .right-flex {
@@ -134,7 +134,7 @@
   padding-right: 30rpx;
 }
 .handle .auto-body .boxs .boxs-flex .right-flex .title .title-right {
-  width: 120rpx;
+  width: 160rpx;
   height: 42rpx;
   display: flex;
   align-items: center;
diff --git a/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.js b/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.js
index 4395646..cae02dd 100644
--- a/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.js
+++ b/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.js
@@ -1,6 +1,7 @@
 "use strict";
 const common_vendor = require("../../common/vendor.js");
 const stor_getCard_getCard = require("../../stor/getCard/getCard.js");
+const stor_home_home = require("../../stor/home/home.js");
 if (!Array) {
   const _easycom_navigationStyle2 = common_vendor.resolveComponent("navigationStyle");
   _easycom_navigationStyle2();
@@ -12,6 +13,7 @@ if (!Math) {
 const _sfc_main = {
   __name: "secondaryCard",
   setup(__props) {
+    const h = stor_home_home.home();
     const c = stor_getCard_getCard.getCard();
     const { cardDataValidCards, cardDataInvalidCards } = common_vendor.storeToRefs(c);
     c.getCards();
@@ -26,6 +28,9 @@ const _sfc_main = {
       headerindex.value = 2;
     };
     common_vendor.ref([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+    const goSencd = () => {
+      h.scanQrcode();
+    };
     return (_ctx, _cache) => {
       return common_vendor.e({
         a: common_vendor.p({
@@ -51,8 +56,10 @@ const _sfc_main = {
             b: common_vendor.t(item.goodsName),
             c: common_vendor.t(item.minute),
             d: common_vendor.t(item.endTime)
-          }, headerindex.value === 1 ? {} : {}, headerindex.value === 2 ? {} : {}, {
-            e: item.id
+          }, headerindex.value === 1 ? {
+            e: common_vendor.o(($event) => goSencd(), item.id)
+          } : {}, headerindex.value === 2 ? {} : {}, {
+            f: item.id
           });
         }),
         l: headerindex.value === 1,
diff --git a/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.wxml b/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.wxml
index 945f96b..77a6260 100644
--- a/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.wxml
@@ -1 +1 @@
-<navigation-style wx:if="{{a}}" u-i="7c737da3-0" bind:__l="__l" u-p="{{a}}"></navigation-style><view class="secondaryCard"><view class="tops"></view><view class="secondBright-header"><view class="{{['header-left', d && 'headerActive']}}" bindtap="{{e}}"> 可用次卡 <view wx:if="{{b}}" class="act"></view><view class="icons">{{c}}</view></view><view class="{{['header-right', h && 'headerActive']}}" bindtap="{{i}}"> 失效次卡 <view wx:if="{{f}}" class="act"></view><view class="icons">{{g}}</view></view></view><scroll-view class="secondaryCard-auto" scroll-y="true"><block wx:if="{{j}}"><view wx:for="{{k}}" wx:for-item="item" wx:key="e" class="card"><text class="reds">剩余<text class="color-r">{{item.a}}</text>次</text><image class="card-l" src="https://www.jiubaotongxue.love/image/demo73.png" alt=""/><view class="card-c"><view class="t"><text class="w"><text class="blacks">{{item.b}}</text></text></view><view class="c"> 每次上限使用{{item.c}}分钟 </view><view class="d"> 生效中,有效期至 {{item.d}}</view></view><view wx:if="{{l}}" class="card-r"> 使用 </view><view wx:if="{{m}}" class="card-r1"></view></view></block><block wx:if="{{n}}"><view wx:for="{{o}}" wx:for-item="item" wx:key="e" class="card"><text class="reds">剩余<text class="color-r">{{item.a}}</text>次</text><image class="card-l" src="https://www.jiubaotongxue.love/image/demo73.png" alt=""/><view class="card-c"><view class="t"><text class="w"><text class="blacks">{{item.b}}</text></text></view><view class="c"> 每次上限使用{{item.c}}分钟 </view><view class="d"> 已失效,有效期至 {{item.d}}</view></view><view wx:if="{{p}}" class="card-r"> 使用 </view><view wx:if="{{q}}" class="card-r1"></view></view></block></scroll-view></view>
\ No newline at end of file
+<navigation-style wx:if="{{a}}" u-i="7c737da3-0" bind:__l="__l" u-p="{{a}}"></navigation-style><view class="secondaryCard"><view class="tops"></view><view class="secondBright-header"><view class="{{['header-left', d && 'headerActive']}}" bindtap="{{e}}"> 可用次卡 <view wx:if="{{b}}" class="act"></view><view class="icons">{{c}}</view></view><view class="{{['header-right', h && 'headerActive']}}" bindtap="{{i}}"> 失效次卡 <view wx:if="{{f}}" class="act"></view><view class="icons">{{g}}</view></view></view><scroll-view class="secondaryCard-auto" scroll-y="true"><block wx:if="{{j}}"><view wx:for="{{k}}" wx:for-item="item" wx:key="f" class="card"><text class="reds">剩余<text class="color-r">{{item.a}}</text>次</text><image class="card-l" src="https://www.jiubaotongxue.love/image/demo73.png" alt=""/><view class="card-c"><view class="t"><text class="w"><text class="blacks">{{item.b}}</text></text></view><view class="c"> 每次上限使用{{item.c}}分钟 </view><view class="d"> 生效中,有效期至 {{item.d}}</view></view><view wx:if="{{l}}" class="card-r" bindtap="{{item.e}}"> 使用 </view><view wx:if="{{m}}" class="card-r1"></view></view></block><block wx:if="{{n}}"><view wx:for="{{o}}" wx:for-item="item" wx:key="e" class="card"><text class="reds">剩余<text class="color-r">{{item.a}}</text>次</text><image class="card-l" src="https://www.jiubaotongxue.love/image/demo73.png" alt=""/><view class="card-c"><view class="t"><text class="w"><text class="blacks">{{item.b}}</text></text></view><view class="c"> 每次上限使用{{item.c}}分钟 </view><view class="d"> 已失效,有效期至 {{item.d}}</view></view><view wx:if="{{p}}" class="card-r"> 使用 </view><view wx:if="{{q}}" class="card-r1"></view></view></block></scroll-view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.wxss b/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.wxss
index 0d0fd5d..c1caed7 100644
--- a/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.wxss
@@ -91,7 +91,7 @@
   left: 250rpx;
 }
 .secondaryCard .secondBright-header .headerActive {
-  color: #009dd9;
+  color: #1378F7;
 }
 .secondaryCard .secondaryCard-auto {
   width: 100%;
diff --git a/unpackage/dist/dev/mp-weixin/pages/tuan/tuan.js b/unpackage/dist/dev/mp-weixin/pages/tuan/tuan.js
index 6a9a611..abc9e95 100644
--- a/unpackage/dist/dev/mp-weixin/pages/tuan/tuan.js
+++ b/unpackage/dist/dev/mp-weixin/pages/tuan/tuan.js
@@ -1,5 +1,6 @@
 "use strict";
 const common_vendor = require("../../common/vendor.js");
+const stor_list_list = require("../../stor/list/list.js");
 if (!Array) {
   const _easycom_navigationStyle2 = common_vendor.resolveComponent("navigationStyle");
   _easycom_navigationStyle2();
@@ -11,10 +12,28 @@ if (!Math) {
 const _sfc_main = {
   __name: "tuan",
   setup(__props) {
-    const demo = common_vendor.ref([0, 1, 2, 3, 4, 5]);
-    const titles = common_vendor.ref("优惠详情");
+    const l = stor_list_list.list();
+    l.getNetworks();
+    const {
+      netWorkList,
+      markers,
+      BranchInformationList
+    } = common_vendor.storeToRefs(l);
+    console.log(netWorkList);
+    const titles = common_vendor.ref("团购兑换");
     const bgcolor = common_vendor.ref("#fff");
     const color = common_vendor.ref("#000");
+    const listIndex = common_vendor.ref(10);
+    const demos = (index) => {
+      listIndex.value = index;
+    };
+    const add = () => {
+      common_vendor.index.showToast({
+        icon: "none",
+        title: "暂未开通",
+        duration: 1e3
+      });
+    };
     return (_ctx, _cache) => {
       return {
         a: common_vendor.p({
@@ -22,10 +41,18 @@ const _sfc_main = {
           bgcolor: bgcolor.value,
           color: color.value
         }),
-        b: common_vendor.f(demo.value, (item, index, i0) => {
+        b: common_vendor.o(add),
+        c: common_vendor.f(common_vendor.unref(netWorkList), (item, index, i0) => {
           return {
-            a: index,
-            b: common_vendor.o((...args) => _ctx.demos && _ctx.demos(...args), index)
+            a: listIndex.value === index ? 1 : "",
+            b: item.image,
+            c: common_vendor.t(item.networkName),
+            d: common_vendor.t(item.gongli),
+            e: common_vendor.t(item.networkArea),
+            f: common_vendor.t(item.special + item.workDevice),
+            g: common_vendor.t(item.special),
+            h: item.id,
+            i: common_vendor.o(($event) => demos(index), item.id)
           };
         })
       };
diff --git a/unpackage/dist/dev/mp-weixin/pages/tuan/tuan.wxml b/unpackage/dist/dev/mp-weixin/pages/tuan/tuan.wxml
index f28a849..91f978f 100644
--- a/unpackage/dist/dev/mp-weixin/pages/tuan/tuan.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/tuan/tuan.wxml
@@ -1 +1 @@
-<navigation-style wx:if="{{a}}" u-i="6fbbd3ce-0" bind:__l="__l" u-p="{{a}}"></navigation-style><view class="preferentialDetail"><view class="tops"></view><image class="first" src="https://www.jiubaotongxue.love/image/demo11.png" alt=""/><view class="box"><view class="titlex"> 兑换说明 </view><view class="body-q"><input class="q-input" type="text" placeholder="请输入兑换码"/><image class="q-img" src="https://www.jiubaotongxue.love/image/demo12.png" alt=""/></view></view><scroll-view scroll-y="true" class="auto-body"><view class="boxs"><view class="seach"><text class="lefts">请选择门店</text><view class="rights"><image class="i" src="{{''}}" alt=""/><input class="inp" type="text" name="" id="" placeholder="请输入商家名称"></input></view></view><view wx:for="{{b}}" wx:for-item="item" wx:key="a" class="boxs-flex" bindtap="{{item.b}}"><view class="checkboxs"><view class="actImg activeImg"></view></view><view class="boxs-flexs"><image class="i" src="{{''}}" alt=""/><view class="right-flex"><view class="title"><text>中石化顺达加油站</text><view class="title-right"><image class="title-right-i" src="https://www.jiubaotongxue.love/image/handle4.png" alt=""/><text>5.4km</text></view></view><view class="centers"><image class="centers-i" src="https://www.jiubaotongxue.love/image/handle3.png" alt=""/><text class="flex-centers-txt">杭州市拱墅区丰庆路750号天悦时代代…</text></view><view class="centers1"><view class="centers-i-l"><image class="centers-i-l-i" src="https://www.jiubaotongxue.love/image/handle3.png" alt=""/><text class="txt">营业时间：00:00-23:59   </text></view><view class="centers-i-l"><image class="centers-i-l-i" src="https://www.jiubaotongxue.love/image/handle3.png" alt=""/><text class="txts">站点维修</text></view></view><view class="bottoms"><view class="lefta"> 总工位:5 </view><view class="righta"> 空闲:5 </view></view></view><view class="abo"> 暂停营业 </view></view></view></view></scroll-view></view>
\ No newline at end of file
+<navigation-style wx:if="{{a}}" u-i="6fbbd3ce-0" bind:__l="__l" u-p="{{a}}"></navigation-style><view class="preferentialDetail"><view class="tops"></view><image class="first" src="https://www.jiubaotongxue.love/image/demo11.png" alt=""/><view class="box"><view class="titlex"> 兑换说明 </view><view class="body-q"><input class="q-input" type="text" placeholder="请输入兑换码"/><image class="q-img" src="https://www.jiubaotongxue.love/image/demo12.png" alt="" bindtap="{{b}}"/></view></view><scroll-view scroll-y="true" class="auto-body"><view class="boxs"><view class="seach"><text class="lefts">请选择门店</text><view class="rights"><image class="i" src="https://www.jiubaotongxue.love/image/seach.png" alt=""/><input class="inp" type="text" name="" id="" placeholder="请输入商家名称"></input></view></view><view wx:for="{{c}}" wx:for-item="item" wx:key="h" class="boxs-flex" bindtap="{{item.i}}"><view class="checkboxs"><view class="{{['actImg', item.a && 'activeImg']}}"></view></view><view class="boxs-flexs"><image class="i" src="{{item.b}}" alt=""/><view class="right-flex"><view class="title"><text>{{item.c}}</text><view class="title-right"><image class="title-right-i" src="https://www.jiubaotongxue.love/image/handle4.png" alt=""/><text>{{item.d}}</text></view></view><view class="centers"><image class="centers-i" src="https://www.jiubaotongxue.love/image/map2.png" alt=""/><text class="flex-centers-txt">{{item.e}}</text></view><view class="centers1"><view class="centers-i-l"><image class="centers-i-l-i" src="https://www.jiubaotongxue.love/image/demo29.png" alt=""/><text class="txt">营业时间：00:00-23:59   </text></view></view><view class="bottoms"><view class="lefta"> 总工位:{{item.f}}</view><view class="righta"> 空闲:{{item.g}}</view></view></view></view></view></view></scroll-view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/tuan/tuan.wxss b/unpackage/dist/dev/mp-weixin/pages/tuan/tuan.wxss
index 87fc252..08b09d2 100644
--- a/unpackage/dist/dev/mp-weixin/pages/tuan/tuan.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/tuan/tuan.wxss
@@ -119,7 +119,6 @@
   width: 34rpx;
   height: 34rpx;
   position: absolute;
-  background-color: red;
   left: 30rpx;
   top: 50%;
   transform: translateY(-50%);
@@ -170,8 +169,8 @@
 }
 .preferentialDetail .auto-body .boxs .boxs-flex .boxs-flexs .i {
   width: 184rpx;
-  height: 184rpx;
-  margin-left: 30rpx;
+  height: 164rpx;
+  margin-left: 36rpx;
 }
 .preferentialDetail .auto-body .boxs .boxs-flex .boxs-flexs .right-flex {
   width: 68%;
diff --git a/unpackage/dist/dev/mp-weixin/pages/vehicle/vehicle.js b/unpackage/dist/dev/mp-weixin/pages/vehicle/vehicle.js
index c592f09..4b84f8c 100644
--- a/unpackage/dist/dev/mp-weixin/pages/vehicle/vehicle.js
+++ b/unpackage/dist/dev/mp-weixin/pages/vehicle/vehicle.js
@@ -22,9 +22,17 @@ const _sfc_main = {
     const color = common_vendor.ref("#000");
     common_vendor.ref(0);
     const addValidate = () => {
-      common_vendor.index.navigateTo({
-        url: "/pages/addValidate/addValidate"
-      });
+      if (carList.value.length >= 3) {
+        common_vendor.index.showToast({
+          icon: "none",
+          title: "已达到最大绑定数量",
+          duration: 1500
+        });
+      } else {
+        common_vendor.index.navigateTo({
+          url: "/pages/addValidate/addValidate"
+        });
+      }
     };
     const deletes = (index) => {
       ac.getDelete(carList.value[index].id);
@@ -38,7 +46,8 @@ const _sfc_main = {
         }),
         b: common_vendor.unref(carList).length > 0
       }, common_vendor.unref(carList).length > 0 ? {
-        c: common_vendor.f(common_vendor.unref(carList), (item, index, i0) => {
+        c: common_vendor.t(common_vendor.unref(carList).length),
+        d: common_vendor.f(common_vendor.unref(carList), (item, index, i0) => {
           return {
             a: common_vendor.t(item.plateNumber),
             b: common_vendor.t(item.phoneNumber),
@@ -49,13 +58,13 @@ const _sfc_main = {
           };
         })
       } : {}, {
-        d: common_vendor.unref(carList).length <= 0
+        e: common_vendor.unref(carList).length <= 0
       }, common_vendor.unref(carList).length <= 0 ? {
-        e: common_vendor.o(addValidate)
+        f: common_vendor.o(addValidate)
       } : {}, {
-        f: common_vendor.unref(carList).length > 0
+        g: common_vendor.unref(carList).length > 0
       }, common_vendor.unref(carList).length > 0 ? {
-        g: common_vendor.o(addValidate)
+        h: common_vendor.o(addValidate)
       } : {});
     };
   }
diff --git a/unpackage/dist/dev/mp-weixin/pages/vehicle/vehicle.wxml b/unpackage/dist/dev/mp-weixin/pages/vehicle/vehicle.wxml
index a919ea7..47ffc69 100644
--- a/unpackage/dist/dev/mp-weixin/pages/vehicle/vehicle.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/vehicle/vehicle.wxml
@@ -1 +1 @@
-<navigation-style wx:if="{{a}}" u-i="0284251a-0" bind:__l="__l" u-p="{{a}}"></navigation-style><view class="vehicle"><view class="tops"></view><view wx:if="{{b}}" class="maxBox"><view class="vehicle-title"> 已绑定2辆<text class="t">最多绑定3辆</text></view><view wx:for="{{c}}" wx:for-item="item" wx:key="f" class="bigs"><view class="{{['box', item.d && 'bgmActive', item.e && 'bgmActives']}}"><image class="cheDemo" src="https://www.jiubaotongxue.love/image/demo13.png" alt=""/><view class="boxDemo"><view class="box-top"><text>微信昵称</text><text class="color-b">{{item.a}}</text></view><view class="box-center"><text>{{item.b}}</text><image class="delete" src="https://www.jiubaotongxue.love/image/demo15.png" alt="" bindtap="{{item.c}}"/></view></view></view></view></view><view wx:if="{{d}}" class="maxBox1"><image class="maxBox1-i" src="https://www.jiubaotongxue.love/image/demo18.png" alt=""/><view class="maxBox1-title"><view class="title-center"> 亲，您当前还没有绑定车辆呢，请您添加车辆信息哦~ </view><view class="tops" bindtap="{{e}}"><text class="add">+</text> <text class="adds">点击绑定爱车</text></view></view></view><view wx:if="{{f}}" class="btns" bindtap="{{g}}"><text class="add">+</text> <text class="adds">添加车辆</text></view></view>
\ No newline at end of file
+<navigation-style wx:if="{{a}}" u-i="0284251a-0" bind:__l="__l" u-p="{{a}}"></navigation-style><view class="vehicle"><view class="tops"></view><view wx:if="{{b}}" class="maxBox"><view class="vehicle-title"> 已绑定{{c}}辆<text class="t">最多绑定3辆</text></view><view wx:for="{{d}}" wx:for-item="item" wx:key="f" class="bigs"><view class="{{['box', item.d && 'bgmActive', item.e && 'bgmActives']}}"><image class="cheDemo" src="https://www.jiubaotongxue.love/image/demo13.png" alt=""/><view class="boxDemo"><view class="box-top"><text>微信昵称</text><text class="color-b">{{item.a}}</text></view><view class="box-center"><text>{{item.b}}</text><image class="delete" src="https://www.jiubaotongxue.love/image/demo15.png" alt="" bindtap="{{item.c}}"/></view></view></view></view></view><view wx:if="{{e}}" class="maxBox1"><image class="maxBox1-i" src="https://www.jiubaotongxue.love/image/demo18.png" alt=""/><view class="maxBox1-title"><view class="title-center"> 亲，您当前还没有绑定车辆呢，请您添加车辆信息哦~ </view><view class="tops" bindtap="{{f}}"><text class="add">+</text> <text class="adds">点击绑定爱车</text></view></view></view><view wx:if="{{g}}" class="btns" bindtap="{{h}}"><text class="add">+</text> <text class="adds">添加车辆</text></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/stor/getCard/getCard.js b/unpackage/dist/dev/mp-weixin/stor/getCard/getCard.js
index 0c73049..f043252 100644
--- a/unpackage/dist/dev/mp-weixin/stor/getCard/getCard.js
+++ b/unpackage/dist/dev/mp-weixin/stor/getCard/getCard.js
@@ -10,7 +10,8 @@ const getCard = common_vendor.defineStore("getCard", () => {
     cardData.value = cardData.value.data;
     cardDataInvalidCards.value = cardData.value.invalidCards;
     cardDataValidCards.value = cardData.value.validCards;
-    console.log(cardDataInvalidCards.value, cardDataValidCards.value);
+    console.log(cardDataInvalidCards.value);
+    console.log(cardDataValidCards.value);
   };
   return {
     cardDataInvalidCards,
diff --git a/unpackage/dist/dev/mp-weixin/stor/index.js b/unpackage/dist/dev/mp-weixin/stor/index.js
index 4bd3a68..4e2d063 100644
--- a/unpackage/dist/dev/mp-weixin/stor/index.js
+++ b/unpackage/dist/dev/mp-weixin/stor/index.js
@@ -54,13 +54,6 @@ const storindex = common_vendor.defineStore("storindex", () => {
       p.value = 0;
     } else {
       console.log("out_trade_no", res);
-      const qaq = await api_api.getTincheCoupons({
-        phoneNumber: common_vendor.index.getStorageSync("phoneNumber")
-      });
-      common_vendor.index.showToast({
-        icon: "none",
-        title: `${qaq.data[0]}`
-      });
       const res1 = await api_api.getWxPlay({
         appId: common_baseurl.appid,
         phone: common_vendor.index.getStorageSync("phoneNumber"),
@@ -117,7 +110,7 @@ const storindex = common_vendor.defineStore("storindex", () => {
               icon: "none",
               title: `${res4.data.statusText},请在我的页面联系客服解决`,
               duration: 1200,
-              success: (res3) => {
+              success: async (res3) => {
                 p.value = 0;
                 common_vendor.index.setStorageSync(
                   "orderid",
@@ -127,6 +120,13 @@ const storindex = common_vendor.defineStore("storindex", () => {
                   "msg",
                   descriptions.value
                 );
+                const qaq = await api_api.getTincheCoupons({
+                  phoneNumber: common_vendor.index.getStorageSync("phoneNumber")
+                });
+                common_vendor.index.showToast({
+                  icon: "none",
+                  title: `${qaq.data[0]}`
+                });
               }
             });
           }
@@ -314,14 +314,6 @@ const storindex = common_vendor.defineStore("storindex", () => {
       });
       p.value = 0;
     } else {
-      const qaq = await api_api.getTincheCoupons({
-        phoneNumber: common_vendor.index.getStorageSync("phoneNumber")
-      });
-      console.log(qaq);
-      common_vendor.index.showToast({
-        icon: "none",
-        title: `${qaq.data[0]}`
-      });
       const res4 = await api_api.start({
         mid: common_vendor.index.getStorageSync("mid"),
         price: 100,
@@ -339,13 +331,21 @@ const storindex = common_vendor.defineStore("storindex", () => {
           icon: "none",
           title: "启动设备成功",
           duration: 1e3,
-          success: (res2) => {
+          success: async (res2) => {
             p.value = 0;
             common_vendor.index.setStorageSync("orderid", orderid.value);
             common_vendor.index.setStorageSync("msg", descriptions.value);
             common_vendor.index.redirectTo({
               url: "/pages/complete/complete"
             });
+            const qaq = await api_api.getTincheCoupons({
+              phoneNumber: common_vendor.index.getStorageSync("phoneNumber")
+            });
+            console.log(qaq);
+            common_vendor.index.showToast({
+              icon: "none",
+              title: `${qaq.data[0]}`
+            });
           }
         });
       } else {
@@ -386,13 +386,6 @@ const storindex = common_vendor.defineStore("storindex", () => {
       });
       p.value = 0;
     } else {
-      const qaq = await api_api.getTincheCoupons({
-        phoneNumber: common_vendor.index.getStorageSync("phoneNumber")
-      });
-      common_vendor.index.showToast({
-        icon: "none",
-        title: `${qaq.data[0]}`
-      });
       const res4 = await api_api.start({
         mid: common_vendor.index.getStorageSync("mid"),
         price: 100,
@@ -408,13 +401,20 @@ const storindex = common_vendor.defineStore("storindex", () => {
           icon: "none",
           title: "启动设备成功",
           duration: 1e3,
-          success: (res2) => {
+          success: async (res2) => {
             p.value = 0;
             common_vendor.index.setStorageSync("orderid", orderid.value);
             common_vendor.index.setStorageSync("msg", "次卡");
             common_vendor.index.redirectTo({
               url: "/pages/complete/complete"
             });
+            const qaq = await api_api.getTincheCoupons({
+              phoneNumber: common_vendor.index.getStorageSync("phoneNumber")
+            });
+            common_vendor.index.showToast({
+              icon: "none",
+              title: `${qaq.data[0]}`
+            });
           }
         });
       } else {
diff --git a/unpackage/dist/dev/mp-weixin/stor/operation/operation.js b/unpackage/dist/dev/mp-weixin/stor/operation/operation.js
index 48f737a..4684e5a 100644
--- a/unpackage/dist/dev/mp-weixin/stor/operation/operation.js
+++ b/unpackage/dist/dev/mp-weixin/stor/operation/operation.js
@@ -26,6 +26,7 @@ const operation = common_vendor.defineStore("operation", () => {
   };
   const getCurrentOrderApi = async () => {
     currentOrder.value = await api_api.getCurrenOrder({ phoneNumber: common_vendor.index.getStorageSync("phoneNumber") });
+    currentOrder.value = currentOrder.value.data;
     console.log(currentOrder.value);
   };
   return {
diff --git a/unpackage/dist/dev/mp-weixin/stor/shop/shop.js b/unpackage/dist/dev/mp-weixin/stor/shop/shop.js
index 9fd5073..23ebbb0 100644
--- a/unpackage/dist/dev/mp-weixin/stor/shop/shop.js
+++ b/unpackage/dist/dev/mp-weixin/stor/shop/shop.js
@@ -5,6 +5,7 @@ const shopStor = common_vendor.defineStore("shopStor", () => {
   const shop = common_vendor.ref([]);
   const shopData = common_vendor.ref([]);
   const shopSucces = common_vendor.ref([]);
+  common_vendor.ref();
   const getShop = async (data) => {
     shop.value = await api_api.getCommodityShop({ deviceNum: "dev1234567" });
     shop.value = shop.value.data;
@@ -20,8 +21,13 @@ const shopStor = common_vendor.defineStore("shopStor", () => {
   };
   const getShopDatas = async () => {
     shopData.value = await api_api.getCardUpdateInfo({ phoneNumber: common_vendor.index.getStorageSync("phoneNumber"), type: "0" });
-    shopData.value = shopData.value.data;
-    console.log(shopData.value);
+    if (shopData.value.code === 500) {
+      console.log(shopData.value);
+      shopData.value = [];
+    } else {
+      shopData.value = shopData.value.data;
+      console.log(shopData.value);
+    }
   };
   const getChecks = async (data) => {
     console.log(data);
diff --git a/unpackage/dist/dev/mp-weixin/utils/request.js b/unpackage/dist/dev/mp-weixin/utils/request.js
index 3179630..170dc66 100644
--- a/unpackage/dist/dev/mp-weixin/utils/request.js
+++ b/unpackage/dist/dev/mp-weixin/utils/request.js
@@ -92,7 +92,7 @@ const reqs = (url, data, method) => {
       title: "加载中"
     });
     common_vendor.index.request({
-      url: "http://47.97.35.139:19270/" + url,
+      url: common_baseurl.BASE_URLSS + url,
       data,
       header: {
         "content-type": "application/json"
@@ -120,7 +120,7 @@ const reqs = (url, data, method) => {
           });
         }
         if (err) {
-          console.log(" 错误信息接口URL：http://47.97.35.139:19270/" + url);
+          console.log(" 错误信息接口URL：" + common_baseurl.BASE_URLSS + url);
         }
         reject(err);
       }
diff --git a/utils/request.js b/utils/request.js
index 0e8003a..b7a540b 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,5 +1,5 @@
 import {
-	BASE_URL,BASE_URLS
+	BASE_URL,BASE_URLS,BASE_URLSS
 } from "@/common/baseurl.js"
 export const request = (url, data, method) => {
 
@@ -100,7 +100,7 @@ export const reqs= (url, data, method) => {
 			title: "加载中",
 		});
 		uni.request({
-			url: 'http://47.97.35.139:19270/' + url,
+			url: BASE_URLSS + url,
 			data: data,
 			header: {
 				'content-type': 'application/json',
@@ -130,7 +130,7 @@ export const reqs= (url, data, method) => {
 					})
 				}
 				if (err) {
-					console.log(" 错误信息接口URL：" + 'http://47.97.35.139:19270/' + url);;
+					console.log(" 错误信息接口URL：" + BASE_URLSS + url);;
 				}
 				reject(err)
 			}