yangteng pirms 11 mēnešiem
vecāks
revīzija
bce8e13c0a

+ 14
- 2
datas/9901Jump.js Parādīt failu

@@ -2,12 +2,13 @@ import {
getItem
} from "@/utils/storage";
export function jump(type,item){
console.log("type",type,item)
let data=""//传递过来的数据
if(item){
data = JSON.parse(decodeURIComponent(item))
}
let path=""
let jumpType=type //1 obu重新激活 2 卡签注销 3 首次激活 4客车个人用户办理etc 5 更换设备
let jumpType=type //1 obu重新激活 2 卡签注销 3 首次激活 4客车个人用户办理etc 5 更换设备 6 卡签续期
if(jumpType=="1"){
path="pages/route/index"
}else if(jumpType=="2"){
@@ -16,7 +17,7 @@ export function jump(type,item){
path="pages/route/index"
}else if(jumpType=="4"){
path="pages/route/index"
}else if(jumpType=="5"){
}else if(jumpType=="5"){
if(item.applyType=="EXCHANGE_CARD"){
// 卡
path="pages/route/index"
@@ -27,6 +28,17 @@ export function jump(type,item){
// 卡签
path="pages/route/index"
}
}else if(jumpType=="6"){ //卡签续期 renevalType
if(item.renevalType=="1"){
// 卡
path="pages/route/index"
}else if(item.renevalType=="2"){
// 签
path="pages/route/index"
}else if(item.renevalType=="3"){
// 卡签
path="pages/route/index"
}
}
console.log("===",getItem("QYorder").openid,data.vehicleId,data.cardId,jumpType)
uni.navigateToMiniProgram({

+ 0
- 14
pages.json Parādīt failu

@@ -557,13 +557,6 @@
"enablePullDownRefresh": false
}
},
{
"path": "card-Renewal/select-car",
"style": {
"navigationBarTitleText": "卡签续期",
"enablePullDownRefresh": false
}
},
{
"path": "card-Renewal/renewal-confirm",
"style": {
@@ -774,13 +767,6 @@
"enablePullDownRefresh": false
}
},
{
"path": "replace-equipment/select-car",
"style": {
"navigationBarTitleText": "更换ETC设备-选择车辆",
"enablePullDownRefresh": false
}
},
{
"path": "replace-equipment/replace-equipment-confirm",
"style": {

+ 2
- 2
pages/index/index.vue Parādīt failu

@@ -44,7 +44,7 @@
<view class="text">通行发票</view>
</view> -->
<view class="item-box"
@click="$util.navTo('/subpackage/after-sale/activation-once-again/select-car',true)">
@click="$util.navTo('/subpackage/after-sale/activation-once-again/select-car?type=1',true)">
<view class="item item-3">
<image :src="fileURL + '20230511/24e179d44e2d4e5687339bff_obucxjh.png'" mode="aspectFill" />
</view>
@@ -64,7 +64,7 @@
</view>
<view class="text">设备注销</view>
</view>
<view class="item-box" @click="$util.navTo(`/subpackage/after-sale/equipment-upgrade/select-car`,true)">
<view class="item-box" @click="$util.navTo(`/subpackage/after-sale/activation-once-again/select-car?type=2`,true)">
<view class="item item-6">
<image :src="fileURL + 'image/index/item-6.png'" mode="aspectFill" />
</view>

+ 0
- 4
subpackage/after-sale/ETC-log-off/etc-log-off.vue Parādīt failu

@@ -43,10 +43,6 @@
</template>

<script setup lang="ts">
import navBar from "./components/nav-bar.vue";
import {
checkStr
} from "@/utils/utils";
import {
ref,
reactive

+ 3
- 6
subpackage/after-sale/ETC-log-off/log-off-confirm.vue Parādīt failu

@@ -104,14 +104,9 @@
} from "@/utils/network/request.js";
import {
orderDetail,
CardlossStatus,
cckChangejzCardJY
} from "@/utils/network/api.js";

import {
msg
} from "@/utils/utils";

import {
stringToJson
} from "@/utils/network/encryption";
@@ -121,7 +116,8 @@
cardStatus: undefined,
obuStatus: undefined,
},
type: undefined
type: undefined,
agencyId:""
});

/*视图进入后操作*/
@@ -130,6 +126,7 @@
console.log("option", val)
state.data = val
})
state.agencyId=option.agencyId

});
onUnload(() => {

+ 32
- 22
subpackage/after-sale/activation-once-again/select-car.vue Parādīt failu

@@ -27,7 +27,7 @@
const state = reactive({
list: [],
type:"",//1 OBU重新激活 2 卡签注销 3 更换设备(正常走,现在不需要跳转)
type:"",//1 OBU重新激活 2 卡签注销 3 更换设备(正常走,现在不需要跳转,因为要根据其他判断) 4卡签续期(正常走,现在不需要跳转,因为要根据其他判断)
});
onLoad((options) => {
console.log("options",options)
@@ -40,6 +40,10 @@
uni.setNavigationBarTitle({
title: '更换ETC设备-选择车辆'
});
}else if(options.type=="4"){
uni.setNavigationBarTitle({
title: '卡签续期-选择车辆'
});
}
quanCheckActionTrue().then((item : any) => {
@@ -85,28 +89,34 @@
const choose = (i, item) => {
console.log(item.cardId);
// 判断9901
// if(item.aa && state.type!=3){
// // OBU重新激活跳转
// const params = encodeURIComponent(JSON.stringify(item))
// jump(state.type,params)
// }else{
if(state.type=="1"){
// #ifdef MP-WEIXIN
navTo(
`/subpackage/after-sale/activation-once-again/activation-once-again?id=${item.id}`
);
// #endif
// #ifdef MP-ALIPAY
navTo(
`/subpackage/after-sale/activation-once-again/activation-once-again-ali?id=${item.id}`
);
// #endif
}else if(state.type=="2"){
navTo(`/subpackage/after-sale/ETC-log-off/log-off-confirm?id=${item.id}`)
}else if(state.type=="3"){
navTo(`/subpackage/after-sale/replace-equipment/replace-equipment-confirm?id=${item.id}`)
console.log("state.type!=3 || state.type!=4",(state.type!="3" || state.type!="4"))
if(state.type=="2"){
navTo(`/subpackage/after-sale/ETC-log-off/log-off-confirm?id=${item.id}&&agencyId=${item.agencyId}`)
}else if(state.type=="3"){
navTo(`/subpackage/after-sale/replace-equipment/replace-equipment-confirm?id=${item.id}&&agencyId=${item.agencyId}`)
}else if(state.type=="4"){
navTo(`/subpackage/after-sale/card-Renewal/renewal-confirm?id=${item.id}&orderId=${item.orderId}&&agencyId=${item.agencyId}`)
}else {
if(item.agencyId=="52010106004"){
// OBU重新激活跳转
const params = encodeURIComponent(JSON.stringify(item))
jump(state.type,params)
}else{
if(state.type=="1"){
// #ifdef MP-WEIXIN
navTo(
`/subpackage/after-sale/activation-once-again/activation-once-again?id=${item.id}`
);
// #endif
// #ifdef MP-ALIPAY
navTo(
`/subpackage/after-sale/activation-once-again/activation-once-again-ali?id=${item.id}`
);
// #endif
}
}
// }
}
}

+ 23
- 3
subpackage/after-sale/card-Renewal/renewal-confirm.vue Parādīt failu

@@ -127,6 +127,9 @@
IntegerToHexString,
AsciToHexString,
} from "@/utils/util/fileData.js";
import {
jump
} from "@/datas/9901Jump.js";

import {
stringToJson
@@ -136,11 +139,12 @@
const state = reactive({
showPopup: false,
flag: false,
successName: ""
successName: "",
agencyId:""

})
const flag = reactive([])
const type = ref('')
const type = ref('') //1 卡 2 签 3卡签
const fileDataStrings = reactive({
approvedCount: 0, //核载人数
cardId: "", //卡号
@@ -186,13 +190,15 @@
cardEnableTime: "",
obuEnableTime: "",
cardExpireTime: "",
obuExpireTime: ""
obuExpireTime: "",
vehicleId: ""
});
let orderInfo = {};
onLoad((option) => {
//请求订单详情
queryOrderDetail(option.id);
getOrderDetails(option.id)
state.agencyId=option.agencyId
});

onShow((option) => {
@@ -242,6 +248,7 @@
} else {
type.value = '2'
}
console.log("type.value",type.value)
}

//获取订单详情
@@ -271,6 +278,8 @@
orderInfos.obuStatus = orderInfo.obuStatus;
orderInfos.cardExpireTime = orderInfo.cardExpireTime;
orderInfos.obuExpireTime = orderInfo.obuExpireTime;
orderInfos.vehicleId = orderInfo.vehicleId;

console.log("orderInfos.cardExpiretime", orderInfos.cardExpiretime, orderInfo.cardExpiretime)
});
};
@@ -375,8 +384,19 @@
icon: 'none'
});
} else {
if(state.agencyId=="52010106004"){
let obj={
vehicleId: orderInfos.vehicleId,
cardId: orderInfos.cardId,
obuId: orderInfos.obuId,
renevalType: type.value, //选择得哪一个续期
}
const params = encodeURIComponent(JSON.stringify(obj))
jump("6",params)
}else{
console.log("getCurrentPages()", getCurrentPages())
navTo("/pages/bluetooth/bluetooth?routeType=5"); //去连接蓝牙
}
}

};

