ryx

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "日月峡",
-    "appid" : "__UNI__AE80BEC",
+    "appid" : "__UNI__042D4B1",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pages/index/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="">
 		<view class="swiper">
-			<u-swiper :list="swiper" keyName="url" height="100%"></u-swiper>
+			<u-swiper :list="swiper" keyName="url" height="100%" :autoplay="false"></u-swiper>
 			<view class="banner">
 				<view class="logo">
 					<image :src="msg.logo" mode="widthFix"></image>

pages/invoice/applyInvoice.vue

@@ -30,17 +30,24 @@
 					<view :class="state==1?'btn-item-active':'btn-item'" @click="state=1">个人</view>
 			   	</view>
 			
-			    
-				<u-form-item  label="发票抬头" prop="presonalname" borderBottom  ref="item1" labelWidth="160rpx" v-if="state==1" :required="true">
-					<u-input v-model="presonalname"  disabledColor="#ffffff" placeholder="请输入个人姓名" border="none" placeholderStyle="color: #555555">
-						<template slot="suffix"><text @click="goinvoiceList">抬头薄</text> </template>
-					</u-input>
-				</u-form-item>
-				<u-form-item  label="发送邮箱" prop="prsonalemail" borderBottom  ref="item1" labelWidth="160rpx" v-if="state==1" :required="true">
-					<u-input v-model="prsonalemail"  disabledColor="#ffffff" placeholder="请输入接收邮箱" border="none" placeholderStyle="color: #555555">
-						<template slot="suffix"><text @click="goinvoiceList"></text> </template>
-					</u-input>
-				</u-form-item>
+			    <view v-if="state==1">
+					<u-form-item  label="发票抬头" prop="presonalname" borderBottom  ref="item1" labelWidth="160rpx"  :required="true">
+						<u-input v-model="presonalname"  disabledColor="#ffffff" placeholder="请输入个人姓名" border="none" placeholderStyle="color: #555555">
+							<template slot="suffix"><text @click="goinvoiceList">抬头薄</text> </template>
+						</u-input>
+					</u-form-item>
+					<u-form-item  label="邮寄地址" prop="prsonalemail" borderBottom  ref="item1" labelWidth="160rpx"  :required="true">
+						<u-input v-model="prsonalemail"  disabledColor="#ffffff" placeholder="请输入发票邮寄地址" border="none" placeholderStyle="color: #555555">
+							<template slot="suffix"><text @click="goinvoiceList"></text> </template>
+						</u-input>
+					</u-form-item>
+					<view class="" style="margin: 30rpx 0;" >
+						<!-- <text style="color: red;">*</text> -->
+						<text>备注信息（选填）</text>
+					</view>
+					<u--textarea v-model="memo" :customStyle="{'background':'#F4F4F4','border-radius': '0px 32rpx 8rpx 32rpx'}" placeholder="输入备注信息" placeholderStyle="color: #555555"  height=120 border="none" :required="true"></u--textarea>
+				</view>
+				
 				<view class="" v-if="state==0">
 					<u-form-item  label="发票抬头" prop="userInfo.name" borderBottom  ref="item1" labelWidth="160rpx" :required="true">
 						<u-input v-model="model1.userInfo.name"  disabledColor="#ffffff" :placeholder="state==0?'请输入公司名称':'请输入个人姓名'" border="none" placeholderStyle="color: #555555">
@@ -63,15 +70,18 @@
 						<u--input v-model="model1.userInfo.bank_no"  disabledColor="#ffffff" placeholder="请输入银行账号" border="none" placeholderStyle="color: #555555" type="number"></u--input>
 						
 					</u-form-item>
-					<u-form-item   label="发送邮箱" prop="userInfo.mail" borderBottom  ref="item1" labelWidth="160rpx" :required="true">
-						<u--input v-model="model1.userInfo.mail"  disabledColor="#ffffff" placeholder="请输入接收邮箱" placeholderStyle="color: #555555" border="none" ></u--input>
+					<u-form-item   label="邮寄地址" prop="userInfo.email" borderBottom  ref="item1" labelWidth="160rpx" :required="true">
+						<u--input v-model="model1.userInfo.email"  disabledColor="#ffffff" placeholder="请输入发票邮寄地址" placeholderStyle="color: #555555" border="none" ></u--input>
+						
 					</u-form-item>
