qiubinghui
/
zhywpt-sp
Tarkkaile 1
Äänestä 0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Julkaisut 0 Wiki Activity
Selaa lähdekoodia

跳转运维

master
yangteng 6 kuukautta sitten
vanhempi
bd6d6be5ba
commit
393d0e6fd6
29 muutettua tiedostoa jossa 271 lisäystä ja 576 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 6
    5
      App.vue
  2. 2
    1
      components/nav-bar/nav-bar2.vue
  3. 0
    125
      components/nav-bar/nav-barNew.vue
  4. 3
    1
      composables/order/useOrderListItem.ts
  5. 14
    21
      pages.json
  6. 8
    2
      pages/index/index.vue
  7. 10
    5
      pages/service/components/rightList.vue
  8. 2
    2
      subpackage/after-sale/account-recharge/recharge-weixin.vue
  9. 2
    2
      subpackage/after-sale/add-equity/add-equity-details.vue
  10. 2
    2
      subpackage/after-sale/add-equity/equity-list.vue
  11. 2
    2
      subpackage/after-sale/replace-equipment/order-confirm-receipt.vue
  12. 5
    7
      subpackage/after-sale/replace-equipment/order-payment.vue
  13. 2
    2
      subpackage/carPark/recharge/recharge-weixin.vue
  14. 1
    2
      subpackage/orders/essential-information.vue
  15. 2
    2
      subpackage/orders/order-confirm-receipt.vue
  16. 2
    2
      subpackage/orders/order-details-new.vue
  17. 5
    28
      subpackage/orders/order_payment.vue
  18. 2
    2
      subpackage/orders/payment.vue
  19. 3
    3
      subpackage/orders/payment/payment.vue
  20. 1
    1
      subpackage/orders/sign-up-ali-yd.vue
  21. 4
    4
      subpackage/orders/sign-up-ali.vue
  22. 8
    20
      subpackage/orders/sign/sign-up-ali.vue
  23. 0
    161
      subpackage/personal-center/search/select-card-删除.vue
  24. 2
    2
      subpackage/personal-center/trapping-and-repairing-account/recharge-two.vue
  25. 2
    2
      subpackage/personal-center/trapping-and-repairing/recharge-two.vue
  26. 4
    2
      subpackage/service/equity/equity.vue
  27. 154
    154
      subpackage/service/equityList/equityList.vue
  28. 7
    13
      utils/network/api.js
  29. 16
    1
      utils/utils.ts

+ 6
- 5
App.vue Näytä tiedosto

