From 4e5031eb9d34f2bb358889a58abb23f70416e407 Mon Sep 17 00:00:00 2001
From: cjb <646858191@qq.com>
Date: Sat, 29 Mar 2025 17:22:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/homePages/reservation/index.vue |  40 +++--
 src/minePages/account/index.vue     |  10 +-
 src/minePages/order/index.vue       |  81 +++++++---
 src/minePages/order/item.vue        | 224 ++++++++++++++++++++++++++++
 src/minePages/order/parcont.vue     |  32 ++++
 src/minePages/payment/index.vue     |   4 +-
 src/minePages/recharge/index.vue    |   4 +-
 src/minePages/reserlist/index.vue   |   9 +-
 src/minePages/userInfor/index.vue   |   6 +
 src/mixin.d.ts                      |   4 +
 src/mixin.ts                        |  17 +++
 src/pages/home/index.vue            |  44 ++++--
 src/pages/login/index.vue           |  17 ++-
 src/pages/mine/index.vue            |  12 +-
 src/pages/scanCode/index.vue        |   2 +-
 src/static/img/share.png            | Bin 0 -> 28391 bytes
 src/utils/request.ts                |   2 +-
 src/utils/service.ts                |  13 +-
 18 files changed, 453 insertions(+), 68 deletions(-)
 create mode 100644 src/minePages/order/item.vue
 create mode 100644 src/minePages/order/parcont.vue
 create mode 100644 src/mixin.d.ts
 create mode 100644 src/mixin.ts
 create mode 100644 src/static/img/share.png

diff --git a/src/homePages/reservation/index.vue b/src/homePages/reservation/index.vue
index d3d7336..cb0ba4f 100644
--- a/src/homePages/reservation/index.vue
+++ b/src/homePages/reservation/index.vue
@@ -50,16 +50,30 @@
 				</view>
 				<view v-else-if="nuindex == 2" style="display: flex;justify-content: space-between;align-items: center;padding-top: 12rpx;">
 					<up-input  type="number" maxlength="11" v-model="formdata.phone" border="none" placeholder="请输入手机号" clearable />
-					<view>获取验证码</view>
+					<!-- <view>获取验证码</view> -->
 				</view>
 			</up-form-item>
-			<up-form-item
-			  label="车牌号"
-			  prop="plateNum"
-			  borderBottom
-			>
-				<up-input v-model="formdata.plateNum" border="none" readonly placeholder="请选择车牌号" suffixIcon="arrow-down" suffixIconStyle="color: #bababa" @tap="cphand" />
-			</up-form-item>
+			<template  v-if="cpcolumns.length > 0">
+				<up-form-item
+				  label="车牌号"
+				  prop="plateNum"
+				  borderBottom
+				>
+					<up-input v-model="formdata.plateNum" border="none" readonly placeholder="请选择车牌号" suffixIcon="arrow-down" suffixIconStyle="color: #bababa" @tap="cphand" />
+				</up-form-item>
+			</template>
+			<template v-else>
+				<up-form-item
+				  label="车牌号"
+				  borderBottom
+				>
+					<view style="display: flex;align-items: center;">
+						<view>暂未绑定车辆</view>
+						<view style="padding-left:40rpx;color: #8bc34a;">去绑定</view>
+					</view>
+				</up-form-item>
+			</template>
+			
 			<up-form-item
 			  label="换电站"
 			  prop="stationName"
@@ -179,10 +193,11 @@
 			  uni.setStorageSync('PhoneNumber', rps.data)
 		  })
 	}
