DESKTOP-2IO5MST\huting před 1 rokem
rodič
revize
f384418b2c

+ 2
- 2
composables/order/useOrderSkip.ts Zobrazit soubor

@@ -77,14 +77,14 @@ export default function useOrderSkip() {
url = '/subpackage/orders/car-release';
} else if (orderInfo.orderStep === OrderStatus.完成车辆信息上传 && orderInfo.isValueCard != 1) {
url = `/subpackage/orders/release-products`;
} else if (orderInfo.orderStep === OrderStatus.待加购权益 ) {
} else if (orderInfo.orderStep === OrderStatus.待加购权益) {
navTo(`/subpackage/orders/interestsList?orderId=${orderInfo.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`);
return
// uni.redirectTo({
// url: `/subpackage/orders/choice-product?orderId=${val.orderId}`,
// });
} else {
}
console.log("url", url)
navTo(`${url}?orderId=${orderInfo.orderId}&clientFee=${orderInfo.amount}&id=${orderInfo.productId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&type=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}`);

+ 8
- 3
datas/fileURL.js Zobrazit soubor

@@ -4,6 +4,11 @@ import {

// export const fileURL = 'http://47.94.96.52/'
// export const fileURL = 'http://222.85.144.89:19002/default-bucket/'
export const downloadFileURL = envs[process.env.NODE_ENV].baseUrl + '/user-export-excel/'
export const fileURL = envs[process.env.NODE_ENV].baseUrl + '/default-bucket/'
export const fileURLList = envs[process.env.NODE_ENV].baseUrl + "/"

// export const downloadFileURL = envs[process.env.NODE_ENV].baseUrl + '/user-export-excel/'
// export const fileURL = envs[process.env.NODE_ENV].baseUrl + '/default-bucket/'
// export const fileURLList = envs[process.env.NODE_ENV].baseUrl + "/"

export const downloadFileURL = "http://192.168.100.63:8087/user-export-excel/"
export const fileURL = "http://192.168.100.63:8087/default-bucket/"
export const fileURLList = "http://192.168.100.63:8087/"

+ 1
- 0
pages/order/components/order-list-item-new.vue Zobrazit soubor

@@ -58,6 +58,7 @@
<view class="btn btn-primary" @click.stop="gotoOrderDetails(item)">支付</view>
</view> -->
<view class="btns" v-if="item.orderStep == OrderStatus.待支付2">
<!-- <view class="btn btn-normal" @click.stop="gotoEditUserOrUnitInfo(item)">修改资料</view> -->
<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
<view class="btn btn-primary" @click.stop="gotoOrderDetails(item)">支付</view>
</view>

+ 1
- 1
subpackage/orders/cancel-order.vue Zobrazit soubor

@@ -110,11 +110,11 @@
};

onLoad((options) => {
console.log("options", options)
state.orderInfo = JSON.parse(options.data) ? JSON.parse(options.data) : {};
state.formData[0].hint = state.orderInfo.orderId;
state.formData[1].hint = state.orderInfo.vehiclePlate;
state.formData[2].hint = getOrderStatusName(state.orderInfo.orderStep);
console.log("options", options, getOrderStatusName(state.orderInfo.orderStep))
});
</script>


+ 2
- 2
subpackage/orders/sign-up.vue Zobrazit soubor

@@ -186,8 +186,8 @@
//如果获取openId成功
if (state.openid) {
var data = {
// orderId: state.orderId,
orderId: "20231012114651162505354",
orderId: state.orderId,
// orderId: "20231012114651162505354",
subOpenId: state.openid,
};
const options = {

+ 30
- 21
utils/utils.ts Zobrazit soubor

@@ -1,5 +1,5 @@
import { getItem, StorageKeys } from "./storage";
import { OrderStatus, OrderTypes } from "@/datas/enum";
import { OrderStatus, OrderTypes } from "@/datas/enum.ts";

//toast
export const msg = (title : string = "", param : any = {}) => {
@@ -138,61 +138,70 @@ export function isBlank(val) {

//根据订单状态获取订单状态文字
export const getOrderStatusName = (status) => {
switch (status) {
case OrderStatus.完成填写基本信息:
switch (Number(status)) {
case Number(OrderStatus.完成填写基本信息):
return '申请中';
break;
case OrderStatus["完成个人/单位信息上传"]:
case Number(OrderStatus["完成个人/单位信息上传"]):
return '申请中';
break;
case OrderStatus.完成车辆信息上传:
case Number(OrderStatus.完成车辆信息上传):
return '申请中';
break;
case OrderStatus.待支付:
case Number(OrderStatus.待支付):
return '待支付';
break;
case OrderStatus.已支付:
case Number(OrderStatus.待支付3):
return '待支付';
break;
case Number(OrderStatus.待支付2):
return '待支付';
break;
case Number(OrderStatus.已支付):
return '已支付';
break;
case OrderStatus.待审核:
case Number(OrderStatus.待审核):
return '待审核';
break;
case OrderStatus.审核不通过:
case Number(OrderStatus.审核不通过):
return '审核不通过';
break;
case OrderStatus.待发货:
case Number(OrderStatus.待发货):
return '待发货';
break;
case OrderStatus.待收货:
case Number(OrderStatus.待收货):
return '待收货';
break;
case OrderStatus.待激活:
case Number(OrderStatus.待激活):
return '待激活';
break;
case OrderStatus.已完成:
case Number(OrderStatus.已完成):
return '已完成';
break;
case OrderStatus["已申请-换货"]:
case Number(OrderStatus["已申请-换货"]):
return '换货中';
break;
case OrderStatus["已申请-退货"]:
case Number(OrderStatus["已申请-退货"]):
return '退货中';
break;
case OrderStatus.已结束:
case Number(OrderStatus.已结束):
return '已结束';
break;
case OrderStatus.退款中:
case Number(OrderStatus.退款中):
return '退款中';
break;
case OrderStatus.退款成功:
case Number(OrderStatus.退款成功):
return '退款成功';
break;
case OrderStatus.退货成功:
case Number(OrderStatus.退货成功):
return '退货成功';
break;
case OrderStatus["换货-设备已回收"]:
case Number(OrderStatus["换货-设备已回收"]):
return '换货成功';
break;
case Number(OrderStatus.待加购权益):
return '代加购权益';
break;
default:
break;
}
@@ -226,7 +235,7 @@ export const getOrderTypeName = (orderType = 'ISSUE') => {
}

//根据车辆类型获取车辆名称
export const getCarTypeName = (carType: any) => {
export const getCarTypeName = (carType : any) => {
switch (carType) {
case 1:
return '客车';

Načítá se…
Zrušit
Uložit