From 96493e08d8b44a4df896cf41855f1ca118cf714e Mon Sep 17 00:00:00 2001
From: cjb <646858191@qq.com>
Date: Sat, 11 Jan 2025 17:13:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/minePages/order/index.vue      |   7 +-
 src/minePages/paySuccess/index.vue |  95 +++++++++++++++++++++++
 src/minePages/payment/index.vue    | 117 +++++++++++++++++------------
 src/minePages/reserlist/index.vue  |   2 +-
 src/pages.json                     |   3 +
 src/pages/home/index.vue           |  36 +++++----
 src/pages/login/index.vue          |   6 +-
 src/static/img/weixin.png          | Bin 0 -> 3736 bytes
 src/static/img/yuer.png            | Bin 0 -> 3777 bytes
 src/utils/config.ts                |   1 +
 src/utils/request.ts               |   6 +-
 src/utils/service.ts               |  40 +++++-----
 12 files changed, 227 insertions(+), 86 deletions(-)
 create mode 100644 src/minePages/paySuccess/index.vue
 create mode 100644 src/static/img/weixin.png
 create mode 100644 src/static/img/yuer.png

diff --git a/src/minePages/order/index.vue b/src/minePages/order/index.vue
index 8b07939..012de7d 100644
--- a/src/minePages/order/index.vue
+++ b/src/minePages/order/index.vue
@@ -44,7 +44,7 @@
 						<view style="color: #009688;" @tap="getbz(n.orderNo)">查看换电详情</view>
 					</view>
 				</view>
-				<view v-if="n.status == 6" class="qxyy" @tap="topay(`/minePages/payment/index?orderNo=${n.orderNo}&amount=${n.amount}`)">去支付</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="暂无订单" />
@@ -67,8 +67,11 @@
 <script setup lang="ts">
 	import { ref,reactive } from 'vue'
 	import { orderlist,dzbzxq } from '@/utils/service'
-	import { onReachBottom } from '@dcloudio/uni-app'
+	import { onShow,onReachBottom } from '@dcloudio/uni-app'
 	
