2.2

components/ty-electronic/ty-electronic.vue

@@ -95,10 +95,11 @@
 				item1: -1,
 				onpageshow: false,
 				itemid: '',
-				item2:-1,
-				item3:-1,
-				itemlist1:[],
-				itemlist2:[]
+				item2: -1,
+				item3: -1,
+				itemlist1: [],
+				itemlist2: [],
+				total: '',
 			};
 		},
 		created(options) {
@@ -108,6 +109,12 @@
 			this.getBooksSpeciality()
 			this.getBooksArrangement()
 		},
+		onPullDownRefresh() {
+			if (this.paperlist.length < this.total) {
+				this.page++
+				this.getBooksList()
+			}
+		},
 		methods: {
 			toinfo(id) {
 				uni.navigateTo({
@@ -128,7 +135,7 @@
 					this.arrangement_id = id
 					this.item2 = index
 				}
-				
+
 				if (this.current == 2) {
 					this.speciality_id = id
 					this.item3 = index
@@ -186,7 +193,12 @@
 					limit: this.limit
 				}).then(res => {
 					console.log('list', res);
-					this.paperlist = res.data.data
+					if (this.page == 1) {
+						this.paperlist = res.data.data
+					} else {
+						this.paperlist.concat(res.data.data)
+					}
+					this.total = res.data.total
 				})
 			}
 		},

pages.json

@@ -159,7 +159,7 @@
 			"path" : "pages/mine/privacy",
 			"style" : 
 			{
-				"navigationBarTitleText" : "隐私服务",
+				"navigationBarTitleText" : "隐私政策",
 				"enablePullDownRefresh" : false
 			}
 		},

pages/index/bookinfo.vue

@@ -99,21 +99,34 @@
 				<view class="">
 					<view class="sample u-flex u-row-between">
 						<view class="">资源包</view>
-						<view v-if="datainfo.is_free==1&&book_type==0" class="u-flex">
+						<view v-if="datainfo.is_free==1&&datainfo.book_type==0" class="u-flex">
 							<view class="selling">资源售价</view>
 							<!-- <view class="selling">纸质售价</view> -->
 							<view class="money5">¥{{price}}</view>
 							<view class="button4" @click="orderinfo">付费下载</view>
 						</view>
 					</view>
-					<view class="courseware">课件</view>
-					<view @click='touser(item.url)' v-for="(item,index) in courseware_file" :key="index" class=""
-						style="display: flex;margin-top: 28rpx;justify-content: space-between;">
-						<div style="display: flex;">
-							<image src="/static/images/video.png" class="image3" mode=""></image>
-							<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 class="" v-if="ebook_file.length>0">
+						<view class="courseware">电子书</view>
+						<view @click='touser(item.url)' v-for="(item,index) in ebook_file" :key="index" class=""
+							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 u-line-1" style="width: 530rpx;">{{item.title}}</view>
+							</view>
+							<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
+						</view>
+					</view>
+					<view class="" v-if="courseware_file.length>0">
+						<view class="courseware">课件</view>
+						<view @click='touser(item.url)' v-for="(item,index) in courseware_file" :key="index" class=""
+							style="display: flex;margin-top: 28rpx;justify-content: space-between;">
+							<div style="display: flex;">
+								<image src="/static/images/video.png" class="image3" mode=""></image>
+								<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>
 					</view>
 					<view class="" v-if="resource_file.length>0">
 						<view class="courseware">资源</view>
@@ -133,20 +146,22 @@
 		<view class="bottom u-flex">
 			<view v-if="datainfo.book_type==0" class="left" @click="stylebook">样书申请</view>
 			<!-- <view v-if="datainfo.book_type==1" class="left" @click="stylebook">样书申请</view> -->