+	let userInfor = uni.getStorageSync('userInfor')
 	let formdata = reactive({
 		source:'1',										//来源：1-小程序，2-云端，3-站端
 		ucode:uni.getStorageSync('wxuid'),				//预约人编码
-		uname:'',										//预约人姓名
+		uname:userInfor.name?userInfor.name:'',										//预约人姓名
 		phone:'',										//手机号码	
 		plateNum:'',									//车牌号
 		stationCode:'',									//换电站编码
@@ -194,7 +209,7 @@
 	
 	let hdzcode = ref('')
 	onLoad((opt:any) => {
-		hdzcode.value = opt.hdzcode
+		hdzcode.value = opt.hdzcode?opt.hdzcode:''
 		if(opt.phoneNumber){
 			formdata.phone = opt.phoneNumber
 			nuindex.value = 1
@@ -332,7 +347,10 @@
 			'11:00 - 12:00',
 			'12:00 - 13:00',
 			'13:00 - 14:00',
-			'14:00 - 15:00'
+			'14:00 - 15:00',
+			'15:00 - 16:00',
+			'16:00 - 17:00',
+			'17:00 - 18:00'
 		]
 	])
 	function timeconfirm(v:any) {
diff --git a/src/minePages/account/index.vue b/src/minePages/account/index.vue
index 6a1647d..d428636 100644
--- a/src/minePages/account/index.vue
+++ b/src/minePages/account/index.vue
@@ -30,10 +30,11 @@
 						<view v-if="n.tradeType == 1" style="padding-bottom: 8rpx;font-size: 40rpx;color: #00aa00;">+<text>{{n.tradeTotalAmount/100}}</text></view>
 						<view v-else-if="n.tradeType == 2" style="padding-bottom: 8rpx;font-size: 40rpx;color: #191919;"><text>{{n.tradeTotalAmount/100}}</text></view>
 						<view v-else-if="n.tradeType == 9" style="padding-bottom: 8rpx;font-size: 40rpx;color: #c79a11;">-<text>{{n.tradeTotalAmount/100}}</text></view>
-						<!-- <view style="font-size: 30rpx;color: #ccc;">实际到账金额：100元</view> -->
+						
 					</view>
 				</view>
-				<up-empty v-if="list.length == 0" mode="list" text="暂无记录" />
+				<!-- <view style="font-size: 30rpx;color: #ccc;">实际到账金额：100元</view> -->
+				<up-empty v-if="isempty" mode="list" text="暂无记录" />
 				<up-loadmore v-else :status="status" color="#c0c4cc" lineColor="#c0c4cc" />
 				<!-- <view class="mxitem">
 					<view>
@@ -67,17 +68,20 @@
 		pageSize:30,
 		pageNo:1
 	})
+	let isempty = ref(false)
 	let list = ref<any[]>([])
 	function getylist() {
 		balancedetails(qsobj).then((rps:any) => {
 			if(rps.data.total > 0){
-				list.value = [...list.value,...rps.data.records] 
+				 list.value = [...list.value,...rps.data.records] 
 				if(list.value.length == rps.data.total){
 					status.value = 'nomore'
 				}else{
 					status.value = 'loadmore'
 					qsobj.pageNo++
 				}
+			}else{
+				isempty.value = true
 			}
 		})
 	}
diff --git a/src/minePages/order/index.vue b/src/minePages/order/index.vue
index aa043f9..cfcb2ea 100644
--- a/src/minePages/order/index.vue
+++ b/src/minePages/order/index.vue
@@ -16,7 +16,7 @@
 			  lineColor="#00aa00"
 			/>
 		</view>
-		<view class="lisct">
+		<!-- <view class="lisct">
 			<view v-for="n in list" :key="n.orderNo" class="list">
 				<view class="zoddu">
 					<view>
@@ -37,17 +37,27 @@
 					</view>
 					<view>
 						<view>订单状态</view>
-						<view>{{dsta(n.status)}}</view>
+						<view>{{statev[n.status]}}</view>
 					</view>
 					<view>
 						<view style="color: #5f5f5f;">{{n.orderTime}}</view>
 						<view style="color: #009688;" @tap="getbz(n.orderNo)">查看换电详情</view>
 					</view>
+					<view class="hdbzcont">
+						<up-steps v-if="show && bzlist.length > 0" :current="bzlist.length" direction="column">
+							<up-steps-item v-for="n in bzlist" :title="hdbzname(n.step)" :desc="n.stepTime" />
+						</up-steps>
+						<up-empty v-else mode="list" text="暂无记录" />
+					</view>
 				</view>
 				<view v-if="n.status == 6" class="qxyy" @tap="topay(`/minePages/payment/index?orderNo=${n.orderNo}&amount=${n.amount}&plateNum=${n.plateNum}&stationName=${n.stationName}`)">去支付</view>
 			</view>
-		</view>
-		<up-empty v-if="list.length == 0" mode="list" text="暂无订单" />
+		</view> -->
+		<parent :actv="0">
+			<item v-for="(n,index) in list" :key="n.orderNo" :n="n" :index="index" />
+		</parent>
+
+		<up-empty v-if="isempty" mode="list" text="暂无订单" />
 		<up-loadmore v-else :status="status" color="#c0c4cc" lineColor="#c0c4cc" />
 	</view>
 	<up-popup
@@ -57,9 +67,10 @@
 	 @close="bzclose"
 	 >
 		<view class="hdbzcont">
-			<up-steps v-if="show" :current="bzlist.length" direction="column">
+			<up-steps v-if="show && bzlist.length > 0" :current="bzlist.length" direction="column">
 				<up-steps-item v-for="n in bzlist" :title="hdbzname(n.step)" :desc="n.stepTime" />
 			</up-steps>
+			<up-empty v-else mode="list" text="暂无记录" />
 		</view>
 	</up-popup>
 </template>
@@ -69,6 +80,9 @@
 	import { orderlist,dzbzxq } from '@/utils/service'
 	import { onShow,onReachBottom } from '@dcloudio/uni-app'
 	
+	import Parent from './parcont.vue'
+	import Item from './item.vue'
+	
 	onShow(() => {
 		pageNo.value = 1
 		list.value.splice(0)
@@ -93,10 +107,11 @@
 		}else if(n == 8){
 			return '换电完成'
 		}
+		return ''
 	}
 
 	
-	//订单状态  1-已创建，2-换电中，3-换电完成，4-充电中，5-充电完成，6-待结算，7-已完成，9-已取消
+	//订单状态  1-已创建，2-换电中，3-换电完成，4-充电中，5-充电完成，6-待支付，7-已完成，9-已取消
 	const statelist = reactive([  
 	    { name: '全部'}, 
 		{ name: '进行中', status:'1,2,3,4,5' },
@@ -106,14 +121,25 @@
 	
 	let status = ref('nomore')  //loadmore loading
 	
+	// {
+	// 	orderNo:'123456789DV2',
+	// 	plateNum:'冀A12345D',
+	// 	stationName:'石家庄1号换电站',
+	// 	amount:'2000',
+	// 	status:'2'
+		
+	// }
+	
 	let list = ref<any[]>([])
 	let pageNo = ref(1)
 	let stanum = ref('')
+	let isempty = ref(false)
 	//点击tabs
 	function tabshand(n:any){
 		pageNo.value = 1
 		list.value.splice(0)
 		stanum.value = n.status
+		isempty.value = false
 		getlist()
 	}
 	function getlist() {
@@ -135,6 +161,8 @@
 					status.value = 'loadmore'
 					pageNo.value++
 				}
+			}else{
+				isempty.value = true
 			}
 		})
 	}
