From 9ce116795724c40d258fb07683b578130380a2ea Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Fri, 22 Jan 2021 19:55:19 +0800 Subject: [PATCH 1/5] no message --- app.js | 2 +- pages/api/payment.js | 2 +- pages/api/user.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app.js b/app.js index 4762153..749ea78 100644 --- a/app.js +++ b/app.js @@ -1,7 +1,7 @@ //app.js App({ //----------------------------------------------globalData-------------------------------------- - release: 0, + release: 1, tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'], agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'], version: 152, diff --git a/pages/api/payment.js b/pages/api/payment.js index c7010cf..279b44e 100644 --- a/pages/api/payment.js +++ b/pages/api/payment.js @@ -5,7 +5,7 @@ import { mGet, mPost } from "./request" const app = getApp() const pconfig = { - baseUrl: app.release ? `http://api-client-ztb.qniao.cn` : `http://47.113.118.47:9000` + baseUrl: app.release ? `http://api-client-psc.qniao.cn` : `http://47.113.118.47:9000` } // *******************************************************账户业务*********************************************************** const getBankcardInfo = (cardNo) => mGet(`/payment-settlement-center/bankcard/bankcard/home/${cardNo}`, null, pconfig) diff --git a/pages/api/user.js b/pages/api/user.js index 9597233..4720784 100644 --- a/pages/api/user.js +++ b/pages/api/user.js @@ -11,7 +11,7 @@ const storage = require('../../utils/storage') const app = getApp() const config = { - baseUrl: app.release ? 'https://uec.qniao.cn' : 'https://uec-dev.qniao.cn' + baseUrl: app.release ? 'https://api-client-uec.qniao.cn' : 'https:/api-client-uec-dev.qniao.cn' } const wechatApplet = (params) => mPost('/uec/get/wechat-applet-session', params, config) const loginCaptcha = (params) => mPost(`/uec/authorize/by-captcha`, params, config) From 7806c84e18638e1c3f7df8735ee9b3ace2b4b9f8 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Sat, 23 Jan 2021 18:05:11 +0800 Subject: [PATCH 2/5] no message --- pages/api/saas.js | 2 +- pages/index/index.js | 35 ++++++++++++----- pages/login/index.js | 62 ++++++++++++++++++++++-------- pages/withdrawal/checkout/index.js | 2 +- 4 files changed, 73 insertions(+), 28 deletions(-) diff --git a/pages/api/saas.js b/pages/api/saas.js index f73979b..ae12051 100644 --- a/pages/api/saas.js +++ b/pages/api/saas.js @@ -28,7 +28,7 @@ const getReceiveInfo = (id) => mGet(`/saas-trade/receive/v150/${id}`, null, scon const feedbackReceiveInfo = (params) => mPut(`/saas-trade/receive/feedback`, params, sconfig) const deleteReceive = (id) => mDelete(`/saas-trade/receive/v150/${id}`, null, sconfig) const getCancelReceive = (id) => mGet(`/saas-trade/receive/v150/cancel/${id}`, null, sconfig) -const putReceive = (id) => mPut(`/saas-trade/receive/v150/cancel/${id}`, null, sconfig) +const putReceive = (id) => mPut(`/saas-trade/receive/v150/${id}`, null, sconfig) const updateUserInfo = (params) => mPut(`/saas-user/user/updateUserInfo`, params, sconfig) const getTrades = (params) => mGet(`/trades`, params, sconfig) const personalAuth = (params) => mPost(`/user-centre/front/customer/personalAuth`, params, sconfig) diff --git a/pages/index/index.js b/pages/index/index.js index 29ccf15..fa88ead 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -119,13 +119,13 @@ Page({ zconfig.header = { 'Authorization': 'QNT ' + result.data.token } pconfig.header = { 'Authorization': 'QNT ' + result.data.token } mconfig.header = { 'Authorization': 'QNT ' + result.data.token } + // 登录流程完成； + if(!util.isEmpty(result.data.userToken)){ + this.handleUserToken(result.data.userToken) + return + } getBaseInfo().then(result => { app.globalData.userInfo = result.data - // 登录流程完成； - if(!util.isEmpty(result.data.userToken)){ - this.handleUserToken(result.data.userToken) - return - } wx.hideLoading() this.defaultIndex() }).catch(err => { @@ -140,11 +140,24 @@ Page({ handleUserToken: function(userToken){ sconfig.header = {'user-token': userToken } getOrderExists().then(result => { - wx.hideLoading() if (Number(result.data) != 1 || !app.release) { - wx.navigateBack() + getBaseInfo().then(result => { + app.globalData.userInfo = result.data + wx.hideLoading() + this.defaultIndex() + }).catch(err => { + wx.hideLoading() + this.defaultIndex() + }) } else { - wx.reLaunch({ url: '/pages/paper/index' }) + getBaseInfo().then(result => { + app.globalData.userInfo = result.data + wx.hideLoading() + wx.redirectTo({ url: '/pages/paper/index' }) + }).catch(err => { + wx.hideLoading() + wx.redirectTo({ url: '/pages/paper/index' }) + }) } }).catch(err => { wx.hideLoading() @@ -173,9 +186,11 @@ Page({ } }, onEvent: function (message) { - if(message.what == 250){ + if(message.what == 250){ this.setData({ pageIndex: 0 }) - } + } else if(message.what == 884){ + wx.navigateBack() + } }, stopTouchMove: function(e){ return false diff --git a/pages/login/index.js b/pages/login/index.js index 8168428..ed5ba41 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -61,24 +61,28 @@ Page({ pconfig.header = { 'Authorization': 'QNT ' + result.data.token } mconfig.header = { 'Authorization': 'QNT ' + result.data.token } // 登录流程完成； - getBaseInfo().then(result => { - app.globalData.userInfo = result.data - if(!util.isEmpty(result.data.userToken)){ - this.handleUserToken(result.data.userToken) - } else { + if(!util.isEmpty(result.data.userToken)){ + this.handleUserToken(result.data.userToken) + } else { + this.setData({ loging: false}) + wx.hideLoading() + wx.navigateBack() + event.emit('EventMessage', { what: 888, desc: 'Logined' }) + getBaseInfo().then(result => { + app.globalData.userInfo = result.data this.setData({ loging: false}) wx.hideLoading() wx.navigateBack() event.emit('EventMessage', { what: 888, desc: 'Logined' }) - } - }).catch(err => { - wx.hideLoading() - 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}) + }) + } }).catch(err => { wx.hideLoading() util.showToast(err) @@ -94,9 +98,35 @@ Page({ getOrderExists().then(result => { wx.hideLoading() if (Number(result.data) != 1 || !app.release) { - wx.navigateBack() + getBaseInfo().then(result => { + app.globalData.userInfo = result.data + this.setData({ loging: false}) + wx.hideLoading() + wx.navigateBack() + event.emit('EventMessage', { what: 888, desc: 'Logined' }) + }).catch(err => { + wx.hideLoading() + util.showToast(err) + app.globalData.token = null + storage.remove('Authorization') + config.header = null + this.setData({ loging: false}) + }) } else { - wx.reLaunch({ url: '/pages/paper/index' }) + getBaseInfo().then(result => { + app.globalData.userInfo = result.data + this.setData({ loging: false}) + wx.hideLoading() + event.emit('EventMessage', { what: 884, desc: 'Logined' }) + wx.redirectTo({ url: '/pages/paper/index' }) + }).catch(err => { + wx.hideLoading() + util.showToast(err) + app.globalData.token = null + storage.remove('Authorization') + config.header = null + this.setData({ loging: false}) + }) } }).catch(err => { wx.hideLoading() diff --git a/pages/withdrawal/checkout/index.js b/pages/withdrawal/checkout/index.js index cb12545..ef07fdc 100644 --- a/pages/withdrawal/checkout/index.js +++ b/pages/withdrawal/checkout/index.js @@ -1,5 +1,5 @@ // pages/withdrawal/checkout/index.js -import { checkPayPassword, getBalanceInfo, getBankCardList, postWithdraw } from "../../api/payment" +import { checkPayPassword, getBalanceInfo, getBankCardList, postWithdraw } from "../../api/saas" import { $wuxKeyBoard, $wuxDialog } from '../../../components/index' const util = require('../../../utils/util') // const md5 = require('../../../utils/md5') From 820dbbe7e1d607b00bee140bba337d6c9063dee6 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Mon, 25 Jan 2021 11:32:38 +0800 Subject: [PATCH 3/5] no message --- pages/api/moment.js | 2 +- pages/api/payment.js | 2 +- pages/api/saas.js | 2 +- pages/api/user.js | 2 +- pages/api/ztb.js | 2 +- pages/home/pindex/index.js | 59 ++++++++++++++++++++++++++++++++++++ pages/home/pindex/index.wxml | 17 +++++------ pages/index/index.js | 5 +++ pages/order/index/index.js | 20 ++++++------ pages/order/index/index.wxml | 2 +- pages/paper/index.json | 1 - 11 files changed, 87 insertions(+), 27 deletions(-) diff --git a/pages/api/moment.js b/pages/api/moment.js index 3dcd048..dfa99fc 100644 --- a/pages/api/moment.js +++ b/pages/api/moment.js @@ -5,7 +5,7 @@ import { mGet, mPost } from "./request" const app = getApp() const mconfig = { - baseUrl: app.release ? `https://api-client-ztb.qniao.cn` : `http://47.113.118.47:9000` + baseUrl: app.release ? `https://api-client-ztb.qniao.cn` : `https://api-client-ztb-test.qniao.cn` } // *******************************************************************账户业务*********************************************************** // /article/save/Article 发文章 diff --git a/pages/api/payment.js b/pages/api/payment.js index 279b44e..b194cb2 100644 --- a/pages/api/payment.js +++ b/pages/api/payment.js @@ -5,7 +5,7 @@ import { mGet, mPost } from "./request" const app = getApp() const pconfig = { - baseUrl: app.release ? `http://api-client-psc.qniao.cn` : `http://47.113.118.47:9000` + baseUrl: app.release ? `http://api-client-psc.qniao.cn` : `http://api-client-psc-test.qniao.cn` } // *******************************************************账户业务*********************************************************** const getBankcardInfo = (cardNo) => mGet(`/payment-settlement-center/bankcard/bankcard/home/${cardNo}`, null, pconfig) diff --git a/pages/api/saas.js b/pages/api/saas.js index ae12051..973d064 100644 --- a/pages/api/saas.js +++ b/pages/api/saas.js @@ -5,7 +5,7 @@ import { mGet, mPost, mDelete, mPut } from "./request" const app = getApp() const sconfig = { - baseUrl: app.release ? `https://api-client-ztb.qniao.cn` : `http://47.113.118.47:9000` + baseUrl: app.release ? `https://api-client-ztb.qniao.cn` : `https://api-client-ztb-test.qniao.cn` } // *******************************************************************账户业务*********************************************************** const getOrderExists = () => mGet(`/saas-trade/receive/v150/get/OrderExists`, null, sconfig) diff --git a/pages/api/user.js b/pages/api/user.js index 4720784..8aad74e 100644 --- a/pages/api/user.js +++ b/pages/api/user.js @@ -11,7 +11,7 @@ const storage = require('../../utils/storage') const app = getApp() const config = { - baseUrl: app.release ? 'https://api-client-uec.qniao.cn' : 'https:/api-client-uec-dev.qniao.cn' + baseUrl: app.release ? 'https://api-client-uec.qniao.cn' : 'https:/api-client-uec-test.qniao.cn' } const wechatApplet = (params) => mPost('/uec/get/wechat-applet-session', params, config) const loginCaptcha = (params) => mPost(`/uec/authorize/by-captcha`, params, config) diff --git a/pages/api/ztb.js b/pages/api/ztb.js index 9d3c3af..062e723 100644 --- a/pages/api/ztb.js +++ b/pages/api/ztb.js @@ -5,7 +5,7 @@ import { mGet, mPost } from "./request" const app = getApp() const zconfig = { - baseUrl: app.release ? `https://api-client-ztb.qniao.cn` : `http://47.113.118.47:9000` + baseUrl: app.release ? `https://api-client-ztb.qniao.cn` : `https://api-client-ztb-test.qniao.cn` } // *******************************************************************账户业务*********************************************************** // /authorize/get/product-line-token/by/login-token通过登录token获取产品线token diff --git a/pages/home/pindex/index.js b/pages/home/pindex/index.js index 29f19cb..c9b5b72 100644 --- a/pages/home/pindex/index.js +++ b/pages/home/pindex/index.js @@ -2,6 +2,7 @@ import { getBaseInfo, getBalanceInfo } from "../../api/saas" const util = require('../../../utils/util') const math = require('../../../utils/math') +const event = require('../../../utils/event') const app = getApp() Component({ @@ -9,6 +10,15 @@ Component({ addGlobalClass: true, multipleSlots: true }, + lifetimes: { + // 生命周期函数，可以为函数，或一个在methods段中定义的方法名 + attached: function () { + event.on('EventMessage', this, this.onEvent) + }, + detached: function () { + event.remove('EventMessage', this) + } + }, /** * 页面的初始数据 */ @@ -16,6 +26,7 @@ Component({ firstShow: false, token: app.globalData.token, userInfo: null, + userName: null, avatarUrl: null, accountMoney: 0 }, @@ -25,6 +36,9 @@ Component({ this.data.firstShow = true }, fetchUserInfo: function () { + if(!app.globalData.userInfo){ + return + } getBaseInfo().then(result => { app.globalData.userInfo = result.data this.setData({ @@ -39,10 +53,23 @@ Component({ }).catch(err => { }) }, + onEvent: function (message) { + if (message.what == 888) { + this.setData({ userInfo: app.globalData.userInfo, accountMoney: 0, avatarUrl: '/assets/image/ygImg.png', userName: null }) + } + }, checkout: function () { + if(!app.globalData.userInfo){ + wx.navigateTo({ url: '/pages/login/index' }) + return + } wx.navigateTo({ url: '/pages/withdrawal/checkout/index' }) }, toUserInfo: function () { + if(!app.globalData.userInfo){ + wx.navigateTo({ url: '/pages/login/index' }) + return + } if(app.globalData.userInfo.isAuth != 1 && app.globalData.userInfo.userType == 1){ wx.navigateTo({ url: '/pages/home/pauthory/index' }) } else { @@ -50,11 +77,43 @@ Component({ } }, toAuthor: function () { + if(!app.globalData.userInfo){ + wx.navigateTo({ url: '/pages/login/index' }) + return + } if(app.globalData.userInfo.isAuth != 1 && app.globalData.userInfo.userType == 1){ wx.navigateTo({ url: '/pages/home/pauthory/index' }) } else { wx.navigateTo({ url: '/pages/home/pinfo/index' }) } + }, + toBankCard: function () { + if(!app.globalData.userInfo){ + wx.navigateTo({ url: '/pages/login/index' }) + return + } + wx.navigateTo({ url: '/pages/bank/index/index' }) + }, + toWithdrawal: function () { + if(!app.globalData.userInfo){ + wx.navigateTo({ url: '/pages/login/index' }) + return + } + wx.navigateTo({ url: '/pages/withdrawal/index/index' }) + }, + toBalance: function () { + if(!app.globalData.userInfo){ + wx.navigateTo({ url: '/pages/login/index' }) + return + } + wx.navigateTo({ url: '/pages/balance/index/index' }) + }, + toSetting: function () { + if(!app.globalData.userInfo){ + wx.navigateTo({ url: '/pages/login/index' }) + return + } + wx.navigateTo({ url: '/pages/home/setting/index' }) } } }) \ No newline at end of file diff --git a/pages/home/pindex/index.wxml b/pages/home/pindex/index.wxml index ee58d35..9ff802f 100644 --- a/pages/home/pindex/index.wxml +++ b/pages/home/pindex/index.wxml @@ -3,14 +3,14 @@ 我的 - + - {{userName || ''}} + {{userName || '您还没有登录，去登录'}} - + {{userInfo.isAuth == 1 ? '已认证' : '未实名认证'}} 去认证 @@ -33,13 +33,13 @@ - + - + - + @@ -48,10 +48,7 @@ - + - \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index fa88ead..09cbe2b 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -39,6 +39,7 @@ Page({ this.data.path += '?' + options.key + '=' + options.value } } + event.on('EventMessage', this, this.onEvent) }, onReady: function () { wx.showLoading({ title: '获取中', mask: true }) @@ -189,6 +190,7 @@ Page({ if(message.what == 250){ this.setData({ pageIndex: 0 }) } else if(message.what == 884){ + console.log('navigateBack>>') wx.navigateBack() } }, @@ -216,5 +218,8 @@ Page({ return } util.navigateTarget(this.data.landInfo.ruleRedirectInfo) + }, + onUnload: function(){ + event.remove('EventMessage', this) } }) diff --git a/pages/order/index/index.js b/pages/order/index/index.js index 58c9961..ba2a7de 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -42,7 +42,7 @@ Component({ methods: { onRestart: function () { if (!this.data.firstShow) { - this.setData({ height: app.globalData.fragmentHeight - 100 }) + this.setData({userInfo: app.globalData.userInfo, height: app.globalData.fragmentHeight - 100 }) this.fetchOrderList() } this.data.firstShow = true @@ -50,6 +50,9 @@ Component({ onEvent: function (message) { if (message.what == 13) { this.onRefreshList() + } else if (message.what == 888) { + this.setData({ + userInfo: app.globalData.userInfo, orderList: [], loading: false }) } }, onRefreshList: function () { @@ -63,6 +66,10 @@ Component({ this.fetchOrderList() }, fetchOrderList: function () { + if (!app.globalData.userInfo) { + this.setData({ requesting: false, loading: false }) + return + } if (this.data.requesting || this.data.finished) { return } @@ -86,18 +93,11 @@ Component({ loading: false }) } else { - this.setData({ - finished: true, - requesting: false, - loading: false - }) + this.setData({ finished: true, requesting: false, loading: false }) } }).catch(err => { //异常回调 - this.setData({ - requesting: false, - loading: false - }) + this.setData({ requesting: false, loading: false }) util.showToast(err) }) }, diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml index 9aae9d7..57bf99d 100644 --- a/pages/order/index/index.wxml +++ b/pages/order/index/index.wxml @@ -19,7 +19,7 @@ diff --git a/pages/paper/index.json b/pages/paper/index.json index 9dbaf14..6c9bcb1 100644 --- a/pages/paper/index.json +++ b/pages/paper/index.json @@ -1,7 +1,6 @@ { "disableScroll": true, "usingComponents": { - "message": "/pages/message/index", "order": "/pages/order/index/index", "home": "/pages/home/pindex/index" } From 8b3e4be90b5fa5ff3606c8b1919dc12d296abc77 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Mon, 25 Jan 2021 15:37:37 +0800 Subject: [PATCH 4/5] no message --- pages/api/payment.js | 2 +- project.config.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/api/payment.js b/pages/api/payment.js index b194cb2..a647b49 100644 --- a/pages/api/payment.js +++ b/pages/api/payment.js @@ -5,7 +5,7 @@ import { mGet, mPost } from "./request" const app = getApp() const pconfig = { - baseUrl: app.release ? `http://api-client-psc.qniao.cn` : `http://api-client-psc-test.qniao.cn` + baseUrl: app.release ? `https://api-client-psc.qniao.cn` : `https://api-client-psc-test.qniao.cn` } // *******************************************************账户业务*********************************************************** const getBankcardInfo = (cardNo) => mGet(`/payment-settlement-center/bankcard/bankcard/home/${cardNo}`, null, pconfig) diff --git a/project.config.json b/project.config.json index 15b7d85..9aab4b0 100644 --- a/project.config.json +++ b/project.config.json @@ -4,7 +4,7 @@ "ignore": [] }, "setting": { - "urlCheck": false, + "urlCheck": true, "es6": true, "enhance": true, "postcss": true, @@ -23,6 +23,7 @@ "compileHotReLoad": false, "useMultiFrameRuntime": true, "useApiHook": true, + "useApiHostProcess": true, "babelSetting": { "ignore": [], "disablePlugins": [], @@ -36,8 +37,7 @@ "userConfirmedBundleSwitch": false, "packNpmManually": false, "packNpmRelationList": [], - "minifyWXSS": true, - "useApiHostProcess": true + "minifyWXSS": true }, "compileType": "miniprogram", "libVersion": "2.14.4", From 845f94dc8aa3bee42b47a957263d1aac0f944efa Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Mon, 25 Jan 2021 16:50:56 +0800 Subject: [PATCH 5/5] no message --- pages/bank/create/index.js | 7 ++++++- pages/bank/create/index.wxml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pages/bank/create/index.js b/pages/bank/create/index.js index 39fe667..f9ba403 100644 --- a/pages/bank/create/index.js +++ b/pages/bank/create/index.js @@ -62,7 +62,7 @@ Page({ } } else if (e.target.id == 'cardNo' && !util.isEmpty(e.detail.value)) { if (!util.isEmpty(e.detail.value)) { - this.checkCardNo(e.detail.value) + this.data.form.cardNo = e.detail.value } } }, @@ -95,6 +95,10 @@ Page({ return '' }, fetchCode: function () { + if (util.isEmpty(this.data.bankName) && !util.isEmpty(this.data.form.cardNo)) { + this.checkCardNo(this.data.form.cardNo) + return + } if (util.isEmpty(this.data.form.name)) { util.showToast('请输入持卡人姓名') return @@ -138,6 +142,7 @@ Page({ }) }, submitForm: function(){ + if (util.isEmpty(this.data.form.name)) { util.showToast('请输入持卡人姓名') return diff --git a/pages/bank/create/index.wxml b/pages/bank/create/index.wxml index b2c55df..41a50bb 100644 --- a/pages/bank/create/index.wxml +++ b/pages/bank/create/index.wxml @@ -17,7 +17,7 @@ 银行卡卡号： - +