@@ -54,7 +54,7 @@
my.getAuthCode({
scopes: 'auth_base',
success: res => {
console.log("支付宝授权码", res)
console.log("支付宝授权码", res.authCode)
const options = {
type: 2,
data: {
@@ -62,10 +62,11 @@
},
method: "POST",
};
request(getZfbOpenid, options).then((res) => {
const result = stringToJson(res.bizContent);
if (result.data) {
setItem("zfbOpenId", result.data);
requestNew(getZfbOpenid, options).then((res) => {
const result = res;
console.log("getZfbOpenid",getZfbOpenid)
if (result.openId) {
setItem("zfbOpenId", result.openId);
} else {
setItem("zfbUserId", result.userId);
}

+ 2
- 1
components/nav-bar/nav-bar2.vue Näytä tiedosto

@@ -2,7 +2,8 @@
<view class="nav-bar" :class="scrollTop>navHeight?navbgClass:''" :style="{height:navHeight+'px',color:fontColor}">
<view class="title"
:style="{paddingTop:searchMarginTop+'px',height:searchHeight+'px',lineHeight:searchHeight+'px'}">
<block v-if="isBack && !isAlipay">
<!-- <block v-if="isBack && !isAlipay"> -->
<block v-if="isBack">
<image :src="navbgClass=='nav-bg'?`/static/image/icon-back.png`:'/static/image/icon-back-white.png'" :style="{height:searchHeight+'px',width:searchHeight+'px'}"
class="back" @click="back(title,type,userType,orderId)"></image>
</block>

+ 0
- 125
components/nav-bar/nav-barNew.vue Näytä tiedosto

@@ -1,125 +0,0 @@
<template>
<view class="nav-bar" :class="scrollTop>navHeight?navbgClass:''" :style="{height:navHeight+'px',color:fontColor}">
<view class="title"
:style="{paddingTop:searchMarginTop+'px',height:searchHeight+'px',lineHeight:searchHeight+'px'}">
<block v-if="isBack && !isAlipay">
<image :src="`/static/image/icon-back-white.png`" :style="{height:searchHeight+'px',width:searchHeight+'px'}"
class="back" @click="back(title,type,userType,orderId)"></image>
</block>
<text>{{title}}</text>
</view>
</view>
<view class="blank" :style="{height:navHeight+'px'}"></view>
</template>

<script setup lang="ts">
import { msg } from "@/utils/utils";
import {
onMounted,
ref
} from "vue";
const navHeight = ref(0)
const searchMarginTop = ref(0)
const searchHeight = ref(0)
const searchWidth = ref(0)
const isAlipay = ref(false)
onMounted(() => {
const type = uni.getSystemInfoSync().uniPlatform
isAlipay.value = type === 'mp-alipay'

const menuButtonInfo = uni.getMenuButtonBoundingClientRect()
const {
top,
width,
height,
right
} = menuButtonInfo
uni.getSystemInfo({
success: (res) => {
const {
statusBarHeight
} = res
const margin = top - statusBarHeight
navHeight.value = (height + statusBarHeight + (margin * 2)) //导航栏总高
searchMarginTop.value = statusBarHeight + margin // 状态栏 + 胶囊按钮边距
searchHeight.value = height // 与胶囊按钮同高
searchWidth.value = right - width // 胶囊按钮右边坐标 - 胶囊按钮宽度 = 按钮左边可使用宽度
},
})
})

const props = defineProps({
title: {
type: String,
default: ''
},
orderId: {
type: String,
default: ''
},
type: {
type: String,
default: ''
},
userType: {
type: String,
default: ''
},
isBack: {
type: Boolean,
default: true
},
scrollTop: {
type: Number,
default: 0
},
navbgClass: {
type: String,
default: 'nav-bg'
},
fontColor: {
type: String,
default: '#000'
},
})
const back = () => {
uni.navigateBack({
delta: 1
})
}
</script>

<style scoped>
.nav-bg {
background: #01243A;
}
.nav-bgXin {
background: #01243A;
color:#fff;
}
.blank {
width: 100%;
display: none;
}

.nav-bar {
position: fixed;
width: 100%;
z-index: 999;

}

.nav-bar .title {
text-align: center;
width: 100%;
font-size: 28rpx;
font-weight: bold;
position: relative;
color: white;
}

.back {
position: absolute;
left: 10rpx;
}
</style>

+ 3
- 1
composables/order/useOrderListItem.ts Näytä tiedosto

@@ -202,7 +202,9 @@ export default function useOrderListItem(props) {
});
onShow(() => {
console.log("一进页面就刷新", searchKeyWords.value)
// refreshList(true);
if(props.index==0){
refreshList(true);
}
})
return {
config,

+ 14
- 21
pages.json Näytä tiedosto

@@ -42,14 +42,8 @@
"path": "pages/service/service",
"style": {
"navigationBarTitleText": "九州ETC",
// "navigationStyle": "custom",
"navigationBarBackgroundColor": "#01243A",
"navigationBarTextStyle":"white",
"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
"transparentTitle": "always",
"titlePenetrate": "YES",
"defaultTitle": "" // 将导航栏默认的 title 置空
}
"navigationBarTextStyle":"white"
}
},
{
@@ -1337,7 +1331,12 @@
"style": {
"navigationBarTitleText": "订单详情",
"navigationStyle": "custom",
"navigationBarTextStyle":"white"
"navigationBarTextStyle":"white",
"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
"transparentTitle": "always",
"titlePenetrate": "YES",
"defaultTitle": "" // 将导航栏默认的 title 置空
}
}
},
{
@@ -1533,12 +1532,6 @@
"navigationBarTitleText": "ETC通行流水记录"
}
},
// {
// "path": "search/select-card",
// "style": {
// "navigationBarTitleText": "选择卡号"
// }
// },
{
"path": "help/help",
"style": {
@@ -1944,13 +1937,13 @@
{
//其他服务模块
"root": "subpackage/carPark",
// "plugins": {
// "issuer-plugin": {
// // "version": "dev-5d954bb916bb210d6c17397439d90f07",
// "version": "1.0.2",
// "provider": "wxa2d9acdd1054e69b"
// }
// },
"plugins": {
"issuer-plugin": {
// "version": "dev-5d954bb916bb210d6c17397439d90f07",
"version": "1.0.2",
"provider": "wxa2d9acdd1054e69b"
}
},
"pages": [
{
"path": "etc/etcDeviceInfo",

+ 8
- 2
pages/index/index.vue Näytä tiedosto

@@ -90,7 +90,7 @@
</view>
</view>
</view>
<view class="news-con">
<view class="news-con" v-if="state.highMsgData.length>0">
<view class="title-con">
<text class='title-h'>高速快讯</text>
<view class="r-more" @click="$util.navTo('/subpackage/orders/moreHighMsg/moreHighMsg',true)">
@@ -226,7 +226,7 @@
} from "@/datas/fileURL.js";
import {
navTo,
msg,hasLogin,confirm
msg,hasLogin,confirm,jumpOldMini
} from "@/utils/utils";
import {
getCodeName
@@ -330,6 +330,12 @@
}
}else{
console.log("进来了")
if(item.title=='设备注销' || item.title=='设备升级'){
// 跳转到运维
jumpOldMini()
return;
}
if (item.path) {
navTo(item.path, true)
} else if (item.handlePath) {

+ 10
- 5
pages/service/components/rightList.vue Näytä tiedosto

@@ -1,7 +1,7 @@
<template>
<view class='right-contaienr'>
<scroll-view scroll-y="true" :style='{height:scrollHeight}'>
<view v-for="(item,index) in menuList" :key='index' class="item-box" @click="toNext(item.link)">
<view v-for="(item,index) in menuList" :key='index' class="item-box" @click="toNext(item.link,item.name)">
<view class="l-img bg-blue" :style="{ '--background': bgBlue }">
<image :src="`${fileURLList}${item.iconPath}`" mode="aspectFit" class='img' />
</view>
@@ -21,6 +21,7 @@
getCurrentInstance,
defineProps
} from "vue";
import {jumpOldMini} from "@/utils/utils";
import {
fileURL, fileURLList
} from "@/datas/fileURL.js";
@@ -47,10 +48,14 @@
.exec();

})
function toNext(url) {
uni.navigateTo({
url: url,
});
function toNext(url,name) {
if(name=='更换设备' || name=='卡签续期'||name=='设备升级' || name=='卡签注销'|| name=='挂失解挂' || name=='欠费补缴' || name=='发票服务'|| name=='月结单查询' || name=='业务审核查询'|| name=='ETC通行流水记录' || name=='黑名单查询'){
jumpOldMini()
}else{
uni.navigateTo({
url: url,
});
}
}
</script>


+ 2
- 2
subpackage/after-sale/account-recharge/recharge-weixin.vue Näytä tiedosto

@@ -627,8 +627,8 @@
method: "POST",
showLoading: true,
};
request(obtainUserId, optionsUser).then((res) => {
const data = stringToJson(res.bizContent);
requestNew(obtainUserId, optionsUser).then((res) => {
const data = res;
const optionsali = {
type: 2,
data: {

+ 2
- 2
subpackage/after-sale/add-equity/add-equity-details.vue Näytä tiedosto

@@ -190,9 +190,9 @@
showLoading: true,
};
console.log('支付宝用户编号请求：', optionsUser)
request(obtainUserId, optionsUser).then((res) => {
requestNew(obtainUserId, optionsUser).then((res) => {
console.log('支付宝用户编号返回：', res)
const data = stringToJson(res.bizContent);
const data = res;
console.log("data", data)
const optionsali = {
type: 2,

+ 2
- 2
subpackage/after-sale/add-equity/equity-list.vue Näytä tiedosto

@@ -176,9 +176,9 @@
showLoading: true,
};
console.log('支付宝用户编号请求：', optionsUser)
request(obtainUserId, optionsUser).then((res) => {
requestNew(obtainUserId, optionsUser).then((res) => {
console.log('支付宝用户编号返回：', res)
const data = stringToJson(res.bizContent);
const data = res;
console.log("data", data)
const optionsali = {
type: 2,

+ 2
- 2
subpackage/after-sale/replace-equipment/order-confirm-receipt.vue Näytä tiedosto

@@ -1,6 +1,6 @@
<!-- 订单详情-确认收货 -->
<template>
<navBar title="确认收货" :scrollTop="scrollTop"></navBar>
<navBar title="确认收货" navbgClass="nav-bgXin" fontColor='#fff' :scrollTop="scrollTop"></navBar>
<view class="bg-img">
<image :src="`${$imgUrl}order/bg-order.png`" mode="scaleToFill" class="icon"></image>
</view>
@@ -49,7 +49,7 @@
</template>

<script setup lang="ts">
import navBar from "@/components/nav-bar/nav-barNew.vue";
import navBar from "@/components/nav-bar/nav-bar2.vue";
import { reactive,ref } from "vue";
import { onLoad,onPageScroll } from "@dcloudio/uni-app";
import {requestNew } from "@/utils/network/request.js";

+ 5
- 7
subpackage/after-sale/replace-equipment/order-payment.vue Näytä tiedosto

@@ -27,12 +27,10 @@
import { onLoad, onPageScroll } from "@dcloudio/uni-app";
import { reactive, ref } from "vue";
import {
// PAYDETECTION,
PAYMENTORDERAPPLY,
aliPayConfigIdTwo,
obtainUserId,
getOpenId,
etcVehiclePlateVer,payApply,payQuery,
getOpenId,payApply,payQuery,
cancelPayQuery
} from "@/utils/network/api.js";
import { request,requestNew } from "@/utils/network/request.js";
@@ -83,9 +81,9 @@
showLoading: true,
};
console.log('支付宝用户编号请求：', optionsUser)
request(obtainUserId, optionsUser).then((res) => {
requestNew(obtainUserId, optionsUser).then((res) => {
console.log('支付宝用户编号返回：', res)
const data = stringToJson(res.bizContent);
const data = res;
const optionsali = {
type: 2,
data: {
@@ -97,8 +95,8 @@
showLoading: true,
};
console.log('支付下单请求：', optionsali)
request(PAYMENTORDERAPPLY, optionsali).then((res) => {
const data = stringToJson(res.bizContent);
requestNew(PAYMENTORDERAPPLY, optionsali).then((res) => {
const data = res;
console.log('支付下单返回：', data)
my.tradePay({
// 调用统一收单交易创建接口（alipay.trade.create），获得返回字段支付宝交易号 trade_no

+ 2
- 2
subpackage/carPark/recharge/recharge-weixin.vue Näytä tiedosto

@@ -793,8 +793,8 @@
method: "POST",
showLoading: true,
};
request(obtainUserId, optionsUser).then((res) => {
const data = stringToJson(res.bizContent);
requestNew(obtainUserId, optionsUser).then((res) => {
const data = res;
const optionsali = {
type: 2,
data: {

+ 1
- 2
subpackage/orders/essential-information.vue Näytä tiedosto

@@ -438,8 +438,7 @@
position: absolute;
top: 370rpx;
min-height: calc(100% - 370rpx);
// background-color: #fff;
// padding:20rpx 30rpx 50rpx;
width: 100%;
box-sizing: border-box;
border-radius: 12rpx;
padding: 0 30rpx 210rpx;

+ 2
- 2
subpackage/orders/order-confirm-receipt.vue Näytä tiedosto

@@ -1,6 +1,6 @@
<!-- 订单详情-确认收货 -->
<template>
<navBar title="确认收货" :scrollTop="scrollTop"></navBar>
<navBar title="确认收货" navbgClass="nav-bgXin" fontColor='#fff' :scrollTop="scrollTop"></navBar>
<view class="bg-img">
<image :src="`${$imgUrl}order/bg-order.png`" mode="scaleToFill" class="icon"></image>
</view>
@@ -50,7 +50,7 @@

<script setup lang="ts">
// import orderInfoItem from "./components/order-info-item";
import navBar from "@/components/nav-bar/nav-barNew.vue";
import navBar from "@/components/nav-bar/nav-bar2.vue";
import { reactive,ref } from "vue";
import { onLoad,onPageScroll } from "@dcloudio/uni-app";
import {requestNew } from "@/utils/network/request.js";

+ 2
- 2
subpackage/orders/order-details-new.vue Näytä tiedosto

@@ -1,6 +1,6 @@
<!-- 新办订单-订单详情 -->
<template>
<navBar title="订单详情" :scrollTop="scrollTop"></navBar>
<navBar title="订单详情" navbgClass="nav-bgXin" fontColor='#fff' :scrollTop="scrollTop"></navBar>
<view class="bg-img">
<image :src="`${$imgUrl}order/bg-order.png`" mode="scaleToFill" class="icon"></image>
</view>
@@ -233,7 +233,7 @@
import { getETCStatusName, getOBUStatusName, msg, getOrderTypeName, getCarTypeName, getOrderTime, isBlank, timesDiff } from "@/utils/utils";
import { OrderStatus } from "@/datas/enum";
import {deviceType} from "@/utils/network/difference";
import navBar from "@/components/nav-bar/nav-barNew.vue";
import navBar from "@/components/nav-bar/nav-bar2.vue";
import {
getCodeName
} from "@/datas/queryKey.js";

+ 5
- 28
subpackage/orders/order_payment.vue Näytä tiedosto

@@ -29,12 +29,10 @@
import { onLoad, onPageScroll } from "@dcloudio/uni-app";
import { reactive, ref } from "vue";
import {
// PAYDETECTION,
PAYMENTORDERAPPLY,
aliPayConfigIdTwo,
obtainUserId,
getOpenId,
etcVehiclePlateVer, payApply, payQuery
getOpenId, payApply, payQuery
} from "@/utils/network/api.js";
import { request, requestNew } from "@/utils/network/request.js";
import { stringToJson } from "@/utils/network/encryption";
@@ -63,7 +61,6 @@
const savaHandle = (val) => {
console.log("val", val)
if (state.isclick) {
// etcVehiclePlateVerRequest().then(() => {
if (val.payStatus == "SUCCESS") {
return;
}
@@ -85,9 +82,9 @@
showLoading: true,
};
console.log('支付宝用户编号请求：', optionsUser)
request(obtainUserId, optionsUser).then((res) => {
requestNew(obtainUserId, optionsUser).then((res) => {
console.log('支付宝用户编号返回：', res)
const data = stringToJson(res.bizContent);
const data = res;
const optionsali = {
type: 2,
data: {
@@ -99,8 +96,8 @@
showLoading: true,
};
console.log('支付下单请求：', optionsali)
request(PAYMENTORDERAPPLY, optionsali).then((res) => {
const data = stringToJson(res.bizContent);
requestNew(PAYMENTORDERAPPLY, optionsali).then((res) => {
const data = res;
console.log('支付下单返回：', data)
my.tradePay({
// 调用统一收单交易创建接口（alipay.trade.create），获得返回字段支付宝交易号 trade_no
@@ -403,26 +400,6 @@
isclick: true,//防止重复点击
vehicleId: ""
});
// 车牌校验
const etcVehiclePlateVerRequest = () => {
let data = {
vehiclePlate: state.vehicleId.split('_')[0],
vehiclePlateColor: state.vehicleId.split('_')[1],
}
const options = {
type: 2,
data: data,
method: "POST",
showLoading: true,
};
return new Promise(async (resolve, reject) => {
const res = await request(etcVehiclePlateVer, options);
const data = stringToJson(res.bizContent);
resolve(data);
}).catch((error) => {
reject(error);
});
}
</script>

<style lang="scss" scoped>

+ 2
- 2
subpackage/orders/payment.vue Näytä tiedosto

@@ -196,8 +196,8 @@
method: "POST",
showLoading: true,
};
request(obtainUserId, optionsUser).then((res) => {
const data = stringToJson(res.bizContent);
requestNew(obtainUserId, optionsUser).then((res) => {
const data = res;
const optionsali = {
type: 2,
data: {

+ 3
- 3
subpackage/orders/payment/payment.vue Näytä tiedosto

@@ -19,7 +19,7 @@
<script setup lang="ts">
import { onLoad, onShow } from "@dcloudio/uni-app";
import { reactive } from "vue";
import { request } from "@/utils/network/request.js";
import { request,requestNew } from "@/utils/network/request.js";

import { stringToJson } from "@/utils/network/encryption";
import { fileURL } from "@/datas/fileURL.js";
@@ -71,9 +71,9 @@
showLoading: true,
};
console.log('支付宝用户编号请求：', optionsUser)
request(obtainUserId, optionsUser).then((res) => {
requestNew(obtainUserId, optionsUser).then((res) => {
console.log('支付宝用户编号返回：', res)
const data = stringToJson(res.bizContent);
const data = res;
const optionsali = {
type: 2,
data: {

+ 1
- 1
subpackage/orders/sign-up-ali-yd.vue Näytä tiedosto

@@ -138,7 +138,7 @@
};
console.log('支付宝用户编号请求：', optionsUser)

request(obtainUserId, optionsUser).then((res) => {
requestNew(obtainUserId, optionsUser).then((res) => {
console.log('支付宝用户编号返回：', res,res.bizContent)
// const bizContent = stringToJson(res.bizContent);
var data = {

+ 4
- 4
subpackage/orders/sign-up-ali.vue Näytä tiedosto

@@ -53,7 +53,7 @@
aliPayConfigIdTwo,
obtainUserId,
infoQuery,
envs, etcQYAction
envs, userSign
} from "@/utils/network/api";
const imgURL = `${fileURL}image/`;

@@ -153,9 +153,9 @@
};
console.log('支付宝用户编号请求：', optionsUser)

request(obtainUserId, optionsUser).then((res) => {
requestNew(obtainUserId, optionsUser).then((res) => {
console.log('支付宝用户编号返回：', res)
const bizContent = stringToJson(res.bizContent);
const bizContent = res;
var data = {
orderId: state.orderId,
subOpenId: bizContent.openId,
@@ -166,7 +166,7 @@
method: "POST",
showLoading: true,
};
request(etcQYAction, options).then((res) => {
requestNew(userSign, options).then((res) => {
console.log("res*******", res);
const data = stringToJson(res.bizContent);
console.log("data*******", data);

+ 8
- 20
subpackage/orders/sign/sign-up-ali.vue Näytä tiedosto

@@ -27,21 +27,16 @@
<script setup lang="ts">
import { onLoad, onShow } from "@dcloudio/uni-app";
import { reactive } from "vue";
import { etcQYAction } from "@/utils/network/api.js";
import { request } from "@/utils/network/request.js";
import { request, requestNew } from "@/utils/network/request.js";

import { stringToJson } from "@/utils/network/encryption";
import { fileURL } from "@/datas/fileURL.js";
import navBar from "@/components/nav-bar/nav-bar2.vue";
import navBgCar from "./components/nav-bg-car4";
import { setItem, StorageKeys } from "@/utils/storage";
import { msg, confirm, getOrderStatusName } from "@/utils/utils";
import { msg, confirm} from "@/utils/utils";
import {
checkOrderStatus,
wechatAppID,
wechatSecret,
aliPayConfigIdTwo,
obtainUserId,
userSign
} from "@/utils/network/api";
const imgURL = `${fileURL}image/`;

@@ -62,13 +57,6 @@
setItem('openId', option.openId);
});


const addInterestsList = () => {
uni.navigateTo({
url: `/subpackage/orders/interestsList?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}`
});
}

const savaHandle = () => {
my.getAuthCode({
scopes: 'auth_user',
@@ -89,9 +77,9 @@
};
console.log('支付宝用户编号请求：', optionsUser)

request(obtainUserId, optionsUser).then((res) => {
requestNew(obtainUserId, optionsUser).then((res) => {
console.log('支付宝用户编号返回：', res)
const bizContent = stringToJson(res.bizContent);
const bizContent = res;
var data = {
orderId: state.orderId,
subOpenId: bizContent.openId,
@@ -102,9 +90,9 @@
method: "POST",
showLoading: true,
};
request(etcQYAction, options).then((res) => {
requestNew(userSign, options).then((res) => {
console.log("res*******", res);
const data = stringToJson(res.bizContent);
const data = res;
console.log("data*******", data);
if (data.signStatus === "WAIT_SIGN") {
//待签约
@@ -222,4 +210,4 @@
color: #ff0000;
line-height: 58rpx;
}
</style>
</style>

+ 0
- 161
subpackage/personal-center/search/select-card-删除.vue Näytä tiedosto

@@ -1,161 +0,0 @@
<template>
<view class="selectCar-box">
<view v-if="state.cards.length>0" @click="choose(i,item)" class="item" v-for="(item,i) in state.cards" :key="i">
<view class="iten-left">
<image :src="`${$imgUrl}card2.png`" mode=""></image>
<text>{{item.cardId}}</text>
</view>
<view class="choose-item">
<view class="active" v-if="flag==i">
</view>
</view>
</view>
<view v-else class="flex">
暂无该车辆卡信息
</view>
</view>
</template>

<script setup>
import {
reactive,
ref
} from "vue"
import {
navTo
} from "@/utils/utils"
import {
onLoad,
onShow
} from "@dcloudio/uni-app";
import {
cardList,
} from "@/utils/network/api.js";
import {
request
} from "@/utils/network/request.js";
import {
msg
} from "@/utils/utils";
import {
getItem,
StorageKeys,
setItem
} from "@/utils/storage";
import {
stringToJson
} from "@/utils/network/encryption";

const state = reactive({
cards: [],
vehicleId: "",
handleDate: ""
});
onLoad((option) => {
state.handleDate = option.handleDate
state.vehicleId = option.vehicleId
getCardList(option.vehicleId)
});

const flag = ref('0')

const choose = (i, item) => {
console.log(item, i)
console.log(item.vehicleId);
navTo(
`/subpackage/personal-center/search/etcFlowingWater?cardId=${item.cardId}&&handleDate=${state.handleDate}&&vehicleId=${state.vehicleId}`
)
}

const getCardList = (vehicleId) => {
var data = {
vehicleId: vehicleId
};
const options = {
type: 2,
data: data,
method: "POST",
showLoading: true,
};
request(cardList, options).then((res) => {
console.log("152", stringToJson(res.bizContent))
let result = stringToJson(res.bizContent);
state.cards = result.data ? result.data : null;
console.log(result.data);
})
}
</script>

<style>
page {
width: 100%;
height: 100%;
background-color: #EEF7F7;
}
</style>
<style lang="scss" scoped>
.flex {
display: flex;
justify-content: center;
}

.selectCar-box {
// width: 100%;
height: 100%;
padding: 30rpx;

.item {
padding: 20rpx;
display: flex;
justify-content: space-between;
align-items: center;
height: 130rpx;
background: #FFFFFF;
box-shadow: 0rpx 2rpx 6rpx 0rpx rgba(223, 223, 223, 0.8);
border-radius: 20rpx;
margin-bottom: 30rpx;

.iten-left {
display: flex;
align-items: center;

image {
width: 150rpx;
height: 120rpx;

}

text {
margin-left: 20rpx;
font-size: 32rpx;
font-family: Noto Sans S Chinese;
font-weight: 400;
color: #333333;
}
}

.choose-item {
width: 44rpx;
height: 44rpx;
background: #FFFFFF;
border: 2rpx solid #00B38B;
border-radius: 50%;
margin-right: 20rpx;
display: flex;
justify-content: center;
align-items: center;
box-sizing: content-box;
}

.active {
width: 34rpx;
height: 34rpx;
background: #00B38B;
border-radius: 50%;
}

}


}
</style>

+ 2
- 2
subpackage/personal-center/trapping-and-repairing-account/recharge-two.vue Näytä tiedosto

@@ -690,8 +690,8 @@
method: "POST",
showLoading: true,
};
request(obtainUserId, optionsUser).then((res) => {
const data = stringToJson(res.bizContent);
requestNew(obtainUserId, optionsUser).then((res) => {
const data = res;
const optionsali = {
type: 2,
data: {

+ 2
- 2
subpackage/personal-center/trapping-and-repairing/recharge-two.vue Näytä tiedosto

@@ -782,8 +782,8 @@
method: "POST",
showLoading: true,
};
request(obtainUserId, optionsUser).then((res) => {
const data = stringToJson(res.bizContent);
requestNew(obtainUserId, optionsUser).then((res) => {
const data = res;
const optionsali = {
type: 2,
data: {

+ 4
- 2
subpackage/service/equity/equity.vue Näytä tiedosto

@@ -12,10 +12,10 @@
<view class="activate" :style="{'--bgimg':`url(${$imgUrl}equity-bg3.png)`}">{{item.getStatus}}</view>
</view>
<view v-for="(list, index) in item.equityInfoItems">
<view class="go" v-if="item.equityType == 'COUPONS'">
<view class="go" v-if="list.equityType == 'COUPONS'">
<view>
<view class="title">权益名称：{{list.productName}}</view>
<view class="title">卡券状态：<text style="color: #01243A;">卡卷状态：{{functBackName(list) == 'WAIT_ACTIVATED' ? '待激活' : functBackName(list) == 'WAIT_USE' ? '待领取' : functBackName(list) == 'USED' ? '已领取' : '已失效'}}</text></view>
<view class="title"><text style="color: #01243A;">卡卷状态：{{functBackName(list) == 'WAIT_ACTIVATED' ? '待激活' : functBackName(list) == 'WAIT_USE' ? '待领取' : functBackName(list) == 'USED' ? '已领取' : '已失效'}}</text></view>
</view>
<view class="btn" data-code="{{item}}"
@click.stop="copyCode(list,functBackName(list),item)" v-if="functBackName(list) != 'EXPIRED' && list && list.equityType !='ZFB'">{{functBackName(list) == 'WAIT_ACTIVATED' ? '去激活' : functBackName(list) == 'WAIT_USE' ? '立即领取' :
@@ -133,6 +133,7 @@
item.vehiclePlate);
// functBackName(list) = item.equityInfoItems[0].couponStatus == 'WAIT_GET' ? 'WAIT_ACTIVATED' : item.equityInfoItems[0].couponStatus
item.getStatus = getStatusValue(item.status)
console.log("item.getStatus===",item.getStatus)
item.redeemCodeStr = item.equityInfoItems[0].couponInfoItem && desensitize(item
.equityInfoItems[0].couponInfoItem.redeemCode)
item.periodOfValidity = item.equityInfoItems[0].periodOfValidity ? item
@@ -337,6 +338,7 @@
font-size: 26rpx;
box-sizing: border-box;
margin: 20rpx auto;
position: relative;
}
.btn{
padding: 16rpx 24rpx;

+ 154
- 154
subpackage/service/equityList/equityList.vue Näytä tiedosto

@@ -59,163 +59,163 @@
})
}
// 权益支付下单
const equityPaymentOrderRequest = (id) => {
state.id =id
// #ifdef MP-WEIXIN
uni.login({
provider: "weixin",
success: function (e) {
const options1 = {
type: 2,
data: {
"jsCode": e.code
},
method: "POST",
showLoading: true,
};
requestNew(getOpenId, options1).then((res) => {
console.log("state.id",id)
const result = res;
const openidData = stringToJson(result.data);
console.log("openidData",openidData)
const options = {
type: 2,
data: {
id: id,
payType: "EQUITY",
wxOpenid: openidData.openid,
},
method: 'POST',
showLoading: true,
}
requestNew(paymentequityapplyapp, options).then((res) => {
const data = res;
console.log("权益支付下单", data)
if (data.info == "购买权益记录已支付") {
uni.showModal({
title: '提示',
content: data.info,
showCancel: false,
success: function (res) {
if (res.confirm) {
uni.navigateBack({
delta: 2
})
}
}
});
} else {
uni.requestPayment({
provider: "wxpay",
orderInfo: "",
timeStamp: data.timestamp,
nonceStr: data.noncestr,
package: data.wxPackage ? data.wxPackage : "",
signType: data.signType,
paySign: data.sign,
success: function (e) {
console.log("支付成功", res);
// 权益支付检测
equityPaymentTestRequest().then((item : any) => {
console.log("权益支付检测", data)
msg("权益产品购买成功")
// 重新查询一遍
query()
})
},
fail: function (err) {
confirm(err, () => { }, "支付失败", false);
},
})
}
})
})
},
})
// #endif
// #ifdef MP-ALIPAY
my.getAuthCode({
scopes: 'auth_base',
success: res => {
const optionsUser = {
type: 2,
data: {
payConfigId: aliPayConfigIdTwo,
code: res.authCode
},
method: "POST",
showLoading: true,
};
console.log('支付宝用户编号请求：', optionsUser)
request(obtainUserId, optionsUser).then((res) => {
console.log('支付宝用户编号返回：', res)
const data = stringToJson(res.bizContent);
console.log("data", data)
const optionsali = {
type: 2,
data: {
id: state.id,
payType: "EQUITY",
wxOpenid: data.openId,
},
method: "POST",
showLoading: true,
};
console.log('支付下单请求：', optionsali)
requestNew(paymentequityapplyapp, optionsali).then((res) => {
const data = stringToJson(res.bizContent);
console.log('支付下单返回：', data)
my.tradePay({
// 调用统一收单交易创建接口（alipay.trade.create），获得返回字段支付宝交易号 trade_no
tradeNO: data.tranPackage,
success: res => {
console.log("支付成功", res);
if (res.resultCode != "6001") {
// 权益支付检测
equityPaymentTestRequest().then((item : any) => {
console.log("权益支付检测", data)
msg("权益产品购买成功,到【我的】权益查看")
setTimeout(() => {
uni.navigateBack({
delta: 2
})
}, 2000)
})
}
// const equityPaymentOrderRequest = (id) => {
// state.id =id
// // #ifdef MP-WEIXIN
// uni.login({
// provider: "weixin",
// success: function (e) {
// const options1 = {
// type: 2,
// data: {
// "jsCode": e.code
// },
// method: "POST",
// showLoading: true,
// };
// requestNew(getOpenId, options1).then((res) => {
// console.log("state.id",id)
// const result = res;
// const openidData = stringToJson(result.data);
// console.log("openidData",openidData)
// const options = {
// type: 2,
// data: {
// id: id,
// payType: "EQUITY",
// wxOpenid: openidData.openid,
// },
// method: 'POST',
// showLoading: true,
// }
// requestNew(paymentequityapplyapp, options).then((res) => {
// const data = res;
// console.log("权益支付下单", data)
// if (data.info == "购买权益记录已支付") {
// uni.showModal({
// title: '提示',
// content: data.info,
// showCancel: false,
// success: function (res) {
// if (res.confirm) {
// uni.navigateBack({
// delta: 2
// })
// }
// }
// });
// } else {
// uni.requestPayment({
// provider: "wxpay",
// orderInfo: "",
// timeStamp: data.timestamp,
// nonceStr: data.noncestr,
// package: data.wxPackage ? data.wxPackage : "",
// signType: data.signType,
// paySign: data.sign,
// success: function (e) {
// console.log("支付成功", res);
// // 权益支付检测
// equityPaymentTestRequest().then((item : any) => {
// console.log("权益支付检测", data)
// msg("权益产品购买成功")
// // 重新查询一遍
// query()
// })
// },
// fail: function (err) {
// confirm(err, () => { }, "支付失败", false);
// },
// })
// }
// })
// })
// },
// })
// // #endif
// // #ifdef MP-ALIPAY
// my.getAuthCode({
// scopes: 'auth_base',
// success: res => {
// const optionsUser = {
// type: 2,
// data: {
// payConfigId: aliPayConfigIdTwo,
// code: res.authCode
// },
// method: "POST",
// showLoading: true,
// };
// console.log('支付宝用户编号请求：', optionsUser)
// requestNew(obtainUserId, optionsUser).then((res) => {
// console.log('支付宝用户编号返回：', res)
// const data = res;
// console.log("data", data)
// const optionsali = {
// type: 2,
// data: {
// id: state.id,
// payType: "EQUITY",
// wxOpenid: data.openId,
// },
// method: "POST",
// showLoading: true,
// };
// console.log('支付下单请求：', optionsali)
// requestNew(paymentequityapplyapp, optionsali).then((res) => {
// const data = stringToJson(res.bizContent);
// console.log('支付下单返回：', data)
// my.tradePay({
// // 调用统一收单交易创建接口（alipay.trade.create），获得返回字段支付宝交易号 trade_no
// tradeNO: data.tranPackage,
// success: res => {
// console.log("支付成功", res);
// if (res.resultCode != "6001") {
// // 权益支付检测
// equityPaymentTestRequest().then((item : any) => {
// console.log("权益支付检测", data)
// msg("权益产品购买成功,到【我的】权益查看")
// setTimeout(() => {
// uni.navigateBack({
// delta: 2
// })
// }, 2000)
// })
// }
},
fail: res => {
console.log("支付失败", res);
},
});
// },
// fail: res => {
// console.log("支付失败", res);
// },
// });
});
});
},
fail: err => {
console.log('my.getAuthCode 调用失败', err)
}
});
// #endif
}
// });
// });
// },
// fail: err => {
// console.log('my.getAuthCode 调用失败', err)
// }
// });
// // #endif
// }
// 权益支付检测
const equityPaymentTestRequest = () => {
const options = {
type: 2,
data: {
id: state.id,
},
method: 'POST',
showLoading: true,
}
return new Promise(async (resolve, reject) => {
const res = await requestNew(payequitydetection, options);
const data = res;
resolve(data);
}).catch((error) => {
reject(error);
});
}
// const equityPaymentTestRequest = () => {
// const options = {
// type: 2,
// data: {
// id: state.id,
// },
// method: 'POST',
// showLoading: true,
// }
// return new Promise(async (resolve, reject) => {
// const res = await requestNew(payequitydetection, options);
// const data = res;
// resolve(data);
// }).catch((error) => {
// reject(error);
// });
// }
</script>
<style>
page {

+ 7
- 13
utils/network/api.js Näytä tiedosto

@@ -39,7 +39,6 @@ export const sendCode = "1001"; //统一会员平台发送验证码接口
export const updateToken = "225aa780a91b40f0b44e7e5fe204fc9a"; //统一会员平台登录确认接口（用于换取openId和token）
export const checkCode = "966"; //校验验证码
export const register = "52de4029940f4e03b18c3a0b8d64c2db"; //USER-无感注册登录（个人/企业）
export const obtainUserId = "58760acb637245729e971597a1fb92c4"; //获取第三方用户标识

/*地址管理*/
export const addressQuery = "27"; //地址管理查询
@@ -49,8 +48,6 @@ export const addressDelete = "28"; // 地址删除
export const addressToOrder = "531"; //CSMSN-卡签是否邮寄 -》更新地址订单

/*下单CSMSN*/
export const etcVehiclePlateVer = "35"; //车牌校验
export const etcCreatOrder = "6"; //CSMSN-创建订单
export const searchOrder = "156"; //8.54.CSMSN-根据车辆ID、操作人、来源获取未完成办理订单
export const etcOcrCard = "15"; //CSMSN-OCR识别身份证
export const etcCarOcrCard = "16"; //CSMSN-OCR识别行驶证
@@ -58,8 +55,8 @@ export const etcUserCardInfoSubmit = "22"; // CSMSN-提交个人用户信息
export const etcUserCardInfoChange = "21"; // CSMSN-更改个人用户信息
export const etcCompanyCardInfoSubmit = "20"; // CSMSN-提交单位用户信息
export const etcCarCardInfoSubmit = "18"; // CSMSN-提交车辆信息
export const exchangeApply = '888' //8.99.ASS-换货/换卡签申请接口
export const exchangeProcess = '886' //8.101.ASS-换货/换卡签审核接口
// export const exchangeApply = '888' //8.99.ASS-换货/换卡签申请接口
// export const exchangeProcess = '886' //8.101.ASS-换货/换卡签审核接口

//产品选择
export const etcQueryProduct = "f01002fa6ded4162afaec1139e503641"; //获取产品 根据客货类型获取
@@ -67,7 +64,6 @@ export const productReCode = '198172b1858d474fa8e35225d65014d7' //订单选择

//签约
export const etcOpenIdMember = "62"; //统一会员平台openId查询接口
export const etcQYAction = "23"; //签约接口

/*******************蓝牙 start*************/
/* 开卡 * 50->51->52->73->51*/
@@ -96,7 +92,6 @@ export const checkOrderStatus = "57"; //订单支付结果查询接口
export const cancelOrder = "7"; //取消订单
export const cancelOrderNew = "7fba19ba5d354c0ea5c443f9b5c66cdf"; //取消订单(新)
export const receiveOrder = "155"; //订单完成收货
// export const getLogistics = "30"; //获取所有的快递公司信息
export const editOrderAddr = '164'; //订单修改收货地址
export const orderEvaluate = '169'; //评价订单
export const orderEvaluateTag = '170'; //获取服务评价标签
@@ -123,7 +118,6 @@ export const CardlossStatus = '82' //卡签挂失/解挂
export const confirmSignCancellation = '897' //卡确认注销接口
export const relieveCarId = '932' //车辆释放信息增加接口(解除车牌占用)
export const cckChangejzCard = '93' //8.106.ASS-储值卡转记账卡申请接口
// export const cckChangejzCardJY = '92' //8.133.ASS-卡签注销验证接口
export const cckChangejzCardJY = 'e730fdae15f542b09395ecb0f5ccbcb6' //8.133.ASS-卡签注销验证接口

export const cckChangejzCardInfo = '95' //8.107.ASS-储值卡转记账卡填写信息接口
@@ -208,11 +202,9 @@ export const queryStoredQuan = "cc907ba2683e481d92398bf6c4d74c57" //储值卡圈
export const queryTrajectory = "d6414e83a2a34c4cb0f3da33a0e901bd" //我的上个月轨迹查询
export const queryCardRecord = "2124c3086aa04faf84d70c01930cc90c" //用户储值卡充值记录-分页查询
export const PAYDETECTION = "7d240e2034f94da399fb0e3775f87a62" //CSMSN-订单支付检测
export const PAYMENTORDERAPPLY = "377421d6ed4f48a29575aa126838a4d2" //CSMSN-订单支付检测

export const businessApi = "b275644e586b447791eede4ad6a41640" //业务完成日志
export const inventoryEquipmentApi = "5570160d4b8d46408664b6c289de6b57" //库存设备统计
// export const getOpenidApi = "53c0698b512a44539ea05cc88157e68b" //获取微信小程序openid
export const getAgreementApi = "a8b7a57c7e7546848c1c0cc4c3dfe19a" //根据订单编号获取渠道产品的补充协议(新)
export const transferRecordApi = "323bc6e1f3304c83921155fc220e9e37" //过户记录查询
export const agreementConfirmApi = "96fa039a85f54655af06d980c8ddc057" //协议确认接口
@@ -223,7 +215,6 @@ export const finishUseOrderApi = "6eb10e968aac40f8bf4549cd05c8f5eb" //结束订
export const ETCProductStatusListQueryApi = "448e81a599fe49b5b7f90f4af3ecae06" //ETC产品状态名单查询
export const ETCProductStatusListQueryDetailsApi = "3b8fdabde0aa4db59be440cd3d688d72" //ETC产品状态名单查询详情
export const DataSynchronizationApi = "1ed5f05a48d24ee8985a4fa104e8ef3e" //订单数据同步到老系统接口
// export const isSubmitOrderApi = "3cec5ab7db63439186bda5a054c5fab7" //老中台-检测能否提交订单
export const activationRecordApi = "1be22d30f08a4f10958a4b76dcfae6cf" //查询重新激活记录限制
export const submitVehicleApi = "e35daf84891549afabcbf86b4ed7e2e3" //重新激活提交车辆信息
export const getEquityListApi = "a2656146d9c24c86b8ea7aabbe3dbf97" //获取全部加购权益列表
@@ -264,7 +255,6 @@ export const flowServiceFee = "1a78cda7cace443f9cff63902fb3d35c" // 通行流水

export const silentLoginApi = "abaf0013caa24dafad12b0f571e8ee40" // 无感登录
export const carMessageApi = "854899f6244049d69b6ff883f28dcb28" // 车辆信息上传带出车辆信息
export const getZfbOpenid = "62f02a3fd5eb462d9541aa21b78bba06" // 获取支付宝Openid支付宝



@@ -454,4 +444,8 @@ export const createCarInfo = "/iaw/api/vehicleManage/add"; //车辆管理信息
export const selectCarInfo = "/iaw/api/vehicleManage/query"; //车辆管理信息查询
export const changeCarInfo = "/iaw/api/vehicleManage/update"; //车辆管理信息修改

export const channelSingQueryApi = "/iaw/sign/wxsigninfo"
export const channelSingQueryApi = "/iaw/sign/wxsigninfo"
// 支付宝接口
export const getZfbOpenid = "/iaw/alipay/system/getAlipayOpenId" // 获取支付宝Openid支付宝
export const obtainUserId = "/iaw/trafficsupple/obtainuserid"; //获取第三方用户标识
export const PAYMENTORDERAPPLY = "/iaw/issue/order/payApply" //支付申请

+ 16
- 1
utils/utils.ts Näytä tiedosto

@@ -727,4 +727,19 @@ export function compareDates(specifiedDateString) {
// 示例使用
// const dateComparison = compareDates('2023-12-31');
// console.log(dateComparison);
// console.log(dateComparison);

// 跳转运维小程序
export function jumpOldMini() {
uni.navigateToMiniProgram({
appId: "wx008c60533388527a",
path: `pages/main/serve/serve`,
envVersion: "release",
success(res) {
console.log('成功', res);
},
fail(res) {
console.log('失败' + res);
},
});
}

Write Preview
Loading…
Peruuta
Tallenna