From 3b5feb8a30e65796534b5bd7ad59e8ebb5eb30f7 Mon Sep 17 00:00:00 2001 From: "DESKTOP-A1SENDA\\HUzy" <472860318@qq.com> Date: Fri, 28 May 2021 11:41:53 +0800 Subject: [PATCH] =?UTF-8?q?--=E5=BD=93=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=8F=AF=E5=8C=BA=E5=88=86=E5=87=BA=E6=98=AF?= =?UTF-8?q?=E5=93=AA=E4=B8=AA=E4=B8=9A=E5=8A=A1=E4=BA=BA=E5=91=98=E5=BC=95?= =?UTF-8?q?=E6=B5=81--?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/agent/agent-item/index.wxml | 2 +- pages/agent/factory/index.wxml | 2 +- pages/home/info/index.js | 21 +++++++++++- pages/home/info/index.wxml | 1 + pages/home/setting/index.js | 53 +++++++++++++++++++++++++++++-- pages/home/setting/index.wxml | 4 +++ pages/home/tab1/index.js | 47 +++++++++++++++++++++++++-- pages/home/tab1/index.json | 4 ++- pages/home/tab1/index.wxml | 3 +- 9 files changed, 128 insertions(+), 9 deletions(-) diff --git a/pages/agent/agent-item/index.wxml b/pages/agent/agent-item/index.wxml index 7fbab19..6a95153 100644 --- a/pages/agent/agent-item/index.wxml +++ b/pages/agent/agent-item/index.wxml @@ -23,7 +23,7 @@ 纸厂账期： - {{item.foreignPaybackIntervalString}}天 + {{item.foreignPaybackIntervalString}} diff --git a/pages/agent/factory/index.wxml b/pages/agent/factory/index.wxml index eff42df..b6057d8 100644 --- a/pages/agent/factory/index.wxml +++ b/pages/agent/factory/index.wxml @@ -29,7 +29,7 @@ 纸厂账期： - {{factoryDetail.foreignPaybackIntervalString}}天 + {{factoryDetail.foreignPaybackIntervalString}} diff --git a/pages/home/info/index.js b/pages/home/info/index.js index 36a1691..ba32d49 100644 --- a/pages/home/info/index.js +++ b/pages/home/info/index.js @@ -1,7 +1,8 @@ import { zconfig, getBaseInfo, - updateUserInfoZtb + updateUserInfoZtb, + postRelation } from '../../api/ztb' import { updateUserInfo @@ -102,6 +103,8 @@ Page({ companyAddress: res.data.fullAddress, userType: res.data.userType, realName: res.data.realName || res.data.userName, + bizUserId:res.data.bizUserId, + bizUserName:res.data.bizUserName, }) }) this.cascaderView = this.cascaderView || this.selectComponent('#wux-cascader') @@ -158,6 +161,9 @@ Page({ } else if (e1.currentTarget.dataset.tag == '昵称') { placeholderName = that.data.userInfo.nickname } + else if (e1.currentTarget.dataset.tag == '业务人员邀请码') { + placeholderName = that.data.userInfo.bizUserId + } this.wuxDialog.prompt({ resetOnClose: true, title: e1.currentTarget.dataset.tag, @@ -174,6 +180,19 @@ Page({ packageFactoryName: response }) } else + if (e1.currentTarget.dataset.tag == '业务人员邀请码') { + // that.updateUserInfoFct({ + // bizUserId: response + // }) + postRelation(response).then(result => { + //成功回调 + wx.hideLoading() + }).catch(err => { + //异常回调 + wx.hideLoading() + util.showToast(err) + }) + } else if (e1.currentTarget.dataset.tag == '打包站占地面积') { if (parseInt(response)>0 && parseInt(response)==Number(response)) { that.updateUserInfoFct({ diff --git a/pages/home/info/index.wxml b/pages/home/info/index.wxml index e941433..d7753fe 100644 --- a/pages/home/info/index.wxml +++ b/pages/home/info/index.wxml @@ -68,6 +68,7 @@ 企业信息 + diff --git a/pages/home/setting/index.js b/pages/home/setting/index.js index 4adbe1f..fbdc9f8 100644 --- a/pages/home/setting/index.js +++ b/pages/home/setting/index.js @@ -1,8 +1,13 @@ // pages/home/setting/index.js import { finalizeToken } from "../../api/user" import { $wuxDialog } from '../../../components/index' +import { + postRelation, + getBaseInfo +} from '../../api/ztb' const event = require('../../../utils/event') const storage = require('../../../utils/storage') +const util = require('../../../utils/util') const app = getApp() Page({ @@ -12,13 +17,24 @@ Page({ */ data: { kg: app.globalData.kg, - version: 2 + version: 2, + userInfo: { + bizUserId:null, + bizUserName:null + }, }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { + getBaseInfo().then(res => { + this.setData({ + userInfo: res.data, + bizUserId:res.data.bizUserId, + bizUserName:res.data.bizUserName, + }) + }) var pages = getCurrentPages() for (let index = 0; index < pages.length; index++) { const element = pages[index] @@ -62,5 +78,38 @@ Page({ } }] }) - } + }, + showDialog: function (e1) { + this.wuxDialog = this.wuxDialog || this.selectComponent('#wux-dialog') + var that = this + var placeholderName = '' + if (e1.currentTarget.dataset.tag == '业务人员邀请码') { + placeholderName = that.data.userInfo.bizUserId + } + this.wuxDialog.prompt({ + resetOnClose: true, + title: e1.currentTarget.dataset.tag, + placeholder: placeholderName || '请输入' + e1.currentTarget.dataset.tag, + maxlength: 18, + onConfirm(e, response) { + if (util.isEmpty(response)) { + util.showToast('请输入' + e1.currentTarget.dataset.tag) + return + } + if (e1.currentTarget.dataset.tag == '业务人员邀请码') { + postRelation(response).then(result => { + //成功回调 + wx.hideLoading() + }).catch(err => { + //异常回调 + wx.hideLoading() + util.showToast(err) + }) + } + + }, + }) + + + }, }) \ No newline at end of file diff --git a/pages/home/setting/index.wxml b/pages/home/setting/index.wxml index 108341f..46b3baf 100644 --- a/pages/home/setting/index.wxml +++ b/pages/home/setting/index.wxml @@ -40,6 +40,10 @@ + + 业务人员邀请码 + {{userInfo.bizUserName || '点击填写业务人员邀请码'}} + diff --git a/pages/home/tab1/index.js b/pages/home/tab1/index.js index 16d77e3..e50111d 100644 --- a/pages/home/tab1/index.js +++ b/pages/home/tab1/index.js @@ -1,9 +1,14 @@ // pages/home/tab1/index.js import { updateUserInfo, - getBaseInfo + getBaseInfo, + postRelation } from '../../api/ztb' const storage = require('../../../utils/storage') +const util = require('../../../utils/util') +const math = require('../../../utils/math') +const event = require('../../../utils/event.js') +const app = getApp() Page({ /** @@ -19,7 +24,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - this.getUerInfoFct() + this.getUerInfoFct() }, toNextTab: function () { wx.navigateTo({ @@ -129,6 +134,9 @@ Page({ }, getUerInfoFct: function () { getBaseInfo().then(res => { + if(res.data.hasShowedLoginTag==false){ + this.showDialog() + } if (res.data.identityTag == '打包站') { this.setData({ bidType: 1 @@ -153,5 +161,40 @@ Page({ } }) }, + showDialog: function(){ + this.wuxDialog = this.wuxDialog || this.selectComponent('#wux-dialog') + var that = this + this.wuxDialog.prompt({ + resetOnClose: false, + maskClosable: false, + title: '邀请码', + // content: '联系相关业务人员获取邀请码', + placeholder: '填写业务人员邀请码(必填)', + maxlength: 6, + onConfirm(e, response) { + if(util.isEmpty(response)){ + util.showToast('请输入邀请码') + that.showDialog() + return + } + that.bindRelation(response) + }, + onCancel(){ + + } + }) + }, + bindRelation: function(code){ + wx.showLoading({ title: '处理中', mask: true }) + postRelation(code).then(result => { + //成功回调 + wx.hideLoading() + }).catch(err => { + //异常回调 + wx.hideLoading() + util.showToast(err) + this.showDialog() + }) + }, }) \ No newline at end of file diff --git a/pages/home/tab1/index.json b/pages/home/tab1/index.json index 8835af0..ff98b1d 100644 --- a/pages/home/tab1/index.json +++ b/pages/home/tab1/index.json @@ -1,3 +1,5 @@ { - "usingComponents": {} + "usingComponents": { + "wux-dialog": "/components/dialog/index" + } } \ No newline at end of file diff --git a/pages/home/tab1/index.wxml b/pages/home/tab1/index.wxml index 011360e..8bd2724 100644 --- a/pages/home/tab1/index.wxml +++ b/pages/home/tab1/index.wxml @@ -59,4 +59,5 @@ - \ No newline at end of file + + \ No newline at end of file