yangteng пре 6 месеци
родитељ
комит
c18df16251

+ 1
- 0
App.vue Прегледај датотеку

@@ -169,5 +169,6 @@

page {
font-family: "Microsoft Yahei";
background-color: #E9EDF0;
}
</style>

+ 1
- 1
components/tips/tips.vue Прегледај датотеку

@@ -5,7 +5,7 @@
<image class="tips-image" :src="`${$imgUrl}common/tips.png`" mode=""></image>
<text class="tishi">提示</text>
</view>
<view class="title">服务开通中敬请期待</view>
<view class="title">服务开通中敬请期待</view>
<view>
<text class="cancle" @click="emits('cancle', false)">取消</text>
<text class="sure" @click="emits('cancle', false)">确定</text>

+ 4
- 4
login/register-step1.vue Прегледај датотеку

@@ -104,11 +104,11 @@
.then((res) => {
const result = res;
console.log("个人账号重复注册校验", result.canRegister)
if (result.canRegister) {
// if (result.canRegister) {
nextStep();
} else {
msg("该手机号已注册!");
}
// } else {
// msg("该手机号已注册!");
// }
})
.catch((err) => {
console.log(err);

+ 34
- 9
pages/index/index.vue Прегледај датотеку

@@ -139,7 +139,11 @@
</view>
<image :src="`${fileURL}image/newHome/tiaojianr.png`" mode="scaleToFill" class="icon-img"></image>
</view>
<view class="list-info"> {{state.processeConditionText}} </view>
<!-- <view class="list-info"> {{state.processeConditionText}} </view> -->
<view class="item" v-for="(item,index) in state.processeConditionText" :key="index">
<view class="tu" :style="{'--bgimg':`url(${fileURL}image/newHome/condition.png)`}">{{index+1}}</view>
<view>{{item}}</view>
</view>
</view>
</view>
<view v-else-if="state.tabActive === '常见问题'">
@@ -152,7 +156,6 @@
{{item}}
</view>
</view>
<!-- <view class="list-info"> {{state.commonQuestionText}} </view> -->
</view>
</view>
</view>
@@ -333,7 +336,7 @@
jumpOldMini()
return;
}
if(item.title=='网点查询' || item.title=='业务指引'){
if(item.title=='业务指引'){
state.showTips=true
return;
}
@@ -400,7 +403,7 @@
},
],
highMsgData: '',//高速快讯内容
processeConditionText: "", //办理条件文本
processeConditionText:[], //办理条件文本
commonQuestionText: "", //常见问题文本
commonQuestionArr: [], //常见问题数组
isEnableSetGray: false,
@@ -418,9 +421,6 @@
}
})
getSwiper()
// setTimeout(()=>{
// toCreatOrder('1')
// },200)
});
onReachBottom(() => {
highMsg(); //高速快讯
@@ -441,6 +441,10 @@
};

const showMask = (val : any) => {
if(val==2){
state.showTips=true
return;
}
state.vanType = val; //1 客车 2货车
isShowMask.value = true;
};
@@ -518,7 +522,7 @@
.then((res) => {
let data = res
console.log("办理条件", data)
state.processeConditionText = data.text
state.processeConditionText = data.text.split('。').filter(item => item)
})
.catch((err) => {
console.log(err);
@@ -1043,7 +1047,28 @@
height: 20rpx;
}
}

.item{
font-size: 26rpx;
color: #222222;
display: flex;
margin-bottom: 16rpx;
font-family: MicrosoftYaHeiUI;
.tu{
background-image: var(--bgimg);
background-size: 100% 100%;
background-repeat: no-repeat;
height: 44rpx;
width: 44rpx;
display: flex;
align-items: center;
text-align: center;
color: white;
justify-content: center;
margin-right: 10rpx;
flex-shrink: 0;
font-size: 22rpx;
}
}
}

