提交
This commit is contained in:
@@ -2,10 +2,10 @@ 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') {
|
||||||
//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/"; //线上正式
|
||||||
//baseUrl = "https://testapi.nuttyreading.com/"; //线上正式
|
//baseUrl = "https://testapi.nuttyreading.com/"; //线上正式
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -818,6 +818,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
var list = [...this.goodsDataList];
|
var list = [...this.goodsDataList];
|
||||||
|
console.log(list,'确认订单 金额!!!')
|
||||||
list = list.map((e) => e.goodsType);
|
list = list.map((e) => e.goodsType);
|
||||||
this.haveCourse = list.some((ele) => ele === "05");
|
this.haveCourse = list.some((ele) => ele === "05");
|
||||||
if (this.options.sourceType == "curriculum") {
|
if (this.options.sourceType == "curriculum") {
|
||||||
|
|||||||
@@ -545,14 +545,16 @@
|
|||||||
},
|
},
|
||||||
onHandleClickBuy(e) {
|
onHandleClickBuy(e) {
|
||||||
var mynavData = JSON.stringify({
|
var mynavData = JSON.stringify({
|
||||||
goods: [this.selectGoodsData],
|
goods: [{...this.selectGoodsData,productAmount:1}],
|
||||||
typeId: 0,
|
typeId: 0,
|
||||||
navTitle: this.options.navTitle,
|
navTitle: this.options.navTitle,
|
||||||
title: this.options.title,
|
title: this.options.title,
|
||||||
sourceType: "curriculum",
|
sourceType: "curriculum",
|
||||||
isFudu: this.isFudu,
|
isFudu: this.isFudu,
|
||||||
fuduId: this.fuduId
|
fuduId: this.fuduId,
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: `/pages/goods/order?data=${mynavData}`,
|
url: `/pages/goods/order?data=${mynavData}`,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -244,6 +244,10 @@ export default {
|
|||||||
this.goodsDataList = res.productList.filter(
|
this.goodsDataList = res.productList.filter(
|
||||||
(e) => this.options.goods[0].productName == e.productName
|
(e) => this.options.goods[0].productName == e.productName
|
||||||
);
|
);
|
||||||
|
this.goodsDataList.map(e=>{
|
||||||
|
e.productAmount=e.productAmount?e.productAmount:1
|
||||||
|
})
|
||||||
|
console.log(this.goodsDataList ,'这是复读订单')
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -151,6 +151,7 @@ export default {
|
|||||||
let cateIndex = uni.getStorageSync('cateIndex');
|
let cateIndex = uni.getStorageSync('cateIndex');
|
||||||
this.cateIndex = cateIndex;
|
this.cateIndex = cateIndex;
|
||||||
this.getCourseList();
|
this.getCourseList();
|
||||||
|
this.getCateList()
|
||||||
this.getNotice();
|
this.getNotice();
|
||||||
this.getMarketProductList();
|
this.getMarketProductList();
|
||||||
this.getMarketCourseList();
|
this.getMarketCourseList();
|
||||||
|
|||||||
Reference in New Issue
Block a user