+			<!-- 			<view v-if="datainfo.book_type==1&&(datainfo.is_free==0||datainfo.is_certificate==0||datainfo.is_pay==0)"
+				class="left" @click="stylebook">在线阅读</view> -->
+			<view class="left" @click="toyang" v-if="datainfo.book_type==1">在线阅读</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-if="datainfo.is_pay==1&&datainfo.book_type==1&&datainfo.is_free!=0&&datainfo.is_certificate"
+				class="right" @click="orderinfo">立即购买</view>
+			<view v-if="datainfo.is_pay!=0&&datainfo.is_certificate!=0&&datainfo.is_free!=0&&datainfo.book_type==0"
+				class="right" @click="toyang()">在线试读</view>
 			<view v-if="datainfo.is_certificate==0" class="" style="position: relative;flex: 1;">
 				<view class="timeback" style="position: absolute">
 					体验到期时间：{{card.free_end_time}}
 				</view>
 				<view @click="show=true" class="right">体验下载</view>
 			</view>
-			<view v-if="datainfo.book_type==1&&(datainfo.is_free==0||datainfo.is_certificate==0||datainfo.is_pay==0)"
-				class="left" @click="stylebook">在线阅读</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-if="datainfo.is_pay==1&&datainfo.book_type==1" class="right" @click="orderinfo">立即购买</view>
-			<view v-if="datainfo.is_pay!=0&&datainfo.is_certificate!=0&&datainfo.is_free!=0" class="right"
-				@click="toyang()">在线试读</view>
 		</view>
 		<u-popup v-model="show" mode="bottom" border-radius="24">
 			<view class="" style="padding: 32rpx 28rpx;">
@@ -170,33 +185,38 @@
 					<view class="sample u-flex u-row-between">
 						<view class="">资源包</view>
 					</view>
-					<view class="courseware">电子书</view>
-					<view v-for="(item,index) in courseware_file" :key="index" class=""
-						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 u-line-1" style="width: 530rpx;">{{item.title}}</view>
-						</div>
-						<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
+					<view class="" v-if="ebook_file.length>0">  
+						<view class="courseware">电子书</view>
+						<view @click='touser(item.url)' v-for="(item,index) in ebook_file" :key="index" class=""
+							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 u-line-1" style="width: 530rpx;">{{item.title}}</view>
+							</div>
+							<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
+						</view>
 					</view>
-					<view class="courseware">课件</view>
-					<view v-for="(item,index) in courseware_file" :key="index" class=""
-						style="display: flex;margin-top: 28rpx;justify-content: space-between;">
-						<div style="display: flex;">
-							<image src="/static/images/video.png" class="image3" mode=""></image>
-							<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 class="" v-if="courseware_file.length>0">
+						<view class="courseware">课件</view>
+						<view @click='touser(item.url)' v-for="(item,index) in courseware_file" :key="index" class=""
+							style="display: flex;margin-top: 28rpx;justify-content: space-between;">
+							<div style="display: flex;">
+								<image src="/static/images/video.png" class="image3" mode=""></image>
+								<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>
 					</view>
 					<view class="" v-if="resource_file.length>0">
 						<view class="courseware">资源</view>
-						<view v-for="(item,index) in resource_file" :key="index" class=""
+						<view @click='touser(item.url)' v-for="(item,index) in resource_file" :key="index" class=""
 							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 u-line-1" style="width: 530rpx;">{{item.title}}</view>
 							</view>
-							<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
+							<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;">
+							</image>
 						</view>
 					</view>
 				</view>
@@ -252,10 +272,11 @@
 				courseware_file: [],
 				resource_file: [],
 				specimen_file: [],
+				ebook_file:[],
 				price: '', //资源价格,
 				url: '',
-				card:{
-					free_end_time:''
+				card: {
+					free_end_time: ''
 				}
 			};
 		},
@@ -356,6 +377,7 @@
 					this.courseware_file = res.data.courseware_file
 					this.resource_file = res.data.resource_file
 					this.specimen_file = res.data.specimen_file
