9.9 账户充值错误bug

components/search-destination/search-destination.vue

@@ -156,7 +156,7 @@
 		let mapContext = uni.createMapContext('map')
 		// 1.组装数据之后，并赋值给地图上的marker
 		const allMarkers = Array.from(markerList).map((e, i) => {
-			console.log(e,'e')
+			// console.log(e,'e')
 			return {
 				id: e.id,
 				longitude: e.longitude,

pages/index/index.vue

@@ -182,7 +182,7 @@
 		realNameAuthFlag.value = uni.getStorageSync("realNameAuthFlag")
 		if (globalData.isLogin) {
 			if (realNameAuthFlag.value == 1) {
-				handle_setting()
+				// handle_setting()
 				clearInterval(timer.value)
 				timer.value = null
 				handle_loop()
@@ -597,6 +597,7 @@
 					version_loading.value = false
 					check_version.value = e.value[0]
 				}, 2000)
+				ischarging_order.value = false
 			} else {
 				return
 			}

pages/index/recharge/recharge.vue

@@ -61,8 +61,7 @@
 			value: 500
 		}, {
 			value: 1000
-	}
-	,
+		},
 		{
 			value: '自定义'
 		},
@@ -158,8 +157,18 @@
 	}
 	const submitRechargeOrder = (trAmt) => {
 		// console.log(trAmt,'trAmt')
+		let config_url = ''
+		let bindType = 1
+		if (uni.getStorageSync("version") == '个人版') {
+			config_url = 'app-api/cloud/personal/queryLatestOrder'
+			bindType = 1
+		}
+		if (uni.getStorageSync("version") == '车队版' && uni.getStorageSync("captainOrNot")) {
+			config_url = 'app-api/pay/wallet-recharge/createTeam'
+			bindType = 2
+		}
 		let param = {
-			bindType: 1,
+			bindType: bindType,
 			payPrice: trAmt * 100
 		};
 		uni.$request({

pages/index/stationDetails/stationDetails.vue

@@ -51,20 +51,6 @@
 					<view class="bat-change">可充充电枪</view>
 					<view class="bat-pic">{{swapBatTotal_charg}}</view>
 				</view>
-				<!-- <view class="flex soc-box">
-					<view class="bat-soc">
-						<view class="bat-nine">{{hcBatTotal_charg}}<text class="bat-unit">块</text></view>
-						<view class="bat-capacity">90%以上</view>
-					</view>
-					<view class="bat-soc">
-						<view class="bat-eight">{{mcBatTotal_charg}}<text class="bat-unit">块</text></view>
-						<view class="bat-capacity">80-90%</view>
-					</view>
-					<view class="bat-soc">
-						<view class="bat-zero">{{lcBatTotal_charg}}<text class="bat-unit">块</text></view>
-						<view class="bat-capacity">0-80%</view>
-					</view>
-				</view> -->
 			</view>
 
 			<!--  -->

pages/order/chargorder/detailInf/detailInf.vue

@@ -83,13 +83,13 @@
 					<view class="staNum">{{detail.list.chargeTotalFee==null?'0':detail.list.chargeTotalFee / 100}}元
 					</view>
 				</view>
-				<view class="flex padding-lr-sm justify-between list-view">
+				<!-- <view class="flex padding-lr-sm justify-between list-view">
 					<view class="staName">尖时段充电电量(直流)</view>
 					<view class="staNum">{{ detail.list.theTipElectric==null?'0':detail.list.theTipElectric }}kW·h
 					</view>
-				</view>
+				</view> -->
 
-				<view class="flex padding-lr-sm justify-between list-view">
+				<!-- <view class="flex padding-lr-sm justify-between list-view">
 					<view class="staName">峰时段充电电量(直流)</view>
 					<view class="staNum">{{ detail.list.peakElectric==null?'0':detail.list.peakElectric }}kW·h</view>
 				</view>
@@ -103,7 +103,7 @@
 					<view class="staName">谷时段充电电量(直流)</view>
 					<view class="staNum">{{ detail.list.theValleyElectric==null?'0':detail.list.theValleyElectric }}kW·h
 					</view>
-				</view>
+				</view> -->
 
 				<view class="flex padding-sm justify-between flex-wrap">
 					<view class="titleName">费用合计</view>

pages/order/chargorder/order.vue

@@ -117,7 +117,7 @@
 		getOrder(0, picker_array_index.value)
 	})
 	onTabItemTap(async (e) => {
-		console.log(e);
+		// console.log(e);
 		if (e.index == 1) {
 			if (!uni.getStorageSync("userInfo")) {
 				uni.showToast({

pages/userCenter/personalDetails/personalDetails.vue

@@ -100,7 +100,7 @@
 		uni.$request({
 			url: config.baseUrl + 'app-api/member/user/get',
 		}).then((res) => {
-			userAvatar.value = res.data.data.userAvatar
+			userAvatar.value = res.data.data.avatar
 			userName.value = res.data.data.nickname
 			iphone.value = res.data.data.mobile
 			// birthday.value = (res.data.data.birthday == null || "") ? "1990-01" : res.data.data.birthday

pages/userCenter/userCenter.vue

@@ -107,7 +107,8 @@
 		</view>
 		<view class="cu-card ">
 			<view class="cu-item shadow padding-lr-sm">
-				<view class="flex solids-bottom padding-tb-sm justify-between" @click="vehicleCertification">
+				<view class="flex solids-bottom padding-tb-sm justify-between" @click="vehicleCertification"
+					v-if="now_version == '个人版' ">
 					<view class="flex">
 						<image class="titleImg" src="../../static/user/motor.svg" mode="scaleToFill"></image>
 						<view class="titleFont">车辆认证</view>
@@ -221,7 +222,7 @@
 			}).then((res) => {
 				// console.log(res,'获取基本信息');
 				if (res.data.code == 0) {
-					avatar.value = res.data.data.userAvatar
+					avatar.value = res.data.data.avatar
 					userName.value = res.data.data.userName
 					phone.value = res.data.data.mobile
 					realNameAuthFlag.value = res.data.data.realNameAuthFlag
@@ -234,7 +235,6 @@
 						uni.setStorageSync("version", "个人版")
 					}
 				}
-
 			})
 		}
 	})

pagesCenter/billingPage/billingPage.vue

@@ -2,11 +2,9 @@
 	<view class="main-page">
 		<cc-couponList colors="#e54d42" :couponList="couponList" @itemClick="jumpNext"></cc-couponList>
 	</view>
-	<view v-if="orderData.orderList == null || orderData.orderList.length == 0">
-		<view class="nonePage">
-			<view class="noneBg">
-			</view>
-		</view>
+	<view v-if="couponList.length == 0">
+		<up-empty mode="coupon">
+		</up-empty>
 	</view>
 </template>
 
@@ -103,8 +101,12 @@
 
 	// 
 	const getOrder = async (type) => {
+		let types = ''
+		if (uni.getStorageSync("version") == '个人版') {
+			types = '?type=1'
+		}
 		await uni.$request({
-			url: config.baseUrl + 'app-api/cloud/set-meal/page'
+			url: config.baseUrl + 'app-api/cloud/set-meal/page' + types
 		}).then(res => {
 			// console.log(res, '==========>');
 			let str_array = []

pagesCenter/motorCadeMy/motorCadeMy.vue

@@ -17,11 +17,11 @@
 					<!-- 右侧 -->
 					<view class="flex align-center">
 						<view class="passState"
-							v-if="item.vehicleProperty == null || item.vehicleProperty == '' || item.vehicleProperty == 1">
-							私人车辆
+							v-if="item.vehicleType == null || item.vehicleType == '' || item.vehicleType == 1">
+							重卡
 						</view>
 						<view class="reState" v-else>
-							车队车辆
+							轻卡
 						</view>
 					</view>
 				</view>

pagesCenter/pay/index.vue

@@ -198,8 +198,15 @@
 		if (uni.getStorageSync('version') == '个人版') {
 			array_str = data
 		}
+		let str_comeen = getPayMethods(array_str)
+		let commen_item = []
+		for(let item of str_comeen) {
+			if(item.disabled == false) {
+				commen_item.push(item)
+			}
+		}
+		state.payMethods = commen_item
 		// console.log(state.payMethods, 'tate.payMethods')
-		state.payMethods = getPayMethods(array_str)
 
 	}
 

sheep/platform/pay.js

@@ -340,7 +340,7 @@ export default class SheepPay {
 }
 
 export function getPayMethods(channels) {
-	console.log(channels, 'channels')
+	// console.log(channels, 'channels')
 	const payMethods = [{
 			icon: '/static/img/shop/pay/wechat.png',
 			title: '微信支付',
@@ -355,19 +355,19 @@ export function getPayMethods(channels) {
 		// },
 		{
 			icon: '/static/img/shop/pay/wallet.png',
-			title: '个人余额支付',
+			title: '个人余额',
 			value: 'wallet',
 			disabled: true,
 		},
 		{
 			icon: '/static/img/shop/pay/apple.png',
-			title: '车队个人余额支付',
+			title: '个人账户',
 			value: 'wallet_personnel_car',
 			disabled: true,
 		},
 		{
 			icon: '/static/img/shop/pay/wallet.png',
-			title: '车队账户支付',
+			title: '车队账户',
 			value: 'team_wallet',
 			disabled: true,
 		}

sheep/request/index.js

@@ -290,7 +290,7 @@ const getAccessToken = () => {
 
 /** 获得刷新令牌 */
 const getRefreshToken = () => {
-  return uni.getStorageSync('refresh-token');
+  return uni.getStorageSync('refreshToken');
 }
 
 const request = (config) => {