From 0b0516bd0a9cd7ab424d22992ba9be62b014dedf Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Thu, 27 Jul 2023 17:51:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=9E=E7=89=A9=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=EF=BC=8C=E5=88=86=E4=BA=AB=EF=BC=8C=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/share.js                               | 40 ++++++++++----
 components/goods-list/goods-list.vue          | 10 +++-
 components/no-more/no-more.vue                | 37 -------------
 components/shopcart.vue                       | 34 +++++++-----
 pages.json                                    | 55 +++++++++++++------
 pages/goods/HM-search/HM-search.vue           | 22 +++++---
 pages/goods/goods-list/goods-list.vue         | 11 +---
 pages/goods/goods.vue                         |  4 +-
 pages/order/confirmation.vue                  | 33 +++++------
 pages/tabBar/home/home.vue                    | 48 +++++++++++++---
 pages/user/generatePoster/generatePoster.vue  | 12 ++--
 pages/user/mineCoupons/mineCoupons.vue        | 51 +++++++++--------
 pages/user/news/news.vue                      |  4 +-
 physical-merchants/address/address.vue        | 10 +++-
 physical-merchants/classify/cart/cart.vue     |  9 ++-
 .../classify/classify.css                     |  0
 .../classify/classify.vue                     |  0
 .../classify/goodsDetail/goodsDetail.vue      | 13 +++--
 qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue   |  3 +-
 qianzhu-KFC/menu-list/menu-list.vue           |  4 +-
 .../coupon-comfirmation.vue                   |  2 +-
 subPages/coupon-package/coupon-package.vue    | 21 +++----
 uni.scss                                      | 10 ++++
 23 files changed, 254 insertions(+), 179 deletions(-)
 delete mode 100644 components/no-more/no-more.vue
 rename {pages/tabBar => physical-merchants}/classify/classify.css (100%)
 rename {pages/tabBar => physical-merchants}/classify/classify.vue (100%)

diff --git a/common/share.js b/common/share.js
index 5a2f569..194202f 100644
--- a/common/share.js
+++ b/common/share.js
@@ -18,6 +18,25 @@ export default {
 				imgUrl: 'https://hsg.dctpay.com/filesystem/wxApplets/logo.png', // 分享图标
 			},
 			resVerifyWx:null,