+					this.ebook_file = res.data.ebook_file
 					this.card = res.data.cer
 					if (res.data.specimen_file.length > 0) {
 						this.url = res.data.specimen_file[0].url
@@ -379,7 +401,7 @@
 					uni.navigateTo({
 						url: '/pages/index/updown?id=' + this.series_id + "&&index=" + index
 					})
-				}else{
+				} else {
 					this.$u.toast('请登录后下载')
 				}
 			},

pages/index/contribute.vue

@@ -128,7 +128,7 @@
 					<view style="margin-top: 16rpx;font-size: 20rpx;
 font-family: PingFangSC, PingFang SC;
 font-weight: 400;
-color: #222222;">{{name}}</view>
+color: #222222;width:170rpx ;overflow: hidden;  white-space:nowrap; text-overflow:ellipsis;">{{name}}</view>
 				</view>
 				<view v-else class="uploading" @click="upload1">
 					<image src="../../static/images/uploading.png" style="width: 64rpx;height: 64rpx;" mode=""></image>

pages/index/index-search.vue

@@ -15,7 +15,8 @@
 			</view>
 		</view>
 		<view class="u-flex" style="flex-wrap: wrap;margin-top: 24rpx;" v-if="show1">
-			<view class="item" style="margin-right: 16rpx;" v-for="(item,index) in search" :key="index" @click="searcha(item)">
+			<view class="item" style="margin-right: 16rpx;" v-for="(item,index) in search" :key="index"
+				@click="searcha(item)">
 				{{item}}
 			</view>
 		</view>
@@ -33,8 +34,8 @@
 		</view>
 		<view class="" v-if="positionlist.length > 0">
 			<view class="list1">
-				<view v-for="(item,index) in positionlist" :key="index" class="u-flex" style="margin-top: 28rpx;"
-					v-if="curret==0">
+				<view @click="toinfo(item.id)" v-for="(item,index) in positionlist" :key="index" class="u-flex"
+					style="margin-top: 28rpx;" v-if="curret==0">
 					<image :src="item.image" style="width: 239rpx;height: 240rpx;" mode=""></image>
 					<view class="u-flex-col " style="margin-left: 20rpx;height: 240rpx;padding: 12rpx 0;
 			justify-content: space-between;">
@@ -49,7 +50,7 @@
 						</view>
 					</view>
 				</view>
-				<view v-for="(item,index) in positionlist" :key="index" class="u-flex" style="margin-top: 28rpx;"
+				<view @click="toinfo(item.id)"  v-for="(item,index) in positionlist" :key="index" class="u-flex" style="margin-top: 28rpx;"
 					v-if="curret==1">
 					<image :src="item.image" style="width: 239rpx;height: 240rpx;" mode=""></image>
 					<view class="u-flex-col " style="margin-left: 20rpx;height: 240rpx;padding: 12rpx 0;
@@ -65,7 +66,7 @@
 						</view>
 					</view>
 				</view>
-				<view v-for="(item,index) in VideoList" :key="index" class="top" v-if="curret==2">
+				<view @click="tovideo(item.id)"  v-for="(item,index) in VideoList" :key="index" class="top" v-if="curret==2">
 					<view class="flex">
 						<image :src="item.image" style="width: 212rpx;height: 128rpx;" mode=""></image>
 						<view class="" style="margin-left: 20rpx;">
