Merge branch 'master' of https://gitee.com/youc-project/litemall

litemall-wx/pages/groupon/myGroupon/myGroupon.js

+var util = require('../../../utils/util.js');
+var api = require('../../../config/api.js');
+
+Page({
+ data: {
+  orderList: [],
+  showType: 0
+ },
+ onLoad: function(options) {
+  // 页面初始化 options为页面跳转所带来的参数
+ },
+
+ onPullDownRefresh() {
+  wx.showNavigationBarLoading() //在标题栏中显示加载
+  this.getOrderList();
+  wx.hideNavigationBarLoading() //完成停止加载
+  wx.stopPullDownRefresh() //停止下拉刷新
+ },
+
+ getOrderList() {
+  let that = this;
+  util.request(api.GroupOnMy, {
+   showType: that.data.showType
+  }).then(function(res) {
+   if (res.errno === 0) {
+    that.setData({
+     orderList: res.data.data
+    });
+   }
+  });
+ },
+ switchTab: function(event) {
+  let showType = event.currentTarget.dataset.index;
+  this.setData({
+   showType: showType
+  });
+  this.getOrderList();
+ },
+ onReady: function() {
+  // 页面渲染完成
+ },
+ onShow: function() {
+  // 页面显示
+  this.getOrderList();
+ },
+ onHide: function() {
+  // 页面隐藏
+ },
+ onUnload: function() {
+  // 页面关闭
+ }
+})
\ No newline at end of file

litemall-wx/pages/groupon/myGroupon/myGroupon.json

+{
+ "navigationBarTitleText": "我的团购",
+ "usingComponents": {
+  "zan-capsule": "../../../dist/capsule/index"
+ }
+}
\ No newline at end of file

litemall-wx/pages/groupon/myGroupon/myGroupon.wxml

+<view class="container">
+ <view class="orders-switch">
+  <view class="item {{ showType == 0 ? 'active' : ''}}" bindtap="switchTab" data-index='0'>
+   <view class="txt">发起的团购</view>
+  </view>
+  <view class="item {{ showType == 1 ? 'active' : ''}}" bindtap="switchTab" data-index='1'>
+   <view class="txt">参加的团购</view>
+  </view>
+ </view>
+ <view class="no-order" wx:if="{{orderList.length <= 0}}">
+  <view class="c">
+   <image src="http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/noCart-a8fe3f12e5.png" />
+   <text>尚未参加任何团购</text>
+  </view>
+ </view>
+
+ <view class="orders">
+  <navigator url="../grouponDetail/grouponDetail?id={{item.id}}" class="order" open-type="navigate" wx:for="{{orderList}}" wx:key="id">
+   <view class="h">
+    <view class="l">订单编号：{{item.orderSn}}</view>
+    <view class="r">{{item.orderStatusText}}</view>
+   </view>
+   <view class="j">
+    <view class="l">团购立减：￥{{item.rules.discount}}</view>
+    <view class="r">参与时间：{{item.groupon.addTime}}</view>
+   </view>
+   <view class="i">
+    <view class="l">团购要求：{{item.rules.discountMember}}人</view>
+    <view class="r">当前参与：{{item.joinerCount}}</view>
+   </view>
+   <view class="goods" wx:for="{{item.goodsList}}" wx:key="id" wx:for-item="gitem">
+    <view class="img">
+     <image src="{{gitem.picUrl}}"></image>
+    </view>
+    <view class="info">
+     <text class="name">{{gitem.goodsName}}</text>
+     <text class="number">共{{gitem.number}}件商品</text>
+    </view>
+    <view class="status"></view>
+   </view>
+   <view class="b">
+    <view class="l">实付：￥{{item.actualPrice}}</view>
+    <view class="capsule-tag">
+     <zan-capsule color="#a78845" leftText="状态" rightText="{{item.joinerCount>=item.rules.discountMember?'已达成':'团购中'}}" />
+    </view>
+    <view class="capsule-tag">
+     <zan-capsule color="#a78845" leftText="发起" rightText="{{item.creator}}" wx:if="{{!item.isCreator}}" />
+    </view>
+   </view>
+  </navigator>
+ </view>
+</view>
\ No newline at end of file

