1.31

components/ty-electronic/ty-electronic.vue

@@ -0,0 +1,327 @@
+<template>
+	<view class="page1" style="background: #fff;">
+		<view class="" style="position: relative;height: 16px;">
+			<view class="top u-flex u-row-between">
+				<view class="u-flex" @click="change(0)">
+					<text :class="current==0?'new':'fen'">教材级别</text>
+					<image src="/static/images/down.png" style="width: 12rpx;height: 8rpx;margin-left: 8rpx;" mode="">
+					</image>
+				</view>
+				<view class="u-flex" @click="change(1)">
+					<text :class="current==1?'new':'fen'">教学层次</text>
+					<image src="/static/images/down.png" style="width: 12rpx;height: 8rpx;margin-left: 8rpx;" mode="">
+					</image>
+				</view>
+				<view class="u-flex" @click="change(2)">
+					<text :class="current==2?'new':'fen'">专业分类</text>
+					<image src="/static/images/down.png" style="width: 12rpx;height: 8rpx;margin-left: 8rpx;" mode="">
+					</image>
+				</view>
+				<view @click="change(3)" class="" :class="current==3?'new':'fen'">获奖教材</view>
+				<view @click="change(4)" :class="current==4?'new':'fen'">新书推荐</view>
+			</view>
+			<view v-show="current==0" class="absolt" v-if="onpageshow">
+				<div style="padding: 8rpx 28rpx 36rpx;box-sizing: border-box;display: flex;flex-wrap: wrap;">
+					<view :class="item1==-1?'itemb':'itema'" @click="changeitem(-1,'')">全部</view>
+					<view :class="item1==index?'itemb':'itema'" v-for="(item,index) in itemlist" :key="index"
+						@click="changeitem(index,item.id)">
+						{{item.title}}
+					</view>
+				</div>
+				<view class="u-flex u-row-between" style="padding: 20rpx 28rpx;box-sizing: border-box;">
+					<view class="btn1" @click="onpageshow=false">取消</view>
+					<view class="btn2" @click="enter">确认</view>
+				</view>
+			</view>
+			<view v-show="current==1" class="absolt" v-if="onpageshow">
+				<div style="padding: 8rpx 28rpx 36rpx;box-sizing: border-box;display: flex;flex-wrap: wrap;">
+					<view :class="item2==-1?'itemb':'itema'" @click="changeitem(-1,'')">全部</view>
+					<view :class="item2==index?'itemb':'itema'" v-for="(item,index) in itemlist" :key="index"
+						@click="changeitem(index,item.id)">
+						{{item.title}}
+					</view>
+				</div>
+				<view class="u-flex u-row-between" style="padding: 20rpx 28rpx;box-sizing: border-box;">
+					<view class="btn1" @click="onpageshow=false">取消</view>
+					<view class="btn2" @click="enter">确认</view>
+				</view>
+			</view>
+			<view v-show="current==2" class="absolt" v-if="onpageshow">
+				<div style="padding: 8rpx 28rpx 36rpx;box-sizing: border-box;display: flex;flex-wrap: wrap;">
+					<view :class="item3==-1?'itemb':'itema'" @click="changeitem(-1,'')">全部</view>
+					<view :class="item3==index?'itemb':'itema'" v-for="(item,index) in itemlist" :key="index"
+						@click="changeitem(index,item.id)">
+						{{item.title}}
+					</view>
+				</div>
+				<view class="u-flex u-row-between" style="padding: 20rpx 28rpx;box-sizing: border-box;">
+					<view class="btn1" @click="onpageshow=false">取消</view>
+					<view class="btn2" @click="enter">确认</view>
+				</view>
+			</view>
+		</view>
+		<scroll-view :scroll-y='true' style="height: calc(100vh - 200px);">
+			<view class="u-flex u-row-between u-flex-wrap">
+				<view class="" @click="toinfo(item.id)" v-for="(item,index) in paperlist" :key="index"
+					style="margin-top: 26rpx;display: inline-block;">
+					<image :src="item.image" style="width: 334rpx;height: 460rpx;" mode=""></image>
+					<view class="title u-line-1">{{item.title}}…</view>
+					<view class="writer u-line-1">{{item.author}}</view>
+					<view class="" style="margin-top: 8rpx;">
+						<text class="ding">定价</text>
+						<text class="money">¥{{item.entity_price}}</text>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				level_id: '',
+				arrangement_id: '',
+				speciality_id: "",
+				book_type: 1,
+				is_new_recommend: '',
+				is_awards: '',
+				page: 1,
+				limit: 10,
+				current: 0,
+				paperlist: [],
+				itemlist: [],
+				item1: -1,
+				onpageshow: false,
+				itemid: '',
+				item2:-1,
+				item3:-1,
+				itemlist1:[],
+				itemlist2:[]
+			};
+		},
+		created(options) {
+			//新书
+			this.getBooksList()
+			this.getBooksLevel()
+			this.getBooksSpeciality()
+			this.getBooksArrangement()
+		},
+		methods: {
+			toinfo(id) {
+				uni.navigateTo({
+					url: '/pages/index/bookinfo?id=' + id
+				})
+			},
+			//确定
+			enter() {
+				this.onpageshow = false
+				this.getBooksList()
+			},
+			changeitem(index, id) {
+				if (this.current == 0) {
+					this.level_id = id
+					this.item1 = index
+				}
+				if (this.current == 1) {
+					this.arrangement_id = id
+					this.item2 = index
+				}
+				
+				if (this.current == 2) {
+					this.speciality_id = id
+					this.item3 = index
+				}
+			},
+			//级别
+			getBooksLevel() {
+				this.$u.post('api/books/getBooksLevel', {}).then(res => {
+					this.itemlist = res.data
+				})
+			},
+			getBooksArrangement() {
+				this.$u.post('api/books/getBooksArrangement', {}).then(res => {
+					this.itemlist1 = res.data
+				})
+			},
+			getBooksSpeciality() {
+				this.$u.post('api/books/getBooksSpeciality', {}).then(res => {
+					this.itemlist2 = res.data
+				})
+			},
+			change(index) {
+				this.onpageshow = true
+				this.current = index
+				this.is_new_recommend = ''
+				this.is_awards = ''
+				this.getBooksList()
+				if (this.current == 0) {
+					this.getBooksLevel()
+				}
+				if (this.current == 1) {
+					this.itemlist = this.itemlist1
+				}
+				if (this.current == 2) {
+					this.itemlist = this.itemlist2
+				}
+			},
+			getBooksList() {
+				if (this.current == 4) {
+					this.is_new_recommend = 0
+					this.onpageshow = false
+				}
+				if (this.current == 3) {
+					this.is_awards = 0
+					this.onpageshow = false
+				}
+				this.$u.post('api/books/getBooksList', {
+					level_id: this.level_id,
+					arrangement_id: this.arrangement_id,
+					speciality_id: this.speciality_id,
+					book_type: this.book_type,
+					is_new_recommend: this.is_new_recommend,
+					is_awards: this.is_awards,
+					page: this.page,
+					limit: this.limit
+				}).then(res => {
+					console.log('list', res);
+					this.paperlist = res.data.data
+				})
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.itema {
+		height: 60rpx;
+		border-radius: 8rpx;
+		border: 1rpx solid rgba(151, 151, 151, 1);
+		font-size: 26rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		color: #444444;
+		margin-right: 24rpx;
+		line-height: 60rpx;
+		text-align: center;
+		padding: 0 27rpx;
+		box-sizing: border-box;
+		margin-top: 20rpx;
+	}
+
+	.itemb {
+		height: 60rpx;
+		border-radius: 8rpx;
+		border: 1rpx solid rgba(6, 169, 113, 0.1);
+		background: rgba(6, 169, 113, 0.1);
+		font-size: 26rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		color: #06A971;
+		margin-right: 24rpx;
+		line-height: 60rpx;
+		text-align: center;
+		padding: 0 27rpx;
+		margin-top: 20rpx;
+	}
+
+	.btn1 {
+		width: 260rpx;
+		height: 76rpx;
+		background: #F3F3F3;
+		border-radius: 12rpx;
+		line-height: 76rpx;
+		text-align: center;
+		font-size: 28rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		color: #333333;
+
+	}
+
+	.btn2 {
+		width: 402rpx;
+		height: 76rpx;
+		background: #06A971;
+		border-radius: 12rpx;
+		line-height: 76rpx;
+		text-align: center;
+		font-size: 28rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
+	}
+
+	.absolt {
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		position: absolute;
+		top: 30rpx;
+		left: -24rpx;
+		// height: 300rpx;
+		box-sizing: border-box;
+		background: #FFFFFF;
+		border-radius: 0rpx 0rpx 20rpx 20rpx;
+		width: 750rpx;
+		z-index: 100;
+	}
+
+	.title {
+		font-size: 28rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+		margin-top: 20rpx;
+		width: 334rpx;
+	}
+
+	.writer {
+		font-size: 24rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		color: #444444;
+		margin-top: 8rpx;
+		width: 334rpx;
+	}
+
+	.money {
+		font-size: 28rpx;
+		font-family: SFPro, SFPro;
+		font-weight: 400;
+		color: #CC3300;
+	}
+
+	.ding {
+		font-size: 24rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		color: #222222;
+	}
+
+	.page1 {
+		width: 750rpx;
+		background: #FFFFFF;
+		border-radius: 28rpx 28rpx 0rpx 0rpx;
+		padding: 28rpx 24rpx;
+		// height: 70vh;
+		height: 75.5vh;
+	}
+
+	.top {
+		.fen {
+			font-size: 24rpx;
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			color: #444444;
+		}
+
+		.new {
+			font-size: 24rpx;
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 500;
+			color: #06A971;
+		}
+	}
+</style>

components/ty-paper/ty-paper.vue

@@ -20,7 +20,7 @@
 				<view @click="change(3)" class="" :class="current==3?'new':'fen'">获奖教材</view>
 				<view @click="change(4)" :class="current==4?'new':'fen'">新书推荐</view>
 			</view>
-			<view class="absolt" v-if="onpageshow">
+			<view v-show="current==0" class="absolt" v-if="onpageshow">
 				<div style="padding: 8rpx 28rpx 36rpx;box-sizing: border-box;display: flex;flex-wrap: wrap;">
 					<view :class="item1==-1?'itemb':'itema'" @click="changeitem(-1,'')">全部</view>
 					<view :class="item1==index?'itemb':'itema'" v-for="(item,index) in itemlist" :key="index"
@@ -33,9 +33,35 @@
 					<view class="btn2" @click="enter">确认</view>
 				</view>
 			</view>
+			<view v-show="current==1" class="absolt" v-if="onpageshow">
+				<div style="padding: 8rpx 28rpx 36rpx;box-sizing: border-box;display: flex;flex-wrap: wrap;">
+					<view :class="item2==-1?'itemb':'itema'" @click="changeitem(-1,'')">全部</view>
+					<view :class="item2==index?'itemb':'itema'" v-for="(item,index) in itemlist" :key="index"
+						@click="changeitem(index,item.id)">
+						{{item.title}}
+					</view>
+				</div>
+				<view class="u-flex u-row-between" style="padding: 20rpx 28rpx;box-sizing: border-box;">
+					<view class="btn1" @click="onpageshow=false">取消</view>
+					<view class="btn2" @click="enter">确认</view>
+				</view>
+			</view>
+			<view v-show="current==2" class="absolt" v-if="onpageshow">
+				<div style="padding: 8rpx 28rpx 36rpx;box-sizing: border-box;display: flex;flex-wrap: wrap;">
+					<view :class="item3==-1?'itemb':'itema'" @click="changeitem(-1,'')">全部</view>
+					<view :class="item3==index?'itemb':'itema'" v-for="(item,index) in itemlist" :key="index"
+						@click="changeitem(index,item.id)">
+						{{item.title}}
+					</view>
+				</div>
+				<view class="u-flex u-row-between" style="padding: 20rpx 28rpx;box-sizing: border-box;">
+					<view class="btn1" @click="onpageshow=false">取消</view>
+					<view class="btn2" @click="enter">确认</view>
+				</view>
+			</view>
 		</view>
 		<scroll-view :scroll-y='true' style="height: calc(100vh - 200px);">
-			<view class="u-flex u-row-between u-flex-wrap" >
+			<view class="u-flex u-row-between u-flex-wrap">
 				<view class="" @click="toinfo(item.id)" v-for="(item,index) in paperlist" :key="index"
 					style="margin-top: 26rpx;display: inline-block;">
 					<image :src="item.image" style="width: 334rpx;height: 460rpx;" mode=""></image>
@@ -69,12 +95,18 @@
 				item1: -1,
 				onpageshow: false,
 				itemid: '',
+				item2:-1,
+				item3:-1,
+				itemlist1:[],
+				itemlist2:[]
 			};
 		},
 		created(options) {
 			//新书
 			this.getBooksList()
 			this.getBooksLevel()
+			this.getBooksSpeciality()
+			this.getBooksArrangement()
 		},
 		methods: {
 			toinfo(id) {
@@ -88,16 +120,18 @@
 				this.getBooksList()
 			},
 			changeitem(index, id) {
-				this.item1 = index
 				if (this.current == 0) {
 					this.level_id = id
+					this.item1 = index
 				}
 				if (this.current == 1) {
 					this.arrangement_id = id
+					this.item2 = index
 				}
-				this.item1 = index
+				
 				if (this.current == 2) {
 					this.speciality_id = id
+					this.item3 = index
 				}
 			},
 			//级别
@@ -108,12 +142,12 @@
 			},
 			getBooksArrangement() {
 				this.$u.post('api/books/getBooksArrangement', {}).then(res => {
-					this.itemlist = res.data
+					this.itemlist1 = res.data
 				})
 			},
 			getBooksSpeciality() {
 				this.$u.post('api/books/getBooksSpeciality', {}).then(res => {
-					this.itemlist = res.data
+					this.itemlist2 = res.data
 				})
 			},
 			change(index) {
@@ -126,10 +160,10 @@
 					this.getBooksLevel()
 				}
 				if (this.current == 1) {
-					this.getBooksArrangement()
+					this.itemlist = this.itemlist1
 				}
 				if (this.current == 2) {
-					this.getBooksSpeciality()
+					this.itemlist = this.itemlist2
 				}
 			},
 			getBooksList() {

pages.json

@@ -154,6 +154,22 @@
 				"navigationBarTitleText" : "投稿",
 				"enablePullDownRefresh" : false
 			}
