2.19

components/ty-electronic/ty-electronic.vue

@@ -60,16 +60,16 @@
 				</view>
 			</view>
 		</view>
-		<scroll-view :scroll-y='true' style="height: calc(100vh - 200px);">
+		<scroll-view :scroll-y='true' style="height: calc(100vh - 200px);box-sizing: border-box;">
 			<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;">
+					style="margin-top: 26rpx;display: inline-block;padding-bottom: 20rpx;">
 					<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>
+						<text class="money">¥{{item.price}}</text>
 					</view>
 				</view>
 			</view>
@@ -317,8 +317,8 @@
 		background: #FFFFFF;
 		border-radius: 28rpx 28rpx 0rpx 0rpx;
 		padding: 28rpx 24rpx;
-		// height: 70vh;
-		height: 75.5vh;
+		height: 70vh;
+		// height: 75.5vh;
 	}
 
 	.top {

components/ty-paper/ty-paper.vue

@@ -60,10 +60,10 @@
 				</view>
 			</view>
 		</view>
-		<scroll-view :scroll-y='true' style="height: calc(100vh - 200px);">
+		<scroll-view :scroll-y='true' style="height: calc(100vh - 200px);box-sizing: border-box;">
 			<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;">
+					style="margin-top: 26rpx;display: inline-block;;padding-bottom: 20rpx;">
 					<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>
@@ -305,8 +305,8 @@
 		background: #FFFFFF;
 		border-radius: 28rpx 28rpx 0rpx 0rpx;
 		padding: 28rpx 24rpx;
-		// height: 70vh;
-		height: 75.5vh;
+		height: 70vh;
+		// height: 75.5vh;
 	}
 
 	.top {

components/ty-video/ty-video.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="page u-flex u-row-between">
+	<view class="page5 u-flex u-row-between">
 		<view class="item" v-for="(item,index) in videolist" :key="index" @click="tovideoinfo(item.id)">
 			<image :src="item.image" style="width: 334rpx;height: 204rpx;" mode=""></image>
 			<view class="title u-line-1">{{item.title}}</view>
@@ -59,9 +59,9 @@
 		margin-top: 24rpx;
 	}
 
-	.page {
+	.page5 {
 		width: 750rpx;
-		min-height: 70vh;
+		// min-height: 70vh;
 		background: #FFFFFF;
 		border-radius: 28rpx 28rpx 0rpx 0rpx;
 		padding: 8rpx 28rpx 34rpx;

pages.json

@@ -170,6 +170,14 @@
 				"navigationBarTitleText" : "服务协议",
 				"enablePullDownRefresh" : false
 			}
+		},
+		{
+			"path" : "pages/login/succ",
+			"style" : 
+			{
+				"navigationBarTitleText" : "密码设置",
+				"enablePullDownRefresh" : false
+			}
 		}
 	],
 	"globalStyle": {

pages/index/bookinfo.vue

@@ -11,7 +11,8 @@
 				<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" v-if="datainfo.is_free==1">纸质定价：¥{{datainfo.entity_price}}</view>
+				<view class="item-jian" v-if="datainfo.is_free==1&&datainfo.book_type==0">纸质定价：¥{{datainfo.entity_price}}</view>
+				<view class="item-jian" v-if="datainfo.book_type==1">资源售价：¥{{datainfo.price}}</view>
 			</view>
 		</view>
 		<view class="height"></view>
@@ -99,9 +100,9 @@
 				<view class="">
 					<view class="sample u-flex u-row-between">
 						<view class="">资源包</view>
-						<view v-if="datainfo.is_free==1&&datainfo.book_type==0" class="u-flex">
+						<view v-if="datainfo.is_free==1&&datainfo.is_pay==1&&datainfo.book_type==0" class="u-flex">
 							<view class="selling">资源售价</view>
-							<!-- <view class="selling">纸质售价</view> -->
+							<!-- <view class="selling">纸质售价</view> -->  
 							<view class="money5">¥{{price}}</view>
 							<view class="button4" @click="orderinfo">付费下载</view>
 						</view>
@@ -149,7 +150,7 @@
 			<!-- 			<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_free==0&&datainfo.is_pay==1" 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"
@@ -185,7 +186,7 @@
 					<view class="sample u-flex u-row-between">
 						<view class="">资源包</view>
 					</view>
-					<view class="" v-if="ebook_file.length>0">  
+					<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;">
@@ -272,7 +273,7 @@
 				courseware_file: [],
 				resource_file: [],
 				specimen_file: [],
-				ebook_file:[],
+				ebook_file: [],
 				price: '', //资源价格,
 				url: '',
 				card: {
@@ -388,7 +389,6 @@
 						obj.image = item
 						return obj
 					})
