From 0dcf7b4b22c4ac180b6cb847012b4241a0a27cc5 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Wed, 20 Jan 2021 17:46:26 +0800 Subject: [PATCH] no message --- app.js | 8 +- app.json | 2 +- assets/image/bg-logo.png | Bin 37306 -> 0 bytes assets/image/icon_logo.png | Bin 2696 -> 5972 bytes pages/api/payment.js | 20 -- pages/api/saas.js | 18 ++ pages/api/user.js | 99 +++------- pages/home/index/index.js | 1 - pages/home/index/index.wxml | 18 +- pages/index/index.js | 171 +--------------- pages/index/index.json | 3 +- pages/index/index.wxml | 4 +- pages/login/index.js | 263 +++++++++++-------------- pages/login/index.json | 3 +- pages/login/index.wxml | 121 ++++-------- pages/login/index.wxss | 13 -- pages/mall/components/cell/index.js | 23 --- pages/mall/components/cell/index.json | 4 - pages/mall/components/cell/index.wxml | 2 - pages/mall/components/cell/index.wxss | 1 - pages/mall/components/fence/index.js | 23 --- pages/mall/components/fence/index.json | 4 - pages/mall/components/fence/index.wxml | 2 - pages/mall/components/fence/index.wxss | 1 - pages/mall/components/sku/index.js | 23 --- pages/mall/components/sku/index.json | 4 - pages/mall/components/sku/index.wxml | 2 - pages/mall/components/sku/index.wxss | 1 - pages/process/index/index.json | 10 +- pages/process/index/index.wxml | 58 ++---- project.config.json | 2 +- 31 files changed, 225 insertions(+), 679 deletions(-) delete mode 100644 assets/image/bg-logo.png delete mode 100644 pages/api/payment.js create mode 100644 pages/api/saas.js delete mode 100644 pages/mall/components/cell/index.js delete mode 100644 pages/mall/components/cell/index.json delete mode 100644 pages/mall/components/cell/index.wxml delete mode 100644 pages/mall/components/cell/index.wxss delete mode 100644 pages/mall/components/fence/index.js delete mode 100644 pages/mall/components/fence/index.json delete mode 100644 pages/mall/components/fence/index.wxml delete mode 100644 pages/mall/components/fence/index.wxss delete mode 100644 pages/mall/components/sku/index.js delete mode 100644 pages/mall/components/sku/index.json delete mode 100644 pages/mall/components/sku/index.wxml delete mode 100644 pages/mall/components/sku/index.wxss diff --git a/app.js b/app.js index 5255751..aa4c898 100644 --- a/app.js +++ b/app.js @@ -1,15 +1,15 @@ //app.js App({ //----------------------------------------------globalData-------------------------------------- - release: 1, + release: 0, tmplIds: ['kg0T1ve0FpYrEtZ4ExbypHm8mtS7OJaehvqN_T9ypoI'], version: 152, - xAppId: '503258978847952896', - accountInfo: null, + xAppId: '503258978847953926', + userInfo: null, globalData: { openId: null, token: null, - isIPhoneX: false, + keyboardHeight: 0, isIos: false } }) \ No newline at end of file diff --git a/app.json b/app.json index 8803a30..3f52d25 100644 --- a/app.json +++ b/app.json @@ -1,7 +1,7 @@ { "pages":[ - "pages/index/index", "pages/login/index", + "pages/index/index", "pages/home/mobile/index", "pages/home/authory/index", "pages/htmls/agreement/index", diff --git a/assets/image/bg-logo.png b/assets/image/bg-logo.png deleted file mode 100644 index 61da39b802395249c843ae0e462d1a7494896dbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37306 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
  • SaMOGyLId4`RPNh7lQ{6jzs3l5Nr~G2 zMPgzSt_j+GU0xDSI=0q+hV6DQ-q-OmT(1QnXDkH?$W#V|?Ep#|F5e<`;q&D{1cboo z)U#&~dGygow4+6OUKFqNf9DDT#y-_PlvI|^%*U9nsd5K;+e>vFGv=qJ!Ef2JmFYQ( za_t3g{x^D##>x>O6doOH!{uhAqkN8a;yS|hM5mM#{5B=}#IfOjpU1IsM2-O=cXYG{ zms^o83s86pL=UT61VA_@{BQF(Mvlo9AnXMla)D1RJ1f3JmAys*4%UY29Q z|1OVX@mGPDYmf8_(g~zkCCWw_+dF>2f6KK2UN#l!F{EOoSRu+n znNly+xO#5(x_J={Ko7JVhr}pgmKz=sw818ge1ybhwDCxD>+a>=6JCCQ38Kmtbr0JT6KXN@tn!83jVs{J)QT0Xk l*vGHlp8!BL8J=U7{vVdWQVezTxXJ(k002ovPDHLkV1iJsjTHa@ delta 2653 zcmX|Dc{J4PAGVEUP~CBfkdSCZhM6I2mccLxxk%QsW;cy0heNK4j#6^`Hzzw9MyuN5$tkw1#=aJ z@ee~HktY-1vGawJPjEP#-9Yut+07+ggyz3sGi)Fb2zKTR>tIW4T1!joKa$P=C$UE` zwo5T@>i^Qe1^^-UXh5a(lYG_~d;Sl<;d*3-3sbS^;!n*#LK?jsl_odR{)R~`dKd!RNG9X< z3(K@;MnqaiD|tO`6thw>a98Y4=s~d8`n9wyRS1QHgFgXnVtCbWb`{9;kNVsUdE}jx z@kR8(Ng-rzodPH1jHTjo5MwstGxm(6#?es|2CeR+Vadq6_+yJGLNwpCt-7ip%2U#| z^=qe>K<({a*2H?uPw!Kgw|;~F+U#IX@0(fk&YaH1wCfFZq>o-)EN1RM6uR*d2Z_;c z+aEU6+qj|4ZGd}y6b(#z=a+nM|8;__t=a)@49pK6D95*B9H-w873z46gU*9^1uLdq9; z4smXCB6okSb#1A|?l5!prtf@udE89!Gh@_$wPdKTU&G8@#=Y>z@Z~h{%6y=o!NS)f z_pbZBBGY_sM|;2qW;^_@guDo17wcxt2(!IJR2kf-5BYWe62D7s*B72b(NpzK*!_va z&d}eI^3}FB(IIWMFv-a1v7XyfXsXb60|PxhPVK>@o(QO9L0BzIy%o1%vidEm-mHI4obP|ByihUk{FCOmz(iO2GLzSSXc z^izs}-Tj2=td_$^VsnkU_$>?wE-dMVb6cRF6 zVPT3uOPgQtcSF@A?Dy&ly`rPL8fZgXPFt;d+mQu+KVjpGP|#_LVm}M>Jv)){g=8=M zU|wq0S=pa9f};Nf@n^g1&dtu!sKfp9cYuS`u1!tp=RcZvmA=4aawxFX=Y-nNAequANUPt!NuT#`|| z(K!Nfw`C($ca&=&TJkVW%!YT}fzQCyhD03a;(8pb?H#|n5TK$I8D2mF-TK>C9q8`U zk`No|J~rj@#PDzej0?}IL7gU?JO_$ssVYlndOddUu^~BaKCb6mxH%Gs3ys&WrVWm( zy(v}}OWG#Bh||}|MI5UQhBDo&W|yyL`#yChEMr3xo3Prqw_M(AAIW0gTQj9)#6qjZ z_61}!#leuZXHM&v&t9dcmKWUG0pR}7^N_!qUC5$uBV1;ldcIZ)6!m(QQsdZ9l9Os)_X2MS!Bp?nO0~sWOh6y*lCM@a1)!GIU@PamflMNsu$n zF`F^6gw0_O#=Rz+B$&LmXnW=67{vPS2NWoBgzzTm=VaICg50zxsaU}efECtU!X!v~HD6{fzHLpxi> zQ&b4YzBdXd&K5{{r*aYG%-ZEH_%pJu=T{;0RIH!oOM44Loh*QJsbpU=#rBqQesfqw z^&P=!=sW3}TOilSVbwacENzhN?_V@4F$dF8veP6QT9-$m@r*#>0enX0mA_p6}y0%L=bGnv%)iS!J2?!F9#(b$&-b!de8z(WRa zj^zisc*u`rFi@&r5;bab;0iB=x;Z)a`;o}WQw>dT(H+`jXL>bJ(LS08YV!%nYN@op zP{{lX@RiDgkKO}YoL~=n5=#roF%;YIe@b7YI0e_;T zI2X7A$?g5I#`4gSJBfo%4%?-?3dZMCT5d*)nbnnzRa1wf-wc>Zde9kXaLc4V*&A}x65=?0-Woa$&al`#5Srj^H z1)c@8(JS5uwmd&AWkN@;6>q6|AZxsy8~Jw#D>nLMzS_k<=y;+sC%9}VA+D^`V52BT zzF#&T?mBGCqXI`=dwl*`*Pg-qv+`8zL(6B^5aoE=j{%+zSOJ*cW^sp$s)B$)WDe?M zPD2BF%IH8dKmTir{vIHM-g6z6xeghGaCrmrZ;E#bhnM*-Wbi11qJu5AUhXbPhM>2v^tyn4MobAx&l6Q%%m4rY diff --git a/pages/api/payment.js b/pages/api/payment.js deleted file mode 100644 index f407f8a..0000000 --- a/pages/api/payment.js +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Copyright © 2020-present LiuDanYang. All rights Reserved. - */ -import { mGet, mPost } from "./request" -const app = getApp() - -const pconfig = { - baseUrl: app.release ? `https://psc.qniao.cn` : `http://psc-dev.qniao.cn` -} -// *******************************************************************账户业务*********************************************************** -// /credit/get/self-enterprise-credit-by-enterprise-id查看个人的采购额度 -const getCreditInfo = (params) => mGet(`/payment-settlement-center/credit/get/self-enterprise-credit-by-enterprise-id`, params, pconfig) - -const paymentInfo = (params) => mPost(`/payment-settlement-center/pay`, params, pconfig) - -export { - pconfig, - getCreditInfo, - paymentInfo -} \ No newline at end of file diff --git a/pages/api/saas.js b/pages/api/saas.js new file mode 100644 index 0000000..dd402da --- /dev/null +++ b/pages/api/saas.js @@ -0,0 +1,18 @@ +/** + * Copyright © 2020-present LiuDanYang. All rights Reserved. + */ +import { mGet, mPost } from "./request" +const app = getApp() + +const sconfig = { + baseUrl: app.release ? `https://api-client-ztb.qniao.cn` : `http://47.113.118.47:9000` +} +// *****************************************账户业务********************************************** +const loginToken = (params) => mPost(`/recycle-user-center/authorize/get/product-line-token/by/login-token`, params, sconfig) +const getBaseInfo = () => mGet(`/ztb-factory/get/self-enterprise-profile-detail`, null, sconfig) + +export { + sconfig, + loginToken, + getBaseInfo +} \ No newline at end of file diff --git a/pages/api/user.js b/pages/api/user.js index 12f76aa..9adc51f 100644 --- a/pages/api/user.js +++ b/pages/api/user.js @@ -1,59 +1,24 @@ /** * Copyright © 2020-present LiuDanYang. All rights Reserved. */ -import { mGet, mPost, mDelete } from "./request" -// import { mconfig } from "./mall" -// import { cconfig } from "./cloud" -import { pconfig } from "./payment" +import { mGet, mPost } from "./request" +import { sconfig } from "./saas" const util = require('../../utils/util') const storage = require('../../utils/storage') const app = getApp() const config = { - baseUrl: app.release ? 'https://uec.qniao.cn' : 'http://47.107.97.166:9000', - header: { - 'Authorization': `QNT ` + storage.get('Authorization') - } + baseUrl: app.release ? 'https://uec.qniao.cn' : 'https://uec-dev.qniao.cn' } -const checkTestCode = (params) => mGet(`/uec/get/check/qr-code`, params, config) -///uec/get/auth-captcha -const verifyCode = (code, params) => mGet(`/uec/verify/qrcode${code}`, params, config) - -const qrcodeEmploye = (params) => mPost(`/uec/generate/qrcode`, params, config) -// /uec/get/wechat-applet-session const wechatApplet = (params) => mPost('/uec/get/wechat-applet-session', params, config) -const authCaptcha = (params) => mPost(`/uec/get/auth-captcha`, params, config) -const verifyCaptcha = (params) => mPost(`/uec/authorize/by-captcha`, params, config) +const loginCaptcha = (params) => mPost(`/uec/authorize/by-captcha`, params, config) +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 getAuthSession = () => mGet('/uec/create/identity-auth-session', null, config) - -const certificateImage = (params) => mPost('/uec/recognize/certificate-img', params, config) - -const certificateIdentity = (params) => mPost('/uec/identify/identity', 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) - -const getCheckList = (params) => mGet(`/uec/get/auditing-joining-enterprise-application-list`, params, config) - -const getEmployeList = (params) => mGet(`/uec/get/passed-employees`, params, config) - -const auditEmploye = (params) => mPost(`/uec/audit/employee-joining-application`, params, config) - -const deleteEmploye = (params) => mPost(`/uec/remove/employees`, params, config) - -const adminEmploye = (params) => mPost(`/uec/grant/admin-role/to/employees`, params, config) - -const getAddressList = () => mGet(`/uec/get/enterprise-shipping-address-list/by-userId`, null, config) - -const getAddressInfo = (id) => mGet(`/uec/get/enterprise-shipping-address-list/by-userId`, null, config) - -const saveAddress = (params) => mPost(`/uec/save/enterprise-shipping-address`, params, config) -// /uec/delete/enterprise-shipping-address/{id} -const deleteAddress = (id) => mDelete(`/uec/delete/enterprise-shipping-address/${id}`, null, config) - +const updateUserInfo = (params) => mPost('/uec/user/update/user-info', params, config) +const verifyCode = (code, params) => mGet(`/uec/verify/qrcode${code}`, params, config) // **************************************************************************************************************************************** // /authorize/by-wechat-applet小程序登录 @@ -116,7 +81,6 @@ function unionWechat(form, resolve, reject) { data: form, method: 'POST', success: function (result) { - wx.hideLoading() if (result.data.code == 0) { storage.remove('tempToken') resolve(result.data) @@ -204,42 +168,23 @@ function phoneWechat(form) { return promise } -function finalizeToken() { +function finalizeToken(){ config.header = null - mconfig.header = null - pconfig.header = null - cconfig.header = null + sconfig.header = null } export { config, - qrcodeEmploye, - verifyCode, - checkTestCode, - wechatApplet, - authCaptcha, - verifyCaptcha, + finalizeToken, + wechatApplet, getUserInfo, - getAuthSession, - certificateImage, - certificateIdentity, + updateUserInfo, + postCaptcha, + loginPwd, + loginCaptcha, phoneWechat, loginWechat, - bindingAdmin, - bindingAccount, - getCheckList, - getEmployeList, - auditEmploye, - deleteEmploye, - adminEmploye, - getAddressList, - saveAddress, - getAddressInfo, - deleteAddress, - finalizeToken -} - -// module.exports = { -// phoneWechat: phoneWechat, -// loginWechat: loginWechat -// } \ No newline at end of file + setPassword, + modifyMobile, + verifyCode +} \ No newline at end of file diff --git a/pages/home/index/index.js b/pages/home/index/index.js index 0a4c832..5a7e61a 100644 --- a/pages/home/index/index.js +++ b/pages/home/index/index.js @@ -1,7 +1,6 @@ // pages/stock/index.js import Dialog from '../../../components/dialog/dialog' import { finalizeToken } from "../../api/user" -import { getCreditInfo } from "../../api/payment" const util = require('../../../utils/util') const event = require('../../../utils/event.js') const app = getApp() diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml index 898e516..4c53ab5 100644 --- a/pages/home/index/index.wxml +++ b/pages/home/index/index.wxml @@ -47,23 +47,7 @@ 查看订单明细 - - - - - - - 商城订单 - - - - - - - - - - + diff --git a/pages/index/index.js b/pages/index/index.js index 52699f8..f505277 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -1,12 +1,4 @@ // pages/administ/index.js -import Dialog from '../../components/dialog/dialog' -import { config, getUserInfo, verifyCode } from "../api/user" -// import { loginToken, cconfig } from "../api/cloud" -// import { mconfig } from "../api/mall" -import { pconfig } from "../api/payment" -const storage = require('../../utils/storage') -const event = require('../../utils/event') -const util = require('../../utils/util') const app = getApp() Page({ @@ -21,11 +13,7 @@ Page({ { index: 1, value: 'work', badge: 0, name: '工作台', blue: '/assets/image/tabbar/process-blue.png', gray: '/assets/image/tabbar/process-gray.png' }, { index: 2, value: 'home', badge: 0, name: '我的', blue: '/assets/image/tabbar/home-blue.png', gray: '/assets/image/tabbar/home-gray.png' } ], - tabIndex: 0, - inited: false, - authorization: null, - code: null, - // code: '?mark=cloudprint&QrCodeRecordId=541755014083907584' + tabIndex: 0 }, /************************************** 初始化流程 ********************************************/ onLoad: function (options) { @@ -35,157 +23,11 @@ Page({ // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启 updateManager.applyUpdate() }) - if(options.q){ - //扫二维码进入的， - let q = decodeURIComponent(options.q) - this.data.code = q.substring(q.indexOf('?')) - } - event.on('EventMessage', this, this.onEvent) - }, - onReady: function () { - wx.showLoading({ title: '获取中', mask: true }) - wx.getSystemInfo({ - success: e => { - app.globalData.isIPhoneX = this.checkIPhoneX(e) - app.globalData.isIos = this.checkIos(e) - app.globalData.dev = e.platform == 'devtools' - - let custom = wx.getMenuButtonBoundingClientRect() - app.globalData.Custom = custom - // 顶部操作栏高度 - app.globalData.CustomBar = custom.bottom + custom.top - e.statusBarHeight + (app.globalData.isIos ? 4 : 0) - let windowHeight = e.windowHeight * (750 / e.windowWidth) - - let safeBottom = e.windowHeight - e.safeArea.bottom - if(safeBottom > e.windowHeight){ - safeBottom = 34 - } - app.globalData.safeBottom = safeBottom * (750 / e.windowWidth) - // 状态栏高度 - app.globalData.StatusBar = e.statusBarHeight * (750 / e.windowWidth) - let statusBarHeight = app.globalData.CustomBar * (750 / e.windowWidth) - app.globalData.statusBarHeight = statusBarHeight - // fragmentHeight：指的是整个页面statusBarHeight以下的高度 - app.globalData.fragmentHeight = windowHeight - statusBarHeight - app.globalData.safeFragmentHeight = windowHeight - statusBarHeight - app.globalData.safeBottom - app.globalData.windowWidth = e.windowWidth - - this.data.inited = true - const fheght = (app.globalData.safeFragmentHeight + app.globalData.statusBarHeight) - 100 - event.emit('InitMessage', { what: 8, desc: 'Inited' }) - this.setData({fragment: fheght, safeBottom: app.globalData.safeBottom, inited: true }) - this.data.authorization = app.globalData.token || storage.get('Authorization') - if(this.data.code){ - // 进入登录绑定页面 - this.fetchCode(this.data.code) - } else if(this.data.authorization){ - app.globalData.token = this.data.authorization - this.fetchUserInfo() - } else { - wx.hideLoading() - this.onResume() - } - } - }) - }, - checkIos: function (e) { - if ('ios' === e.platform) { - return true - } - if (e.system.startsWith('iOS')) { - return true - } - return false - }, - checkIPhoneX: function (e) { - var t = e.model - return (/iPhone 11/.test(t) || /iPhone X/.test(t) || /iPhone 12/.test(t)) && this.checkIos(e) - }, - /************************************** 登录流程 ********************************************/ - onEvent: function (message) { - if (message.what == 888) { - if(!app.accountInfo){ - this.setData({ tabIndex: 0 }) - } else if(app.accountInfo && app.accountInfo.applicationStatus == 0){ - this.setData({ tabIndex: 1 }) - } - } - }, - fetchUserInfo: function(){ - if(!app.globalData.token){ - wx.hideLoading() - this.onResume() - return - } - config.header = { 'Authorization': 'QNT ' + app.globalData.token } - getUserInfo().then(result => { - if (result.data.token) { - storage.put('Authorization', result.data.token) - app.globalData.token = result.data.token - } - app.accountInfo = result.data - loginToken({loginToken: app.globalData.token}).then(result => { - mconfig.header = { 'Authorization': 'QNT ' + result.data } - cconfig.header = { 'Authorization': 'QNT ' + result.data } - pconfig.header = { 'Authorization': 'QNT ' + result.data } - // 登录流程完成； - wx.hideLoading() - // 如果是员工，或者 - if(app.accountInfo && app.accountInfo.applicationStatus == 0){ - this.setData({ tabIndex: 1 }) - } - this.onResume() - // event.emit('EventMessage', { what: 888, desc: 'Logined' }) - }).catch(err => { - wx.hideLoading() - this.onResume() - }) - }).catch(err => { - wx.hideLoading() - this.onResume() - }) - }, - // 根据二维码的code获取相关的内容; - fetchCode: function(code){ - verifyCode(code).then(result => { - this.data.code = null - if(result.data.redirectUrl == '/login'){ - // 根据userId来获取用户信息；并且直接登录 - app.globalData.token = result.data.metaData.token - storage.put('Authorization', app.globalData.token) - this.fetchUserInfo() - } else if('/page/index/yaoqing' == result.data.redirectUrl || '/page/index/shenqing' == result.data.redirectUrl){ - storage.put('metaData', JSON.stringify(result.data), 1) - wx.hideLoading() - // 进入login页面; - wx.navigateTo({ url: '/pages/index/index?code=11' }) - } else { - wx.hideLoading() - if(!result.data.message){ - result.data.message = '二维码解析失败，请重新扫码' - } - util.showToast(result.data.message) - } - }).catch(err => { - //异常回调 - wx.hideLoading() - if(this.data.authorization){ - Dialog.alert({ title: '温馨提示', message: '二维码解析失败，以当前账号进行登录!' }).then(() => { - wx.showLoading({ title: '登录中', mask: true }) - app.globalData.token = this.data.authorization - this.fetchUserInfo() - }) - } else { - util.showToast(err) - this.onResume() - } - }) + this.setData({fragment: (app.globalData.safeFragmentHeight + app.globalData.statusBarHeight) - 100, safeBottom: app.globalData.safeBottom }) }, /************************************** 生命周期函数--监听页面初次渲染完成 ********************************************/ onShow: function () { - if(this.data.inited){ - this.onResume() - } + this.onResume() }, onResume: function(){ var pageView = this.selectComponent('#' + this.data.tabList[this.data.tabIndex].value) @@ -194,17 +36,10 @@ Page({ } }, onChange: function ({detail}) { - if(detail == 2 && !app.accountInfo){ - wx.navigateTo({ url: '/pages/login/index' }) - return - } this.setData({ tabIndex: detail }) this.onResume() }, stopTouchMove: function(e){ return false - }, - onUnload: function(){ - event.remove('EventMessage', this) } }) \ No newline at end of file diff --git a/pages/index/index.json b/pages/index/index.json index 176b038..c95a7d8 100644 --- a/pages/index/index.json +++ b/pages/index/index.json @@ -5,7 +5,6 @@ "van-tabbar-item": "/components/tabbar-item/index", "mall": "/pages/mall/index/index", "workbench": "/pages/process/index/index", - "home": "/pages/home/index/index", - "van-dialog": "/components/dialog/index" + "home": "/pages/home/index/index" } } \ No newline at end of file diff --git a/pages/index/index.wxml b/pages/index/index.wxml index f14268c..caadf07 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,11 +1,11 @@ - + - + diff --git a/pages/login/index.js b/pages/login/index.js index 01a637b..64c7554 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -1,12 +1,9 @@ //获取应用实例 import Dialog from '../../components/dialog/dialog' -import { config, wechatApplet, getUserInfo, loginWechat, authCaptcha, verifyCaptcha, bindingAdmin, bindingAccount } from "../api/user" -// import { loginToken, cconfig } from "../api/cloud" -// import { mconfig } from "../api/mall" -import { pconfig } from "../api/payment" +import { config, postCaptcha, loginCaptcha, loginPwd, verifyCode } from "../api/user" +import { sconfig, loginToken, getBaseInfo } from "../api/saas" const util = require('../../utils/util') const storage = require('../../utils/storage') -const event = require('../../utils/event') const app = getApp() Page({ @@ -23,145 +20,106 @@ Page({ captcha: null }, loging: false, - regist: false, qrPage: null, metaData: null, - code: null, - checked: true, - height: app.globalData.fragmentHeight + code: null }, /************************************** 初始化登录流程 ********************************************/ onLoad: function (options) { - var json = storage.get('metaData') - if(options.code && json){ - //分享带code进入的， - this.setData({ code: options.code, height: app.globalData.fragmentHeight }) - storage.remove('metaData') - var form = JSON.parse(json) - this.data.metaData = form.metaData - this.data.qrPage = form.redirectUrl - } else { - this.setData({ height: app.globalData.fragmentHeight }) - } - this.wxLogin() - }, - onEvent: function (message) { - if (message.what == 888) { - this.initAccountInfo() + const updateManager = wx.getUpdateManager() + updateManager.onCheckForUpdate() + updateManager.onUpdateReady(function () { + // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启 + updateManager.applyUpdate() + }) + if(options.q){ + //扫二维码进入的， + let q = decodeURIComponent(options.q) + this.data.code = q.substring(q.indexOf('?')) } }, - wxLogin: function(){ - wx.login({ - success: res => { - // 获取openId - wechatApplet({ authCode: res.code }).then(result => { - storage.put('tmpAuthToken', result.data.tmpAuthToken, 98) - }) + onReady: function () { + wx.getSystemInfo({ + success: e => { + app.globalData.isIos = this.checkIos(e) + app.globalData.dev = e.platform == 'devtools' + + let custom = wx.getMenuButtonBoundingClientRect() + app.globalData.Custom = custom + // 顶部操作栏高度 + app.globalData.CustomBar = custom.bottom + custom.top - e.statusBarHeight + (app.globalData.isIos ? 4 : 0) + let windowHeight = e.windowHeight * (750 / e.windowWidth) + + let safeBottom = e.windowHeight - e.safeArea.bottom + if(safeBottom > e.windowHeight){ + safeBottom = 34 + } + app.globalData.safeBottom = safeBottom * (750 / e.windowWidth) + // 状态栏高度 + app.globalData.StatusBar = e.statusBarHeight * (750 / e.windowWidth) + let statusBarHeight = app.globalData.CustomBar * (750 / e.windowWidth) + app.globalData.statusBarHeight = statusBarHeight + // fragmentHeight：指的是整个页面statusBarHeight以下的高度 + app.globalData.fragmentHeight = windowHeight - statusBarHeight + app.globalData.safeFragmentHeight = windowHeight - statusBarHeight - app.globalData.safeBottom + app.globalData.windowWidth = e.windowWidth + + if(this.data.code){ + this.fetchQrCode(this.data.code) + } else { + this.fetchUserInfo() + } } }) }, - // 获取用户信息，进行登录 + checkIos: function (e) { + if ('ios' === e.platform) { + return true + } + if (e.system.startsWith('iOS')) { + return true + } + return false + }, + /************************************** 获取用户信息，进行登录 ********************************************/ fetchUserInfo: function(){ - config.header = { 'Authorization': 'QNT ' + app.globalData.token } + var authorization = app.globalData.token || storage.get('Authorization') + if (util.isEmpty(authorization)) { + return + } + app.globalData.token = authorization + config.header = { 'Authorization': 'QNT ' + authorization } this.setData({ loging: true}) - getUserInfo().then(result => { - this.setData({ loging: false}) - if(!result.data.mobile){ - wx.hideLoading() - //小白用户；注册流程； - this.setData({ regist: true }) - return - } - if (result.data.token) { - storage.put('Authorization', result.data.token) - app.globalData.token = result.data.token - } - app.accountInfo = result.data - if(result.data.enterpriseId){ - // 企业不一致 - var invaild = false - if(this.data.metaData && this.data.metaData.enterpriseId){ - invaild = result.data.enterpriseId != this.data.metaData.enterpriseId - } else if(this.data.metaData && this.data.metaData.joiningEnterprisePublicInvitationId){ - invaild = result.data.enterpriseId != this.data.metaData.joiningEnterprisePublicInvitationId - } - if(invaild){ - wx.hideLoading() - Dialog.alert({ title: '温馨提示', message: '您已经绑定过企业，现在就进入？' }).then(() => { - this.toIndex() - }) - } else { - this.toIndex() - } - } else if(this.data.metaData){ - // 如果有metaData + loginToken({loginToken: app.globalData.token}).then(result => { + sconfig.header = { 'Authorization': 'QNT ' + result.data.token } + getBaseInfo().then(result => { + this.setData({ loging: false}) + app.userInfo = result.data wx.hideLoading() - this.setData({ metaData: this.data.metaData, qrPage: this.data.qrPage, regist: false, loging: false }) - } else { - //如果绑定过手机号码； + wx.redirectTo({ url: '/pages/index/index' }) + }).catch(err => { wx.hideLoading() - this.toIndex() - } + util.showToast(err) + app.globalData.token = null + storage.remove('Authorization') + config.header = null + this.setData({ loging: false}) + }) }).catch(err => { - //异常回调 wx.hideLoading() + util.showToast(err) + app.globalData.token = null + storage.remove('Authorization') + config.header = null this.setData({ loging: false}) }) }, - toIndex: function(){ - loginToken({loginToken: app.globalData.token}).then(result => { - mconfig.header = { 'Authorization': 'QNT ' + result.data } - cconfig.header = { 'Authorization': 'QNT ' + result.data } - pconfig.header = { 'Authorization': 'QNT ' + result.data } - // 登录完成... - wx.hideLoading() - event.emit('EventMessage', { what: 888, desc: 'Logined' }) - wx.navigateBack() - }).catch(err => { - wx.hideLoading() - }) - }, - onBoxChange: function({detail}){ - this.setData({ checked: detail }) - }, /************************************** 注册流程 ********************************************/ readAgreement: function () { wx.navigateTo({ url: '/pages/htmls/agreement/index' }) }, - onGotUserInfo: function (e) { - if(!this.data.checked){ - util.showToast('请阅读并同意《服务与隐私协议》') - return - } - if(this.data.loging){ - return - } - this.setData({ loging: true }) - if(this.data.form.tmpAuthToken){ - this.registAccount() - return - } - loginWechat({ encryptedData: e.detail.encryptedData, iv: e.detail.iv }).then(result => { - storage.put('Authorization', result.data.token) - app.globalData.token = result.data.token - this.data.form.tmpAuthToken = result.data.tmpAuthToken - if(e.currentTarget.id == 'btn-login'){ - this.registAccount() - } else { - this.fetchUserInfo() - } - }).catch(error => { - if(error.data && error.data.tmpAuthToken){ - this.data.form.tmpAuthToken = error.data.tmpAuthToken - this.setData({ regist: true, loging: false }) - } else { - this.setData({ loging: false }) - } - util.showToast(error.message) - }) - }, inputFocus: function(e) { - storage.put('keyboardHeight', e.detail.height) + app.globalData.keyboardHeight = e.detail.height }, bindInput: function (e) { this.data.form[e.target.id] = e.detail.value @@ -191,16 +149,13 @@ Page({ onFinished: function(){ this.setData({ second: '重新获取验证码', codeEnable: true }) }, - loginFrom: function(){ - this.setData({ regist: true }) - }, fetchCaptcha: function(){ if (!(/^1\d{10}$/.test(this.data.form.account)) || this.data.form.account.length < 11) { util.showToast('请输入11位手机号码') return } wx.showLoading({ title: '正在获取', mask: true }) - authCaptcha({ verifiableAccount: this.data.form.account, verifiableAccountType: 1, purpose: 1 }).then(result => { + postCaptcha({ verifiableAccount: this.data.form.account, verifiableAccountType: 1, purpose: 1 }).then(result => { wx.hideLoading() this.setData({ codeEnable: false }) util.showToast('验证码已经发送') @@ -227,45 +182,53 @@ Page({ } wx.showLoading({ title: '登录中', mask: true }) this.setData({ loging: true }) - // this.data.form.password = md5.hexMD5(this.data.form.password).toUpperCase() if (this.data.type == 1) { - verifyCaptcha(this.data.form).then(result => { - wx.setStorageSync('Authorization', result.data.token) + loginCaptcha(this.data.form).then(result => { + storage.put('Authorization', result.data.token) app.globalData.token = result.data.token this.fetchUserInfo() }).catch(error => { wx.hideLoading() - this.setData({ loging: false }) + console.log(error) util.showToast(error) }) } else { - // authorize/by-password 密码登录 - } - }, - /************************************** 二维码流程 ********************************************/ - bindAccount: function(){ - if (util.isEmpty(this.data.form.userName)) { - util.showToast('请输入您的姓名，以便于识别') - return - } - this.setData({ loging: true }) - this.data.metaData.userName = this.data.form.userName - if(this.data.qrPage == '/page/index/yaoqing'){ - bindingAdmin(this.data.metaData).then(result => { - this.data.metaData = null + loginPwd(this.data.form).then(result => { + storage.put('Authorization', result.data.token) + app.globalData.token = result.data.token this.fetchUserInfo() }).catch(error => { - this.setData({loging: false}) + wx.hideLoading() util.showToast(error) }) + } + }, + changeType: function () { + if (this.data.type == 1) { + this.setData({ type: 0, ['form.captcha']: null, loginEnable: true }) } else { - bindingAccount(this.data.metaData).then(result => { - this.data.metaData = null - this.fetchUserInfo() - }).catch(error => { - this.setData({loging: false}) - util.showToast(error) - }) + this.setData({ type: 1, ['form.password']: null, loginEnable: true }) } + }, + /************************************** 二维码流程 ********************************************/ + fetchQrCode: function(code){ + verifyCode(code).then(result => { + this.data.code = null + if(result.data.redirectUrl == '/login'){ + // 根据userId来获取用户信息；并且直接登录 + app.globalData.token = result.data.metaData.token + storage.put('Authorization', app.globalData.token) + this.fetchUserInfo() + } else { + wx.hideLoading() + if(!result.data.message){ + result.data.message = '二维码解析失败，请重新扫码' + } + util.showToast(result.data.message) + } + }).catch(err => { + //异常回调 + wx.hideLoading() + }) } }) \ No newline at end of file diff --git a/pages/login/index.json b/pages/login/index.json index db02766..c83be94 100644 --- a/pages/login/index.json +++ b/pages/login/index.json @@ -2,7 +2,6 @@ "usingComponents": { "van-button": "/components/button/index", "van-dialog": "/components/dialog/index", - "van-count-down": "/components/count-down/index", - "van-checkbox": "/components/checkbox/index" + "van-count-down": "/components/count-down/index" } } \ No newline at end of file diff --git a/pages/login/index.wxml b/pages/login/index.wxml index fc5a6ca..90ed99a 100644 --- a/pages/login/index.wxml +++ b/pages/login/index.wxml @@ -1,94 +1,49 @@ - - 登录 - + + + - - - + + + + 手机号码 - - - 欢迎您使用千鸟跟单王！ - - 现邀请您成为{{metaData.name}}的管理员 - - - 现邀请您成为{{metaData.name}}的员工 - - - - - - 提交 - + + - - - - - 手机号码 - - - - - - - {{type == 1 ? '验证码' : '密码'}} - - - - - - - {{second}} - - - - - - - - - 登录 - - + + + {{type == 1 ? '验证码' : '密码'}} + + + + + + {{second}} + + + + + + + {{type == 1 ? '密码登录' : '验证码登录'}} + + + + 登录 - - - - 千鸟互联云印通 - 专注服务于印刷包装企业 - - - - 微信用户一键登录 - - - 手机验证码登录 - - - - 登录即同意 - - 《服务与隐私协议》 - - - - + + + + 仅限纸通宝工厂用户使用 \ No newline at end of file diff --git a/pages/login/index.wxss b/pages/login/index.wxss index e83520a..ef76a63 100644 --- a/pages/login/index.wxss +++ b/pages/login/index.wxss @@ -3,19 +3,6 @@ page { background-color: #fff; } -.relative{ - height: 100%; - width: 100%; - position:relative; -} - -.container { - width: 100%; - flex-direction: column; - position: fixed; - bottom: 64rpx; -} - .label { font-size: 30rpx; font-family: PingFang-SC-Regular, PingFang-SC; diff --git a/pages/mall/components/cell/index.js b/pages/mall/components/cell/index.js deleted file mode 100644 index e5d500e..0000000 --- a/pages/mall/components/cell/index.js +++ /dev/null @@ -1,23 +0,0 @@ -// pages/mall/components/sku.js -Component({ - /** - * 组件的属性列表 - */ - properties: { - - }, - - /** - * 组件的初始数据 - */ - data: { - - }, - - /** - * 组件的方法列表 - */ - methods: { - - } -}) diff --git a/pages/mall/components/cell/index.json b/pages/mall/components/cell/index.json deleted file mode 100644 index e8cfaaf..0000000 --- a/pages/mall/components/cell/index.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "component": true, - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/mall/components/cell/index.wxml b/pages/mall/components/cell/index.wxml deleted file mode 100644 index 8a7f9b8..0000000 --- a/pages/mall/components/cell/index.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -pages/mall/components/sku.wxml diff --git a/pages/mall/components/cell/index.wxss b/pages/mall/components/cell/index.wxss deleted file mode 100644 index 8562a32..0000000 --- a/pages/mall/components/cell/index.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/mall/components/sku.wxss */ \ No newline at end of file diff --git a/pages/mall/components/fence/index.js b/pages/mall/components/fence/index.js deleted file mode 100644 index e5d500e..0000000 --- a/pages/mall/components/fence/index.js +++ /dev/null @@ -1,23 +0,0 @@ -// pages/mall/components/sku.js -Component({ - /** - * 组件的属性列表 - */ - properties: { - - }, - - /** - * 组件的初始数据 - */ - data: { - - }, - - /** - * 组件的方法列表 - */ - methods: { - - } -}) diff --git a/pages/mall/components/fence/index.json b/pages/mall/components/fence/index.json deleted file mode 100644 index e8cfaaf..0000000 --- a/pages/mall/components/fence/index.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "component": true, - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/mall/components/fence/index.wxml b/pages/mall/components/fence/index.wxml deleted file mode 100644 index 8a7f9b8..0000000 --- a/pages/mall/components/fence/index.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -pages/mall/components/sku.wxml diff --git a/pages/mall/components/fence/index.wxss b/pages/mall/components/fence/index.wxss deleted file mode 100644 index 8562a32..0000000 --- a/pages/mall/components/fence/index.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/mall/components/sku.wxss */ \ No newline at end of file diff --git a/pages/mall/components/sku/index.js b/pages/mall/components/sku/index.js deleted file mode 100644 index e5d500e..0000000 --- a/pages/mall/components/sku/index.js +++ /dev/null @@ -1,23 +0,0 @@ -// pages/mall/components/sku.js -Component({ - /** - * 组件的属性列表 - */ - properties: { - - }, - - /** - * 组件的初始数据 - */ - data: { - - }, - - /** - * 组件的方法列表 - */ - methods: { - - } -}) diff --git a/pages/mall/components/sku/index.json b/pages/mall/components/sku/index.json deleted file mode 100644 index e8cfaaf..0000000 --- a/pages/mall/components/sku/index.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "component": true, - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/mall/components/sku/index.wxml b/pages/mall/components/sku/index.wxml deleted file mode 100644 index 8a7f9b8..0000000 --- a/pages/mall/components/sku/index.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -pages/mall/components/sku.wxml diff --git a/pages/mall/components/sku/index.wxss b/pages/mall/components/sku/index.wxss deleted file mode 100644 index 8562a32..0000000 --- a/pages/mall/components/sku/index.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/mall/components/sku.wxss */ \ No newline at end of file diff --git a/pages/process/index/index.json b/pages/process/index/index.json index 1269718..b869717 100644 --- a/pages/process/index/index.json +++ b/pages/process/index/index.json @@ -1,9 +1,11 @@ { "component": true, "usingComponents": { - "van-tabs": "/components/tabs/index", - "van-tab": "/components/tab/index", - "van-loading": "/components/loading/index", - "van-button": "/components/button/index" + "van-grid": "/components/grid/index", + "van-grid-item": "/components/grid-item/index", + "van-cell": "/components/cell/index", + "van-cell-group": "/components/cell-group/index", + "van-info": "/components/info/index", + "van-icon": "/components/icon/index" } } \ No newline at end of file diff --git a/pages/process/index/index.wxml b/pages/process/index/index.wxml index 143c2c8..6733d98 100644 --- a/pages/process/index/index.wxml +++ b/pages/process/index/index.wxml @@ -2,47 +2,17 @@ 工作台 - - - - 正在加载 - - - - - - - - - - - - - - - - - - - - - - - 您的申请还在审核中，如有疑问请联系管理员。 - - - - - 您还没有入驻云印通 - - 现在去申请 - - - - - - 您还没有云印通账号 - - 现在去登录 - - \ No newline at end of file + + + + + 收货管理 + + + + + + + + + \ No newline at end of file diff --git a/project.config.json b/project.config.json index abc836e..eb29e99 100644 --- a/project.config.json +++ b/project.config.json @@ -41,7 +41,7 @@ }, "compileType": "miniprogram", "libVersion": "2.14.0", - "appid": "wx0e4e0fc5432db6d8", + "appid": "wx8214a7f3614a3340", "projectname": "ztb-saas-mini", "debugOptions": { "hidedInDevtools": []