+			
+			shareArr:[
+				'/qianzhu-Starbucks/home/home',
+				'/qianzhu-KFC/home/home',
+				'/pages/goods/goods-list/goods-list',
+				'/subPages/coupon-package/coupon-package',
+				'/subPages/coupon-packge-details/coupon-packge-details',
+				'/pages/goods/goods',
+				'/physical-merchants/classify/classify',
+				'/physical-merchants/classify/goodsDetail/goodsDetail',
+				'/physical-merchants/classify/goods-search/goods-search',
+				'/pages/goods/refuel/refuel',//在线加油列表
+				'/pages/goods/refuel-details/refuel-details',//在线加油详情
+				'/pages/goods/store-list/store-details',//门店详情
+				'/pages/goods/HM-search/HM-search',//门店列表
+				'/pages/tabBar/home/home',
+				'/pages/tabBar/category/category',
+			],
+			
 		}
 	},
 	methods: {
@@ -96,23 +115,23 @@ export default {
 		isGoHome(path){
 			
 			/* 黑名单：不允许分享,分享的跳转至首页 */
-			let arr =[
-				"/physical-merchants/settleAccounts/settleAccounts",//订单确认
-				"/physical-merchants/classify/order/pay",//收银台页
-				"/physical-merchants/classify/order/paymentResult",//支付结果
-				"/physical-merchants/address/addNewAddress/addNewAddress",//添加地址
-				"/physical-merchants/classify/poster/poster",//生成海报
-			];
+			// let arr =[
+			// 	"/physical-merchants/settleAccounts/settleAccounts",//订单确认
+			// 	"/physical-merchants/classify/order/pay",//收银台页
+			// 	"/physical-merchants/classify/order/paymentResult",//支付结果
+			// 	"/physical-merchants/address/addNewAddress/addNewAddress",//添加地址
+			// 	"/physical-merchants/classify/poster/poster",//生成海报
+			// ];
 			
 			// #ifdef H5
 			let str = this.localPath.split('#')[1];
 			str = str.split("?")[0];
-			return arr.includes(str)
+			return !this.shareArr.includes(str)
 			// #endif
 			
 			
 			// #ifdef MP-WEIXIN		
-			return arr.includes(path)
+			return !this.shareArr.includes(path)
 			// #endif 
 			
 			
@@ -192,7 +211,8 @@ export default {
 		this.share.path = this.getCurrentRouteYm();
 		
 		if(this.isGoHome(this.share.path.split('?')[0])){
-			this.share.path = "/pages/tabBar/home/home"
+			this.share.path = "/pages/tabBar/home/home";
+			this.share.imageUrl = 'https://hsg.dctpay.com/filesystem/wxApplets/logo.png';
 		}
 		
 		// console.log(this.share.path, "this.share.path", res);
diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue
index ae98295..4e25412 100644
--- a/components/goods-list/goods-list.vue
+++ b/components/goods-list/goods-list.vue
@@ -105,7 +105,11 @@
 					</view>
 				</view>
 
-				<noMore :bgColor="'#ffffff'"></noMore>
+				<!-- <noMore :bgColor="'#ffffff'"></noMore> -->
+				<view  class="nomore font13 backcolorfff">
+						————  我是有底线的  ————
+				</view>
+				
 			</view>
 			<!-- 空 -->
 			<view class=" empty-content" v-else>
@@ -140,7 +144,7 @@
 </template>
 
 <script>
-	import noMore from '@/components/no-more/no-more.vue'
+	// import noMore from '@/components/no-more/no-more.vue'
 	import wybPopup from '@/components/wyb-popup/wyb-popup.vue'
 	import cartChoose from '@/components/cart-choose/cart-choose.vue'
 	import {
@@ -279,7 +283,7 @@
 		components: {
 			wybPopup,
 			cartChoose,
-			noMore,
+			// noMore,
 			uniBadge
 
 		},
diff --git a/components/no-more/no-more.vue b/components/no-more/no-more.vue
deleted file mode 100644
index 1e7b6e1..0000000
--- a/components/no-more/no-more.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-	<view class="nomore " :style="'font-size:'+fontSize+'px;background:'+bgColor">
-			————  {{msg}}  ————
-	</view>
-</template>
-
-<script>
-	export default {
-		props:{
-			fontSize:{
-				type:Number,
-				default:13
-			},
-			msg:{
-				type:String,
-				default:"我是有底线的"
-			},
-			bgColor:{
-				type:String,
-				default:"#f6f6f6"
-			}
-		},
-		
-	}
-</script>
-
-<style scoped>
-.nomore{
-	height: 40rpx;
-	line-height: 40rpx;
-	color:#ccc !important;
-	padding: 40rpx;
-	text-align: center;
-	/* background-color: #f6f6f6; */
-	
-}
-</style>
\ No newline at end of file
diff --git a/components/shopcart.vue b/components/shopcart.vue
index f8403ef..00761f9 100644
--- a/components/shopcart.vue
+++ b/components/shopcart.vue
@@ -7,9 +7,9 @@
 					<text class="allcount" style="background-color: #f01414;"
 						v-if="getAllCount && typeid == 1">{{getAllCount}}</text>
 					<text class="allcount backcorf2f6" v-if="getAllCount && typeid == 2">{{getAllCount}}</text>
-					<image src="../qianzhu-KFC/static/imgs/kfcicon.png" mode="widthFix" v-if="typeid == 1" class="img">
+					<image src="../qianzhu-KFC/static/imgs/kfcicon.png" mode="aspectFit" v-if="typeid == 1" class="img">
 					</image>
-					<image src="../qianzhu-KFC/static/imgs/skicon.png" mode="widthFix" v-if="typeid == 2" class="img">
+					<image src="../qianzhu-KFC/static/imgs/skicon.png" mode="aspectFit" v-if="typeid == 2" class="img">
 					</image>
 				</view>
 			</view>
@@ -216,7 +216,7 @@
 	}
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 	.list-text {
 		display: flex;
 		flex-direction: row;
@@ -246,8 +246,23 @@
 		border-radius: 50%;
 		height: 48px;
 		width: 48px;
-		line-height: 55px;
+		/* line-height: 55px; */
+		line-height: 48px;
+		text-align: center;
 		/* border: 6px solid #141d27; */
+		
+		.img {
+			font-size: 24px;
+			// line-height: 24px;
+			width: 30px;
+			height: 30px;
+			vertical-align: middle;
+			// padding-left: 10px;
+			// padding-top: 8px;
+			color: #cccccc;
+			border-radius: 50%;
+		}
+		
 	}
 
 	.iconBox .allcount {
@@ -263,16 +278,7 @@
 		color: #ffffff;
 	}
 
-	.img {
-		font-size: 24px;
-		line-height: 24px;
-		width: 30px;
-		height: 30px;
-		padding-left: 10px;
-		padding-top: 8px;
-		color: #cccccc;
-		border-radius: 50%;
-	}
+	
 
 	.carIcon .active {
 		background-color: #141d27;
diff --git a/pages.json b/pages.json
index 96712ff..88bcc3a 100644
--- a/pages.json
+++ b/pages.json
@@ -35,21 +35,21 @@
 				}
 			} */
 		},
-		{
-			"path": "pages/tabBar/classify/classify",
-			"style": {
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "商品",
-				"navigationBarBackgroundColor": "#3da7e7",
-				"backgroundColorTop": "#3da7e7",
-				"enablePullDownRefresh": false,
-				"disableScroll": true,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
-			}
-		},
+		// {
+		// 	"path": "pages/tabBar/classify/classify",
+		// 	"style": {
+		// 		"navigationBarTextStyle": "white",
+		// 		"navigationBarTitleText": "商品",
+		// 		"navigationBarBackgroundColor": "#3da7e7",
+		// 		"backgroundColorTop": "#3da7e7",
+		// 		"enablePullDownRefresh": false,
+		// 		"disableScroll": true,
+		// 		"app-plus": {
+		// 			"titleNView": false, //禁用原生导航栏
+		// 			"softinputNavBar": "none"
+		// 		}
+		// 	}
+		// },
 		
 		{
 			"path": "pages/qianZhuPay/union-pay/union-pay",
@@ -252,7 +252,11 @@
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
-				"softinputNavBar": "none"
+				"softinputNavBar": "none",
+				"h5": {
+					"titleNView": false
+				}
+				
 			}
 		}, {
 			"path": "pages/user/coupon/coupon",
@@ -999,7 +1003,24 @@
 			}]
 		}, {
 			"root": "physical-merchants",
-			"pages": [{
+			"pages": [
+				{
+					"path": "classify/classify",
+					"style": {
+						"navigationBarTextStyle": "white",
+						"navigationBarTitleText": "商品",
+						"navigationBarBackgroundColor": "#3da7e7",
+						"backgroundColorTop": "#3da7e7",
+						"enablePullDownRefresh": false,
+						"disableScroll": true,
+						"app-plus": {
+							"titleNView": false, //禁用原生导航栏
+							"softinputNavBar": "none"
+						}
+					}
+				},
+				
+				{
 					"path": "classify/goodsDetail/goodsDetail",
 					"style": {
 						"navigationBarTitleText": "商品详情",
diff --git a/pages/goods/HM-search/HM-search.vue b/pages/goods/HM-search/HM-search.vue
index 9851902..effe9ae 100644
--- a/pages/goods/HM-search/HM-search.vue
+++ b/pages/goods/HM-search/HM-search.vue
@@ -29,9 +29,9 @@
 
 			</view> -->
 		<!-- <view class="keyword-box" > -->
-		<view class="product-list mart10">
+		<view class="product-list ">
 			<view class="product" v-for="product in productList" :key="product.id" @tap="toGoods(product)">
-				<image mode="widthFix" :src="imageUrl+product.highMerchant.merchantLogo"></image>
+				<image mode="aspectFit" lazy-load="true" :src="imageUrl+product.highMerchant.merchantLogo"></image>
 				<view class="name">{{ product.storeName }}</view>
 			</view>
 		</view>
@@ -67,6 +67,7 @@
 		},
 		onLoad() {
 			this.init();
+			this.doSearch(false);
 		},
 		components: {
 			//引用mSearch组件，如不需要删除即可
@@ -249,22 +250,29 @@
 	}
 
 	.product-list {
-		width: 92%;
-		padding: 0 4% 3vw 4%;
+		width: 100%;
+		padding:20rpx;
+		box-sizing: border-box;
 		display: flex;
 		justify-content: space-between;
 		flex-wrap: wrap;
+		background-color: #f2f2f2;
 
 		.product {
 			width: 48%;
 			border-radius: 20upx;
 			background-color: #fff;
 			margin: 0 0 15upx 0;
+			box-sizing: border-box;
+			padding:20rpx;
 			box-shadow: 0upx 5upx 25upx rgba(0, 0, 0, 0.1);
-
+			text-align: center;
 			image {
-				width: 100%;
+				width: 100px;
+				height: 100px;
+				
 				border-radius: 20upx 20upx 0 0;
+				
 			}
 
 			.name {
@@ -273,7 +281,7 @@
 				display: -webkit-box;
 				-webkit-box-orient: vertical;
 				-webkit-line-clamp: 1;
-				text-align: justify;
+				text-align: center;
 				overflow: hidden;
 				font-size: 30upx;
 			}
diff --git a/pages/goods/goods-list/goods-list.vue b/pages/goods/goods-list/goods-list.vue
index e8426f9..65b9556 100644
--- a/pages/goods/goods-list/goods-list.vue
+++ b/pages/goods/goods-list/goods-list.vue
@@ -81,16 +81,7 @@
 				imageUrl: app.globalData.imgUrl,
 				// 轮播图片
 				swiperList: [
-					// {
-					// 	id: 1,
-					// 	src: 'url1',
-					// 	img: 'banner2.png'
-					// },
-					// {
-					// 	id: 2,
-					// 	src: 'url2',
-					// 	img: 'banner3.png'
-					// }
+					
 				],
 				currentSwiper: 0,
 				pageNum: 1,
diff --git a/pages/goods/goods.vue b/pages/goods/goods.vue
index cc35064..14c6ec4 100644
--- a/pages/goods/goods.vue
+++ b/pages/goods/goods.vue
@@ -138,7 +138,7 @@
 				afterHeaderOpacity: 0, //不透明度
 				//是否显示返回按钮
 				// #ifndef MP
-				showBack: true,
+				// showBack: true,
 				// #endif
 				//轮播主图数据
 				swiperList: [],
@@ -182,7 +182,7 @@
 			app.globalData.storename = '';
 			// #ifdef MP
 			//小程序隐藏返回按钮
-			this.showBack = false;
+			// this.showBack = false;
 			// #endif
 			//option为object类型，会序列化上个页面传递的参数
 		},
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 3aa8a17..e2e5022 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -6,7 +6,7 @@
 				<image class="flleft" mode="widthFix" v-if="couponList.couponImg" :src="imageUrl+couponList.couponImg"></image>
 				<view class="tcrig">
 					<view class="font18 fontwig6 fcor333 text1">{{couponList.couponName}}</view>
-					<view class="font13  fcor666 mart10">规格: 默认</view>
+					<!-- <view class="font13  fcor666 mart10">规格: 默认</view> -->
 					<view class="price-number mart10" v-if="isDiscont">
 						<view class="price font16">￥{{couponList.salesPrice}}</view>
 						<view class="flright fotrt paddleft10">x1</view>
@@ -34,7 +34,7 @@
 				</view>
 			</view>
 
-			<view class="width94 line1 mart5 marb5"></view>
+			<!-- <view class="width94 line1 mart5 marb5"></view>
 			<view class="height50 width100 backcorfff">
 				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
 					配送费
@@ -42,7 +42,7 @@
 				<view class="width40 flright alijun paddtright10 font15 fontwig6 fcor666">
 					￥0
 				</view>
-			</view>
+			</view> -->
 
 			<view class="width94 line1 mart5 marb5"></view>
 			<view class="height50 width100 backcorfff" @click="showPopup()">
@@ -134,7 +134,7 @@
 
 			<view class="height40 width100 backcorfff">
 				<view class="height50 width100 backcorfff">
-					<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+					<view class="width100 flleft fcor333 fontwig6 font16 border-box" style="padding-left: 4%;">
 						支付方式
 						<!-- : <text class="jfrecharge" @click="jumpdeposits"
 			 	v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3">积分充值</text> -->
@@ -276,17 +276,17 @@
 			</view>
 		</view>
 		<wybPopup ref="popup" type="bottom" width="500" :scrollY="true" radius="6" :showCloseIcon="true">
-			<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view>
-			<view class="width92 height110 tccs mart10" v-for="(items, index) in UserNormalDiscountList" :key="items"
+			<view class="fotct font18 fontwig6 fcor333 paddtop10 height30">优惠券选择</view>
+			<view class="width92 paddtop10 paddbotm10 border-box tccs mart10" v-for="(items, index) in UserNormalDiscountList" :key="items"
 				@click="radioChanges(items)">
 				<image mode="widthFix" class="flleft" :src="imageUrl+items.discountImg"></image>
-				<view class="tcrig">
-					<view class="yhprice">
-						<radio :checked="items.id == memDiscountId" color="#0083f5" />
-					</view>
+				<view class=" flex-1 border-box pd-main ">
+					
 					<view class="font16 fontwig6 fcor333 text1">{{items.discountName}}</view>
 					<view class="font13 fcor999 mart5">有效期至：{{items.useEndTime | formatDate('-')}}</view>
-
+				</view>
+				<view class="yhprice flex-s0 pd-main">
+					<radio :checked="items.id == memDiscountId" color="#0083f5" />
 				</view>
 			</view>
 		</wybPopup>
@@ -1244,7 +1244,7 @@
 								});
 							} else {
 								uni.reLaunch({
-									url: '../success/success?id=' + that.couponId
+									url: '../pay/success/success?id=' + that.couponId
 								});
 							}
 						},
@@ -1364,10 +1364,11 @@
 	}
 
 	.yhprice {
-		width: 100%;
-		height: 25px;
-		text-align: right;
-		margin-top: -20px;
+		// width: 100%;
+		// // height: 25px;
+		// padding:15rpx;
+		// text-align: right;
+		// margin-top: -20px;
 	}
 
 	.price-number {
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 417925b..83c151d 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -10,18 +10,28 @@
 		<view class="" :style="{paddingTop:StatusBar,position:'relative',}">
 
 			<!-- 定位城市 position:'relative' ,top:StatusBar,-->
+			<!-- #ifdef MP-->
 			<view  v-if="!isdisplay" class="city-con dis-flex padleft15" :style="{ height:CustomBar+'px', }">
 				<view class="addr" @click="goPostion">
 					{{ city }}
 					<image mode="aspectFit" style="width: 15px;height: 15px;" :src="imagewxUrl+imgadres2"></image>
 				</view>
 			</view>
-
+			<!-- #endif -->
 			<!-- 顶部导航栏 -->
 			<view  v-if="!isdisplay"  class="header"
-				:style="{ position: 'sticky',top:StatusBar,height:Number(CustomBar + 5) +'px',backgroundColor: bgColor,}">
+				:style="{ position: 'sticky',top:StatusBar,height:height,backgroundColor: bgColor,}">
 
 				<view :style="{width:width}" class="header-chid">
+					
+					<!-- #ifdef H5-->
+					<view  v-if="!isdisplay" class=" dis-flex paddtright10 flex-s0" >
+						<view class="addr" @click="goPostion">
+							{{ city }}
+							<image mode="aspectFit" style="width: 15px;height: 15px;" :src="imagewxUrl+imgadres2"></image>
+						</view>
+					</view>
+					<!-- #endif -->
 					<view class="input-box">
 						<input placeholder="搜索门店" placeholder-style="color:#c0c0c0;" @tap="toSearch()" />
 						<view class="icon search"></view>
@@ -31,7 +41,7 @@
 					<view class="icon-btn">
 						<!-- #ifdef MP-->
 						<button open-type="contact" style="background-color: transparent;padding: 0px;">
-							<image src="../../../static/img/home/cusser.png" mode="aspectFit" class="icon30"
+							<image src="../../../static/img/home/cusser.png" mode="aspectFit" class="icon30 verc"
 								style="height: 30px;"></image>
 						</button>
 						<!-- #endif -->
@@ -139,7 +149,9 @@
 						<image mode="aspectFill" class="width100" style="border-radius: 5px 5px 0 0;height: 100px;"
 							:src="imageUrl+goods.couponImg"></image>
 						<view class="width96 fcor333 font15 fontwig6">{{goods.couponName}}</view>
-						<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.salesPrice}}</view>
+						<!-- <view class="width94 fcoreb5 font15 fontwig6">¥{{goods.salesPrice}}</view> -->
+						<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.discountPrice}}</view>
+						
 					</view>
 				</view>
 				<view class="width94 alijusnostart mart20" v-if="item.type == 9 ">
