Merge branch 'master' of https://gitee.com/he2802/saas_applet

common/httpList/goods.js

@@ -24,6 +24,14 @@ export default {
 			noToken: true
 		})
 	},
+	collectQuestion(data) {
+		return myRequest({
+			url: '/collect/question',
+			data:data,
+			method: 'get',
+			noToken: true
+		})
+	},
 	
 	goodsBankList(data) {
 		return myRequest({
@@ -76,6 +84,16 @@ export default {
 			data: data
 		})
 	},
+	
+	questionRecordList(data) {
+		return myRequest({
+			url: '/bank/question/record/list',
+			method: 'get',
+			data: data
+		})
+	},
+	
+	
 	deleteCart(data) {
 		return myRequest({
 			url: '/base/cart/delete/'+data,

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) {

pages2/bank/detail.vue

@@ -32,25 +32,30 @@
 			<view class="content">
 				<view class="list" v-for="(item1,index1) in bankList" :key="index1">
 					<template v-if="item1.type==1">
-						<view class="module" @click="clickModule" :data-id="item1.majorId" :data-index="index1">
-							{{item1.name}} {{item1.subjectName}}
+						<view class="moduleItem" @click="clickModule" :data-id="item1.majorId" :data-index="index1">
+							<view class="courseName">{{item1.name}}</view>
+							<view>
+								<image src="/static/icon/up.png" class="icon_up" v-if="!item1.showList"></image>
+								<image src="/static/icon/down.png" class="icon_up" v-if="item1.showList"></image>
+							</view>
 						</view>
 						
 						<template v-if="item1.showList">
 							<view v-for="(item2,index2) in item1.list" :key="index2" >
 								<view class="section" @click="changeItem" :data-index1="index1" :data-index2="index2" :data-id="item2.chapterExamId" :data-type="item1.type">
-									<u-icon name="arrow-down" class="icon" v-if="item2.showList"></u-icon>
-									<u-icon name="arrow-up" class="icon" v-if="!item2.showList"></u-icon>
+									<image src="/static/icon/up1.png" class="icon_up" v-if="!item2.showList"></image>
+									<image src="/static/icon/down1.png" class="icon_up" v-if="item2.showList"></image>
 									{{item2.name}}
 								</view>
 								<view  v-if="item2.showList">
 									<view class="article" :class="{active:index3 == 0}"  v-for="(article,index3) in item2.list" :key="index3">
 										<view class="flex_auto">{{article.examName}}</view>
-										<navigator :url="'/pages2/bank/questionBankTest?id='+article.majorId">
+										<navigator :url="'/pages2/bank/questionBankTest?id='+article.examId">
 											<view class="btn">试做</view>
 										</navigator>
 									</view>
 								</view>
+								<u-line></u-line>
 							</view>
 						</template>
 						
@@ -59,8 +64,8 @@
 					
 					<template v-if="item1.type ==2">
 						<view class="section" :data-index1="index1" :data-id="item1.majorId" @click="changeItem" :data-type="item1.type">
-							<u-icon name="arrow-down" class="icon" v-if="item1.showList"></u-icon>
-							<u-icon name="arrow-up" class="icon" v-if="!item1.showList"></u-icon>
+							<image src="/static/icon/up1.png" class="icon_up" v-if="!item1.showList"></image>
+							<image src="/static/icon/down1.png" class="icon_up" v-if="item1.showList"></image>
 							{{item1.name}}
 						</view>
 						<view v-if="item1.showList" >
@@ -263,7 +268,15 @@ export default {
 	}
 </style>
 <style lang="scss" scope>
-	
+	.courseName{
+		white-space:nowrap;
+		overflow:hidden;
+		text-overflow:ellipsis; 
+	}
+	.icon_up{
+		width: 32rpx;
+		height: 32rpx;
+	}
 	.intro {
 		background: #EAEEF1;
 		padding:16rpx 16rpx 124rpx;
@@ -284,6 +297,16 @@ export default {
 		}
 	}
 	
+	.moduleItem{
+		height: 80rpx;
+		color: #333333;
+		font-size: 32rpx;
+		line-height: 80rpx;
+		font-weight: bold;
+		display: flex;
+		justify-content: space-between;
+	
+	}
 	.title-list {
 		background: #EAEEF1;
 		padding:16rpx 16rpx 124rpx;
@@ -299,20 +322,25 @@ export default {
 				.module {
 					font-size: 30rpx;
 					color: #333333;
-				}
-				
-				.section {
-					padding:30rpx 0;
-					padding-left:17rpx;
-					border-bottom: 1rpx solid #EEEEEE;
-					font-size: 24rpx;
-					color: #666666;
 					
 					.icon {
-						margin-right:30rpx;
+						margin-right:10rpx;
 					}
 				}
 				
+				.section {
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+					white-space:nowrap;
+					overflow:hidden;
+					text-overflow:ellipsis; 
+					margin: 20rpx 0;
+					display: flex;
+					align-items: center;
+				}
+				
 				.article {
 					height:80rpx;
 					display: flex;

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() {

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 >

pages2/subject/wrong.vue

@@ -58,8 +58,18 @@ export default {
 		};
 	},
 	onPullDownRefresh() {},
-	onLoad(option) {},
+	onLoad(option) {
+		this.questionRecordList();
+	},
 	methods: {
+		questionRecordList() {
+			this.$api.questionRecordList({
+				isRight:0,
+				
+			}).then(res => {
+				console.log(res)
+			})
+		},
 		showSceen(type){
 			this.sceenType = type
 		},

pages2/wd/question_bank.vue

@@ -21,10 +21,12 @@
 					</view>
 				</navigator>
 				
-				<view class="list-in">
-					<image class="img" src="/static/icon/wk_icon2.png"></image>
-					错题集 >
-				</view>
+				<navigator url="/pages2/subject/wrong">
+					<view class="list-in">
+						<image class="img" src="/static/icon/wk_icon2.png"></image>
+						错题集 >
+					</view>
+				</navigator>
 			</view>
 		</view>
 	</view>

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){