loading组件

app.js

@@ -105,6 +105,10 @@ App({
     typeSwitchObj : {"C":'现金券',"D":"折扣券"}
   },
   showLoading() {
+    if (this._loadingLock) {
+      return
+    }
+    this._loadingLock = true
     const page = this.getComponent("#Page")
     if (page) {
       page.setValue("showLoading", true)
@@ -113,8 +117,12 @@ App({
   hideLoading() {
     const page = this.getComponent("#Page")
     if (page) {
+      // setTimeout(_ => {
+      //   page.setValue("showLoading", false)
+      // }, 1000) 
       page.setValue("showLoading", false)
     }
+    this._loadingLock = false
   },
   getComponent(id) {
     const page = getCurrentPages()[getCurrentPages().length - 1]

pages/luckDraw/index.wxml

@@ -1,5 +1,5 @@
 <!--pages/luckDraw/index.wxml-->
-<view>
+<page id="Page">
 
    <!-- 活动列表 -->
    <view class="_list">
@@ -37,7 +37,4 @@
 
    </view>
 
-</view>
-
-<!-- 底部导航 -->
-<!-- <tab-bar /> -->
+</page>

pages/signIn/activity/activity.wxml

@@ -1,5 +1,5 @@
 <!--pages/signIn/index.wxml-->
-<view wx:if="{{showPage}}">
+<page id="Page" wx:if="{{showPage}}">
 
 <custom-page head-bg-image="{{activity.themePic}}" bind:sizes="handlePageSizes">
     <topbar slot="head" title="签到中心" back-color="{{mainColor}}" title-color="{{mainColor}}" />
@@ -130,4 +130,4 @@
     </view>
 </view>
 
-</view>
+</page>

pages/welfareMall/activityInfo/activityInfo.wxml

@@ -1,86 +1,86 @@
+<page id="#Page">
+  <image src="{{detail.fullCoverImg}}" mode="widthFix" class="top_img"></image>
+  <view class="info_all flex-row">
+    <view class="flex-row info">
+      <view class="info_left flex-column">
+        <view class="info_name over-ellipsis">{{detail.name}}</view>
 
-<image src="{{detail.fullCoverImg}}" mode="widthFix" class="top_img"></image>
+        <!-- <view class="info_coupon_num">3张代金券、3张折扣券</view> -->
+        <view class="info_coupon_num" wx:if="{{detail.cashCouponNum > 0 && detail.discountCouponNum > 0}}">含{{detail.cashCouponNum}}张代金券、{{detail.discountCouponNum}}张折扣券</view>
+          <view class="info_coupon_num" wx:if="{{detail.cashCouponNum ==0 && detail.discountCouponNum > 0}}">含{{detail.discountCouponNum}}张折扣券</view>
+          <view class="info_coupon_num" wx:if="{{detail.cashCouponNum > 0 && detail.discountCouponNum == 0}}">含{{detail.cashCouponNum}}张代金券</view>
+          <view class="info_coupon_num" wx:if="{{detail.cashCouponNum ==0 && detail.discountCouponNum ==0}}"></view>
+        <view class="flex-row">
 
-<view class="info_all flex-row">
-<view class="flex-row info">
-  <view class="info_left flex-column">
-    <view class="info_name over-ellipsis">{{detail.name}}</view>
+          <view class="flex-row">
+          <image src="/images/welfareMall/right_1.png" class="right_icon"></image>
+          <view class="right_text">仅支持整单</view>
+          </view>
+          <view class="flex-row">
+          <image src="/images/welfareMall/right_1.png" class="right_icon"></image>
+          <view class="right_text">过期自动退</view>
+          </view>
+          <view class="flex-row">
+          <image src="/images/welfareMall/right_1.png" class="right_icon"></image>
+          <view class="right_text">退款说明</view>
+          </view>
 
-    <!-- <view class="info_coupon_num">3张代金券、3张折扣券</view> -->
-    <view class="info_coupon_num" wx:if="{{detail.cashCouponNum > 0 && detail.discountCouponNum > 0}}">含{{detail.cashCouponNum}}张代金券、{{detail.discountCouponNum}}张折扣券</view>
-      <view class="info_coupon_num" wx:if="{{detail.cashCouponNum ==0 && detail.discountCouponNum > 0}}">含{{detail.discountCouponNum}}张折扣券</view>
-      <view class="info_coupon_num" wx:if="{{detail.cashCouponNum > 0 && detail.discountCouponNum == 0}}">含{{detail.cashCouponNum}}张代金券</view>
-      <view class="info_coupon_num" wx:if="{{detail.cashCouponNum ==0 && detail.discountCouponNum ==0}}"></view>
-    <view class="flex-row">
-
-      <view class="flex-row">
-      <image src="/images/welfareMall/right_1.png" class="right_icon"></image>
-      <view class="right_text">仅支持整单</view>
-      </view>
-      <view class="flex-row">
-      <image src="/images/welfareMall/right_1.png" class="right_icon"></image>
-      <view class="right_text">过期自动退</view>
-      </view>
-      <view class="flex-row">
-      <image src="/images/welfareMall/right_1.png" class="right_icon"></image>
-      <view class="right_text">退款说明</view>
+        </view>
       </view>
 
+      <view class="info_right flex-column">
+      <view class="info_right_top" wx:if="{{detail.isPay!=0}}">{{detail.priceFormatter}}元</view>
+      <view class="info_right_top" wx:else>免费</view>
+      <view class="info_right_bottom">价值￥{{detail.showPriceFormatter}}</view>
+      </view>
     </view>
-  </view>
-
-  <view class="info_right flex-column">
-  <view class="info_right_top" wx:if="{{detail.isPay!=0}}">{{detail.priceFormatter}}元</view>
-  <view class="info_right_top" wx:else>免费</view>
-  <view class="info_right_bottom">价值￥{{detail.showPriceFormatter}}</view>
-  </view>
-</view>
-</view>
-<view  class="bottom_title flex-column">
-<view class="flex-row bottom_title_top">
-<image src="/images/welfareMall/bag_content.png" class="bottom_icon"></image>
-<view class="bottom_tilte_text">礼包内容</view>
-</view>
-<view class="bottom_title_b" wx:if="{{detail.cashCouponNum > 0 && detail.discountCouponNum > 0}}">代金券 X {{detail.cashCouponNum}} ,折扣券 X {{detail.discountCouponNum}}</view>
-      <view class="bottom_title_b" wx:if="{{detail.cashCouponNum ==0 && detail.discountCouponNum > 0}}">折扣券 X {{detail.discountCouponNum}}</view>
-      <view class="bottom_title_b" wx:if="{{detail.cashCouponNum > 0 && detail.discountCouponNum == 0}}">代金券 X {{detail.cashCouponNum}}</view>
-      <view class="bottom_title_b" wx:if="{{detail.cashCouponNum ==0 && detail.discountCouponNum ==0}}"></view>
+    </view>
+    <view  class="bottom_title flex-column">
+    <view class="flex-row bottom_title_top">
+    <image src="/images/welfareMall/bag_content.png" class="bottom_icon"></image>
+    <view class="bottom_tilte_text">礼包内容</view>
+    </view>
+    <view class="bottom_title_b" wx:if="{{detail.cashCouponNum > 0 && detail.discountCouponNum > 0}}">代金券 X {{detail.cashCouponNum}} ,折扣券 X {{detail.discountCouponNum}}</view>
+          <view class="bottom_title_b" wx:if="{{detail.cashCouponNum ==0 && detail.discountCouponNum > 0}}">折扣券 X {{detail.discountCouponNum}}</view>
+          <view class="bottom_title_b" wx:if="{{detail.cashCouponNum > 0 && detail.discountCouponNum == 0}}">代金券 X {{detail.cashCouponNum}}</view>
+          <view class="bottom_title_b" wx:if="{{detail.cashCouponNum ==0 && detail.discountCouponNum ==0}}"></view>
 
-</view>
+    </view>
 
-<view  class="bottom_title flex-column">
-<view class="flex-row bottom_title_top">
-<image src="/images/welfareMall/buy_info.png" class="bottom_icon"></image>
-<view class="bottom_tilte_text">购买须知</view>
-</view>
-<rich-text class="bottom_title_b" nodes="{{detail.buyRemark}}"></rich-text>
+    <view  class="bottom_title flex-column">
+    <view class="flex-row bottom_title_top">
+    <image src="/images/welfareMall/buy_info.png" class="bottom_icon"></image>
+    <view class="bottom_tilte_text">购买须知</view>
+    </view>
+    <rich-text class="bottom_title_b" nodes="{{detail.buyRemark}}"></rich-text>
 
-</view>
+    </view>
 
-<view  class="bottom_title flex-column" style="margin-bottom: 130px;">
-<view class="flex-row bottom_title_top">
-<image src="/images/welfareMall/use_info.png" class="bottom_icon"></image>
-<view class="bottom_tilte_text">使用说明</view>
-</view>
-<rich-text class="bottom_title_b" nodes="{{detail.remark}}"></rich-text>
+    <view  class="bottom_title flex-column" style="margin-bottom: 130px;">
+    <view class="flex-row bottom_title_top">
+    <image src="/images/welfareMall/use_info.png" class="bottom_icon"></image>
+    <view class="bottom_tilte_text">使用说明</view>
+    </view>
+    <rich-text class="bottom_title_b" nodes="{{detail.remark}}"></rich-text>
 
-</view>
+    </view>
 
-<view class="bottom_button" wx:if="{{detail.status ==2 && detail.stock !=0}}">
-  <view class="now_buy" bindtap="nowBuy" wx:if="{{userMobile.length>0}}">{{buttonText}}</view>
-  <button class="now_buy_button" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" wx:else>{{buttonText}}</button>
-</view>
-<view class="go_buy"  style="background-color:#bdbdbd" wx:else>{{statusShowText}}</view>
+    <view class="bottom_button" wx:if="{{detail.status ==2 && detail.stock !=0}}">
+      <view class="now_buy" bindtap="nowBuy" wx:if="{{userMobile.length>0}}">{{buttonText}}</view>
+      <button class="now_buy_button" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" wx:else>{{buttonText}}</button>
+    </view>
+    <view class="go_buy"  style="background-color:#bdbdbd" wx:else>{{statusShowText}}</view>
 
-<view class="bg-zindex" wx:if="{{hideWindowValue}}">
+    <view class="bg-zindex" wx:if="{{hideWindowValue}}">
 
-    <view class="success_window flex-column">
-    <view class="w_title">购买成功</view>
-    <view class="w_name">{{detail.name}}</view>
-    <view class="w_text">已发送至您的卡包</view>
-    <view class="w_border"></view>
-    <view class="w_go_order" bindtap="goToOrderList">去看看</view>
+        <view class="success_window flex-column">
+        <view class="w_title">购买成功</view>
+        <view class="w_name">{{detail.name}}</view>
+        <view class="w_text">已发送至您的卡包</view>
+        <view class="w_border"></view>
+        <view class="w_go_order" bindtap="goToOrderList">去看看</view>
 
+        </view>
+      <image class="widow_del" src="/images/welfareMall/window_del.png"  bindtap="goToOrderList"></image>
     </view>
-   <image class="widow_del" src="/images/welfareMall/window_del.png"  bindtap="goToOrderList"></image>
-</view>
+</page>

pages/welfareMall/activityInfo/activityInfo.wxss

@@ -79,43 +79,43 @@ color: #B01717;
 margin-top: 8px;
 }
 .bottom_title{
-  width: 345px;
-  margin-top: 35px;
+  width: 690rpx;
+  margin: 70rpx auto 0;
 }
 .bottom_icon{
-  width: 20px;
-  height: 20px;
+  width: 40rpx;
+  height: 40rpx;
 }
 .bottom_tilte_text{
 
-height: 20px;
-line-height: 20px;
-font-size: 18px;
+height: 40rpx;
+line-height: 40rpx;
+font-size: 36rpx;
 font-weight: bold;
 color: #444444;
-margin-left: 8px;
+margin-left: 16rpx;
 }
 .bottom_title_b{
-  margin-top: 17px;
+  margin-top: 34rpx;
 
-font-size: 14px;
+font-size: 28rpx;
 font-weight: 500;
 color: #A0A0A0;
-margin-left: 28px;
+margin-left: 56rpx;
 }
 
 .go_buy{
-  width: 316px;
-  height: 49px;
-  line-height: 49px;
-  font-size: 22px;
+  width: 632rpx;
+  height: 98rpx;
+  line-height: 98rpx;
+  font-size: 44rpx;
   font-weight: 500;
   color: #FFFFFF;
   background-color: #B01717;
-  border-radius: 25px;
+  border-radius: 50rpx;
   text-align: center;
   position: fixed;
-  bottom: 50px;
+  bottom: 100rpx;
 }
 
 .bottom_button {

pages/welfareMall/activityList/activityList.wxml

@@ -1,38 +1,40 @@
-<view class="top_banner flex-row">
-
-  <view class="top_banner_item flex-column" bindtap="gotoPay">
-    <view class="t_b_i_title">特惠券包</view>
-    <view class="t_b_i_border {{type==2?'active':''}}"></view>
-  </view>
+<page id="Page">
+  <view class="top_banner flex-row">
+    <view class="top_banner_item flex-column" bindtap="gotoPay">
+      <view class="t_b_i_title">特惠券包</view>
+      <view class="t_b_i_border {{type==2?'active':''}}"></view>
+    </view>
 
-  <view class="top_banner_item flex-column" bindtap="gotoFree">
-    <view class="t_b_i_title">免费券包</view>
-    <view class="t_b_i_border {{type==1?'active':''}}"></view>
-  </view>
+    <view class="top_banner_item flex-column" bindtap="gotoFree">
+      <view class="t_b_i_title">免费券包</view>
+      <view class="t_b_i_border {{type==1?'active':''}}"></view>
+    </view>
 
-</view>
+    </view>
 
 
-<view class="coupon_item flex-row" wx:for="{{list}}" wx:key="unique"  bindtap="goCouponDetail" data-id="{{item.activityId}}">
-    <image src="{{item.coverImg}}" class="coupon_item_img"></image>
-    <view class="coupon_item_right flex-column">
-    <view class="flex-column">
-      <view class="coupon_name over-ellipsis-two">{{item.name}}</view>
-      <view class="coupon_num" wx:if="{{item.cashCouponNum > 0 && item.discountCouponNum > 0}}">含{{item.cashCouponNum}}张代金券、{{item.discountCouponNum}}张折扣券</view>
-      <view class="coupon_num" wx:if="{{item.cashCouponNum ==0 && item.discountCouponNum > 0}}">含{{item.discountCouponNum}}张折扣券</view>
-      <view class="coupon_num" wx:if="{{item.cashCouponNum > 0 && item.discountCouponNum == 0}}">含{{item.cashCouponNum}}张代金券</view>
-      <view class="coupon_num" wx:if="{{item.cashCouponNum ==0 && item.discountCouponNum ==0}}"></view>
-     
-    </view>
-      <view class="coupon_i_r_bottom flex-row">
-        <view class="coupon_price">价值 ￥{{item.formatShowPrice}}</view>
-        <view class="coupon_buy" wx:if="{{item.isPay!=0}}">{{item.formatPrice}}元抢</view>
-        <view class="coupon_buy"  wx:else>免费领取</view>
+    <view class="coupon_item flex-row" wx:for="{{list}}" wx:key="unique"  bindtap="goCouponDetail" data-id="{{item.activityId}}">
+      <image src="{{item.coverImg}}" class="coupon_item_img"></image>
+      <view class="coupon_item_right flex-column">
+      <view class="flex-column">
+        <view class="coupon_name over-ellipsis-two">{{item.name}}</view>
+        <view class="coupon_num" wx:if="{{item.cashCouponNum > 0 && item.discountCouponNum > 0}}">含{{item.cashCouponNum}}张代金券、{{item.discountCouponNum}}张折扣券</view>
+        <view class="coupon_num" wx:if="{{item.cashCouponNum ==0 && item.discountCouponNum > 0}}">含{{item.discountCouponNum}}张折扣券</view>
+        <view class="coupon_num" wx:if="{{item.cashCouponNum > 0 && item.discountCouponNum == 0}}">含{{item.cashCouponNum}}张代金券</view>
+        <view class="coupon_num" wx:if="{{item.cashCouponNum ==0 && item.discountCouponNum ==0}}"></view>
+      
+      </view>
+        <view class="coupon_i_r_bottom flex-row">
+          <view class="coupon_price">价值 ￥{{item.formatShowPrice}}</view>
+          <view class="coupon_buy" wx:if="{{item.isPay!=0}}">{{item.formatPrice}}元抢</view>
+          <view class="coupon_buy"  wx:else>免费领取</view>
+        </view>
       </view>
     </view>
-  </view>
+</page>
+
 
-  <!-- <view class="coupon_item flex-row">
+<!-- <view class="coupon_item flex-row">
     <image src="https://dy.shpr.top/welfareGo/index_top.png" class="coupon_item_img"></image>
     <view class="coupon_item_right flex-column">
     <view class="flex-column">

pages/welfareMall/personal/personal.wxml

@@ -1,5 +1,5 @@
 <!--pages/welfareMall/personal/personal.wxml-->
-<view class="{{grayTheme?'page':''}}">
+<page id="Page" class="{{grayTheme?'page':''}}">
 <custom-page head-bg-color="#fff2f3">  
   <view slot="body" class="personal flex-column">
     <!-- 首部个人信息 -->
@@ -42,7 +42,7 @@
       </view>
   </view>
 </custom-page>  
-</view>
+</page>
 
 <!-- 使用wxs 手机号码中间四位显示为*号 -->
 <wxs module="phone">