no message

api/saas.js

@@ -10,7 +10,9 @@ const sconfig = {
 }
 // *****************************************账户业务**********************************************
 const loginToken = (params) => mPost(`/recycle-user-center/authorize/get/product-line-token/by/login-token`, params, sconfig)
+const getUserInfo = () => mGet(`/recycle-user-center/user/get/user-info`, null, sconfig)
 const getBaseInfo = () => mGet(`/ztb-factory/get/self-enterprise-profile-detail`, null, sconfig)
+const bindingAdmin = (params) => mPost(`/recycle-user-center/bind/factory-admin`, params, sconfig)
 const getOrderList = (params) => mGet(`/ztb-factory/factory-customer/get/order-list`, params, sconfig)
 const getOrderInfo = (id) => mGet(`/ztb-factory/factory-customer/get/order-detail/${id}`, null, sconfig)
 const pricingOrder = (params) => mPost(`/ztb-factory/factory/submit/order-price`, params, sconfig)
@@ -33,6 +35,8 @@ export {
   sconfig,
   loginToken,
   getBaseInfo,
+  getUserInfo,
+  bindingAdmin,
   getFactoryOrderList,
   getFactoryOrderInfo,
   getOrderList,

api/user.js

@@ -17,10 +17,8 @@ const loginPwd = (params) => mPost(`/uec/authorize/by-password`, params, config)
 const postCaptcha = (params) => mPost(`/uec/get/auth-captcha`, params, config)
 const setPassword = (params) => mPost(`/uec/user/set/sign-in-password`, params, config)
 const modifyMobile = (params) => mPost(`/uec/user/modify/mobile`, params, config)
-const getUserInfo = (params) => mGet('/uec/get/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 bindingAdmin = (params) => mPost(`/uec/bind/primary-account`, params, config)
 const bindingAccount = (params) => mPost(`/uec/apply/to/be/emplyee/of/enterprise`, params, config)
 
 // ****************************************************************************************************************************************
@@ -180,7 +178,6 @@ export {
   config,
   finalizeToken,
   wechatApplet, 
-  getUserInfo,
   updateUserInfo,
   postCaptcha,
   loginPwd,
@@ -190,6 +187,5 @@ export {
   setPassword,
   modifyMobile,
   verifyCode,
-  bindingAdmin,
   bindingAccount
 }

pages/login/index.js

@@ -1,7 +1,7 @@
 //获取应用实例
 import Dialog from '../../components/dialog/dialog'
-import { config, wechatApplet, loginWechat, postCaptcha, loginCaptcha, loginPwd, verifyCode, bindingAdmin, bindingAccount } from "../../api/user"
-import { sconfig, loginToken, getBaseInfo } from "../../api/saas"
+import { config, wechatApplet, loginWechat, postCaptcha, loginCaptcha, loginPwd, verifyCode } from "../../api/user"
+import { sconfig, loginToken, getUserInfo, getBaseInfo, bindingAdmin, bindingAccount } from "../../api/saas"
 const util = require('../../utils/util')
 const storage = require('../../utils/storage')
 const app = getApp()
@@ -23,7 +23,8 @@ Page({
     loging: false,
     regist: false,
     metaData: null,
-    code: null
+    // code: null,
+    code: '?mark=cloudprint&QrCodeRecordId=552611775347036160'
   },
   /************************************** 初始化登录流程  ********************************************/
   onLoad: function (options) {
@@ -89,13 +90,13 @@ Page({
   /************************************** 获取用户信息，进行登录  ********************************************/
   fetchUserInfo: function(authorization){
     // config.header = { 'Authorization': 'QNT ' + authorization }
+    // token 切换流程
     loginToken({loginToken: authorization}).then(result => {
-      // token 切换流程
       sconfig.header = { 'Authorization': 'QNT ' + result.data }
-      getBaseInfo().then(result => {
+      getUserInfo().then(result => {
         app.userInfo = result.data
+        wx.hideLoading()
         if(app.userInfo.enterpriseId){
-          wx.hideLoading()
           app.globalData.token = authorization
           storage.put('Authorization', authorization)
           this.setData({ loging: false})
@@ -108,11 +109,11 @@ Page({
           }
         } else if(this.data.metaData){
           // 这里要进行账号的绑定，对工厂进行绑定；或者进行申请操作；
-          this.setData({metaData: this.data.metaData })
+          app.globalData.token = authorization
+          storage.put('Authorization', authorization)
+          this.setData({ loging: false, metaData: this.data.metaData })
         } else {
-          wx.hideLoading()
           this.setData({ loging: false})
-          config.header = null
           Dialog.alert({ title: '温馨提示', message: '您还不是纸通宝SAAS用户，请联系工厂管理员，或者联系纸通宝客户人员。' }).then(() => {
           })
         }
@@ -175,7 +176,7 @@ Page({
         this.setData({ mobileEnable: true })
       }
     } else if ('userName' == e.target.id) {
-      this.setData({ ['form.userName']: e.detail.value })
+      this.setData({ ['metaData.userName']: e.detail.value })
     }
     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)) {
@@ -274,7 +275,8 @@ Page({
         this.fetchUserInfo(result.data.metaData.token)
       } else {
         wx.hideLoading()
-        this.data.metaData = result.data
+        this.data.metaData = result.data.metaData
+        this.data.metaData.qrPage = result.data.redirectUrl
         this.setData({ loging: false})
       }
     }).catch(err => {
@@ -287,9 +289,9 @@ Page({
     if(this.data.metaData.qrPage == '/page/index/yaoqing'){
       bindingAdmin(this.data.metaData).then(result => {
         wx.hideLoading()
+        app.userInfo.enterpriseId = this.data.metaData.factoryId
+        app.userInfo.enterpriseName = this.data.metaData.factoryName
         this.data.metaData = null
-        app.userInfo.enterpriseId = this.data.metaData.metaData.enterpriseId
-        app.userInfo.enterpriseName = this.data.metaData.metaData.enterpriseName
         this.setData({loging: false})
         wx.redirectTo({ url: '/pages/index/index' })
       }).catch(error => {

pages/login/index.wxml

@@ -5,11 +5,11 @@
 
 <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 class="text-df" style="padding:20rpx 0rpx" wx:if="{{metaData.qrPage == '/page/index/yaoqing'}}">
+			<text class="text-df">现邀请您成为<text class="text-bold text-blue">{{metaData.factoryName}}</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 class="text-df" style="padding:20rpx 0rpx" wx:elif="{{metaData.qrPage == '/page/index/shenqing'}}">
+			<text class="text-df">现邀请您成为<text class="text-bold text-blue">{{metaData.factoryName}}</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" />
@@ -50,7 +50,7 @@
 </view>
  
 <view style="margin-top:20rpx;padding:40rpx 80rpx">
-	<van-button block type="info" loading="{{loging}}" loading-text="提交..." disabled="{{form.userName}}"
+	<van-button block type="info" loading="{{loging}}" loading-text="提交..." disabled="{{!metaData.userName}}"
 		bind:click="submitForm" wx:if="{{ metaData }}">提交</van-button>
 	<van-button block type="info" loading="{{loging}}" loading-text="登录中..." disabled="{{loginEnable}}"
 		bind:click="registAccount" wx:elif="{{ regist }}">登录</van-button>