+	onShow(() => {
+		tabshand(stanum.value)
+	})
 	
 	//订单状态  1-已创建，2-换电中，3-换电完成，4-充电中，5-充电完成，6-待结算，7-已完成，9-已取消
 	const statelist = reactive([  
diff --git a/src/minePages/paySuccess/index.vue b/src/minePages/paySuccess/index.vue
new file mode 100644
index 0000000..b73b978
--- /dev/null
+++ b/src/minePages/paySuccess/index.vue
@@ -0,0 +1,95 @@
+<template>
+	<up-navbar
+	  title="支付详情"
+	  bgColor="#00aa7f"
+	  :autoBack="false"
+	  leftIconColor="#00aa7f"
+	  titleStyle="color:#fff"
+	  :placeholder="true"
+	/>
+	<view style="padding: 100rpx 20rpx; background: #fff;">
+		<view style="display: flex;align-items: center;justify-content: center;">
+			<up-icon name="checkmark-circle" color="#00aa00" size="38" />
+			<view style="padding-left: 10rpx;font-size: 54rpx;color: #00aa00;">支付成功</view>
+		</view>
+		<view class="dingdan">
+			<view>
+				<view>订单号</view>
+				<view style="font-size: 28rpx;">YTSOgyy000012025011110572044197C</view>
+			</view>
+			<view>
+				<view>订单金额</view>
+				<view>¥100</view>
+			</view>
+			<view>
+				<view>车牌号</view>
+				<view>冀A12345D</view>
+			</view>
+			<view>
+				<view>换电站</view>
+				<view>北京1号换电站</view>
+			</view>
+		</view>
+		<view class="btns">
+			<view class="qxyy" @tap="gohome">返回首页</view>
+			<view class="qxyy" @tap="goorder">我的订单</view>
+		</view>
+	</view>
+	
+</template>
+
+<script setup lang="ts">
+	import { ref,reactive } from 'vue'
+	import { payment,getip } from '@/utils/service'
+	import { onLoad,onShow } from '@dcloudio/uni-app'
+	
+	function gohome(){
+		uni.switchTab({
+			url:'/pages/home/index'
+		})
+	}
+	
+	function goorder(){
+		uni.navigateTo({
+			url:'/minePages/order/index'
+		})
+	}
+	
+</script>
+
+<style lang="scss">
+	page{
+		background: #f4f4f4;
+	}
+	.dingdan{
+		padding:60rpx 20rpx 100rpx;
+		>view{
+			display: flex;
+			justify-content:space-between;
+			padding-bottom: 24rpx;
+			>view{
+				padding-right: 14rpx;
+			}
+			>view:last-child{
+				color: #616161;
+			}
+		}
+	}
+	.btns{
+		display: flex;
+		box-sizing: border-box;
+		width: 100%;
+		padding: 0 30rpx;
+		justify-content:space-between
+	}
+	.qxyy{
+		width: 40%;
+		height: 80rpx;
+		//margin: 100rpx auto 0;
+		line-height: 80rpx;
+		border-radius:16rpx;
+		color: #fff;
+		text-align: center;
+		background: #00aa00;
+	}
+</style>
\ No newline at end of file
diff --git a/src/minePages/payment/index.vue b/src/minePages/payment/index.vue
index 73c5737..bbde1ab 100644
--- a/src/minePages/payment/index.vue
+++ b/src/minePages/payment/index.vue
@@ -8,68 +8,97 @@
 	  :placeholder="true"
 	/>
 	
-	<view class="content">
-		<view style="padding-bottom: 200rpx;text-align: center;">
-			<text>¥</text>
-			<text style="font-size: 60rpx;">100</text>
-			<text>元</text>
+	<view style="display: flex;align-items:center;justify-content: space-between;padding:30rpx;border-bottom:1px solid #f4f4f4;background: #fff;">
+		<view>付款金额</view>
+		<view style="color: #ffaa00;">
+			<text>¥ </text>
+			<text style="font-size: 50rpx;">{{payqs.money}}</text>
 		</view>
-		<view class="qxyy" @tap="payhand">立即支付</view>
 	</view>
-	
+	<view style="padding: 40rpx 20rpx 20rpx;color: #959595;">选择支付方式</view>
+	<view style="background: #fff;">
+		<radio-group size="30" @change="radioChange">
+			<label style="display: flex;align-items: center;padding: 30rpx;border-bottom: 2px solid #f4f4f4;">
+				<radio :checked="actv == 1" value="1" color="#00aa00" style="transform:scale(80%);" />
+				<view style="display: flex;align-items: center;">
+					<image src="/src/static/img/yuer.png" style="width: 60rpx;height: 60rpx;" />
+					<view style="padding-left: 10rpx;">余额</view>
+				</view>
+			</label>
+			<label style="display: flex;align-items: center;padding: 30rpx;">
+				<radio :checked="actv == 2" value="2" color="#00aa00" style="transform:scale(80%);" />
+				<view style="display: flex;align-items: center;">
+					<image src="/src/static/img/weixin.png" style="width: 60rpx;height: 60rpx;" />
+					<view style="padding-left: 10rpx;">微信</view>
+				</view>
+			</label>
+		</radio-group>
+	</view>
+	<view class="qxyy" @tap="payhand">立即支付</view> 
 </template>
 
 <script setup lang="ts">
 	import { ref,reactive } from 'vue'
-	import { payment } from '@/utils/service'
+	import { payment,getip } from '@/utils/service'
 	import { onLoad,onShow } from '@dcloudio/uni-app'
 	
 	onLoad((opt:any) => {
-		payqs.money = opt.amount
-		payqs.detail.costPrice = opt.amount
-		payqs.detail.goodsDetail.unitPrice = opt.amount
+		payqs.money = opt.amount*1
+		payqs.attach = opt.orderNo
+		payqs.detail.goodsDetail.merchantGoodsId = opt.orderNo
+		payqs.detail.goodsDetail.unitPrice = opt.amount*1
+		
+		payqs.description = `车牌号：${opt.plateNum} 换电站：${opt.stationName}`
+		// payqs.detail.costPrice = opt.amount
+		// payqs.detail.goodsDetail.unitPrice = opt.amount
 	})
 	
+	let actv = ref(2)
+	function radioChange(v:any) {
+		console.log(v,'v')
+	}
+	
 	let payqs = reactive({
 		wuid:uni.getStorageSync('wxuid'),
-		remarks:'',
-		money:'',
+		description:'',						//订单总描述
+		money:0,							//支付金额，单位：分
+		//timeExp:'',						//支付结束时间
+		attach:'',	
 		detail:{
-			costPrice:'',				//订单原价
-			invoiceId:'',				//商家小票ID
 			goodsDetail:{
 				merchantGoodsId:'',		//商户侧商品编码
 				wechatpayGoodsId:'',	//微信支付定义的统一商品编号（没有可不传）
 				goodsName:'',			//商品的实际名称
 				quantity:1,				//商品数量
-				unitPrice:''			//商品价格
-			}
-		}
+				unitPrice:0				//商品价格
+			}//订单附加信息
+		},
+		payerClientIp:'',			//用户IP
+		deviceId:'',				//用户设备型号
+		stationCode:''
+	})
+	
+	//获取ip
+	getip().then((rps:any) => {
+		payqs.payerClientIp = rps.data
 	})
 	
 	function payhand() {
 		payment(payqs).then((rps:any) => {
-			console.log(rps)
-			// appId: "wx2ab384cf1e6f85a1"
-			// nonceStr: "WhtgCld5gCTWBDzfFuRcFEhKCYTsIq2f"
-			// packageVal: "prepay_id=wx091610306843188838925c6a38a9fb0000"
-			// paySign: "JCWH1qZtgIJx6k+Cah5Js40Bgx9k1sQlvthfsYu3IwexwPX3JXOnEjAHhKSG61iRkcdaxaqtcIxYpXUuiQOwWf4epZE+YTZIJ021eXiM4J/o0NwXXTB7guEDo5MuEFQWsrdyAqhoTD1cziVrKyp/ka1aux5ULOgVfn6FvHRaoEO+YIn71ls9z/sKloJjuCS9bdSppknJwAmmVD+k7Xc/vCiFZ0c7k13JzYWbWCXgHCMNJ02DrP75EuzuDvmN/4U9ABN9z/SN/Roz2fs9/h7DPagICC9oj0oEg80+Y4S84EUFupsR2MCFVQlCF4+dPdCx75JcXId6cSIE+ySJciyjHQ=="
-			// signType: "RSA"
-			// timeStamp: "1736410231"
-			
-		
-			
+
 			//#ifdef MP-WEIXIN
 			wx.requestPayment({
 				timeStamp:rps.data.timeStamp,
-				nonceStr: rps.data.timeStamp,
-				package: rps.data.timeStamp,
+				nonceStr: rps.data.nonceStr,
+				package: rps.data.packageVal,
 				signType: rps.data.signType,
 				paySign: rps.data.paySign,
-				success:function(res){
-					
+				success(){
+					uni.redirectTo({
+						url:'/minPages/paySuccess/index'
+					})
 				},
-				fail:function(res){
+				fail(){
 					
 				}
 			})
@@ -83,19 +112,15 @@
 	page{
 		background: #f4f4f4;
 	}
-	.content{
-		margin:50rpx 30rpx 30rpx;
-		padding: 40rpx;
-		border-radius: 20rpx;
-		background: #fff;
-		.qxyy{
-			height: 80rpx;
-			line-height: 80rpx;
-			border-radius:20rpx;
-			color: #fff;
-			text-align: center;
-			background: #00aa00;
-		}
+	.qxyy{
+		width: 90%;
+		height: 80rpx;
+		margin: 100rpx auto 0;
+		line-height: 80rpx;
+		border-radius:10rpx;
+		color: #fff;
+		text-align: center;
+		background: #00aa00;
 	}
 	.hdbzcont{
 		box-sizing: border-box;
diff --git a/src/minePages/reserlist/index.vue b/src/minePages/reserlist/index.vue
index eea1ede..8df1b9c 100644
--- a/src/minePages/reserlist/index.vue
+++ b/src/minePages/reserlist/index.vue
@@ -24,7 +24,7 @@
 				</view>
 				<view>
 					<view>预约时间：</view>
-					<view>{{ytime(n.swapDay,n.swapDuration)}}</view>
+					<view style="font-size: 30rpx;">{{ytime(n.swapDay,n.swapDuration)}}</view>
 				</view>
 			</view>
 			<view v-if="n.status == 1" @tap="cancel(n.pkId)" class="qxyy" style="background: #00aa00;">取消预约</view>
diff --git a/src/pages.json b/src/pages.json
index 517faaa..ee55bea 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -66,6 +66,9 @@
 				},
 				{
 					"path": "payment/index"		//支付
+				},
+				{
+					"path": "paySuccess/index"		//支付成功
 				}
 			]
 		}
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index f6a5b88..31a061e 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -5,7 +5,6 @@
 			  height="500rpx"
 			  keyName="picUrl"
 			  :list="imglist"
-			  indicator
 			  indicatorMode="line"
 			  radius="0"
 			  :indicator="false"
@@ -143,7 +142,15 @@
 <script setup lang="ts">
 import { ref,reactive,watch,getCurrentInstance  } from 'vue'
 import { onLoad,onShow } from '@dcloudio/uni-app'
-import { login,getUser,gethdz,loginstate,swiperimg,agreement,getInfo } from '@/utils/service'
+import { 
+	login,
+	getUser,
+	gethdz,
+	loginstate,
+	swiperimg,
+	agreement,
+	getInfo,
+} from '@/utils/service'
 let height = ref('')
 let islogin = ref(false)
 let PhoneNumber = ref('')
@@ -252,17 +259,20 @@ onShow(() => {
 		// }
 		
 		//检验登录状态??
-		if(init){
-			loginstate({
-				wuid:uni.getStorageSync('wxuid')
-			}).then((rps:any) => {
-				uni.setStorageSync('wxToken',rps.data.wxToken)
-				getinfo()
-			})
-			init = false
-		}else{
-			getinfo()
-		}
+		getinfo() //??
+		// if(init){
+		// 	loginstate({
+		// 		wuid:uni.getStorageSync('wxuid')
+		// 	}).then((rps:any) => {
+		// 		if(rps.data && rps.data.wxToken){
+		// 			uni.setStorageSync('wxToken',rps.data.wxToken)
+		// 		}
+		// 		getinfo()
+		// 	})
+		// 	init = false
+		// }else{
+		// 	getinfo()
+		// }
 	}else{
 		islogin.value = false
 		PhoneNumber.value = ''
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index ebbd8dd..16f5659 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -8,9 +8,9 @@
     	open-type="getPhoneNumber" 
     	@getphonenumber="onGetPhoneNumber"
     >手机号快捷登录</button> -->
-	<button style="width: 80%;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: 10rpx;">
-		<label class="radio"><radio value="r1" :checked="checked" @tap="checked = !checked">已阅读并同意</radio></label>
+	<button style="width: 85%;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 @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>
diff --git a/src/static/img/weixin.png b/src/static/img/weixin.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8aa3df31bd487168003492f2f6a8f7871644aa1
GIT binary patch
literal 3736
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
C1VfMj

literal 0
HcmV?d00001

diff --git a/src/static/img/yuer.png b/src/static/img/yuer.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccabeef40bf175383cee0411a3b7f03091c3b482
GIT binary patch
literal 3777
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

literal 0
HcmV?d00001

diff --git a/src/utils/config.ts b/src/utils/config.ts
index afb539b..1e1fcfb 100644
--- a/src/utils/config.ts
+++ b/src/utils/config.ts
@@ -1,4 +1,5 @@
 const ENV = process.env.APP_ENV || process.env.NODE_ENV;
+
 const confing = {
     development: {
 		// #ifdef MP-WEIXIN
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 1f57eaf..0a8875a 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -29,8 +29,8 @@ 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:'https://api.evo-techina.com'+url,
+			url:'http://192.168.5.213:9100/gateway'+ url,
+			//url:'https://api.evo-techina.com'+url,
 			method,
 			data:data,
 			timeout:30000,
@@ -43,8 +43,6 @@ export function request(method:any,url:string,data?:any,isLoading?:any){
 					resolve(rps.data)
 				}else if((rps.data as any).code == 'D0402'){
 					resolve({data:[]})
-				}else if((rps.data as any).code == 'W0404'){
-					resolve({data:[]})
 				}else if((rps.data as any).code == 'W0405'){
 					//uni.removeStorageSync('wxToken')
 					if(url == '/wechat/login/checksessionkey'){
diff --git a/src/utils/service.ts b/src/utils/service.ts
index 3f9e6ad..5ed8146 100644
--- a/src/utils/service.ts
+++ b/src/utils/service.ts
@@ -175,22 +175,28 @@ export function carlist(wuid:String){
 }
 
 //支付
-interface Payment{
-	wuid:String,
-	remarks:String,
-	money:String|Number,
-	detail:{
-		costPrice:String|Number,
-		invoiceId:String,
-		goodsDetail:{
-			merchantGoodsId:String
-			wechatpayGoodsId:String
-			goodsName:String
-			quantity:String|Number
-			unitPrice:String|Number
-		}
-	}
-}
-export function payment(parameter:Payment){
+// interface Payment{
+// 	wuid:String					//用户编码
+// 	description:String			//订单总描述
+// 	money:String|Number			//支付金额，单位：分
+// 	timeExp:String				//支付结束时间
+// 	attach:String				//订单附加信息
+// 	goodsDetail:{
+// 		merchantGoodsId:String
+// 		wechatpayGoodsId:String
+// 		goodsName:String
+// 		quantity:String|Number
+// 		unitPrice:String|Number
+// 	}
+// 	payerClientIp:String		//用户IP
+// 	deviceId:String				//用户设备型号
+// 	stationCode:String
+// }
+export function payment(parameter:any){
 	return request('post_json','/wechat/wechatpay/xcx/prepay',parameter)
+}
+
+//获取ip
+export function getip(){
+	return request('GET','/wechat/resource/util/ip')
 }
\ No newline at end of file