Tang 3 vuotta sitten
vanhempi
commit
4f507cf7c5
4 muutettua tiedostoa jossa 26 lisäystä ja 13 poistoa
  1. 1 1
      common/request.js
  2. 11 7
      pages2/appointment/index.vue
  3. 10 2
      pages2/order/confirm_list.vue
  4. 4 3
      pages2/order/confirm_pay.vue

+ 1 - 1
common/request.js

@@ -4,7 +4,7 @@ import store from '@/store/index.js'
 import api from './api.js'
 var num = 1
 
-export const BASE_URL = 'http://42.192.164.187:19005' //接口api  http://42.192.164.187:19005 http://192.168.1.222:5055
+export const BASE_URL = 'http://192.168.1.222:5055' //接口api  http://42.192.164.187:19005 http://192.168.1.222:5055
 
 
 export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/' //图片上传api  'https://file.xyyxt.net/

+ 11 - 7
pages2/appointment/index.vue

@@ -89,7 +89,7 @@ export default {
 				applyStatus: []
 			}, //页面数据
 			radioInfo: '',
-			goodsIdBK:null,//补考商品ID
+			goodsIdBK: null //补考商品ID
 		};
 	},
 	onLoad(option) {
@@ -136,22 +136,26 @@ export default {
 							applyId: this.listData.applyId,
 							applyStatus: this.radioInfo,
 							goodsId: this.goodsId,
-							dataId:res.data.data
+							dataId: res.data.data
 						});
 					}
 					if (res.data.data === 3) {
-						this.$api.goodsList({makeGoodsId:this.goodsId}).then(res => {
-							if(res.data.code === 200 && res.data.rows.length){
-								this.goodsIdBK = res.data.rows[0].goodsId
+						this.$api.goodsList({ makeGoodsId: this.goodsId }).then(res => {
+							if (res.data.code === 200 && res.data.rows.length) {
+								this.goodsIdBK = res.data.rows[0].goodsId;
 							}
-						})
+						});
 						this.showTip = true;
 					}
 				}
 			});
 		},
 		submit() {
-			console.log(this.goodsId,this.goodsIdBK)
+			this.showTip = false;
+			this.$navTo.togo('/pages2/order/confirm_list', {
+				id: this.goodsIdBK,
+				isBK:'1'
+			});
 		}
 	}
 };

+ 10 - 2
pages2/order/confirm_list.vue

@@ -142,13 +142,15 @@ export default {
 			applyObj:{
 				applyAreasJson:null,
 				examDateJson:null
-			}
+			},
+			isBK:'',//是不是补考商品
 		};
 	},
 	onPullDownRefresh(){
 	},
 	onLoad(option) {
 		this.id = option.id;
+		this.isBK = option.isBK
 		this.getDetail()
 	},
 	onShow() {
@@ -295,7 +297,13 @@ export default {
 			let checkGoodsList = []
 			checkGoodsList.push(this.detail)
 			this.$store.commit('setShoppingCartList', {shoppingCartList  :checkGoodsList});
-			this.$navTo.togo('/pages2/order/confirm_pay');
+			if(this.isBK == '1'){
+				this.$navTo.togo('/pages2/order/confirm_pay',{
+					isBK : '1'
+				});
+			}else{
+				this.$navTo.togo('/pages2/order/confirm_pay');
+			}
 		},
 		getDetail() {
 			let self = this

+ 4 - 3
pages2/order/confirm_pay.vue

@@ -61,7 +61,8 @@ export default {
 			current:0,
 			menuIndex:0,
 			value:'wepay',
-			btnNo:false
+			btnNo:false,
+			isBK:'',
 		};
 	},
 	onPullDownRefresh(){
@@ -70,8 +71,8 @@ export default {
 		let self = this
 		 console.log(self.shoppingCartList,6)
 		 let list = self.shoppingCartList
-		 
-
+		 this.isBK = option.isBK
+		 console.log(this.isBK == '1')
 	},
 	onShow() {