Commit f09d760678dbd39ae2622f317d467b8be9b815ed
1 parent
93bdc9ef
登陆字样及url判断
Showing
2 changed files
with
15 additions
and
6 deletions
app.js
| @@ -494,6 +494,15 @@ App({ | @@ -494,6 +494,15 @@ App({ | ||
| 494 | "/pages/cart/cart/cart", "/pages/user/index/index", | 494 | "/pages/cart/cart/cart", "/pages/user/index/index", |
| 495 | "/pages/distribution/distribution"]; | 495 | "/pages/distribution/distribution"]; |
| 496 | 496 | ||
| 497 | + for(var i in arr_tabbar){ | ||
| 498 | + var ck_url=arr_tabbar[i]; | ||
| 499 | + if (("/"+url).indexOf(ck_url) != -1) { | ||
| 500 | + if (url.indexOf("categoryList?type=1") != -1) this.globalData.cat_type = 1; | ||
| 501 | + if (url.indexOf("categoryList?type=2") != -1) this.globalData.cat_type = 2; | ||
| 502 | + wx.reLaunch({ url: url, }) //跳到tabbar页 | ||
| 503 | + return; | ||
| 504 | + } | ||
| 505 | + } | ||
| 497 | if (arr_tabbar.indexOf(url) != -1) { | 506 | if (arr_tabbar.indexOf(url) != -1) { |
| 498 | if (url.indexOf("categoryList?type=1") != -1) this.globalData.cat_type = 1; | 507 | if (url.indexOf("categoryList?type=1") != -1) this.globalData.cat_type = 1; |
| 499 | if (url.indexOf("categoryList?type=2") != -1) this.globalData.cat_type = 2; | 508 | if (url.indexOf("categoryList?type=2") != -1) this.globalData.cat_type = 2; |
packageE/pages/togoin/togoin.wxml
| @@ -31,8 +31,8 @@ | @@ -31,8 +31,8 @@ | ||
| 31 | <block wx:if="{{canIUseGetUserProfile}}"> | 31 | <block wx:if="{{canIUseGetUserProfile}}"> |
| 32 | <button hidden="{{user}}" class="getPhoneNumber" bindtap="bindGetUserInfo"> | 32 | <button hidden="{{user}}" class="getPhoneNumber" bindtap="bindGetUserInfo"> |
| 33 | <view class="flex flex-center ali-c"> | 33 | <view class="flex flex-center ali-c"> |
| 34 | - <image class="we_chat" src="{{imghots}}/miniapp/images/we_chat.png"></image> | ||
| 35 | - <view>微信账号快捷登录</view> | 34 | + <!-- <image class="we_chat" src="{{imghots}}/miniapp/images/we_chat.png"></image> --> |
| 35 | + <view>一键快捷登录</view> | ||
| 36 | </view> | 36 | </view> |
| 37 | </button> | 37 | </button> |
| 38 | </block> | 38 | </block> |
| @@ -41,8 +41,8 @@ | @@ -41,8 +41,8 @@ | ||
| 41 | <!-- 授权获取基础信息 --> | 41 | <!-- 授权获取基础信息 --> |
| 42 | <button hidden="{{user}}" class="getPhoneNumber" open-type="getUserInfo" bindgetuserinfo="bindUserInfo"> | 42 | <button hidden="{{user}}" class="getPhoneNumber" open-type="getUserInfo" bindgetuserinfo="bindUserInfo"> |
| 43 | <view class="flex flex-center ali-c"> | 43 | <view class="flex flex-center ali-c"> |
| 44 | - <image class="we_chat" src="{{imghots}}/miniapp/images/we_chat.png"></image> | ||
| 45 | - <view>微信账号快捷登录</view> | 44 | + <!-- <image class="we_chat" src="{{imghots}}/miniapp/images/we_chat.png"></image> --> |
| 45 | + <view>一键快捷登录</view> | ||
| 46 | </view> | 46 | </view> |
| 47 | </button> | 47 | </button> |
| 48 | </block> | 48 | </block> |
| @@ -50,8 +50,8 @@ | @@ -50,8 +50,8 @@ | ||
| 50 | <!-- 点击显示绑定手机的对话框 --> | 50 | <!-- 点击显示绑定手机的对话框 --> |
| 51 | <button hidden="{{!user}}" class="getPhoneNumber" bindtap="show_bind_mobile"> | 51 | <button hidden="{{!user}}" class="getPhoneNumber" bindtap="show_bind_mobile"> |
| 52 | <view class="flex flex-center2 ali-c" > | 52 | <view class="flex flex-center2 ali-c" > |
| 53 | - <image class="we_chat" src="{{imghots}}/miniapp/images/we_chat.png"></image> | ||
| 54 | - <view>微信账号快捷登录</view> | 53 | + <!-- <image class="we_chat" src="{{imghots}}/miniapp/images/we_chat.png"></image> --> |
| 54 | + <view>手机号快捷登录</view> | ||
| 55 | </view> | 55 | </view> |
| 56 | </button> | 56 | </button> |
| 57 | </view> | 57 | </view> |