售票页面样式处理

App.vue

@@ -110,7 +110,7 @@ export default {
 		height: 70rpx;
 		line-height: 70rpx;
 		font-size:28rpx;
-		border-radius:16rpx;
+		border-radius:12rpx;
 		text-align: center;
 	}
 	//中等按钮

components/merchantDetail.vue

@@ -16,7 +16,7 @@
 				<view class="middle">
 					<!-- 景区介绍 -->
 					<view class="introduce">
-						<view class="middle-title">
+						<view class="middle-title" v-if="detailData.introduce">
 							介绍
 						</view>
 						<view v-html="detailData.introduce">
@@ -189,9 +189,6 @@ export default {
 	font-weight: bold;
 	padding-bottom: 24rpx;
 }
-.introduce image{
-	width: 100%;
-}
 .opentime{
 	padding: 30rpx 16rpx;
 	background: #fff;

pages/combination/distributionCombiChoose/distributionCombiChoose.vue

@@ -29,7 +29,7 @@
 
 									<view v-if="showDistance" class="title-right">
 										距您{{ item.distance ? parseFloat((item.distance / 1000).toFixed(2)) : 0 }}km
-										<u-icon name="arrow-right" style="margin-left: 4rpx;"></u-icon>
+										<u-icon name="arrow-right" style="margin-left: 4rpx;" size='26' color='#B4B4B4'></u-icon>
 									</view>
 								</view>
 
@@ -61,7 +61,7 @@
 
 													<text class="product-rule"> 无需取票 </text>
 													<text @click.stop="showBuyKnow(items)">购买须知</text>
-													<u-icon name="arrow-right"></u-icon>
+													<u-icon name="arrow-right" size='26' color='#B4B4B4'></u-icon>
 												</view>
 												<view>
 													<text class="product-orange"> ¥{{ items.originalPrice }} </text>
@@ -73,14 +73,14 @@
 								</label>
 
 								<view class="product-more" v-if="index > 0 && item.productList.length > 2">
-									<view style="display: flex;justify-content: center;" v-if="item.productListCopy.length != item.productList.length" @click="showMoreProduct(item)">
+									<view v-if="item.productListCopy.length != item.productList.length" @click="showMoreProduct(item)">
 										更多
-										<u-icon name="arrow-down"></u-icon>
+										<u-icon name="arrow-down" size='24' color='#B4B4B4'></u-icon>
 									</view>
 
-									<view style="display: flex;justify-content: center;" v-else @click="retractProduct(item)">
+									<view v-else @click="retractProduct(item)">
 										收起
-										<u-icon name="arrow-up"></u-icon>
+										<u-icon name="arrow-up" size='24' color='#B4B4B4'></u-icon>
 									</view>
 								</view>
 							</view>
@@ -323,9 +323,10 @@ export default {
 		    this.showSuodaoImg = false
 		  }, 2500)
     }
-    //清空之前选中的数据
+    //清空之前选中的数据以及状态
     this.detailData=''
     this.chooseProduct=[]
+    this.$refs.detail.showPop = false
     let token = uni.getStorageSync('token')
     if (token) {
       uni.getLocation({
@@ -395,6 +396,11 @@ export default {
 		  this.$request('scenic/user/merchant/findDetailInfo',data).then((res)=>{
 		    if(res.code=='00'){
 		      this.detailData=res.data
+          //解决详情里面图片太宽超出屏幕宽度出现滚动条的问题
+          if(this.detailData.introduce){
+            this.detailData.introduce=this.detailData.introduce.replace(/\<img/gi, '<img style="max-width:100%;height:auto;"')
+          }
+          
 		    }else{
 		      uni.showToast({
 		        title: res.message,
@@ -635,21 +641,19 @@ export default {
 	height: 100%;
 	display: flex;
 	flex-direction: column;
-	background: #fff;
+	background: #f7f7f7;
 }
 .middle {
 	padding: 0 24rpx 100rpx 24rpx;
 	display: flex;
 	flex-direction: column;
 	// flex: 1;
-	background: #f7f7f7;
 }
 .swiper-box {
 	// flex: 1;
 	position: relative;
 	top: -40rpx;
 }
-
 .tabbar {
 	transition:1s;
 	width: 100%;
@@ -724,7 +728,7 @@ export default {
 	display: flex;
 }
 .product {
-	padding: 10rpx 16rpx;
+	padding:16rpx 16rpx 10rpx 16rpx;
 	background: #ffffff;
 	border-radius: 8rpx;
 	display: flex;
@@ -750,7 +754,6 @@ export default {
 .product-status {
 	padding: 6rpx 12rpx;
 	border: 2px solid #f40000;
-	background: #ffffff;
 	color: #f40000;
 	font-size: 24rpx;
 	border-radius: 4rpx;
@@ -787,10 +790,13 @@ export default {
 	margin-left: 10rpx;
 }
 .product-more {
-	padding: 10rpx;
-	text-align: center;
+	padding-top:24rpx;
+	font-size: 20rpx;
+}
+.product-more>view{
+	display: flex;
+	justify-content: center;
 }
-
 .bottom {
 	position: fixed;
 	bottom: 0;

pages/scenic/scenicSingleOrder/scenicSingleOrder.vue

@@ -1596,6 +1596,7 @@ export default {
 	margin-top: 20rpx;
 	display: flex;
 	flex-wrap: wrap;
+	justify-content: space-between;
 }
 .plus-list {
 	height: 70rpx;
@@ -1617,7 +1618,7 @@ export default {
 .plus-list-last {
 	color: $theme;
 	background: #efefef;
-	width: 170rpx;
+	width: 200rpx;
 	border: none;
 }
 .plus-list.on {