Browse Source

no message

feature/v1.0
xpz2018 5 years ago
parent
commit
d8a0865913
3 changed files with 25 additions and 6 deletions
  1. 6
      api/user.js
  2. 8
      pages/login/index.js
  3. 17
      pages/login/index.wxml

6
api/user.js

@ -20,6 +20,8 @@ const modifyMobile = (params) => mPost(`/uec/user/modify/mobile`, params, config
const getUserInfo = (params) => mGet('/uec/get/user-info', params, config) const getUserInfo = (params) => mGet('/uec/get/user-info', params, config)
const updateUserInfo = (params) => mPost('/uec/user/update/user-info', params, config) const updateUserInfo = (params) => mPost('/uec/user/update/user-info', params, config)
const verifyCode = (code, params) => mGet(`/uec/verify/qrcode${code}`, params, config) const verifyCode = (code, params) => mGet(`/uec/verify/qrcode${code}`, params, config)
const bindingAdmin = (params) => mPost(`/uec/bind/primary-account`, params, config)
const bindingAccount = (params) => mPost(`/uec/apply/to/be/emplyee/of/enterprise`, params, config)
// **************************************************************************************************************************************** // ****************************************************************************************************************************************
// /authorize/by-wechat-applet小程序登录 // /authorize/by-wechat-applet小程序登录
@ -187,5 +189,7 @@ export {
loginWechat, loginWechat,
setPassword, setPassword,
modifyMobile, modifyMobile,
verifyCode
verifyCode,
bindingAdmin,
bindingAccount
} }

8
pages/login/index.js

@ -1,6 +1,6 @@
//获取应用实例 //获取应用实例
import Dialog from '../../components/dialog/dialog' import Dialog from '../../components/dialog/dialog'
import { config, wechatApplet, loginWechat, postCaptcha, loginCaptcha, loginPwd, verifyCode } from "../../api/user"
import { config, wechatApplet, loginWechat, postCaptcha, loginCaptcha, loginPwd, verifyCode, bindingAdmin, bindingAccount } from "../../api/user"
import { sconfig, loginToken, getBaseInfo } from "../../api/saas" import { sconfig, loginToken, getBaseInfo } from "../../api/saas"
const util = require('../../utils/util') const util = require('../../utils/util')
const storage = require('../../utils/storage') const storage = require('../../utils/storage')
@ -108,7 +108,7 @@ Page({
} }
} else if(this.data.metaData){ } else if(this.data.metaData){
// 这里要进行账号的绑定,对工厂进行绑定;或者进行申请操作; // 这里要进行账号的绑定,对工厂进行绑定;或者进行申请操作;
this.handMetaData()
this.setData({metaData: this.data.metaData })
} else { } else {
wx.hideLoading() wx.hideLoading()
this.setData({ loging: false}) this.setData({ loging: false})
@ -174,6 +174,8 @@ Page({
if ((/^1\d{10}$/.test(e.detail.value)) && e.detail.value.length == 11) { if ((/^1\d{10}$/.test(e.detail.value)) && e.detail.value.length == 11) {
this.setData({ mobileEnable: true }) this.setData({ mobileEnable: true })
} }
} else if ('userName' == e.target.id) {
this.setData({ ['form.userName']: e.detail.value })
} }
if ((/^1\d{10}$/.test(this.data.form.account)) && this.data.form.account.length == 11) { if ((/^1\d{10}$/.test(this.data.form.account)) && this.data.form.account.length == 11) {
if (this.data.type == 1 && !util.isEmpty(this.data.form.captcha)) { if (this.data.type == 1 && !util.isEmpty(this.data.form.captcha)) {
@ -281,7 +283,7 @@ Page({
this.setData({ loging: false}) this.setData({ loging: false})
}) })
}, },
handMetaData: function(){
submitForm: function(){
if(this.data.metaData.qrPage == '/page/index/yaoqing'){ if(this.data.metaData.qrPage == '/page/index/yaoqing'){
bindingAdmin(this.data.metaData).then(result => { bindingAdmin(this.data.metaData).then(result => {
wx.hideLoading() wx.hideLoading()

17
pages/login/index.wxml

@ -3,7 +3,18 @@
<image style="width:192rpx;height:192rpx" src="/assets/image/icon_logo.png"></image> <image style="width:192rpx;height:192rpx" src="/assets/image/icon_logo.png"></image>
</view> </view>
<view style="padding: 30rpx 80rpx;height:480rpx" wx:if="{{ regist }}">
<view style="padding: 30rpx 80rpx;height:480rpx" wx:if="{{ metaData }}">
<view class="text-xl">欢迎您使用千鸟跟单王!</view>
<view class="text-df" style="padding:20rpx 0rpx" wx:if="{{qrPage == '/page/index/yaoqing'}}">
<text class="text-df">现邀请您成为<text class="text-bold text-blue">{{metaData.name}}</text>的管理员</text>
</view>
<view class="text-df" style="padding:20rpx 0rpx" wx:elif="{{qrPage == '/page/index/shenqing'}}">
<text class="text-df">现邀请您成为<text class="text-bold text-blue">{{metaData.name}}</text>的员工</text>
</view>
<input id="userName" style="padding:0rpx 30rpx;border:1rpx solid #eee;height:80rpx;margin-top:64rpx" placeholder-style="color:#aaa"
maxlength="20" placeholder="请输入您的姓名,以便于识别" bindinput="bindInput" disabled="{{loging}}" bindfocus="inputFocus" />
</view>
<view style="padding: 30rpx 80rpx;height:480rpx" wx:elif="{{ regist }}">
<view class="flex"> <view class="flex">
<image style="width:40rpx;height:40rpx" src="/assets/image/icon_phone.png"></image> <image style="width:40rpx;height:40rpx" src="/assets/image/icon_phone.png"></image>
<text class="label" style="margin-left:24rpx">手机号码</text> <text class="label" style="margin-left:24rpx">手机号码</text>
@ -39,8 +50,10 @@
</view> </view>
<view style="margin-top:20rpx;padding:40rpx 80rpx"> <view style="margin-top:20rpx;padding:40rpx 80rpx">
<van-button block type="info" loading="{{loging}}" loading-text="提交..." disabled="{{form.userName}}"
bind:click="submitForm" wx:if="{{ metaData }}">提交</van-button>
<van-button block type="info" loading="{{loging}}" loading-text="登录中..." disabled="{{loginEnable}}" <van-button block type="info" loading="{{loging}}" loading-text="登录中..." disabled="{{loginEnable}}"
bind:click="registAccount" wx:if="{{ regist }}">提交</van-button>
bind:click="registAccount" wx:elif="{{ regist }}">登录</van-button>
<van-button block type="info" loading="{{loging}}" loading-text="登录中..." open-type="getUserInfo" <van-button block type="info" loading="{{loging}}" loading-text="登录中..." open-type="getUserInfo"
bind:getuserinfo="onGotUserInfo" wx:else>同意</van-button> bind:getuserinfo="onGotUserInfo" wx:else>同意</van-button>
</view> </view>

Loading…
Cancel
Save