提交

10 months ago · d81400d871
11 changed files with 12 additions and 12 deletions
--- a/subPackages/daoyou/order.vue
+++ b/subPackages/daoyou/order.vue
@ -69,7 +69,7 @@
 					合计：<span>{{sku.money * buyNum / 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>阅读并同意《xxx协议》
+					<span><image src="https://static.ticket.sz-trip.com/tongli/images/user/dui.png" v-show="isAgreement"></image></span>阅读并同意《{{xieyi.title}}》
 				</view>
 			</view>
 			<view :class="['order-btn', {'order-disable': !isAgreement}]" @click="order">去支付</view>
@ -128,8 +128,8 @@
 				<image src="https://static.ticket.sz-trip.com/tourist/daoyou/cha.png" class="agreement-cha" @click="$refs.agreementPopup.close()"></image>
 				<scroll-view class="agreement-content" scroll-y="true" @scrolltolower="lower" lower-threshold="20">
-					<view class="agreement-title">xxxx协议</view>
+					<view class="agreement-title">{{xieyi.title}}</view>
-					<view v-html="formateRichText(content)"></view>
+					<view v-html="formateRichText(xieyi.content)"></view>
 				</scroll-view>
 				<view class="agreement-btn flex-center">
@ -157,7 +157,7 @@
 				contactList: [],
 				isAgreement: false,
 				isBottom: false,
-				content: ''
+				xieyi: ''
 			}
 		},
 		onLoad() {
@ -168,7 +168,7 @@
 			this.Post({
 				id: 3
 			}, '/api/Article/getArticleById').then(res => {
-				this.content = res.data.content
+				this.xieyi = res.data
 			})
 		},
 		methods: {
--- a/subPackages/order/orderDetail.vue
+++ b/subPackages/order/orderDetail.vue
@ -112,7 +112,7 @@
 		<view class="order-info">
 			订单信息
 			<view class="order-subtitle" style="display: flex;align-items: center;">
-				<span>订单账号：</span>{{info.order_id}}
+				<span>订单编号：</span>{{info.order_id}}
 				<view class="copy flex-around" @click="clickCopy">
 					<image src="https://static.ticket.sz-trip.com/yandu/images/order/copy.png" class="copy-img"></image>
 					复制
--- a/subPackages/search/searchList.vue
+++ b/subPackages/search/searchList.vue
@ -14,7 +14,7 @@
 			<view v-for="(item,index) in list1" :key="index" class="item" @click="goDetail(item)">
 				<view class="item-img">
-					<image :src="showImg(item.guide_data?item.guide_data.avatar:item.image)" mode="aspectFill"></image>
+					<image :src="showImg(item.image)" mode="aspectFill"></image>
 				</view>
 				<view class="item-content flex-column">
--- 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.e7a7ee5f.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.60b3f7fb.js></script></body></html>
--- a/unpackage/dist/build/web/static/js/index.60b3f7fb.js
+++ b/unpackage/dist/build/web/static/js/index.60b3f7fb.js
--- a/unpackage/dist/build/web/static/js/subPackages-daoyou-order.40351345.js
+++ b/unpackage/dist/build/web/static/js/subPackages-daoyou-order.40351345.js
--- a/unpackage/dist/build/web/static/js/subPackages-daoyou-order.a039ad72.js
+++ b/unpackage/dist/build/web/static/js/subPackages-daoyou-order.a039ad72.js
--- a/unpackage/dist/build/web/static/js/subPackages-order-orderDetail.9ce54904.js
+++ b/unpackage/dist/build/web/static/js/subPackages-order-orderDetail.9ce54904.js
--- a/unpackage/dist/build/web/static/js/subPackages-order-orderDetail.d1229b08.js
+++ b/unpackage/dist/build/web/static/js/subPackages-order-orderDetail.d1229b08.js
--- a/unpackage/dist/build/web/static/js/subPackages-search-searchList.220ce9db.js
+++ b/unpackage/dist/build/web/static/js/subPackages-search-searchList.220ce9db.js
--- a/unpackage/dist/build/web/static/js/subPackages-search-searchList.9c8ff535.js
+++ b/unpackage/dist/build/web/static/js/subPackages-search-searchList.9c8ff535.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.e7a7ee5f.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.60b3f7fb.js></script></body></html>`