Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop

components/buyKnow.vue

@@ -12,11 +12,15 @@
 				<view class="head3">
 					挂牌价：￥{{buyKnowData.originalPrice}}
 				</view>
-				
 			</view>
 			
+			
+			
 			<view style="flex: 1;overflow-y: scroll;">
 				<view class="middle">
+					<view style="margin-top: 30rpx;">
+						<image style="width: 100%;" v-for="(item,index) in buyKnowData.productImgs" :key="index" :src="item.url"></image>
+					</view>
 					<view class="middle-list" v-for="(item,a) of buyKnowData.productTitleResVos||buyKnowData.productTitleData" :key="a">
 						<view class="middle-title">
 							{{item.title}}
@@ -35,8 +39,6 @@
 						</view>
 					</view>
 					<!-- 退票规则 -->
-					<!-- 索道写死 -->
-					<!-- <view class="middle-list" style="border-bottom: none;" v-if="buyKnowData.merchantId!='z0015605022691a5945bbe463141668c'"> -->
 					<view class="middle-list" style="border-bottom: none;">
 						<view class="middle-title">
 							<text v-if="buyKnowData.backChangeRule == 0">不可退</text>
@@ -133,12 +135,15 @@ export default {
 	border-bottom: 1px solid #e6e6e6;
 	padding-bottom: 30rpx;
 }
+.img-box{
+	margin: 20rpx 0;
+}
 .middle {
-	padding-bottom: 100rpx;
+	padding: 0 24rpx 24rpx 24rpx;
 	font-size: 28rpx;
 }
 .middle-list {
-	margin: 30rpx 24rpx;
+	margin: 30rpx 0;
 	padding-bottom: 24rpx;
 	border-bottom: 1px solid #E6E6E6;
 }
@@ -181,6 +186,7 @@ export default {
 	z-index: 9;
 	background: #FFFFFF;
 	box-sizing: border-box;
+	border-top: 1px solid #e6e6e6;
 }
 
 .bottom-left{

pages.json

@@ -331,6 +331,13 @@
 						"navigationBarTitleText": "订单填写",
 						"enablePullDownRefresh": false
 					}
+				}, 
+				{
+					"path": "scenicCombiOrder/scenicCombiOrderNew",
+					"style": {
+						"navigationBarTitleText": "订单填写",
+						"enablePullDownRefresh": false
+					}
 				}
 			]
 		},

pages/combination/distributionCombiChoose/distributionCombiChoose.vue

@@ -190,6 +190,7 @@
 			</view>
 		</u-popup>
 		<!-- 自定义导航栏 -->
+		<!--#ifdef MP-WEIXIN-->
 		<view class="tabbar" :style="{height:topHeight+'px',opacity:tabbarOpacity}" >
 			<view class="tabbar-title">
 				<u-icon @click="goTop()" name="arrow-left" color="#333333" size="48"></u-icon>
@@ -197,6 +198,7 @@
 				<text></text>
 			</view>
 		</view>
+		<!-- #endif -->
 	</view>
 </template>
 

pages/indexs/index/index.vue

 <template>
 	<view class="wrap">
+		<!-- #ifdef MP-WEIXIN -->
 		<view class="search">
 			<text>重庆</text>
 			<view class="search-right">
 				<u-icon name="search" style="margin-right: 10rpx;"></u-icon>
 				<input placeholder="商品/用户/关键词搜索" disabled/>
 			</view>
-			
 		</view>
-		
+		<!-- #endif -->
 		<view class="middle">
 			<view class="tabbar">
 				<view @click="jumpPage(item.projectLinkUrl)" v-for="(item,index) in iconList" :key='index' v-show="item.projectStatus==0">

pages/login/login.vue

@@ -12,14 +12,18 @@ export default {
   onLoad() {
     this.getCodeLogin()
   },
-  // 一般页面用onUnload
-  // tabbar页面用onHide
   onUnload() {
     if(this.timer) {  
       clearTimeout(this.timer)
       this.timer = null
     }  
   },
+  onHide() {
+	  if(this.timer) {
+		  clearTimeout(this.timer)
+		  this.timer = null
+	  } 
+  },
   methods:{
     //---获取编码并登录
     getCodeLogin(){