@@ -143,8 +171,9 @@
 	let bzlist = ref<any[]>([])
 	function getbz(orderNo:any) {
 		bzlist.value.splice(0)
-		show.value = true
+		
 		dzbzxq(orderNo).then((rps:any) => {
+			show.value = true
 			bzlist.value = rps.data
 		})
 	}
@@ -153,18 +182,29 @@
 		show.value = false
 	}
 	
-	function dsta(n:any) {
-		if(n == 6){
-			return '待支付'
-		}
-		if(n == 7){
-			return '已完成'
-		}
-		if(n == 9){
-			return '已取消'
-		}
-		return '进行中'
-	}
+	const statev =ref({
+		1:'已创建',
+		2:'换电中',
+		3:'换电完成',
+		4:'充电中',
+		5:'充电完成',
+		6:'待支付',
+		7:'已完成',
+		9:'已取消'
+	}) 
+	
+	// function dsta(n:any) {
+	// 	if(n == 6){
+	// 		return '待支付'
+	// 	}
+	// 	if(n == 7){
+	// 		return '已完成'
+	// 	}
+	// 	if(n == 9){
+	// 		return '已取消'
+	// 	}
+	// 	return '进行中'
+	// }
 	
 	function topay(url:string) {
 		uni.navigateTo({
@@ -187,13 +227,14 @@
 		background: #f4f4f4;
 	}
 	.content{
-		padding-bottom: 30rpx;
+		padding-bottom: 20rpx;
 		.tabct{
 			position: fixed;
 			width: 100%;
 			box-sizing: border-box;
 			padding-bottom: 10rpx;
 			background: #fff;
+			z-index: 99;
 		}
 		.lisct{
 			padding-top: 130rpx;
diff --git a/src/minePages/order/item.vue b/src/minePages/order/item.vue
new file mode 100644
index 0000000..879c21b
--- /dev/null
+++ b/src/minePages/order/item.vue
@@ -0,0 +1,224 @@
+<template>
+	<view :key="n.orderNo" class="list">
+		<view class="zoddu">
+			<view>
+				<view>订单号</view>
+				<view style="font-size: 28rpx;">{{n.orderNo}}</view>
+			</view>
+			<view>
+				<view>车牌号</view>
+				<view>{{n.plateNum}}</view>
+			</view>
+			<view>
+				<view>换电站</view>
+				<view>{{n.stationName}}</view>
+			</view>
+			<view v-if="n.status == 6 || n.status == 7">
+				<view>订单金额</view>
+				<view>{{n.amount/100}}元</view>
+			</view>
+			<view>
+				<view>订单状态</view>
+				<view>{{statev[n.status]}}</view>
+			</view>
+			<view>
+				<view style="color: #5f5f5f;">{{n.orderTime}}</view>
+				<!-- <view style="color: #009688;" @tap="getbz(n.orderNo)">查看换电详情</view> -->
+				<view style="display: flex;align-items:center;color: #009688;" @tap="toghand">
+					<view style="padding-right: 10rpx;">查看换电步骤</view>
+					<up-icon v-if="isactv" name="arrow-up" color="#009688" size="16" />
+					<up-icon v-else name="arrow-down" color="#009688" size="16" />
+				</view>
+			</view>
+			<view v-if="isactv" style="display: block;margin-top: 15rpx;padding-top: 30rpx;border-top: 1px dashed #009688;">
+				<!--v-if="bzlist.length == 2"-->
+				<!--border: 1px solid #009688;border-radius: 10rpx;-->
+				<view style="display:flex;margin-bottom:20px;align-items: center;justify-content: space-between;">
+					<view style="display:flex;align-items: center;color:#009688;">
+						<view style="padding-right: 5rpx;">车辆已到达指定位置</view>
+						<up-icon name="checkmark" color="#009688" size="20" />
+					</view>
+					<view style="width: 160rpx;height: 70rpx;line-height: 70rpx;border:1px solid #009688;border-radius:10rpx;text-align: center;color:#009688;" @tap="showPop = true">确认换电</view>
+				</view>
+				<view>
+					<up-steps v-if="bzlist.length > 0" :current="bzlist.length" direction="column" activeColor="#009688">
+						<up-steps-item v-for="n in bzlist" :title="hdbzname(n.step)" :desc="n.stepTime" :key="n.step" />
+					</up-steps>
+				</view>
+				
+				
+				<up-empty v-if="isempty" mode="list" text="暂无换电记录" />
+				<up-loading-icon v-if="loading" />
+			</view>
+		</view>
+		<view v-if="n.status == 6" class="qxyy" @tap="topay(`/minePages/payment/index?orderNo=${n.orderNo}&amount=${n.amount}&plateNum=${n.plateNum}&stationName=${n.stationName}`)">去支付</view>
+		
+		<up-popup
+		 :show="showPop" 
+		 mode="center" 
+		 round="10"
+		 :closeOnClickOverlay="true"
+		 >
+			<view style="box-sizing: border-box;position: relative;;width: 640rpx;">
+				<view style="padding: 50rpx 20rpx 150rpx;text-align: center;">
+					<view style="font-size:38rpx;">确认方向盘是否回正</view>
+					<view style="padding-top: 10rpx;color: #f00;">方向盘未回正可能会对车辆造成损伤!</view>
+				</view>
+				<view style="width: 50%;margin: 0 auto;text-align: center;height: 80rpx;line-height: 80rpx;background: #009688;border-radius:20rpx;color: #fff;" @tap="showsxhand">确认方向盘已回正</view>
+			</view>
+		</up-popup>
+		
+		<up-popup
+		 :show="showsxpop" 
+		 mode="center" 
+		 round="10"
+		 :closeOnClickOverlay="true"
+		 >
+			<view style="box-sizing: border-box;position: relative;;width: 640rpx;">
+				<view style="padding: 50rpx 20rpx 150rpx;text-align: center;">
+					<view style="font-size:38rpx;">确认手刹是否放开</view>
+					<view style="padding-top: 10rpx;color: #f00;">手刹未放开可能会对车辆造成损伤!</view>
+				</view>
+				<view style="width: 50%;margin: 0 auto;text-align: center;height: 80rpx;line-height: 80rpx;background: #009688;border-radius:20rpx;color: #fff;" @tap="huandhand">确认手刹已放开</view>
+			</view>
+		</up-popup>
+	</view>
+</template>
+
+<script lang="ts" setup>
+	import { ref,inject,computed } from 'vue'
+	import { dzbzxq } from '@/utils/service'
+	const props = withDefaults(defineProps<{
+		n:any
+		index:string|number
+	  }>(), {
+		n:{},
+		index:0
+	  })
+	  
+	const { actv, setActv } = inject<any>('parc')
+	
+	const isactv = computed(() =>  actv.value === props.index)
+	
+	function toghand() {
+		if(!isactv.value){
+			getbz(props.n.orderNo)
+		}
+		setActv(props.index)
+	}
+	
+	//查看换电步骤
+	let bzlist = ref<any[]>([])
+	let isempty = ref(false)
+	let loading = ref(true)
+	function getbz(orderNo:any) {
+		bzlist.value.splice(0)		
+		isempty.value = false
+		dzbzxq(orderNo).then((rps:any) => {
+			loading.value = false
+			if(rps.data && rps.data.length > 0){
+				bzlist.value = rps.data
+			}else{
+				isempty.value = true
+			}
+			
+		}).catch(() => {
+			loading.value = false
+		})
+	}
+	
+	if(isactv.value){
+		getbz(props.n.orderNo)
+	}
+	
+	function hdbzname(n:string|number) {
+		if(n == 1){
+			return '车辆进站'
+		}else if(n == 2){
+			return '车辆到达指定位置'
+		}else if(n == 3){
+			return '启动对中机构'
+		}else if(n == 4){
+			return '取新电池'
+		}else if(n == 5){
+			return '拆旧电池'
+		}else if(n == 6){
+			return '装新电池'
+		}else if(n == 7){
+			return '放旧电池'
+		}else if(n == 8){
+			return '换电完成'
+		}
+		return ''
+	}
+	
+	const statev =ref({
+		1:'已创建',
+		2:'换电中',
+		3:'换电完成',
+		4:'充电中',
+		5:'充电完成',
+		6:'待支付',
+		7:'已完成',
+		9:'已取消'
+	}) 
+	
+	function topay(url:string) {
+		uni.navigateTo({
+			url
+		})
+	}
+	
+	//确定换电提示
+	let showPop = ref(false)	//方向盘
+	let showsxpop = ref(false)	//手刹
+	
+	function showsxhand(){
+		showPop.value = false
+		showsxpop.value = true
+	}
+	
+	//确认换电
+	function huandhand() {
+		showsxpop.value = false
+		uni.showToast({
+			title: '操作成功',
+			duration: 2000
+		})
+	}
+</script>
+
+<style lang="scss" scoped>
+	.list{
+		margin:0 25rpx 40rpx;
+		//padding: 25rpx;
+		border-radius: 20rpx;
+		box-shadow: 0 0 10px 2px rgba(190, 190, 190, 0.5);
+		background: #fff;
+		.zoddu{
+			padding: 25rpx;
+			//margin-bottom: 30rpx;
+			//padding-top: 20rpx;
+			//border-top: 1px dashed #ccc;
+			>view{
+				display: flex;
+				padding-bottom: 20rpx;
+				justify-content: space-between;
+				>view:last-child{
+					color: #7a7a7a;
+				}
+			}
+			>view:last-child{
+				padding-bottom: 0;
+			}
+		}
+		.qxyy{
+			height: 80rpx;
+			line-height: 80rpx;
+			border-radius: 0 0 20rpx 20rpx;
+			color: #fff;
+			text-align: center;
+			background: #00aa00;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/src/minePages/order/parcont.vue b/src/minePages/order/parcont.vue
new file mode 100644
index 0000000..91c9b8f
--- /dev/null
+++ b/src/minePages/order/parcont.vue
@@ -0,0 +1,32 @@
+<template>
+	<view class="lisct">
+		<slot />
+	</view>
+</template>
+<script lang="ts" setup>
+	import { ref, provide } from 'vue'
+	
+	const props = withDefaults(defineProps<{
+		actv:any
+	  }>(), {
+		actv:null
+	  })
+	
+	let actv = ref(props.actv)
+	function setActv(id:string|number) {
+		actv.value = id
+	}
+	
+	provide('parc',{
+		actv,
+		setActv
+	})
+	
+</script>
+
+<style lang="scss" scoped>
+	.lisct{
+		padding-top: 130rpx;
+		
+	}
+</style>
\ No newline at end of file
diff --git a/src/minePages/payment/index.vue b/src/minePages/payment/index.vue
index 31d1fb8..e31948e 100644
--- a/src/minePages/payment/index.vue
+++ b/src/minePages/payment/index.vue
@@ -24,8 +24,8 @@
 					<image src="/src/static/img/yuer.png" style="width: 60rpx;height: 60rpx;" />
 					<view style="padding-left: 10rpx;">余额</view>
 					<view v-if="iskt" style="flex:1;font-size: 30rpx;;text-align:right;color: #949494;">
-						<template v-if="iskzf">可用{{totalAmount}}元</template>
-						<template v-else>余额不足，剩余{{totalAmount}}元</template>
+						<template v-if="iskzf">可用{{totalAmount/100}}元</template>
+						<template v-else>余额不足，剩余{{totalAmount/100}}元</template>
 					</view>
 					<view v-else style="flex:1;text-align:right;color: #949494;">暂未开通</view>
 				</view>
diff --git a/src/minePages/recharge/index.vue b/src/minePages/recharge/index.vue
index 94d30bb..d83a7af 100644
--- a/src/minePages/recharge/index.vue
+++ b/src/minePages/recharge/index.vue
@@ -51,14 +51,14 @@
 
 <script setup lang="ts">
 	import { ref,reactive } from 'vue'
-	import { payment,getip,getInfo,getaccou,openaccou } from '@/utils/service'
+	import { payment,getip,getInfo,getaccou,openaccou,isktbal } from '@/utils/service'
 	import { onLoad } from '@dcloudio/uni-app'
 	
 	// onLoad((opt:any) => {
 	// 	payqs.attach.walletCode = opt.walletCode
 	// })
 	
-	getaccou(uni.getStorageSync('wxuid')).then((rps:any) => {
+	isktbal(uni.getStorageSync('wxuid')).then((rps:any) => {
 		if(!rps.data.records){
 			//开通余额
 			openaccou(uni.getStorageSync('wxuid'))
diff --git a/src/minePages/reserlist/index.vue b/src/minePages/reserlist/index.vue
index 0f77f6b..5b42e68 100644
--- a/src/minePages/reserlist/index.vue
+++ b/src/minePages/reserlist/index.vue
@@ -42,9 +42,10 @@
 					<view v-else class="qxyy">已过期</view>
 				</view>
 			</view>
+			<up-empty v-if="isempty" mode="list" text="暂无预约记录" />
+			<up-loadmore v-else :status="status" color="#c0c4cc" lineColor="#c0c4cc" />
 		</view>
-		<up-empty v-if="list.length == 0" mode="list" text="暂无预约记录" />
-		<up-loadmore v-else :status="status" color="#c0c4cc" lineColor="#c0c4cc" />
+		
 </template>
 
 <script setup lang="ts">
@@ -72,11 +73,13 @@
 	let list = ref<any[]>([])
 	let pageNo = ref(1)
 	let stanum = ref('')
+	let isempty = ref(false)
 	//点击tabs
 	function tabshand(n:any){
 		pageNo.value = 1
 		list.value.splice(0)
 		stanum.value = n.status
+		isempty.value = false
 		getlist()
 	}
 	function getlist() {
@@ -98,6 +101,8 @@
 					status.value = 'loadmore'
 					pageNo.value++
 				}
+			}else{
+				isempty.value = true
 			}
 		})
 	}
diff --git a/src/minePages/userInfor/index.vue b/src/minePages/userInfor/index.vue
index ea74bda..3c3a85f 100644
--- a/src/minePages/userInfor/index.vue
+++ b/src/minePages/userInfor/index.vue
@@ -106,6 +106,12 @@
 		formdata.avatarUrl = rps.data.avatarUrl?rps.data.avatarUrl:''
 		formdata.name = rps.data.name?rps.data.name:''
 		formdata.gender = rps.data.gender?rps.data.gender:''
+		if(rps.data.gender == 1){
+			genderName.value = '男'
+		}else if(rps.data.gender == 2){
+			genderName.value = '女'
+		}
+		
 	})
 	
 	const rules = {
diff --git a/src/mixin.d.ts b/src/mixin.d.ts
new file mode 100644
index 0000000..1715fb2
--- /dev/null
+++ b/src/mixin.d.ts
@@ -0,0 +1,4 @@
+// declare module '/mixin' {
+//   const mixin: any;
+//   export default mixin;
+// }
\ No newline at end of file
diff --git a/src/mixin.ts b/src/mixin.ts
new file mode 100644
index 0000000..02305b9
--- /dev/null
+++ b/src/mixin.ts
@@ -0,0 +1,17 @@
+// import {onShareAppMessage,onShareTimeline} from "@dcloudio/uni-app"
+export default {
+	onShareAppMessage() {
+		return {
+		title: 'EVO换电',
+		path: '/pages/home/index',
+		imageUrl: '/static/img/share.png'
+		}
+	},
+	onShareTimeline() {
+		return {
+		title: 'EVO换电',
+		query: 'from=share',
+		imageUrl: '/static/img/share.png'
+		}
+	}
+}
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index eb26030..5ceb067 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -61,7 +61,7 @@
 						<image src="../../static/img/chongz.png" />
 						<view>充值中心</view>
 					</view>
-					<view @tap="topage('/minePages/reserlist/index')">
+					<view @tap="wdltip()">
 						<image src="../../static/img/shiyxy.png" />
 						<view>预约记录</view>
 					</view>
@@ -120,10 +120,13 @@
 	 >
 		<view style="box-sizing: border-box;padding: 20rpx;background: #fff;">
 			<view style="margin-bottom: 20rpx;padding-bottom:20rpx;font-size: 40rpx;text-align: center;color: #00aa7f;border-bottom: 1px #00aa7f dashed;">伊特换电使用协议</view>
-			<view style="height: 30vh;overflow-y: scroll;">
+			<view style="height: 600rpx;overflow-y: auto;">
 				<view style="padding: 25rpx 25rpx 50rpx;font-size: 26rpx;">
 					<view style="padding-bottom: 30rpx;font-weight: bold;text-align: center;">{{xyobj.title}}</view>
-					<up-parse :content="decodeURIComponent(xyobj.content)"></up-parse>
+					
+					 <scroll-view scroll-y="true" style="height: 600rpx;">
+					   <up-parse  :content="decodeURIComponent(xyobj.content)"></up-parse>
+					</scroll-view>
 				</view>
 			</view>
 			<!-- <view style="display: flex;align-items: center;;padding-top: 10rpx;">
@@ -141,7 +144,7 @@
 
 <script setup lang="ts">
 import { ref,reactive,watch,getCurrentInstance  } from 'vue'
-import { onLoad,onShow } from '@dcloudio/uni-app'
+import { onLoad,onShow,onTabItemTap } from '@dcloudio/uni-app'
 import { 
 	login,
 	getUser,
@@ -160,10 +163,10 @@ let	covers =ref<any[]>([])
 let hdzcode = ref('')
 let imglist = ref<any[]>([])
 
-// uni.removeStorageSync('wxuid')
-// uni.removeStorageSync('wxToken')
-// uni.removeStorageSync('PhoneNumber')
-
+uni.removeStorageSync('wxuid')
+uni.removeStorageSync('wxToken')
+uni.removeStorageSync('PhoneNumber')
+uni.removeStorageSync('Init')
 
 let xyobj = ref<any>({})
 let account = ref<any>({})
@@ -190,18 +193,21 @@ onShow(() => {
 	//判断是否登录
 	if(uni.getStorageSync('wxuid')){
 		islogin.value = true
-		if(!isinit){
-			getinfo()
-		}else{
-			isinit = false
-		}
+		getinfo()	//??
+		// if(!isinit){
+		// 	getinfo()
+		// }else{
+		// 	isinit = false
+		// }
 	}else{
 		islogin.value = false
 		PhoneNumber.value = ''
 		covers.value = []
 		//hdzcode.value = ''
 		imglist.value = []
-		showxy()
+		if(!uni.getStorageSync('Init')){
+			showxy()
+		}
 	}
 	const instance = getCurrentInstance()
 	const query = uni.createSelectorQuery().in((instance as any).proxy)
@@ -379,6 +385,10 @@ function btnshan(type:number = 1) {
 			xyshow.value = false
 			uni.showTabBar()
 			islogin.value = true
+			
+			//是否初次使用
+			uni.setStorageSync('Init',true)
+			
 			getinfo()
 			setTimeout(()=> {
 				uni.getLocation({
@@ -461,11 +471,13 @@ page{
 	justify-content: space-between;
 	padding:20rpx 0 100rpx 0;
 	>view{
+		display: flex;
+		box-sizing: border-box;
 		width: 300rpx;
 		height: 80rpx;
-		line-height: 80rpx;
+		align-items: center;
+		justify-content: center;
 		border-radius: 50rpx;
-		text-align: center;
 		color: #fff;
 		background: #00aa00;
 	}
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 16f5659..e6ef7df 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -1,16 +1,19 @@
 <template>
   <view class="content">
     <image style="width: 200rpx;height: 90rpx;" src="/static/logo.png" />
-	<view style="padding: 50rpx 50rpx 80rpx;font-size: 50rpx;color: #4CAF50;">伊特换电</view>
+	<view style="padding: 50rpx 50rpx 160rpx;font-size: 50rpx;color: #4CAF50;">伊特换电</view>
     <!-- <view @tap="getUser()" style="width: 80%;height: 80rpx;margin-bottom:30rpx;line-height: 80rpx;border-radius:10rpx;color:#fff;text-align:center;background: #4CAF50;">微信授权登录</view> -->
 	<!-- <button
     	style="width: 80%;height: 80rpx;line-height: 80rpx;border-radius:10rpx;color:#fff;text-align:center;background: #4CAF50;"
     	open-type="getPhoneNumber" 
     	@getphonenumber="onGetPhoneNumber"
     >手机号快捷登录</button> -->
-	<button style="width: 85%;height: 80rpx;line-height: 80rpx;border-radius:10rpx;color:#fff;text-align:center;background: #4CAF50;" @tap="login">登 录</button>
+	<button style="width: 90%;height: 80rpx;line-height: 80rpx;border-radius:10rpx;color:#fff;text-align:center;background: #4CAF50;" @tap="login">登 录</button>
 	<view style="display: flex;align-items: center;;padding-top: 20rpx;">
-		<label class="radio"><radio value="r1" :checked="checked" @tap="checked = !checked" style="transform:scale(80%);" />已阅读并同意</label>
+		<view class="radio" @tap="checked = !checked">
+			<radio value="r1" :checked="checked" style="transform:scale(80%);" />
+			已阅读并同意
+		</view>
 		<view @tap="topage('/minePages/agreement/index?type=1')" style="padding: 0 10rpx;color: #ffaa00;">《服务条款》</view>
 		<view @tap="topage('/minePages/agreement/index?type=2')" style="color: #ffaa00;">《隐私协议》</view>
 	</view>
@@ -34,7 +37,13 @@ import { getphone,getUser } from '@/utils/service'
   function login() {
 	  if(checked.value){
 		  getUser().then(() => {
-			uni.navigateBack()
+			  uni.showToast({
+			  	title: '登录成功',
+			  	duration: 2000
+			  })
+			  setTimeout(() => {
+			  	uni.navigateBack()
+			  },2300)
 		  })
 	  }else{
 		uni.showToast({
diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue
index 907838f..63fe385 100644
--- a/src/pages/mine/index.vue
+++ b/src/pages/mine/index.vue
@@ -176,7 +176,7 @@
 <script setup lang="ts">
 	import { ref,reactive } from 'vue'
 	import { onShow } from '@dcloudio/uni-app'
-	import { getInfo } from '@/utils/service'
+	import { getInfo,getaccou } from '@/utils/service'
 	
 	let islogin = ref(false)
 	let PhoneNumber = ref('')
@@ -205,7 +205,15 @@
 				userInfo.name = rps.data.name?rps.data.name:''
 			})
 			
-			totalAmount.value = uni.getStorageSync('totalAmount')
+			//获取账户信息
+			getaccou(uni.getStorageSync('wxuid')).then((rps:any) => {
+				if(rps.data.records){
+					totalAmount.value = rps.data.records[0].totalAmount
+					uni.setStorageSync('totalAmount', rps.data.records[0].totalAmount)
+					uni.setStorageSync('walletCode', rps.data.records[0].code)
+				}
+			})
+			
 			
 			islogin.value = true
 			// let pnum = uni.getStorageSync('PhoneNumber')
diff --git a/src/pages/scanCode/index.vue b/src/pages/scanCode/index.vue
index a15382b..d4cdb3b 100644
--- a/src/pages/scanCode/index.vue
+++ b/src/pages/scanCode/index.vue
@@ -25,7 +25,7 @@
 				code.value = res
 				console.log('条码类型：' + res.scanType);
 				console.log('条码内容：' + res.result);
-				uni.navigateTo({
+				uni.redirectTo({
 					url:`/homePages/reservation/index?hdzcode=${hdzcode}&phoneNumber=${uni.getStorageSync('userInfor').phoneNumber?uni.getStorageSync('userInfor').phoneNumber:''}`
 				})
 			},
diff --git a/src/static/img/share.png b/src/static/img/share.png
new file mode 100644
index 0000000000000000000000000000000000000000..15bf8d9c5bf1323dd2ea97d7e884bb47b88b934d
GIT binary patch
literal 28391
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

literal 0
HcmV?d00001

diff --git a/src/utils/request.ts b/src/utils/request.ts
index aaf70da..912adcc 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -29,7 +29,7 @@ export function request(method:any,url:string,data?:any,isLoading?:any){
 			uni.request({
 			header:headers,
 			//url:'http://192.168.5.200:9100/gateway'+ url,//`${conf.apiBaseUrl}${url}`,
-			//url:'http://192.168.5.213:9100/gateway'+ url,
+			//url:'http://192.168.5.14:9104'+ url,
 			url:'https://api.evo-techina.com'+url,
 			method,
 			data:data,
diff --git a/src/utils/service.ts b/src/utils/service.ts
index ce04313..db467e0 100644
--- a/src/utils/service.ts
+++ b/src/utils/service.ts
@@ -60,7 +60,7 @@ export function addrese(parameter:Ydata){
 
 //预约记录
 export function getyylist(parameter:any){
-	return request('GET','/wechat/order/swap/pre/list',parameter)
+	return request('GET','/wechat/order/swap/pre/list',parameter,false)
 }
 
 //取消预约
@@ -143,12 +143,12 @@ export	function getUser() {
   }
   
   export function orderlist(parameter:Oderqs){
-  	return request('GET','/wechat/order/swap/list',parameter)
+  	return request('GET','/wechat/order/swap/list',parameter,false)
   }
   
   //查询换电步骤
   export function dzbzxq(orderNo:string){
-  	return request('GET','/wechat/order/swap/step/list',{orderNo})
+  	return request('GET','/wechat/order/swap/step/list',{orderNo},false)
   }
   
   //协议
@@ -218,7 +218,7 @@ interface Balande{
 	pageNo:String|Number			//页数,示例值(1)
 }
 export function balancedetails(parameter:Balande){
-	return request('post_form','/wechat/wechat/user/wallet/detail/list',parameter)
+	return request('post_form','/wechat/wechat/user/wallet/detail/list',parameter,false)
 }
 
 
@@ -232,3 +232,8 @@ interface Bapay{
 export function balancpay(parameter:Bapay){
 	return request('post_form','/wechat/order/swap/wallet/pay',parameter)
 }
+
+//查询用户是否开通余额
+export function isktbal(wuid:string){
+	return request('post_form','/wechat/wechat/user/wallet/isOpenAccount',{wuid})
+}
\ No newline at end of file