Commit 7b0f03f2aa68768ba4d3679becded47b59e133f4
1 parent
50e71796
修改文字 登陆改成登录
Showing
16 changed files
with
20 additions
and
20 deletions
components/diy_goodsGroup/diy_goodsGroup.js
components/diy_service/diy_service.wxml
components/goods_list/goods_list.js
packageA/pages/activity_share/activity_share.js
packageA/pages/goods_share/goods_share.js
packageA/pages/jfbuy/jfbuy.js
packageA/pages/liveStreamDetails/liveStreamDetails.js
| ... | ... | @@ -403,7 +403,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un |
| 403 | 403 | var storageId=options.storageId; |
| 404 | 404 | |
| 405 | 405 | if(first_leader){ |
| 406 | - //-- user_id代过来免登陆 -- | |
| 406 | + //-- user_id代过来免登录 -- | |
| 407 | 407 | getApp().globalData.first_leader=first_leader; |
| 408 | 408 | //调用接口判断是不是会员 |
| 409 | 409 | getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+o.stoid+"/"+first_leader,{}).then(res=>{ | ... | ... |
packageA/pages/live_share/live_share.js
packageA/pages/quan/quan.js
packageA/pages/quan_pro/quan_pro.js
| ... | ... | @@ -23,7 +23,7 @@ Page({ |
| 23 | 23 | var th = this; |
| 24 | 24 | var first_leader=t.first_leader; |
| 25 | 25 | if(first_leader){ |
| 26 | - //-- user_id代过来免登陆 -- | |
| 26 | + //-- user_id代过来免登录 -- | |
| 27 | 27 | getApp().globalData.first_leader=first_leader; |
| 28 | 28 | //调用接口判断是不是会员 |
| 29 | 29 | getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ | ... | ... |
pages/cart/cart/cart.js
pages/giftpack/giftpacklist/giftpacklist.js
| ... | ... | @@ -41,7 +41,7 @@ Page({ |
| 41 | 41 | //-- 获取分享人的ID -- |
| 42 | 42 | var first_leader=options.first_leader; |
| 43 | 43 | if(first_leader){ |
| 44 | - //-- user_id代过来免登陆 -- | |
| 44 | + //-- user_id代过来免登录 -- | |
| 45 | 45 | getApp().globalData.first_leader=first_leader; |
| 46 | 46 | //调用接口判断是不是会员 |
| 47 | 47 | getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ | ... | ... |
pages/index/index/index.js
| ... | ... | @@ -85,7 +85,7 @@ Page({ |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | if(first_leader){ |
| 88 | - //-- user_id代过来免登陆 -- | |
| 88 | + //-- user_id代过来免登录 -- | |
| 89 | 89 | getApp().globalData.first_leader=first_leader; |
| 90 | 90 | //调用接口判断是不是会员 |
| 91 | 91 | getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ | ... | ... |
pages/togoin/togoin.js
| ... | ... | @@ -67,7 +67,7 @@ Page({ |
| 67 | 67 | that.setData({user:user}) |
| 68 | 68 | //如果有会员的话,没有sessionKey |
| 69 | 69 | if(!e.data.data.sessionKey){ |
| 70 | - getApp().showWarning("登陆成功"); | |
| 70 | + getApp().showWarning("登录成功"); | |
| 71 | 71 | getApp().globalData.userInfo=e.data.data; |
| 72 | 72 | getApp().globalData.user_id=e.data.data.user_id; |
| 73 | 73 | getApp().globalData.openid = e.data.data.weapp_openid; |
| ... | ... | @@ -89,7 +89,7 @@ Page({ |
| 89 | 89 | }) |
| 90 | 90 | }, |
| 91 | 91 | |
| 92 | - //暂不登陆，返回上一页 | |
| 92 | + //暂不登录，返回上一页 | |
| 93 | 93 | cancle_bind:function () { |
| 94 | 94 | wx.navigateBack({ delta: 1}) |
| 95 | 95 | }, | ... | ... |
pages/togoin/togoin.wxml
| ... | ... | @@ -16,20 +16,20 @@ |
| 16 | 16 | <button hidden="{{user}}" class="getPhoneNumber" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo"> |
| 17 | 17 | <view class="flex flex-center2 ali-c"> |
| 18 | 18 | <image class="we_chat" src="{{imghots}}/miniapp/images/we_chat.png"></image> |
| 19 | - <view>微信账号快捷登陆</view> | |
| 19 | + <view>微信账号快捷登录</view> | |
| 20 | 20 | </view> |
| 21 | 21 | </button> |
| 22 | 22 | <!-- 点击显示绑定手机的对话框 --> |
| 23 | 23 | <button hidden="{{!user}}" class="getPhoneNumber" bindtap="show_bind_mobile"> |
| 24 | 24 | <view class="flex flex-center2 ali-c" > |
| 25 | 25 | <image class="we_chat" src="{{imghots}}/miniapp/images/we_chat.png"></image> |
| 26 | - <view>微信账号快捷登陆</view> | |
| 26 | + <view>微信账号快捷登录</view> | |
| 27 | 27 | </view> |
| 28 | 28 | </button> |
| 29 | 29 | </view> |
| 30 | 30 | |
| 31 | 31 | <view class="userlongin flex-center2 flex fs30 jc_sb" style="margin: 0 130rpx"> |
| 32 | - <view bindtap="cancle_bind">暂不登陆</view> | |
| 32 | + <view bindtap="cancle_bind">暂不登录</view> | |
| 33 | 33 | </view> |
| 34 | 34 | |
| 35 | 35 | </view> |
| ... | ... | @@ -41,7 +41,7 @@ |
| 41 | 41 | <view class="cover-layer" bindtap="close_pop"></view> |
| 42 | 42 | <view class="p_content"> |
| 43 | 43 | <view class="p_title flex ali-c fs34"> |
| 44 | - 请授权绑定手机号完成注册，拒绝将登陆失败 | |
| 44 | + 请授权绑定手机号完成注册，拒绝将登录失败 | |
| 45 | 45 | </view> |
| 46 | 46 | <view class="flex btn_view"> |
| 47 | 47 | <view bindtap="close_pop" style="height: 100%; line-height:normal;" class="txt-center f2 flex ali-c flex-center2 fs36 b_right">拒绝</view> | ... | ... |