From 2a16283c3a6e17e72cd09e8c5a4aa30afa0b82c6 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Tue, 12 Jan 2021 17:10:10 +0800 Subject: [PATCH] no message --- pages/agent/index/index.js | 6 +++--- pages/api/moment.js | 8 ++++---- pages/api/request.js | 5 +++-- pages/api/ztb.js | 13 +++++++++++-- pages/article/article-item/index.js | 4 ++-- pages/article/detail/index.js | 14 +++++++------- pages/article/detail/index.wxml | 2 +- pages/article/factory/index.js | 4 ++-- pages/article/hot-index/index.js | 6 ++++-- pages/article/index/index.js | 1 - pages/article/point-index/index.js | 4 ++-- pages/article/price-detail/index.js | 4 ++-- pages/article/price-index/index.js | 4 ++-- pages/article/queue-index/index.js | 4 ++-- pages/index/index.js | 21 +++++++++++---------- pages/login/index.js | 4 ++-- pages/mall/index/index.js | 3 ++- utils/request.js | 2 +- 18 files changed, 61 insertions(+), 48 deletions(-) diff --git a/pages/agent/index/index.js b/pages/agent/index/index.js index 21d1eeb..7b22c9f 100644 --- a/pages/agent/index/index.js +++ b/pages/agent/index/index.js @@ -1,5 +1,5 @@ // pages/agent/index/index.js -const request = require('../../../utils/request') //导入模块 +import { getFactoryPrice, getFactoryCity } from "../../api/ztb" const app = getApp() Page({ @@ -34,7 +34,7 @@ Page({ this.fetchPapersList() }, fetchRegionList: function(){ - request.get('/recycle-service/get/paper-mill-city').then(result => { + getFactoryCity().then(result => { //成功回调 this.data.cateList = [{cityId: '', cityName: '全部'}].concat(result.data) for (let index = 0; index < this.data.cateList.length; index++) { @@ -72,7 +72,7 @@ Page({ } else { this.setData({ requesting: true }) } - request.get('/recycle-service/get/paper-mill-paper-category-price-list', this.data.form).then(result => { + getFactoryPrice(this.data.form).then(result => { //成功回调 if (result.data.records.length) { var respList = result.data.records diff --git a/pages/api/moment.js b/pages/api/moment.js index 2b01a5b..ae97bf3 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://psc.qniao.cn` : `http://psc-dev.qniao.cn` + baseUrl: app.release ? `https://api-client-ztb.qniao.cn` : `https://api-client-ztb-dev.qniao.cn` } // *******************************************************************账户业务*********************************************************** // /article/save/Article 发文章 @@ -13,7 +13,7 @@ const postMoment = (params) => mPost(`/information-center/article/save/Article`, // /article/update/Article/{id} 编辑文章 const updateMoment = (id, params) => mPost(`/information-center/article/update/Article/${id}`, params, mconfig) // /article/get/Article-list/文章列表 -const getPreferList = (params) => mGet(`/information-center/article/get/Article-list`, params, mconfig) +const getPreferList = (params) => mGet(`/information-center/article/get/Article-list/`, params, mconfig) // /article/get/Article-view-list 浏览文章历史列表 const getViewedList = (params) => mGet(`/information-center/article/get/Article-view-list`, params, mconfig) // /article/delete/Article删除文章 @@ -21,11 +21,11 @@ const deleteMoment = (params) => mPost(`/information-center/article/delete/Artic // /article/get/my-Article-list 我的文章列表 const getMyList = (params) => mGet(`/information-center/article/get/my-Article-list`, params, mconfig) // /article/get/Article-detail/{id} 文章详情 -const getMomentDetail = (id) => mGet(`/information-center/article/get/Article-detail/${id}`, params, mconfig) +const getMomentDetail = (id) => mGet(`/information-center/article/get/Article-detail/${id}`, null, mconfig) // /article-reply/get/my-reply-list 我的评论列表 const getReplyList = (params) => mGet(`/information-center/article-reply/get/my-reply-list`, params, mconfig) // /article-reply/get/reply-list/in/{articleId} 帖子评论列表 -const getCommentList = (id) => mGet(`/information-center/article-reply/get/reply-list/in/${id}`, params, mconfig) +const getCommentList = (id, params) => mGet(`/information-center/article-reply/get/reply-list/in/${id}`, params, mconfig) // /article-reply/like-or-cancel/article 点赞文章 const likeMoment = (params) => mPost(`/information-center/article-reply/like-or-cancel/article`, params, mconfig) // /article-reply/like-or-cancel/reply 点赞评论 diff --git a/pages/api/request.js b/pages/api/request.js index ce3a5d6..f77e51c 100644 --- a/pages/api/request.js +++ b/pages/api/request.js @@ -96,8 +96,9 @@ function handleResult(result) { if (result.code === 401) { app.globalData.token = null app.globalData.userToken = null + app.globalData.userInfo = null wx.removeStorageSync('Authorization') - event.emit('EventMessage', { what: 666, desc: 'Logout' }) + event.emit('EventMessage', { what: 888, desc: 'Logout' }) let pages = getCurrentPages() //当前页面栈 let prevPage = pages[pages.length - 1] //当前页面 if (prevPage.route != 'pages/login/index') { @@ -107,7 +108,7 @@ function handleResult(result) { showCancel: false, success: function (res) { if (res.confirm) { - wx.reLaunch({ url: '/pages/login/index' }) + wx.navigateTo({ url: '/pages/login/index' }) } } }) diff --git a/pages/api/ztb.js b/pages/api/ztb.js index 6c91d26..bc024df 100644 --- a/pages/api/ztb.js +++ b/pages/api/ztb.js @@ -11,10 +11,19 @@ const zconfig = { // /authorize/get/product-line-token/by/login-token通过登录token获取产品线token const loginToken = (params) => mPost(`/recycle-user-center/authorize/get/product-line-token/by/login-token`, params, zconfig) ///user/get/base-info基本信息 -const getBaseInfo = () => mGet(`/recycle-user-center/user/get/base-info`, null, zconfig) +const getBaseInfo = () => mGet(`/recycle-service/user/get/base-info`, null, zconfig) +// /get/all-paper-mill 获取全部纸厂列表 +const getAllFactoryList = () => mGet(`/recycle-service/get/all-paper-mill`, null, zconfig) +// /get/paper-mill-paper-category-price-list 获取纸厂品类价格信息列表 +const getFactoryPrice = () => mGet(`/recycle-service/get/paper-mill-paper-category-price-list`, null, zconfig) +// /get/paper-mill-city 获取纸厂所有地区列表 +const getFactoryCity = () => mGet(`/recycle-service/get/paper-mill-city`, null, zconfig) export { zconfig, loginToken, - getBaseInfo + getBaseInfo, + getAllFactoryList, + getFactoryPrice, + getFactoryCity } \ No newline at end of file diff --git a/pages/article/article-item/index.js b/pages/article/article-item/index.js index fc89ab2..cc599e2 100644 --- a/pages/article/article-item/index.js +++ b/pages/article/article-item/index.js @@ -1,5 +1,5 @@ // pages/stock/index.js -const request = require('../../../utils/request') //导入模块 +import { likeMoment } from "../../api/moment" const util = require('../../../utils/util') const app = getApp() @@ -32,7 +32,7 @@ Component({ return } // /article/like-or-cancel/article/{id} - request.post('/information-center/article-reply/like-or-cancel/article', {articleId: this.data.item.id}).then(result => { + likeMoment({articleId: this.data.item.id}).then(result => { this.setData({ ['item.likeQuantity']: result.data.likeQuantity, ['item.isLiked']: 1 }) }).catch(error => { util.showToast(error) diff --git a/pages/article/detail/index.js b/pages/article/detail/index.js index 80cb452..2257204 100644 --- a/pages/article/detail/index.js +++ b/pages/article/detail/index.js @@ -1,4 +1,4 @@ -const request = require('../../../utils/request') //导入模块 +import { getMomentDetail, getCommentList, likeMoment, likeComment, commentMoment } from "../../api/moment" const util = require('../../../utils/util') const app = getApp() // pages/moment/detail/index.js @@ -42,7 +42,7 @@ Page({ this.data.form.articleId = options.id wx.showLoading({ title: '加载中', mask: true }) // /article/get/Article-detail/{id}文章详情 - request.get('/information-center/article/get/Article-detail/' + options.id).then(result => { + getMomentDetail(options.id).then(result => { //成功回调 this.setData({ momentDetail: result.data }) this.fetchCommentList() @@ -68,7 +68,7 @@ Page({ } this.setData({ requesting: true }) // /article-reply/get/reply-list/in/{articleId} 帖子评论列表 - request.get('/information-center/article-reply/get/reply-list/in/' + this.data.id, this.data.form).then(result => { + getCommentList(this.data.id, this.data.form).then(result => { if (result.data.records.length) { var respList = result.data.records let nowList = `commentList[${this.data.commentList.length}]` @@ -139,7 +139,7 @@ Page({ wx.showLoading({ title: '处理中', mask: true }) var form = { content: this.data.comment, articleId: this.data.id} // /article-reply/reply 评论 - request.post('/information-center/article-reply/reply', form).then(result => { + commentMoment(form).then(result => { this.setData({ inputBottom: 0, focus: false, comment: '' }) wx.hideLoading() util.showToast('评论成功') @@ -149,7 +149,7 @@ Page({ util.showToast(error) }) }, - likeComment: function(e){ + postLikeComment: function(e){ if(!app.globalData.userInfo){ wx.navigateTo({ url: '/pages/login/index' }) return @@ -160,7 +160,7 @@ Page({ return } // /article-reply/like-or-cancel/reply 点赞评论 - request.post('/information-center/article-reply/like-or-cancel/reply', {replyId: item.id}).then(result => { + likeComment({replyId: item.id}).then(result => { if(item.isLiked){ this.setData({ ['commentList[' + e.currentTarget.dataset.page + '][' + e.currentTarget.dataset.index + '].likeQuantity']: result.data.likeQuantity, @@ -185,7 +185,7 @@ Page({ util.showToast('请勿重复点赞') return } - request.post('/information-center/article-reply/like-or-cancel/article', {articleId: this.data.id}).then(result => { + likeMoment({articleId: this.data.id}).then(result => { this.setData({ ['momentDetail.likeQuantity']: result.data.likeQuantity, ['momentDetail.isLiked']: 1 diff --git a/pages/article/detail/index.wxml b/pages/article/detail/index.wxml index c868f1f..3ba638d 100644 --- a/pages/article/detail/index.wxml +++ b/pages/article/detail/index.wxml @@ -55,7 +55,7 @@ {{item.replierNickname}} - + {{item.likeQuantity || '赞'}} diff --git a/pages/article/factory/index.js b/pages/article/factory/index.js index 70838c6..51d9d3d 100644 --- a/pages/article/factory/index.js +++ b/pages/article/factory/index.js @@ -1,5 +1,5 @@ // pages/moment/paper/index.js -const request = require('../../../utils/request') //导入模块 +import { getAllFactoryList } from "../../api/ztb" const util = require('../../../utils/util') const storage = require('../../../utils/storage') const event = require('../../../utils/event.js') @@ -33,7 +33,7 @@ Page({ if(options.ids){ this.data.idString = options.ids } - request.get('/recycle-service/get/all-paper-mill').then(result => { + getAllFactoryList().then(result => { //成功回调 if(!util.isEmpty(this.data.recommendedString)){ var that = this diff --git a/pages/article/hot-index/index.js b/pages/article/hot-index/index.js index 08a5b28..ccc4910 100644 --- a/pages/article/hot-index/index.js +++ b/pages/article/hot-index/index.js @@ -1,4 +1,6 @@ // pages/stock/index.js +import { getPreferList } from "../../api/moment" +import { getAllFactoryList } from "../../api/ztb" const request = require('../../../utils/request') //导入模块 const util = require('../../../utils/util') const storage = require('../../../utils/storage') @@ -66,7 +68,7 @@ Component({ } } // /recycle-service/get/paper-mill-list - request.get('/recycle-service/get/all-paper-mill').then(result => { + getAllFactoryList().then(result => { result.data.sort((a, b)=> b.isRecommended - a.isRecommended) this.setData({ factoryList: result.data.slice(0, 8) }) }) @@ -98,7 +100,7 @@ Component({ } this.data.requesting = true // /article/get/article-list 查询文章列表 - request.get('/information-center/article/get/Article-list/', this.data.form).then(result => { + getPreferList(this.data.form).then(result => { //成功回调 if (result.data.records.length) { var respList = result.data.records diff --git a/pages/article/index/index.js b/pages/article/index/index.js index a13a212..fe0579a 100644 --- a/pages/article/index/index.js +++ b/pages/article/index/index.js @@ -1,5 +1,4 @@ // pages/stock/index.js -const request = require('../../../utils/request') //导入模块 const util = require('../../../utils/util') const app = getApp() diff --git a/pages/article/point-index/index.js b/pages/article/point-index/index.js index a7ccf5a..eebf93f 100644 --- a/pages/article/point-index/index.js +++ b/pages/article/point-index/index.js @@ -1,5 +1,5 @@ // pages/stock/index.js -const request = require('../../../utils/request') //导入模块 +import { getPreferList } from "../../api/moment" const event = require('../../../utils/event.js') const app = getApp() @@ -65,7 +65,7 @@ Component({ return } this.data.requesting = true - request.get('/information-center/article/get/Article-list/', this.data.form).then(result => { + getPreferList(this.data.form).then(result => { //成功回调 if (result.data.records.length) { var respList = result.data.records diff --git a/pages/article/price-detail/index.js b/pages/article/price-detail/index.js index c254d3d..e06ab2f 100644 --- a/pages/article/price-detail/index.js +++ b/pages/article/price-detail/index.js @@ -1,5 +1,5 @@ // pages/moment/price/index.js -const request = require('../../../utils/request') //导入模块 +import { getFactoryPrice } from "../../api/ztb" const event = require('../../../utils/event') const storage = require('../../../utils/storage') const app = getApp() @@ -58,7 +58,7 @@ Page({ } else { this.setData({ requesting: true }) } - request.get('/recycle-service/get/paper-mill-paper-category-price-list', this.data.form).then(result => { + getFactoryPrice(this.data.form).then(result => { //成功回调 if (result.data.records.length) { var respList = result.data.records diff --git a/pages/article/price-index/index.js b/pages/article/price-index/index.js index f7777f6..ab166b8 100644 --- a/pages/article/price-index/index.js +++ b/pages/article/price-index/index.js @@ -1,5 +1,5 @@ // pages/stock/index.js -const request = require('../../../utils/request') //导入模块 +import { getPreferList } from "../../api/moment" const event = require('../../../utils/event.js') const app = getApp() @@ -59,7 +59,7 @@ Component({ return } this.data.requesting = true - request.get('/information-center/article/get/Article-list/', this.data.form).then(result => { + getPreferList(this.data.form).then(result => { //成功回调 if (result.data.records.length) { var respList = result.data.records diff --git a/pages/article/queue-index/index.js b/pages/article/queue-index/index.js index a0235a0..9ba0747 100644 --- a/pages/article/queue-index/index.js +++ b/pages/article/queue-index/index.js @@ -1,5 +1,5 @@ // pages/stock/index.js -const request = require('../../../utils/request') //导入模块 +import { getPreferList } from "../../api/moment" const event = require('../../../utils/event') const app = getApp() @@ -57,7 +57,7 @@ Component({ return } this.data.requesting = true - request.get('/information-center/article/get/Article-list/', this.data.form).then(result => { + getPreferList(this.data.form).then(result => { //成功回调 if (result.data.records.length) { var respList = result.data.records diff --git a/pages/index/index.js b/pages/index/index.js index 4c351c9..1a3b040 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -1,5 +1,6 @@ import { config, getUserInfo} from "../api/user" import { zconfig, loginToken } from "../api/ztb" +import { mconfig } from "../api/moment" const event = require('../../utils/event.js') const storage = require('../../utils/storage') const app = getApp() @@ -73,7 +74,6 @@ Page({ app.globalData.token = authorization this.fetchUserInfo() } else { - wx.hideLoading() this.toIndex() } } @@ -102,9 +102,17 @@ Page({ }) }, toIndex: function(){ + if(!app.globalData.token){ + wx.hideLoading() + this.onResume() + if(this.data.path){ + wx.navigateTo({ url: this.data.path }) + } + return + } loginToken({loginToken: app.globalData.token}).then(result => { - zconfig.header = { 'Authorization': 'QNT ' + result.data } - // cconfig.header = { 'Authorization': 'QNT ' + result.data } + zconfig.header = { 'Authorization': 'QNT ' + result.data.token } + mconfig.header = { 'Authorization': 'QNT ' + result.data.token } // pconfig.header = { 'Authorization': 'QNT ' + result.data } wx.hideLoading() this.onResume() @@ -121,13 +129,6 @@ Page({ } }) }, - toIndex: function(){ - this.onResume() - if(this.data.path){ - wx.navigateTo({ url: this.data.path }) - } - // 进行弹窗的dialog显示处理； - }, onResume: function(){ var pageView = this.selectComponent('#' + this.data.TabList[this.data.pageIndex].value) if (pageView && this.data.inited) { diff --git a/pages/login/index.js b/pages/login/index.js index 4ceaba3..9dfe4b3 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -34,7 +34,6 @@ Page({ this.wxLogin() var check = wx.getStorageSync('AgreeCheck') app.globalData.kg = wx.getStorageSync('ztb-kg') - this.checkLogin() if (check) { this.setData({check: true}) } @@ -59,7 +58,8 @@ Page({ app.globalData.userInfo = result.data this.setData({ loging: false}) loginToken({loginToken: app.globalData.token}).then(result => { - zconfig.header = { 'Authorization': 'QNT ' + result.data } + zconfig.header = { 'Authorization': 'QNT ' + result.data.token } + console.log(zconfig) // cconfig.header = { 'Authorization': 'QNT ' + result.data } // pconfig.header = { 'Authorization': 'QNT ' + result.data } // 登录流程完成； diff --git a/pages/mall/index/index.js b/pages/mall/index/index.js index f346225..3a5eb83 100644 --- a/pages/mall/index/index.js +++ b/pages/mall/index/index.js @@ -1,4 +1,5 @@ // pages/message/index.js +import { getFactoryPrice } from "../../api/ztb" const request = require('../../../utils/request') //导入模块 const event = require('../../../utils/event') const util = require('../../../utils/util') @@ -334,7 +335,7 @@ Component({ } else { this.setData({ ['requesting[2]']: true }) } - request.get('/recycle-service/get/paper-mill-paper-category-price-list', this.data.form[2]).then(result => { + getFactoryPrice(this.data.form[2]).then(result => { //成功回调 if (result.data.records.length) { var respList = result.data.records diff --git a/utils/request.js b/utils/request.js index d0accc9..edac92e 100644 --- a/utils/request.js +++ b/utils/request.js @@ -55,7 +55,7 @@ function fun(url, method, data, header) { app.globalData.userToken = null wx.removeStorageSync('accessToken') wx.removeStorageSync('Authorization') - event.emit('EventMessage', { what: 666, desc: 'Logout' }) + event.emit('EventMessage', { what: 888, desc: 'Logout' }) let pages = getCurrentPages(); //当前页面栈 let prevPage = pages[pages.length - 1]; //当前页面 if (prevPage.route != 'pages/login/index' && !modal) {