Commit b96b1e35dbbb4e73dbd7346a83929e7fea0d1f11

Authored by yvan.ni
2 parents dafec629 6bcbaa7e

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

packageA/pages/checkin/checkin.wxml
1   -<wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
  1 +<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
2 2 <wxs module="g_filter" src="g_filter.wxs"></wxs>
3 3 <wxs src="checkin.wxs" module="myUtil"></wxs>
4 4 <view class="checkin-container">
... ... @@ -7,9 +7,7 @@
7 7 <view class="points" bindtap="goto" data-url="/pages/user/integral/integral">
8 8 <image class="coin" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/coins.png"></image>我的积分
9 9 </view>
10   -
11 10 </view>
12   -
13 11 <view class="list flex" wx:if="{{res}}">
14 12 <view class="list-item active}}">
15 13 <view class="circle">+{{res.cday1}}</view>
... ...