.list-info {

+ 1
- 1
pages/order/components/order-list-item-new.vue Прегледај датотеку

@@ -91,7 +91,7 @@

<!-- 待收货 -->
<view class="btns" v-else-if="item.orderStep == OrderStatus.待收货">
<view class="btn btn-normal" @click.stop="gotoOrderDetails(item)">查看物流</view>
<!-- <view class="btn btn-normal" @click.stop="gotoOrderDetails(item)">查看物流</view> -->
<!-- 待收货异地 发货之后确认收货之前可以补货 -->
<view class="btn btn-normal" @click.stop="gotoReplenishmentOrder(item)" v-if="item.deviceType == deviceType">
申请补货</view>

+ 0
- 1
stores/user.js Прегледај датотеку

@@ -86,7 +86,6 @@ export const useUserStore = defineStore("userStore", {
// //移除本地缓存
removeItem(StorageKeys.Token);
removeItem(StorageKeys.OpenId);
removeItem(StorageKeys.QYorder);
uni.$emit('loginOut');
uni.navigateTo({
url: "/login/login"

+ 6
- 93
subpackage/after-sale/wangdian.vue Прегледај датотеку

@@ -1,101 +1,14 @@
<template>
<view class="selectCar-box">
<view v-if="state.list.length > 0" class="item" v-for="(item, i) in state.list"
:key="i">
<view class="iten-left">
<view class="message">
<view>渠道:{{ item.agencyId }}</view>
<view>渠道名称:{{item.agencyName}}</view>
<view>网点:{{item.name }}</view>
<view>网点编号:{{item.servicehallId}}</view>
</view>
</view>
</view>
<view v-else class="flex"> 暂无网点 </view>
</view>
<image :src="`${fileURL}image/newHome/wangdianall.png`" mode="widthFix" style="width: 100%;"></image>
</template>

<script lang="ts" setup>
import { reactive, ref } from "vue";
import { onLoad} from "@dcloudio/uni-app";
import { outletList } from "@/utils/network/api.js";
import { requestNew } from "@/utils/network/request.js";
const state = reactive({
list: [],
});
onLoad(() => {
wangdian().then((item : any) => {
console.log("item",item)
state.list = item;
});
});

const wangdian = () => {
const options = {
type: 2,
data: {},
method: "POST",
showLoading: true,
};
return new Promise(async (resolve, reject) => {
const res = await requestNew(outletList, options);
const data = res;

resolve(data);
}).catch((error) => {
reject(error);
});
};
import {
fileURL
} from "@/datas/fileURL.js";
</script>

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

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

.item {
padding: 20rpx;
display: flex;
justify-content: space-between;
align-items: center;
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;
}
}
}
}
.message{
font-size: 26rpx;
margin-left: 6rpx;
}
<style lang="scss" scoped>
</style>

+ 53
- 51
subpackage/orders/apply-ex-goods-step1.vue Прегледај датотеку

@@ -5,7 +5,7 @@

<u-form-item prop="applyType">
<view class="from_item">
<text><text style="color: red;">*</text>申请类型:</text>
<text style="color: #004576;"><text class="red">*</text>申请类型:</text>
<view style="display: flex;">
<picker @change="bindPickerChange" :value="index" :range="columnsOld">
<view class="uni-input">{{index>=0?columnsOld[index]:"请选择"}}</view>
@@ -17,12 +17,22 @@
</u-form-item>
</view>
</u-form>
<view class="message">
<view><text class="red">*</text>设备更换需将原设备寄回</view>
<view>寄回信息:</view>
<view>收件人:ETC售后 联系电话:18798751224(此电话仅用于ETC售后收取快递,如需咨询业务请致电4008008787)</view>
<view>寄回地址:{{state.address}}</view>
<view>补换订单审核时效:设备签收后的2个自然日完成审核,审核通过后请关注订单物流单号;</view>
<view class="content">
<view class="title"><text class="red">*</text>设备更换需将原设备寄回</view>
<view class="title1"><image :src="`${$imgUrl}common/apply-goods.png`"></image><text>寄回信息</text></view>
<view class="content-box">
<view class="phone">
<text>收件人:</text>
<text>ETC售后</text>
</view>
<view class="phone">
<text>联系电话:</text>
<text>18798751224</text>
</view>
<view>此电话仅用于ETC售后收取快递,如需咨询业务请致电4008008787</view>
</view>
<view class="title1"><image :src="`${$imgUrl}common/tips.png`"></image><text>寄回地址</text></view>
<view class="content-box">补换订单审核时效:设备签收后的2个自然日完成审核,审核通过后请关注订单物流单号;</view>
</view>
<button class="submit" @click="submit">下一步</button>
</view>
@@ -47,12 +57,7 @@
const form = reactive({
orderId: '',
applyType: '',
operation: ''

})
const state = reactive({
address: '',
})
//接受通过该id查询订单详情
const oldId = ref('')
@@ -93,13 +98,6 @@
const showPicker = function () {
show.value = true
}
// 确定地区
const confirm = (e) => {
console.log(e, columns[e].id, columns[e].label);
index.value = e
form.applyType = columns[e].id
applyType.value = columns[e].label
}


// 提交
@@ -129,7 +127,6 @@
height: 100%;
display: flex;
flex-direction: column;
background-color: #F3F3F3;
}
</style>
<style lang="scss" scoped>
@@ -139,7 +136,6 @@

.from {
background-color: #fff;
margin-top: 20rpx;

::v-deep .u-form-item {
padding: 0;
@@ -168,35 +164,11 @@
}
}
}

