bug修改

pages/index/discountCard.vue

@@ -59,7 +59,7 @@
 					<view  class="rightJian">使用规则
 					  <image src="../../static/img/little_rightArrow.png" mode="" style="width: 24rpx;height: 24rpx;"></image>
 					</view>
-					<view class="gouse" v-if="item.state==0" @click="goUseFn(item)">去使用</view>
+					<view class="gouse" v-if="item.usedState==0" @click="goUseFn(item)">去使用</view>
 				</view>
 				</view>
 

pages/index/index.vue

@@ -141,7 +141,7 @@
 			</swiper>
 		</view>
 		<!-- 热门活动 -->
-		<view v-if="homeCardList.openMActivity">
+		<view v-if="homeCardList.openMActivity&&homeCardList.openMActivity.openCollectingList">
 			<view class="Hot" v-if="homeCardList.openMActivity.openCollectingList.length>0">
 				<view class="hotTop">
 					<view class="hotLeft">

pages/index/shopList.vue

@@ -103,7 +103,7 @@
 				noMoreShow: false,
                 regionName:'',
                 twoRegionName:'',
-                cityName:'',
+                cityName:'城市',
 				area:'',
 				cityCode:'',
 				areaList:'',

pages/user/historySpend.vue

@@ -364,7 +364,7 @@
 		font-size: 24rpx;
 		color: #F19D01;
 		padding: 0rpx 10rpx;
-		border: 1rpx solid #F19D01;
+		border: 1px solid #F19D01;
 		border-radius: 4rpx;
 		height: 33rpx;
 	}

pages/user/user.vue

@@ -45,7 +45,7 @@
 			</view>
 		
 		</view>
-		<view class="remindBox" v-if="numList.remindType!=0">
+		<view class="remindBox" v-if="numList.remindType!=0&&numList.remindIntegral!=0">
 		  <view class="remindLeft" style="display: flex;">
 			  <image style="width: 24rpx;height: 24rpx;margin-top: 2rpx;" src="http://dmsphoto.66km.com.cn/thFiles/BA87B937-90F3-420C-A21C-A5B7BE7E8B07.png" mode=""></image>
 			  <span style="padding-left: 10rpx;">您有</span>
@@ -667,6 +667,12 @@
 					this.phone = res.data.openUser.mobilePhone;
                     this.showSetting=res.data.showSetting
                     this.f2csystemlist=res.data.f2csystemlist
+					if(this.numList.customerInfo.pState==1&&this.numList.shopSettings.partnerDisabled){
+						this.kkshow=true
+					}
+					if(this.numList.customerInfo.rebateState==1&&this.numList.shopSettings.introductionDisabled){
+						this.kkshow=true
+					}
 				})
 			},
 			gonavigateTo(url) {