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" }