购物车

common/httpList/systemPlan.js

@@ -45,7 +45,7 @@ export default {
 	//获取学习计划详细信息
 	systemplanInfo(data) {
 		return myRequest({
-			url: '/system/plan/' + data,
+			url: '/system/plan/inFo',
 			method: 'get',
 			data: data
 		})

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/

pages2/bank/questionBank.vue

@@ -402,8 +402,8 @@
 					<view class="btnsty btns2" @click="backPages">结束做题</view>
 				</view>
 				<view class="classFootsty" v-if="cgType === 8">
-					<view class="btnsty btns1" @click="submit">立即交卷</view>
-					<view class="btnsty btns2" @click="showpopups = false">继续做题</view>
+					<view class="btnsty btns1" @click="leaveNow()">下次继续</view>
+					<view class="btnsty btns2" @click="showpopups = false">继续作答</view>
 				</view>
 			</view>
 		</u-popup>
@@ -1403,7 +1403,13 @@ export default {
 					//判断
 				} else if (item.type == 3) {
 					return this.questionList[index].ques == this.questionList[index].ans;
-				} else {
+				// } else if (item.type == 5) {
+				// 	if(this.questionList[index].ques.text){
+				// 		return true
+				// 	}else{
+				// 		return false
+				// 	}
+				}else {
 					return false;
 				}
 			} else {

pages2/class/detail.vue

@@ -236,38 +236,72 @@ export default {
 					self.$api.getbaseprofiletpgetInfo({ goodsId: self.goodsId }).then(result => {
 						if (result.data.code === 200) {
 							if (!result.data.data || (result.data.data.status === 3 && result.data.data.changeStatus === 1)) {
-								uni.showModal({
-									content: '资料审核不通过，请前往重新填写',
-									cancelText: '返回',
-									success: function(resultst) {
-										if (resultst.confirm) {
-											self.$navTo.togo('/pages2/verify/input', {
-												id: self.goodsId
-											});
+								if (!result.data.data) {
+									uni.showModal({
+										content: '请前往填写资料',
+										cancelText: '返回',
+										success: function(resultst) {
+											if (resultst.confirm) {
+												self.$navTo.togo('/pages2/verify/input', {
+													id: self.goodsId
+												});
+											}
+											if (resultst.cancel) {
+												uni.navigateBack();
+											}
 										}
-										if (resultst.cancel) {
-											uni.navigateBack();
+									});
+								} else {
+									uni.showModal({
+										content: '资料审核不通过，请前往重新填写',
+										cancelText: '返回',
+										success: function(resultst) {
+											if (resultst.confirm) {
+												self.$navTo.togo('/pages2/verify/input', {
+													id: self.goodsId
+												});
+											}
+											if (resultst.cancel) {
+												uni.navigateBack();
+											}
 										}
-									}
-								});
+									});
+								}
 							} else if (result.data.data.status === 1 && res.data.rows[0].keyValue2) {
 								self.$api.getbaseprofileStampgetInfo({ goodsId: self.goodsId }).then(k => {
 									if (k.data.code === 200) {
 										if (!k.data.data || (k.data.data.status === 3 && k.data.data.changeStatus === 1)) {
-											uni.showModal({
-												cancelText: '返回',
-												content: '资料盖章审核不通过，请前往重新填写',
-												success: function(resultst) {
-													if (resultst.confirm) {
-														self.$navTo.togo('/pages2/verify/input2', {
-															id: self.goodsId
-														});
+											if (!k.data.data) {
+												uni.showModal({
+													cancelText: '返回',
+													content: '请前往填写盖章资料',
+													success: function(resultst) {
+														if (resultst.confirm) {
+															self.$navTo.togo('/pages2/verify/input2', {
+																id: self.goodsId
+															});
+														}
+														if (resultst.cancel) {
+															uni.navigateBack();
+														}
 													}
-													if (resultst.cancel) {
-														uni.navigateBack();
+												});
+											} else {
+												uni.showModal({
+													cancelText: '返回',
+													content: '资料盖章审核不通过，请前往重新填写',
+													success: function(resultst) {
+														if (resultst.confirm) {
+															self.$navTo.togo('/pages2/verify/input2', {
+																id: self.goodsId
+															});
+														}
+														if (resultst.cancel) {
+															uni.navigateBack();
+														}
 													}
-												}
-											});
+												});
+											}
 										}
 									}
 								});

pages2/msg/detail.vue

@@ -64,7 +64,7 @@ export default {
 	},
 	methods: {
 		//跳转页面
-		jumpFuns(item){
+		jumpFuns(item) {
 			switch (item.remindId) {
 				case 1:
 				case 3:
@@ -74,14 +74,16 @@ export default {
 				case 19:
 				case 21:
 				case 22:
-				this.$navTo.togo('/pages2/wd/course',{
-					id:item.goodsId
-				})
+					this.$navTo.togo('/pages2/wd/course', {
+						id: item.goodsId
+					});
 					// arsty = '立刻学习';
 					break;
 				case 2:
 				case 4:
-					this.$navTo.togo('/pages2/verify/input');
+					this.$navTo.togo('/pages2/verify/input', {
+						id: item.goodsId
+					});
 					break;
 				case 10:
 				case 12:
@@ -89,10 +91,25 @@ export default {
 					// arsty = '立即重学';
 					break;
 				case 11:
-					// arsty = '立即预约';
-					break;
 				case 13:
-					// arsty = '预约考试';
+					var data = {
+						goodsId: item.goodsId,
+						gradeId: item.gradeId
+					};
+					this.$api.getApplysubscribe(data).then(res => {
+						if (res.data.code === 500) {
+							uni.showModal({
+								showCancel: false,
+								content: res.data.msg
+							});
+						}
+						if (res.data.code === 200) {
+							this.$navTo.togo('/pages2/appointment/index', {
+								goodsId: item.goodsId,
+								gradeId: item.gradeId
+							});
+						}
+					});
 					break;
 				case 20:
 					// arsty = '重新购买';
@@ -126,10 +143,9 @@ export default {
 		getInfo() {
 			this.$api.getappinformUserId(this.id).then(res => {
 				if (res.data.code === 200) {
-					if(!res.data.data.receiptStatus){
+					if (!res.data.data.receiptStatus) {
 						this.$api.courseappinformUser({ id: res.data.data.id, receiptStatus: 1 }).then(res => {
 							if (res.data.code === 200) {
-								
 							}
 						});
 					}

pages2/msg/index.vue

@@ -62,7 +62,9 @@ export default {
 				uni.stopPullDownRefresh();
 			});
 	},
-	onLoad(option) {},
+	onLoad(option) {
+		this.$store.getters.dictObj
+	},
 	onShow() {
 		this.getInfo();
 	},

pages2/order/index.vue

@@ -21,7 +21,7 @@
 							<image :src="$method.splitImgHost(items.coverUrl)" style="height: 134rpx;width: 278rpx;border-radius: 16rpx;flex-shrink: 0;"></image>
 							<view style="margin-left: 20rpx;flex:1;display: flex;flex-direction: column;">
 								<view style="color: #333333;font-size: 30rpx;font-weight: bold;flex:1">{{ items.goodsName }}</view>
-								<view class="priceTag">¥ {{ items.goodsPrice }}</view>
+								<view class="priceTag">¥ {{ items.goodsRealPrice }}</view>
 							</view>
 						</view>
 						<view style="height: 80rpx;display: flex;justify-content: space-between;align-items: center;">
@@ -65,9 +65,11 @@ export default {
 			list1: [1, 2, 3, 4, 5, 6, 7],
 			current: 0,
 			order: [],
-			order1: [],
-			order2: [],
-			order3: []
+			formData:{
+				status:'0,1',
+				pageNum:1,
+				pageSize:8
+			}
 		};
 	},
 	onPullDownRefresh() {},
@@ -86,6 +88,10 @@ export default {
 			path: `/pages/index/index?inviteCode=` + userInfo == null ? '' : userInfo.userAccount
 		};
 	},
+	onReachBottom(){
+		this.formData.pageNum++
+		console.log(this.formData.pageNum)
+	},
 	methods: {
 		openPopup() {},
 		//删除订单
@@ -98,7 +104,7 @@ export default {
 						self.$api
 							.eddOrder({
 								orderId: item.orderId,
-								status: 0
+								status: -1
 							})
 							.then(res => {
 								if (res.data.code === 200) {
@@ -132,42 +138,46 @@ export default {
 				}
 			});
 		},
+		getFY(){
+			if (this.current === 0) {
+				this.formData.orderStatus = 0;
+			}
+			if (this.current === 1) {
+				this.formData.orderStatus = [1, 2];
+			}
+			if (this.current === 2) {
+				this.formData.orderStatus = [-1, -2];
+			}
+			this.$api.getorderlists(this.formData).then(res => {
+				if (res.data.code === 200) {
+					this.order.push(res.data.rows)
+				}
+			});
+		},
 		//获取订单
 		getOrderList() {
-			this.$api.getorderlists({ status: 1 }).then(res => {
+			this.formData.pageNum = 1
+			if (this.current === 0) {
+				this.formData.orderStatus = 0;
+			}
+			if (this.current === 1) {
+				this.formData.orderStatus = [1, 2];
+			}
+			if (this.current === 2) {
+				this.formData.orderStatus = [-1, -2];
+			}
+			this.$api.getorderlists(this.formData).then(res => {
 				if (res.data.code === 200) {
-					var array1 = []; //待支付
-					var array2 = []; //已支付
-					var array3 = []; //已取消
-					res.data.rows.forEach(item => {
-						if (item.orderStatus === 0) {
-							array1.push(item);
-						}
-						if (item.orderStatus === 1 || item.orderStatus === 2) {
-							array2.push(item);
-						}
-						if (item.orderStatus === -1 || item.orderStatus === -2) {
-							array3.push(item);
-						}
-					});
-					this.order1 = array1;
-					this.order2 = array2;
-					this.order3 = array3;
-					this.change(this.current);
+					this.order = res.data.rows;
 				}
 			});
 		},
 		change(index) {
-			this.current = index;
-			if (index === 0) {
-				this.order = JSON.parse(JSON.stringify(this.order1));
-			}
-			if (index === 1) {
-				this.order = JSON.parse(JSON.stringify(this.order2));
-			}
-			if (index === 2) {
-				this.order = JSON.parse(JSON.stringify(this.order3));
+			if (this.current === index) {
+				return;
 			}
+			this.current = index;
+			this.getOrderList();
 		}
 	},
 	onReachBottom() {},

pages2/plan/edit.vue

@@ -293,7 +293,7 @@ export default {
 		},
 		getInfo(int) {
 			var self = this;
-			this.$api.systemplanInfo(this.planId).then(res => {
+			this.$api.systemplanInfo({planId:this.planId}).then(res => {
 				this.form.date = this.$method.timestampToTime(res.data.data.examDate);
 				this.form.time = res.data.data.reminderTime;
 				this.form.startDate = this.$method.timestampToTime(res.data.data.startTime);

pages2/verify/input.vue

@@ -450,6 +450,9 @@ export default {
 			}
 		};
 	},
+	created() {
+		this.$store.getters.dictObj
+	},
 	onLoad(option) {
 		this.goodsId = Number(option.id);
 		this.getInfo();

pages2/wd/course.vue

@@ -40,8 +40,8 @@ export default {
 		this.goodsId = Number(option.id);
 		// uni.setStorageSync('courseGoodsId', this.goodsId);
 		this.courseCourseList();
+		this.$store.getters.dictObj
 	},
-	onShow() {},
 	onReachBottom() {
 		if (this.courseList.length < this.param.total) {
 			this.param.pageNum++;