+					<view class="" style="margin: 30rpx 0;" >
+						<!-- <text style="color: red;">*</text> -->
+						<text>备注信息（选填）</text>
+					</view>
+					<u--textarea v-model="model1.userInfo.memo" :customStyle="{'background':'#F4F4F4','border-radius': '0px 32rpx 8rpx 32rpx'}" placeholder="输入备注信息" placeholderStyle="color: #555555"  height=120 border="none" :required="true"></u--textarea>
 				</view>
 
-				<view class="" style="margin: 30rpx 0;">
-					备注信息（选填）
-				</view>
-				<u--textarea v-model="model1.userInfo.memo" :customStyle="{'background':'#F4F4F4','border-radius': '0px 32rpx 8rpx 32rpx'}" placeholder="输入备注信息" placeholderStyle="color: #555555"  height=120 border="none"></u--textarea>
+				
 			</u--form>
 		</view>
 		<view class="" style="margin-bottom: 144rpx;"></view>
@@ -89,6 +99,7 @@
 				showSex:false,
 				presonalname:'',
 				prsonalemail:'',
+				memo:'',
 				ids:[],
 				total:0,
 				rules:{
@@ -154,6 +165,7 @@
 				}else{
 					this.state=1
 					this.presonalname=userInfo.name
+					this.memo=userInfo.memo
 				}
 			}
 		},
@@ -180,27 +192,46 @@
 					var form = this.model1.userInfo
 					 this.model1.userInfo.orders=this.ids
 					form.type=2
+					if(!form.tax_no){
+						this.$toast("请输入纳税税号")
+						return
+					}
+					if(!form.email){
+						this.$toast("请输入邮箱号码")
+						return
+					}
+					if(!form.name){
+						this.$toast("请输入公司名称")
+						return
+					}
+					// if(!form.memo){
+					// 	this.$toast("请输入备注信息")
+					// 	return
+					// }
 				}else{
 					var form={
 						type:1,
 						name:this.presonalname,
 						email:this.prsonalemail,
-						orders:this.ids
+						orders:this.ids,
+						memo:this.memo
+					}
+					if(!form.name){
+						this.$toast("请输入邮箱号码")
+						return
+					}
+					if(!form.email){
+						this.$toast("请输入名称")
+						return
 					}
+					// if(!form.memo){
+					// 	this.$toast("请输入备注信息")
+					// 	return
+					// }
 				}
 				this.$delete(form,'id');
