From cf97ea67a17902c0ca2207f8ad81bc683d305d49 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Tue, 23 Feb 2021 15:00:07 +0800 Subject: [PATCH] no message --- api/user.js | 6 ++++++ pages/login/index.js | 8 +------- pages/process/index/index.js | 5 +++++ pages/process/order-price/index.js | 2 +- pages/process/order-price/index.wxml | 2 +- pages/process/payment/index.wxml | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/api/user.js b/api/user.js index bb821f9..2932775 100644 --- a/api/user.js +++ b/api/user.js @@ -18,6 +18,9 @@ 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 updateUserInfo = (params) => mPost('/uec/user/update/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 generateCode = (params) => mPost('/uec/generate/qrcode', params, config) const verifyCode = (code, params) => mGet(`/uec/verify/qrcode${code}`, params, config) const applyEmplyee = (params) => mPost(`/uec/apply/to/be/employee/of/enterprise-department`, params, config) @@ -184,6 +187,9 @@ export { finalizeToken, wechatApplet, updateUserInfo, + getAuthSession, + certificateImage, + certificateIdentity, postCaptcha, loginPwd, loginCaptcha, diff --git a/pages/login/index.js b/pages/login/index.js index 1d29958..bf7df70 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -1,7 +1,7 @@ //获取应用实例 import Dialog from '../../components/dialog/dialog' import { config, wechatApplet, loginWechat, postCaptcha, loginCaptcha, loginPwd, verifyCode, applyEmplyee } from "../../api/user" -import { sconfig, loginToken, getUserInfo, getBaseInfo, bindingAdmin } from "../../api/saas" +import { sconfig, loginToken, getUserInfo, bindingAdmin } from "../../api/saas" const util = require('../../utils/util') const storage = require('../../utils/storage') const app = getApp() @@ -95,12 +95,6 @@ Page({ sconfig.header = { 'Authorization': 'QNT ' + result.data } getUserInfo().then(result => { wx.hideLoading() - // if(!result.data.isSaasPerssion){ - // this.setData({ loging: false}) - // Dialog.alert({ title: '温馨提示', message: '您还不是纸通宝SAAS的授权客户,无法使用,如有疑问请联系相关客服人员。' }).then(() => { - // }) - // return - // } app.userInfo = result.data app.globalData.token = authorization storage.put('Authorization', app.globalData.token) diff --git a/pages/process/index/index.js b/pages/process/index/index.js index 6e76795..baac2fb 100644 --- a/pages/process/index/index.js +++ b/pages/process/index/index.js @@ -53,6 +53,11 @@ Component({ } }, orderList: function (e) { + // if(!app.userInfo.isSaasPerssion){ + // Dialog.alert({ title: '温馨提示', message: '您还不是纸通宝SAAS的授权客户,无法使用,如有疑问请联系相关客服人员。' }).then(() => { + // }) + // return + // } if(app.userInfo.applicationStatus == 0){ Dialog.alert({ title: '温馨提示', message: '您的申请还在审核中,如有疑问请联系管理员。' }).then(() => { }) diff --git a/pages/process/order-price/index.js b/pages/process/order-price/index.js index 16b6947..9bf72d7 100644 --- a/pages/process/order-price/index.js +++ b/pages/process/order-price/index.js @@ -62,7 +62,7 @@ Page({ this.data.nowItem = this.data.paperList[detail.index] this.data.form.productId = this.data.nowItem.id var unitPrice = this.data.nowItem.defaultUnitPrice - this.setData({ visible: false, ['form.productCategoryName']: detail.value, ['form.unitPrice']: unitPrice }) + this.setData({ visible: false, ['form.productName']: detail.value, ['form.unitPrice']: unitPrice }) }, onHide: function(){ this.setData({ visible: false }) diff --git a/pages/process/order-price/index.wxml b/pages/process/order-price/index.wxml index 8d479f9..cc7cba5 100644 --- a/pages/process/order-price/index.wxml +++ b/pages/process/order-price/index.wxml @@ -23,7 +23,7 @@ 废纸品类 * - {{form.productCategoryName || '请选择废纸品类'}} + {{form.productName || '请选择废纸品类'}} diff --git a/pages/process/payment/index.wxml b/pages/process/payment/index.wxml index 594c9f9..594385b 100644 --- a/pages/process/payment/index.wxml +++ b/pages/process/payment/index.wxml @@ -35,7 +35,7 @@ 2021年2月22日 - 废纸品类:{{item.productCategoryName}} + 废纸品类:{{item.productName}} 金额:{{formate.formateAmount(item.settlePrice)}}元