+ 0
- 168
subpackage/after-sale/card-Renewal/select-car.vue Parādīt failu

@@ -1,168 +0,0 @@
<template>
<view class="selectCar-box">
<view v-if="state.list.length>0" @click="choose(i,item)" class="item" v-for="(item,i) in state.list" :key="i">
<view class="iten-left">
<image :src="`${$imgUrl}che.png`" mode="aspectFill"></image>
<text>{{item.vehiclePlate}}</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 {
orderList
} 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({
list: []
});
onLoad(() => {
quanCheckActionTrue().then((item) => {
state.list = item.data
console.log(item)
})
});

const quanCheckActionTrue = () => {
let source = ""
// #ifdef MP-ALIPAY
source = "ALI"
// #endif
// #ifdef MP-WEIXIN
source = "WECHAT"
// #endif
var data = {
opId: getItem(StorageKeys.OpenId),
source: source,
tabIndex: '0',
orderStep: '11',
isValueCard: '',
orderStatus: "1",
isAfter: true,
};
const options = {
type: 2,
data: data,
method: "POST",
showLoading: true,
};
return new Promise(async (resolve, reject) => {
const res = await request(orderList, options);
const data = stringToJson(res.bizContent);
resolve(data);
}).catch((error) => {
reject(error);
});
}
const flag = ref('0')

