1.29

pages/index/bookinfo.vue

@@ -261,8 +261,9 @@
 					type: 0
 				}).then(res => {
 					if (res.code == 1) {
+						uni.setStorageSync('bookid',this.id)
 						uni.navigateTo({
-							url: '/pages/index/orderinfo?id=' + res.data.order_on + '&&index=' + 1
+							url: '/pages/index/orderinfo?id=' + res.data.id + '&&index=' + 1
 						})
 					}
 				})
@@ -313,6 +314,7 @@
 				this.current = index;
 			},
 			toupdown(index) {
+				uni.setStorageSync('bookid',this.id)
 				uni.navigateTo({
 					url: '/pages/index/updown?id=' + this.id + "&&index=" + index
 				})

pages/index/index.vue

@@ -208,7 +208,7 @@
 
 	.newbox {
 		// width: 702rpx;
-		min-height: 870rpx;
+		// min-height: 870rpx;
 		background: #FFFFFF;
 		border-radius: 16rpx;
 		margin-top: 20rpx;
@@ -302,10 +302,10 @@
 
 	.jiang {
 		// width: 702rpx;
-		height: 978rpx;
+		// height: 978rpx;
 		background: #FFFFFF;
 		border-radius: 16rpx;
-		padding: 28rpx 20rpx 0;
+		padding: 28rpx 20rpx ;
 		margin-top: 28rpx;
 	}
 

pages/index/orderinfo.vue

@@ -3,20 +3,36 @@
 		<view class="info">
 			<view class="u-flex u-row-between">
 				<text class="shang">商品信息</text>
-				<text class="more" @click="open">展开</text>
+				<text class="more" @click="open" v-if="orderlist.length>3 && this.opena == false">展开</text>
+				<text class="more" @click="open" v-if="orderlist.length>3 && this.opena==true">收起</text>
 			</view>
-			<view class="u-flex" style="margin-top: 32rpx;" v-for="(item,index) in orderlist.slice(0,3)" :key="index">
+			<!-- 			<view v-if="index==1" class="u-flex" style="margin-top: 32rpx;" :key="index">
 				<view class="box">
 					<image :src="item.image" style="width: 120rpx;height: 160rpx;" mode=""></image>
 				</view>
 				<view class=""
 					style="margin-left: 20rpx;justify-content: space-between;display: flex;flex-direction: column;height: 160rpx;">
-					<view class="">
-						<view class="title u-line-1">{{item.title}}</view>
+					<view class="" style="width: 500rpx;">
+						<view class="title u-line-1" style="margin-bottom: 8rpx;">{{item.title}}</view>
 						<view class="fufei">资源类型：付费资源</view>
+						<view class="fufei">资源类型：免费资源</view>
 					</view>
 					<view class="money">¥{{item.price}}</view>
 				</view>
+			</view> -->
+			<view class="u-flex" style="margin-top: 32rpx;" v-for="(item,index) in orderlist" :key="index">
+				<view class="box">
+					<image :src="item.good_item.image" style="width: 120rpx;height: 160rpx;" mode=""></image>
+				</view>
+				<view class=""
+					style="margin-left: 20rpx;justify-content: space-between;display: flex;flex-direction: column;height: 160rpx;">
+					<view class="" style="width: 500rpx;">
+						<view class="title u-line-1" style="margin-bottom: 8rpx;">{{item.good_item.title}}</view>
+						<view class="fufei" v-if="item.good_item.price>0">资源类型：付费资源</view>
+						<view class="fufei" v-if="item.good_item.price==0">资源类型：免费资源</view>
+					</view>
+					<view class="money">¥{{item.good_item.price}}</view>
+				</view>
 			</view>
 			<view class="jiner ">
 				<view class="" style="margin-top: 24rpx;" class="u-flex u-row-between">
@@ -57,7 +73,7 @@
 			<view class="">
 				<text>合计：</text>
 				<text>￥</text>
-				<text>325.00</text>
+				<text>{{orderinfo.total_price}}</text>
 			</view>
 			<view class="btn" @click="pay">
 				确认支付
@@ -75,7 +91,11 @@
 				orderinfo: {
 					total_price: ''
 				},
-				index: ''
+				order: {
+
+				},
+				index: '',
+				opena: false
 			};
 		},
 		onLoad(options) {
@@ -85,18 +105,23 @@
 		},
 		methods: {
 			open() {
-
+				this.opena = !this.opena
 			},
 			//获取订单列表
 			getOrderList() {
 				this.$u.post('api/order/getOrderInfo', {
 					id: this.orderid
 				}).then(res => {
-					this.orderlist = res.data.goods
 					this.orderinfo = res.data
+					if (this.opena) {
+						this.orderlist = res.data.goods
+					} else {
+						this.orderlist = res.data.goods.slice(0, 3)
+					}
 					console.log(res);
 				})
 			},
+
 			// 选中某个单选框时，由radio时触发
 			radioChange(e) {
 				// console.log(e);
@@ -158,7 +183,7 @@
 
 	.jiner {
 		width: 654rpx;
-		height: 2rpx;
+		// height: 2rpx;
 		border-top: 2rpx solid rgba(151, 151, 151, 0.1);
 		margin-top: 32rpx;
 
@@ -214,7 +239,7 @@
 
 	.info {
 		width: 694rpx;
-		height: 944rpx;
+		// height: 944rpx;
 		background: #FFFFFF;
 		border-radius: 16rpx;
 		padding: 24rpx 20rpx 30rpx;

pages/index/pay/pay.vue

@@ -11,7 +11,7 @@
 				<text class="one">订单编号： 47903234955559</text>
 				<text class="one" style="color: rgba(10, 109, 205, 1);margin-left: 20rpx;" @click="success">查看订单</text>
 			</view>
-			<view class="button">
+			<view class="button" @click="accomplish">
 				完成
 			</view>
 		</view>
@@ -22,13 +22,22 @@
 	export default {
 		data() {
 			return {
-				id: ''
+				id: '',
+				bookid: ''
 			};
 		},
 		onLoad(options) {
 			this.id = options.id
 		},
 		methods: {
+			accomplish() {
+				this.bookid = uni.getStorageSync('bookid')
+				console.log(this.bookid);
+				uni.switchTab({
+					// url: '/pages/index/bookinfo?id=' + this.bookid
+					url:'/pages/index/index'
+				})
+			},
 			success() {
 				uni.navigateTo({
 					url: '/pages/success?id=' + this.id

pages/index/updown.vue

@@ -10,9 +10,10 @@
 					style="justify-content: space-between;padding: 4rpx 0 ;height: 160rpx;display: flex;flex-direction: column;">
 					<view class="">
 						<view class="title u-line-1">{{item.title}}</view>
-						<view class="writer">资源类型：付费资源</view>
+						<view class="writer" v-if='item.price>0'>资源类型：付费资源</view>
+						<view class="writer" v-if='item.price==0'>资源类型：免费资源</view>
 					</view>
-					<view class="money">¥{{item.entity_price}}</view>
+					<view class="money">¥{{item.price}}</view>
 				</view>
 			</view>
 		</u-checkbox-group>
@@ -65,7 +66,7 @@
 				this.sum = 0
 				for (var i = 0; i < this.list.length; i++) {
 					if (this.list[i].checked) {
-						this.sum += Number(this.list[i].entity_price)
+						this.sum += Number(this.list[i].price)
 					}
 				}
 			},
@@ -87,14 +88,14 @@
 			//订单确认
 			orderinfo() {
 				this.$u.post('api/order/createOrder', {
-					goods_id: '',
+					goods_id: '1,2',
 					type: 0
 				}).then(res => {
 					if (res.code == 1) {
 						this.orderid = res.data.id
 						setTimeout(() => {
 							uni.navigateTo({
-								url: '/pages/index/orderinfo?id=' + this.orderid + "&&index=" + 2
+								url: '/pages/index/orderinfo?id=' + this.orderid + "&index=" + 2
 							})
 						}, 800)
 					}
@@ -109,7 +110,6 @@
 				} else {
 					this.list.map(val => {
 						val.checked = true;
-						console.log('aaa');
 					})
 				}
 				this.getsum()
@@ -119,11 +119,11 @@
 				if (e.length == this.list.length) {
 					this.all = true
 				}
-				this.list.map(val => {
-					if (val.checked == false) {
-						this.all = false
-					}
-				})
+				// this.list.map(val => {
+				// 	if (val.checked == false) {
+				// 		this.all = false
+				// 	}
+				// })
 			},
 		}
 	}

pages/index/video.vue

@@ -29,11 +29,12 @@
 							{{video_desc}}
 						</view>
 					</view>
+					<view class="" style="height:160rpx;"></view>
 				</view>
 			</view>
-			<view class="" style="height: 166rpx;"></view>
+			<!-- 	<view class="" style="height: 166rpx;"></view> -->
 			<view class="catalogue" v-if="current==1 && file.length > 0">
-				<view  v-for="(item,index) in file" :key="index" class="section u-flex u-row-between"
+				<view v-for="(item,index) in file" :key="index" class="section u-flex u-row-between"
 					@click="onplay(item.url)">
 					<view class="">
 						<text class="tong">{{item.title}}</text>

pages/login/login.vue

@@ -87,8 +87,12 @@ color: #222222;opacity: 0.4;' placeholder='请输入密码' v-model="password" t
 				})
 			},
 			getCode() {
-				if (!this.$u.test.mobile(this.phone)) {
-					this.$u.toast("请输入正确的手机号")
+				// if (!this.$u.test.mobile(this.phone)) {
+				// 	this.$u.toast("请输入正确的手机号")
+				// 	return
+				// }
+				if (!this.checked) {
+					this.$u.toast('请先勾选协议')
 					return
 				}
 				if (this.$refs.uCode.canGetCode) {
@@ -97,20 +101,20 @@ color: #222222;opacity: 0.4;' placeholder='请输入密码' v-model="password" t
 						title: '正在获取验证码',
 						mask: true
 					})
-					this.$u.post('/api/sms/send', {
-						mobile: this.tel,
-						event: 'login'
-					}).then(res => {
-						if (res.code == 1) {
-							uni.hideLoading();
-							// 这里此提示会被this.start()方法中的提示覆盖
-							this.$u.toast('验证码已发送');
-							// 通知验证码组件内部开始倒计时
-							this.$refs.uCode.start();
-						} else {
-							this.$u.toast(res.msg)
-						}
-					})
+					// this.$u.post('/api/sms/send', {
+					// 	mobile: this.phone,
+					// password:this.password
+					// }).then(res => {
+					// 	if (res.code == 1) {
+					// 		uni.hideLoading();
+					// 		// 这里此提示会被this.start()方法中的提示覆盖
+					// 		this.$u.toast('验证码已发送');
+					// 		// 通知验证码组件内部开始倒计时
+					// 		this.$refs.uCode.start();
+					// 	} else {
+					// 		this.$u.toast(res.msg)
+					// 	}
+					// })
 				} else {
 					this.$u.toast('倒计时结束后再发送');
 				}

pages/login/register.vue

@@ -88,6 +88,35 @@ color: #222222;opacity: 0.4;' placeholder='请输入验证码' v-model="code" ty
 					this.$u.toast('请先勾选协议')
 					return
 				}
+				if (!this.$u.test.mobile(this.phone)) {
+					this.$u.toast("请输入正确的手机号")
+					return
+				}
+
+				// if (this.$refs.uCode.canGetCode) {
+				// 	// 模拟向后端请求验证码
+				// 	uni.showLoading({
+				// 		title: '正在获取验证码',
+				// 		mask: true
+				// 	})
+				// 	// this.$u.post('/api/sms/send', {
+				// 	// 	mobile: this.phone,
+				// 	// password:this.password
+				// 	// }).then(res => {
+				// 	// 	if (res.code == 1) {
+				// 	// 		uni.hideLoading();
+				// 	// 		// 这里此提示会被this.start()方法中的提示覆盖
+				// 	// 		this.$u.toast('验证码已发送');
+				// 	// 		// 通知验证码组件内部开始倒计时
+				// 	// 		this.$refs.uCode.start();
+				// 	// 	} else {
+				// 	// 		this.$u.toast(res.msg)
+				// 	// 	}
+				// 	// })
+				// } else {
+				// 	this.$u.toast('倒计时结束后再发送');
+				// }
+
 				this.$u.post('api/user/register', {
 					username: this.name,
 					password: this.passwoed,