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

manifest.json

@@ -48,7 +48,7 @@
             }
         },
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
         }
     },
     /* 快应用特有相关 */
@@ -69,42 +69,67 @@
             }
         },
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
         },
         "requiredPrivateInfos" : [ "getLocation" ]
     },
     "mp-alipay" : {
         "usingComponents" : true,
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
         },
         "appid" : "2021001194629244"
     },
     "mp-baidu" : {
         "usingComponents" : true,
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
         }
     },
     "mp-toutiao" : {
         "usingComponents" : true,
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
         }
     },
     "uniStatistics" : {
-        "enable" : true
+        "enable" : false
     },
     "h5" : {
         "title" : "uni-pdtravel",
         "domain" : "www.baidu.com",
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
         }
     },
     "mp-qq" : {
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
+        }
+    },
+    "mp-jd" : {
+        "uniStatistics" : {
+            "enable" : false
+        }
+    },
+    "mp-kuaishou" : {
+        "uniStatistics" : {
+            "enable" : false
+        }
+    },
+    "mp-lark" : {
+        "uniStatistics" : {
+            "enable" : false
+        }
+    },
+    "quickapp-webview-huawei" : {
+        "uniStatistics" : {
+            "enable" : false
+        }
+    },
+    "quickapp-webview-union" : {
+        "uniStatistics" : {
+            "enable" : false
         }
     }
 }

pages/indexs/merchantListIndex/merchantListIndex.vue

@@ -382,11 +382,6 @@ export default {
 	font-size: 20rpx;
 	padding: 2rpx 4rpx;
 	border-radius: 2rpx;
-	width: 110rpx;
-	display: inline-block;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
 }
 .right2 text:not(:last-child){
 	margin-right: 10rpx;

pages/scenic/scenicChooseProduct/components/detail.vue

@@ -25,7 +25,7 @@
 			<view class="bottom">
 				<view class="bottom-left">
 					合计：¥ 
-					<text style="font-size: 36rpx;font-weight: bold;">{{priceTotal}}</text> 
+					<text style="font-weight: bold;font-size: 40rpx;">{{priceTotal}}</text> 
 				</view>
 				<view class="bottom-right">
 					<text class="btn" @click="goFillorder()">
@@ -138,6 +138,7 @@ export default {
 }
 .bottom-left{
 	color:$red;
+	font-size: 32rpx;
 }
 .btn{
 	padding: 16rpx 48rpx;

pages/scenic/scenicChooseProduct/scenicChooseProduct.vue

 <template>
 	<view class="wrap">
 		<view class="banner">
-			<u-swiper :list="imgList" name="url" mode="number" height="420" indicator-pos="topRight"></u-swiper>
+			<u-swiper :list="imgList" name="url" mode="number" height="360" indicator-pos="topRight"></u-swiper>
 		</view>
 		<view class="middle">
 			<view class="tabbar">
@@ -53,7 +53,7 @@
 													</text>
 
 													<text class="product-rule"> 无需取票 </text>
-													<text @click="showBuyKnow(items)">购买须知</text>
+													<text @click.stop="showBuyKnow(items)">购买须知</text>
 													<u-icon name="arrow-right"></u-icon>
 												</view>
 												<view>
@@ -143,7 +143,7 @@ export default {
     return {
       merchantId: '', //商户Id
       // tabbar:['热门景点','一日游','摄影/旅拍','文创DIY'],//tabbar标题列表
-      tabbar: ['热门景点', '一日游', '摄影/旅拍'], //tabbar标题列表
+      tabbar: ['热门景点', '摄影/旅拍', '一日游'], //tabbar标题列表
       active: 0, //导航栏下标
       imgList: [], //图片列表
       scenicList: [], //景区数据
@@ -421,8 +421,7 @@ export default {
         let productIdList = this.chooseProduct.map(item => {
           return item.id
         })
-        let query =
-					'?productIdList=' + JSON.stringify(productIdList) + '&groupId=' + this.groupId + '&groupChannelId=' + this.groupChannelId + '&orderSource=3'
+        let query ='?productIdList=' + JSON.stringify(productIdList) + '&groupId=' + this.groupId + '&groupChannelId=' + this.groupChannelId + '&orderSource=3'
         uni.navigateTo({
           url: '/pages/combination/combiOrder/combiOrder' + query
         })
@@ -462,7 +461,8 @@ export default {
 	}
 }
 .tabbar .on {
-	background: url('../../../static/img/scenic/tabbar.png') no-repeat;
+	// background: url('../../../static/img/scenic/tabbar.png') no-repeat;
+	background: $blue;
 	background-size: 100% 100%;
 	color: #fff;
 	font-weight: bold;