+		},
+		{
+			"path" : "pages/mine/privacy",
+			"style" : 
+			{
+				"navigationBarTitleText" : "隐私服务",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/mine/serve",
+			"style" : 
+			{
+				"navigationBarTitleText" : "服务协议",
+				"enablePullDownRefresh" : false
+			}
 		}
 	],
 	"globalStyle": {

pages/index/bookinfo.vue

@@ -87,7 +87,7 @@
 				<!-- 样章 -->
 				<view class="" v-if="specimen_file.length>0">
 					<view class="sample">样章</view>
-					<view @click="tourl(item.url)" class="" v-for="(item,index) in specimen_file" :key="index"
+					<view @click='toyang(item.url)' class="" 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>
@@ -129,14 +129,23 @@
 				</view>
 			</view>
 		</view>
-		<view class="" style=" height: 166rpx;"></view>
+		<view class="" style=" height: 190rpx;"></view>
 		<view class="bottom u-flex">
-			<view class="left" @click="stylebook">样书申请</view>
+			<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.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_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!=0&&datainfo.is_certificate!=0&&datainfo.is_free!=0" @click="tourl(url)"
-				class="right">在线试读</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;">
@@ -147,7 +156,7 @@
 				</view>
 				<view class="" v-if="specimen_file.length>0">
 					<view class="sample">样章</view>
-					<view @click="tourl(item.url)" class="u-row-between" v-for="(item,index) in specimen_file"
+					<view @click="toyang(item.url)" 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>
@@ -161,7 +170,7 @@
 						<view class="">资源包</view>
 					</view>
 					<view class="courseware">电子书</view>
-					<view @click="touser(item.url)" v-for="(item,index) in courseware_file" :key="index" class=""
+					<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>
@@ -170,7 +179,7 @@
 						<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
 					</view>
 					<view class="courseware">课件</view>
-					<view @click="touser(item.url)" v-for="(item,index) in courseware_file" :key="index" class=""
+					<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>
@@ -180,7 +189,7 @@
 					</view>
 					<view class="" v-if="resource_file.length>0">
 						<view class="courseware">资源</view>
-						<view @click="touser(item.url)" v-for="(item,index) in resource_file" :key="index" class=""
+						<view 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>
@@ -235,6 +244,7 @@
 					is_certificate: '', //是否体验中
 					is_pay: '', //是否已购买
 					is_free: '', //是否免费
+					book_type: '',
 				},
 				swiptlist: [],
 				pubdate: '',