@@ -107,7 +108,17 @@
 			}
 		},
 		methods: {
-			searcha(item){
+			tovideo(id){
+				uni.navigateTo({
+					url:"/pages/index/video?id="+id
+				})
+			},
+			toinfo(id) {
+				uni.navigateTo({
+					url: '/pages/index/bookinfo?id=' + id
+				})
+			},
+			searcha(item) {
 				this.keyword1 = item
 				this.getBooksList()
 			},

pages/index/index.vue

@@ -37,8 +37,9 @@
 		<view v-if="curret==0" class="back pad">
 			<view class="wrap" v-if="curret==0">
 				<swiper class="swiper" style="height: 280rpx;border-radius: 20rpx;" circular>
-					<swiper-item v-for="(item,index) in imagelist" :key="index" @click="toinfo(item.id,item.jump_type)">
-						<image style="width: 100%;height: 100%;border-radius: 20rpx;" mode="aspectFill" :src="item.image"></image>
+					<swiper-item v-for="(item,index) in imagelist" :key="index" @click="toinfo(item.jump_id,item.jump_type)">
+						<image style="width: 100%;height: 100%;border-radius: 20rpx;" mode="aspectFill"
+							:src="item.image"></image>
 					</swiper-item>
 				</swiper>
 			</view>
@@ -47,7 +48,7 @@
 					<text class="title1">获奖教材</text>
 					<view class="look" @click="tomore(3)">查看更多</view>
 				</view>
-				<view class="cai u-flex u-row-between">
+				<view class="cai u-flex ">
 					<view class="item " v-for="(item,index) in awardlist.slice(0,6)" :key="index"
 						@click="toinfo(item.id)">
 						<image :src="item.image" class="bookimg" mode=""></image>
@@ -69,7 +70,7 @@
 					<text class="title1">新书推荐</text>
 					<view class="look" @click="tomore(4)">查看更多</view>
 				</view>
-				<view class="cai u-flex u-row-between">
+				<view class="cai u-flex ">
 					<view class="item " v-for="(item,index) in newlist.slice(0,6)" :key="index"
 						@click="toinfo(item.id)">
 						<image :src="item.image" class="bookimg" mode=""></image>
@@ -163,13 +164,24 @@
 			},
 			onchange(index) {
 				this.curret = index
+				if (this.curret == 0) {
+					this.getnewlist()
+					this.getawardslist()
+					this.getBanner()
+				}
+				if(this.curret==1){
+					this.$refs.paper.getBooksList()
+				}
+				if(this.curret==2){
+					this.$refs.electronic.getBooksList()
+				}
 			},
 			toindexsearch() {
 				uni.navigateTo({
 					url: "/pages/index/index-search"
 				})
 			},
-			toinfo(id, type=0) {
+			toinfo(id, type = 0) {
 				if (type == 0) {
 					uni.navigateTo({
 						url: '/pages/index/bookinfo?id=' + id
@@ -182,9 +194,13 @@
 				}
 			},
 			contribute() {
-				uni.navigateTo({
-					url: '/pages/index/contribute'
-				})
+				if(uni.getStorageSync('token')){
+					uni.navigateTo({
+						url: '/pages/index/contribute'
+					})
+				}else{
+					this.$u.toast('请登录后操作')
+				}
 			}
 		},
 	}
@@ -308,7 +324,7 @@
 		// height: 978rpx;
 		background: #FFFFFF;
 		border-radius: 16rpx;
-		padding: 28rpx 20rpx ;
+		padding: 28rpx 20rpx;
 		margin-top: 28rpx;
 	}
 
@@ -398,4 +414,8 @@
 
 		// overflow: hidden;
 	}
+
+	.cai :not(:last-child) {
+		margin-right: 8rpx;
+	}
 </style>

pages/index/orderinfo.vue

@@ -3,8 +3,8 @@
 		<view class="info">
 			<view class="u-flex u-row-between">
 				<text class="shang">商品信息</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>
+				<text class="more" @click="open" v-if="this.orderlist.length>2 && this.opena==false">展开</text>
+				<text class="more" @click="open" v-if="this.orderlist.length>2 && this.opena==true">收起</text>
 			</view>
 			<!-- 			<view v-if="index==1" class="u-flex" style="margin-top: 32rpx;" :key="index">
 				<view class="box">
@@ -20,7 +20,8 @@
 					<view class="money">¥{{item.price}}</view>
 				</view>
 			</view> -->