-					console.log(arr);
 					this.list1 = arr
 				})
 			},
@@ -406,9 +406,13 @@
 				}
 			},
 			stylebook() {
-				uni.navigateTo({
-					url: '/pages/index/stylebook?id=' + this.id
-				})
+				if (uni.getStorageSync('token')) {
+					uni.navigateTo({
+						url: '/pages/index/stylebook?id=' + this.id
+					})
+				} else {
+					this.$u.toast('请登录后操作')
+				}
 			}
 		}
 	}

pages/index/contribute.vue

@@ -86,7 +86,7 @@
 				</view>
 				<view class="box u-flex" style="padding: 0 28rpx;" @click="show=true">
 					<image src="/static/images/calendar.png" style="width: 44rpx;height: 44rpx;" mode=""></image>
-					<u-calendar v-model="show" mode="date" @change="change"></u-calendar>
+					<u-calendar max-date='3000-01-01' v-model="show" mode="date" @change="change"></u-calendar>
 					<input v-model="from.last_publish_time" :disabled="true" type="text"
 						style="width: 100%;margin-left: 20rpx;" />
 				</view>

pages/index/index-search.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="tap">
-		<view class="">
-			<u-navbar :placeholder='true' :fixed='true'>
+		<view class="" >
+			<u-navbar height='55' :placeholder='true' :fixed='true' >
 				<u-search placeholder="请输入书名、作者搜索" v-model="keyword1" :show-action="false"
 					@search="tosearch(1)"></u-search>
 			</u-navbar>
@@ -36,7 +36,9 @@
 			<view class="list1">
 				<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="" style="width: 239rpx;">
+						<image :src="item.image" style="width: 239rpx;height: 240rpx;" mode=""></image>
+					</view>
 					<view class="u-flex-col " style="margin-left: 20rpx;height: 240rpx;padding: 12rpx 0;
 			justify-content: space-between;">
 						<view class="">
@@ -50,9 +52,11 @@
 						</view>
 					</view>
 				</view>
-				<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 @click="toinfo(item.id)" v-for="(item,index) in positionlist" :key="index" class="u-flex"
+					style="margin-top: 28rpx;" v-if="curret==1">
+					<view class="" style="width: 239rpx;">
+						<image :src="item.image" style="width: 239rpx;height: 240rpx;" mode=""></image>
+					</view>
 					<view class="u-flex-col " style="margin-left: 20rpx;height: 240rpx;padding: 12rpx 0;
 			justify-content: space-between;">
 						<view class="">
@@ -66,9 +70,12 @@
 						</view>
 					</view>
 				</view>
-				<view @click="tovideo(item.id)"  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="width: 212rpx;">
+							<image :src="item.image" style="width: 212rpx;height: 128rpx;" mode=""></image>
+						</view>
 						<view class="" style="margin-left: 20rpx;">
 							<view class="title1">{{item.title}}</view>
 							<view class="writer">{{item.lecturer}}</view>