.from_item1 {
display: flex;
flex-wrap: nowrap;
flex-direction: column;
justify-content: space-between;
padding: 30rpx;
border-bottom: #DCDCDC 1px solid;

input {
text-align: right;
}

.textarea {
background-color: #F1F1F1;
width: 100%;
border-radius: 20rpx;
margin-top: 10rpx;
text-indent: 1rem;
height: 180rpx;
padding: 20rpx;
box-sizing: border-box;
}
}
}
}

.submit {
background: linear-gradient(to left, #43A1E0 0%, #13E7C1 100%);
background:linear-gradient(to right,#01243A,#004576);
width: 670rpx;
height: 80rpx;
color: #fff;
@@ -209,10 +181,40 @@
color: red;
margin-right: 10rpx;
}

.message {
font-size: 30rpx;
margin-top: 30rpx;
padding: 0 20rpx;
.content{
font-weight: 400;
font-size: 28rpx;
color: #6C6C6C;
background-color: white;
width: 100%;
margin-top: 20rpx;
padding: 30rpx;
box-sizing: border-box;
image{
width: 8rpx;
height: 26rpx;
margin-right: 10rpx;
}
.title{
font-weight: 400;
font-size: 30rpx;
color: #111111;
}
.title1{
font-weight: 400;
font-size: 28rpx;
color: #111111;
margin: 20rpx 0 30rpx 0;
}
.content-box{
background: #F1F1F1;
padding: 20rpx;
.phone{
margin-bottom: 6rpx;
text:first-child{
margin-right: 6rpx;
}
}
}
}
</style>

+ 29
- 36
subpackage/orders/apply-ex-goods.vue Прегледај датотеку

@@ -2,7 +2,7 @@
<view class="oderPage">
<view class="addr-box">
<view class="addr-box-left" v-if="form.consignee">
<view class="text-image">{{form.consignee.charAt(0)}} </view>
<image class="text-image" :src="`${$imgUrl}applyCard/head.png`"></image>
<view class="content">
<view class="">
<text class="item1">{{form.consignee}}</text>
@@ -22,11 +22,11 @@
<view class="from">
<u-form-item prop="cardState">
<view class="from_item">
<text><text style="color: red">*</text>是否寄回设备:</text>
<text class="left"><text style="color: red">*</text>是否寄回设备:</text>
<radio-group @change="sendChange" class="radios">
<block v-for="(item, index) in radiolist1" :key="item.val">
<view class="radio-box">
<radio :value="item.val" :checked="form.sendStatus == item.val" color="#13e7c1"
<radio :value="item.val" :checked="form.sendStatus == item.val" color="#42D175"
style="transform:scale(0.75)" />
<view>{{item.name}}</view>
</view>
@@ -36,7 +36,7 @@
</u-form-item>
<u-form-item prop="logistics" v-if="form.sendStatusName == '寄回'">
<view class="from_item">
<text><text style="color: red">*</text>退货物流公司:</text>
<text class="left"><text style="color: red">*</text>退货物流公司:</text>
<view style="display: flex">
<u-input v-model="form.courierCompany" class="input" @click="showPicker" placeholder="请选择"
disabled />
@@ -46,17 +46,17 @@
</u-form-item>
<u-form-item prop="returnNum" v-if="form.sendStatusName == '寄回'">
<view class="from_item">
<text><text style="color: red"></text>退货单号:</text>
<text class="left"><text style="color: red"></text>退货单号:</text>
<u-input v-model="form.courierOrderId" class="input" maxlength="32" />
</view>
</u-form-item>
<u-form-item prop="cardState">
<view class="from_item">
<text><text style="color: red">*</text>收货方式:</text>
<text class="left"><text style="color: red">*</text>收货方式:</text>
<radio-group @change="receiveChange" class="radios">
<block v-for="(item, index) in radiolist2" :key="item.val">
<view class="radio-box">
<radio :value="item.val" :checked="form.receiveMethod == item.val" color="#13e7c1"
<radio :value="item.val" :checked="form.receiveMethod == item.val" color="#42D175"
style="transform:scale(0.75)" />
<view>{{item.name}}</view>
</view>
@@ -66,7 +66,7 @@
</u-form-item>
<u-form-item prop="remark">
<view class="from_item">
<text><text style="color: red"></text>更换原因:</text>
<text class="left"><text style="color: red"></text>更换原因:</text>
<view style="display: flex">
<u-input v-model="form.applyRes" @click="showApplyResPicker()" class="input" disabled
placeholder="请选择" />
@@ -74,17 +74,8 @@
</view>
</view>
</u-form-item>
<!-- <u-form-item >
<view class="from_item">
<text><text style="color: red"></text>邮寄地址:</text>
<u-input v-model="form.goodsAddress" class="input" disabled/>
</view>
</u-form-item> -->
</view>
</u-form>
<!-- <view class="attention">{{params.msg}}</view> -->
<!-- <view class="no_pay"><text>*</text>不支持货到付款</view> -->
<!-- 物流弹窗 -->
<view>
<!-- 物流 -->
<u-select v-model="show" mode="single-column" :list="list" @confirm="confirm"></u-select>
@@ -103,9 +94,9 @@
<view v-if="address.list" v-for="(item, index) in address.list" :key="index" @click="addressSelected(item)"
style="margin-bottom: 40rpx" class="flex-bettwen">
<view class="flex">
<view class="xing">
{{ item.consignee.charAt(0) }}
</view>
<!-- <view class="xing"> -->
<image class="xing" :src="`${$imgUrl}applyCard/head.png`"></image>
<!-- </view> -->
<view class="content">
<view class="flex">
<view class="name">
@@ -433,7 +424,6 @@
height: 100%;
display: flex;
flex-direction: column;
background-color: #f3f3f3;
}
</style>
<style lang="scss" scoped>
@@ -450,6 +440,8 @@
.oderPage {
flex: 1;
width: 100%;
padding: 0 20rpx;
box-sizing: border-box;

.addr-box {
margin-top: 20rpx;
@@ -484,18 +476,18 @@
color: #333333;

.item1 {
font-size: 30rpx;
font-family: Microsoft YaHei;
font-weight: 400;
color: #333333;
font-size: 32rpx;
color: #111111;
font-family: Microsoft YaHei;
}

.item2 {
font-size: 24rpx;
font-family: Microsoft YaHei;
font-weight: 400;
color: #999999;
margin-left: 10rpx;
font-size: 26rpx;
color: #999999;
}

.item3 {
@@ -544,7 +536,9 @@
align-items: center;
height: 80rpx;
border-bottom: 1rpx solid #dcdcdc;

.left{
color: #004576;
}
.btn {
font-size: 24rpx;
font-family: Microsoft YaHei;
@@ -605,13 +599,14 @@
.xing {
width: 68rpx;
height: 68rpx;
background: rgba(0, 179, 139, 0.2);
background: #00b38b;
border-radius: 50%;
text-align: center;
font-size: 26rpx;
font-family: Microsoft YaHei;
font-weight: 400;
color: #00b38b;
color: #ffffff;
line-height: 68rpx;
text-align: center;
}

.content {
@@ -659,7 +654,7 @@

.button {
height: 80rpx;
background: linear-gradient(-90deg, #43a1e0 0%, #13e7c1 100%);
background: linear-gradient(to right,#01243A,#004576);
border-radius: 40rpx;
font-size: 32rpx;
font-weight: 400;
@@ -673,7 +668,7 @@

.button {
height: 80rpx;
background: linear-gradient(-90deg, #43a1e0 0%, #13e7c1 100%);
background: linear-gradient(to right,#01243A,#004576);
border-radius: 40rpx;
font-size: 32rpx;
font-weight: 400;
@@ -688,17 +683,15 @@
}

.submit {
width: 45%;
width: 90%;
height: 80rpx;
background: linear-gradient(-90deg, #43a1e0 0%, #13e7c1 100%);
box-shadow: 0rpx 4rpx 11rpx 1rpx rgba(223, 223, 223, 0.5);
background: linear-gradient(to right,#01243A,#004576);
border-radius: 40rpx;
font-size: 32rpx;
font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
line-height: 80rpx;
// margin-top: 60rpx;
}

.default {

+ 0
- 7
subpackage/orders/apply-return-goods.vue Прегледај датотеку

@@ -13,9 +13,6 @@
import {requestNew } from "@/utils/network/request";
import { commQueryCourier, orderReturn, outletList } from "@/utils/network/api";
import { getItem, StorageKeys } from "@/utils/storage";
import {
getMailingAddress
} from "@/subpackage/orders/js/publicRequest";

const config = {
submitName: "申请退货",
@@ -238,10 +235,6 @@

//获取退货网点
getOutletList();
// getMailingAddress(state.orderInfo.orderId,state.orderInfo.id).then((address) => {
// console.log("address",address)
// config.address=address
// })
});
</script>


+ 1
- 1
subpackage/orders/car-release.vue Прегледај датотеку

@@ -532,7 +532,7 @@
}
console.log("option", option)
getGlobalParam();
if (option.type == 1) {
if (option.vanType == 1) {
state.actionSheetList = [{
text: "普通车",
value: 0,

+ 1
- 1
subpackage/orders/order-details-card-sign.vue Прегледај датотеку

@@ -305,7 +305,7 @@
</view>
<!-- 待收货 -->
<view v-if="state.orderInfo.orderStep == OrderStatus.待收货" class="btn-status">
<view class="btn space" @click="gotoCheckLogistics(state.orderInfo)">查看物流</view>
<!-- <view class="btn space" @click="gotoCheckLogistics(state.orderInfo)">查看物流</view> -->
<view class="btn-green" @click="gotoConfirmReceipt(state.orderInfo)">确认收货</view>
</view>
<!-- 待激活 -->

+ 10
- 1
subpackage/orders/order-details-new.vue Прегледај датотеку

@@ -35,6 +35,8 @@
<view class="vehiclePlate">
<text>快递单号:</text>
<text>{{state.orderInfo.orderInfoExt?state.orderInfo.orderInfoExt.trackingNumber: ''}}</text>
<image style="width: 36rpx;height: 36rpx;position: relative;top: -4rpx;" :src="`${$imgUrl}order/copy-template.png`" @click="copy(state.orderInfo.orderInfoExt.trackingNumber)">
</image>
</view>
<view >
<text>物流公司:</text>
@@ -139,7 +141,7 @@
</view>
<!-- 待收货 -->
<view v-if="state.orderInfo.orderStep == OrderStatus.待收货" class="btn-status">
<view class="btn space" @click="gotoOrderDetails(state.orderInfo)">查看物流</view>
<!-- <view class="btn space" @click="gotoOrderDetails(state.orderInfo)">查看物流</view> -->
<view class="btn space" @click.stop="gotoReplenishmentOrder(state.orderInfo)" v-if="state.orderInfo.deviceType == deviceType">申请补货</view>
<view class="btn space" @click="gotoReturnOrder(state.orderInfo)" v-else>申请退货</view>
<view class="btn-green space" @click="gotoConfirmReceipt(state.orderInfo)">确认收货</view>
@@ -368,6 +370,13 @@ const scrollTop = ref(0); //滚动距离
uni.$off('selectAddressSuccess');
console.log("已评价")
})
const copy = (value) => {
uni.setClipboardData({
data: value,
success(res) {
}
})
}
</script>
<style>
page {

+ 1
- 1
subpackage/orders/order-details-obu.vue Прегледај датотеку

@@ -288,7 +288,7 @@
</view>
<!-- 待收货 -->
<view v-if="state.orderInfo.orderStep == OrderStatus.待收货" class="btn-status">
<view class="btn space" @click="gotoCheckLogistics(state.orderInfo)">查看物流</view>
<!-- <view class="btn space" @click="gotoCheckLogistics(state.orderInfo)">查看物流</view> -->
<view class="btn-green" @click="gotoConfirmReceipt(state.orderInfo)">确认收货</view>
</view>
<!-- 待激活 -->

+ 0
- 1
utils/network/request.js Прегледај датотеку

@@ -133,7 +133,6 @@ export function request(code, options = {}, start = false) {
if (res.confirm) {
removeItem(StorageKeys.Token);
removeItem(StorageKeys.OpenId);
removeItem(StorageKeys.QYorder);
uni.reLaunch({
url: '/login/login',
})

+ 3
- 1
utils/utils.ts Прегледај датотеку

@@ -728,7 +728,9 @@ export function compareDates(specifiedDateString) {
if (currentDate > specifiedDate) {
console.log("当前日期晚于指定日期")
msg("身份证过期请重新上传")
msg("身份证过期请重新上传", {
'duration': 2000
})
return "当前日期晚于指定日期";
} else if (currentDate < specifiedDate) {
console.log("当前日期早于指定日期")

Loading…
Откажи
Сачувај