-			<view v-if="index==3" class="u-flex" style="margin-top: 32rpx;" v-for="(item,index) in orderlist" :key="index">
+			<view v-if="index==3" 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: 200rpx;height: 160rpx;" mode=""></image>
 				</view>
@@ -34,7 +35,7 @@
 					<view class="money">¥{{item.good_item.price}}</view>
 				</view>
 			</view>
-			<view  class="u-flex" style="margin-top: 32rpx;" v-for="(item,index) in orderlist" :key="index">
+			<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>
@@ -59,7 +60,7 @@
 			</view>
 		</view>
 		<view class="pay">
-			<u-radio-group v-model="value" >
+			<u-radio-group v-model="value">
 				<view class="u-flex u-row-between" style="width: 680rpx;">
 					<view class="u-flex">
 						<image src="/static/images/wei.png" style="width: 40rpx;height: 40rpx;" mode=""></image>
@@ -120,6 +121,7 @@
 		methods: {
 			open() {
 				this.opena = !this.opena
+				this.getOrderList()
 			},
 			//获取订单列表
 			getOrderList() {
@@ -145,8 +147,20 @@
 				// console.log(e);
 			},
 			pay() {
-				uni.navigateTo({
-					url: '/pages/index/pay/pay?id='+this.orderid
+				this.$u.post('api/order/orderPay', {
+					order_id: this.orderid,
+					pay_type: this.value,
+					trade_type: "MWEB"
+				}).then(res => {
+					console.log(res)
+					if (res.code == 1) {
+						this.$u.toast("支付完成")
+						setTimeout(() => {
+							uni.navigateTo({
+								url: '/pages/index/pay/pay?id=' + this.orderid
+							})
+						}, 800)
+					}
 				})
 			}
 		}

pages/index/stylebook.vue

@@ -112,7 +112,7 @@
 		data() {
 			return {
 				showc:false,
-				value: 0,
+				value: null,
 				list: [{
 						name: '教材用书',
 						disabled: false,
@@ -135,7 +135,7 @@
 					phone: '',
 					email: '',
 					school: '',
-					use_to: 0,
+					use_to: null,
 					mailing_name: '',
 					mailing_area: '',
 					mailing_address: '',
@@ -176,7 +176,7 @@
 					this.$u.toast('请输入您的学校')
 					return
 				}
-				if (!this.from.use_to) {
+				if (this.from.use_to==null) {
 					this.$u.toast('请选择图书用途')
 					return
 				}
@@ -197,7 +197,10 @@
 				}).then(res => {
 					console.log(res);
 					if (res.code == 1) {
-						uni.navigateBack()
+						this.$u.toast('提交成功')
+						setTimeout(()=>{
+							uni.navigateBack()
+						},800)
 					}
 				})
 			}

pages/index/video.vue

@@ -39,25 +39,25 @@
 					<view class="">
 						<text class="tong">{{item.title}}</text>
 					</view>
-					<view v-if="item.is_try==0" class="look">
+					<view v-if="item.is_try==0&&info.is_pay==1" class="look">
 						试看
 					</view>
-					<view v-else class="look">
+					<view v-else class="look" v-if="info.is_pay==0">
 						观看
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="bottom" style="display: flex;justify-content: space-between;">
-			<view class="button1 u-flex u-row-center" style="margin-right: 11rpx;" v-if="current==0&&trylist.length>0">
-				<view  class="" @click="open">免费试看</view>
+			<view class="button1 u-flex u-row-center" style="margin-right: 11rpx;" v-if="trylist.length>0&&info.is_pay==1">
+				<view class="" @click="open">免费试看</view>
 				<image src="/static/images/slice.png" style="width: 32rpx; height: 32rpx;margin-left: 12rpx;" mode="">
 				</image>
 			</view>
-			<view style="flex: 1;" class="button2" v-if="current==0" @click="toorderinfo">
+			<view style="flex: 1;" class="button2" v-if="info.is_pay==1" @click="toorderinfo">
 				立即订阅
 			</view>
-			<view @click="open()" class="button" v-if="current==1">
+			<view @click="open()" class="button" v-if="info.is_pay==0">
 				立即学习
 			</view>
 		</view>
@@ -130,8 +130,15 @@
 				}
 			},
 			open() {
-				this.show1 = true
-				this.url = this.url1
+				if (this.info.is_pay == 0) {
+					this.show1 = true
+					this.url = this.file[0].url
+				} else if (this.trylist.length > 0) {
+					this.show1 = true
+					this.url = this.url1
+				} else{
+					this.$u.toast("请购买后观看")
+				}
 			},
 			//获取视频信息
 			getVideoInfo() {
@@ -150,7 +157,7 @@
 							this.trylist.push(item)
 						}
 					})
