diff --git a/App.vue b/App.vue
index 2facf5c..3182453 100644
--- a/App.vue
+++ b/App.vue
@@ -5,7 +5,6 @@
 import { mapMutations } from "vuex";
 import APPUpdate from "@/plugins/APPUpdate";
 import { getClipboardData } from "@/js_sdk/h5-copy/h5-copy.js";
-<<<<<<< HEAD
 import config from "@/config/config";
 import storage from "@/utils/storage";
 // 悬浮球
diff --git a/pages/cart/coupon/couponCenter.vue b/pages/cart/coupon/couponCenter.vue
index c7f9457..c07e07b 100644
--- a/pages/cart/coupon/couponCenter.vue
+++ b/pages/cart/coupon/couponCenter.vue
@@ -1,48 +1,47 @@
 <template>
-	<view class="coupon-center">
-		<div class="swiper-box">
-			<div class="swiper-item">
-				<div class="scroll-v" enableBackToTop="true" scroll-y>
-					<u-empty mode="coupon" style='margin-top: 20%;' text="没有优惠券了" v-if="whetherEmpty"></u-empty>
-					<view v-else class="coupon-item" v-for="(item, index) in couponList" :key="index">
-						<view class="left">
-							<view class="wave-line">
-								<view class="wave" v-for="(item, index) in 12" :key="index"></view>
-							</view>
-							<view class="message">
-								<view>
-									<!--判断当前优惠券类型  couponType  PRICE || DISCOUNT -->
-									<span v-if="item.couponType == 'DISCOUNT'">{{ item.couponDiscount }}折</span>
-									<span v-else>{{ item.price }}元</span>
-								</view>
-								<view>满{{ item.consumeThreshold | unitPrice }}元可用</view>
-							</view>
-							<view class="circle circle-top"></view>
-							<view class="circle circle-bottom"></view>
-						</view>
-						<view class="right">
-							<view>
-								<!-- 根据scopeType 判断是否是 平台、品类或店铺  -->
-								<view class="coupon-title wes-3" v-if="item.scopeType">
-									<span v-if="item.scopeType == 'ALL' && item.id == 'platform'">全平台</span>
-									<span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
-									<view v-else>{{ item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用
-									</view>
-								</view>
-								<view v-if="item.endTime">有效期至：{{ item.endTime.split(" ")[0] }}</view>
-							</view>
-							<view class="receive" @click="receive(item)">
-								<text>点击</text><br />
-								<text>领取</text>
-							</view>
-							<view class="bg-quan"> 券 </view>
-						</view>
-					</view>
-
-				</div>
-			</div>
-		</div>
-	</view>
+  <view class="coupon-center">
+    <swiper class="swiper-box">
+      <swiper-item class="swiper-item">
+        <scroll-view class="scroll-v" enableBackToTop="true" scroll-y @scrolltolower="loadMore">
+          <u-empty mode="coupon" text="没有优惠券了" v-if="whetherEmpty"></u-empty>
+          <view v-else class="coupon-item" v-for="(item, index) in couponList" :key="index">
+            <view class="left">
+              <view class="wave-line">
+                <view class="wave" v-for="(item, index) in 12" :key="index"></view>
+              </view>
+              <view class="message">
+                <view>
+                  <!--判断当前优惠券类型  couponType  PRICE || DISCOUNT -->
+                  <span v-if="item.couponType == 'DISCOUNT'">{{ item.couponDiscount }}折</span>
+                  <span v-else>{{ item.price }}元</span>
+                </view>
+                <view>满{{ item.consumeThreshold | unitPrice }}元可用</view>
+              </view>
+              <view class="circle circle-top"></view>
+              <view class="circle circle-bottom"></view>
+            </view>
+            <view class="right">
+              <view>
+                <!-- 根据scopeType 判断是否是 平台、品类或店铺  -->
+                <view v-if="item.scopeType">
+                  <span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span>
+                  <span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
+                  <view v-else>{{  item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用</view>
+                </view>
+                <view v-if="item.endTime">有效期至：{{  item.endTime.split(" ")[0] }}</view>
+              </view>
+              <view class="receive" @click="receive(item)">
+                <text>点击</text><br />
+                <text>领取</text>
+              </view>
+              <view class="bg-quan"> 券 </view>
+            </view>
+          </view>
+          <uni-load-more :status="loadStatus"></uni-load-more>
+        </scroll-view>
+      </swiper-item>
+    </swiper>
+  </view>
 </template>
 
 <script>
@@ -291,4 +290,4 @@
 		width: 260rpx;
 
 	}
-</style>
+</style>
diff --git a/pages/cart/coupon/couponDetail.vue b/pages/cart/coupon/couponDetail.vue
index 2f2a39f..66dd99b 100644
--- a/pages/cart/coupon/couponDetail.vue
+++ b/pages/cart/coupon/couponDetail.vue
@@ -14,7 +14,7 @@
       </view>
       <view class="bottom-view">
         <view class="text">• 使用平台：{{
-                    coupon.scopeType == 'ALL' && coupon.id == 'platform'
+                    coupon.scopeType == 'ALL' && coupon.storeId == '0'
                       ? "全平台"
                       : coupon.scopeType == "PORTION_CATEGORY"
                       ? "仅限品类"
diff --git a/pages/cart/coupon/index.vue b/pages/cart/coupon/index.vue
index 8d218ca..f34ce21 100644
--- a/pages/cart/coupon/index.vue
+++ b/pages/cart/coupon/index.vue
@@ -34,7 +34,7 @@
       <view class="right">
         <view class="desc">
           <view v-if="item.scopeType">
-            <span v-if="item.scopeType == 'ALL' && item.id == 'platform'">全平台</span>
+            <span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span>
             <span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
             <view v-else
               >{{
diff --git a/pages/cart/coupon/myCoupon.vue b/pages/cart/coupon/myCoupon.vue
index 41b562c..ac59a4a 100644
--- a/pages/cart/coupon/myCoupon.vue
+++ b/pages/cart/coupon/myCoupon.vue
@@ -32,7 +32,7 @@
               <view class="content">
                 <view class="title-1">{{ coupon.title }}</view>
                 <view class="title-2">使用平台：{{
-                    coupon.scopeType == 'ALL' && coupon.id == 'platform'
+                    coupon.scopeType == 'ALL' && coupon.storeId == '0'
                       ? "全平台"
                       : coupon.scopeType == "PORTION_CATEGORY"
                       ? "仅限品类"
@@ -188,7 +188,7 @@ export default {
      * 立即使用优惠券
      */
     useItNow(item) {
-      if (item.storeId && item.storeId!='platform') {
+      if (item.storeId && item.storeId!='0') {
         uni.navigateTo({
           url: `/pages/product/shopPage?id=${item.storeId}`,
         });
diff --git a/pages/product/product/promotion/-promotion-coupon.vue b/pages/product/product/promotion/-promotion-coupon.vue
index 0948a1e..6b0936b 100644
--- a/pages/product/product/promotion/-promotion-coupon.vue
+++ b/pages/product/product/promotion/-promotion-coupon.vue
@@ -11,7 +11,7 @@
 					<view class="text">
 						<div class="coupon-List-title">
 							<view v-if="item.scopeType">
-								<span v-if="item.scopeType == 'ALL' && item.id == 'platform'">全平台</span>
+								<span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span>
 								<span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
 								<view v-else>{{
                          item.storeName == "platform" ? "全平台" : item.storeName + "店铺"
@@ -181,4 +181,4 @@
 			}
 		}
 	}
-</style>
+</style>