Merge branch 'master' of http://47.114.134.244:3000/chenkainan/tourist

10 months ago · 98ef0d8bc8
8 changed files with 34 additions and 13 deletions
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -83,6 +83,15 @@
 				lineList: []
 			}
 		},
 		onLoad(option) {
 			if(option.token) {
 				this.Post({
 					token: option.token
 				}, '/api/user/getUserDetails').then(res => {
 					this.$store.commit('changeUserInfo', res.data)
 				})
 			}
 		},
 		onReady() {
 			this.getTopBanner()
 			this.getLineList()
--- a/subPackages/daoyou/order.vue
+++ b/subPackages/daoyou/order.vue
@ -21,10 +21,10 @@
 		<!-- 出行信息 -->
 		<view class="people-box">
-			<view>{{skuInfo.is_card ? (skuInfo.is_real_name ? '需填'+buyNum+'位出行人' : '需填1位出行人') : '无需填写出行人'}}</view>
+			<view>{{skuInfo.is_card == 1 ? (skuInfo.is_real_name ? '需填'+buyNum+'位出行人' : '需填1位出行人') : '无需填写出行人'}}</view>
 			<!-- is_card是否实名 -->
-			<view v-if="skuInfo.is_card">
+			<view v-if="skuInfo.is_card == 1">
 				<!-- 已选中出行人 -->
 				<view v-if="seldPeople.length > 0">
 					<view class="people-seld">
@ -66,7 +66,7 @@
 		<footer class="flex-between">
 			<view class="footer-left">
 				<view>
-					合计：<span>{{sku.money * buyNum / 100}}</span>
+					合计：<span>{{sku.money / 100}}</span>
 				</view>
 				<view style="margin-top: 10rpx;" @click="clickAgreement(0)">
 					<span><image src="https://static.ticket.sz-trip.com/tongli/images/user/dui.png" v-show="isAgreement"></image></span>阅读并同意《{{xieyi.title}}》
@ -161,7 +161,7 @@
 			}
 		},
 		onLoad() {
-			console.log(this.sku)
+			console.log(this.skuInfo)
 			this.getContactList()
 			// 获取下单协议
@ -176,7 +176,7 @@
 			order() {
 				let seldUserIdArr = []
 				// is_card 是否实名 0否 1是
-				if(this.skuInfo.is_card) {
+				if(this.skuInfo.is_card == 1) {
 					for (let i = 0; i < this.seldPeople.length; i++) {
 						seldUserIdArr.push(this.seldPeople[i].id)
 					}
@ -203,7 +203,8 @@
 					let params = {
 						goods_id: this.skuInfo.goods_id,
 						specifications_id: this.skuInfo.id,
-						num: this.buyNum,
+						num: 1,
 						contact_num: this.buyNum,
 						contact_id: seldUserIdArr,
 						date: this.selectDay,
 						start_time: '',
@ -307,7 +308,6 @@
 				    }else {
 				        for (let i = 0; i < this.contactList.length; i++) {
 				            this.contactList[i].isSeld = false
 				            this.contactList[i].selected = false
 				        }
 				    }
 				};
@ -369,11 +369,16 @@
 			// 获取出行人信息
 			getContactList() {
 				this.Post({},'/api/user/contactList').then(res => {
-					res.data.forEach(item => {
+					res.data.forEach((item, index) => {
 						item.isSeld = false
 						// 默认出行人选中
 						if(this.seldPeople.length == 0 && item.is_default == 1) {
 							item.isSeld = true
 							this.seldPeople.push(item)
 						}
 					})
 					this.contactList = res.data
 					console.log(this.seldPeople)
 					// 如果是添加或者修改完出行人后需要默认选中已选择的出行人
 					if(this.seldPeople.length > 0){
 						for (let i = 0; i < this.seldPeople.length; i++) {
@ -393,6 +398,13 @@
 				if(type) {
 					// 增加数量
 					this.buyNum += 1
 					if(this.buyNum > this.skuInfo.contact_num){
 					    this.buyNum = this.skuInfo.contact_num
 						uni.showToast({
 							title:"最大出行人数为"+this.skuInfo.contact_num,
 							icon:'none'
 						})
 					}
 				}else {
 					// 减少数量
 					if (this.buyNum <= 1) {
--- a/unpackage/dist/build/web/index.html
+++ b/unpackage/dist/build/web/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>daoyous</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.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.690d039f.js></script><script src=/static/js/index.09fc4dff.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.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.690d039f.js></script><script src=/static/js/index.e6687f49.js></script></body></html>
--- a/unpackage/dist/build/web/static/js/index.e6687f49.js
+++ b/unpackage/dist/build/web/static/js/index.e6687f49.js
--- a/unpackage/dist/build/web/static/js/pages-index-index.410b3713.js
+++ b/unpackage/dist/build/web/static/js/pages-index-index.410b3713.js
--- a/unpackage/dist/build/web/static/js/pages-index-index.87f20659.js
+++ b/unpackage/dist/build/web/static/js/pages-index-index.87f20659.js
--- a/unpackage/dist/build/web/static/js/subPackages-daoyou-order.79b8671f.js
+++ b/unpackage/dist/build/web/static/js/subPackages-daoyou-order.79b8671f.js
--- a/unpackage/dist/build/web/static/js/subPackages-daoyou-order.d6ce301f.js
+++ b/unpackage/dist/build/web/static/js/subPackages-daoyou-order.d6ce301f.js
`@ -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>daoyous</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') \|\| CSS.supports('top: constant(a)'))`	`<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>daoyous</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.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.690d039f.js></script><script src=/static/js/index.09fc4dff.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.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.690d039f.js></script><script src=/static/js/index.e6687f49.js></script></body></html>`