diff --git a/api/api.js b/api/api.js
index 173cacf..08ce230 100644
--- a/api/api.js
+++ b/api/api.js
@@ -110,3 +110,8 @@ export const getShopGoOut=(data)=>reqs(`shop/good/out-goods?imei=${data.imei}&go
 export const getIllustrate = (data)=>requests(`mobile/config/getInfo`,data,"GET")
 //获取退款接口
 export const getRefund = (data)=>requests(`mobile/order/refund`,data,"POST")
+//获取图片链接
+export const getHeaderImg = (data)=>requests(`mobile/file/upload`,data,"POST")
+//获取用户头像昵称性别
+export const getUserSex = (data)=>requests(`mobile/login/setInfo`,data,"POST")
+
diff --git a/pages/charge/charge.vue b/pages/charge/charge.vue
index 0a1a46d..3c5a2fe 100644
--- a/pages/charge/charge.vue
+++ b/pages/charge/charge.vue
@@ -93,6 +93,7 @@
 		</view>
 	</view>
 	<explain v-if="explainShow===1" @close="close"></explain>
+	<windows v-if="ccc===1" @cloSe="cloSe" @oks="oks" :titleMsg="titleMsg"></windows>
 </template>
 
 <script setup>
@@ -123,6 +124,8 @@
 	const color = ref('#000')
 	const explainShow = ref(0)
 	const cardIndex = ref(0)
+	const ccc   =ref(0)
+	const titleMsg = ref('次卡购买后无法退款 !')
 	onLoad((options) => {
 		console.log(options.id);
 		r.getRechageCardApi(options.id)
@@ -148,9 +151,16 @@
 		cardIndex.value = index
 	}
 	const goPlays=()=>{
+		ccc.value=1
+	}
+	const oks = ()=>{
 		console.log(rechageCardData.value.cards[cardIndex.value]);
+		ccc.value=0
 		s.wxPlayss(rechageCardData.value.cards[cardIndex.value])
 	}
+	const cloSe = ()=>{
+		ccc.value=0
+	}
 </script>
 
 <style lang="scss">
diff --git a/pages/implement/implement.vue b/pages/implement/implement.vue
index 9064645..51b4936 100644
--- a/pages/implement/implement.vue
+++ b/pages/implement/implement.vue
@@ -102,6 +102,7 @@
 			结算
 		</view>
 	</view>
+	<windows v-if="ccc===1" @cloSe="cloSe" @oks="oks" :titleMsg="titleMsg"></windows>
 </template>
 
 <script setup>
@@ -139,6 +140,8 @@
 		cardDataValidCards
 	} = storeToRefs(g)
 	g.getCards()
+	const ccc   =ref(0)
+	const titleMsg = ref('次卡洗车无法退款 !')
 	const headerIndex = ref(1)
 	const titles = ref('购买套餐')
 	const bgcolor = ref('#fff')
@@ -182,9 +185,15 @@
 	const goCiPlay = (index) => {
 		if (cardIndex.value === index) {
 			// console.log("使用");
-			s.ciPlay(cardDataValidCards.value[index])
+			ccc.value=1
 		}
 	}
+	const cloSe = ()=>{
+		ccc.value=0
+	}
+	const oks = ()=>{
+		s.ciPlay(cardDataValidCards.value[cardIndex.value])
+	}
 	const yuChecks = (index) => {
 		yuIndex.value=index
 		s.getMiaoshu(infos.value[index])
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7a5f424..655ae58 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -226,8 +226,13 @@
 	}
 
 	const preferential = () => {
-		uni.navigateTo({
-			url: "/pages/tuan/tuan"
+		// uni.navigateTo({
+		// 	url: "/pages/tuan/tuan"
+		// })
+		uni.showToast({
+			icon:"none",
+			title:'暂未开通',
+			duration:1000
 		})
 	}
 	const scaends = () => {
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 68ca8a5..68d4985 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -5,7 +5,8 @@
 				我的
 			</view>
 			<view class="my-header">
-				<img class="my-img" :src="wxImg ? wxImg :'https://www.jiubaotongxue.love/image/demo32.png'" alt="" @click="logins" />
+				<img class="my-img" :src="wxImg ? wxImg :'https://www.jiubaotongxue.love/image/demo32.png'" alt=""
+					@click="logins" />
 				<view class="header-box" @click="logins">
 					<view class="txt">
 						<text>{{wxname ? wxname :'用户'}}</text>
@@ -16,7 +17,7 @@
 					</view>
 				</view>
 				<view class="tongbu" @click="wxClose=1">
-					
+
 					<img class="i" src="https://www.jiubaotongxue.love/image/shua1.png" alt="" />同步资料
 				</view>
 			</view>
@@ -111,7 +112,7 @@
 
 		</view>
 		<view class="d" style="width: 100%;height: 9%;position: relative;">
-		
+
 		</view>
 	</view>
 	<view class="gets" v-if="wxClose===1">
@@ -125,7 +126,7 @@
 				<view class="inputs">
 					<text><!-- 昵称 --></text> <input class="input" type="nickname" name="input" placeholder="获取昵称">
 				</view>
-				<button class="getImgs" open-type="chooseAvatar" @chooseavatar="chooseavatar">获取头像</button>
+				<button class="getImgs" @click="chooseavatar">上传头像</button>
 				<view class="btnView">
 					<view class="left-btnView" @click="getClose">
 						取消
@@ -203,7 +204,7 @@
 
 	const titles = ref('我的信息')
 	const color = ref('#2264dc')
-	const isPhoneNumber = ()=>{
+	const isPhoneNumber = () => {
 		wxname.value = uni.getStorageSync('wxname')
 		wxImg.value = uni.getStorageSync('wxImg')
 		if (uni.getStorageSync('phoneNumber')) {
@@ -213,11 +214,11 @@
 			const prefix = phoneNum.value.slice(0, 3);
 			const suffix = phoneNum.value.slice(3 + 5);
 			phoneNum.value = prefix + '*****' + suffix;
-		
+
 			console.log(phoneNum.value);
-		}else{
+		} else {
 			uni.navigateTo({
-				url:"/pages/login/login"
+				url: "/pages/login/login"
 			})
 		}
 	}
@@ -226,20 +227,21 @@
 		wxImg.value = uni.getStorageSync('wxImg')
 		titles.value = '我的信息'
 		color.value = '#2264dc'
-	isPhoneNumber()
+		isPhoneNumber()
 		// isUser()
 	})
 	onShow(() => {
-		if(!uni.getStorageSync('wxname')){
-			wxname.value='用户'
-			
+		if (!uni.getStorageSync('wxname')) {
+			wxname.value = '用户'
+
 		}
-		if(!uni.getStorageSync('wxImg')){
-			wxImg.value ='https://www.jiubaotongxue.love/image/demo32.png'
+		if (!uni.getStorageSync('wxImg')) {
+			wxImg.value = 'https://www.jiubaotongxue.love/image/demo32.png'
 		}
 		isUser()
 		isPhoneNumber()
-		console.log("你的头像链接---------------:"+uni.getStorageSync('wxImg'));
+		mys.getUserApi()
+		console.log("你的头像链接---------------:" + uni.getStorageSync('wxImg'));
 	})
 	//检查登录状态
 	const isUser = () => {
@@ -263,10 +265,28 @@
 	const tong = () => {
 		wxClose.value = 1
 	}
+	const getImageUrl=ref([])
 	const chooseavatar = (e) => {
 		oldImg.value = wxImg.value
-		wxImg.value = e.detail.avatarUrl
-		uni.setStorageSync('wxImg', oldImg.value)
+		// wxImg.value = e.detail.avatarUrl
+		uni.chooseImage({
+			count: 1,
+			sizeType: ['original'],
+			sourceType: ['album', 'camera'],
+			success: (res) => {
+				getImageUrl.value = res.tempFilePaths[0];
+				uni.uploadFile({
+					url:"http://47.97.35.139:19260/mobile/file/upload",
+					filePath:getImageUrl.value,
+					name:'file',
+					success: (res1) => {
+						wxImg.value = JSON.parse(res1.data).data
+						console.log(wxImg.value)
+						uni.setStorageSync('wxImg',wxImg.value)
+					}
+				})
+			}
+		})
 	}
 	const getClose = () => {
 		wxClose.value = 0
@@ -280,6 +300,8 @@
 		uni.setStorageSync('wxImg', wxImg.value)
 		wxname.value = uni.getStorageSync('wxname')
 		wxClose.value = 0
+		mys.getUserApi()
+		
 	}
 	const GOji = () => {
 		uni.navigateTo({
@@ -317,9 +339,9 @@
 			url: "/pages/yijian/yijian"
 		})
 	}
-	const dianhua = ()=>{
+	const dianhua = () => {
 		uni.makePhoneCall({
-			phoneNumber:'17605326897'
+			phoneNumber: '17605326897'
 		})
 	}
 </script>
@@ -452,6 +474,7 @@
 				background-size: 100% 100%;
 				background-repeat: no-repeat;
 				background-image: url("https://www.jiubaotongxue.love/image/demo34.png");
+
 				.up {
 					width: 120rpx;
 					height: 40rpx;
@@ -609,7 +632,7 @@
 		position: fixed;
 		background-color: rgba(0, 0, 0, 0.8);
 		z-index: 90;
-		
+
 
 		.bgn {
 			width: 600rpx;
diff --git a/pages/orderForm/orderForm.vue b/pages/orderForm/orderForm.vue
index 5e1862b..9a55ca6 100644
--- a/pages/orderForm/orderForm.vue
+++ b/pages/orderForm/orderForm.vue
@@ -48,9 +48,12 @@
 				<view class="orderForm-b-m">
 					<text class="blacsa">原价￥ <text class="bla">{{item.amount}}</text> </text> <text
 						class="blu">实付款￥<text class="blues" v-if="item.status!=0">{{item.amount}}</text><text class="blues" v-if="item.status===0">0</text> </text>
-					<view class="btns" v-if="item.status===1" @click.stop="goOks(index)">
+					<view class="btns" v-if="item.status===1&&item.payType===2||item.payType===1&&item.status===1" @click.stop="goOks(index)">
 						申请退款
 					</view>
+					<view class="btns" v-if="item.status===1&&item.payType!=2||item.payType!=1&&item.status===1" @click.stop="startOks(index)">
+						结束洗车
+					</view>
 					<view class="btnas" v-if="item.status===2">
 
 					</view>
@@ -439,14 +442,35 @@
 	const goOks = (index) => {
 		orderIndex.value = index
 		console.log(orders.value[index].status);
+		if(orders.val[index].payType===4||orders.val[index].goodsName==='拉新券洗车'){
+			uni.showToast({
+				icon:"none",
+				title:"拉新券洗车无法退款",
+				duration:1000
+			})
+			return
+		}
+		if(orders.val[index].payType===3||orders.val[index].goodsName==='次卡消费'){
+			uni.showToast({
+				icon:"none",
+				title:"次卡洗车无法退款",
+				duration:1000
+			})
+			return
+		}
 		if(orders.value[index].status===1){
 			moneyRefund.value=0
 		}
 	}
+	const startOks = (index)=>{
+		orderIndex.value = index
+		ccc.value = 1
+	}
 	const oks = () => {
 		o.getClose({
 			id: orders.value[orderIndex.value].orderId,
-			mid: orders.value[orderIndex.value].deviceId
+			mid: orders.value[orderIndex.value].deviceId,
+			payType: orders.value[orderIndex.value].payType
 		})
 		ccc.value = 0
 	}
diff --git a/pages/secondaryCard/secondaryCard.vue b/pages/secondaryCard/secondaryCard.vue
index e46838b..8e8c795 100644
--- a/pages/secondaryCard/secondaryCard.vue
+++ b/pages/secondaryCard/secondaryCard.vue
@@ -114,6 +114,7 @@
 			</view>
 		</view>
 	</view>
+	<windows v-if="ccc===1" @cloSe="cloSe" @oks="oks" :titleMsg="titleMsg"></windows>
 </template>
 
 <script setup>
@@ -133,6 +134,9 @@
 	const titles = ref('洗车次卡')
 	const bgcolor = ref('#fff')
 	const color = ref('#000')
+	const ccc = ref(0)
+	const titleMsg = ref('次卡洗车无法退款 ！')
+	const cardDataValidCardsIndex = ref(0)
 	const remo = () => {
 		headerindex.value = 1
 	}
@@ -141,10 +145,19 @@
 	}
 	const demo = ref([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
 	const goSencd = (index)=>{
+		cardDataValidCardsIndex.value=index
 		// h.scanQrcode('次卡')
-		c.scanQrcode(cardDataValidCards.value[index])
+		ccc.value=1
+		// c.scanQrcode(cardDataValidCards.value[index])
 		
 	}
+	const oks = ()=>{
+		ccc.value=0
+		c.scanQrcode(cardDataValidCards.value[cardDataValidCardsIndex.value])
+	}
+	const cloSe = ()=>{
+		ccc.value=0
+	}
 	const quedingsa = () => {
 		c.goStar()
 	}
diff --git a/pages/yijian/yijian.vue b/pages/yijian/yijian.vue
index 9be28c3..aee9636 100644
--- a/pages/yijian/yijian.vue
+++ b/pages/yijian/yijian.vue
@@ -41,7 +41,7 @@
 						title:"提交成功",
 						duration:1000,
 						success: (result) => {
-							uni.navigateTo({
+							uni.switchTab({
 								url:"/pages/my/my"
 							})
 						}
diff --git a/stor/my/my.js b/stor/my/my.js
index 6b1daee..68ad73d 100644
--- a/stor/my/my.js
+++ b/stor/my/my.js
@@ -7,7 +7,8 @@ import {
 import {
 	getCurren,
 	getDriver,
-	GetInformation
+	GetInformation,
+	getUserSex
 } from '../../api/api.js'
 export const my = defineStore('my', () => {
 	const weixinname = ref('')
@@ -91,6 +92,17 @@ export const my = defineStore('my', () => {
 		Information.value = await GetInformation({phoneNumber:uni.getStorageSync('phoneNumber')})
 		Information.value=Information.value.data
 		console.log(Information.value);
+		uni.setStorageSync('wxname',Information.value.wechatName)
+		uni.setStorageSync('wxImg',Information.value.icon)
+	}
+	const getUserApi = async(data)=>{
+		const res = await getUserSex({
+			phoneNumber:uni.getStorageSync('phoneNumber'),
+			name:uni.getStorageSync('wxname'),
+			icon:uni.getStorageSync('wxImg'),
+			sex:'男'
+		})
+		console.log(res)
 	}
 	return {
 		maskPhoneNumber,
@@ -103,7 +115,8 @@ export const my = defineStore('my', () => {
 		drivers,
 		getDrivers,
 		Information,
-		getInformation
+		getInformation,
+		getUserApi
 	}
 
 })
\ No newline at end of file
diff --git a/stor/order/order.js b/stor/order/order.js
index 7a91584..efe605e 100644
--- a/stor/order/order.js
+++ b/stor/order/order.js
@@ -41,11 +41,28 @@ export const order = defineStore('order', () => {
 			phone:uni.getStorageSync('phoneNumber'),
 			mid:data.mid,
 			orderId:data.id,
+			payType:data.payType
 		}).then((res)=>{
 				current.value = res.data
 				console.log(res);
-				if(res.code===0){
+				console.log(data)
+				if(res.code===200&&data.payType===2||res.code===200&&data.payType===1){
 				getRefundApi(data)
+				return
+				}
+				if(res.code===200){
+				setTimeout(()=>{
+					uni.switchTab({
+						url:"/pages/my/my",
+						success: () => {
+							uni.showToast({
+								icon:"none",
+								title:"结束洗车成功",
+								duration:1000
+							})
+						}
+					})
+				},800)
 				}
 				// uni.setStorageSync('orderid',orderid.value)
 				// uni.setStorageSync('mid',mid.value)
diff --git a/unpackage/dist/dev/mp-weixin/api/api.js b/unpackage/dist/dev/mp-weixin/api/api.js
index dc7cffe..9b36a55 100644
--- a/unpackage/dist/dev/mp-weixin/api/api.js
+++ b/unpackage/dist/dev/mp-weixin/api/api.js
@@ -38,6 +38,7 @@ const getShopList = (data) => utils_request.reqs(`shop/good/list-goods`, data, "
 const getShopGoOut = (data) => utils_request.reqs(`shop/good/out-goods?imei=${data.imei}&goods_id=${data.goods_id}&phoneNumber=${data.phoneNumber}`, data, "POST");
 const getIllustrate = (data) => utils_request.requests(`mobile/config/getInfo`, data, "GET");
 const getRefund = (data) => utils_request.requests(`mobile/order/refund`, data, "POST");
+const getUserSex = (data) => utils_request.requests(`mobile/login/setInfo`, data, "POST");
 exports.GetBranchInformation = GetBranchInformation;
 exports.GetCarList = GetCarList;
 exports.GetInformation = GetInformation;
@@ -68,6 +69,7 @@ exports.getShopList = getShopList;
 exports.getShopid = getShopid;
 exports.getTimeStamps = getTimeStamps;
 exports.getTincheCoupons = getTincheCoupons;
+exports.getUserSex = getUserSex;
 exports.getWxPlay = getWxPlay;
 exports.getaddCar = getaddCar;
 exports.getremove = getremove;
diff --git a/unpackage/dist/dev/mp-weixin/pages/charge/charge.js b/unpackage/dist/dev/mp-weixin/pages/charge/charge.js
index d9ed04e..aa51293 100644
--- a/unpackage/dist/dev/mp-weixin/pages/charge/charge.js
+++ b/unpackage/dist/dev/mp-weixin/pages/charge/charge.js
@@ -4,11 +4,13 @@ const stor_rechagePlay_rechagePlay = require("../../stor/rechagePlay/rechagePlay
 const stor_index = require("../../stor/index.js");
 if (!Array) {
   const _easycom_explain2 = common_vendor.resolveComponent("explain");
-  _easycom_explain2();
+  const _easycom_windows2 = common_vendor.resolveComponent("windows");
+  (_easycom_explain2 + _easycom_windows2)();
 }
 const _easycom_explain = () => "../../components/explain/explain.js";
+const _easycom_windows = () => "../../components/windows/windows.js";
 if (!Math) {
-  _easycom_explain();
+  (_easycom_explain + _easycom_windows)();
 }
 const _sfc_main = {
   __name: "charge",
@@ -24,6 +26,8 @@ const _sfc_main = {
     common_vendor.ref("#000");
     const explainShow = common_vendor.ref(0);
     const cardIndex = common_vendor.ref(0);
+    const ccc = common_vendor.ref(0);
+    const titleMsg = common_vendor.ref("次卡购买后无法退款 !");
     common_vendor.onLoad((options) => {
       console.log(options.id);
       r.getRechageCardApi(options.id);
@@ -48,9 +52,16 @@ const _sfc_main = {
       cardIndex.value = index;
     };
     const goPlays = () => {
+      ccc.value = 1;
+    };
+    const oks = () => {
       console.log(rechageCardData.value.cards[cardIndex.value]);
+      ccc.value = 0;
       s.wxPlayss(rechageCardData.value.cards[cardIndex.value]);
     };
+    const cloSe = () => {
+      ccc.value = 0;
+    };
     return (_ctx, _cache) => {
       return common_vendor.e({
         a: common_vendor.o(getNavs),
@@ -76,6 +87,14 @@ const _sfc_main = {
         i: explainShow.value === 1
       }, explainShow.value === 1 ? {
         j: common_vendor.o(close)
+      } : {}, {
+        k: ccc.value === 1
+      }, ccc.value === 1 ? {
+        l: common_vendor.o(cloSe),
+        m: common_vendor.o(oks),
+        n: common_vendor.p({
+          titleMsg: titleMsg.value
+        })
       } : {});
     };
   }
diff --git a/unpackage/dist/dev/mp-weixin/pages/charge/charge.json b/unpackage/dist/dev/mp-weixin/pages/charge/charge.json
index 087abd4..72ab975 100644
--- a/unpackage/dist/dev/mp-weixin/pages/charge/charge.json
+++ b/unpackage/dist/dev/mp-weixin/pages/charge/charge.json
@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "次卡办理",
   "usingComponents": {
-    "explain": "../../components/explain/explain"
+    "explain": "../../components/explain/explain",
+    "windows": "../../components/windows/windows"
   }
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/charge/charge.wxml b/unpackage/dist/dev/mp-weixin/pages/charge/charge.wxml
index 1defbe7..ee26be6 100644
--- a/unpackage/dist/dev/mp-weixin/pages/charge/charge.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/charge/charge.wxml
@@ -1 +1 @@
-<view class="charge"><view class="tops"><image class="nav-img" src="https://www.jiubaotongxue.love/image/nav10.png" alt="" bindtap="{{a}}"/><view class="title" style="font-size:36rpx"> 次卡办理 </view></view><view class="topss"></view><scroll-view class="scrol" scroll-y="true"><view class="charge-header"><view class="charge-header-box"><view class="charge-header-box-left"><view class="title"><image class="title-i" src="https://www.jiubaotongxue.love/image/demo53.png" alt=""/><text class="title-t">次数剩余（次）</text></view><view class="strongeTxt">{{b}}</view><view class="bt"> 当前洗卡适用于平台全门店 </view></view><view class="charge-header-box-right"><view class="jiaobiao"> 门店次卡 </view><image class="header-img" src="{{c}}" alt=""/></view></view><view class="charge-header-bottom"><view class="charge-header-bottom-left" bindtap="{{d}}"> 次卡说明 </view> | <view class="charge-header-bottom-left" bindtap="{{e}}"> 次卡明细 </view></view></view><view class="charge-body"><view class="charge-body-title"> 请选择次卡套餐办理 </view><view class="charge-body-box"><view wx:for="{{f}}" wx:for-item="item" wx:key="g" class="{{['box', item.f && 'boxacc']}}" bindtap="{{item.h}}"><view class="box-titles">{{item.a}}次卡 </view><view class="box-conters">{{item.b}}个月 </view><view class="box-center"> ￥{{item.c}}</view><view class="box-bottoms"> 每次使用上线{{item.d}}分钟 </view><image wx:if="{{item.e}}" class="box-actives" src="https://www.jiubaotongxue.love/image/demo50.png" alt=""/></view><view class="ding"></view></view></view><view class="charge-play"><view class="charge-body-title"> 请选择次卡套餐办理 </view><view class="charge-play-icon"><view class="icon-left"><image class="icon-img" src="https://www.jiubaotongxue.love/image/demo54.png" alt=""/><text>微信支付</text></view><view class="icon-right icon-active"></view></view></view><view class="dings"></view></scroll-view><view class="charge-btnPlay"><text class="charge-btnPlay-left">支付：<text class="pricess">{{g}}</text></text><view class="plays" bindtap="{{h}}"> 去支付 </view></view></view><explain wx:if="{{i}}" bindclose="{{j}}" u-i="0e748619-0" bind:__l="__l"></explain>
\ No newline at end of file
+<view class="charge"><view class="tops"><image class="nav-img" src="https://www.jiubaotongxue.love/image/nav10.png" alt="" bindtap="{{a}}"/><view class="title" style="font-size:36rpx"> 次卡办理 </view></view><view class="topss"></view><scroll-view class="scrol" scroll-y="true"><view class="charge-header"><view class="charge-header-box"><view class="charge-header-box-left"><view class="title"><image class="title-i" src="https://www.jiubaotongxue.love/image/demo53.png" alt=""/><text class="title-t">次数剩余（次）</text></view><view class="strongeTxt">{{b}}</view><view class="bt"> 当前洗卡适用于平台全门店 </view></view><view class="charge-header-box-right"><view class="jiaobiao"> 门店次卡 </view><image class="header-img" src="{{c}}" alt=""/></view></view><view class="charge-header-bottom"><view class="charge-header-bottom-left" bindtap="{{d}}"> 次卡说明 </view> | <view class="charge-header-bottom-left" bindtap="{{e}}"> 次卡明细 </view></view></view><view class="charge-body"><view class="charge-body-title"> 请选择次卡套餐办理 </view><view class="charge-body-box"><view wx:for="{{f}}" wx:for-item="item" wx:key="g" class="{{['box', item.f && 'boxacc']}}" bindtap="{{item.h}}"><view class="box-titles">{{item.a}}次卡 </view><view class="box-conters">{{item.b}}个月 </view><view class="box-center"> ￥{{item.c}}</view><view class="box-bottoms"> 每次使用上线{{item.d}}分钟 </view><image wx:if="{{item.e}}" class="box-actives" src="https://www.jiubaotongxue.love/image/demo50.png" alt=""/></view><view class="ding"></view></view></view><view class="charge-play"><view class="charge-body-title"> 请选择次卡套餐办理 </view><view class="charge-play-icon"><view class="icon-left"><image class="icon-img" src="https://www.jiubaotongxue.love/image/demo54.png" alt=""/><text>微信支付</text></view><view class="icon-right icon-active"></view></view></view><view class="dings"></view></scroll-view><view class="charge-btnPlay"><text class="charge-btnPlay-left">支付：<text class="pricess">{{g}}</text></text><view class="plays" bindtap="{{h}}"> 去支付 </view></view></view><explain wx:if="{{i}}" bindclose="{{j}}" u-i="0e748619-0" bind:__l="__l"></explain><windows wx:if="{{k}}" bindcloSe="{{l}}" bindoks="{{m}}" u-i="0e748619-1" bind:__l="__l" u-p="{{n}}"></windows>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/implement/implement.js b/unpackage/dist/dev/mp-weixin/pages/implement/implement.js
index ef62e71..bff2b51 100644
--- a/unpackage/dist/dev/mp-weixin/pages/implement/implement.js
+++ b/unpackage/dist/dev/mp-weixin/pages/implement/implement.js
@@ -4,6 +4,14 @@ const stor_rechagePlay_rechagePlay = require("../../stor/rechagePlay/rechagePlay
 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");
+if (!Array) {
+  const _easycom_windows2 = common_vendor.resolveComponent("windows");
+  _easycom_windows2();
+}
+const _easycom_windows = () => "../../components/windows/windows.js";
+if (!Math) {
+  _easycom_windows();
+}
 const _sfc_main = {
   __name: "implement",
   setup(__props) {
@@ -21,6 +29,8 @@ const _sfc_main = {
       cardDataValidCards
     } = common_vendor.storeToRefs(g);
     g.getCards();
+    const ccc = common_vendor.ref(0);
+    const titleMsg = common_vendor.ref("次卡洗车无法退款 !");
     const headerIndex = common_vendor.ref(1);
     common_vendor.ref("购买套餐");
     common_vendor.ref("#fff");
@@ -58,9 +68,15 @@ const _sfc_main = {
     };
     const goCiPlay = (index) => {
       if (cardIndex.value === index) {
-        s.ciPlay(cardDataValidCards.value[index]);
+        ccc.value = 1;
       }
     };
+    const cloSe = () => {
+      ccc.value = 0;
+    };
+    const oks = () => {
+      s.ciPlay(cardDataValidCards.value[cardIndex.value]);
+    };
     const yuChecks = (index) => {
       yuIndex.value = index;
       s.getMiaoshu(infos.value[index]);
@@ -155,6 +171,14 @@ const _sfc_main = {
       }, headerIndex.value === 1 ? {
         r: common_vendor.t(common_vendor.unref(infos)[yuIndex.value].amount),
         s: common_vendor.o(goPays)
+      } : {}, {
+        t: ccc.value === 1
+      }, ccc.value === 1 ? {
+        v: common_vendor.o(cloSe),
+        w: common_vendor.o(oks),
+        x: common_vendor.p({
+          titleMsg: titleMsg.value
+        })
       } : {});
     };
   }
diff --git a/unpackage/dist/dev/mp-weixin/pages/implement/implement.json b/unpackage/dist/dev/mp-weixin/pages/implement/implement.json
index 51a5ba2..dce1b8c 100644
--- a/unpackage/dist/dev/mp-weixin/pages/implement/implement.json
+++ b/unpackage/dist/dev/mp-weixin/pages/implement/implement.json
@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "购买套餐",
-  "usingComponents": {}
+  "usingComponents": {
+    "windows": "../../components/windows/windows"
+  }
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/implement/implement.wxml b/unpackage/dist/dev/mp-weixin/pages/implement/implement.wxml
index c417008..fc71113 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="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
+<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><windows wx:if="{{t}}" bindcloSe="{{v}}" bindoks="{{w}}" u-i="1ef60d61-0" bind:__l="__l" u-p="{{x}}"></windows>
\ 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 4168f57..d2b04cf 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js
@@ -55,8 +55,10 @@ const _sfc_main = {
       });
     };
     const preferential = () => {
-      common_vendor.index.navigateTo({
-        url: "/pages/tuan/tuan"
+      common_vendor.index.showToast({
+        icon: "none",
+        title: "暂未开通",
+        duration: 1e3
       });
     };
     const scaends = () => {
diff --git a/unpackage/dist/dev/mp-weixin/pages/my/my.js b/unpackage/dist/dev/mp-weixin/pages/my/my.js
index cf35735..4636f8c 100644
--- a/unpackage/dist/dev/mp-weixin/pages/my/my.js
+++ b/unpackage/dist/dev/mp-weixin/pages/my/my.js
@@ -69,6 +69,7 @@ const _sfc_main = {
       }
       isUser();
       isPhoneNumber();
+      mys.getUserApi();
       console.log("你的头像链接---------------:" + common_vendor.index.getStorageSync("wxImg"));
     });
     const isUser = () => {
@@ -88,10 +89,27 @@ const _sfc_main = {
         url: "/pages/login/login"
       });
     };
+    const getImageUrl = common_vendor.ref([]);
     const chooseavatar = (e) => {
       oldImg.value = wxImg.value;
-      wxImg.value = e.detail.avatarUrl;
-      common_vendor.index.setStorageSync("wxImg", oldImg.value);
+      common_vendor.index.chooseImage({
+        count: 1,
+        sizeType: ["original"],
+        sourceType: ["album", "camera"],
+        success: (res) => {
+          getImageUrl.value = res.tempFilePaths[0];
+          common_vendor.index.uploadFile({
+            url: "http://47.97.35.139:19260/mobile/file/upload",
+            filePath: getImageUrl.value,
+            name: "file",
+            success: (res1) => {
+              wxImg.value = JSON.parse(res1.data).data;
+              console.log(wxImg.value);
+              common_vendor.index.setStorageSync("wxImg", wxImg.value);
+            }
+          });
+        }
+      });
     };
     const getClose = () => {
       wxClose.value = 0;
@@ -105,6 +123,7 @@ const _sfc_main = {
       common_vendor.index.setStorageSync("wxImg", wxImg.value);
       wxname.value = common_vendor.index.getStorageSync("wxname");
       wxClose.value = 0;
+      mys.getUserApi();
     };
     const balance = () => {
       common_vendor.index.navigateTo({
diff --git a/unpackage/dist/dev/mp-weixin/pages/my/my.wxml b/unpackage/dist/dev/mp-weixin/pages/my/my.wxml
index 6568ca5..43ebf25 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></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" bindtap="{{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/orderForm/orderForm.js b/unpackage/dist/dev/mp-weixin/pages/orderForm/orderForm.js
index 4dbcc0f..e9e2e7d 100644
--- a/unpackage/dist/dev/mp-weixin/pages/orderForm/orderForm.js
+++ b/unpackage/dist/dev/mp-weixin/pages/orderForm/orderForm.js
@@ -90,14 +90,35 @@ const _sfc_main = {
     const goOks = (index) => {
       orderIndex.value = index;
       console.log(orders.value[index].status);
+      if (orders.val[index].payType === 4 || orders.val[index].goodsName === "拉新券洗车") {
+        common_vendor.index.showToast({
+          icon: "none",
+          title: "拉新券洗车无法退款",
+          duration: 1e3
+        });
+        return;
+      }
+      if (orders.val[index].payType === 3 || orders.val[index].goodsName === "次卡消费") {
+        common_vendor.index.showToast({
+          icon: "none",
+          title: "次卡洗车无法退款",
+          duration: 1e3
+        });
+        return;
+      }
       if (orders.value[index].status === 1) {
         moneyRefund.value = 0;
       }
     };
+    const startOks = (index) => {
+      orderIndex.value = index;
+      ccc.value = 1;
+    };
     const oks = () => {
       o.getClose({
         id: orders.value[orderIndex.value].orderId,
-        mid: orders.value[orderIndex.value].deviceId
+        mid: orders.value[orderIndex.value].deviceId,
+        payType: orders.value[orderIndex.value].payType
       });
       ccc.value = 0;
     };
@@ -208,18 +229,22 @@ const _sfc_main = {
           } : {}, {
             q: item.status === 0
           }, item.status === 0 ? {} : {}, {
-            r: item.status === 1
-          }, item.status === 1 ? {
+            r: item.status === 1 && item.payType === 2 || item.payType === 1 && item.status === 1
+          }, item.status === 1 && item.payType === 2 || item.payType === 1 && item.status === 1 ? {
             s: common_vendor.o(($event) => goOks(index), item.id)
           } : {}, {
-            t: item.status === 2
+            t: item.status === 1 && item.payType != 2 || item.payType != 1 && item.status === 1
+          }, item.status === 1 && item.payType != 2 || item.payType != 1 && item.status === 1 ? {
+            v: common_vendor.o(($event) => startOks(index), item.id)
+          } : {}, {
+            w: item.status === 2
           }, item.status === 2 ? {} : {}, {
-            v: item.status === 3
+            x: item.status === 3
           }, item.status === 3 ? {} : {}, {
-            w: item.status === 4
+            y: item.status === 4
           }, item.status === 4 ? {} : {}, {
-            x: common_vendor.o(($event) => goComplete(index), item.id),
-            y: item.id
+            z: common_vendor.o(($event) => goComplete(index), item.id),
+            A: item.id
           });
         })
       } : {}, {
diff --git a/unpackage/dist/dev/mp-weixin/pages/orderForm/orderForm.wxml b/unpackage/dist/dev/mp-weixin/pages/orderForm/orderForm.wxml
index 6123ead..09c1d0f 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" bindscrolltolower="{{v}}"><view class="tops"></view><scroll-view style="width:100%;height:84rpx;position:fixed;z-index:10" scroll-x="true"><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></scroll-view><view class="ding-h"></view><block wx:if="{{c}}"><view wx:for="{{d}}" wx:for-item="item" wx:key="y" class="order-box"><view class="orderForm-b" bindtap="{{item.x}}"><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><text wx:if="{{item.f}}" 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.g}}</text></view><view wx:if="{{item.h}}" class="b-b-r-b">{{item.i}}<text>X1</text></view><view wx:if="{{item.j}}" class="b-b-r-b"> 拉新券<text>X1</text></view><view class="b-b-r-b">{{item.k}}</view><view wx:if="{{item.l}}" class="b-b-r-cs">{{item.m}}</view></view></view><view class="orderForm-b-m"><text class="blacsa">原价￥ <text class="bla">{{item.n}}</text></text> <text class="blu">实付款￥<text wx:if="{{item.o}}" class="blues">{{item.p}}</text><text wx:if="{{item.q}}" class="blues">0</text></text><view wx:if="{{item.r}}" class="btns" catchtap="{{item.s}}"> 申请退款 </view><view wx:if="{{item.t}}" class="btnas"></view><view wx:if="{{item.v}}" class="btnst"></view><view wx:if="{{item.w}}" class="btnst"></view></view></view></view></block><view wx:if="{{e}}" class="kong" style="width:100%;height:1000rpx;text-align:center"><image style="width:480rpx;height:400rpx;margin-top:360rpx;margin-left:50%;transform:translateX(-50%)" src="https://www.jiubaotongxue.love/image/demo111.png" alt=""/><view style="width:100%;height:50rpx;line-height:50rpx;text-align:center"> 暂无数据 </view></view><block wx:if="{{f}}"><view wx:for="{{g}}" wx:for-item="item" wx:key="p" class="order-box"><view wx:if="{{item.a}}" class="orderForm-b" bindtap="{{item.o}}"><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" catchtap="{{item.n}}"> 申请退款 </view></view></view></view></block><view wx:if="{{h}}" class="kong" style="width:100%;height:1000rpx;text-align:center"><image style="width:480rpx;height:400rpx;margin-top:360rpx;margin-left:50%;transform:translateX(-50%)" src="https://www.jiubaotongxue.love/image/demo111.png" alt=""/><view style="width:100%;height:50rpx;line-height:50rpx;text-align:center"> 暂无数据 </view></view><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="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><view wx:if="{{k}}" class="kong" style="width:100%;height:1000rpx;text-align:center"><image style="width:480rpx;height:400rpx;margin-top:360rpx;margin-left:50%;transform:translateX(-50%)" src="https://www.jiubaotongxue.love/image/demo111.png" alt=""/><view style="width:100%;height:50rpx;line-height:50rpx;text-align:center"> 暂无数据 </view></view><block wx:if="{{l}}"><view wx:for="{{m}}" 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><view wx:if="{{n}}" class="kong" style="width:100%;height:1000rpx;text-align:center"><image style="width:480rpx;height:400rpx;margin-top:360rpx;margin-left:50%;transform:translateX(-50%)" src="https://www.jiubaotongxue.love/image/demo111.png" alt=""/><view style="width:100%;height:50rpx;line-height:50rpx;text-align:center"> 暂无数据 </view></view><block wx:if="{{o}}"><view wx:for="{{p}}" 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="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 wx:if="{{item.l}}" class="blues">{{item.m}}</text><text wx:if="{{item.n}}" class="blues">0</text></text></view></view></view></block><view wx:if="{{q}}" class="kong" style="width:100%;height:1000rpx;text-align:center"><image style="width:480rpx;height:400rpx;margin-top:360rpx;margin-left:50%;transform:translateX(-50%)" src="https://www.jiubaotongxue.love/image/demo111.png" alt=""/><view style="width:100%;height:50rpx;line-height:50rpx;text-align:center"> 暂无数据 </view></view><block wx:if="{{r}}"><view wx:for="{{s}}" wx:for-item="item" wx:key="p" class="order-box"><view class="orderForm-b" bindtap="{{item.o}}"><view class="orderForm-b-t"><text>订单号:{{item.a}}</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 wx:if="{{item.d}}" class="b-b-r-b">{{item.e}}<text>X1</text></view><view wx:if="{{item.f}}" class="b-b-r-b"> 拉新券<text>X1</text></view><view class="b-b-r-b">{{item.g}}</view><view wx:if="{{item.h}}" class="b-b-r-cs">{{item.i}}</view></view></view><view class="orderForm-b-m"><text class="blacsa">原价￥ <text class="bla">{{item.j}}</text></text> <text class="blu">实付款￥<text wx:if="{{item.k}}" class="blues">{{item.l}}</text><text wx:if="{{item.m}}" class="blues">0</text></text><view wx:if="{{item.n}}" class="btnst"></view></view></view></view></block><view wx:if="{{t}}" class="kong" style="width:100%;height:1000rpx;text-align:center"><image style="width:480rpx;height:400rpx;margin-top:360rpx;margin-left:50%;transform:translateX(-50%)" src="https://www.jiubaotongxue.love/image/demo111.png" alt=""/><view style="width:100%;height:50rpx;line-height:50rpx;text-align:center"> 暂无数据 </view></view><view class="ding"></view></scroll-view><view wx:if="{{w}}" class="thishiWindow"><view class="tishi"><image class="pori" src="https://www.jiubaotongxue.love/image/demo41.png" alt="" bindtap="{{x}}"/><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="{{y}}" 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="{{z}}">取消</button><button class="rights" bindtap="{{A}}">立即呼叫</button></view><view class="ke4"> 为了保证服务质量，您的通话可能会被录音 </view></view></view><view wx:if="{{B}}" class="refund"><view class="refundWindows"><view class="title"> 请输入退款原因 </view><view class="inputBox"><block wx:if="{{r0}}"><textarea class="inputBox_go" name="" id="" cols="30" rows="30" placeholder="请输入退款原因" maxlength="-1" value="{{C}}" bindinput="{{D}}"></textarea></block></view><view class="btn"><view class="btn-left" bindtap="{{E}}"> 取消 </view><view class="btn-right" bindtap="{{F}}"> 确定 </view></view></view></view><windows wx:if="{{G}}" bindcloSe="{{H}}" bindoks="{{I}}" u-i="27e66fbf-1" bind:__l="__l" u-p="{{J}}"></windows>
\ 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" bindscrolltolower="{{v}}"><view class="tops"></view><scroll-view style="width:100%;height:84rpx;position:fixed;z-index:10" scroll-x="true"><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></scroll-view><view class="ding-h"></view><block wx:if="{{c}}"><view wx:for="{{d}}" wx:for-item="item" wx:key="A" class="order-box"><view class="orderForm-b" bindtap="{{item.z}}"><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><text wx:if="{{item.f}}" 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.g}}</text></view><view wx:if="{{item.h}}" class="b-b-r-b">{{item.i}}<text>X1</text></view><view wx:if="{{item.j}}" class="b-b-r-b"> 拉新券<text>X1</text></view><view class="b-b-r-b">{{item.k}}</view><view wx:if="{{item.l}}" class="b-b-r-cs">{{item.m}}</view></view></view><view class="orderForm-b-m"><text class="blacsa">原价￥ <text class="bla">{{item.n}}</text></text> <text class="blu">实付款￥<text wx:if="{{item.o}}" class="blues">{{item.p}}</text><text wx:if="{{item.q}}" class="blues">0</text></text><view wx:if="{{item.r}}" class="btns" catchtap="{{item.s}}"> 申请退款 </view><view wx:if="{{item.t}}" class="btns" catchtap="{{item.v}}"> 结束洗车 </view><view wx:if="{{item.w}}" class="btnas"></view><view wx:if="{{item.x}}" class="btnst"></view><view wx:if="{{item.y}}" class="btnst"></view></view></view></view></block><view wx:if="{{e}}" class="kong" style="width:100%;height:1000rpx;text-align:center"><image style="width:480rpx;height:400rpx;margin-top:360rpx;margin-left:50%;transform:translateX(-50%)" src="https://www.jiubaotongxue.love/image/demo111.png" alt=""/><view style="width:100%;height:50rpx;line-height:50rpx;text-align:center"> 暂无数据 </view></view><block wx:if="{{f}}"><view wx:for="{{g}}" wx:for-item="item" wx:key="p" class="order-box"><view wx:if="{{item.a}}" class="orderForm-b" bindtap="{{item.o}}"><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" catchtap="{{item.n}}"> 申请退款 </view></view></view></view></block><view wx:if="{{h}}" class="kong" style="width:100%;height:1000rpx;text-align:center"><image style="width:480rpx;height:400rpx;margin-top:360rpx;margin-left:50%;transform:translateX(-50%)" src="https://www.jiubaotongxue.love/image/demo111.png" alt=""/><view style="width:100%;height:50rpx;line-height:50rpx;text-align:center"> 暂无数据 </view></view><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="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><view wx:if="{{k}}" class="kong" style="width:100%;height:1000rpx;text-align:center"><image style="width:480rpx;height:400rpx;margin-top:360rpx;margin-left:50%;transform:translateX(-50%)" src="https://www.jiubaotongxue.love/image/demo111.png" alt=""/><view style="width:100%;height:50rpx;line-height:50rpx;text-align:center"> 暂无数据 </view></view><block wx:if="{{l}}"><view wx:for="{{m}}" 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><view wx:if="{{n}}" class="kong" style="width:100%;height:1000rpx;text-align:center"><image style="width:480rpx;height:400rpx;margin-top:360rpx;margin-left:50%;transform:translateX(-50%)" src="https://www.jiubaotongxue.love/image/demo111.png" alt=""/><view style="width:100%;height:50rpx;line-height:50rpx;text-align:center"> 暂无数据 </view></view><block wx:if="{{o}}"><view wx:for="{{p}}" 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="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 wx:if="{{item.l}}" class="blues">{{item.m}}</text><text wx:if="{{item.n}}" class="blues">0</text></text></view></view></view></block><view wx:if="{{q}}" class="kong" style="width:100%;height:1000rpx;text-align:center"><image style="width:480rpx;height:400rpx;margin-top:360rpx;margin-left:50%;transform:translateX(-50%)" src="https://www.jiubaotongxue.love/image/demo111.png" alt=""/><view style="width:100%;height:50rpx;line-height:50rpx;text-align:center"> 暂无数据 </view></view><block wx:if="{{r}}"><view wx:for="{{s}}" wx:for-item="item" wx:key="p" class="order-box"><view class="orderForm-b" bindtap="{{item.o}}"><view class="orderForm-b-t"><text>订单号:{{item.a}}</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 wx:if="{{item.d}}" class="b-b-r-b">{{item.e}}<text>X1</text></view><view wx:if="{{item.f}}" class="b-b-r-b"> 拉新券<text>X1</text></view><view class="b-b-r-b">{{item.g}}</view><view wx:if="{{item.h}}" class="b-b-r-cs">{{item.i}}</view></view></view><view class="orderForm-b-m"><text class="blacsa">原价￥ <text class="bla">{{item.j}}</text></text> <text class="blu">实付款￥<text wx:if="{{item.k}}" class="blues">{{item.l}}</text><text wx:if="{{item.m}}" class="blues">0</text></text><view wx:if="{{item.n}}" class="btnst"></view></view></view></view></block><view wx:if="{{t}}" class="kong" style="width:100%;height:1000rpx;text-align:center"><image style="width:480rpx;height:400rpx;margin-top:360rpx;margin-left:50%;transform:translateX(-50%)" src="https://www.jiubaotongxue.love/image/demo111.png" alt=""/><view style="width:100%;height:50rpx;line-height:50rpx;text-align:center"> 暂无数据 </view></view><view class="ding"></view></scroll-view><view wx:if="{{w}}" class="thishiWindow"><view class="tishi"><image class="pori" src="https://www.jiubaotongxue.love/image/demo41.png" alt="" bindtap="{{x}}"/><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="{{y}}" 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="{{z}}">取消</button><button class="rights" bindtap="{{A}}">立即呼叫</button></view><view class="ke4"> 为了保证服务质量，您的通话可能会被录音 </view></view></view><view wx:if="{{B}}" class="refund"><view class="refundWindows"><view class="title"> 请输入退款原因 </view><view class="inputBox"><block wx:if="{{r0}}"><textarea class="inputBox_go" name="" id="" cols="30" rows="30" placeholder="请输入退款原因" maxlength="-1" value="{{C}}" bindinput="{{D}}"></textarea></block></view><view class="btn"><view class="btn-left" bindtap="{{E}}"> 取消 </view><view class="btn-right" bindtap="{{F}}"> 确定 </view></view></view></view><windows wx:if="{{G}}" bindcloSe="{{H}}" bindoks="{{I}}" u-i="27e66fbf-1" bind:__l="__l" u-p="{{J}}"></windows>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.js b/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.js
index 7ce82ac..e8392fe 100644
--- a/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.js
+++ b/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.js
@@ -4,11 +4,13 @@ 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();
+  const _easycom_windows2 = common_vendor.resolveComponent("windows");
+  (_easycom_navigationStyle2 + _easycom_windows2)();
 }
 const _easycom_navigationStyle = () => "../../components/navigationStyle/navigationStyle.js";
+const _easycom_windows = () => "../../components/windows/windows.js";
 if (!Math) {
-  _easycom_navigationStyle();
+  (_easycom_navigationStyle + _easycom_windows)();
 }
 const _sfc_main = {
   __name: "secondaryCard",
@@ -21,6 +23,9 @@ const _sfc_main = {
     const titles = common_vendor.ref("洗车次卡");
     const bgcolor = common_vendor.ref("#fff");
     const color = common_vendor.ref("#000");
+    const ccc = common_vendor.ref(0);
+    const titleMsg = common_vendor.ref("次卡洗车无法退款 ！");
+    const cardDataValidCardsIndex = common_vendor.ref(0);
     const remo = () => {
       headerindex.value = 1;
     };
@@ -29,7 +34,15 @@ const _sfc_main = {
     };
     common_vendor.ref([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
     const goSencd = (index) => {
-      c.scanQrcode(cardDataValidCards.value[index]);
+      cardDataValidCardsIndex.value = index;
+      ccc.value = 1;
+    };
+    const oks = () => {
+      ccc.value = 0;
+      c.scanQrcode(cardDataValidCards.value[cardDataValidCardsIndex.value]);
+    };
+    const cloSe = () => {
+      ccc.value = 0;
     };
     const quedingsa = () => {
       c.goStar();
@@ -95,6 +108,14 @@ const _sfc_main = {
       }, common_vendor.unref(que) === 1 ? {
         r: common_vendor.o(quedingsa),
         s: common_vendor.o(quedinga)
+      } : {}, {
+        t: ccc.value === 1
+      }, ccc.value === 1 ? {
+        v: common_vendor.o(cloSe),
+        w: common_vendor.o(oks),
+        x: common_vendor.p({
+          titleMsg: titleMsg.value
+        })
       } : {});
     };
   }
diff --git a/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.json b/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.json
index 77ec408..d7dd9d5 100644
--- a/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.json
+++ b/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.json
@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "洗车次卡",
   "usingComponents": {
-    "navigation-style": "../../components/navigationStyle/navigationStyle"
+    "navigation-style": "../../components/navigationStyle/navigationStyle",
+    "windows": "../../components/windows/windows"
   }
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.wxml b/unpackage/dist/dev/mp-weixin/pages/secondaryCard/secondaryCard.wxml
index 608c5e9..68a8b09 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', c && 'headerActive']}}" bindtap="{{d}}"> 可用次卡 <view wx:if="{{b}}" class="act"></view></view><view class="{{['header-right', f && 'headerActive']}}" bindtap="{{g}}"> 失效次卡 <view wx:if="{{e}}" class="act"></view></view></view><scroll-view class="secondaryCard-auto" scroll-y="true"><block wx:if="{{h}}"><view wx:for="{{i}}" 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="{{j}}" class="card-r" bindtap="{{item.e}}"> 使用 </view><view wx:if="{{k}}" class="card-r1"></view></view></block><block wx:if="{{l}}"><view wx:for="{{m}}" wx:for-item="item" wx:key="g" 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="{{n}}" class="card-r"> 使用 </view><view wx:if="{{item.e}}" class="card-r1"></view><view wx:if="{{item.f}}" class="card-r3"></view></view></block><view wx:if="{{o}}" class="kong" style="width:100%;height:1000rpx;text-align:center"><image style="width:480rpx;height:400rpx;margin-top:360rpx;margin-left:50%;transform:translateX(-50%)" src="https://www.jiubaotongxue.love/image/demo111.png" alt=""/><view style="width:100%;height:50rpx;line-height:50rpx;text-align:center"> 暂无数据 </view></view><view wx:if="{{p}}" class="kong" style="width:100%;height:1000rpx;text-align:center"><image style="width:480rpx;height:400rpx;margin-top:360rpx;margin-left:50%;transform:translateX(-50%)" src="https://www.jiubaotongxue.love/image/demo111.png" alt=""/><view style="width:100%;height:50rpx;line-height:50rpx;text-align:center"> 暂无数据 </view></view></scroll-view></view><view wx:if="{{q}}" class="queding"><view class="content"><view class="titles"> 温馨提示 </view><view class="hear"> 确定开始洗车? </view><view class="queding-bottom"><view class="queding-bottom-left" bindtap="{{r}}"> 确定 </view><view class="queding-bottom-right" bindtap="{{s}}"> 取消 </view></view></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', c && 'headerActive']}}" bindtap="{{d}}"> 可用次卡 <view wx:if="{{b}}" class="act"></view></view><view class="{{['header-right', f && 'headerActive']}}" bindtap="{{g}}"> 失效次卡 <view wx:if="{{e}}" class="act"></view></view></view><scroll-view class="secondaryCard-auto" scroll-y="true"><block wx:if="{{h}}"><view wx:for="{{i}}" 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="{{j}}" class="card-r" bindtap="{{item.e}}"> 使用 </view><view wx:if="{{k}}" class="card-r1"></view></view></block><block wx:if="{{l}}"><view wx:for="{{m}}" wx:for-item="item" wx:key="g" 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="{{n}}" class="card-r"> 使用 </view><view wx:if="{{item.e}}" class="card-r1"></view><view wx:if="{{item.f}}" class="card-r3"></view></view></block><view wx:if="{{o}}" class="kong" style="width:100%;height:1000rpx;text-align:center"><image style="width:480rpx;height:400rpx;margin-top:360rpx;margin-left:50%;transform:translateX(-50%)" src="https://www.jiubaotongxue.love/image/demo111.png" alt=""/><view style="width:100%;height:50rpx;line-height:50rpx;text-align:center"> 暂无数据 </view></view><view wx:if="{{p}}" class="kong" style="width:100%;height:1000rpx;text-align:center"><image style="width:480rpx;height:400rpx;margin-top:360rpx;margin-left:50%;transform:translateX(-50%)" src="https://www.jiubaotongxue.love/image/demo111.png" alt=""/><view style="width:100%;height:50rpx;line-height:50rpx;text-align:center"> 暂无数据 </view></view></scroll-view></view><view wx:if="{{q}}" class="queding"><view class="content"><view class="titles"> 温馨提示 </view><view class="hear"> 确定开始洗车? </view><view class="queding-bottom"><view class="queding-bottom-left" bindtap="{{r}}"> 确定 </view><view class="queding-bottom-right" bindtap="{{s}}"> 取消 </view></view></view></view><windows wx:if="{{t}}" bindcloSe="{{v}}" bindoks="{{w}}" u-i="7c737da3-1" bind:__l="__l" u-p="{{x}}"></windows>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/yijian/yijian.js b/unpackage/dist/dev/mp-weixin/pages/yijian/yijian.js
index eb564ca..ed111e0 100644
--- a/unpackage/dist/dev/mp-weixin/pages/yijian/yijian.js
+++ b/unpackage/dist/dev/mp-weixin/pages/yijian/yijian.js
@@ -28,7 +28,7 @@ const _sfc_main = {
               title: "提交成功",
               duration: 1e3,
               success: (result) => {
-                common_vendor.index.navigateTo({
+                common_vendor.index.switchTab({
                   url: "/pages/my/my"
                 });
               }
diff --git a/unpackage/dist/dev/mp-weixin/stor/my/my.js b/unpackage/dist/dev/mp-weixin/stor/my/my.js
index c99acd6..4f7a7f7 100644
--- a/unpackage/dist/dev/mp-weixin/stor/my/my.js
+++ b/unpackage/dist/dev/mp-weixin/stor/my/my.js
@@ -66,6 +66,17 @@ const my = common_vendor.defineStore("my", () => {
     Information.value = await api_api.GetInformation({ phoneNumber: common_vendor.index.getStorageSync("phoneNumber") });
     Information.value = Information.value.data;
     console.log(Information.value);
+    common_vendor.index.setStorageSync("wxname", Information.value.wechatName);
+    common_vendor.index.setStorageSync("wxImg", Information.value.icon);
+  };
+  const getUserApi = async (data) => {
+    const res = await api_api.getUserSex({
+      phoneNumber: common_vendor.index.getStorageSync("phoneNumber"),
+      name: common_vendor.index.getStorageSync("wxname"),
+      icon: common_vendor.index.getStorageSync("wxImg"),
+      sex: "男"
+    });
+    console.log(res);
   };
   return {
     maskPhoneNumber,
@@ -78,7 +89,8 @@ const my = common_vendor.defineStore("my", () => {
     drivers,
     getDrivers,
     Information,
-    getInformation
+    getInformation,
+    getUserApi
   };
 });
 exports.my = my;
diff --git a/unpackage/dist/dev/mp-weixin/stor/order/order.js b/unpackage/dist/dev/mp-weixin/stor/order/order.js
index 899703d..746f2b4 100644
--- a/unpackage/dist/dev/mp-weixin/stor/order/order.js
+++ b/unpackage/dist/dev/mp-weixin/stor/order/order.js
@@ -33,12 +33,29 @@ const order = common_vendor.defineStore("order", () => {
     api_api.shop({
       phone: common_vendor.index.getStorageSync("phoneNumber"),
       mid: data.mid,
-      orderId: data.id
+      orderId: data.id,
+      payType: data.payType
     }).then((res) => {
       current.value = res.data;
       console.log(res);
-      if (res.code === 0) {
+      console.log(data);
+      if (res.code === 200 && data.payType === 2 || res.code === 200 && data.payType === 1) {
         getRefundApi(data);
+        return;
+      }
+      if (res.code === 200) {
+        setTimeout(() => {
+          common_vendor.index.switchTab({
+            url: "/pages/my/my",
+            success: () => {
+              common_vendor.index.showToast({
+                icon: "none",
+                title: "结束洗车成功",
+                duration: 1e3
+              });
+            }
+          });
+        }, 800);
       }
     });
   };