litemall-wx/pages/groupon/myGroupon/myGroupon.wxss

+page {
+ height: 100%;
+ width: 100%;
+ background: #f4f4f4;
+}
+
+.capsule-tag {
+ float: right;
+ /* padding-right: 10rpx; */
+}
+
+.zan-capsule + .zan-capsule {
+ margin-left: 5px;
+}
+
+.orders-switch {
+ width: 100%;
+ background: #fff;
+ height: 84rpx;
+ border-bottom: 1px solid #a78845;
+}
+
+.orders-switch .item {
+ display: inline-block;
+ height: 82rpx;
+ width: 50%;
+ padding: 0 15rpx;
+ text-align: center;
+}
+
+.orders-switch .item .txt {
+ display: inline-block;
+ height: 82rpx;
+ padding: 0 20rpx;
+ line-height: 82rpx;
+ color: #333;
+ font-size: 30rpx;
+ width: 100%;
+}
+
+.orders-switch .item.active .txt {
+ color: #a78845;
+ border-bottom: 4rpx solid #a78845;
+}
+
+.no-order {
+ width: 100%;
+ height: auto;
+ margin: 0 auto;
+}
+
+.no-order .c {
+ width: 100%;
+ height: auto;
+ margin-top: 200rpx;
+}
+
+.no-order .c image {
+ margin: 0 auto;
+ display: block;
+ text-align: center;
+ width: 258rpx;
+ height: 258rpx;
+}
+
+.no-order .c text {
+ margin: 0 auto;
+ display: block;
+ width: 258rpx;
+ height: 29rpx;
+ line-height: 29rpx;
+ text-align: center;
+ font-size: 29rpx;
+ color: #999;
+}
+
+.orders {
+ height: auto;
+ width: 100%;
+ overflow: hidden;
+}
+
+.order {
+ margin-top: 20rpx;
+ background: #fff;
+}
+
+.order .h {
+ height: 83.3rpx;
+ line-height: 83.3rpx;
+ margin-left: 31.25rpx;
+ padding-right: 31.25rpx;
+ border-bottom: 1px solid #f4f4f4;
+}
+
+.order .h .l {
+ float: left;
+ color: #a78845;
+ font-size: 26rpx;
+}
+
+.order .h .r {
+ float: right;
+ color: #a78845;
+ font-size: 26rpx;
+}
+
+.order .i {
+ height: 56rpx;
+ line-height: 56rpx;
+ margin-left: 31.25rpx;
+ padding-right: 31.25rpx;
+ border-bottom: 1px solid #f4f4f4;
+}
+
+.order .i .l {
+ float: left;
+ color: #a78845;
+ font-size: 26rpx;
+}
+
+.order .i .r {
+ float: right;
+ color: #a78845;
+ font-size: 26rpx;
+}
+
+.order .j {
+ height: 56rpx;
+ line-height: 56rpx;
+ margin-left: 31.25rpx;
+ padding-right: 31.25rpx;
+}
+
+.order .j .l {
+ float: left;
+ font-size: 26rpx;
+ color: #a78845;
+}
+
+.order .j .r {
+ float: right;
+ color: #a78845;
+ font-size: 26rpx;
+}
+
+.order .goods {
+ display: flex;
+ align-items: center;
+ height: 199rpx;
+ margin-left: 31.25rpx;
+}
+
+.order .goods .img {
+ height: 145.83rpx;
+ width: 145.83rpx;
+ background: #f4f4f4;
+}
+
+.order .goods .img image {
+ height: 145.83rpx;
+ width: 145.83rpx;
+}
+
+.order .goods .info {
+ height: 145.83rpx;
+ flex: 1;
+ padding-left: 20rpx;
+}
+
+.order .goods .name {
+ margin-top: 30rpx;
+ display: block;
+ height: 44rpx;
+ line-height: 44rpx;
+ color: #333;
+ font-size: 30rpx;
+}
+
+.order .goods .number {
+ display: block;
+ height: 37rpx;
+ line-height: 37rpx;
+ color: #666;
+ font-size: 25rpx;
+}
+
+.order .goods .status {
+ width: 105rpx;
+ color: #a78845;
+ font-size: 25rpx;
+}
+
+.order .b {
+ height: 103rpx;
+ line-height: 103rpx;
+ margin-left: 31.25rpx;
+ padding-right: 31.25rpx;
+ border-top: 1px solid #f4f4f4;
+ font-size: 30rpx;
+ color: #333;
+}
+
+.order .b .l {
+ float: left;
+}
+
+.order .b .r {
+ float: right;
+}
+
+.order .b .btn {
+ margin-top: 19rpx;
+ height: 64.5rpx;
+ line-height: 64.5rpx;
+ text-align: center;
+ padding: 0 20rpx;
+ border-radius: 5rpx;
+ font-size: 28rpx;
+ color: #fff;
+ background: #a78845;
+}