@@ -108,9 +115,9 @@
 			}
 		},
 		methods: {
-			tovideo(id){
+			tovideo(id) {
 				uni.navigateTo({
-					url:"/pages/index/video?id="+id
+					url: "/pages/index/video?id=" + id
 				})
 			},
 			toinfo(id) {
@@ -311,4 +318,7 @@
 	::v-deep .u-content {
 		// padding: 0 0 0 106rpx;
 	}
+	::v-deep .u-navbar-inner{
+		padding-right: 28rpx;
+	}
 </style>

pages/index/index.vue

@@ -3,7 +3,7 @@
 		<image class="back1" src="../../static/images/bj.png" mode=""></image>
 		<view class="index-navbar">
 			<view class="" style="position: relative;">
-				<image class="back1" style="height: 200rpx;" src="../../static/images/bj.png" mode=""></image>
+				<image class="back1" style="height: 200rpx;" src="../../static/images/bj.png" mode="s"></image>
 				<u-navbar title-width='300' title='' :is-back="false" :border-bottom="false"
 					:background="{background:'rgba(0,0,0,0)'}" :isFixed="true">
 					<view class="u-flex u-row-between" style="padding: 0  28rpx ;width: 100vw;">
@@ -38,7 +38,7 @@
 			<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.jump_id,item.jump_type)">
-						<image style="width: 100%;height: 100%;border-radius: 20rpx;" mode="aspectFill"
+						<image style="width: 100%;height: 100%;border-radius: 20rpx;" mode="scaleToFill"
 							:src="item.image"></image>
 					</swiper-item>
 				</swiper>
@@ -60,7 +60,8 @@
 						</view>
 						<view class="bottom1">
 							<text class="ding">定价</text>
-							<text class="money">{{item.entity_price}}</text>
+							<text class="money" v-if="item.book_type==0">{{item.entity_price}}</text>
+							<text class="money" v-if="item.book_type==1">{{item.price}}</text>
 						</view>
 					</view>
 				</view>
@@ -82,7 +83,8 @@
 						</view>
 						<view class="bottom1">
 							<text class="ding">定价</text>
-							<text class="money">{{item.entity_price}}</text>
+							<text class="money" v-if="item.book_type==0">{{item.entity_price}}</text>
+							<text class="money" v-if="item.book_type==1">{{item.price}}</text>
 						</view>
 					</view>
 				</view>
@@ -227,7 +229,7 @@
 
 	.newbox {
 		// width: 702rpx;
-		// min-height: 870rpx;
+		min-height: 870rpx;
 		background: #FFFFFF;
 		border-radius: 16rpx;
 		margin-top: 20rpx;
@@ -264,6 +266,7 @@
 		color: #444444;
 		margin-top: 8rpx;
 		width: 202rpx;
+		height: 34rpx;
 	}
 
 	.author2 {
@@ -342,7 +345,7 @@
 
 	.pad {
 		padding: 0 28rpx;
-		height: 21px;
+		// height: 21px;
 	}
 
 	.one {
@@ -376,7 +379,7 @@
 
 	.page {
 		// padding: 0 28rpx;
-		min-height: 92.5vh;
+		// min-height: 92.5vh;
 		background: rgba(243, 243, 243, 1);
 		position: relative;
 		z-index: 1;

pages/index/orderinfo.vue

@@ -20,8 +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,bbb) in orderlist"
+				:key="bbb">
 				<view class="box">
 					<image :src="item.good_item.image" style="width: 200rpx;height: 160rpx;" mode=""></image>
 				</view>

pages/index/video.vue

@@ -102,6 +102,7 @@
 			this.getVideoInfo()
 		},
 		methods: {
+			// 订阅
 			toorderinfo() {
 				if (uni.getStorageSync("token")) {
 					this.$u.post('api/order/createOrder', {

pages/login/changePasswoed.vue

@@ -5,19 +5,16 @@
 			<u-input placeholder-style='font-size: 32rpx;
 			font-family: PingFangSC, PingFang SC;
 			font-weight: 400;
-			color: #222222;opacity: 0.5;' placeholder='密码6-20位，须包含数字、字母' v-model="phone" type="text" :border="false"
+			color: #222222;opacity: 0.5;' placeholder='密码6-20位，须包含数字、字母' v-model="password" type="text" :border="false"
 				:clearable='false' />
 		</view>
 		<view class="input u-flex">
 			<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' />
-			<view class="code">
-				获取验证码
-			</view>
+			color: #222222;opacity: 0.5;' placeholder='再次确认密码' v-model="newpassword" type="text" :border="false" :clearable='false' />
 		</view>
-		<view class="button" @click="">
+		<view class="button" @click="tosucc">
 			提交
 		</view>
 	</view>
@@ -27,12 +24,30 @@
 	export default {
 		data() {
 			return {
-				code: '',
-				phone: ''
+				newpassword:'',
+				password:'',
 			};
 		},
+		onLoad(options) {
+			this.mobile = options.mobile
+		},
 		methods: {
-
+			tosucc(){
+				if(this.newpassword==this.newpassword){
+					this.$u.post('api/user/resetpwd',{
+						mobile:this.mobile,
+						newpassword:this.newpassword,
+					}).then(res=>{
+						if(res.code==1){
+							uni.navigateTo({
+								url:'./succ'
+							})
+						}
+					})
+				}else{
+					this.$u.toast('两次密码应保持一致')
+				}
+			},
 		}
 	}
 </script>
@@ -55,7 +70,7 @@
 		height: 84rpx;
 		background: #06A971;
 		border-radius: 8rpx;
-		opacity: 0.5;
+		// opacity: 0.5;
 		text-align: center;
 		margin-top: 46rpx;
 		line-height: 84rpx;

pages/login/forgetPassword.vue

@@ -5,21 +5,22 @@
 			<u-input placeholder-style='font-size: 32rpx;
 			font-family: PingFangSC, PingFang SC;
 			font-weight: 400;
-			color: #222222;opacity: 0.5;' placeholder='手机号' v-model="resultPhone" type="text" :border="false" 
-				:clearable='false' :disabled="true" />
+			color: #222222;opacity: 0.5;' placeholder='手机号' v-model="resultPhone" type="text" :border="false"
+				:clearable='false' />
 		</view>
 		<view class="input u-flex">
 			<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'  />
-			<view class="code">
-				获取验证码
+			color: #222222;opacity: 0.5;' placeholder='请输入验证码' v-model="code" type="text" :border="false" :clearable='false' />
+			<view class="code" @click="getCode">
+				{{tips}}
 			</view>
 		</view>
 		<view class="button" @click="changePasswoed">
 			确认
 		</view>
+		<u-verification-code :seconds="seconds" ref="uCode" @change="codeChange"></u-verification-code>
 	</view>
 </template>
 
@@ -29,7 +30,9 @@
 			return {
 				code: '',
 				phone: '',
-				resultPhone: ''
+				resultPhone: '',
+				tips: '',
+				seconds: ''
 			};
 		},
 		onLoad() {
@@ -38,9 +41,12 @@
 			}
 		},
 		methods: {
+			codeChange(text) {
+				this.tips = text;
+			},
 			changePasswoed() {
 				uni.navigateTo({
-					url: '/pages/login/changePasswoed'
+					url: '/pages/login/changePasswoed?mobile=' + this.phone
 				})
 			},
 			getUserinfo() {
@@ -48,7 +54,32 @@
 					this.phone = res.mobile
 					this.resultPhone = res.phone_r
 				})
-			}
+			},
+			getCode() {
+				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('倒计时结束后再发送');
+				}
+			},
 		}
 	}
 </script>
@@ -71,7 +102,7 @@
 		height: 84rpx;
 		background: #06A971;
 		border-radius: 8rpx;
-		opacity: 0.5;
+		// opacity: 0.5;
 		text-align: center;
 		margin-top: 46rpx;
 		line-height: 84rpx;

pages/login/login.vue

@@ -98,10 +98,6 @@ color: #222222;opacity: 0.4;' placeholder='请输入密码' v-model="password" t
 				})
 			},
 			getCode() {
-				// if (!this.$u.test.mobile(this.phone)) {
-				// 	this.$u.toast("请输入正确的手机号")
-				// 	return
-				// }
 				if (!this.checked) {
 					this.$u.toast('请先勾选协议')
 					return
@@ -112,20 +108,20 @@ color: #222222;opacity: 0.4;' placeholder='请输入密码' v-model="password" t
 						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)
-					// 	}
-					// })
+					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/succ.vue

@@ -0,0 +1,104 @@
+<template>
+	<view>
+		<view class="u-flex-col" style="justify-content: flex-end;align-items: center;margin-top: 100rpx;">
+			<image src="/static/images/success.png" style="width: 86rpx;height: 86rpx;" mode=""></image>
+			<view class="success">恭喜！密码重置成功</view>
+			<view class="fonta" style="margin-top: 26rpx;">
+				<text>请牢记新密码，</text>
+				<text style="color:rgba(6, 169, 113, 1) ;">{{num}}s</text>
+				<text>后自动跳转至首页</text>
+			</view>
+			<view class="button" @click="accomplish">
+				返回首页
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				bookid: '',
+				order_on: '',
+				total_price: '',
+				num: 3,
+				timer: null,
+			};
+		},
+		onLoad(options) {
+			this.setTime()
+		},
+		beforeDestroy() {
+		  clearInterval(this.timer);　　// 清除定时器
+		  this.timer = null;
+		},
+		methods: {
+			accomplish() {
+				uni.switchTab({
+					url: '/pages/index/index'
+				})
+			},
+			setTime() {
+				 this.timer = setInterval(() => {
+					this.num--
+					if (this.num == 0) {
+						this.accomplish()
+					}
+				}, 1000)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.fonta {
+		font-size: 24rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		color: #929292;
+		margin-top: 36px;
+	}
+
+	.one {
+		font-size: 26rpx;
+		font-family: SFPro, SFPro;
+		font-weight: 400;
+		color: #222222;
+	}
+
+	.button {
+		width: 286rpx;
+		height: 88rpx;
+		background: #F5F5F5;
+		border-radius: 8rpx;
+		border: 2rpx solid rgba(151, 151, 151, 0.3);
+		font-size: 32rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+		margin-top: 168rpx;
+		line-height: 88rpx;
+		text-align: center;
+	}
+
+	.order {
+		margin-top: 62rpx;
+	}
+
+	.success {
+		font-size: 36rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		color: #222222;
+		margin-top: 60rpx;
+	}
+
+	.money {
+		font-size: 26rpx;
+		font-family: JDZhengHT, JDZhengHT;
+		font-weight: 400;
+		color: #222222;
+	}
+</style>

pages/mine/card.vue

@@ -90,7 +90,7 @@
 				this.$u.post('/api/certificate/useCertificate', {
 					id: id
 				}).then(res => {
-					this.$u.toast(res.msg)
+					// this.$u.toast(res.msg)
 					setTimeout(() => {
 						uni.navigateTo({
 							url: '/pages/index/bookinfo?id=' + bookid

pages/mine/myorder.vue

@@ -32,7 +32,7 @@
 					</view>
 					<view class="u-flex " style="margin-top: 28rpx;justify-content: end;">
 						<view v-if="item.status ==0" class="cancel" @click="cancel(item.id)">取消订单</view>
-						<view v-if="item.status ==0" class="pay" style="color: #fff;">立即付款</view>
+						<view v-if="item.status ==0" class="pay" style="color: #fff;" @click="pay(item.id)">立即付款</view>
 						<view v-if="item.status ==-1" class=" cancel" @click="delect(item.id)">删除订单</view>
 						<view v-if="item.status ==1||item.status ==0" class="details cancel"
 							@click="orderinfo(item.id)">查看详情</view>
@@ -76,6 +76,11 @@
 			}
 		},
 		methods: {
+			pay(id){
+				uni.navigateTo({
+					url:'/pages/index/orderinfo?id='+id
+				})
+			},
 			orderinfo(id) {
 				uni.navigateTo({
 					url: '/pages/success?id=' + id

pages/success.vue

@@ -8,7 +8,10 @@
 				<view class="back"></view>
 			</view>
 		</view>
-		<view class="success">
+		<view class="success" v-if="info.paytime==null">
+			待支付
+		</view>
+		<view class="success" v-else>
 			交易已完成
 		</view>
 		<view class="order">
@@ -59,7 +62,7 @@
 			</view>
 			<view class="order1">
 				<text class="info1">支付方式</text>
-				<text class="math">微信支付</text>
+				<text class="math">{{info.pay_type_text||'未'}}支付</text>
 			</view>
 		</view>
 	</view>
@@ -75,8 +78,9 @@
 					order_on: '',
 					total_price: '',
 					createtime:'',
-					paytime:'',
-					type:''
+					paytime:null,
+					type:'',
+					pay_type_text:''
 				}
 			};
 		},

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.1124f349.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.cccec22e.js></script></body></html>