diff --git a/common/share.js b/common/share.js
index 74aa431..5f9b5c4 100644
--- a/common/share.js
+++ b/common/share.js
@@ -93,17 +93,28 @@ export default {
 				})
 			}
 		},
-		isGoHome(){
+		isGoHome(path){
 			
-			/* 黑名单：不允许分享 */
+			/* 黑名单：不允许分享,分享的跳转至首页 */
 			let arr =[
 				"/physical-merchants/settleAccounts/settleAccounts",//订单确认
 				"/physical-merchants/classify/order/pay",//收银台页
 				"/physical-merchants/classify/order/paymentResult",//支付结果
 			];
+			
+			// #ifdef H5
 			let str = this.localPath.split('#')[1];
 			str = str.split("?")[0];
 			return arr.includes(str)
+			// #endif
+			
+			
+			// #ifdef MP-WEIXIN		
+			return arr.includes(path)
+			// #endif 
+			
+			
+			
 		},
 
 	},
@@ -147,6 +158,11 @@ export default {
 	// #ifdef MP-WEIXIN
 	onShareAppMessage(res) {
 		this.share.path = this.getCurrentRouteYm();
+		
+		if(this.isGoHome(this.share.path.split('?')[0])){
+			this.share.path = "/pages/tabBar/home/home"
+		}
+		
 		// console.log(this.share.path, "this.share.path", res);
 		return {
 			title: this.share.title,
diff --git a/pages/goods/goods-list/goods-list.vue b/pages/goods/goods-list/goods-list.vue
index 2ffa6ab..688bdd0 100644
--- a/pages/goods/goods-list/goods-list.vue
+++ b/pages/goods/goods-list/goods-list.vue
@@ -4,17 +4,22 @@
 			<view class="icon search"></view>
 			<input placeholder="搜索商品" v-model="couponName" placeholder-style="color:#c0c0c0;" @input="toSearch()" />
 		</view>
-
-		<view class="swiper">
-			<view class="swiper-box">
+		
+		<view class="swiper" v-if="swiperList.length>0">
+			<view class="swiper-box" >
 				<swiper circular="true" autoplay="true" @change="swiperChange">
 					<swiper-item v-for="swiper in swiperList" :key="swiper.id">
 						<image :src="imageUrl+swiper.imgData" @click="jumpCont(swiper)"></image>
 					</swiper-item>
 				</swiper>
-				<view class="indicator">
+				<!-- <view class="indicator">
 					<view class="dots" v-for="(swiper, index) in swiperList"
 						:class="[currentSwiper >= index ? 'on' : '']" :key="index"></view>
+				</view> -->
+				<view class="indicator" >
+						<view class="dots" v-for="(swiper, index) in swiperList"
+							:style="(currentSwiper >= index ? 'width:calc(100%/'+swiperList.length+')' : '')"
+							:key="index"></view>
 				</view>
 			</view>
 		</view>
@@ -27,8 +32,8 @@
 		<view v-if="goodsList == '' " class="mart60 fotct font14 fcor666">
 			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
 		</view>
-		<view class="width90 height110 mart10 backcorfff border-8r alijusstart" v-for="(row, index) in goodsList" :key="index" @click="toGoods(row.id)">
-			<image class="goodsimg mart5" mode="widthFix" :src="imageUrl+row.couponImg"></image>
+		<view class="width90 height110 mart10  border-8r itemContainer" v-for="(row, index) in goodsList" :key="index" @click="toGoods(row.id)">
+			<image class="goodsimg flleft" mode="aspectFit" :src="imageUrl+row.couponImg"></image>
 			<view class="goodsli width65">
 				<view class="text1 fcor333 font16 fontwig6">{{row.couponName}}</view>
 				<view class="goodsxg font12 fotct">限购{{row.limitNumber}}件</view>
@@ -53,7 +58,9 @@
 				</view>
 			</view>
 		</view>
-
+		<view class="height10">
+			
+		</view>
 	</view>
 </template>
 
@@ -73,16 +80,17 @@
 				imgadres: 'noorder.png',
 				imageUrl: app.globalData.imgUrl,
 				// 轮播图片
-				swiperList: [{
-						id: 1,
-						src: 'url1',
-						img: 'banner2.png'
-					},
-					{
-						id: 2,
-						src: 'url2',
-						img: 'banner3.png'
-					}
+				swiperList: [
+					// {
+					// 	id: 1,
+					// 	src: 'url1',
+					// 	img: 'banner2.png'
+					// },
+					// {
+					// 	id: 2,
+					// 	src: 'url2',
+					// 	img: 'banner3.png'
+					// }
 				],
 				currentSwiper: 0,
 				pageNum: 1,
@@ -397,7 +405,7 @@
 	}
 
 	.goodsli {
-		margin-left: 10px;
+		margin-left: 100px;
 		padding-top: 5px;
 	}
 
@@ -406,9 +414,15 @@
 		border: 1px solid #3da7e7;
 		border-radius: 5px;
 		color: #3da7e7;
-		width: 55px;
+		// width: 55px;
+		display: inline-block;
 		padding: 3px;
 	}
+	.itemContainer{
+		box-sizing: border-box;
+		padding: 10px;
+		background: #ffffff;
+	}
 
 	// .info {
 	// 	display: flex;
diff --git a/pages/goods/goods.vue b/pages/goods/goods.vue
index b80b814..ccdd20b 100644
--- a/pages/goods/goods.vue
+++ b/pages/goods/goods.vue
@@ -73,11 +73,13 @@
 		<!-- 详情 -->
 		<view class="description">
 			<view class="title">———— 商品详情 ————</view>
-			<view class="content marb65">
-				<image mode="widthFix" class="width100" v-for="codes in  couponDesc" :key="codes" :src="imageUrl+codes"
+			<view class="content ">
+				<image mode="widthFix" class="width100 verc" v-for="codes in  couponDesc" :key="codes" :src="imageUrl+codes"
 					@click="perImage(codes)">
 				</image>
 			</view>
+			<view style="height: 48px;">
+			</view>
 		</view>
 		<wybPopup ref="popup" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true">
 			<view class="fotct font18 fontwig6 fcor333 mart10 height30">赠送卡券</view>
diff --git a/pages/goods/refuel-details/refuel-details.vue b/pages/goods/refuel-details/refuel-details.vue
index eecbdfd..df5c6fd 100644
--- a/pages/goods/refuel-details/refuel-details.vue
+++ b/pages/goods/refuel-details/refuel-details.vue
@@ -110,7 +110,7 @@
 		</view>
 		<view class="line10 mart15"></view>
 
-		<view class="height60 width100"></view>
+		<view class=" width100" style="height: 51px;"></view>
 		<!-- 底部按钮 -->
 		<view class="footer">
 			<view class="flleft padleft15 font15 fcoreb5">
@@ -128,7 +128,7 @@
 			<!-- #endif -->
 		</view>
 		<!-- 底部弹窗 -->
-		<wybPopup ref="popup" type="bottom" height="600" width="500" radius="6" :showCloseIcon="true">
+		<wybPopup ref="popup" type="bottom" height="500" width="500" radius="6" :showCloseIcon="true">
 			<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 1">选择油号</view>
 			<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 2">选择油枪</view>
 			<view class="font15 fcor666 width90 mart10 height22" v-if="typeId == 1">汽油油号</view>
@@ -147,7 +147,7 @@
 				</view>
 			</view>
 		</wybPopup>
-		<view class="height30"></view>
+		<!-- <view class="height30"></view> -->
 
 		<wybPopup ref="popups" type="center" height="850" width="600" bgColor="" radius="20" :showCloseIcon="false">
 			<!-- <image class="popImg" :src="imagewxUrl+imgadres3" @click="jumpWeb"></image> -->
diff --git a/pages/goods/refuel/refuel.vue b/pages/goods/refuel/refuel.vue
index bb66e3e..2e8392f 100644
--- a/pages/goods/refuel/refuel.vue
+++ b/pages/goods/refuel/refuel.vue
@@ -48,7 +48,7 @@
 			</view>
 		</view>
 
-		<wybPopup ref="popup" type="bottom" height="800" width="500" radius="6" :showCloseIcon="false">
+		<wybPopup ref="popup" type="bottom" height="500" width="500" radius="6" :showCloseIcon="false">
 			<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId  == 1">筛选距离</view>
 			<!-- <view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId  == 2">优先条件</view> -->
 			<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId  == 3">油号选择</view>
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index e3ce30b..b08f616 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -112,7 +112,7 @@
 				<view class="width70 font18 fcor333">
 					{{item.name}}
 				</view>
-				<view class="width30 font14 fotrt fcor666">更多</view>
+				<view class="width30 font14 fotrt fcor666">更多<text class="icon-ymt to-right fcor666 font14"></text></view>
 			</view>
 			<view class="width94 alijusnostart mart20" v-if="item.type == 6 ">
 				<view class="backcorfff spcarea border-r" v-for="(goods,index1) in item.childDate" :key="index1"
diff --git a/physical-merchants/classify/cart/cart.vue b/physical-merchants/classify/cart/cart.vue
index d0c2c66..1f3aa38 100644
--- a/physical-merchants/classify/cart/cart.vue
+++ b/physical-merchants/classify/cart/cart.vue
@@ -523,7 +523,10 @@
 
 			},
 			goClassify(){
-				var pages = getCurrentPages();
+				uni.navigateBack({
+				})
+				
+				/* var pages = getCurrentPages();
 				 pages.reverse()
 				let index = -1;
 				pages.map((item,ind)=>{
@@ -543,7 +546,7 @@
 				
 				uni.navigateBack({
 					delta:index
-				})
+				}) */
 				
 				
 			},
diff --git a/physical-merchants/classify/goodsDetail/goodsDetail.vue b/physical-merchants/classify/goodsDetail/goodsDetail.vue
index 5277dda..2546f17 100644
--- a/physical-merchants/classify/goodsDetail/goodsDetail.vue
+++ b/physical-merchants/classify/goodsDetail/goodsDetail.vue
@@ -40,7 +40,7 @@
 					保障
 				</view>
 				<view class="color999 font14">
-					破损包赔 · 假一赔四 · 退货运费险
+					破损包退 · 假一赔四 
 				</view>
 				<view class="icon-ymt to-right"></view>
 			</view>
@@ -60,7 +60,7 @@
 			</view> -->
 
 			<!-- 详情 -->
-			<view class="font13   goods-desc-img br tc marb10 colorccc">
+			<view class="font13  goods-desc-img br tc  colorccc">
 				———— 商品详情 ————
 			</view>
 			<view style="font-size: 0;" >
@@ -105,7 +105,7 @@
 						破损包退
 					</view>
 					<view class="baozhangDescDesc  font13 mart10">
-						签收72小时之内。发现商品破损或商品变形等，保存有限证件，商家24小时内响应并退款，诚信用户享受极速退款
+						签收72小时之内。发现商品破损或商品变形等，保存有限证件，商家24小时内响应并退款
 					</view>
 				</view>
 				<view>
@@ -116,14 +116,14 @@
 						正品保障,假一赔四
 					</view>
 				</view>
-				<view>
+				<!-- <view>
 					<view class="baozhangTitle fontwig6 font16 mart10">
 						七天无理由退换
 					</view>
 					<view class="baozhangDescDesc  font13 mart10">
 						满足相应条件时，消费者可申请"七天无理由退换货"
 					</view>
-				</view>
+				</view> -->
 
 
 				<view class="fcorfff baozhang-btn " @click="closeBaoZhang">
@@ -294,7 +294,7 @@
 								.imageUrl + temp);
 							this.goodsDetail.detailImg = res.return_data.detailImg.split(",").map(temp => this
 								.imageUrl + temp);