litemall-wx/pages/index/index.js

@@ -3,13 +3,15 @@ const api = require('../../config/api.js');
 const user = require('../../utils/user.js');
 
 //获取应用实例
-const app = getApp()
+const app = getApp();
+
 Page({
  data: {
   newGoods: [],
   hotGoods: [],
   topics: [],
   brands: [],
+  groupons: [],
   floorGoods: [],
   banner: [],
   channel: []
@@ -41,6 +43,7 @@ Page({
      brands: res.data.brandList,
      floorGoods: res.data.floorGoodsList,
      banner: res.data.banner,
+     groupons: res.data.grouponList,
      channel: res.data.channel
     });
    }
@@ -53,8 +56,32 @@ Page({
    //这个scene的值存在则证明首页的开启来源于朋友圈分享的图,同时可以通过获取到的goodId的值跳转导航到对应的详情页
    var scene = decodeURIComponent(options.scene);
    console.log("scene:" + scene);
+
+   let info_arr = [];
+   info_arr = scene.split(',');
+   let _type = info_arr[0];
+   let id = info_arr[1];
+
+   if (_type == 'goods') {
+    wx.navigateTo({
+     url: '../goods/goods?id=' + id
+    });
+   } else if (_type == 'groupon') {
+    wx.navigateTo({
+     url: '../goods/goods?grouponId=' + id
+    });
+   } else {
+    wx.navigateTo({
+     url: '../index/index'
+    });
+   }
+  }
+
+  // 页面初始化 options为页面跳转所带来的参数
+  if (options.grouponId) {
+   //这个pageId的值存在则证明首页的开启来源于用户点击来首页,同时可以通过获取到的pageId的值跳转导航到对应的详情页
    wx.navigateTo({
-    url: '../goods/goods?id=' + scene
+    url: '../goods/goods?grouponId=' + options.grouponId
    });
   }
 

litemall-wx/pages/index/index.json

-{}
\ No newline at end of file
+{
+ "navigationBarTitleText": "",
+ 
+ "usingComponents": {
+  "zan-capsule": "../../dist/capsule/index"
+ }
+}
\ No newline at end of file

litemall-wx/pages/index/index.wxml

-
 <!--index.wxml-->
 <view class="container">
-  <swiper class="banner" indicator-dots="true" autoplay="true" interval="3000" duration="1000">
-    <swiper-item wx:for="{{banner}}" wx:key="id">
-      <!-- <navigator url="{{item.link}}"> -->
-        <image src="{{item.url}}" background-size="cover"></image>
-      <!-- </navigator> -->
-    </swiper-item>
-  </swiper>
-  <view class="m-menu">
-    <navigator class="item" url="/pages/category/category?id={{item.id}}" wx:for="{{channel}}" wx:key="id">
-      <image src="{{item.iconUrl}}" background-size="cover"></image>
-      <text>{{item.name}}</text>
-    </navigator>
-  </view>
-  <view class="a-section a-brand">
-    <view class="h">
-      <navigator url="../brand/brand">
-        <text class="txt">品牌制造商直供</text>
-      </navigator>
-    </view>
-    <view class="b">
-      <view class="item item-1" wx:for="{{brands}}" wx:key="id">
-        <navigator url="/pages/brandDetail/brandDetail?id={{item.id}}">
-          <view class="wrap">
-            <image class="img" src="{{item.picUrl}}" mode="aspectFill"></image>
-            <view class="mt">
-              <text class="brand">{{item.name}}</text>
-              <text class="price">{{item.floorPrice}}</text>
-              <text class="unit">元起</text>
-            </view>
-          </view>
-        </navigator>
-      </view>
+ <swiper class="banner" indicator-dots="true" autoplay="true" interval="3000" duration="1000">
+  <swiper-item wx:for="{{banner}}" wx:key="id">
+   <!-- <navigator url="{{item.link}}"> -->
+   <image src="{{item.url}}" background-size="cover"></image>
+   <!-- </navigator> -->
+  </swiper-item>
+ </swiper>
+ <view class="m-menu">
+  <navigator class="item" url="/pages/category/category?id={{item.id}}" wx:for="{{channel}}" wx:key="id">
+   <image src="{{item.iconUrl}}" background-size="cover"></image>
+   <text>{{item.name}}</text>
+  </navigator>
+ </view>
+
+ <view class="a-section a-groupon" wx:if="{{groupons.length > 0}}">
+  <view class="h">
+   <view class="title">
+    <view>
+     <!-- <navigator url="../hotGoods/hotGoods"> -->
+     <text class="txt">优惠专区</text>
+     <!-- </navigator> -->
     </view>
+   </view>
   </view>
-  <view class="a-section a-new" wx:if="{{newGoods.length > 0}}">
-    <view class="h">
-      <view>
-        <navigator url="../newGoods/newGoods">
-          <text class="txt">周一周四 · 新品首发</text>
-        </navigator>
-      </view>
-    </view>
-    <view class="b">
-      <view class="item" wx:for="{{newGoods}}" wx:for-index="index" wx:for-item="item" wx:key="id">
-        <navigator url="../goods/goods?id={{item.id}}">
-          <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
-          <text class="name">{{item.name}}</text>
-          <text class="price">￥{{item.retailPrice}}</text>
-        </navigator>
+  <view class="b">
+   <view class="item" wx:for="{{groupons}}" wx:for-index="index" wx:for-item="item" wx:key="id">
+    <navigator url="/pages/goods/goods?id={{item.goods.id}}">
+     <image class="img" src="{{item.goods.picUrl}}" background-size="cover"></image>
+     <view class="right">
+      <view class="text">
+       <view class="header">
+        <text class="name">{{item.goods.name}}</text>
+        <view class="capsule-tag">
+         <zan-capsule color="#a78845" leftText="团购" rightText="{{item.groupon_member}}" />
+        </view>
+       </view>
+       <text class="desc">{{item.goods.brief}}</text>
+       <view class="price">
+        <view class="counterPrice">原价：￥{{item.goods.counterPrice}}</view>
+        <view class="retailPrice">现价：￥{{item.groupon_price}}</view>
+       </view>
       </view>
-    </view>
+     </view>
+    </navigator>
+   </view>
   </view>
-  <view class="a-section a-popular" wx:if="{{hotGoods.length > 0}}">
-    <view class="h">
-      <view>
-        <navigator url="../hotGoods/hotGoods">
-          <text class="txt">人气推荐</text>
-        </navigator>
-      </view>
-    </view>
-    <view class="b">
-      <view class="item" wx:for="{{hotGoods}}" wx:for-index="index" wx:for-item="item" wx:key="id">
-        <navigator url="/pages/goods/goods?id={{item.id}}">
-          <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
-          <view class="right">
-            <view class="text">
-              <text class="name">{{item.name}}</text>
-              <text class="desc">{{item.brief}}</text>
-              <text class="price">￥{{item.retailPrice}}</text>
-            </view>
-          </view>
-        </navigator>
+ </view>
+
+ <view class="a-section a-brand">
+  <view class="h">
+   <navigator url="../brand/brand">
+    <text class="txt">品牌制造商直供</text>
+   </navigator>
+  </view>
+  <view class="b">
+   <view class="item item-1" wx:for="{{brands}}" wx:key="id">
+    <navigator url="/pages/brandDetail/brandDetail?id={{item.id}}">
+     <view class="wrap">
+      <image class="img" src="{{item.picUrl}}" mode="aspectFill"></image>
+      <view class="mt">
+       <text class="brand">{{item.name}}</text>
+       <text class="price">{{item.floorPrice}}</text>
+       <text class="unit">元起</text>
       </view>
-    </view>
+     </view>
+    </navigator>
+   </view>
+  </view>
+ </view>
+ <view class="a-section a-new" wx:if="{{newGoods.length > 0}}">
+  <view class="h">
+   <view>
+    <navigator url="../newGoods/newGoods">
+     <text class="txt">周一周四 · 新品首发</text>
+    </navigator>
+   </view>
+  </view>
+  <view class="b">
+   <view class="item" wx:for="{{newGoods}}" wx:for-index="index" wx:for-item="item" wx:key="id">
+    <navigator url="../goods/goods?id={{item.id}}">
+     <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
+     <text class="name">{{item.name}}</text>
+     <text class="price">￥{{item.retailPrice}}</text>
+    </navigator>
+   </view>
   </view>
-  <view class="a-section a-topic" wx:if="topics.length > 0">
-    <view class="h">
-      <view>
-      <navigator url="/pages/topic/topic">
-        <text class="txt">专题精选</text>
-        </navigator>
+ </view>
+
+ <view class="a-section a-popular" wx:if="{{hotGoods.length > 0}}">
+  <view class="h">
+   <view>
+    <navigator url="../hotGoods/hotGoods">
+     <text class="txt">人气推荐</text>
+    </navigator>
+   </view>
+  </view>
+  <view class="b">
+   <view class="item" wx:for="{{hotGoods}}" wx:for-index="index" wx:for-item="item" wx:key="id">
+    <navigator url="/pages/goods/goods?id={{item.id}}">
+     <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
+     <view class="right">
+      <view class="text">
+       <text class="name">{{item.name}}</text>
+       <text class="desc">{{item.brief}}</text>
+       <text class="price">￥{{item.retailPrice}}</text>
       </view>
-    </view>
-    <view class="b">
-      <scroll-view scroll-x class="list">
-        <view class="item" wx:for="{{topics}}" wx:for-index="index" wx:for-item="item" wx:key="id">
-          <navigator url="../topicDetail/topicDetail?id={{item.id}}">
-            <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
-            <view class="np">
-              <text class="name">{{item.title}}</text>
-              <text class="price">￥{{item.price}}元起</text>
-            </view>
-            <text class="desc">{{item.subtitle}}</text>
-          </navigator>
-        </view>
-      </scroll-view>
-    </view>
+     </view>
+    </navigator>
+   </view>
   </view>
-  <view class="good-grid" wx:for="{{floorGoods}}" wx:key="id">
-    <view class="h">
-      <view>
-        <text>{{item.name}}</text>
+ </view>
+
+ <view class="a-section a-topic" wx:if="topics.length > 0">
+  <view class="h">
+   <view>
+    <navigator url="/pages/topic/topic">
+     <text class="txt">专题精选</text>
+    </navigator>
+   </view>
+  </view>
+  <view class="b">
+   <scroll-view scroll-x class="list">
+    <view class="item" wx:for="{{topics}}" wx:for-index="index" wx:for-item="item" wx:key="id">
+     <navigator url="../topicDetail/topicDetail?id={{item.id}}">
+      <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
+      <view class="np">
+       <text class="name">{{item.title}}</text>
+       <text class="price">￥{{item.price}}元起</text>
       </view>
+      <text class="desc">{{item.subtitle}}</text>
+     </navigator>
     </view>
-    <view class="b">
-      <block wx:for="{{item.goodsList}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="id">
-        <view class="item {{iindex % 2 == 0 ? '' : 'item-b'}}">
-          <navigator url="../goods/goods?id={{iitem.id}}" class="a">
-            <image class="img" src="{{iitem.picUrl}}" background-size="cover"></image>
-            <text class="name">{{iitem.name}}</text>
-            <text class="price">￥{{iitem.retailPrice}}</text>
-          </navigator>
-        </view>
-      </block>
-      <view class="item item-b item-more">
-          <navigator url="/pages/category/category?id={{item.id}}" class="more-a">
-            <view class="txt">{{'更多'+item.name+'好物'}}</view>
-            <image class="icon" src="../../static/images/icon_go_more.png" background-size="cover"></image>
-          </navigator>
-      </view>
+   </scroll-view>
+  </view>
+ </view>
+ <view class="good-grid" wx:for="{{floorGoods}}" wx:key="id">
+  <view class="h">
+   <view>
+    <text>{{item.name}}</text>
+   </view>
+  </view>
+  <view class="b">
+   <block wx:for="{{item.goodsList}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="id">
+    <view class="item {{iindex % 2 == 0 ? '' : 'item-b'}}">
+     <navigator url="../goods/goods?id={{iitem.id}}" class="a">
+      <image class="img" src="{{iitem.picUrl}}" background-size="cover"></image>
+      <text class="name">{{iitem.name}}</text>
+      <text class="price">￥{{iitem.retailPrice}}</text>
+     </navigator>
     </view>
+   </block>
+   <view class="item item-b item-more">
+    <navigator url="/pages/category/category?id={{item.id}}" class="more-a">
+     <view class="txt">{{'更多'+item.name+'好物'}}</view>
+     <image class="icon" src="../../static/images/icon_go_more.png" background-size="cover"></image>
+    </navigator>
+   </view>
   </view>
+ </view>
 </view>
\ No newline at end of file

litemall-wx/pages/index/index.wxss

@@ -123,6 +123,92 @@
   height: 253rpx;
 }
 
+.a-groupon {
+ width: 750rpx;
+ height: auto;
+ overflow: hidden;
+}
+
+.a-groupon .b .item {
+ border-top: 1px solid #d9d9d9;
+ margin: 0 20rpx;
+ height: 244rpx;
+ width: 710rpx;
+}
+
+.a-groupon .b .img {
+ margin-top: 12rpx;
+ margin-right: 12rpx;
+ float: left;
+ width: 220rpx;
+ height: 220rpx;
+}
+
+.a-groupon .b .right {
+ float: left;
+ height: 244rpx;
+ width: 476rpx;
+ display: flex;
+ flex-flow: row nowrap;
+}
+
+.a-groupon .b .text {
+ display: flex;
+ flex-wrap: nowrap;
+ flex-direction: column;
+ justify-content: center;
+ overflow: hidden;
+ height: 244rpx;
+ width: 476rpx;
+}
+
+.a-groupon .b .name {
+ float: left;
+ width: 330rpx;
+ display: block;
+ color: #333;
+ line-height: 50rpx;
+ font-size: 30rpx;
+}
+
+.a-groupon .capsule-tag {
+ float: right;
+ padding-right: 0rpx;
+ padding-top: 8rpx;
+}
+
+.a-groupon .zan-capsule + .zan-capsule {
+ margin-left: 10px;
+}
+
+.a-groupon .b .desc {
+ width: 476rpx;
+ display: block;
+ color: #999;
+ line-height: 50rpx;
+ font-size: 25rpx;
+}
+
+.a-groupon .b .price {
+ width: 476rpx;
+ display: flex;
+ color: #b4282d;
+ line-height: 50rpx;
+ font-size: 33rpx;
+}
+
+.a-groupon .b .counterPrice {
+ text-decoration: line-through;
+ font-size: 28rpx;
+ color: #999;
+}
+
+.a-groupon .b .retailPrice {
+ margin-left: 30rpx;
+ font-size: 28rpx;
+ color: #a78845;
+}
+
 .a-new .b {
   width: 750rpx;
   height: auto;

litemall-wx/pages/ucenter/index/index.js

@@ -62,61 +62,66 @@ Page({
         url: "/pages/auth/login/login"
       });
     };
-
-  },
-  goCollect() {
-    if (app.globalData.hasLogin) {
-      wx.navigateTo({
-        url: "/pages/ucenter/collect/collect"
-      });
-    } else {
-      wx.navigateTo({
-        url: "/pages/auth/login/login"
-      });
-    };
-  },
-  goFootprint() {
-    if (app.globalData.hasLogin) {
-      wx.navigateTo({
-        url: "/pages/ucenter/footprint/footprint"
-      });
-    } else {
-      wx.navigateTo({
-        url: "/pages/auth/login/login"
-      });
-    };
-  },
-  goAddress() {
-    if (app.globalData.hasLogin) {
-      wx.navigateTo({
-        url: "/pages/ucenter/address/address"
-      });
-    } else {
-      wx.navigateTo({
-        url: "/pages/auth/login/login"
-      });
-    };
-  },
-  aboutUs: function() {
-    wx.navigateTo({
-      url: '/pages/about/about'
-    });
-  },
-  exitLogin: function() {
-    wx.showModal({
-      title: '',
-      confirmColor: '#b4282d',
-      content: '退出登录？',
-      success: function(res) {
-        if (res.confirm) {
-          wx.removeStorageSync('token');
-          wx.removeStorageSync('userInfo');
-          wx.switchTab({
-            url: '/pages/index/index'
-          });
-        }
-      }
-    })
+ },
+ goGroupon() {
+  if (app.globalData.hasLogin) {
+   wx.navigateTo({
+    url: "/pages/groupon/myGroupon/myGroupon"
+   });
+  } else {
+   wx.navigateTo({
+    url: "/pages/auth/login/login"
+   });
+  };
+ },
+ goCollect() {
+  if (app.globalData.hasLogin) {
+   wx.navigateTo({
+    url: "/pages/ucenter/collect/collect"
+   });
+  } else {
+   wx.navigateTo({
+    url: "/pages/auth/login/login"
+   });
+  };
+ },
+ goFootprint() {
+  if (app.globalData.hasLogin) {
+   wx.navigateTo({
+    url: "/pages/ucenter/footprint/footprint"
+   });
+  } else {
+   wx.navigateTo({
+    url: "/pages/auth/login/login"
+   });
+  };
+ },
+ goAddress() {
+  if (app.globalData.hasLogin) {
+   wx.navigateTo({
+    url: "/pages/ucenter/address/address"
+   });
+  } else {
+   wx.navigateTo({
+    url: "/pages/auth/login/login"
+   });
+  };
+ },
+ exitLogin: function() {
+  wx.showModal({
+   title: '',
+   confirmColor: '#b4282d',
+   content: '退出登录？',
+   success: function(res) {
+    if (res.confirm) {
+     wx.removeStorageSync('token');
+     wx.removeStorageSync('userInfo');
+     wx.switchTab({
+      url: '/pages/index/index'
+     });
+    }
+   }
+  })
 
   }
 })
\ No newline at end of file

litemall-wx/pages/ucenter/index/index.wxml

@@ -19,12 +19,12 @@
         <text class="txt">优惠券</text>
       </view>
     </view>
-    <!-- <view class="item no-border">
+    <view class="item no-border" bindtap="goGroupon">
       <view class="a">
         <text class="icon gift"></text>
-        <text class="txt">礼品卡</text>
+        <text class="txt">团购</text>
       </view>
-    </view> -->
+    </view>
     <view class="item">
       <view class="a" bindtap="goCollect">
         <image class="user-menu .icon.collect" src="/static/images/icon_collect.png"></image>