Merge branch 'develop' of http://192.168.0.204/panyongping/uni-pdtravel into develop

pages.json

@@ -39,7 +39,8 @@
 			"path": "pages/combination/combiChoose/combiChoose",
 			"style": {
 				"navigationBarTitleText": "产品选择",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
 			}
 		},
 

pages/scenic/scenicSingleOrder/scenicSingleOrder.vue

@@ -314,10 +314,8 @@
 		<view class="bottom">
 			<view class="bottom-left">
 				<text> ¥{{ originalTotal || 0 }} </text>
-
 				<text> <text>¥</text>{{ sellTotal || 0 }} </text>
 			</view>
-
 			<view class="bottom-right">
 				<view @click="showDetail()" class="bottom-detail">
 					明细