From 60b26e1c1327418d5dfc5e53f0d69e79e6ec4a08 Mon Sep 17 00:00:00 2001
From: shilei <965026003@qq.com>
Date: Mon, 9 Sep 2024 14:01:22 +0800
Subject: [PATCH] =?UTF-8?q?9.9=20=E8=B4=A6=E6=88=B7=E5=85=85=E5=80=BC?=
=?UTF-8?q?=E9=94=99=E8=AF=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../search-destination/search-destination.vue | 2 +-
pages/index/index.vue | 3 +-
pages/index/recharge/recharge.vue | 39 ++++++++++++-------
pages/index/stationDetails/stationDetails.vue | 14 -------
.../order/chargorder/detailInf/detailInf.vue | 8 ++--
pages/order/chargorder/order.vue | 2 +-
.../personalDetails/personalDetails.vue | 2 +-
pages/userCenter/userCenter.vue | 6 +--
pagesCenter/billingPage/billingPage.vue | 14 ++++---
pagesCenter/motorCadeMy/motorCadeMy.vue | 6 +--
pagesCenter/pay/index.vue | 21 ++++++----
sheep/platform/pay.js | 8 ++--
sheep/request/index.js | 2 +-
13 files changed, 66 insertions(+), 61 deletions(-)
diff --git a/components/search-destination/search-destination.vue b/components/search-destination/search-destination.vue
index 4bab1b7..c795b81 100644
--- a/components/search-destination/search-destination.vue
+++ b/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,
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a8bf6c7..b4eae84 100644
--- a/pages/index/index.vue
+++ b/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
}
diff --git a/pages/index/recharge/recharge.vue b/pages/index/recharge/recharge.vue
index 6039e20..4fdf52c 100644
--- a/pages/index/recharge/recharge.vue
+++ b/pages/index/recharge/recharge.vue
@@ -52,20 +52,19 @@
// log
// } from '../../../static/mqtt/dist/mqtt.min.js';
const payList = reactive([{
- value: 50
- }, {
- value: 100
- }, {
- value: 200
- }, {
- value: 500
- }, {
- value: 1000
- }
- ,
- {
- value: '自定义'
- },
+ value: 50
+ }, {
+ value: 100
+ }, {
+ value: 200
+ }, {
+ value: 500
+ }, {
+ value: 1000
+ },
+ {
+ value: '自定义'
+ },
])
const li = ref()
const show = ref(false)
@@ -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({
diff --git a/pages/index/stationDetails/stationDetails.vue b/pages/index/stationDetails/stationDetails.vue
index 1db347c..59b560b 100644
--- a/pages/index/stationDetails/stationDetails.vue
+++ b/pages/index/stationDetails/stationDetails.vue
@@ -51,20 +51,6 @@
可充充电枪
{{swapBatTotal_charg}}
-
diff --git a/pages/order/chargorder/detailInf/detailInf.vue b/pages/order/chargorder/detailInf/detailInf.vue
index 41cc0d8..265b0af 100644
--- a/pages/order/chargorder/detailInf/detailInf.vue
+++ b/pages/order/chargorder/detailInf/detailInf.vue
@@ -83,13 +83,13 @@
{{detail.list.chargeTotalFee==null?'0':detail.list.chargeTotalFee / 100}}元
-
+
-
+
费用合计
diff --git a/pages/order/chargorder/order.vue b/pages/order/chargorder/order.vue
index bd026a5..48bdccc 100644
--- a/pages/order/chargorder/order.vue
+++ b/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({
diff --git a/pages/userCenter/personalDetails/personalDetails.vue b/pages/userCenter/personalDetails/personalDetails.vue
index 07a36b8..2749a3e 100644
--- a/pages/userCenter/personalDetails/personalDetails.vue
+++ b/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
diff --git a/pages/userCenter/userCenter.vue b/pages/userCenter/userCenter.vue
index 19f4c57..6a40498 100644
--- a/pages/userCenter/userCenter.vue
+++ b/pages/userCenter/userCenter.vue
@@ -107,7 +107,8 @@
-
+
车辆认证
@@ -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", "个人版")
}
}
-
})
}
})
diff --git a/pagesCenter/billingPage/billingPage.vue b/pagesCenter/billingPage/billingPage.vue
index 756cc0d..73d413d 100644
--- a/pagesCenter/billingPage/billingPage.vue
+++ b/pagesCenter/billingPage/billingPage.vue
@@ -2,11 +2,9 @@
-
-
-
-
-
+
+
+
@@ -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 = []
diff --git a/pagesCenter/motorCadeMy/motorCadeMy.vue b/pagesCenter/motorCadeMy/motorCadeMy.vue
index 115f666..3e929b5 100644
--- a/pagesCenter/motorCadeMy/motorCadeMy.vue
+++ b/pagesCenter/motorCadeMy/motorCadeMy.vue
@@ -17,11 +17,11 @@
- 私人车辆
+ v-if="item.vehicleType == null || item.vehicleType == '' || item.vehicleType == 1">
+ 重卡
- 车队车辆
+ 轻卡
diff --git a/pagesCenter/pay/index.vue b/pagesCenter/pay/index.vue
index accaba6..4d7b4fe 100644
--- a/pagesCenter/pay/index.vue
+++ b/pagesCenter/pay/index.vue
@@ -181,16 +181,16 @@
}
// console.log(data, '支付渠道')
let haswallet = false
- for(let item of data) {
- if(item == 'wallet') {
+ for (let item of data) {
+ if (item == 'wallet') {
haswallet = true
}
}
let array_str = []
if (uni.getStorageSync('version') == '车队版' && haswallet) {
data.push('wallet_personnel_car')
- for(let item of data) {
- if(item != 'wallet') {
+ for (let item of data) {
+ if (item != 'wallet') {
array_str.push(item)
}
}
@@ -198,9 +198,16 @@
if (uni.getStorageSync('version') == '个人版') {
array_str = data
}
- // console.log(state.payMethods,'tate.payMethods')
- state.payMethods = getPayMethods(array_str)
-
+ 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')
+
}
onLoad((options) => {
diff --git a/sheep/platform/pay.js b/sheep/platform/pay.js
index 57ae35e..7e6e281 100644
--- a/sheep/platform/pay.js
+++ b/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,
}
diff --git a/sheep/request/index.js b/sheep/request/index.js
index 492f08c..1ffb16a 100644
--- a/sheep/request/index.js
+++ b/sheep/request/index.js
@@ -290,7 +290,7 @@ const getAccessToken = () => {
/** 获得刷新令牌 */
const getRefreshToken = () => {
- return uni.getStorageSync('refresh-token');
+ return uni.getStorageSync('refreshToken');
}
const request = (config) => {