@@ -242,7 +252,10 @@
 				resource_file: [],
 				specimen_file: [],
 				price: '', //资源价格,
-				url: ''
+				url: '',
+				card:{
+					free_end_time:''
+				}
 			};
 		},
 		onLoad(options) {
@@ -252,8 +265,7 @@
 		methods: {
 			//跳转下载
 			touser(url) {
-				if (this.datainfo.is_certificate == 0 || this.datainfo.is_pay == 0 || this.datainfo.is_free == 0) {
-					console.log(this.url);
+				if (this.datainfo.is_free == 0 || this.datainfo.is_pay == 0 || this.datainfo.is_certificate == 0) {
 					window.location.href = url
 				} else {
 					uni.showModal({
@@ -262,7 +274,7 @@
 						confirmText: '我知道了',
 						success: function(res) {
 							if (res.confirm) {
-								console.log('用户点击确定');
+
 							} else if (res.cancel) {
 								console.log('用户点击取消');
 							}
@@ -270,8 +282,12 @@
 					});
 				}
 			},
-			tourl(url){
-				window.location.href = url
+			toyang() {
+				if (this.url != '') {
+					window.location.href = this.url
+				} else {
+					this.$u.toast('暂无试读资源')
+				}
 			},
 			//跳转详情
 			toinfo(id) {
@@ -280,17 +296,32 @@
 			},
 			//立即购买
 			orderinfo() {
-				this.$u.post('api/order/createOrder', {
-					goods_id: this.id,
-					type: 0
-				}).then(res => {
-					if (res.code == 1) {
-						uni.setStorageSync('bookid', this.id)
-						uni.navigateTo({
-							url: '/pages/index/orderinfo?id=' + res.data.id + '&&index=' + 1
-						})
-					}
-				})
+				if (uni.getStorageSync("token")) {
+					this.$u.post('api/order/createOrder', {
+						goods_id: this.id,
+						type: 0
+					}).then(res => {
+						if (res.code == 1) {
+							uni.setStorageSync('bookid', this.id)
+							uni.navigateTo({
+								url: '/pages/index/orderinfo?id=' + res.data.id + '&&index=' + 1
+							})
+						}
+					})
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: '请先登录',
+						confirmText: '我知道了',
+						success: function(res) {
+							if (res.confirm) {
+
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+				}
 			},
 			// 系列
 			getSeriesBooks() {
@@ -324,6 +355,7 @@
 					this.courseware_file = res.data.courseware_file
 					this.resource_file = res.data.resource_file
 					this.specimen_file = res.data.specimen_file
+					this.card = res.data.cer
 					if (res.data.specimen_file.length > 0) {
 						this.url = res.data.specimen_file[0].url
 					}
@@ -356,6 +388,22 @@
 </script>
 
 <style lang="scss">
+	.timeback {
+		width: 412rpx;
+		height: 64rpx;
+		background: url('../../static/images/rectangle.png') no-repeat;
+		position: absolute;
+		top: -64rpx;
+		right: 0;
+		background-size: 100%;
+		font-size: 24rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		color: #06A971;
+		line-height: 56rpx;
+		text-align: center;
+	}
+
 	.courseware {
 		font-size: 28rpx;
 		font-family: PingFangSC, PingFang SC;
@@ -546,7 +594,8 @@
 		}
 
 		.right {
-			width: 336rpx;
+			flex: 1;
+			// min-width: 336rpx;
 			height: 88rpx;
 			background: #06A971;
 			border-radius: 12rpx;

pages/index/index.vue

@@ -91,6 +91,9 @@
 		<view v-show="curret==1" style="position: relative;z-index: 1;margin-top: 24rpx;" class="">
 			<ty-paper ref='paper'></ty-paper>
 		</view>
+		<view v-show="curret==2" style="position: relative;z-index: 1;margin-top: 24rpx;" class="">
+			<ty-electronic ref='electronic'></ty-electronic>
+		</view>
 		<view v-if="curret==3" style="position: relative;z-index: 1;margin-top: 24rpx;" class="">
 			<ty-video></ty-video>
 		</view>

pages/index/video.vue

@@ -25,8 +25,8 @@
 						<view class="titles" style="margin-top: 0;">
 							课程介绍
 						</view>
-						<view class="text-info">
-							{{video_desc}}
+						<view class="text-info" v-html="video_desc">
+							<!-- {{video_desc}} -->
 						</view>
 					</view>
 					<view class="" style="height:160rpx;"></view>

pages/login/login.vue

@@ -75,6 +75,7 @@ color: #222222;opacity: 0.4;' placeholder='请输入密码' v-model="password" t
 				code: '',
 				password: '',
 				tips: '',
+				seconds: ''
 			};
 		},
 		methods: {

pages/mine/abount.vue

@@ -1,6 +1,6 @@
 <template>
-	<view>
-		
+	<view class="page" >
+		<view class="" v-html="content"></view>
 	</view>
 </template>
 
@@ -8,12 +8,33 @@
 	export default {
 		data() {
 			return {
-				
+				content:''
 			};
+		},
+		onLoad() {
+			this.getHelpConfig()
+		},
+		methods:{
+			getHelpConfig(){
+				this.$u.post('/api/common/getHelpConfig').then(res=>{
+					console.log(res);
+					// this.content = res.data[1].value
+					const a = new RegExp('style=""', 'gi')
+					var content = res.data[1].value.replace(a, `styles`)
+					const regex = new RegExp('<img', 'gi')
+					this.content = content.replace(regex, `<img style="max-width: 100%; height: auto"`)
+				})
+			}
 		}
 	}
 </script>
 
 <style lang="scss">
-
+.page{
+	font-size: 28rpx;
+	font-family: SFPro, SFPro;
+	font-weight: 400;
+	color: #333333;
+	padding:24rpx 28rpx  
+}
 </style>

pages/mine/mine.vue

@@ -9,10 +9,10 @@
 			</view>
 		</view>
 		<view class="pad">
-			<view v-if="login" class="unlogin" @click="tologin">
+			<view v-if="login" class="unlogin">
 				{{mine.username}}
 			</view>
-			<view v-else class="unlogin">
+			<view v-else class="unlogin" @click="tologin">
 				登录/注册
 			</view>
 			<view class="order u-flex u-row-between" @click="toorder">

pages/mine/privacy.vue

@@ -0,0 +1,40 @@
+<template>
+	<view class="page" >
+		<view class="" v-html="content"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				content:''
+			};
+		},
+		onLoad() {
+			this.getHelpConfig()
+		},
+		methods:{
+			getHelpConfig(){
+				this.$u.post('/api/common/getHelpConfig').then(res=>{
+					console.log(res);
+					// this.content = res.data[1].value
+					const a = new RegExp('style=""', 'gi')
+					var content = res.data[2].value.replace(a, `styles`)
+					const regex = new RegExp('<img', 'gi')
+					this.content = content.replace(regex, `<img style="max-width: 100%; height: auto"`)
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+.page{
+	font-size: 28rpx;
+	font-family: SFPro, SFPro;
+	font-weight: 400;
+	color: #333333;
+	padding:24rpx 28rpx  
+}
+</style>

pages/mine/problem.vue

@@ -1,14 +1,14 @@
 <template>
 	<view class="page">
-		<view class="">
-			<view class="u-flex">
+		<view class="" v-html='content'>
+<!-- 			<view class="u-flex">
 				<view class="icon">
 				</view>
 				<text class="title">关于怎样才能注册账号？</text>
 			</view>
 			<view class="font1">
 				1.打开百度爱采购首页（b2b.baid
-			</view>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -17,8 +17,23 @@
 	export default {
 		data() {
 			return {
-
+				content: ''
 			};
+		},
+		onLoad() {
+			this.getHelpConfig()
+		},
+		methods: {
+			getHelpConfig() {
+				this.$u.post('/api/common/getHelpConfig').then(res => {
+					console.log(res);
+					// this.content = res.data[1].value
+					const a = new RegExp('style=""', 'gi')
+					var content = res.data[0].value.replace(a, `styles`)
+					const regex = new RegExp('<img', 'gi')
+					this.content = content.replace(regex, `<img style="max-width: 100%; height: auto"`)
+				})
+			}
 		}
 	}
 </script>

pages/mine/serve.vue

@@ -0,0 +1,40 @@
+<template>
+	<view class="page" >
+		<view class="" v-html="content"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				content:''
+			};
+		},
+		onLoad() {
+			this.getHelpConfig()
+		},
+		methods:{
+			getHelpConfig(){
+				this.$u.post('/api/common/getHelpConfig').then(res=>{
+					console.log(res);
+					// this.content = res.data[1].value
+					const a = new RegExp('style=""', 'gi')
+					var content = res.data[3].value.replace(a, `styles`)
+					const regex = new RegExp('<img', 'gi')
+					this.content = content.replace(regex, `<img style="max-width: 100%; height: auto"`)
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+.page{
+	font-size: 28rpx;
+	font-family: SFPro, SFPro;
+	font-weight: 400;
+	color: #333333;
+	padding:24rpx 28rpx  
+}
+</style>

pages/mine/setting.vue

@@ -5,11 +5,11 @@
 				<text class='font'>密码设置</text>
 				<image src="/static/images/return.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
 			</view>
-			<view class="u-flex u-row-between" style='margin-top:64rpx' @click=''>
+			<view class="u-flex u-row-between" style='margin-top:64rpx' @click='privacy'>
 				<text class='font'>隐私服务</text>
 				<image src="/static/images/return.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
 			</view>
-			<view class="u-flex u-row-between" style='margin-top:64rpx' @click=''>
+			<view class="u-flex u-row-between" style='margin-top:64rpx' @click='serve'>
 				<text class='font'>服务协议</text>
 				<image src="/static/images/return.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
 			</view>
@@ -36,6 +36,16 @@
 			};
 		},
 		methods: {
+			serve(){
+				uni.navigateTo({
+					url:'/pages/mine/serve'
+				})
+			},
+			privacy(){
+				uni.navigateTo({
+					url:'/pages/mine/privacy'
+				})
+			},
 			tofor() {
 				uni.navigateTo({
 					url: '/pages/login/forgetPassword'