Browse Source

2023年9月21日15:00:18

yxb
wq 1 year ago
parent
commit
caf2a36489

+ 7
- 2
composables/order/useOrderSkip.ts View File

const gotoOrderDetails = (orderInfo) => { const gotoOrderDetails = (orderInfo) => {
console.log('输出内容=====', orderInfo) console.log('输出内容=====', orderInfo)
if (orderInfo.orderType === 'ISSUE') { if (orderInfo.orderType === 'ISSUE') {
// navTo(`/subpackage/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}`);
// #ifdef MP-WEIXIN
navTo(`/subpackage/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}`);
// #endif
// #ifdef MP-ALIPAY
navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}`); navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}`);
// #endif


} else if (orderInfo.orderType == OrderTypes.同时换卡换签 || } else if (orderInfo.orderType == OrderTypes.同时换卡换签 ||
orderInfo.orderType == 'REPLACEMENT_CARD' || orderInfo.orderType == 'REPLACEMENT_SIGNATURE') { orderInfo.orderType == 'REPLACEMENT_CARD' || orderInfo.orderType == 'REPLACEMENT_SIGNATURE') {
// }); // });
} else { } else {
// #ifdef MP-ALIPAY // #ifdef MP-ALIPAY
url = `/subpackage/orders/sign-up`;
url = `/subpackage/orders/sign-up-ali`;
// #endif // #endif
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
url = `/subpackage/orders/essential-information`; url = `/subpackage/orders/essential-information`;

+ 2
- 2
pages/order/components/order-list-item-new.vue View File

<view class="btn btn-normal" v-if="item.orderStep == OrderStatus.审核不通过" <view class="btn btn-normal" v-if="item.orderStep == OrderStatus.审核不通过"
@click.stop="gotoEditUserOrUnitInfo(item)">修改资料</view> @click.stop="gotoEditUserOrUnitInfo(item)">修改资料</view>
<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view> <view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
<view class="btn btn-primary" @click.stop="gotoOrderDetails(item)">修改地址</view>
<!-- <view class="btn btn-primary" @click.stop="gotoEditAddress(item)">修改地址</view> -->
</view> </view>


<!-- 待发货 --> <!-- 待发货 -->
<view class="btns" v-else-if="item.orderStep == OrderStatus.待发货"> <view class="btns" v-else-if="item.orderStep == OrderStatus.待发货">
<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view> <view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
<view class="btn btn-primary" @click.stop="gotoOrderDetails(item)">修改地址</view>
<!-- <view class="btn btn-primary" @click.stop="gotoEditAddress(item)">修改地址</view> -->
</view> </view>


<!-- 待收货 --> <!-- 待收货 -->

+ 1
- 2
utils/network/api.js View File

/* 接口中常量 */ /* 接口中常量 */
// export const URL = "192.168.100.63"; // export const URL = "192.168.100.63";
export const URL = "192.168.124.6";
export const URL = "trial.etcjz.cn";
/** /**
* 配置信息,针对不同的平台进行配置 * 配置信息,针对不同的平台进行配置
*/ */
}, },
//生产环境配置 //生产环境配置
production: { production: {
// baseUrl: "http://192.168.124.6:8087",
// baseUrl: "http://222.85.144.89:19002", // baseUrl: "http://222.85.144.89:19002",
// baseUrl: "http://192.168.100.158:8085/html/", // baseUrl: "http://192.168.100.158:8085/html/",
// baseUrl: "https://qtzl.etcjz.cn", // baseUrl: "https://qtzl.etcjz.cn",

+ 2
- 2
utils/network/request.js View File

rbacSource: 'MINI_PROGRAM', rbacSource: 'MINI_PROGRAM',
accessToken: getItem(StorageKeys.Token) accessToken: getItem(StorageKeys.Token)
} }
options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
// options.url = envs[process.env.NODE_ENV].baseUrl + '/ifzt/api/interfaceMidGroundIn'
// options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
options.url = envs[process.env.NODE_ENV].baseUrl + '/ifzt/api/interfaceMidGroundIn'
//默认json数据格式提交` //默认json数据格式提交`
let contentType = 'application/x-www-form-urlencoded' let contentType = 'application/x-www-form-urlencoded'



Loading…
Cancel
Save