线上2.1.39

pages/goods/externalCoupon/externalCoupon.vue

@@ -39,7 +39,7 @@
 
 		<image :src="imageres5" class="width100 headbgimg" mode="widthFix"
 			v-if="couponsDetails.highDiscount.usingRange == 8"></image>
-		<view class="width90 contents backcorfff height260 border-r fotct"
+		<view class="width90 contents backcorfff  border-r fotct"
 			v-if="couponsDetails.highDiscount.usingRange == 8">
 			<view class="width90 font18 fontwig6 fcor333 paddtop10 ">{{couponsDetails.highDiscount.discountName}}
 			</view>
@@ -76,7 +76,7 @@
 		<!-- //新的优惠券领取 -->
 		<image :src="imageres4" class="width100 headbgimg" mode="widthFix"
 			v-if="couponsDetails.highDiscount.usingRange != 8"></image>
-		<view class="width90 contents backcorfff height260 border-r fotct"
+		<view class="width90 contents backcorfff  border-r fotct"
 			v-if="couponsDetails.highDiscount.usingRange != 8">
 			<view class="width90 font18 fontwig6 fcor333 paddtop10 ">{{couponsDetails.highDiscount.discountName}}
 			</view>
@@ -643,7 +643,7 @@
 	.contents {
 		position: relative;
 		top: 160px;
-
+		padding-bottom: 1px;
 		.headcontimg {
 			width: 90px;
 			height: 90px;

pages/goods/goods-list/goods-list.vue

@@ -227,7 +227,8 @@
 				}
 				let pagenum = this.pageNum;
 				let params = {
-					regionId: app.globalData.cityId,
+					// regionId: app.globalData.cityId,
+					companyId:app.globalData.companyId,
 					goodsTypeId: this.goodtyid,
 					pageNum: pagenum,
 					pageSize: this.pageSize,

pages/tabBar/classify/classify.vue

@@ -160,11 +160,9 @@
 		},
 		onShow(){	
 			this.$nextTick(()=>{
-				if(this.$refs.goodsList&&app.globalData.userInfo){
+				if(this.isLoading==false&&app.globalData.userInfo){
 					this.$refs.goodsList.refreshCartNum()
 				}
-				
-				
 			})
 					
 					
@@ -194,7 +192,7 @@
 									length:_this.data_content.children.length	
 								};
 								// console.log(_this.selectObject,"_this.selectObject")
-								await _this.get_goods_list(_this.data_content.children[_this.nav_active_item_two_index].key);//获取右侧商品
+								await _this.get_goods_list(_this.data_content.children[_this.nav_active_item_two_index].key,true);//获取右侧商品
 							}	
 						}
 					
@@ -247,7 +245,7 @@
 				this.get_goods_list(this.data_content.children[this.nav_active_item_two_index].key)
 			},
 			
-			get_goods_list(key){
+			get_goods_list(key,isRefreshCart=false){
 				
 				let price =0;
 				if(this.sortIndex ==3){
@@ -276,6 +274,11 @@
 				getListGoodsDetail(params).then(res=>{		
 					setTimeout(()=>{
 						this.isLoading = false;
+						if(isRefreshCart&&app.globalData.userInfo){
+							this.$nextTick(()=>{
+								this.$refs.goodsList.refreshCartNum();
+							})
+						}
 					},200)
 					// uni.hideLoading();
 					if (res.return_code == '000000') {

subPages/coupon-package/coupon-package.vue

@@ -131,7 +131,8 @@
 				}
 				let pagenum = this.pageNum;
 				let params = {
-					regionId: app.globalData.cityId,
+					// regionId: app.globalData.cityId,
+					companyId:app.globalData.companyId,
 					pageNum: pagenum,
 					pageSize: this.pageSize,
 					title: this.couponName