@@ -234,10 +246,13 @@
 				isdisplay: true, //是否展示
 
 				StatusBar: this.StatusBar + 'px',
+				// #ifdef MP-WEIXIN
 				Custom: this.Custom,
+				// #endif
 				width: '100%',
 				CustomBar: this.CustomBar,
 				bgColor: '#3da7e7',
+				height:Number(this.CustomBar + 5) +'px',
 				// dhTop:Number(this.StatusBar+this.CustomBar)+'px' 
 
 
@@ -254,7 +269,7 @@
 			}
 		},
 		onPageScroll(obj) {
-			// console.log(obj,"obj")
+			// #ifdef MP-WEIXIN
 			if (obj.scrollTop >= this.CustomBar) {
 				this.width = this.Custom.left + 'px';
 				this.bgColor = "#089bf5";
@@ -262,6 +277,17 @@
 				this.width = "100%";
 				this.bgColor = "#3da7e7";
 			}
+			// #endif
+			
+			// #ifdef H5
+			if (obj.scrollTop >= Number(this.CustomBar + 5)) {
+				this.bgColor = "#089bf5";
+			} else {
+				this.bgColor = "#3da7e7";
+			}
+			
+			// #endif
+			
 		},
 		onLoad(options) {
 			let that = this;
@@ -828,7 +854,15 @@
 			display: flex;
 			align-items: center;
 			height: 100%;
+			
+			/* #ifdef MP-WEIXIN */
 			padding: 4px 10px 4px 10px;
+			/* #endif */
+			
+			/* #ifdef H5 */
+			padding:8px 10px;
+			/* #endif */
+			
 			box-sizing: border-box;
 			transition: 0.2s all linear;
 		}