-							console.log(this.goodsDetail, )
+							// console.log(this.goodsDetail, )
 
 							// let list =item.map(temp=>this.imageUrl + temp)
 
diff --git a/subPages/coupon-package/coupon-package.vue b/subPages/coupon-package/coupon-package.vue
index 36b02ef..72dbd17 100644
--- a/subPages/coupon-package/coupon-package.vue
+++ b/subPages/coupon-package/coupon-package.vue
@@ -4,16 +4,21 @@
 			<view class="icon search"></view>
 			<input placeholder="搜索商品" v-model="couponName" placeholder-style="color:#c0c0c0;" @input="toSearch()" />
 		</view>
-		<view class="swiper">
+		<view class="swiper" v-if="swiperList.length>0">
 			<view class="swiper-box">
 				<swiper circular="true" autoplay="true" @change="swiperChange">
 					<swiper-item v-for="swiper in swiperList" :key="swiper.id">
 						<image :src="imageUrl+swiper.imgData"></image>
 					</swiper-item>
 				</swiper>
-				<view class="indicator">
+				<!-- <view class="indicator">
 					<view class="dots" v-for="(swiper, index) in swiperList"
 						:class="[currentSwiper >= index ? 'on' : '']" :key="index"></view>
+				</view> -->
+				<view class="indicator" >
+						<view class="dots" v-for="(swiper, index) in swiperList"
+							:style="(currentSwiper >= index ? 'width:calc(100%/'+swiperList.length+')' : '')"
+							:key="index"></view>
 				</view>
 			</view>
 		</view>
