1.28

pages/index/bookinfo.vue

@@ -11,7 +11,7 @@
 				<view class="item-jian">适用专业：{{datainfo.speciality.title}}</view>
 				<view class="item-jian">ISBN：{{datainfo.isbn}}</view>
 				<view class="item-jian">作者：{{datainfo.author}}</view>
-				<view class="item-jian">纸质定价：¥{{datainfo.entity_price}}</view>
+				<view class="item-jian" v-if="datainfo.is_free==1">纸质定价：¥{{datainfo.entity_price}}</view>
 			</view>
 		</view>
 		<view class="height"></view>
@@ -91,7 +91,7 @@
 						style="display: flex;margin-top: 28rpx;">
 						<view class="" style="display: flex;">
 							<image src="/static/images/pdf.png" class="image3" mode=""></image>
-							<view class="pdf">{{item.title}}</view>
+							<view class="pdf u-line-1" style="width: 530rpx;">{{item.title}}</view>
 						</view>
 						<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
 					</view>
@@ -99,8 +99,9 @@
 				<view class="">
 					<view class="sample u-flex u-row-between">
 						<view class="">资源包</view>
-						<view class="u-flex">
+						<view v-if="datainfo.is_free==1" class="u-flex">
 							<view class="selling">资源售价</view>
+							<!-- <view class="selling">纸质售价</view> -->
 							<view class="money5">¥{{price}}</view>
 							<view class="button4" @click="orderinfo">付费下载</view>
 						</view>
@@ -110,7 +111,7 @@
 						style="display: flex;margin-top: 28rpx;justify-content: space-between;">
 						<div style="display: flex;">
 							<image src="/static/images/pdf.png" class="image3" mode=""></image>
-							<view class="pdf">{{item.title}}</view>
+							<view class="pdf u-line-1" style="width: 530rpx;">{{item.title}}</view>
 						</div>
 						<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
 					</view>
@@ -120,7 +121,7 @@
 							style="display: flex;margin-top: 28rpx;justify-content: space-between;">
 							<view class="" style="display: flex;">
 								<image src="/static/images/pdf.png" class="image3" mode=""></image>
-								<view class="pdf">{{item.title}}</view>
+								<view class="pdf u-line-1" style="width: 530rpx;">{{item.title}}</view>
 							</view>
 							<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
 						</view>
@@ -131,25 +132,25 @@
 		<view class="" style=" height: 166rpx;"></view>
 		<view class="bottom u-flex">
 			<view class="left" @click="stylebook">样书申请</view>
-			<!-- <view v-if="" class="right">免费下载</view> -->
-			<view v-if="datainfo.is_certificate==0" class="right">体验下载</view>
+			<view v-if="datainfo.is_free==0" class="right" @click="show=true">免费下载</view>
+			<view v-if="datainfo.is_certificate==0" @click="show=true" class="right">体验下载</view>
 			<view v-if="datainfo.is_pay==0" class="right" @click="show=true">已购买，可下载</view>
-			<view v-else-if class="right">在线试读</view>
+			<view v-if="datainfo.is_pay!=0&&datainfo.is_certificate!=0&&datainfo.is_free!=0" class="right">在线试读</view>
 		</view>
 		<u-popup v-model="show" mode="bottom" border-radius="24">
 			<view class="" style="padding: 32rpx 28rpx;">
 				<view class="u-flex u-row-center" style="text-align: center;position: relative;">
 					<view class="courseware" style="margin-top: 0;">资源下载</view>
-					<image src="../../static/images/close.png"
+					<image @click="show= false" src="../../static/images/close.png"
 						style="width: 44rpx;height: 44rpx;position: absolute;top: 0;right: 0;" mode=""></image>
 				</view>
 				<view class="" v-if="specimen_file.length>0">
 					<view class="sample">样章</view>
-					<view class="" v-for="(item,index) in specimen_file" :key="index"
+					<view class="u-row-between" v-for="(item,index) in specimen_file" :key="index"
 						style="display: flex;margin-top: 28rpx;">
 						<view class="" style="display: flex;">
 							<image src="/static/images/pdf.png" class="image3" mode=""></image>