const choose = (i, item) => {
console.log(item.cardId)
navTo(`/subpackage/after-sale/card-Renewal/renewal-confirm?id=${item.id}&orderId=${item.orderId}`)
}
</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: 90rpx;

}

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>

+ 5
- 3
subpackage/after-sale/replace-equipment/replace-equipment-confirm.vue Parādīt failu

@@ -127,7 +127,8 @@
cardStatus: undefined,
obuStatus: undefined,
},
type: undefined
type: undefined,
agencyId:""
});
const apply = reactive({
data: {
@@ -138,6 +139,7 @@
});
/*视图进入后操作*/
onLoad((option) => {
state.agencyId=option.agencyId
console.log("id", option)
queryOrderDetail(option.id).then((val : any) => {
console.log("val", val)
@@ -154,7 +156,7 @@
console.log("val.status", val);
if (!val) {
navTo(
`/subpackage/after-sale/replace-equipment/verification?orderId=${state.data.orderId}&&cardId=${state.data.cardId}&&mobile=${state.data.customerTel}`
`/subpackage/after-sale/replace-equipment/verification?orderId=${state.data.orderId}&&cardId=${state.data.cardId}&&mobile=${state.data.customerTel}&&vehicleId=${state.data.vehicleId}&&agencyId=${state.agencyId}`
)

} else {
@@ -167,7 +169,7 @@
)
} else {
navTo(
`/subpackage/after-sale/replace-equipment/verification?orderId=${state.data.orderId}&&cardId=${state.data.cardId}&&mobile=${state.data.customerTel}`
`/subpackage/after-sale/replace-equipment/verification?orderId=${state.data.orderId}&&cardId=${state.data.cardId}&&mobile=${state.data.customerTel}&&vehicleId=${state.data.vehicleId}&&agencyId=${state.agencyId}`
)
}
}

+ 0
- 169
subpackage/after-sale/replace-equipment/select-car.vue Parādīt failu

@@ -1,169 +0,0 @@
<template>
<view class="selectCar-box">
<view v-if="state.list&&state.list.length>0" @click="choose(i,item)" class="item" v-for="(item,i) in state.list"
:key="i">
<view class="iten-left">
<image :src="`${$imgUrl}che.png`" mode="aspectFill"></image>
<text>{{item.vehiclePlate}}</text>
</view>
<view class="choose-item">
<view class="active" v-if="flag==i">
</view>
</view>
</view>

<view v-else>
<empty title='暂无找到相关车辆信息' />
</view>
</view>
</template>

<script lang="ts" setup>
import empty from "@/components/empty/empty.vue";
import {
reactive,
ref
} from "vue"
import {
navTo
} from "@/utils/utils"
import {
onLoad,
} from "@dcloudio/uni-app";
import {
orderList
} from "@/utils/network/api.js";
import {
request
} from "@/utils/network/request.js";
import {
getItem,
StorageKeys,
} from "@/utils/storage";
import {
stringToJson
} from "@/utils/network/encryption";

const state = reactive({
list: [] //车辆list
});
const flag = ref('0') //默认选择0

onLoad(() => {
quanCheckActionTrue().then((item : any) => {
state.list = item.data
})
});

const quanCheckActionTrue = () => {
let source = ""
// #ifdef MP-ALIPAY
source = "ALI"
// #endif
// #ifdef MP-WEIXIN
source = "WECHAT"
// #endif
var data = {
opId: getItem(StorageKeys.OpenId),
source: source, //渠道为小程序
tabIndex: '0', //0全部
orderStep: '11', //11 为已完成”
isValueCard: "",
orderStatus: "1",
isAfter: true,
};
const options = {
type: 2,
data: data,
method: "POST",
showLoading: true,
};

return new Promise(async (resolve, reject) => {
const res = await request(orderList, options);
const data = stringToJson(res.bizContent);
resolve(data);
}).catch((error) => {
reject(error);
});
}

const choose = (i, item) => {
flag.value = i
navTo(`/subpackage/after-sale/replace-equipment/replace-equipment-confirm?id=${item.id}`)
}
</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: 90rpx;

}

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>

+ 15
- 12
subpackage/after-sale/replace-equipment/verification.vue Parādīt failu

@@ -56,7 +56,6 @@
</template>

<script setup lang="ts">
import { jump } from "@/datas/9901Jump.js";
import {
ref,
reactive
@@ -80,6 +79,7 @@
import {
stringToJson
} from "@/utils/network/encryption";
import { jump } from "@/datas/9901Jump.js";
import {
msg
} from "@/utils/utils";
@@ -90,6 +90,8 @@
height: 80,
},
isPicture: false, //是否上传图片
vehicleId:"",
agencyId:""
})
// 表单数据
const form = reactive({
@@ -182,7 +184,8 @@
form.mobile = option.mobile
params.cardId = option.cardId
params.orderId = option.orderId

state.vehicleId = option.vehicleId
state.agencyId=option.agencyId
});