-				if(!form.email&&!form.prsonalemail){
-					this.$toast("请输入邮箱号码")
-					return
-				}
-				if(!form.presonalname&&!form.name){
-					this.$toast("请输入名称")
-					return
-				}
-				if(!form.tax_no){
-					this.$toast("请输入纳税税号")
-					return
-				}
+				
+				
 				uni.$u.http.post('/api/bill/add', form, {
 					custom: {
 						auth: true

pages/invoice/invoiceAdmin.vue

@@ -62,16 +62,14 @@
 			}
 		},
 		onLoad(o) {
-			console.log(o)
 			if (o.obj) {
 				let obj = JSON.parse(o.obj)
 				// console.log(obj, 888)
 				this.choose = obj.choose
 				this.state = obj.state
-				console.log(obj)
 			}
 			
-			this.init()
+			
 		},
 		onShow() {
 			let token = uni.getStorageSync("token")
@@ -89,10 +87,8 @@
 
 				return false
 			}
-			// uni.showLoading({
-			// 	title: '加载中'
-			// });
-			// this.init()
+			this.init()
+			
 		},
 		methods: {
 			init() {
@@ -135,7 +131,6 @@
 			},
 			makSure() {
 				let obj = this.list[this.current]
-				console.log(obj,88888)
 				uni.navigateTo({
 					url: '/pages/invoice/applyInvoice?obj=' + JSON.stringify(obj)
 				})

pages/invoice/invoiceEndit.vue

@@ -19,22 +19,32 @@
 					<view :class="model1.userInfo.type==1?'btn-item-active':'btn-item'" @click="model1.userInfo.type=1">
 						个人</view>
 				</view>
-
-				<u-form-item label="发票抬头" prop="personalname" borderBottom ref="item1" labelWidth="160rpx" :required="true"  v-if="model1.userInfo.type==1">
-					<u--input v-model="personalname" disabledColor="#ffffff"
-						placeholder="请输入个人姓名" border="none"
-						placeholderStyle="color: #555555" ></u--input>
-				</u-form-item>
+				<view v-if="model1.userInfo.type==1">
+					<u-form-item label="发票抬头" prop="presonalname" borderBottom ref="item1" labelWidth="160rpx"
+						:required="true">
+						<u--input v-model="presonalname" disabledColor="#ffffff" placeholder="请输入个人姓名" border="none"
+							placeholderStyle="color: #555555"></u--input>
+					</u-form-item>
+					<view class="" style="margin: 30rpx 0;">
+						<!-- <text style="color: red;">*</text> -->
+						<text>备注信息（选填）</text>
+					</view>
+					<u--textarea v-model="memo"
+						:customStyle="{'background':'#F4F4F4','border-radius': '0px 32rpx 8rpx 32rpx'}"
+						placeholder="输入备注信息" placeholderStyle="color: #555555" height=120
+						border="none" :required="true"></u--textarea>
+				</view>
 
 				<view class="" v-if="model1.userInfo.type==2">
-					<u-form-item label="发票抬头" prop="userInfo.name" borderBottom ref="item1" labelWidth="160rpx" :required="true">
-						<u--input v-model="model1.userInfo.name" disabledColor="#ffffff"
-							placeholder="请输入公司名称" border="none"
-							placeholderStyle="color: #555555" ></u--input>
+					<u-form-item label="发票抬头" prop="userInfo.name" borderBottom ref="item1" labelWidth="160rpx"
+						:required="true">
+						<u--input v-model="model1.userInfo.name" disabledColor="#ffffff" placeholder="请输入公司名称"
+							border="none" placeholderStyle="color: #555555"></u--input>
 					</u-form-item>
-					<u-form-item label="纳税税号" prop="userInfo.tax_no" borderBottom ref="item1" labelWidth="160rpx" :required="true">
+					<u-form-item label="纳税税号" prop="userInfo.tax_no" borderBottom ref="item1" labelWidth="160rpx"
+						:required="true">
 						<u--input v-model="model1.userInfo.tax_no" disabledColor="#ffffff" placeholder="请输入税号"
-							border="none" placeholderStyle="color: #555555" ></u--input>
+							border="none" placeholderStyle="color: #555555"></u--input>
 					</u-form-item>
 					<u-form-item label="注册地址" prop="userInfo.address" borderBottom ref="item1" labelWidth="160rpx">
 						<u--input v-model="model1.userInfo.address" disabledColor="#ffffff" placeholder="请输入注册地址"
@@ -46,12 +56,19 @@
 					</u-form-item>
 					<u-form-item label="开户银行" prop="userInfo.bank_name" borderBottom ref="item1" labelWidth="160rpx">
 						<u--input v-model="model1.userInfo.bank_name" disabledColor="#ffffff" placeholder="请输入开户银行"
-							border="none" placeholderStyle="color: #555555" ></u--input>
+							border="none" placeholderStyle="color: #555555"></u--input>
 					</u-form-item>
 					<u-form-item label="银行账号" prop="userInfo.bank_no" borderBottom ref="item1" labelWidth="160rpx">
 						<u--input v-model="model1.userInfo.bank_no" disabledColor="#ffffff" placeholder="请输入银行账号"
 							border="none" placeholderStyle="color: #555555" type="number"></u--input>
 					</u-form-item>
+					<view class="" style="margin: 30rpx 0;">
+						<!-- <text style="color: red;">*</text> -->
+						<text>备注信息（选填）</text>
+					</view>
+					<u--textarea v-model="model1.userInfo.memo" placeholder="输入备注信息"
+						:customStyle="{'background':'#F4F4F4','border-radius': '0px 32rpx 8rpx 32rpx'}"
+						placeholderStyle="color: #555555" height=120 border="none"></u--textarea>
 				</view>
 
 				<!-- <u-form-item  v-if="index==0" label="发送邮箱" prop="userInfo.idcard" borderBottom  ref="item1" labelWidth="160rpx">
@@ -59,18 +76,13 @@
 					</u-form-item> -->
 
 
-				<view class="" style="margin: 30rpx 0;">
-					备注信息（选填）
-				</view>
-				<u--textarea v-model="model1.userInfo.memo" placeholder="输入备注信息"
-					:customStyle="{'background':'#F4F4F4','border-radius': '0px 32rpx 8rpx 32rpx'}"
-					placeholderStyle="color: #555555" height=120 border="none"></u--textarea>
+
 			</u--form>
 		</view>
 		<view class="tips">
 			<u-icon name="error-circle" color="##999999 " size="28"></u-icon>
 			<view class="" style="margin-left:18rpx;">
-				如果购买方为企业，有税号XXX
+				如购买方为企业，请填写正确税号
 			</view>
 		</view>
 		<view class="" style="margin-bottom: 164rpx;"></view>
@@ -91,7 +103,8 @@
 				// 编辑与添加状态 0保存 1添加
 				state: 0,
 				showSex: false,
-				personalname:'',
+				presonalname: '',
+				memo: "",
 				model1: {
 					userInfo: {
 						name: '',
@@ -104,7 +117,7 @@
 						memo: "",
 					},
 				},
-				rules:{
+				rules: {
 					'userInfo.name': {
 						type: 'string',
 						required: true,
@@ -134,8 +147,8 @@
 				let info = JSON.parse(options.info)
 				if (info.type == "个人") {
 					info.type = 1
-					this.personalname=info.name
-					info.name=''
+					this.presonalname = info.name
+					info.name = ''
 				} else if (info.type == "企业") {
 					info.type = 2
 				}
@@ -154,9 +167,36 @@
 		methods: {
 			// 修改
 			editsubmit() {
-				let form = this.model1.userInfo
-
-				console.log(form, "<=================修改")
+				if (this.model1.userInfo.type == 2) {
+					var form = this.model1.userInfo
+					if (!form.tax_no) {
+						this.$toast("请输入纳税税号")
+						return
+					}
+				
+					if (!form.name) {
+						this.$toast("请输入公司名称")
+						return
+					}
+					// if (!form.memo) {
+					// 	this.$toast("请输入备注信息")
+					// 	return
+					// }
+				} else {
+					var form = {
+						type: 1,
+						name: this.presonalname,
+						memo: this.memo
+					}
+					if (!form.name) {
+						this.$toast("请输入名称")
+						return
+					}
+					// if (!form.memo) {
+					// 	this.$toast("请输入备注信息")
+					// 	return
+					// }
+				}
 				uni.$u.http.post('/api/invoice/edit', form, {
 					custom: {
 						auth: true
@@ -180,10 +220,35 @@
 			// 添加抬头
 			submit() {
 				uni.showLoading()
-				let form = this.model1.userInfo
-				if(form.type==1){
-					form=''
-					form.name=this.personalname
+				if (this.model1.userInfo.type == 2) {
+					var form = this.model1.userInfo
+					if (!form.tax_no) {
+						this.$toast("请输入纳税税号")
+						return
+					}
+
+					if (!form.name) {
+						this.$toast("请输入公司名称")
+						return
+					}
+					// if (!form.memo) {
+					// 	this.$toast("请输入备注信息")
+					// 	return
+					// }
+				} else {
+					var form = {
+						type: 1,
+						name: this.presonalname,
+						memo: this.memo
+					}
+					if (!form.name) {
+						this.$toast("请输入名称")
+						return
+					}
+					// if (!form.memo) {
+					// 	this.$toast("请输入备注信息")
+					// 	return
+					// }
 				}
 				uni.$u.http.post('/api/invoice/add', form, {
 					custom: {

pages/invoice/invoiceHistory.vue

@@ -32,9 +32,9 @@
 				{{item.created_at.slice(0,10)}}
 			</view>
 		</view>
-		<view class="btn" @click.stop="sendEmail(item.id)" v-if="item.status!==1">
+		<!-- <view class="btn" @click.stop="sendEmail(item.id)" v-if="item.status!==1&&item!==5">
 			发送至邮箱
-		</view>
+		</view> -->
 	</view>
 	
 	</view>

pages/invoice/invoicedetail.nvue

@@ -30,17 +30,27 @@
 					<view :class="state==1?'btn-item-active':'btn-item'" @click="">个人</view>
 			   	</view>
 			
-			    
-				<u-form-item  label="发票抬头" prop="presonalname" borderBottom  ref="item1" labelWidth="160rpx" v-if="state==1" :required="true">
-					<u-input v-model="presonalname"  disabledColor="#ffffff" placeholder="请输入个人姓名" border="none" placeholderStyle="color: #555555" disabled="true">
-						<!-- <template slot="suffix"><text @click="goinvoiceList">抬头薄</text> </template> -->
-					</u-input>
-				</u-form-item>
-				<u-form-item  label="发送邮箱" prop="prsonalemail" borderBottom  ref="item1" labelWidth="160rpx" v-if="state==1" :required="true">
-					<u-input v-model="prsonalemail"  disabledColor="#ffffff" placeholder="请输入接收邮箱" border="none" placeholderStyle="color: #555555" disabled="true">
-						<template slot="suffix"><text @click="goinvoiceList"></text> </template>
-					</u-input>
-				</u-form-item>
+			    <view  v-if="state==1">
+					<u-form-item  label="发票抬头" prop="presonalname" borderBottom  ref="item1" labelWidth="160rpx" :required="true">
+						<u-input v-model="presonalname"  disabledColor="#ffffff" placeholder="无" border="none" placeholderStyle="color: #555555" disabled="true">
+							<!-- <template slot="suffix"><text @click="goinvoiceList">抬头薄</text> </template> -->
+						</u-input>
+					</u-form-item>
+					<u-form-item  label="邮寄地址" prop="prsonalemail" borderBottom  ref="item1" labelWidth="160rpx"  :required="true">
+						<u-input v-model="prsonalemail"  disabledColor="#ffffff" placeholder="无" border="none" placeholderStyle="color: #555555" disabled="true">
+							<template slot="suffix"><text @click="goinvoiceList"></text> </template>
+						</u-input>
+					</u-form-item>
+					<view class="" style="margin: 30rpx 0;">
+						<!-- <text style="color: red;">*</text> -->
+						<text>备注信息（选填）</text>
+					</view>
+					<u--textarea v-model="memo"
+						:customStyle="{'background':'#F4F4F4','border-radius': '0px 32rpx 8rpx 32rpx'}"
+						placeholder="无" placeholderStyle="color: #555555" height=120
+						border="none" :required="true"></u--textarea>
+				</view>
+				
 				<view class="" v-if="state==0">
 					<u-form-item  label="发票抬头" prop="userInfo.name" borderBottom  ref="item1" labelWidth="160rpx" :required="true">
 						<u-input v-model="model1.userInfo.name"  disabledColor="#ffffff" :placeholder="state==0?'请输入公司姓名':'请输入个人姓名'" border="none" placeholderStyle="color: #555555" disabled="true">
@@ -63,15 +73,18 @@
 						<u--input v-model="model1.userInfo.bank_no"  disabledColor="#ffffff" placeholder="无" border="none" placeholderStyle="color: #555555" type="number" disabled="true"></u--input>
 						
 					</u-form-item>
-					<u-form-item   label="发送邮箱" prop="userInfo.mail" borderBottom  ref="item1" labelWidth="160rpx" :required="true">
+					<u-form-item   label="邮寄地址" prop="userInfo.mail" borderBottom  ref="item1" labelWidth="160rpx" :required="true">
 						<u--input v-model="model1.userInfo.mail"  disabledColor="#ffffff" placeholder="无" placeholderStyle="color: #555555" border="none" disabled="true"></u--input>
 					</u-form-item>
 				</view>
 
 				<view class="" style="margin: 30rpx 0;">
-					备注信息（选填）
+					<!-- <text style="color: red;">*</text> -->
+					<text>备注信息（选填）</text>
 				</view>
-				<u--textarea v-model="model1.userInfo.memo" :customStyle="{'background':'#F4F4F4','border-radius': '0px 32rpx 8rpx 32rpx'}" placeholder="无" placeholderStyle="color: #555555"  height=120 border="none"></u--textarea>
+				<u--textarea v-model="model1.userInfo.memo" placeholder="无"
+					:customStyle="{'background':'#F4F4F4','border-radius': '0px 32rpx 8rpx 32rpx'}"
+					placeholderStyle="color: #555555" height=120 border="none"></u--textarea>
 			</u--form>
 		</view>
 		<view class="bottomall">
@@ -102,6 +115,7 @@
 				showSex:false,
 				presonalname:'',
 				prsonalemail:'',
+				memo:'',
 				ids:[],
 				total:0,
 				rules:{
@@ -165,9 +179,10 @@
 					this.state=0
 				}else{
 					this.state=1
+					this.model1.userInfo=userInfo
 					this.presonalname=userInfo.name
 					this.prsonalemail=userInfo.email
-					this.model1.userInfo.memo=userInfo.memo
+					this.memo=userInfo.memo
 				}
 			}
 		},
@@ -187,43 +202,7 @@
 					delta:1
 				})
 			},
-			submitApply(){
-				uni.showLoading({})
-				if(this.state==0){
-					var form = this.model1.userInfo
-					 this.model1.userInfo.orders=this.ids
-					form.type=2
-				}else{
-					var form={
-						type:1,
-						name:this.presonalname,
-						email:this.prsonalemail,
-						orders:this.ids
-					}
-				}
-				this.$delete(form,'id');
-				// if(!this.$util.email(form.email)){
-				// 	this.$toast("请输入正确的邮箱号码")
-				// 	return
-				// }
-				uni.$u.http.post('/api/bill/add', form, {
-					custom: {
-						auth: true
-					}
-				}).then((res) => {
-					console.log(res)
-					this.$toast("申请成功")
-					setTimeout(() => {
-						uni.navigateTo({
-							url:"/pages/invoice/invoiceList"
-						})
-					}, 1500)
-				
-				}).catch((err) => {
-					uni.hideLoading()
-					this.$toast(err.message)
-				})
-			}
+			
 	    },
 	}
 </script>

pages/login.vue

@@ -73,6 +73,7 @@
 							console.log(res.code, "WXcode");
 							uni.setStorageSync("code",this.wxCode)
 						} else {
+							this.$toast(res.errMsg)
 							console.log('登录失败！' + res.errMsg)
 						}
 					}

pages/order/guide.vue

@@ -162,7 +162,7 @@
 		.image {
 			width: 200rpx;
 			height: 200rpx;
-			background-color: pink;
+			// background-color: pink;
 			margin: 40rpx auto 73rpx;
 
 			image {

pages/order/order.vue

@@ -388,13 +388,13 @@
 		onLoad(o) {
 			if (o.state) {
 				this.state = o.state
-				if (this.state == 1) {
+				if (this.state == 0) {
 					this.current = 0
-				} else if (this.state == 2) {
+				} else if (this.state == 1) {
 					this.current = 1
-				} else if (this.state == 3) {
+				} else if (this.state == 2) {
 					this.current = 2
-				} else if (this.state == 4) {
+				} else if (this.state == 3) {
 					this.current = 3
 				}
 			}

pages/order/orderDetails.vue

@@ -297,7 +297,7 @@
 						signType: res.signType, //固定值
 						paySign: res.paySign, //签名
 						success: function(res) {
-							uni.navigateTo({
+							uni.redirectTo({
 								url: "/pages/order/successpay?id" + that.id
 							})
 							// console.log('success:' + JSON.stringify(res));

pages/travel.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="travelPage">
-		<u-swiper height=500 :list="swiper" :autoplay="false" circular autoplay show-center-play-btn :poster="imgUrl">
+		<u-swiper height=500 :list="swiper"  circular :autoplay="false" show-center-play-btn :poster="imgUrl">
 		</u-swiper>
 		<u-sticky bgColor="#fff">
 			<view class="tags">

pages/travel/contract.vue

@@ -1,7 +1,9 @@
 <template>
 	<view class="content">
 		<view v-for="(item,index) in content" :key="index">
-			<image :src="item" mode="widthFix" lazy-load="true"></image>
+			<scroll-view>
+				<image :src="item" mode="widthFix" lazy-load="true"></image>
+			</scroll-view>
 		</view>
 		<!-- <scroll-view> -->
 			
@@ -38,7 +40,6 @@
 					console.log( err)
 				})
 				
-				
 			}
 		}
 	}

pages/travel/submitOrder.vue

@@ -134,13 +134,14 @@
 				     success: function (res) {
 				         // console.log('success:' + JSON.stringify(res));
 				         console.log("支付成功");
-						 uni.navigateTo({
+						 uni.redirectTo({
 						 	url:"/pages/order/successpay?id="+that.suborder.order_id
 						 })
 				     },
 				     fail: function (err) {
-				         console.log('fail:' + JSON.stringify(err));
-				         console.log("支付失败");
+				        uni.redirectTo({
+				        	url:"/pages/order/orderDetail?id="+that.suborder.order_id
+				        })
 				     }
 				 });
 				 
@@ -250,7 +251,7 @@
 			border-left: 1rpx solid #FFFFFF;
 		}
 		.time {
-			color: #333333;
+			color:red;
 			position: absolute;
 			left: 0;
 			bottom: 105rpx;

pages/travel/travelDetails.vue

@@ -178,8 +178,13 @@
 
 		<!-- <scroll-view  scroll-y="true"  style="height: 90vh;"   scroll-with-animation="true"> -->
 		<view class="model">
-			<u-modal :show="isshow" title="报名前必看" :content='content' showCancelButton @confirm="goadd" @cancel="cancel"
-				confirmColor="#ffffff" style="margin-left: 0;padding-left: 22rpx;"></u-modal>
+			<u-modal :show="isshow" title="报名前必看"  showCancelButton @confirm="goadd" @cancel="cancel"
+				confirmColor="#ffffff" style="margin-left: 0;padding-left: 22rpx;">
+				<view style="height: 560rpx;overflow: auto;">
+					<u-parse :content="content"></u-parse>
+				</view>
+				
+			</u-modal>
 		</view>
 		<!-- </scroll-view> -->
 	</view>
@@ -231,7 +236,7 @@
 				// 模态框
 				isshow: false,
 				// 模态框内容
-				content: '*以上旅游行程在实际执行中可能会根据季节气候、自然环境等不可抗因素进行调整，购买前请知悉。 *如出发地或目的地，有疫情中等风险及以上地区的，可免费转为保留金，保留支付金额，后续预订时以实际预订金额为准。 关于夕阳团的温馨提示： 1、支付完成后，我们将在1个工作日内与您确认是否预订成功。 2、夕阳团默认2个人一个房间。需报名人数满足最低发团数后发团。为了避免造成您的损失，建议您在与客服确认发团后再购买机票。 3、此产品最少需要30人报名才可出发，最多不超过40人。我们会在出发前20天与您再次确认，如届时仍未报满规定人数，则很遗 4、此产品最少需要30人报名才可出发，最多不',
+				content: "",
 				// 套餐内容
 				goodsInfo: {},
 				// 房间选择
@@ -245,11 +250,11 @@
 		},
 		onLoad(options) {
 			that = this
-			console.log(options)
 			if (options.id) {
 				this.init(options.id)
 			}
-
+			let data = uni.getStorageSync("data")
+			this.content=data[3].value
 		},
 		onShow() {
 			this.initvist()
@@ -329,7 +334,7 @@
 					if(this.days.length>0){
 						uni.showModal({
 							title: "提示",
-							content: "请选择房型"
+							content: "请选择出发日期"
 						})
 					}else{
 						uni.showModal({
@@ -362,7 +367,7 @@
 				goodsInfo.name = this.goodsInfo.name
 				goodsInfo.id = this.goodsInfo.id
 				goodsInfo.subtitle = this.goodsInfo.subtitle
-
+				goodsInfo.cohabit=this.goodsInfo.cohabit
 				// uni.navigateTo({
 				// 	url:`/pages/travel/travelPeople?days=${JSON.stringify(this.plans)}&goodsinfo=${JSON.stringify(goodsInfo)}`
 				// })
@@ -463,7 +468,7 @@
 	}
 
 	.model {
-		// height: 500rpx !important;
+		height: 500rpx !important;
 	}
 
 	.detailsPage {

pages/travel/travelPeople.vue

@@ -25,7 +25,7 @@
 					<view class="image">
 						<image :src="item.room_picture" @touchend="dblclick(item.room_picture)"></image>
 						<view class="surplus">
-							剩余 {{item.number-item.used}}
+							剩余 {{item.number}}
 						</view>
 					</view>
 					<view class="text">
@@ -87,7 +87,7 @@
 
 		<view class="remarks">
 			<view class="text">
-				日期、房型相同的情况下可选择其他出行人同住，但有时候会出现人数不够分配的情况，会安排同性出行人同住。
+				{{chooseroommate==1?cohabitexplan.random:cohabitexplan.fixed}}
 			</view>
 		</view>
 
@@ -184,18 +184,21 @@
 				room_id: 0,
 				value: 1,
 				ur1:'',
-				ur2:''
+				ur2:'',
+				cohabitexplan:""
 			}
 		},
 		onLoad(options) {
 			that = this
-			console.log(options)
 			let newdays = decodeURIComponent(options.obj)
 			let datainfo = JSON.parse(newdays)
 			this.days = datainfo.days
-
+			
+			
 			// let goodsInfo=JSON.parse(options.goodsinfo)
 			this.goodsInfo = datainfo.goodsinfo
+			let conexplan=JSON.parse(datainfo.goodsinfo.cohabit)
+			this.cohabitexplan=conexplan
 			// this.days=days
 			// 
 			// console.log(this.days,this.goodsInfo)
@@ -259,7 +262,7 @@
 								this.touchNum = 0
 							}
 							
-						},800)
+						},600)
 							
 					}else{
 						this.touchNum = 0
@@ -282,7 +285,7 @@
 				this.totalromprice = Number(this.houselist[0].price).toFixed(2)
 			},
 			chooseRoomMate(){
-				this.chooseroommate=1
+				this.chooseroommate=1			
 				this.cohabits=[]
 			},
 			// 选择出行人

pages/userCenter.vue

@@ -54,7 +54,7 @@
 			<view class="line">
 
 			</view>
-			<view class="flex-item" @click="goOrder(4)">
+			<view class="flex-item" @click="goOrder(3)">
 				<image mode="aspectFit" src="../static/usercenter/Tobepaid1.png"
 					style="width: 45%;margin-bottom: -5px;"></image>
 				<view>已完成</view>
@@ -63,7 +63,7 @@
 			<view class="line">
 
 			</view>
-			<view class="flex-item " @click="goOrder(1)">
+			<view class="flex-item " @click="goOrder(0)">
 				<image mode="aspectFit" src="../static/usercenter/all.png" style="width: 45%;margin-bottom: -5px;">
 				</image>
 				<view>全部订单</view>