@@ -21,8 +26,8 @@
 		<view v-if="goodsList == '' " class="mart60 fotct font14 fcor666">
 			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
 		</view>
-		<view class="width90 height110 mart5" v-for="(row, index) in goodsList" :key="index" @click="toGoods(row.id)">
-			<image class="goodsimg flleft mart5" mode="widthFix" :src="imageUrl+row.listImg"></image>
+		<view class="width90 height110 mart10 border-8r itemContainer" v-for="(row, index) in goodsList" :key="index" @click="toGoods(row.id)">
+			<image class="goodsimg flleft " mode="aspectFit" :src="imageUrl+row.listImg"></image>
 			<view class="goodsli ">
 				<view class="text2 fcor333 font14 fontwig6">{{row.title}}</view>
 				<view class="goodsxg font12 fotct">限购{{row.purchaseNum}}件</view>
@@ -34,7 +39,9 @@
 				</view>
 			</view>
 		</view>
-
+		<view class="height10">
+			
+		</view>
 	</view>
 </template>
 
@@ -162,12 +169,16 @@
 </script>
 
 <style lang="scss">
+	page {
+		background-color: #f3f3f3;
+	}
 	.input-box {
 		width: 90%;
 		margin-left: 5%;
 		margin-top: 15px;
 		height: 70rpx;
-		background-color: #f5f5f5;
+		// background-color: #f5f5f5;
+		background-color: #ffffff;
 		border-radius: 10rpx;
 		position: relative;
 		display: flex;
@@ -261,9 +272,15 @@
 		border: 1px solid #eb5823;
 		border-radius: 5px;
 		color: #eb5823;
-		width: 55px;
+		// width: 55px;
+		display: inline-block;
 		padding: 3px;
 	}
+	.itemContainer{
+		box-sizing: border-box;
+		padding: 10px;
+		background: #ffffff;
+	}
 
 	.info {
 		display: flex;
diff --git a/subPages/coupon-packge-details/coupon-packge-details.vue b/subPages/coupon-packge-details/coupon-packge-details.vue
index d47b5f4..a824d0e 100644
--- a/subPages/coupon-packge-details/coupon-packge-details.vue
+++ b/subPages/coupon-packge-details/coupon-packge-details.vue
@@ -57,11 +57,14 @@
 		<!-- 详情 -->
 		<view class="description">
 			<view class="title">———— 商品详情 ————</view>
-			<view class="content marb65">
-				<image mode="widthFix" class="width100" v-for="codes in  couponDesc" :key="codes" :src="imageUrl+codes"
+			<view class="content ">
+				<image mode="widthFix" class="width100 verc" v-for="codes in  couponDesc" :key="codes" :src="imageUrl+codes"
 					@click="perImage(codes)">
 				</image>
 			</view>
+			<view style="height: 48px;">
+				
+			</view>
 		</view>
 		<wybPopup ref="popup" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true">
 			<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券包</view>