he2802 3 年之前
父节点
当前提交
ef30007bb2
共有 4 个文件被更改,包括 23 次插入17 次删除
  1. 3 1
      pages/shopping/shoppingCart.vue
  2. 6 0
      pages2/order/confirm_list.vue
  3. 5 14
      pages2/order/confirm_pay.vue
  4. 9 2
      store/index.js

+ 3 - 1
pages/shopping/shoppingCart.vue

@@ -376,7 +376,6 @@
 					this.getProvinceList()
 					this.getExamine(item.projectId)
 				}
-				
 			},
 			checkboxGroupChange(e){
 				this.checkboxList = e
@@ -435,9 +434,11 @@
 					})
 					return 
 				}
+				let checkGoodsList = []
 				for(let i =0;i<this.checkboxList.length;i++){
 					let index = this.checkboxList[i]
 					let item = this.list[index]
+					checkGoodsList.push(item)
 					if(item.templateType=='class'){
 						if(!item.gradObj.className){
 							uni.showModal({
@@ -459,6 +460,7 @@
 						}
 					}
 				}
+				this.$store.commit('setShoppingCartList', {shoppingCartList  :checkGoodsList});
 				this.$navTo.togo('/pages2/order/confirm_pay');
 			},
 			checkboxChange(n) {

+ 6 - 0
pages2/order/confirm_list.vue

@@ -195,6 +195,7 @@ export default {
 					return
 				}
 				this.gradeIndex = this.gradeValue
+				this.detail.gradObj = this.gradeList[this.gradeIndex]
 				this.show = false
 			}else{
 				if(!this.checkAreaData()){
@@ -206,6 +207,8 @@ export default {
 				this.applyAreas = {areaName:pData.areaName,areaId:pData.areaId,cityId:cData.areaId,cityName:cData.areaName}
 				this.applyObj.applyAreasJson = JSON.stringify(this.applyAreas)
 				this.applyObj.examDateJson = JSON.stringify(this.examDate)
+				this.detail.examDate = this.examDate
+				this.detail.applyAreas = this.applyAreas
 				this.show1 = false
 			}
 		},
@@ -289,6 +292,9 @@ export default {
 			if(!this.checkData()){
 				return
 			}
+			let checkGoodsList = []
+			checkGoodsList.push(this.detail)
+			this.$store.commit('setShoppingCartList', {shoppingCartList  :checkGoodsList});
 			this.$navTo.togo('/pages2/order/confirm_pay');
 		},
 		getDetail() {

+ 5 - 14
pages2/order/confirm_pay.vue

@@ -2,28 +2,19 @@
 	<view>
 		<view>
 			<view style="padding: 30rpx;">
-				<view class="box1">
-					<view class="box1_t1">
-						<u-icon name="checkmark-circle" color="#34C759" size="32"></u-icon><text style="margin-left: 8rpx;">订单提交成功,请您尽快付款!</text></view>
-					<view class="box1_t2">请在24小时内付款,否则订单将自动取消</view>
-				</view>
 				<view class="box2">
 					<view class="title2">支付信息</view>
 					<u-line color="#D6D6DB" />
-					<view style="padding:10rpx 30rpx;">
+					<view style="padding:10rpx 30rpx;" v-for="(item,index) in shoppingCartList">
 						<view class="list_item">
 							<view class="txt_left">商品名称</view>
-							<view class="txt_right">2020年二建建筑工程管理与实务(实务专题班)</view>
+							<view class="txt_right">{{item.goodsName}}</view>
 						</view>
 						<view class="list_item">
 							<view class="txt_left">应付金额</view>
-							<view class="txt_right_price">¥ 999.00</view>
-						</view>
-						<view class="list_item">
-							<view class="txt_left">订单编号</view>
-							<view class="txt_right_sn">20211013105634GZ</view>
+							<view class="txt_right_price">¥ {{item.standPrice}}</view>
 						</view>
-						<view class="tip">*您可在“我的>我的订单”中查询</view>
+						<u-line color="#D6D6DB"/>
 					</view>
 				</view>
 				<view class="box3">
@@ -100,7 +91,7 @@ export default {
 		}
 	},
 	onReachBottom() {},
-	computed: { ...mapGetters(['userInfo']) }
+	computed: { ...mapGetters(['userInfo','shoppingCartList']) }
 };
 </script>
 <style >

+ 9 - 2
store/index.js

@@ -11,8 +11,9 @@ const store = new Vuex.Store({
 		userInfo:null,
 		dictObj:null,
 		allowLoading:true,
-		goodsAuditionConfigIdList:[] //当前访问页面的试听节ID
-    },  
+		goodsAuditionConfigIdList:[], //当前访问页面的试听节ID
+		shoppingCartList:[]  //购物车支付商品
+	},  
 	 getters: {
 		userInfo: state => {
 			if(state.userInfo==null){
@@ -30,6 +31,9 @@ const store = new Vuex.Store({
 		},
 		goodsAuditionConfigIdList:state => {
 			return state.goodsAuditionConfigIdList
+		},
+		shoppingCartList:state => {
+			return state.shoppingCartList
 		}
 	},
     mutations: { 
@@ -39,6 +43,9 @@ const store = new Vuex.Store({
 		setGoodsAuditionConfigIdList(state, provider){
 			state.goodsAuditionConfigIdList = provider.goodsAuditionConfigIdList;  
 		},
+		setShoppingCartList(state, provider){
+			state.shoppingCartList = provider.shoppingCartList;  
+		},
     }  
 })  
 async function getUserInfo(state){