@@ -865,8 +899,8 @@
 		}
 
 		.icon-btn {
-			width: 60upx;
-			height: 60upx;
+			// width: 60upx;
+			// height: 60upx;
 			flex-shrink: 0;
 			margin-left: 5px;
 			display: flex;
diff --git a/pages/user/generatePoster/generatePoster.vue b/pages/user/generatePoster/generatePoster.vue
index 1066c21..af1248b 100644
--- a/pages/user/generatePoster/generatePoster.vue
+++ b/pages/user/generatePoster/generatePoster.vue
@@ -1,17 +1,17 @@
 <template>
 	<view>
 		<view class="width90 mart15 border-r backcorfff">
-			<image :src="imagewxUrl+imgadres1" class="mart20 margle10 width20" mode="widthFix"></image>
-			<image :src="imgs" mode="widthFix" class="width80 mart20"></image>
+			<image :src="imagewxUrl+imgadres1" class="mart20 margle10 width20 height22" mode="widthFix"></image>
+			<image :src="imgs" mode="widthFix" class="width80 mart20 height260"></image>
 			<view class="font20 fcor666 fotct mart10">扫一扫上面的二维码图案</view>
 			<view class="font20 fcor666 fotct mart5 paddbotm20">推荐好友加入嗨森逛</view>
 		</view>
 
-		<image :src="imagewxUrl+imgadres2" mode="widthFix" class="width90 mart15"></image>
+		<image :src="imagewxUrl+imgadres2" mode="widthFix" class="width90 mart15 height130"></image>
 		<view class="width90 font16 mart10 fcor666">邀请方式</view>
-		<image :src="imagewxUrl+imgadres3" mode="widthFix" class="width90 mart10"></image>
-		<image :src="imagewxUrl+imgadres4" mode="widthFix" class="width90 mart10"></image>
-		<image :src="imagewxUrl+imgadres5" mode="widthFix" class="width90 mart10 paddbotm15"></image>
+		<image :src="imagewxUrl+imgadres3" mode="widthFix" class="width90 mart10 height75"></image>
+		<image :src="imagewxUrl+imgadres4" mode="widthFix" class="width90 mart10 height75"></image>
+		<image :src="imagewxUrl+imgadres5" mode="widthFix" class="width90 mart10 paddbotm15 height75"></image>
 	</view>
 </template>
 
diff --git a/pages/user/mineCoupons/mineCoupons.vue b/pages/user/mineCoupons/mineCoupons.vue
index 202a6a0..cedbffd 100644
--- a/pages/user/mineCoupons/mineCoupons.vue
+++ b/pages/user/mineCoupons/mineCoupons.vue
@@ -11,12 +11,12 @@
 		</view>
 
 
-		<view class="product-list mart20" v-for="product in productList" :key="product.id"
+		<view class="product-list dis-flex mart20" v-for="product in productList" :key="product.id"
 			@click="jumpMineCou(product.id,product.highCouponModel.id)">
-			<image mode="widthFix" class="headimg mart10 flleft" :src="imageUrl+product.highCouponModel.couponImg">
+			<image mode="widthFix" class="headimg  flex-s0" :src="imageUrl+product.highCouponModel.couponImg">
 			</image>
-			<view class="headconts paddtright10">
-				<view class="headtitle paddtop15 font18 fontwig6 fcor333 text1">{{ product.highCouponModel.couponName }}
+			<view class="headconts ">
+				<view class="headtitle  font18 fontwig6 fcor333 text1">{{ product.highCouponModel.couponName }}
 				</view>
 				<view class="headtitle paddtop10 font15 fontwig6 fcor999 text1">有效期至:
 					{{product.useEndTime | formatDate('-')}}</view>
@@ -41,7 +41,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="loading-text" v-if="productList != '' ">{{ loadingText }}</view>
+		<view class="loading-text" v-if="isNoMoreData ">{{ loadingText }}</view>
 	</view>
 </template>
 
@@ -68,7 +68,7 @@
 		onPageScroll(e) {
 			return;
 			//兼容iOS端下拉时顶部漂移
-			this.headerPosition = e.scrollTop >= 0 ? "fixed" : "absolute";
+			// this.headerPosition = e.scrollTop >= 0 ? "fixed" : "absolute";
 		},
 		filters: {
 			//过滤器 用于格式化时间
@@ -89,7 +89,9 @@
 			}
 		},
 		onLoad() {
-			this.getUserCouponList(1);
+		},
+		onShow(){
+			this.showType(0);
 		},
 		onReachBottom() {
 			if (this.tabbarIndex === 0) {
@@ -103,20 +105,15 @@
 		methods: {
 			showType(tbIndex) {
 				this.tabbarIndex = tbIndex;
+				this.pageNum = 1;
+				this.productList = [];
+				this.isNoMoreData = false;
+				this.loadingText = '';
 				if (this.tabbarIndex === 0) {
-					this.pageNum = 1;
-					this.productList = []
-					this.isNoMoreData = false;
 					this.getUserCouponList(1);
-				} else if (this.tabbarIndex === 1) {
-					this.pageNum = 1;
-					this.productList = []
-					this.isNoMoreData = false;
+				} else if (this.tabbarIndex === 1) {	
 					this.getUserCouponList(2);
-				} else if (this.tabbarIndex === 2) {
-					this.pageNum = 1;
-					this.productList = []
-					this.isNoMoreData = false;
+				} else if (this.tabbarIndex === 2) {	
 					this.getUserCouponList(0);
 				}
 			},
@@ -132,7 +129,7 @@
 				})
 				if (this.isNoMoreData) {
 					uni.hideLoading()
-					this.loadingText = '到底了';
+					this.loadingText = '没有更多了';
 					return false;
 				}
 				let pagenum = this.pageNum;
@@ -147,8 +144,10 @@
 						uni.hideLoading();
 						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
 						this.productList = this.productList.concat(res.return_data.list);
-						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+						// if (res.return_data.total == (this.pageNum * this.pageSize)) {
+						if (res.return_data.total == ((this.pageNum-1) * this.pageSize + res.return_data.list.length)) {
 							this.isNoMoreData = true;
+							this.loadingText = '没有更多了';
 						}
 						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
 					} else {
@@ -172,7 +171,8 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		height: 60upx;
+		// height: 60upx;
+		padding:30upx 0;
 		color: #979797;
 		font-size: 24upx;
 	}