-					this.url1 = trylist[0].url
+					this.url1 = this.trylist[0].url
 				})
 			},
 			change(index) {
@@ -163,7 +170,8 @@
 			},
 			onplay(url, is_try) {
 				if (is_try == 0) {
-					this.open()
+					this.show1 = true
+					this.url = url
 				} else if (this.info.is_pay == 0) {
 					this.show1 = true
 					this.url = url

pages/login/forgetPassword.vue

@@ -5,13 +5,14 @@
 			<u-input placeholder-style='font-size: 32rpx;
 			font-family: PingFangSC, PingFang SC;
 			font-weight: 400;
-			color: #222222;opacity: 0.5;' placeholder='手机号' v-model="phone" type="text" :border="false" :clearable='false' />
+			color: #222222;opacity: 0.5;' placeholder='手机号' v-model="resultPhone" type="text" :border="false" 
+				:clearable='false' :disabled="true" />
 		</view>
 		<view class="input u-flex">
-			<u-input placeholder-style='font-size: 32rpx;
+			<u-input placeholder-style='font-size: 32rpx; 
 			font-family: PingFangSC, PingFang SC;
 			font-weight: 400;
-			color: #222222;opacity: 0.5;' placeholder='请输入验证码' v-model="code" type="text" :border="false" :clearable='false' />
+			color: #222222;opacity: 0.5;' placeholder='请输入验证码' v-model="code" type="text" :border="false" :clearable='false'  />
 			<view class="code">
 				获取验证码
 			</view>
@@ -26,14 +27,26 @@
 	export default {
 		data() {
 			return {
-				code:'',
-				phone:''
+				code: '',
+				phone: '',
+				resultPhone: ''
 			};
 		},
-		methods:{
-			changePasswoed(){
+		onLoad() {
+			if (uni.getStorageSync('token')) {
+				this.getUserinfo()
+			}
+		},
+		methods: {
+			changePasswoed() {
 				uni.navigateTo({
-					url:'/pages/login/changePasswoed'
+					url: '/pages/login/changePasswoed'
+				})
+			},
+			getUserinfo() {
+				this.$u.post('api/user/getUserinfo').then(res => {
+					this.phone = res.mobile
+					this.resultPhone = res.phone_r
 				})
 			}
 		}
@@ -43,7 +56,7 @@
 <style lang="scss">
 	.page {
 		padding: 52rpx 36rpx 0;
-		border-top: 2rpx solid #979797;
+		border-top: 2rpx solid rgba(235, 235, 235, 1);
 	}
 
 	.code {

pages/login/login.vue

@@ -55,9 +55,9 @@ color: #222222;opacity: 0.4;' placeholder='请输入密码' v-model="password" t
 				<u-checkbox shape="circle" v-model="checked"></u-checkbox>
 				<view class="" style="margin-left: -12rpx;">
 					<text>阅读并同意</text>
-					<text style='color:#06A971;'>《隐私政策》</text>
+					<text style='color:#06A971;' @click="toprivacy">《隐私政策》</text>
 					<text>和</text>
-					<text style='color:#06A971;'>《服务协议》</text>
+					<text style='color:#06A971;' @click="toserve">《服务协议》</text>
 				</view>
 			</view>
 		</view>
@@ -79,6 +79,16 @@ color: #222222;opacity: 0.4;' placeholder='请输入密码' v-model="password" t
 			};
 		},
 		methods: {
+			toprivacy(){
+				uni.navigateTo({
+					url:'/pages/mine/privacy'
+				})
+			},
+			toserve(){
+				uni.navigateTo({
+					url:'/pages/mine/serve'
+				})
+			},
 			codeChange(text) {
 				this.tips = text;
 			},

pages/mine/card.vue

@@ -12,7 +12,7 @@
 						{{item.free_end_time||''}}
 					</view>
 				</view>
-				<view v-if="item.is_expire==1" class="button" style="margin-left: 36rpx;" @click='use(item.id)'>
+				<view v-if="item.is_expire==1" class="button" style="margin-left: 36rpx;"@click='use(item.id,item.goods.id)'>
 					立即使用
 				</view>
 				<view v-if="item.is_expire==0" class="">
@@ -31,7 +31,7 @@
 						{{item.free_end_time||''}}
 					</view>
 				</view>
-				<view v-if="item.is_expire==1" class="button" style="margin-left: 36rpx;" @click='use(item.id)'>
+				<view v-if="item.is_expire==1" class="button" style="margin-left: 36rpx;" @click='use(item.id,item.goods.id)'>
 					立即使用
 				</view>
 				<view v-if="item.is_expire==0" class="">
@@ -86,14 +86,14 @@
 			}
 		},
 		methods: {
-			use(id) {
+			use(id,bookid) {
 				this.$u.post('/api/certificate/useCertificate', {
 					id: id
 				}).then(res => {
 					this.$u.toast(res.msg)
 					setTimeout(() => {
 						uni.navigateTo({
-							url: '/pages/index/bookinfo?id=' + id
+							url: '/pages/index/bookinfo?id=' + bookid
 						})
 					}, 800)
 				})

pages/mine/myorder.vue

@@ -60,7 +60,8 @@
 				page: 1,
 				limit: 10,
 				status: '',
-				orderlist: []
+				orderlist: [],
+				total: ''
 			};
 		},
 		onLoad() {
@@ -69,7 +70,10 @@
 			}
 		},
 		onPullDownRefresh() {
-			
+			if (this.orderlist.length < this.total) {
+				this.page++
+				this.getOrderList()
+			}
 		},
 		methods: {
 			orderinfo(id) {
@@ -144,7 +148,12 @@
 					status: this.status
 				}).then(res => {
 					if (res.code == 1) {
-						this.orderlist = res.data.data
+						if (this.page == 1) {
+							this.orderlist = res.data.data
+							this.total = res.data.total
+						} else {
+							this.orderlist.concat(res.data.data)
+						}
 					}
 				})
 			}

pages/mine/setting.vue

@@ -63,8 +63,8 @@
 			},
 			toquit(){
 				uni.clearStorageSync()
-				uni.navigateTo({
-					url:'/pages/login/login'
+				uni.reLaunch({
+					url:'/pages/index/index'
 				})
 			}
 		}

pages/success.vue

@@ -25,7 +25,7 @@
 					<view class="" style="margin-top: 32rpx;">¥{{item.good_item.price}}</view>
 				</view>
 			</view>
-			<view v-else class="" style="display: flex;margin-top: 32rpx;" v-for="(item,index) in goodslist" :key="index">
+			<view  v-if="info.type==0" class="" style="display: flex;margin-top: 32rpx;" v-for="(item,index) in goodslist" :key="index">
 				<view class="box">
 					<image style="width: 120rpx;height: 160rpx;" :src="item.good_item.image" mode=""></image>
 				</view>

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>tiyu</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.9abb6b03.js></script><script src=./static/js/index.96476d77.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.9abb6b03.js></script><script src=./static/js/index.1124f349.js></script></body></html>