From 1f6d21a1a0afa23b15e8b7faeb68c43d32fc9b9c Mon Sep 17 00:00:00 2001 From: dengjie <209192278@qq.com> Date: Sat, 28 Jan 2023 22:33:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BD=93=E9=AA=8C=E7=89=88?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E7=99=BB=E5=BD=95=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/productsBtn/productsBtn.vue | 2 - packageMy/bindCompany/bindCompany.vue | 12 ++--- packageMy/browseHistory/browseHistory.vue | 40 ++++++++++++-- packageMy/changeAvatar/changeAvatar.vue | 54 +++++++++++++++++-- packageMy/memberCenter/memberCenter.vue | 34 ++++++++++++ packageMy/myCollection/myCollection.vue | 39 +++++++++++++- packageMy/myRelease/myRelease.vue | 16 +++--- .../certifiedCjDetail/certifiedCjDetail.vue | 10 ++-- packageReport/newsDetail/newsDetail.vue | 8 ++- .../detail/productsDetail/productsDetail.vue | 15 ++---- pages/ideasAndNeeds/ideasAndNeeds.vue | 21 ++++---- pages/index/index.vue | 14 +---- pages/my/login/login.vue | 2 +- service/request.js | 29 ++++++---- 14 files changed, 213 insertions(+), 83 deletions(-) diff --git a/components/productsBtn/productsBtn.vue b/components/productsBtn/productsBtn.vue index 7f2c414..9a33d17 100644 --- a/components/productsBtn/productsBtn.vue +++ b/components/productsBtn/productsBtn.vue @@ -77,7 +77,6 @@ methods: { //获取历史记录 getHistoryOrCollection() { - console.log(uni.getStorageSync('token')); this.$apiServe.getHistoryOrCollection(this.type).then(res => { let data = res.data.data for (const item of data) { @@ -156,6 +155,5 @@ font-weight: 400; color: #FFFFFF; line-height: 33px; - } diff --git a/packageMy/bindCompany/bindCompany.vue b/packageMy/bindCompany/bindCompany.vue index b754c6b..f312a48 100644 --- a/packageMy/bindCompany/bindCompany.vue +++ b/packageMy/bindCompany/bindCompany.vue @@ -1,6 +1,7 @@ @@ -78,6 +125,5 @@ height: 86rpx !important; background: #0EBB5B; border-radius: 20rpx !important; - margin-top: 230rpx; } diff --git a/packageMy/memberCenter/memberCenter.vue b/packageMy/memberCenter/memberCenter.vue index a741166..0d2dadb 100644 --- a/packageMy/memberCenter/memberCenter.vue +++ b/packageMy/memberCenter/memberCenter.vue @@ -13,16 +13,26 @@ + diff --git a/packageMy/myRelease/myRelease.vue b/packageMy/myRelease/myRelease.vue index 5de7506..47d172f 100644 --- a/packageMy/myRelease/myRelease.vue +++ b/packageMy/myRelease/myRelease.vue @@ -88,10 +88,8 @@ } }, onLoad() { - console.log(uni.getStorageSync('token')); this.getIdeasAndNeeds() - if (!uni.getStorageSync('token') || uni.getStorageSync('token').length === 0) { - console.log(uni.getStorageSync('token')) + if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) { this.isLoad = false // uni.navigateTo({ // url: '../../pages/my/login/login' @@ -103,9 +101,8 @@ methods: { //获取创意发布 getIdeasAndNeeds() { - console.log('this.type', this.type); this.$apiServe.getIdeasAndNeeds(this.type).then(res => { - console.log('获取创意发布&需求发布', res.data.data); + // console.log('获取创意发布&需求发布', res.data.data); let data = res.data.data for (const item of data) { item.pub_time = dateFormatXwDetail(item.pub_time) @@ -127,7 +124,7 @@ //切换需求发布和创意发布 tabChange(data) { this.tabCurrent = data.index - console.log('data.index', data.index); + // console.log('data.index', data.index); if (data.index == 0) { this.type = 1 } else if (data.index == 1) { @@ -151,7 +148,7 @@ success: function(res) { if (res.confirm) { that.$apiServe.deleteIdeasAndNeeds(item.id).then(res => { - console.log('删除发布', res); + // console.log('删除发布', res); if (res.data.code == 1) { that.$toast.warn('删除成功') } @@ -166,8 +163,7 @@ }) }, reOnLoad() { - console.log('----------------true') - if (!uni.getStorageSync('token') || uni.getStorageSync('token').length === 0) { + if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) { this.$toast.warn('登录失败请重试') this.isLoad = false // uni.navigateTo({ @@ -176,9 +172,9 @@ return } this.isLoad = true + this.getIdeasAndNeeds() }, failToLoad() { - console.log('----------------false') this.$toast.warn('登录失败请重试') } } diff --git a/packageReport/certifiedCjDetail/certifiedCjDetail.vue b/packageReport/certifiedCjDetail/certifiedCjDetail.vue index b84c1c0..2e26956 100644 --- a/packageReport/certifiedCjDetail/certifiedCjDetail.vue +++ b/packageReport/certifiedCjDetail/certifiedCjDetail.vue @@ -51,8 +51,7 @@ this.id = option.id this.getCertifiedCjDetail() this.imgUrl = uni.getStorageSync('img_url') - if (!uni.getStorageSync('token') || uni.getStorageSync('token').length === 0) { - console.log(uni.getStorageSync('token')) + if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) { this.isLoad = false // uni.navigateTo({ // url: '../../pages/my/login/login' @@ -65,7 +64,7 @@ //获取认证厂家详情 getCertifiedCjDetail() { this.$apiServe.getCertifiedCjDetail(this.id).then(res => { - console.log('认证厂家详情页', res.data) + // console.log('认证厂家详情页', res.data) if (res.data.data) { let data = res.data.data data.images = data.images.split(';') @@ -76,8 +75,7 @@ }).finally(_ => {}) }, reOnLoad() { - console.log('----------------true') - if (!uni.getStorageSync('token') || uni.getStorageSync('token').length === 0) { + if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) { this.$toast.warn('登录失败请重试') this.isLoad = false // uni.navigateTo({ @@ -86,9 +84,9 @@ return } this.isLoad = true + this.getCertifiedCjDetail() }, failToLoad() { - console.log('----------------false') this.$toast.warn('登录失败请重试') } } diff --git a/packageReport/newsDetail/newsDetail.vue b/packageReport/newsDetail/newsDetail.vue index 1cc602f..290298d 100644 --- a/packageReport/newsDetail/newsDetail.vue +++ b/packageReport/newsDetail/newsDetail.vue @@ -41,8 +41,7 @@ onLoad(option) { this.id = option.id this.getNewsDetail() - if (!uni.getStorageSync('token') || uni.getStorageSync('token').length === 0) { - console.log(uni.getStorageSync('token')) + if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) { this.isLoad = false // uni.navigateTo({ // url: '../../pages/my/login/login' @@ -66,8 +65,7 @@ }).finally(_ => {}) }, reOnLoad() { - console.log('----------------true') - if (!uni.getStorageSync('token') || uni.getStorageSync('token').length === 0) { + if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) { this.$toast.warn('登录失败请重试') this.isLoad = false // uni.navigateTo({ @@ -76,9 +74,9 @@ return } this.isLoad = true + this.getNewsDetail() }, failToLoad() { - console.log('----------------false') this.$toast.warn('登录失败请重试') } } diff --git a/pages/detail/productsDetail/productsDetail.vue b/pages/detail/productsDetail/productsDetail.vue index a0d47bc..a43ee77 100644 --- a/pages/detail/productsDetail/productsDetail.vue +++ b/pages/detail/productsDetail/productsDetail.vue @@ -87,8 +87,7 @@ this.id = option.id this.getProductDetail() this.imgUrl = uni.getStorageSync('img_url') - if (!uni.getStorageSync('token') || uni.getStorageSync('token').length === 0) { - console.log(uni.getStorageSync('token')) + if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) { this.isLoad = false // uni.navigateTo({ // url: '../../pages/my/login/login' @@ -100,9 +99,8 @@ methods: { //获取详情信息 getProductDetail() { - console.log(this.id); this.$apiServe.getProductDetail(this.id).then(res => { - console.log('产品详情页', res.data) + // console.log('产品详情页', res.data) if (res.data.data.thumb) { this.isThumb = true } @@ -121,7 +119,7 @@ //收藏按钮 starTap() { this.$apiServe.collect(this.id).then(res => { - console.log('收藏成功', res.data) + // console.log('收藏成功', res.data) if (res.data.code == 1) { this.detailList.is_fav = 1 this.$toast.warn('收藏成功') @@ -135,8 +133,7 @@ this.showHeart = !this.showHeart }, reOnLoad() { - console.log('----------------true') - if (!uni.getStorageSync('token') || uni.getStorageSync('token').length === 0) { + if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) { this.$toast.warn('登录失败请重试') this.isLoad = false // uni.navigateTo({ @@ -145,9 +142,9 @@ return } this.isLoad = true + this.getProductDetail() }, failToLoad() { - console.log('----------------false') this.$toast.warn('登录失败请重试') } } @@ -170,10 +167,8 @@ right: 77rpx; z-index: 99; } - } - .content { padding: 20rpx; background-color: #fff; diff --git a/pages/ideasAndNeeds/ideasAndNeeds.vue b/pages/ideasAndNeeds/ideasAndNeeds.vue index 2fa2e31..f59b3a1 100644 --- a/pages/ideasAndNeeds/ideasAndNeeds.vue +++ b/pages/ideasAndNeeds/ideasAndNeeds.vue @@ -155,8 +155,8 @@ }, onTabItemTap() { console.log('----onTabItemTap') - if (!uni.getStorageSync('token') || uni.getStorageSync('token').length === 0) { - console.log(uni.getStorageSync('token')) + if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) { + console.log(uni.getStorageSync('loginToken')) this.isLoad = false // uni.navigateTo({ // url: '../../pages/my/login/login' @@ -164,7 +164,7 @@ return } this.isLoad = true - this.token = uni.getStorageSync('token') + this.token = uni.getStorageSync('loginToken') this.getFormData() this.fileList1 = [] this.needsPublishForm = {} @@ -238,7 +238,7 @@ getProductValue(data) { this.showProductPicker = false this.showCategoryPicker = false - this.needsPublishForm.product= data.value[0] + this.needsPublishForm.product = data.value[0] // console.log(data) // const obj = this.productPickerList.find(item => { // return item.name === data.value[0] @@ -368,9 +368,10 @@ return false } this.needsPublishForm.type = Number(this.tabCurrent + 1) - this.needsPublishForm.pub_time = this.needsPublishForm.pub_time ? this.needsPublishForm.pub_time : new Date().getTime() + this.needsPublishForm.pub_time = this.needsPublishForm.pub_time ? this.needsPublishForm.pub_time : + new Date().getTime() const temp = [] - if(this.fileList1.length > 0) { + if (this.fileList1.length > 0) { this.fileList1.map(item => { temp.push(item.url) }) @@ -392,12 +393,14 @@ ...this.needsPublishForm } apiService.submitIdeasAndNeeds(data).then(res => { - this.$toast.success(res.data.msg) + this.$toast.warn('发布成功') + console.log('esf=', res); + // this.$toast.success(res.data.msg) }) }, reOnLoad() { console.log('----------------true') - if (!uni.getStorageSync('token') || uni.getStorageSync('token').length === 0) { + if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) { this.$toast.warn('登录失败请重试') this.isLoad = false // uni.navigateTo({ @@ -405,7 +408,7 @@ // }) return } - this.token = uni.getStorageSync('token') + this.token = uni.getStorageSync('loginToken') this.isLoad = true this.getFormData() }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 8584e81..7672fa0 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -96,18 +96,8 @@ // code: code // }).then(res => { // var data = res.data.data - // console.log('登录code换取的信息', data); - // // uni.setStorageSync('token', data.token); - // // that.$toast.success('登录成功') - // // that.$emit('success') - // //登录完成后使用手机code换取手机号,调用/user/getMobileByMnp接口 - // //接口详细链接 https://docs.apipost.cn/preview/468be606f65cae75/3f2f988ddf82dd8e - // // const codeData = { - // // code: e.detail.code - // // } - // // apiService.postMobileByMnp(codeData).then(res => { - // // console.log(res) - // // }) + // // console.log('登录code换取的信息', data); + // uni.setStorageSync('token', data.token); // }) // }, // }) diff --git a/pages/my/login/login.vue b/pages/my/login/login.vue index 1c9a80f..bacec83 100644 --- a/pages/my/login/login.vue +++ b/pages/my/login/login.vue @@ -38,7 +38,7 @@ }).then(res => { var data = res.data.data // console.log('登录code换取的信息', data); - uni.setStorageSync('token', data.token); + uni.setStorageSync('loginToken', data.token); that.$toast.success('登录成功') that.$emit('success') //登录完成后使用手机code换取手机号,调用/user/getMobileByMnp接口 diff --git a/service/request.js b/service/request.js index 4ca9ede..6a7335d 100644 --- a/service/request.js +++ b/service/request.js @@ -8,7 +8,7 @@ function isOutTime(res) { }) }, 1000) uni.removeStorageSync('userInfo') - uni.removeStorageSync('token') + uni.removeStorageSync('loginToken') } else { // uni.showToast(res.data.message); } @@ -18,7 +18,7 @@ const service = { get(url, data) { const header = {} // header['Authorization'] = 'Bearer ' + uni.getStorageSync('token') - header['token'] = uni.getStorageSync('token') + header['token'] = uni.getStorageSync('loginToken') header['content-type'] = 'application/json' return new Promise((resolve, reject) => { uni.request({ @@ -43,7 +43,7 @@ const service = { }, post(url, data, isLogin) { const header = {} - header['token'] = uni.getStorageSync('token') + header['token'] = uni.getStorageSync('loginToken') header['content-type'] = 'application/json' return new Promise((resolve, reject) => { uni.request({ @@ -92,7 +92,7 @@ const service = { }, put(url, data, isLogin) { const header = {} - header['token'] = uni.getStorageSync('token') + header['token'] = uni.getStorageSync('loginToken') header['content-type'] = 'application/json' return new Promise((resolve, reject) => { uni.request({ @@ -100,10 +100,10 @@ const service = { url: serverHost + url, header: header, success: res => { - if (!res.data.flag) { - isOutTime(res) - reject(res) - } + // if (!res.data.flag) { + // isOutTime(res) + // reject(res) + // } resolve(res) }, data: data, @@ -118,7 +118,7 @@ const service = { }, putWithFormData(url, data, isLogin) { const header = {} - header['token'] = uni.getStorageSync('token') + header['token'] = uni.getStorageSync('loginToken') header['content-type'] = 'application/x-www-form-urlencoded' return new Promise((resolve, reject) => { uni.request({ @@ -144,7 +144,7 @@ const service = { }, delete(url, data, isLogin) { const header = {} - header['token'] = uni.getStorageSync('token') + header['token'] = uni.getStorageSync('loginToken') header['content-type'] = 'application/json' return new Promise((resolve, reject) => { uni.request({ @@ -205,7 +205,7 @@ const toast = { } } const apiService = { - uploadImgUrl: serverHost + `/upload/image/`, + uploadImgUrl: serverHost, imgUrl: serverHost, // login: data => { // data = Object.assign(data || {}, {}) @@ -326,6 +326,13 @@ const apiService = { resolve(service.get(url)) }) }, + //修改个人信息 + updateUser(data) { + const url = `/center/userupdate` + return new Promise((resolve, reject) => { + resolve(service.post(url, data)) + }) + }, // 获取首页分类Tag getTags(data) { const url = `/home/tags`