代码整理，主要首页，钱包

view/xcx/app.wxss

@@ -64,7 +64,3 @@ button::after{border:0;}
 .mt-30{margin-top:30rpx;}
 .mt-20{margin-top:20rpx;}
 .mr-10{margin-right:10rpx;}
-
-
-
-

view/xcx/components/coupon-list-window/index.js

@@ -25,9 +25,11 @@ Component({
     console.log(this.data.cartId)
   },
   methods: {
+
     close: function () {
       this.triggerEvent('ChangCouponsClone');
     },
+    
     getCouponUser:function(e){
       var that = this;
       var id = e.currentTarget.dataset.id;

view/xcx/components/coupon-window/index.js

@@ -18,7 +18,7 @@ Component({
   },
   methods: {
     close:function(){
-      this.triggerEvent('onColse');
+      this.triggerEvent('onClose');
     }
   }
 })

view/xcx/components/goodList/index.wxml

@@ -1,22 +1,36 @@
-       <view class='goodList'>
-          <block wx:for="{{bastList}}" wx:key='index'>
-            <view bindtap="goDetail" data-items='{{item}}' class='item acea-row row-between-wrapper'>
-                <view class='pictrue'>
-                  <image src='{{item.image}}'></image>
-                   <text class="pictrue_log pictrue_log_class" wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
-                   <text class="pictrue_log pictrue_log_class" wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
-                   <text class="pictrue_log pictrue_log_class" wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
-                </view>
-                <view class='underline'>
-                    <view class='text'>
-                        <view class='line1'>{{item.store_name}}</view>
-                        <view class='money font-color'>￥<text class='num'>{{item.price}}</text></view>
-                        <view class='vip-money acea-row row-middle' wx:if='{{item.vip_price && item.vip_price > 0}}'>￥{{item.vip_price || 0}}<image  src='/images/vip.png'></image><text class='num'>已售{{item.sales}}{{item.unit_name}}</text></view>
-                        <view class='vip-money acea-row row-middle' wx:else><text class='num'>已售{{item.sales}}{{item.unit_name}}</text></view>
-                      
-                    </view>
-                </view>
-              <view class='iconfont icon-gouwuche cart-color acea-row row-center-wrapper'></view>
-            </view>
-          </block>   
-       </view>
+<view class='goodList'>
+  <block wx:for="{{bastList}}" wx:key='index'>
+    <view bindtap="goDetail" data-items='{{item}}' class='item acea-row row-between-wrapper'>
+
+      <!-- 首发新品 商品图片 -->
+      <view class='pictrue'>
+        <image src='{{item.image}}'></image>
+        <text class="pictrue_log pictrue_log_class" wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
+        <text class="pictrue_log pictrue_log_class" wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
+        <text class="pictrue_log pictrue_log_class" wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
+      </view>
+
+      <view class='underline'>
+        <view class='text'>
+          <view class='line1'>{{item.store_name}}</view>
+          <view class='money font-color'>
+            ￥<text class='num'>{{item.price}}</text>
+          </view>
+          <view class='vip-money acea-row row-middle' wx:if='{{item.vip_price && item.vip_price > 0}}'>
+            <!-- 暂时不再显示会员价
+            ￥{{item.vip_price || 0}}
+            <image  src='/images/vip.png'></image>
+            -->
+            <text class='num'>已售{{item.sales}}{{item.unit_name}}</text>
+          </view>
+          <view class='vip-money acea-row row-middle' wx:else>
+            <text class='num'>已售{{item.sales}}{{item.unit_name}}</text>
+          </view>
+        </view>
+      </view>
+
+      <view class='iconfont icon-gouwuche cart-color acea-row row-center-wrapper'>
+      </view>
+    </view>
+  </block>   
+</view>

view/xcx/components/promotionGood/index.wxml

@@ -1,22 +1,26 @@
-       <view class='promotionGood'>
-          <block wx:for="{{benefit}}" wx:key='index'>
-            <view class='item acea-row row-between-wrapper'  bindtap="goDetail" data-items='{{item}}'>
-               <view class='pictrue'>
-                  <image src='{{item.image}}'></image>
-                  <text class="pictrue_log pictrue_log_class" wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
-                   <text class="pictrue_log pictrue_log_class" wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
-                   <text class="pictrue_log pictrue_log_class" wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
-              </view>
-              <view class='text'>
-                 <view class='name line1'>{{item.store_name}}</view>
-                 <view class='sp-money acea-row'>
-                   <view class='moneyCon'>促销价: ￥<text class='num'>{{item.price}}</text></view>
-                 </view>
-                 <view class='acea-row row-between-wrapper'>
-                   <view class='money'>日常价：￥{{item.ot_price}}</view>
-                   <view>仅剩：{{item.stock}}{{item.unit_name}}</view>
-                 </view>
-              </view>
-            </view>
-          </block> 
-       </view>
+<!-- 促销单品 -->
+<view class='promotionGood'>
+  <block wx:for="{{benefit}}" wx:key='index'>
+    <view class='item acea-row row-between-wrapper'  bindtap="goDetail" data-items='{{item}}'>
+      <view class='pictrue'>
+        <image src='{{item.image}}'></image>
+        <text class="pictrue_log pictrue_log_class" wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
+        <text class="pictrue_log pictrue_log_class" wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
+        <text class="pictrue_log pictrue_log_class" wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
+      </view>
+
+      <view class='text'>
+        <view class='name line1'>{{item.store_name}}</view>
+        <view class='sp-money acea-row'>
+          <view class='moneyCon'>
+            促销价: ￥<text class='num'>{{item.price}}</text>
+          </view>
+        </view>
+        <view class='acea-row row-between-wrapper'>
+          <view class='money'>日常价：￥{{item.ot_price}}</view>
+          <view>仅剩：{{item.stock}}{{item.unit_name}}</view>
+        </view>
+      </view>
+    </view>
+  </block>
+</view>

view/xcx/components/recommend/index.js

@@ -11,7 +11,7 @@ Component({
   attached: function () {
   },
   methods: {
-       /**
+  /**
    * 商品详情跳转
    */
    goDetail: function (e) {

view/xcx/config.js

@@ -1,6 +1,6 @@
 module.exports = {
   // 请求域名 格式： https://您的域名
-  HTTP_REQUEST_URL:'http://twong.us',
+  HTTP_REQUEST_URL:'https://twong.shotshock.shop',
   // Socket链接 暂不做配置
   WSS_SERVER_URL:'',
 

view/xcx/pages/first-new-product/index.js

@@ -1,3 +1,4 @@
+// 首发新品子页面
 import { getGroomList } from '../../api/store.js';
 import { getCoupons } from '../../api/api.js';
 

view/xcx/pages/first-new-product/index.wxml

@@ -11,4 +11,4 @@
       <text class='loading iconfont icon-jiazai' wx:if='{{loading==true}}'></text>{{loadTitle}}
     </view>
 </view>
-<home></home>
+

view/xcx/pages/goods_details/index.wxml

@@ -1,61 +1,60 @@
 <view class='navbar {{parameter.class}}' style='height:{{navH}}rpx;opacity:{{opacity}}'>
-   <view class='navbarH' style='height:{{navH}}rpx;'>
-      <view class='navbarCon acea-row row-center-wrapper'>
-          <view class="header acea-row row-center-wrapper">
-            <view class="item {{navActive === index ? 'on' : ''}}" wx:for="{{navList}}" wx:key='index' bindtap="tap" data-index="{{index}}" data-id='past{{index}}'>
-              {{ item }}
-            </view>
-          </view>
+  <view class='navbarH' style='height:{{navH}}rpx;'>
+    <view class='navbarCon acea-row row-center-wrapper'>
+      <view class="header acea-row row-center-wrapper">
+        <view class="item {{navActive === index ? 'on' : ''}}" wx:for="{{navList}}" wx:key='index' bindtap="tap" data-index="{{index}}" data-id='past{{index}}'>
+          {{ item }}
+        </view>
       </view>
-   </view>
+    </view>
+  </view>
 </view>
+
 <view class="returnF" style="height:{{navH}}rpx;">
-    <view class="returnH" style='height:{{navH}}rpx;'>
-        <view class="returnCon acea-row row-center-wrapper" bindtap="returns">
-           <view class="iconfont icon-xiangzuo"></view>
-        </view>
+  <view class="returnH" style='height:{{navH}}rpx;'>
+    <view class="returnCon acea-row row-center-wrapper" bindtap="returns">
+      <view class="iconfont icon-xiangzuo"></view>
     </view>
+  </view>
 </view>
 <!-- <view class='iconfont icon-xiangzuo' style="top:{{navH/2}}rpx" bindtap='returns'></view> -->
 <!-- <view style="height:{{navH+20}}rpx;" wx:if="{{scrollY>200}}"></view> -->
 <!-- style='height:{{scrollY>200?(height+2*navH+20):(height+navH)}}rpx;' -->
 <view class='product-con'>
  <scroll-view scroll-top="{{scrollTop}}" scroll-y='true' scroll-with-animation="true" style='height:{{height}}px;' bindscroll="scroll">
-     <view id="past0">
-  <productConSwiper imgUrls="{{storeInfo.slider_image}}" videoline="{{storeInfo.video_link}}"></productConSwiper>
-  <view class='wrapper'>
-    <view class='share acea-row row-between row-bottom'>
-      <view class='money font-color'>
-        ￥
-        <text class='num'>{{storeInfo.price}}</text>
-        <!-- <text class='vip-money' wx:if="{{storeInfo.vip_price && storeInfo.vip_price > 0}}">￥{{storeInfo.vip_price}}</text> -->
-        <!-- <image wx:if="{{storeInfo.vip_price && storeInfo.vip_price > 0}}" src="/images/vip.png"></image> -->
+    <view id="past0">
+      <productConSwiper imgUrls="{{storeInfo.slider_image}}" videoline="{{storeInfo.video_link}}">
+      </productConSwiper>
+      <view class='wrapper'>
+      <view class='share acea-row row-between row-bottom'>
+        <view class='money font-color'>
+          ￥<text class='num'>{{storeInfo.price}}</text>
+          <!-- <text class='vip-money' wx:if="{{storeInfo.vip_price && storeInfo.vip_price > 0}}">￥{{storeInfo.vip_price}}</text> -->
+          <!-- <image wx:if="{{storeInfo.vip_price && storeInfo.vip_price > 0}}" src="/images/vip.png"></image> -->
+        </view>
+        <!-- <view class='iconfont icon-fenxiang' bindtap='listenerActionSheet'></view> -->
       </view>
-      <!-- <view class='iconfont icon-fenxiang' bindtap='listenerActionSheet'></view> -->
-    </view>
-    <view class='introduce'>{{storeInfo.store_name}}</view>
-    <view class='label acea-row row-between-wrapper'>
-      <view>原价:￥{{storeInfo.ot_price}}</view>
-      <view>库存:{{storeInfo.stock}}{{storeInfo.unit_name}}</view>
-      <view>销量:{{storeInfo.fsales}}{{storeInfo.unit_name}}</view>
-    </view>
-    <view class='coupon acea-row row-between-wrapper' wx:if="{{storeInfo.give_integral > 0}}">
-      <view class='hide line1 acea-row'>
-        赠积分：
-        <view class='activity'>赠送 {{storeInfo.give_integral}} 积分</view>
+      <view class='introduce'>{{storeInfo.store_name}}</view>
+      <view class='label acea-row row-between-wrapper'>
+        <view>原价:￥{{storeInfo.ot_price}}</view>
+        <view>库存:{{storeInfo.stock}}{{storeInfo.unit_name}}</view>
+        <view>销量:{{storeInfo.fsales}}{{storeInfo.unit_name}}</view>
       </view>
-    </view>
-    <!-- <view class='coupon acea-row row-between-wrapper' bindtap='coupon' style="{{ storeInfo.give_integral > 0 ? 'margin-top:0;':''}}">
-      <view class='hide line1 acea-row'>
-        优惠券：
-        <view class='activity' wx:for="{{couponList}}" wx:key='index'>满{{item.use_min_price}}减{{item.coupon_price}}</view>
+      <view class='coupon acea-row row-between-wrapper' wx:if="{{storeInfo.give_integral > 0}}">
+        <view class='hide line1 acea-row'>
+          赠积分：<view class='activity'>赠送 {{storeInfo.give_integral}} 积分</view>
+        </view>
       </view>
-      <view class='iconfont icon-jiantou'></view>
-    </view> -->
-    <view class="coupon acea-row row-between-wrapper"  wx:if="{{activity.length}}">
+      <!-- <view class='coupon acea-row row-between-wrapper' bindtap='coupon' style="{{ storeInfo.give_integral > 0 ? 'margin-top:0;':''}}">
+        <view class='hide line1 acea-row'>
+          优惠券：<view class='activity' wx:for="{{couponList}}" wx:key='index'>满{{item.use_min_price}}减{{item.coupon_price}}</view>
+        </view>
+        <view class='iconfont icon-jiantou'></view>
+      </view> -->
+      <view class="coupon acea-row row-between-wrapper"  wx:if="{{activity.length}}">
         <view class="line1 acea-row">
           <text decode="{{true}}" space="{{true}}">活&nbsp;&nbsp;&nbsp;动：</text>
-           <view wx:for="{{activity}}" wx:key='index' bindtap="goActivity" data-items='{{item}}'>
+          <view wx:for="{{activity}}" wx:key='index' bindtap="goActivity" data-items='{{item}}'>
               <view wx:if="{{item.type === '1'}}" class="{{index==0?'activity_pin':'' || index==1?'activity_miao':'' || index==2?'activity_kan':''}}">
                 <text class="iconfonts iconfont icon-pintuan"></text>
                 <text class="activity_title"> 参与秒杀</text>
@@ -68,24 +67,24 @@
                 <text class="iconfonts iconfont icon-kanjia"></text>
                 <text class="activity_title"> 参与拼团</text>
               </view>
-           </view>
+            </view>
+          </view>
         </view>
-    </view>
-  </view>
-  <view class='attribute acea-row row-between-wrapper' bindtap='selecAttr' wx:if='{{productAttr.length}}'>
-    <view>{{attr}}：
-      <text class='atterTxt'>{{attrValue}}</text>
-    </view>
-    <view class='iconfont icon-jiantou'></view>
-  </view>
-  <!-- <view class="store-info" wx:if='{{systemStore.id && storeSelfMention}}'>
-    <view class="acea-row row-between-wrapper store-box" bindtap="showStoreList">
-      <view class="title">门店信息</view>
+      </view>
+    <view class='attribute acea-row row-between-wrapper' bindtap='selecAttr' wx:if='{{productAttr.length}}'>
+      <view>
+        {{attr}}：<text class='atterTxt'>{{attrValue}}</text>
+      </view>
       <view class='iconfont icon-jiantou'></view>
-    </view> 
-    <view class="info acea-row row-between-wrapper" wx:if="{{storeList.length!==0}}">
-      <view class="picTxt">
-        <view class="pictrue">
+    </view>
+    <!-- <view class="store-info" wx:if='{{systemStore.id && storeSelfMention}}'>
+      <view class="acea-row row-between-wrapper store-box" bindtap="showStoreList">
+        <view class="title">门店信息</view>
+        <view class='iconfont icon-jiantou'></view>
+      </view> 
+      <view class="info acea-row row-between-wrapper" wx:if="{{storeList.length!==0}}">
+        <view class="picTxt">
+          <view class="pictrue">
           <image src="{{storeItems.image}}" lazy-load="true"></image>
         </view>
         <view class="text">

view/xcx/pages/index/index.js

@@ -36,7 +36,7 @@ Page({
       firstList: [],
       bastList: []
     },
-    avtiveIndex: 0,
+    avtiveIndex: 0,   // 轮播图索引
     likeInfo: [],
     benefit:[],
     hostProduct: [],
@@ -69,12 +69,12 @@ Page({
       cid: 0, //一级分类id
       sid: 0 //二级分类id
     },
-    loadend: false,
-    loading: false,
+    loadend: false, // 是否已全部加载
+    loading: false, // 是否正在加载
     loadTitle: '加载更多',
     productList: [],
     categoryActive: 0,
-    tapActive:0,
+    activeTabIndex: 0,
     countDownHour: "00",
     countDownMinute: "00",
     countDownSecond: "00",
@@ -82,13 +82,13 @@ Page({
     interval:null,
     newGoodsBananr: '',
     liveList: [],
-    liveInfo: {},
-    activities: {}
+    liveInfo: {}
   },
+
   closeTip:function(){
-    wx.setStorageSync('msg_key',true);
+    wx.setStorageSync('msg_key', true);
     this.setData({
-      iShiddenTip:true
+      iShiddenTip: true
     })
   },
   /**
@@ -110,6 +110,7 @@ Page({
     this.getTemlIds();
     this.getLiveList();
   },
+
   getTemlIds() {
     let messageTmplIds = wx.getStorageSync(CACHE_SUBSCRIBE_MESSAGE);
     if (!messageTmplIds) {
@@ -119,31 +120,34 @@ Page({
       }).catch(()=>{})
     }
   },
+
   //授权
   onLoadFun: function () {
-    this.getCoupon();
+    //this.getCoupon();
   },
+
   catchTouchMove: function (res) {
     return false
   },
-  onColse:function(){
-    this.setData({ window: false});
 
-    console.log(this.data.activities);
-    this.data.activities.forEach(item => {
-      item.tabOut();
-    });
+  /** 关闭优惠券窗口 */
+  onClose: function(){
+    this.setData({ window: false});
   },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function () {
 
   },
+
+  /** 轮播监听 */
   bindchange(e) {
     var index = e.detail.current;
     this.setData({ avtiveIndex: index});
   },
+
   /**
    * 生命周期函数--监听页面显示
    */
@@ -152,12 +156,8 @@ Page({
     this.getIndexConfig();
     this.getNotification();
     // this.getSeckillTime();
-
-    var activity = this.data.activities[this.data.tapActive];
-    if(activity) {
-      activity.tabIn();
-    }
   },
+
   getIndexConfig:function(){
     var that = this;
     getIndexData().then(res=>{
@@ -185,6 +185,7 @@ Page({
       });
     })
   },
+
   getLiveList: function () {
     getLiveList(1, 20).then(res => {
       if (res.data.length == 1) {
@@ -196,9 +197,10 @@ Page({
 
     })
   },
+
   /**
- * 商品详情跳转
- */
+  * 商品详情跳转
+  */
   goDetailType: function (e) {
     let item = e.currentTarget.dataset.items
     if (item.activity && item.activity.type === "1") {
@@ -215,9 +217,10 @@ Page({
       wx.navigateTo({ url: `/pages/goods_details/index?id=${item.id}` });
     }
   },
+
   /**
-* 获取我的推荐
-*/
+  * 获取我的推荐
+  */
   get_host_product: function (isPage) {
     var that = this;
     if (that.data.recommend.loadend) return;
@@ -239,40 +242,33 @@ Page({
       that.setData({ loading: false, loadTitle: '加载更多' });
     });
   },
-  categoryTap: function (event) {
-    let that = this, tapActive = event.detail.index;
+
+  /** 点击上方活动标签按钮 */
+  onTapCategoryTabItem: function (event) {
+    let that = this, activeTabIndex = event.detail.index;
+    if (activeTabIndex <= 0 || activeTabIndex > this.data.categoryOne.children.length) {
+      return
+    }
+
     that.setData({
-      tapActive: tapActive
+      activeTabIndex: activeTabIndex
     })
-    if (tapActive > 0) {
-      that.setData({
-         'where.page':1,
-         loadend:false,
-         loading:false,
-         'where.cid': that.data.categoryOne[tapActive - 1].id,
-         'where.sid': that.data.categoryOne[tapActive - 1].children.length
-          ? that.data.categoryOne[tapActive - 1].children[0].id
-          : -1,
-        categoryActive:0
-      })
-      that.get_product_list(true);
+    // 黑洞
+    if (this.data.categoryOne.children[activeTabIndex - 1].id === 199) {
+      return
     }
 
-    let mine = that.selectComponent('#mine');
-    if(event.detail.title === "黑洞矿场"){
-      if(mine && that.data.activities[tapActive] == null) {
-        var activities = {};
-        activities[tapActive] = mine;
-        that.setData({
-          activities: activities
-        });
-      }
-
-       mine.tabIn();
-    } else {
-      mine.tabOut();
-    }
+    that.setData({
+      'where.page': 1,
+      loadend: false,
+      loading: false,
+      'where.cid': that.data.categoryOne.id,
+      'where.sid': that.data.categoryOne.children[activeTabIndex - 1].id,
+      categoryActive: 0
+    })
+    that.get_product_list(true);
   },
+
   productTap: function (e) {
     let that = this,index = e.currentTarget.dataset.indexn;
     that.setData({
@@ -280,16 +276,19 @@ Page({
       'where.page':1,
       loadend:false,
       loading:false,
-      'where.sid': that.data.categoryOne[that.data.tapActive - 1].children[index].id
+      'where.sid': that.data.categoryOne[that.data.activeTabIndex - 1].children[index].id
     })
     that.get_product_list(true);
   },
+
   get_product_list: function (isPage){
     var that = this;
     if (that.data.loading) return;
     if (that.data.loadend) return;
     if (isPage === true) that.setData({ productList: [] });
+
     that.setData({ loading: true, loadTitle: '' });
+
     getProductslist(that.data.where).then(res => {
       let list = res.data;
       let productList = app.SplitArray(list, that.data.productList);
@@ -305,24 +304,26 @@ Page({
       that.setData({ loading: false, loadTitle: '加载更多' });
     });
   },
-  getSeckillTime: function () {
-    let that = this;
-    getSeckillIndexTime().then(res => {
-      let timeList = res.data.seckillTime, seckillTimeIndex = res.data.seckillTimeIndex;
-      that.setData({
-        timeList: timeList,
-        seckillCont: res.data.seckillCont,
-        killIndex: seckillTimeIndex,
-        seckillTimeIndex: seckillTimeIndex,
-        killIndexTime: timeList[that.data.killIndex].stop,
-        status: timeList[seckillTimeIndex].status
-      })
-      wxh.time(timeList[that.data.killIndex].stop, that,false);
-      that.getSeckillLists(); 
-    }).catch(()=>{
+
+  // getSeckillTime: function () {
+  //   let that = this;
+  //   getSeckillIndexTime().then(res => {
+  //     let timeList = res.data.seckillTime, seckillTimeIndex = res.data.seckillTimeIndex;
+  //     that.setData({
+  //       timeList: timeList,
+  //       seckillCont: res.data.seckillCont,
+  //       killIndex: seckillTimeIndex,
+  //       seckillTimeIndex: seckillTimeIndex,
+  //       killIndexTime: timeList[that.data.killIndex].stop,
+  //       status: timeList[seckillTimeIndex].status
+  //     })
+  //     wxh.time(timeList[that.data.killIndex].stop, that,false);
+  //     that.getSeckillLists(); 
+  //   }).catch(()=>{
       
-    });
-  },
+  //   });
+  // },
+
   setTime: function (e) {
     var that = this, index = e.currentTarget.dataset.index;
     that.setData({
@@ -331,6 +332,7 @@ Page({
     })
     that.getSeckillLists();
   },
+
   getSeckillLists: function () {
     let that = this;
     let timeId = that.data.timeList[that.data.killIndex].id;
@@ -356,20 +358,26 @@ Page({
       }
     }).catch(()=>{});
   },
-  goDetail: function (e) {
-    let index = this.data.timeList[this.data.killIndex];
-    wx.navigateTo({
-      url: '/pages/activity/goods_seckill_details/index?id=' + e.currentTarget.dataset.id + '&time=' + index.stop + '&status=' + index.status
-    })
-  },
+
+  // 秒杀详情
+  // goDetail: function (e) {
+  //   let index = this.data.timeList[this.data.killIndex];
+  //   wx.navigateTo({
+  //     url: '/pages/activity/goods_seckill_details/index?id=' + e.currentTarget.dataset.id + '&time=' + index.stop + '&status=' + index.status
+  //   })
+  // },
+
+  /** 获取分类列表 */
   getCategoryData: function () {
     let that = this;
     getCategoryList().then(res => {
       that.setData({
-        categoryOne: res.data
+        categoryOne: res.data.length > 0 ? res.data[0] : []
       })
     });
   },
+
+  /** 获取优惠券列表 */
   getCoupon: function () {
     var that = this;
     getCoupons({page: 1,limit: 6}).then(res => {
@@ -382,6 +390,8 @@ Page({
       // });
     });
   },
+
+  /** 更新消息红字 */
   getNotification: function() {
     var that = this;
     getNotifications().then(res=>{
@@ -400,6 +410,7 @@ Page({
 
     });
   },
+
   receiveCoupon: function (e) {
     if (!app.globalData.isLog) {
       this.setData({
@@ -429,23 +440,22 @@ Page({
         });
     }
   },
+
   /**
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
     this.setData({ window:false});
     this.data.interval !== null && clearInterval(this.data.interval);
-
-    for(var item in this.data.activities){
-      this.data.activities[item].tabOut();
-    };
   },
+
   /**
    * 生命周期函数--监听页面卸载
    */
   onUnload: function () {
     this.data.interval !== null && clearInterval(this.data.interval);
   },
+  
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */

view/xcx/pages/index/index.wxml

@@ -1,27 +1,31 @@
 <navbar parameter='{{parameter}}' logoUrl="{{logoUrl}}"></navbar>
 <view class="indexs">
-   <view class="indexTip" style="top:{{navH+13}}rpx" hidden="{{iShiddenTip}}">
-       <view class="tip acea-row row-between-wrapper">
-          <view class="text">点击“<image src="/images/spot.png"></image>”添加到我的小程序， 微信首页下拉即可访问商城。</view>
-       <view class="iconfont icon-guanbi1" bindtap="closeTip"></view>
-       </view> 
-    </view>
-    <Tabs color="#fff" active="{{tapActive}}" bind:click="categoryTap">
-      <Tab title="首页">
-        <view class="wrapper">
-          <view class="slider-banner banner">
-            <swiper indicator-dots="true"
+  <view class="indexTip" style="top:{{navH+13}}rpx" hidden="{{iShiddenTip}}">
+    <view class="tip acea-row row-between-wrapper">
+      <view class="text">点击“<image src="/images/spot.png"></image>”添加到我的小程序， 微信首页下拉即可访问商城。</view>
+      <view class="iconfont icon-guanbi1" bindtap="closeTip"></view>
+    </view> 
+  </view>
+
+  <Tabs color="#fff" active="{{activeTabIndex}}" bind:click="onTapCategoryTabItem">
+    <Tab title="主场">
+      <view class="wrapper">
+        <!-- banner 图 -->
+        <view class="slider-banner banner">
+          <swiper indicator-dots="true"
             autoplay="{{autoplay}}" circular="{{circular}}" interval="3000" duration="500" indicator-color="rgba(0,0,0,0.2)" indicator-active-color="#ff3366">
-              <swiper-item wx:for="{{banner}}" wx:key='index'>
-                <navigator url="{{item.url ? item.url : ''}}" class="pictrue acea-row row-middle" hover-class='none'>
-                  <image src="{{item.pic}}" class="slide-image"></image>
-                </navigator >
-              </swiper-item>
-            </swiper>
-          </view>
-          <view class="nav acea-row">
-            <block wx:for="{{menus}}" wx:key='index'>
-               <navigator url="{{item.url ? item.url : ''}}" wx:if="{{item.show == '1'}}" class="item" open-type='switchTab' hover-class='none'>
+            <swiper-item wx:for="{{banner}}" wx:key='index'>
+              <navigator url="{{item.url ? item.url : ''}}" class="pictrue acea-row row-middle" hover-class='none'>
+                <image src="{{item.pic}}" class="slide-image"></image>
+              </navigator >
+            </swiper-item>
+          </swiper>
+        </view>
+
+        <!-- 菜单按钮 -->
+        <view class="nav acea-row">
+          <block wx:for="{{menus}}" wx:key='index'>
+            <navigator url="{{item.url ? item.url : ''}}" wx:if="{{item.show == '1'}}" class="item" open-type='switchTab' hover-class='none'>
               <view class="pictrue"><image src="{{item.pic}}"></image></view>
               <view>{{ item.name }}</view>
             </navigator>
@@ -29,399 +33,420 @@
               <view class="pictrue"><image src="{{item.pic}}"></image></view>
               <view>{{ item.name }}</view>
             </navigator>
-            </block>
-          </view>
-          
-          <view class='news acea-row row-between-wrapper' wx:if="{{itemNew.length}}">
-            <view class='pictrue'><image src='/images/news.png'></image></view>
-            <view class='swiperTxt'>
-                  <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="2500" duration="{{duration}}" vertical="true" circular="true">
-                      <block wx:for="{{itemNew}}" wx:key='index'>
-                          <swiper-item catchtouchmove='catchTouchMove'>
-                              <navigator wx:if="{{item.show == '1'}}" url='{{item.url}}'  open-type='switchTab' class='acea-row row-between-wrapper' hover-class='none'>
-                                  <view class='text acea-row row-between-wrapper'>
-                                      <view class='label border2' wx:if="{{item.id%2 == 0}}">最新</view>
-                                      <view class='newsTitle line1'>{{item.info}}</view>
-                                  </view>
-                                  <view class='iconfont icon-xiangyou'></view>
-                              </navigator>
-                              <navigator wx:else open-type='navigate' url='{{item.url}}'  class='acea-row row-between-wrapper' hover-class='none'>
-                                  <view class='text acea-row row-between-wrapper'>
-                                      <view class='label border2' wx:if="{{item.id%2 == 0}}">最新</view>
-                                      <view class='newsTitle line1'>{{item.info}}</view>
-                                  </view>
-                                  <view class='iconfont icon-xiangyou'></view>
-                              </navigator>
-                          </swiper-item>
-                        </block>
-                    </swiper> 
-            </view>
+          </block>
+        </view>
+        
+        <!-- 新闻/跑马灯 -->
+        <view class='news acea-row row-between-wrapper' wx:if="{{itemNew.length}}">
+          <view class='pictrue'><image src='/images/news.png'></image></view>
+          <view class='swiperTxt'>
+            <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="2500" duration="{{duration}}" vertical="true" circular="true">
+              <block wx:for="{{itemNew}}" wx:key='index'>
+                <swiper-item catchtouchmove='catchTouchMove'>
+                  <navigator wx:if="{{item.show == '1'}}" url='{{item.url}}'  open-type='switchTab' class='acea-row row-between-wrapper' hover-class='none'>
+                    <view class='text acea-row row-between-wrapper'>
+                      <view class='label border2' wx:if="{{item.id%2 == 0}}">最新</view>
+                      <view class='newsTitle line1'>{{item.info}}</view>
+                    </view>
+                    <view class='iconfont icon-xiangyou'></view>
+                  </navigator>
+                  <navigator wx:else open-type='navigate' url='{{item.url}}'  class='acea-row row-between-wrapper' hover-class='none'>
+                    <view class='text acea-row row-between-wrapper'>
+                      <view class='label border2' wx:if="{{item.id%2 == 0}}">最新</view>
+                      <view class='newsTitle line1'>{{item.info}}</view>
+                    </view>
+                    <view class='iconfont icon-xiangyou'></view>
+                  </navigator>
+                </swiper-item>
+              </block>
+            </swiper> 
           </view>
-          
-          <view class="scroll-coupon" wx:if="{{getCouponList.length}}">
-             <scroll-view class="scroll-view_x" enable-flex scroll-x style="width:auto;overflow:hidden;">
-               <view
-                  class="item {{item.is_use ? 'on' : ''}}"
+        </view>
+        
+        <!-- 优惠券领取
+        <view class="scroll-coupon" wx:if="{{getCouponList.length}}">
+          <scroll-view class="scroll-view_x" enable-flex scroll-x style="width:auto;overflow:hidden;">
+            <view class="item {{item.is_use ? 'on' : ''}}"
                   data-index="{{index}}"
                   bindtap="receiveCoupon"
                   wx:for="{{getCouponList}}"
-                  wx:key='index'
-                >
-                  <image src="/images/label01.png" class="lable" wx:if='{{item.is_use === true}}'></image>
-                  <image src="/images/label02.png" class="lable" wx:elif='{{item.is_use === 2}}'></image>
-                  <view class="coupon-slide acea-row row-center-wrapper">
-                    <view class="money">
-                      ¥<text class="num">{{ item.coupon_price }}</text>
-                    </view>
-                    <view>
-                      <view class="minPrice">
-                        满¥<text class="num">{{ item.use_min_price }}</text>可用
-                      </view>
-                      <view class="time">
-                        {{ item.start_time ? item.start_time + "-" : ""
-                        }}{{ item.end_time }}
-                      </view>
-                    </view>
+                  wx:key='index'>
+              <image src="/images/label01.png" class="lable" wx:if='{{item.is_use === true}}'></image>
+              <image src="/images/label02.png" class="lable" wx:elif='{{item.is_use === 2}}'></image>
+              <view class="coupon-slide acea-row row-center-wrapper">
+                <view class="money">
+                  ¥<text class="num">{{ item.coupon_price }}</text>
+                </view>
+                <view>
+                  <view class="minPrice">
+                    满¥<text class="num">{{ item.use_min_price }}</text>可用
+                  </view>
+                  <view class="time">
+                    {{ item.start_time ? item.start_time + "-" : ""}}{{ item.end_time }}
                   </view>
                 </view>
-                <view class="more"><navigator url="/pages/user_get_coupon/index" hover-class="none">领取更多</navigator></view>
-             </scroll-view>
-          </view>
-          <!-- <view class="activity" wx:if="{{activity.length}}">
-            <view class="title"><image src="/images/title.png"></image></view>
-            <view class="activityCon acea-row row-between-wrapper">
-              <navigator url="{{item.link ? item.link : ''}}" class="left"
+              </view>
+            </view>
+            <view class="more"><navigator url="/pages/user_get_coupon/index" hover-class="none">领取更多</navigator></view>
+          </scroll-view>
+        </view>
+        -->
+
+        <!-- 活动区域图片
+        <view class="activity" wx:if="{{activity.length}}">
+          <view class="title"><image src="/images/title.png"></image></view>
+          <view class="activityCon acea-row row-between-wrapper">
+            <navigator url="{{item.link ? item.link : ''}}" class="left"
               style="{{'background-image: url(' + item.pic + ');'}}"
-                hover-class="none" wx:for="{{activity}}" wx:if="{{index == 1}}" wx:key='index'>
+              hover-class="none" wx:for="{{activity}}" wx:if="{{index == 1}}" wx:key='index'>
+              <view class="name">{{ item.title }}</view>
+              <view class="info">{{ item.info }}</view>
+              <view class='timeCon'>
+                <text class='num'>{{countDownHour}}</text> :
+                <text class='num'>{{countDownMinute}}</text> :
+                <text class='num'>{{countDownSecond}}</text>
+              </view>
+            </navigator >
+            <view class="right acea-row row-column-between">
+              <navigator url="{{item.link ? item.link : ''}}"
+                class="item" style="background-image: url('{{item.pic}}')"
+                wx:for="{{activity}}" wx:key='index' hover-class="none" wx:if="{{index == 0 || index == 2}}">
                 <view class="name">{{ item.title }}</view>
                 <view class="info">{{ item.info }}</view>
-                <view class='timeCon'>
-                  <text class='num'>{{countDownHour}}</text> :
-                  <text class='num'>{{countDownMinute}}</text> :
-                  <text class='num'>{{countDownSecond}}</text>
-                </view>
               </navigator >
-              <view class="right acea-row row-column-between">
-                <navigator url="{{item.link ? item.link : ''}}"
-                  class="item" style="background-image: url('{{item.pic}}')"
-                  wx:for="{{activity}}" wx:key='index' hover-class="none" wx:if="{{index == 0 || index == 2}}">
-                  <view class="name">{{ item.title }}</view>
-                  <view class="info">{{ item.info }}</view>
-                </navigator >
-              </view>
-            </view>
-          </view> -->
-              <view class="liveBroadcast" wx:if='{{liveList.length || liveInfo.roomid}}'>
-       <view class="publicTitle acea-row row-center-wrapper">
-              <image src="/images/tv.png"></image>
-              <!-- <navigator hover-class="none" url='/pages/first-new-product/index?type=3' class="more">更多 ></navigator> -->
             </view>
-        <!-- end:结束；time：直播时间 -->
-        <navigator wx:if='{{liveInfo.roomid}}' hover-class="none" url="plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id={{liveInfo.roomid}}" class="broadcast time">
-           <view class="pictrue">
+          </view>
+        </view>
+        -->
+
+        <!-- 直播列表，后台暂不支持
+        <view class="liveBroadcast" wx:if='{{liveList.length || liveInfo.roomid}}'>
+          <view class="publicTitle acea-row row-center-wrapper">
+            <image src="/images/tv.png"></image>
+            <navigator hover-class="none" url='/pages/first-new-product/index?type=3' class="more">更多 ></navigator>
+          </view>
+          <navigator wx:if='{{liveInfo.roomid}}' hover-class="none" url="plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id={{liveInfo.roomid}}" class="broadcast time">
+            <view class="pictrue">
               <image src="{{liveInfo.share_img}}"></image>
               <view class="label" wx:if='{{liveInfo.live_status == 101}}'><text class="iconfont icon-zhibo"></text>直播中</view>
               <view class="label" wx:if='{{liveInfo.live_status == 103}}'><text class="iconfont icon-zhibojieshux"></text>已结束</view>
               <view class="label" wx:if='{{liveInfo.live_status == 102}}'><text class="iconfont icon-shijian"></text>直播时间 {{liveInfo._start_time}}</view>
-           </view>
-           <view class="text line1">{{liveInfo.name}}</view>
-        </navigator>
-        <view class="list" wx:if="{{liveList.length}}">
-           <scroll-view class="scroll-view_x" scroll-x style="width:auto;overflow:hidden;">
+            </view>
+            <view class="text line1">{{liveInfo.name}}</view>
+          </navigator>
+          <view class="list" wx:if="{{liveList.length}}">
+            <scroll-view class="scroll-view_x" scroll-x style="width:auto;overflow:hidden;">
               <navigator hover-class="none" wx:for='{{liveList}}' wx:key='index' url="plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id={{item.roomid}}" class="item">
-                  <view class="pictrue">
-                    <image src="{{item.share_img}}"></image>
-                    <view class="label" wx:if='{{item.live_status == 101}}'><text class="iconfont icon-zhibo"></text>直播中</view>
-              <view class="label" wx:if='{{item.live_status == 103}}'><text class="iconfont icon-zhibojieshux"></text>已结束</view>
-              <view class="label" wx:if='{{item.live_status == 102}}'><text class="iconfont icon-shijian"></text>直播时间 {{item._start_time}}</view>
-                  </view>
-                  <view class="text line1">{{item.name}}</view>
-                </navigator>
-            </scroll-view>
-        </view>
-    </view>
-          <!-- <view class="flashSale" wx:if="{{seckillCont}}">
-            <view class="title acea-row row-between row-bottom">
-              <view class="left acea-row row-middle">
                 <view class="pictrue">
-                  <image src="/images/buyTitle.png"></image>
-                </view>
-                <view class="text">
-                  <view>top sellers</view>
-                  <view class="chinese">拼手速抢惊喜 每日更新</view>
+                  <image src="{{item.share_img}}"></image>
+                  <view class="label" wx:if='{{item.live_status == 101}}'><text class="iconfont icon-zhibo"></text>直播中</view>
+                  <view class="label" wx:if='{{item.live_status == 103}}'><text class="iconfont icon-zhibojieshux"></text>已结束</view>
+                  <view class="label" wx:if='{{item.live_status == 102}}'><text class="iconfont icon-shijian"></text>直播时间 {{item._start_time}}</view>
                 </view>
+                <view class="text line1">{{item.name}}</view>
+              </navigator>
+            </scroll-view>
+          </view>
+        </view>
+        -->
+
+        <!-- 秒杀，屏蔽
+        <view class="flashSale" wx:if="{{seckillCont}}">
+          <view class="title acea-row row-between row-bottom">
+            <view class="left acea-row row-middle">
+              <view class="pictrue">
+                <image src="/images/buyTitle.png"></image>
               </view>
-              <view class="right acea-row row-middle">
-                <view class="item">
-                  <text class="iconfont icon-xuanzhong"></text>限时低价
-                </view>
-                <view class="item">
-                  <text class="iconfont icon-xuanzhong"></text>正品保证
-                </view>
+              <view class="text">
+                <view>top sellers</view>
+                <view class="chinese">拼手速抢惊喜 每日更新</view>
               </view>
             </view>
-            <view class="pictrueBg"><image src="/images/timeBg.png"></image></view>
-            <view class="timeItem">
-                <scroll-view class="scroll-view_x" scroll-x scroll-with-animation scroll-left="{{scrollLeft}}">
-                    <view class="timeLen item {{killIndex==index?'on':''}}" data-index="{{index}}" bindtap="setTime" wx:for="{{timeList}}" wx:key='index'>
-                        <view class="time">{{ item.time }}</view>
-                        <view class="stateCon acea-row row-center-wrapper">
-                            <view class="state acea-row row-center-wrapper">
-                                {{ item.state }}
-                            </view>
-                        </view>
-                    </view>
-                </scroll-view>
-            </view>
-            <view class="list">
-                    <scroll-view class="scroll-view_x acea-row" scroll-x style="width:auto;overflow:hidden;">
-                      <view class="item" wx:for="{{seckillList}}" wx:for-item="itemSeckill" wx:key='index'>
-                        <view class="pictrue" bindtap="goDetail" data-id="{{itemSeckill.id}}">
-                          <image src="{{itemSeckill.image}}"></image>
-                          <view class="bar">
-                            <view class="pos">
-                            <view class="num acea-row row-center-wrapper" style="width:{{itemSeckill.percent}}%;"></view>
-                            <view class="stock">已抢{{itemSeckill.percent}}%</view>
-                            </view>
-                          </view>
-                        </view>
-                        <view class="text">
-                          <view class="name line1">{{ itemSeckill.title }}</view>
-                          <view class="ot-money">
-                            ¥{{ itemSeckill.ot_price }}
-                          </view>
-                          <view class="money font-color">
-                              ¥<text class="num">{{ itemSeckill.price }}</text>
-                          </view>
-                        </view>
-                      </view>
-                    </scroll-view>
-                </view>
-          </view> -->
-          <!-- <navigator 
-            url="{{lovely[0].link ? lovely[0].link : ''}}"
-            class="advert"
-            hover-class="none"
-            wx:if="{{lovely.length}}"
-            >
-            <image src="{{lovely[0].img}}"></image>
-            </navigator> -->
-             <view class='advert' wx:if="{{newGoodsBananr}}">
-                <block>
-                  <image src='{{newGoodsBananr}}'></image>
-                </block>  
+            <view class="right acea-row row-middle">
+              <view class="item">
+                <text class="iconfont icon-xuanzhong"></text>限时低价
+              </view>
+              <view class="item">
+                <text class="iconfont icon-xuanzhong"></text>正品保证
               </view>
-          <view class="newProducts" wx:if="{{info.firstList.length > 0}}">
-            <view class="publicTitle acea-row row-center-wrapper">
-              <image src="/images/newsTitle.png"></image>
-              <navigator hover-class="none" url='/pages/first-new-product/index?type=3' class="more">更多 ></navigator>
             </view>
-            <view class="newSwiper">
-              <swiper autoplay="{{autoplay}}" circular="{{circular}}" interval="{{intervalNew}}" duration="{{durationNew}}" previous-margin="110px" next-margin="110px" bindchange="bindchange">
-                <swiper-item wx:for="{{info.firstList}}" wx:key='index'>
-                  <view bindtap="goDetailType" data-items='{{item}}' class="item {{avtiveIndex===index?'active':'quiet'}}">
-                    <image src="{{item.image}}"></image>
-                    <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
-                      <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
-                      <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
-                  </view>
-                </swiper-item>
-              </swiper>
-              <view class="text" wx:for="{{info.firstList}}" wx:key='index'>
-                <view wx:if="{{index === avtiveIndex}}">
-                  <view class="name line1">{{ item.store_name }}</view>
-                  <view class="money font-color">
-                    ¥<text class="num">{{ item.price }}</text>
+          </view>
+          <view class="pictrueBg"><image src="/images/timeBg.png"></image></view>
+          <view class="timeItem">
+            <scroll-view class="scroll-view_x" scroll-x scroll-with-animation scroll-left="{{scrollLeft}}">
+              <view class="timeLen item {{killIndex==index?'on':''}}" data-index="{{index}}" bindtap="setTime" wx:for="{{timeList}}" wx:key='index'>
+                <view class="time">{{ item.time }}</view>
+                <view class="stateCon acea-row row-center-wrapper">
+                  <view class="state acea-row row-center-wrapper">
+                    {{ item.state }}
                   </view>
                 </view>
               </view>
-            </view>
+            </scroll-view>
           </view>
-          <view
-            class="recommend"
-            wx:if="{{info.bastList.length || info.bastBanner.length}}"
-          >
-            <view class="publicTitle acea-row row-center-wrapper">
-              <image src="/images/boutiqueTitle.png"></image>
-              <navigator hover-class="none" url='/pages/first-new-product/index?type=1' class="more"
-                >更多 ></navigator>
-            </view>
-            <view class="slider-banner recommendSwiper" wx:if="{{info.bastBanner.length}}">
-              <swiper autoplay="true" indicator-dots="true"
-                 circular="{{circular}}" interval="3000" duration="500" indicator-color="rgba(0,0,0,0.2)" indicator-active-color="#ff3366">
-                <swiper-item wx:for="{{info.bastBanner}}" wx:key='index'>
-                  <navigator url="{{item.url ? item.url : ''}}" class="pictrue acea-row row-middle" hover-class="none">
-                    <image src="{{item.img}}"></image>
-                  </navigator >
-                </swiper-item>
-              </swiper>
-            </view>
-            <view class="publicList acea-row row-between-wrapper">
-              <view bindtap="goDetailType" data-items='{{item}}' class="item"
-                wx:for="{{info.bastList}}" wx:key='index'>
-                <view class="pictrue">
-                  <image src="{{item.image}}"></image>
-                  <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
-                      <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
-                      <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
+          <view class="list">
+            <scroll-view class="scroll-view_x acea-row" scroll-x style="width:auto;overflow:hidden;">
+              <view class="item" wx:for="{{seckillList}}" wx:for-item="itemSeckill" wx:key='index'>
+                <view class="pictrue" bindtap="goDetail" data-id="{{itemSeckill.id}}">
+                  <image src="{{itemSeckill.image}}"></image>
+                  <view class="bar">
+                    <view class="pos">
+                      <view class="num acea-row row-center-wrapper" style="width:{{itemSeckill.percent}}%;"></view>
+                      <view class="stock">已抢{{itemSeckill.percent}}%</view>
+                    </view>
+                  </view>
                 </view>
                 <view class="text">
-                  <view class="name line1">{{ item.store_name }}</view>
-                  <view class="acea-row row-between-wrapper">
-                    <view>
-                      <view class="money font-color">
-                        ¥<text class="num">{{ item.price }}</text>
-                      </view>
-                      <!-- <view class="ot-money">¥{{ item.ot_price }}</view> -->
-                    </view>
-                    <view class="cart acea-row row-center-wrapper">
-                      <text class="iconfont icon-mzshopping"></text>
-                    </view>
+                  <view class="name line1">{{ itemSeckill.title }}</view>
+                  <view class="ot-money">
+                    ¥{{ itemSeckill.ot_price }}
+                  </view>
+                  <view class="money font-color">
+                    ¥<text class="num">{{ itemSeckill.price }}</text>
                   </view>
                 </view>
               </view>
-            </view>
+            </scroll-view>
           </view>
-          <view class="hotList" wx:if="{{likeInfo.length}}">
-            <view class="publicTitle acea-row row-center-wrapper">
-              <image src="/images/hotTitle.png"></image>
-              <navigator url="/pages/first-new-product/index?type=2" class="more" hover-class="none">更多 ></navigator>
-            </view>
-            <view class="list acea-row">
-              <navigator url="/pages/goods_details/index?id={{item.id}}" class="item"
-              wx:for="{{likeInfo}}" wx:key='index'>
-                <view class="pictrue">
+        </view>
+        -->
+
+        <!-- 首发新品推荐图片
+        <navigator 
+          url="{{lovely[0].link ? lovely[0].link : ''}}"
+          class="advert"
+          hover-class="none"
+          wx:if="{{lovely.length}}">
+          <image src="{{lovely[0].img}}"></image>
+        </navigator> 
+        -->
+        
+        <!-- 不使用后台的首发新品图片
+        <view class='advert' wx:if="{{newGoodsBananr}}">
+          <block>
+            <image src='{{newGoodsBananr}}'></image>
+          </block>  
+        </view>
+        -->
+
+        <view class="newProducts" wx:if="{{info.firstList.length > 0}}">
+          <!-- 首发新品 banner 固定图片 -->
+          <view class="publicTitle acea-row row-center-wrapper">
+            <image src="/images/newsTitle.png"></image>
+            <navigator hover-class="none" url='/pages/first-new-product/index?type=3' class="more">更多 ></navigator>
+          </view>
+          <!-- 首发新品轮播图 -->
+          <view class="newSwiper">
+            <swiper autoplay="{{autoplay}}" circular="{{circular}}" interval="{{intervalNew}}" duration="{{durationNew}}"     previous-margin="110px" next-margin="110px" bindchange="bindchange">
+              <swiper-item wx:for="{{info.firstList}}" wx:key='index'>
+                <view bindtap="goDetailType" data-items='{{item}}' class="item {{avtiveIndex===index?'active':'quiet'}}">
                   <image src="{{item.image}}"></image>
-                  <image src="/images/one01.png" class="icon" wx:if='{{index === 0}}'></image>
-                 <image src="/images/two02.png" class="icon" wx:if='{{index === 1}}'></image>
-                 <image src="/images/three03.png" class="icon" wx:if='{{index === 2}}'></image> 
+                  <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
+                  <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
+                  <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
                 </view>
-                <view class="text">
-                  <view class="name line1">{{ item.store_name }}</view>
-                  <view class="money font-color">
-                    ¥<text class="num">{{ item.price }}</text>
-                    <!-- <text class="ot-money">¥{{ item.ot_price }}</text> -->
-                  </view>
+              </swiper-item>
+            </swiper>
+            <view class="text" wx:for="{{info.firstList}}" wx:key='index'>
+              <view wx:if="{{index === avtiveIndex}}">
+                <view class="name line1">{{ item.store_name }}</view>
+                <view class="money font-color">
+                  ¥<text class="num">{{ item.price }}</text>
                 </view>
-              </navigator >
+              </view>
             </view>
           </view>
-          <view class="promotion" wx:if="{{benefit.length}}">
-            <view class="publicTitle acea-row row-center-wrapper">
-              <image src="/images/promotionTitle.png"></image>
-              <navigator url="/pages/promotional-items/index" class="more" hover-class="none">更多 ></navigator>
-            </view>
-            <view class="publicList acea-row row-between-wrapper">
-              <view bindtap="goDetailType" data-items='{{item}}' class="item"
-                wx:for="{{benefit}}" wx:key='index'>
-                <view class="pictrue">
-                  <image src="{{item.image}}"></image>
-                   <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
-                      <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
-                      <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
-                </view>
-                <view class="text">
-                  <view class="name line1">{{ item.store_name }}</view>
-                  <view class="acea-row row-between-wrapper">
-                    <view>
-                      <view class="money font-color">
-                        ¥<text class="num">{{ item.price }}</text><text class="label bg-color">疯抢</text>
-                      </view>
-                      <view class="ot-money">¥{{ item.ot_price }}</view>
-                    </view>
-                    <view class="cart acea-row row-center-wrapper">
-                      <text class="iconfont icon-mzshopping"></text>
+        </view>
+
+        <view class="recommend" wx:if="{{info.bastList.length || info.bastBanner.length}}">
+          <!-- 精品推荐 banner 客户端固定 -->
+          <view class="publicTitle acea-row row-center-wrapper">
+            <image src="/images/boutiqueTitle.png"></image>
+            <navigator hover-class="none" url='/pages/first-new-product/index?type=1' class="more" >更多 ></navigator>
+          </view>
+          <!-- 精品推荐配图轮播 -->
+          <view class="slider-banner recommendSwiper" wx:if="{{info.bastBanner.length}}">
+            <swiper autoplay="true" indicator-dots="true"
+              circular="{{circular}}" interval="3000" duration="500" indicator-color="rgba(0,0,0,0.2)" indicator-active-color="#ff3366">
+              <swiper-item wx:for="{{info.bastBanner}}" wx:key='index'>
+                <navigator url="{{item.url ? item.url : ''}}" class="pictrue acea-row row-middle" hover-class="none">
+                  <image src="{{item.img}}"></image>
+                </navigator >
+              </swiper-item>
+            </swiper>
+          </view>
+
+          <!-- 精品推荐 产品列表 -->
+          <view class="publicList acea-row row-between-wrapper">
+            <view bindtap="goDetailType" data-items='{{item}}' class="item"
+              wx:for="{{info.bastList}}" wx:key='index'>
+              <view class="pictrue">
+                <image src="{{item.image}}"></image>
+                <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
+                <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
+                <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
+              </view>
+              <view class="text">
+                <view class="name line1">{{ item.store_name }}</view>
+                <view class="acea-row row-between-wrapper">
+                  <view>
+                    <view class="money font-color">
+                      ¥<text class="num">{{ item.price }}</text>
                     </view>
+                    <!-- <view class="ot-money">¥{{ item.ot_price }}</view> -->
+                  </view>
+                  <view class="cart acea-row row-center-wrapper">
+                    <text class="iconfont icon-mzshopping"></text>
                   </view>
                 </view>
               </view>
             </view>
           </view>
-          <view class="recommendList" wx:if='{{hostProduct.length > 0}}'>
-            <view class="title">
-              <image src="/images/becommendTitle.png"></image>
-            </view>
-            <view class="publicList acea-row row-between-wrapper">
-              <view bindtap="goDetailType" data-items='{{item}}' wx:for="{{hostProduct}}" wx:key='index' class="item">
-                <view class="pictrue">
-                  <image src="{{item.image}}"></image>
-                   <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
-                      <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
-                      <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
+        </view> <!-- 精品推荐 -->
+
+        <view class="hotList" wx:if="{{likeInfo.length}}">
+          <!-- 热门榜单 banner 客户端固定 -->
+          <view class="publicTitle acea-row row-center-wrapper">
+            <image src="/images/hotTitle.png"></image>
+            <navigator url="/pages/first-new-product/index?type=2" class="more" hover-class="none">更多 ></navigator>
+          </view>
+          <view class="list acea-row">
+            <navigator url="/pages/goods_details/index?id={{item.id}}" class="item"
+              wx:for="{{likeInfo}}" wx:key='index'>
+              <view class="pictrue">
+                <image src="{{item.image}}"></image>
+                <image src="/images/one01.png" class="icon" wx:if='{{index === 0}}'></image>
+                <image src="/images/two02.png" class="icon" wx:if='{{index === 1}}'></image>
+                <image src="/images/three03.png" class="icon" wx:if='{{index === 2}}'></image> 
+              </view>
+              <view class="text">
+                <view class="name line1">{{ item.store_name }}</view>
+                <view class="money font-color">
+                  ¥<text class="num">{{ item.price }}</text>
+                  <!-- <text class="ot-money">¥{{ item.ot_price }}</text> -->
                 </view>
-                <view class="text">
-                  <view class="name line1">{{ item.store_name }}</view>
-                  <view class="acea-row row-between-wrapper">
-                    <view>
-                      <view class="money font-color">
-                        ¥<text class="num">{{ item.price }}</text>
-                      </view>
-                      <!-- <view class="ot-money">¥{{ item.ot_price }}</view> -->
-                    </view>
-                    <view class="cart acea-row row-center-wrapper">
-                      <text class="iconfont icon-mzshopping"></text>
+              </view>
+            </navigator >
+          </view>
+        </view>
+
+        <view class="promotion" wx:if="{{benefit.length}}">
+          <!-- 促销单品 banner -->
+          <view class="publicTitle acea-row row-center-wrapper">
+            <image src="/images/promotionTitle.png"></image>
+            <navigator url="/pages/promotional-items/index" class="more" hover-class="none">更多 ></navigator>
+          </view>
+          <view class="publicList acea-row row-between-wrapper">
+            <view bindtap="goDetailType" data-items='{{item}}' class="item"
+              wx:for="{{benefit}}" wx:key='index'>
+              <view class="pictrue">
+                <image src="{{item.image}}"></image>
+                <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
+                <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
+                <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
+              </view>
+              <view class="text">
+                <view class="name line1">{{ item.store_name }}</view>
+                <view class="acea-row row-between-wrapper">
+                  <view>
+                    <view class="money font-color">
+                      ¥<text class="num">{{ item.price }}</text><text class="label bg-color">疯抢</text>
                     </view>
+                    <view class="ot-money">¥{{ item.ot_price }}</view>
+                  </view>
+                  <view class="cart acea-row row-center-wrapper">
+                    <text class="iconfont icon-mzshopping"></text>
                   </view>
                 </view>
               </view>
-                <view class='loadingicon acea-row row-center-wrapper' wx:if='{{hostProduct.length > 0}}'>
-        <text class='loading iconfont icon-jiazai' hidden='{{recommend.loading==false}}'></text>
-        {{recommend.loadTitle}}
-     </view>
             </view>
           </view>
         </view>
-      </Tab>
-      <Tab wx:for="{{categoryOne}}" title="{{item.cate_name}}" wx:key='index'>
-        <view wx:if="{{item.cate_name === '黑洞矿场'}}"><Mine id="mine"></Mine></view>
-        <view wx:else class="wrapper">
-          <image wx:if="{{item.pic !== ''}}" src="{{item.pic}}" style="width: 100%"></image>
-          <view class="scroll acea-row row-middle">
-             <view class="scroll-classify" wx:if="{{item.children.length}}">
-              <scroll-view class="scroll-view_x" scroll-x style="width:auto;overflow:hidden;">
-                <view class="item {{categoryActive === indexn ? 'on' : ''}}" bindtap="productTap" data-indexn="{{indexn}}" wx:for="{{item.children}}" wx:for-item="itemn" wx:for-index="indexn" wx:key='index'>
-                    <view class="pictrue">
-                      <image src="{{itemn.pic}}"></image>
-                    </view>
-                    <view class="name line1">{{ itemn.cate_name }}</view>
-                </view>
-              </scroll-view>
-          </view>
+
+        <view class="recommendList" wx:if='{{hostProduct.length > 0}}'>
+          <!-- 海量精品 为您推荐 banner -->
+          <view class="title">
+            <image src="/images/becommendTitle.png"></image>
           </view>
-          <view class="classifyList acea-row row-between-wrapper">
-            <view bindtap="goDetailType" data-items='{{productItem}}' class="item" wx:for="{{productList}}" wx:for-item="productItem" wx:key='index'>
+          <view class="publicList acea-row row-between-wrapper">
+            <view bindtap="goDetailType" data-items='{{item}}' wx:for="{{hostProduct}}" wx:key='index' class="item">
               <view class="pictrue">
-                <image src="{{productItem.image}}"></image>
-                  <text class="pictrue_log_medium pictrue_log_class" wx:if="{{productItem.activity && productItem.activity.type ==='1'}}">秒杀</text>
-                      <text class="pictrue_log_medium pictrue_log_class" wx:if="{{productItem.activity && productItem.activity.type === '2'}}">砍价</text>
-                      <text class="pictrue_log_medium pictrue_log_class" wx:if="{{productItem.activity && productItem.activity.type === '3'}}">拼团</text>
+                <image src="{{item.image}}"></image>
+                <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
+                <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
+                <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
               </view>
               <view class="text">
-                <view class="name line1">{{ productItem.store_name }}</view>
-                <view class="money font-color">
-                  ¥<span class="num">{{ productItem.price }}</span>
-                </view>
+                <view class="name line1">{{ item.store_name }}</view>
                 <view class="acea-row row-between-wrapper">
-                  <view class="vipMoney" wx:if="{{productItem.vip_price && productItem.vip_price > 0}}">
-                    ￥{{ productItem.vip_price }}
-                    <image src="/images/vip.png"></image>
+                  <view>
+                    <view class="money font-color">
+                      ¥<text class="num">{{ item.price }}</text>
+                    </view>
+                    <!-- <view class="ot-money">¥{{ item.ot_price }}</view> -->
+                  </view>
+                  <view class="cart acea-row row-center-wrapper">
+                    <text class="iconfont icon-mzshopping"></text>
                   </view>
-                  <view class="sales">已售{{ productItem.sales }}件</view>
                 </view>
               </view>
             </view>
-              <view class='loadingicon acea-row row-center-wrapper'>
-        <text class='loading iconfont icon-jiazai' hidden='{{loading==false}}'></text>
-        {{loadTitle}}
-     </view>
+            <view class='loadingicon acea-row row-center-wrapper' wx:if='{{hostProduct.length > 0}}'>
+              <text class='loading iconfont icon-jiazai' hidden='{{recommend.loading==false}}'></text>
+              {{recommend.loadTitle}}
+            </view>
           </view>
-          <view class='noCommodity' wx:if="{{productList.length==0 && where.page > 1}}">
-   <view class='pictrue'><image src='/images/noShopper.png'></image></view>
-   <recommend host_product="{{hostProduct}}"></recommend>
-</view>
         </view>
-      </Tab>
-    </Tabs>
+      </view>
+    </Tab>
+
+    <Tab wx:for="{{categoryOne.children}}" title="{{item.cate_name}}" wx:key='index'>
+      <!--黑洞星球活动-->
+      <view wx:if="{{item.id === 199}}">
+        <Mine id="mine"></Mine>
+      </view>
+
+      <!-- 其他活动 -->
+      <view wx:else class="wrapper">
+        <!-- 活动商品列表 -->
+        <view class="classifyList acea-row row-between-wrapper">
+          <view bindtap="goDetailType" data-items='{{productItem}}' class="item" wx:for="{{productList}}" wx:for-item="productItem" wx:key='index'>
+            <view class="pictrue">
+              <image src="{{productItem.image}}"></image>
+              <text class="pictrue_log_medium pictrue_log_class" wx:if="{{productItem.activity && productItem.activity.type ==='1'}}">秒杀</text>
+              <text class="pictrue_log_medium pictrue_log_class" wx:if="{{productItem.activity && productItem.activity.type === '2'}}">砍价</text>
+              <text class="pictrue_log_medium pictrue_log_class" wx:if="{{productItem.activity && productItem.activity.type === '3'}}">拼团</text>
+            </view>
+            <view class="text">
+              <view class="name line1">{{ productItem.store_name }}</view>
+              <view class="money font-color">
+                ¥<span class="num">{{ productItem.price }}</span>
+              </view>
+              <view class="acea-row row-between-wrapper">
+                <!--view class="vipMoney" wx:if="{{productItem.vip_price && productItem.vip_price > 0}}">
+                  ￥{{ productItem.vip_price }}
+                  <image src="/images/vip.png"></image>
+                </view-->
+                <view class="sales">已售{{ productItem.sales }}件</view>
+              </view>
+            </view>
+          </view>
+
+          <view class='loadingicon acea-row row-center-wrapper'>
+            <text class='loading iconfont icon-jiazai' hidden='{{loading==false}}'></text>
+              {{loadTitle}}
+          </view>
+        </view>
+
+        <!-- 推荐产品展示 -->
+        <view class='noCommodity' wx:if="{{productList.length==0 && where.page > 1}}">
+          <view class='pictrue'><image src='/images/noShopper.png'></image></view>
+          <recommend host_product="{{hostProduct}}"></recommend>
+        </view>
+      </view>
+    </Tab>
+  </Tabs>
 </view>
-<coupon-window window='{{window}}' couponList="{{couponList}}" bind:onColse="onColse"></coupon-window>
+
+<!-- coupon-window window='{{window}}' couponList="{{couponList}}" bind:onClose="onClose"></coupon-window -->
 <authorize bind:onLoadFun='onLoadFun' isGoIndex='{{isGoIndex}}' iShidden="{{iShidden}}" isAuto="{{isAuto}}"></authorize>

view/xcx/pages/message/index.js

@@ -14,7 +14,7 @@ Page({
    */
   data: {
     parameter: {
-      title: "我的消息",
+      title: "消息",
       'navbar': '1',
       'return': '1',
       'color': false,

view/xcx/pages/promotional-items/index.js

@@ -1,8 +1,9 @@
 import { getGroomList } from '../../api/store.js';
 
+// 促销单品
+
 const app=getApp();
 Page({
-
   /**
    * 页面的初始数据
    */
@@ -24,6 +25,7 @@ Page({
   onLoad: function (options) {
     this.getIndexGroomList();
   },
+  
   getIndexGroomList: function(){
     var that=this
     if(this.data.loadend) return false;

view/xcx/pages/promotional-items/index.wxml

@@ -7,7 +7,8 @@
       <view class='line'></view>
    </view>
    <promotionGood benefit="{{bastList}}"></promotionGood>
-    <view class='loadingicon acea-row row-center-wrapper' wx:if='{{bastList.length > 0}}'>
-      <text class='loading iconfont icon-jiazai' wx:if='{{loading==true}}'></text>{{loadTitle}}
-    </view>
+   <view class='loadingicon acea-row row-center-wrapper' wx:if='{{bastList.length > 0}}'>
+      <text class='loading iconfont icon-jiazai' wx:if='{{loading==true}}'></text>
+      {{ loadTitle }}
+   </view>
 </view>

view/xcx/pages/user/user.js

@@ -122,6 +122,7 @@ Page({
   onUnload: function () {
     
   },
+  
   onShow:function(){
     let that = this;
     if (app.globalData.isLog){ 

view/xcx/pages/user_get_coupon/index.js

@@ -29,12 +29,13 @@ Page({
   onLoadFun:function(){
     this.getUseCoupons();
   },
-  getCoupon:function(e){
+  
+  /** 领取优惠券 */
+  getCoupon: function(e){
     var that = this;
     var id = e.currentTarget.dataset.id;
     var index = e.currentTarget.dataset.index;
     var list = that.data.couponsList;
-    //领取优惠券
     getCouponReceive({ couponId: id }).then(function (res) {
       list[index].is_use = true;
       that.setData({
@@ -45,6 +46,7 @@ Page({
       return app.Tips({title:res.msg});
     });
   },
+
   /**
    * 生命周期函数--监听页面加载
    */
@@ -80,7 +82,5 @@ Page({
    */
   onReachBottom: function () {
     this.getUseCoupons();
-  },
-
-
+  }
 })

view/xcx/pages/user_money/index.js

@@ -15,7 +15,7 @@ Page({
     parameter: {
       'navbar': '1',
       'return': '1',
-      'title': '我的账户',
+      'title': '钱包',
       'color': false,
     },
     iShidden: false,
@@ -23,6 +23,11 @@ Page({
     host_product:[],
     isClose:false,
     recharge_switch:0,
+    activity: {
+      is_pink: false,
+      is_seckill: false,
+      is_bargin: false
+    }
   },
 
   /**
@@ -31,7 +36,7 @@ Page({
   onLoadFun:function(){
     this.getUserInfo();
     this.get_host_product();
-    this.get_activity();
+    // this.get_activity();
   },
   /**
    * 生命周期函数--监听页面加载
@@ -93,7 +98,7 @@ Page({
     if (app.globalData.isLog && this.data.isClose) {
       this.getUserInfo();
       this.get_host_product();
-      this.get_activity();
+      // this.get_activity();
       this.setData({
         iShidden: true
       });

view/xcx/pages/user_money/index.wxml

@@ -1,96 +1,96 @@
 <navbar parameter='{{parameter}}'></navbar>
 <view class='my-account'>
-   <view class='wrapper'>
-      <view class='header'>
-         <view class='headerCon'>
-              <view class='account acea-row row-top row-between'>
-                  <view class='assets'>
-                    <view>总资产(元)</view>
-                    <view class='money'>{{userInfo.now_money || 0}}</view>
-                  </view>
-                  <view wx:if='{{recharge_switch}}' bindtap="openSubscribe" hover-class='none' data-url='/pages/user_payment/index' class='recharge font-color'>充值</view>
-              </view>
-              <view class='cumulative acea-row row-top'>
-                <view class='item' wx:if="{{recharge_switch}}">
-                    <view>累计充值(元)</view>
-                    <view class='money'>{{userInfo.recharge || 0}}</view>
-                </view>
-                <view class='item'>
-                    <view>累计消费(元)</view>
-                    <view class='money'>{{userInfo.orderStatusSum || 0}}</view>
-                </view>
-              </view>
-         </view>
+  <view class='wrapper'>
+    <view class='header'>
+      <view class='headerCon'>
+        <view class='account acea-row row-top row-between'>
+          <view class='assets'>
+            <view>总资产(元)</view>
+            <view class='money'>{{userInfo.now_money || 0}}</view>
+          </view>
+          <view wx:if='{{recharge_switch}}' bindtap="openSubscribe" hover-class='none' data-url='/pages/user_payment/index' class='recharge font-color'>充值</view>
+      	</view>
+        <view class='cumulative acea-row row-top'>
+          <view class='item' wx:if="{{recharge_switch}}">
+            <view>累计充值(元)</view>
+            <view class='money'>{{userInfo.recharge || 0}}</view>
+          </view>
+        	<view class='item'>
+          	<view>累计消费(元)</view>
+          	<view class='money'>{{userInfo.orderStatusSum || 0}}</view>
+        	</view>
+     		</view>
       </view>
-      <view class='nav acea-row row-middle'>
-         <navigator class='item' hover-class='none' url='/pages/user_bill/index'>
-            <view class='pictrue'><image src='/images/record1.png'></image></view>
-            <view>账单记录</view>
-         </navigator>
-         <navigator class='item' hover-class='none' url='/pages/user_bill/index?type=1'>
-            <view class='pictrue'><image src='/images/record2.png'></image></view>
-            <view>消费记录</view>
-         </navigator>
-         <navigator class='item' hover-class='none' url='/pages/user_bill/index?type=2' wx:if="{{recharge_switch}}">
-            <view class='pictrue'><image src='/images/record3.png'></image></view>
-            <view>充值记录</view>
-         </navigator>
-         <navigator class='item' hover-class='none' url='/pages/user_integral/index'>
-            <view class='pictrue'><image src='/images/record4.png'></image></view>
-            <view>积分中心</view>
-         </navigator>
+    </view>
+    <view class='nav acea-row row-middle'>
+      <navigator class='item' hover-class='none' url='/pages/user_bill/index'>
+        <view class='pictrue'><image src='/images/record1.png'></image></view>
+        <view>账单记录</view>
+      </navigator>
+      <navigator class='item' hover-class='none' url='/pages/user_bill/index?type=1'>
+        <view class='pictrue'><image src='/images/record2.png'></image></view>
+        <view>消费记录</view>
+      </navigator>
+      <navigator class='item' hover-class='none' url='/pages/user_bill/index?type=2' wx:if="{{recharge_switch}}">
+        <view class='pictrue'><image src='/images/record3.png'></image></view>
+        <view>充值记录</view>
+      </navigator>
+      <navigator class='item' hover-class='none' url='/pages/user_integral/index'>
+        <view class='pictrue'><image src='/images/record4.png'></image></view>
+        <view>积分中心</view>
+      </navigator>
+    </view>
+    <view class='advert acea-row row-between-wrapper'>
+      <navigator class='item acea-row row-between-wrapper' hover-class='none' url='/pages/user_sgin/index'>
+        <view class='text'>
+          <view class='name'>签到领积分</view>
+          <view>赚积分抵现金</view>
+        </view>
+        <view class='pictrue'><image src='/images/gift.png'></image></view>
+      </navigator>
+      <navigator class='item on acea-row row-between-wrapper' hover-class='none' url='/pages/user_get_coupon/index'>
+        <view class='text'>
+        	<view class='name'>领取优惠券</view>
+          <view>满减享优惠</view>
+        </view>
+        <view class='pictrue'><image src='/images/money.png'></image></view>
+      </navigator>
+    </view>
+    <view class='list'>
+      <view class='item acea-row row-between-wrapper'>
+        <view class='picTxt acea-row row-between-wrapper'>
+          <view class='iconfont icon-hebingxingzhuang'></view>
+          <view class='text'>
+            <view class='line1'>最新拼团活动</view>
+            <view class='infor line1'>最新的优惠商品上架拼团</view>
+          </view>
+      	</view>
+        <navigator hover-class='none' url='/pages/activity/goods_combination/index' class='bnt' wx:if="{{activity.is_pink}}">立即参与</navigator>
+        <view class='bnt end' wx:else>已结束</view>
       </view>
-      <view class='advert acea-row row-between-wrapper'>
-         <navigator class='item acea-row row-between-wrapper' hover-class='none' url='/pages/user_sgin/index'>
-            <view class='text'>
-               <view class='name'>签到领积分</view>
-               <view>赚积分抵现金</view>
-            </view>
-            <view class='pictrue'><image src='/images/gift.png'></image></view>
-         </navigator>
-         <navigator class='item on acea-row row-between-wrapper' hover-class='none' url='/pages/user_get_coupon/index'>
-            <view class='text'>
-               <view class='name'>领取优惠券</view>
-               <view>满减享优惠</view>
-            </view>
-            <view class='pictrue'><image src='/images/money.png'></image></view>
-         </navigator>
+      <view class='item acea-row row-between-wrapper'>
+        <view class='picTxt acea-row row-between-wrapper'>
+          <view class='iconfont icon-miaosha yellow'></view>
+          <view class='text'>
+          	<view class='line1'>当前限时秒杀</view>
+            <view class='infor line1'>最新商品秒杀进行中</view>
+          </view>
+        </view>
+        <navigator hover-class='none' url='/pages/activity/goods_seckill/index' class='bnt' wx:if="{{activity.is_seckill}}">立即参与</navigator>
+        <view class='bnt end' wx:else>已结束</view>
       </view>
-      <view class='list'>
-         <view class='item acea-row row-between-wrapper'>
-            <view class='picTxt acea-row row-between-wrapper'>
-               <view class='iconfont icon-hebingxingzhuang'></view>
-               <view class='text'>
-                  <view class='line1'>最新拼团活动</view>
-                  <view class='infor line1'>最新的优惠商品上架拼团</view>
-               </view>
-            </view>
-            <navigator hover-class='none' url='/pages/activity/goods_combination/index' class='bnt' wx:if="{{activity.is_pink}}">立即参与</navigator>
-            <view class='bnt end' wx:else>已结束</view>
-         </view>
-         <view class='item acea-row row-between-wrapper'>
-            <view class='picTxt acea-row row-between-wrapper'>
-               <view class='iconfont icon-miaosha yellow'></view>
-               <view class='text'>
-                  <view class='line1'>当前限时秒杀</view>
-                  <view class='infor line1'>最新商品秒杀进行中</view>
-               </view>
-            </view>
-            <navigator hover-class='none' url='/pages/activity/goods_seckill/index' class='bnt' wx:if="{{activity.is_seckill}}">立即参与</navigator>
-            <view class='bnt end' wx:else>已结束</view>
-         </view>
-         <view class='item acea-row row-between-wrapper'>
-            <view class='picTxt acea-row row-between-wrapper'>
-               <view class='iconfont icon-kanjia1 green'></view>
-               <view class='text'>
-                  <view class='line1'>砍价活动</view>
-                  <view class='infor line1'>呼朋唤友来砍价</view>
-               </view>
-            </view>
-            <navigator hover-class='none' url='/pages/activity/goods_bargain/index' class='bnt' wx:if="{{activity.is_bargin}}">立即参与</navigator>
-            <view class='bnt end' wx:else>已结束</view>
-         </view>
+      <view class='item acea-row row-between-wrapper'>
+        <view class='picTxt acea-row row-between-wrapper'>
+          <view class='iconfont icon-kanjia1 green'></view>
+          <view class='text'>
+            <view class='line1'>砍价活动</view>
+            <view class='infor line1'>呼朋唤友来砍价</view>
+          </view>
+        </view>
+        <navigator hover-class='none' url='/pages/activity/goods_bargain/index' class='bnt' wx:if="{{activity.is_bargin}}">立即参与</navigator>
+        <view class='bnt end' wx:else>已结束</view>
       </view>
+    </view>
    </view>
    <recommend host_product="{{host_product}}"></recommend>
 </view>

view/xcx/project.config.json

@@ -23,7 +23,7 @@
     "compileHotReLoad": false,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
-    "useApiHostProcess": true,
+    "useApiHostProcess": false,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
@@ -40,7 +40,7 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.16.0",
-  "appid": "wxc2eeb4241ad96c3f",
+  "appid": "wx2cfae9c3f26a6f21",
   "projectname": "twong",
   "debugOptions": {
     "hidedInDevtools": []

view/xcx/utils/Server.js

@@ -33,8 +33,7 @@ export default class Server{
 
   /**
    * 心跳
-   *
-   * */
+   */
   ping(){
     let that = this;
     this.timer = setInterval(()=>{
@@ -44,8 +43,7 @@ export default class Server{
 
   /**
    * 关闭链接
-   * 
-  */
+   */
   close(){
     clearInterval(this.timer);
     this.SocketTask.close();
@@ -54,8 +52,7 @@ export default class Server{
 
   /**
    * 发送消息
-   *
-   * */
+   */
   send(data){
     let that = this;
     return new Promise((reslove, reject)=>{
@@ -94,11 +91,10 @@ export default class Server{
   }
 
   /**
-     * 注册事件
-     * @param string name 事件名称
-     * @param callback successFun 回调函数
-     * 
-    */
+   * 注册事件
+   * @param string name 事件名称
+   * @param callback successFun 回调函数
+   */
   $on(name, successFun) {
     let taht = this;
     if (typeof name === 'object') {
@@ -118,7 +114,7 @@ export default class Server{
    * 执行事件
    * @param string type 事件名称
    * @param array data 参数
-  */
+   */
   $emit(type, data){
     let onCallbacks = this.watcherList[type]
     onCallbacks.forEach(element => {

view/xcx/utils/wxh.js

@@ -144,6 +144,7 @@ var tapsize = function(that,e){
     taberindex: $index
   })
 }
+
 var selfLocation = function(showMode) {
   const that = this;
   return new Promise((resolve, reject)=>{
@@ -221,6 +222,7 @@ var selfLocation = function(showMode) {
     })
   })
 }
+
 module.exports = {
   carmin: carmin,
   carjia: carjia,