-							<view class="pdf">{{item.title}}</view>
+							<view class="pdf u-line-1" style="width: 530rpx;">{{item.title}}</view>
 						</view>
 						<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
 					</view>
@@ -163,7 +164,7 @@
 						style="display: flex;margin-top: 28rpx;justify-content: space-between;">
 						<div style="display: flex;">
 							<image src="/static/images/pdf.png" class="image3" mode=""></image>
-							<view class="pdf">{{item.title}}</view>
+							<view class="pdf u-line-1" style="width: 530rpx;">{{item.title}}</view>
 						</div>
 						<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
 					</view>
@@ -172,7 +173,7 @@
 						style="display: flex;margin-top: 28rpx;justify-content: space-between;">
 						<div style="display: flex;">
 							<image src="/static/images/pdf.png" class="image3" mode=""></image>
-							<view class="pdf">{{item.title}}</view>
+							<view class="pdf u-line-1" style="width: 530rpx;">{{item.title}}</view>
 						</div>
 						<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
 					</view>
@@ -182,7 +183,7 @@
 							style="display: flex;margin-top: 28rpx;justify-content: space-between;">
 							<view class="" style="display: flex;">
 								<image src="/static/images/pdf.png" class="image3" mode=""></image>
-								<view class="pdf">{{item.title}}</view>
+								<view class="pdf u-line-1" style="width: 530rpx;">{{item.title}}</view>
 							</view>
 							<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
 						</view>
@@ -232,6 +233,7 @@
 					is_series: '', //是否可以系列购买
 					is_certificate: '', //是否体验中
 					is_pay: '', //是否已购买
+					is_free: '', //是否免费
 				},
 				swiptlist: [],
 				pubdate: '',
@@ -254,8 +256,15 @@
 			},
 			//立即购买
 			orderinfo() {
-				uni.navigateTo({
-					url: '/pages/index/orderinfo?id=' + this.id
+				this.$u.post('api/order/createOrder', {
+					goods_id: this.id,
+					type: 0
+				}).then(res => {
+					if (res.code == 1) {
+						uni.navigateTo({
+							url: '/pages/index/orderinfo?id=' + res.data.order_on + '&&index=' + 1
+						})
+					}
 				})
 			},
 			// 系列

pages/index/orderinfo.vue

@@ -74,12 +74,14 @@
 				orderlist: [],
 				orderinfo: {
 					total_price: ''
-				}
+				},
+				index: ''
 			};
 		},
 		onLoad(options) {
-			this.getOrderList()
 			this.orderid = options.id
+			this.index = options.index
+			this.getOrderList()
 		},
 		methods: {
 			open() {
@@ -92,6 +94,7 @@
 				}).then(res => {
 					this.orderlist = res.data.goods
 					this.orderinfo = res.data
+					console.log(res);
 				})
 			},
 			// 选中某个单选框时，由radio时触发

pages/index/stylebook.vue

@@ -56,9 +56,9 @@
 				</view>
 				<!-- 				<view class="box u-flex"> -->
 				<view class="" style="margin-top: 38rpx;">
-					<u-radio-group :wrap='true'>
+					<u-radio-group :wrap='true' @change='changeground'>
 						<u-radio shape="square" active-color="rgba(6, 169, 113, 1)" v-for="(item, index) in list"
-							:key="index" :name="item.name" @change="radioChange">
+							:key="item.name" :name="index" @change="radioChange">
 							{{item.name}}
 						</u-radio>
 					</u-radio-group>
@@ -145,6 +145,9 @@
 			radioChange(e) {
 				console.log(e);
 			},
