1.优化未配置活动问题

pages/index/index.vue

@@ -9,7 +9,7 @@
 			<view class="width40w mart10 line1"></view>
 		</view>
 		<!-- 商家优惠 -->
-		<view class="height50 width100  mart10 backcorfff">
+		<view class="height50 width100  mart10 backcorfff" v-if="storeList.discountActivity !== '' && storeList.discountActivity !== null">
 			<view class="width50 flleft fcor666 font16 alijusstart" style="padding-left: 5%;">
 				门店优惠
 			</view>
@@ -415,14 +415,17 @@
 			//计算价格
 			calculation(item) {
 				let storetype = '';
-				let storeprice = '';
+				let storeprice = '';
-				if (item >= this.storeList.discountActivity.discountCondition && this.storeList.discountActivity.discountType == 1) {
+				if(this.storeList.discountActivity !='' && this.storeList.discountActivity !=null){
-					storetype = this.storeList.discountActivity.discountType;
+					if (item >= this.storeList.discountActivity.discountCondition && this.storeList.discountActivity.discountType == 1) {
-					storeprice = this.storeList.discountActivity.discountPrice;
+						storetype = this.storeList.discountActivity.discountType;
-				}else{
+						storeprice = this.storeList.discountActivity.discountPrice;
-					storetype = this.storeList.discountActivity.discountType;
+					}else{
-					storeprice = this.storeList.discountActivity.discountPrice;
+						storetype = this.storeList.discountActivity.discountType;
+						storeprice = this.storeList.discountActivity.discountPrice;
+					}
 				}
+				
 				let datas = {
 					transactionPrice: item,
 					storeDiscountType: storetype,