onShow(() => {
@@ -292,22 +295,22 @@
const toPage = () => {
console.log("sdkchkdscn", apply.data)
console.log("form.damageMode", form.damageMode)
// if(state.aa){
// let obj={
// applyType:form.applyType,
// vehicleId:form.vehicleId,
// cardId:params.cardId,
// }
// const params = encodeURIComponent(JSON.stringify(obj))
// jump("5",params)
// }else{
if(state.agencyId=="52010106004"){
let obj={
applyType:form.applyType,
vehicleId:state.vehicleId,
cardId:params.cardId,
}
const paramss = encodeURIComponent(JSON.stringify(obj))
jump("5",paramss)
}else{
queryCckChangejzCardAction().then(val => {
console.log("val888888", val)
navTo(
`/subpackage/after-sale/replace-equipment/form?orderId=${params.orderId}&&id=${val.id}&&damageMode=${form.damageMode}&&msg=${val.msg}&&cardExpire=${val.cardExpire}&&obuExpire=${val.obuExpire}`
)
})
// }
}
};
</script>


+ 4
- 2
subpackage/orders/choice-product.vue Parādīt failu

@@ -99,7 +99,7 @@
}
setItem("isValueCard", state.isValueCard);
uni.navigateTo({
url: `/subpackage/orders/interestsList?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&fee=${Number(state.fee)}&equityId=${state.equityId}&fee=${state.fee}`,
url: `/subpackage/orders/interestsList?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&fee=${Number(state.fee)}&equityId=${state.equityId}&fee=${state.fee}&signAgencyId=${state.signAgencyId}`,
});
}
const savaHandle = (val, idx) => {
@@ -108,6 +108,7 @@
setItem("promoteId", val.promoteId);

state.isSign = val.isSign;
state.signAgencyId = val['releaseProductStandards']['signAgencyId'];
state.equityId = val.releaseProductStandards.equityList[idx].equityId;
// 产品金额+权益金额
state.fee = Number(val.fee) + Number(val.releaseProductStandards.equityList[idx].discountPrice);
@@ -125,7 +126,7 @@
console.log("state.isValueCard", state.isValueCard)
setItem("isValueCard", state.isValueCard);
uni.navigateTo({
url: `/subpackage/orders/interestsList?equityId=${val.releaseProductStandards.equityList[idx].equityId}&promoteId=${val['promoteId']}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&fee=${state.fee}`,
url: `/subpackage/orders/interestsList?equityId=${val.releaseProductStandards.equityList[idx].equityId}&promoteId=${val['promoteId']}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&fee=${state.fee}&signAgencyId=${val['releaseProductStandards']['signAgencyId']}`,
});
} else {
state.radiolist1 = [];
@@ -240,6 +241,7 @@
],
fee: 0, //产品金额
equityId: "",
signAgencyId:"",//渠道标识
});
const closeMask = () => {
state.choiceCardShow = false;

+ 7
- 5
subpackage/orders/interestsList.vue Parādīt failu

@@ -42,7 +42,8 @@
changeCardType: "",//储值卡转记账卡选权益产品
applyId: "",
orderId: "",
sysType: ""
sysType: "",
signAgencyId:"",
})

let richText = ref('')
@@ -68,11 +69,12 @@
state.orderId = option.orderId;
getInfo();
getOpenID();
state.signAgencyId = option.signAgencyId;
})
const addInterestsList = () => {
// if(state.aa){
// jump("4","")
// }else{
if(state.signAgencyId=="99019052"){
jump("4","")
}else{
if (state.changeCardType == "1") {
navTo(
`/subpackage/after-sale/to-bookkeeping-card/mailing_information?orderId=${state.orderId}&&applyId=${state.applyId}&&productId=${state.promoteId}&&totalAmount=${state.totalAmount}&&equityId=${state.equityId}`
@@ -83,7 +85,7 @@
url: `/subpackage/orders/essential-information?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&totalAmount=${state.totalAmount}&equityId=${state.equityId}`,
});
}
// }
}
}


Notiek ielāde…
Atcelt
Saglabāt