+			changeground(e) {
+				console.log(e);
+			},
 			toupload() {
 				if (!this.from.name) {
 					this.$u.toast('请输入您的姓名')

pages/index/updown.vue

@@ -29,10 +29,10 @@
 					<view class="">
 						<text class="all">合计：</text>
 						<text class="mi">¥</text>
-						<text class="mi" style="font-size: 36rpx;">325.00</text>
+						<text class="mi" style="font-size: 36rpx;">{{Number(sum).toFixed(2)}}</text>
 					</view>
 					<view class="">
-						<text class="num">12</text>
+						<text class="num">{{}}</text>
 						<text class="fcai">份资料</text>
 					</view>
 				</view>
@@ -52,7 +52,8 @@
 				all: false,
 				list: [],
 				series_id: '',
-				orderid: ''
+				orderid: '',
+				sum: 0,
 			};
 		},
 		onLoad(options) {
@@ -60,8 +61,17 @@
 			this.getSeriesBooks()
 		},
 		methods: {
+			getsum() {
+				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)
+					}
+				}
+			},
 			checkboxChange(e) {
-				console.log(e);
+				// this.$set(this.list[e.name], 'checked', e.value)
+				this.getsum()
 			},
 			// 系列列表
 			getSeriesBooks() {
@@ -84,7 +94,7 @@
 						this.orderid = res.data.id
 						setTimeout(() => {
 							uni.navigateTo({
-								url: '/pages/index/orderinfo?id=' + this.orderid
+								url: '/pages/index/orderinfo?id=' + this.orderid + "&&index=" + 2
 							})
 						}, 800)
 					}
@@ -95,17 +105,14 @@
 				if (this.all == true) {
 					this.list.map(val => {
 						val.checked = false;
-						this.all = true
-						console.log(111);
 					})
 				} else {
 					this.list.map(val => {
 						val.checked = true;
-						this.all = false
-						console.log(222);
+						console.log('aaa');
 					})
 				}
-				console.log('all', this.all);
+				this.getsum()
 			},
 			checkboxGroupChange(e) {
 				console.log(e);

pages/login/login.vue

@@ -24,9 +24,10 @@ color: #222222;opacity: 0.4;' placeholder='请输入手机号' v-model="phone" t
 font-family: PingFangSC, PingFang SC;
 font-weight: 400;
 color: #222222;opacity: 0.4;' placeholder='请输入验证码' v-model="code" type="text" :border="false" :clearable='false' />
-				<view class="code">
+				<!-- <view class="code">
 					获取验证码
-				</view>
+				</view> -->
+				<text class="code" @click="getCode">{{tips}}</text>
 			</view>
 			<view class="input u-flex" v-if="tabs==1">
 				<u-input placeholder-style='font-size: 32rpx;
@@ -60,6 +61,7 @@ color: #222222;opacity: 0.4;' placeholder='请输入密码' v-model="password" t
 				</view>
 			</view>
 		</view>
+		<u-verification-code :seconds="seconds" ref="uCode" @change="codeChange"></u-verification-code>
 	</view>
 </template>
 
@@ -71,15 +73,48 @@ color: #222222;opacity: 0.4;' placeholder='请输入密码' v-model="password" t
 				phone: '',
 				checked: false,
 				code: '',
-				password: ''
+				password: '',
+				tips: '',
 			};
 		},
 		methods: {
+			codeChange(text) {
+				this.tips = text;
+			},
 			tozhuce() {
 				uni.navigateTo({
 					url: '/pages/login/register'
 				})
 			},
+			getCode() {
+				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.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)
+						}
+					})
+				} else {
+					this.$u.toast('倒计时结束后再发送');
+				}
+			},
 			change(index) {
 				this.tabs = index
 			},

pages/mine/card.vue

@@ -85,11 +85,15 @@
 		},
 		methods: {
 			use(id) {
-				console.log(id);
 				this.$u.post('/api/certificate/useCertificate', {
-					id:id
+					id: id
 				}).then(res => {
-				
+					this.$u.toast(res.msg)
+					setTimeout(() => {
+						uni.navigateTo({
+							url: '/pages/index/bookinfo?id=' + id
+						})
+					}, 800)
 				})
 			},
 			change(index) {
@@ -100,7 +104,7 @@
 					is_expire: ''
 				}).then(res => {
 					this.MyCertificate = res.data.data
-					console.log('MyCertificate',this.MyCertificate);
+					console.log('MyCertificate', this.MyCertificate);
 				})
 			},
 			Certificate() {