wxd / MShopWeApp

Commit 042cb2a21f45fcb239470821041f892e59dda400

Authored by 后端研发-苏明海
2 parents 303909ad 2fabb17e

Merge branch 'dev' into 'test' 

Dev

See merge request !179
Inline Side-by-side
Showing 7 changed files with 34 additions and 10 deletions
pages/activity/seckill_list/seckill_list.wxml
  View file @042cb2a
... ... @@ -25,7 +25,8 @@
25 25 </view>
26 26  
27 27 </view>
28   - <view class=" ml10 fs20 " > 已抢{{item.buy_num+item.virtual}}件</view>
  28 + <view class=" ml10 fs20 " wx:if="{{type==1}}"> 已抢{{item.buy_num+item.virtual}}件</view>
  29 + <view class=" ml10 fs20 " wx:else> 已抢0件</view>
29 30 </view>
30 31  
31 32  
... ...
pages/getphone/getphone.json
  View file @042cb2a
1   -{}
2 1 \ No newline at end of file
  2 +{
  3 + "navigationBarTitleText": "绑定手机"
  4 +}
... ...
pages/togoin/togoin.js
  View file @042cb2a
... ... @@ -29,6 +29,12 @@ Page({
29 29 delta: 1
30 30 })
31 31 })
32   -
33   - }
  32 +
  33 + },
  34 +
  35 + cancle_bind:function(){
  36 + getApp().goto('/pages/user/index/index');
  37 + }
  38 +
  39 +
34 40 });
... ...
pages/togoin/togoin.json
  View file @042cb2a
1   -{}
2 1 \ No newline at end of file
  2 +{
  3 + "navigationBarTitleText": "授权登录"
  4 +}
3 5 \ No newline at end of file
... ...
pages/togoin/togoin.wxml
  View file @042cb2a
... ... @@ -2,7 +2,8 @@
2 2 <view class="content">
3 3 <view><image class='logo' src="{{imghots+store.store_logo}}"> </image></view>
4 4 <view class="title">{{store.store_name}}</view>
5   - <view>{{store.store_desc}}</view>
  5 + <view style="padding:0 40rpx">为了更好的提供服务，小程序将申请获取您的头像，昵称信息</view>
6 6 <button class="btn" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">授权登录</button>
  7 + <text class="btn2" bindtap="cancle_bind">暂不授权</text>
7 8 </view>
8 9 </view>
9 10 \ No newline at end of file
... ...
pages/togoin/togoin.wxss
  View file @042cb2a
... ... @@ -26,6 +26,17 @@
26 26 background: #fc661f;
27 27 color:#fff;
28 28 font-size: 32rpx;
29   - margin-top: 300rpx;
  29 + margin-top: 100rpx;
30 30 border-radius: 5rpx;
  31 +}
  32 +
  33 +.all_page .btn2{
  34 + height: 80rpx;
  35 + line-height: 80rpx;
  36 + width: 580rpx;
  37 +
  38 + color:#999;
  39 + font-size: 32rpx;
  40 + border-radius: 5rpx;
  41 + margin-top: 10rpx;
31 42 }
32 43 \ No newline at end of file
... ...
pages/user/index/index.js
  View file @042cb2a
... ... @@ -40,9 +40,10 @@ Page({
40 40 onLoad: function (options) {
41 41 //--先判断会员状态--
42 42 var user_info = getApp().globalData.userInfo;
43   - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
44   - wx.navigateTo({ url: '/pages/getphone/getphone'})
45   - return false;
  43 + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
  44 + getApp().globalData.use_id=0;
  45 + //wx.navigateTo({ url: '/pages/getphone/getphone'})
  46 + //return false;
46 47 }
47 48 },
48 49  
... ...