diff --git a/config/baseUrl.js b/config/baseUrl.js index f1901ec..46bddf3 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -2,10 +2,10 @@ let baseUrl = ""; let socketUrl = ""; 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/"; //线上正式 } 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://testapi.nuttyreading.com/"; //线上正式 } diff --git a/pages/component/commonComponents/orderSubmit.vue b/pages/component/commonComponents/orderSubmit.vue index 51db50c..97fcf4d 100644 --- a/pages/component/commonComponents/orderSubmit.vue +++ b/pages/component/commonComponents/orderSubmit.vue @@ -818,6 +818,7 @@ } var list = [...this.goodsDataList]; + console.log(list,'确认订单 金额!!!') list = list.map((e) => e.goodsType); this.haveCourse = list.some((ele) => ele === "05"); if (this.options.sourceType == "curriculum") { diff --git a/pages/curriculum/order/index.vue b/pages/curriculum/order/index.vue index db5e9f1..63c03a6 100644 --- a/pages/curriculum/order/index.vue +++ b/pages/curriculum/order/index.vue @@ -545,14 +545,16 @@ }, onHandleClickBuy(e) { var mynavData = JSON.stringify({ - goods: [this.selectGoodsData], + goods: [{...this.selectGoodsData,productAmount:1}], typeId: 0, navTitle: this.options.navTitle, title: this.options.title, sourceType: "curriculum", isFudu: this.isFudu, - fuduId: this.fuduId + fuduId: this.fuduId, + }); + uni.navigateTo({ url: `/pages/goods/order?data=${mynavData}`, }); diff --git a/pages/goods/order.vue b/pages/goods/order.vue index 80d8693..68d4bea 100644 --- a/pages/goods/order.vue +++ b/pages/goods/order.vue @@ -244,6 +244,10 @@ export default { this.goodsDataList = res.productList.filter( (e) => this.options.goods[0].productName == e.productName ); + this.goodsDataList.map(e=>{ + e.productAmount=e.productAmount?e.productAmount:1 + }) + console.log(this.goodsDataList ,'这是复读订单') }); }, diff --git a/pages/home/index.vue b/pages/home/index.vue index faf8747..8183cac 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -151,6 +151,7 @@ export default { let cateIndex = uni.getStorageSync('cateIndex'); this.cateIndex = cateIndex; this.getCourseList(); + this.getCateList() this.getNotice(); this.getMarketProductList(); this.getMarketCourseList();