@@ -208,17 +208,20 @@
 	.product-list {
 		background-color: #FFFFFF;
 		width: 92%;
-		height: 220rpx;
+		// height: 220rpx;
 		margin-left: 4%;
+		padding:20rpx;
+		box-sizing: border-box;
 
 		.headimg {
 			width: 200rpx;
-			margin-left: 10rpx;
+			margin-right: 10px;
 			max-height: 200rpx;
 		}
 
 		.headconts {
-			margin-left: 220rpx;
+			flex: 1;
+			// margin-left: 220rpx;
 		}
 
 		.info {
diff --git a/pages/user/news/news.vue b/pages/user/news/news.vue
index 432b3b7..67c290b 100644
--- a/pages/user/news/news.vue
+++ b/pages/user/news/news.vue
@@ -15,7 +15,7 @@
 		</view>
 		<view class="newscont width90 border-8r backcorfff mart20" v-for="(item,index) in newsList" :key="index" @click="jumporther(item)">
 			<view class="alijusstart mart10 margle10" v-if="item.type == 1">
-				<image src="../../../static/img/user/notive.png" mode="widthFix" class="icon30"></image>
+				<image src="../../../static/img/user/notive.png" mode="widthFix" class="icon30 height30h"></image>
 				<text class="font18 margle" style="color: #0B1D83;">服务通知</text>
 			</view>
 			<view class="alijusstart mart10 margle10" v-if="item.type == 2">
@@ -30,7 +30,7 @@
 			<!-- 服务通知 -->
 			<view class="width90 mart20" v-if="item.type == 1">
 				<view class="font18 fcor333">{{item.title}}</view>
-				<image mode="widthFix" class="width100 mart10" :src="imageUrl+item.image"></image>
+				<image mode="widthFix" class="width100 mart10 height150" :src="imageUrl+item.image"></image>
 			</view>
 
 			<!-- 交易信息 -->
diff --git a/physical-merchants/address/address.vue b/physical-merchants/address/address.vue
index 31a9972..f8a6352 100644
--- a/physical-merchants/address/address.vue
+++ b/physical-merchants/address/address.vue
@@ -33,7 +33,11 @@
 
 				</view>
 			</radio-group>
-			<noMore></noMore>
+			<!-- <noMore></noMore> -->
+			<view  class="nomore font13 backcor9">
+					————  我是有底线的  ————
+			</view>
+			
 		</scroll-view>
 
 
@@ -45,7 +49,7 @@
 </template>
 
 <script>
-	import noMore from '@/components/no-more/no-more.vue'
+	// import noMore from '@/components/no-more/no-more.vue'
 	import {
 		getDeliveryAddressList,
 		deleteAddress,
@@ -55,7 +59,7 @@
 
 	export default {
 		components: {
-			noMore,
+			// noMore,
 
 		},
 		data() {
diff --git a/physical-merchants/classify/cart/cart.vue b/physical-merchants/classify/cart/cart.vue
index 666fc8f..6a465c2 100644
--- a/physical-merchants/classify/cart/cart.vue
+++ b/physical-merchants/classify/cart/cart.vue
@@ -56,7 +56,10 @@
 					</view>
 
 				</uni-swipe-action>
-				<noMore ></noMore>
+				<!-- <noMore ></noMore> -->
+				<view  class="nomore font13 backcor9">
+						————  我是有底线的  ————
+				</view>
 				
 			</scroll-view>
 			
@@ -111,7 +114,7 @@
 </template>
 
 <script>
-	import noMore from '@/components/no-more/no-more.vue'
+	// import noMore from '@/components/no-more/no-more.vue'
 	import uniNumberBox from '@/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue'
 	import {
 		getShoppingCartList,
@@ -166,7 +169,7 @@
 		},
 		components: {
 			// cartList,
-			noMore,
+			// noMore,
 			"uni-number-box": uniNumberBox
 		},
 		computed: {
diff --git a/pages/tabBar/classify/classify.css b/physical-merchants/classify/classify.css
similarity index 100%
rename from pages/tabBar/classify/classify.css
rename to physical-merchants/classify/classify.css
diff --git a/pages/tabBar/classify/classify.vue b/physical-merchants/classify/classify.vue
similarity index 100%
rename from pages/tabBar/classify/classify.vue
rename to physical-merchants/classify/classify.vue
diff --git a/physical-merchants/classify/goodsDetail/goodsDetail.vue b/physical-merchants/classify/goodsDetail/goodsDetail.vue
index d43787e..453e4d2 100644
--- a/physical-merchants/classify/goodsDetail/goodsDetail.vue
+++ b/physical-merchants/classify/goodsDetail/goodsDetail.vue
@@ -16,8 +16,8 @@
 			<!-- 商品信息 -->
 			<view class="goods-message br bg-white marb10">
 				<view class="goods-price">
-					<text>&yen;{{goodsDetail.price}}</text>
-					<text class="old">&yen;{{goodsDetail.originalPrice}}</text>
+					<text>&yen;{{goodsDetail.price || ''}}</text>
+					<text class="old">&yen;{{goodsDetail.originalPrice || ''}}</text>
 				</view>
 				<view class="goods-title">
 					<view class="goods-text">{{goodsDetail.name || ''}}</view>
@@ -69,7 +69,10 @@
 					:src="item" @click="perImage(index,goodsDetail.detailImg)">
 				</image>
 			</view>
-			<noMore></noMore>
+			<!-- <noMore></noMore> -->
+			<view  class="nomore font13 backcor9">
+					————  我是有底线的  ————
+			</view>
 		</view>
 
 		<!-- 底部购物车 -->
@@ -147,7 +150,7 @@
 </template>
 
 <script>
-	import noMore from '@/components/no-more/no-more.vue'
+	// import noMore from '@/components/no-more/no-more.vue'
 	import wybPopup from '@/components/wyb-popup/wyb-popup.vue'
 
 	import cartChoose from '@/components/cart-choose/cart-choose.vue'
@@ -260,7 +263,7 @@
 			wybPopup,
 			cartChoose,
 			uniGoodsNav,
-			noMore,
+			// noMore,
 			ccShareMenu,
 		},
 		onShow() {
diff --git a/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue b/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
index 41590fd..d61d5d8 100644
--- a/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
+++ b/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
@@ -539,7 +539,8 @@
 		width: 80px;
 		height: 100%;
 		// margin-top: 85px;
-		margin-bottom: 55px;
+		padding-bottom: 55px;
+		box-sizing: border-box;
 		background-color: #fff;
 	}
 
diff --git a/qianzhu-KFC/menu-list/menu-list.vue b/qianzhu-KFC/menu-list/menu-list.vue
index 187b497..d929349 100644
--- a/qianzhu-KFC/menu-list/menu-list.vue
+++ b/qianzhu-KFC/menu-list/menu-list.vue
@@ -539,7 +539,9 @@
 		width: 80px;
 		height: 100%;
 		// margin-top: 85px;
-		margin-bottom: 55px;
+		// margin-bottom: 55px;
+		padding-bottom: 55px;
+		box-sizing: border-box;
 		background-color: #fff;
 	}
 
diff --git a/subPages/coupon-comfirmation/coupon-comfirmation.vue b/subPages/coupon-comfirmation/coupon-comfirmation.vue
index 99fb355..4ca376c 100644
--- a/subPages/coupon-comfirmation/coupon-comfirmation.vue
+++ b/subPages/coupon-comfirmation/coupon-comfirmation.vue
@@ -6,7 +6,7 @@
 				<image class="flleft" mode="widthFix" :src="imageUrl+couponList.packageDetail.listImg"></image>
 				<view class="tcrig">
 					<view class="font18 fontwig6 fcor333 text1">{{couponList.packageDetail.title}}</view>
-					<view class="font13  fcor666 mart10">规格: 默认</view>
+					<!-- <view class="font13  fcor666 mart10">规格: 默认</view> -->
 					<view class="price-number mart10">
 						<view class="price font16">￥{{couponList.packageDetail.price}}</view>
 						<view class="flright fotrt paddleft10">x1</view>
diff --git a/subPages/coupon-package/coupon-package.vue b/subPages/coupon-package/coupon-package.vue
index ef1eb67..adfc233 100644
--- a/subPages/coupon-package/coupon-package.vue
+++ b/subPages/coupon-package/coupon-package.vue
@@ -59,16 +59,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,
diff --git a/uni.scss b/uni.scss
index e97107f..3e00830 100644
--- a/uni.scss
+++ b/uni.scss
@@ -333,6 +333,8 @@ $uni-font-size-paragraph:30upx;
 	background: linear-gradient(to bottom, #3267f6, #f5f5f5);
 }
 
+
+
 .backcorf06{
 	background-color: #0083f5;
 }
@@ -1003,4 +1005,12 @@ $uni-font-size-paragraph:30upx;
 //text
 .text-lt{
 	text-decoration: line-through;
+}
+
+.nomore{
+	height: 40rpx;
+	line-height: 40rpx;
+	color:#ccc !important;
+	padding: 40rpx;
+	text-align: center;
 }
\ No newline at end of file