feat: 添加优惠券金额查询功能
- 将manifest.json中的版本号从1.0.56更新至1.0.57 - 在开发环境恢复使用本地测试API地址 - 在订单详情页新增优惠券金额查询功能,当订单包含优惠券时自动查询并显示优惠金额
This commit is contained in:
@@ -2,8 +2,8 @@ let baseUrl = "";
|
|||||||
let socketUrl = "";
|
let socketUrl = "";
|
||||||
if (process.env.NODE_ENV === 'development') {
|
if (process.env.NODE_ENV === 'development') {
|
||||||
// 开发环境
|
// 开发环境
|
||||||
// baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
|
baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
|
||||||
baseUrl = "https://api.nuttyreading.com/"; // 线上正式
|
// baseUrl = "https://api.nuttyreading.com/"; // 线上正式
|
||||||
} else if (process.env.NODE_ENV === 'production') {
|
} else if (process.env.NODE_ENV === 'production') {
|
||||||
// 生产环境11
|
// 生产环境11
|
||||||
//baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
|
//baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
|
||||||
|
|||||||
@@ -13,8 +13,8 @@
|
|||||||
"src" : "图片路径"
|
"src" : "图片路径"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"versionName" : "1.0.56",
|
"versionName" : "1.0.57",
|
||||||
"versionCode" : 1056,
|
"versionCode" : 1057,
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
"nvueCompiler" : "weex",
|
"nvueCompiler" : "weex",
|
||||||
"compatible" : {
|
"compatible" : {
|
||||||
|
|||||||
@@ -1029,6 +1029,29 @@ export default {
|
|||||||
orderTabCLi(e) {
|
orderTabCLi(e) {
|
||||||
this.orderListTab = e;
|
this.orderListTab = e;
|
||||||
},
|
},
|
||||||
|
async getCouponDetail(id) {
|
||||||
|
await this.$http
|
||||||
|
.request({
|
||||||
|
url: "common/coupon/getCouponHistoryInfo",
|
||||||
|
method: "POST", // POST、GET、PUT、DELETE,具体说明查看官方文档
|
||||||
|
data: {
|
||||||
|
id,
|
||||||
|
},
|
||||||
|
header: {
|
||||||
|
//默认 无 说明:请求头
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.then(async (res) => {
|
||||||
|
if (res.code != 0) return this.$commonJS.showToast(res.errMsg);
|
||||||
|
this.orderContet.couponAmount =
|
||||||
|
res.couponHistory.couponEntity.couponAmount;
|
||||||
|
})
|
||||||
|
.catch((e) => {
|
||||||
|
console.log(e);
|
||||||
|
this.$commonJS.showToast(e.errMsg);
|
||||||
|
});
|
||||||
|
},
|
||||||
// 获取订单详情
|
// 获取订单详情
|
||||||
getOrderList() {
|
getOrderList() {
|
||||||
console.log("this.orderType", this.orderType);
|
console.log("this.orderType", this.orderType);
|
||||||
@@ -1045,12 +1068,16 @@ export default {
|
|||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
.then((res) => {
|
.then(async (res) => {
|
||||||
this.customButton = [];
|
this.customButton = [];
|
||||||
console.log("订单详情", res);
|
console.log("订单详情", res);
|
||||||
this.orderContet = res.data.buyOrder;
|
this.orderContet = res.data.buyOrder;
|
||||||
this.goodsList = res.data.productInfo;
|
this.goodsList = res.data.productInfo;
|
||||||
this.consigneeShow = true;
|
this.consigneeShow = true;
|
||||||
|
// 存在优惠券信息,就查询优惠券集体金额
|
||||||
|
if (this.orderContet.couponId && this.orderContet.couponId != null) {
|
||||||
|
await this.getCouponDetail(this.orderContet.couponId);
|
||||||
|
}
|
||||||
if (
|
if (
|
||||||
this.orderContet.orderStatus == 2 &&
|
this.orderContet.orderStatus == 2 &&
|
||||||
this.sheetList.length > 0 &&
|
this.sheetList.length > 0 &&
|
||||||
|
|||||||
Reference in New Issue
Block a user