From e5c257ed2dffabd3b0ec57890e6325b72d67fea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com> Date: Thu, 23 Feb 2023 23:59:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=92=8C=E5=8D=87=E7=BA=A7VIP=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/myAvatar/myAvatar.vue | 4 +++- packageMy/memberCenter/memberCenter.vue | 21 +++++++++++++++---- .../detail/productsDetail/productsDetail.vue | 2 +- pages/ideasAndNeeds/ideasAndNeeds.vue | 17 +++++++++++---- pages/my/my.vue | 2 +- 5 files changed, 35 insertions(+), 11 deletions(-) diff --git a/components/myAvatar/myAvatar.vue b/components/myAvatar/myAvatar.vue index fa09a00..9d4db2d 100644 --- a/components/myAvatar/myAvatar.vue +++ b/components/myAvatar/myAvatar.vue @@ -38,7 +38,7 @@ }, data() { return { - member: false, + member: '', showEdit: true, avatar: '', nickname: '用户', @@ -75,6 +75,8 @@ this.avatar = uni.getStorageSync('img_url') + data.avatar this.nickname = data.nickname this.member = data.member + uni.setStorageSync('member', data.member) + uni.setStorageSync('agreement', data.agreement) uni.setStorageSync('com_name', data.com_name) uni.setStorageSync('com_mobile', data.com_mobile) }).finally(_ => {}) diff --git a/packageMy/memberCenter/memberCenter.vue b/packageMy/memberCenter/memberCenter.vue index e03225b..8925391 100644 --- a/packageMy/memberCenter/memberCenter.vue +++ b/packageMy/memberCenter/memberCenter.vue @@ -3,13 +3,14 @@ - + {{commitment}} - + + @@ -23,17 +24,29 @@ name: '', phone: '', showM: false, + btnText: '升级VIP', + btnDisabled: false, //部分产品无权限访问，需升级VIP needAsk: '', //会员中心的用户名旁边不显示edit图标 show: false, content: `请保持手机畅通
客服会及时联系您`, - commitment: '承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置' + commitment: '' } }, onLoad(option) { - console.log('ask', option.ask); + console.log('uni.getStorageSync', uni.getStorageSync('member')); + if (uni.getStorageSync('member') == 2) { + this.btnText = '升级VIP' + } else if (uni.getStorageSync('member') == 3) { + this.btnText = '升级VIP' + this.btnDisabled = true + } else if (uni.getStorageSync('member') == 99) { + this.btnText = '升级vip，正在审核中' + this.btnDisabled = true + } + this.commitment = uni.getStorageSync('agreement') if (option.ask == 1) { this.needAsk = option.ask } diff --git a/pages/detail/productsDetail/productsDetail.vue b/pages/detail/productsDetail/productsDetail.vue index 2ca3ecd..751eb4c 100644 --- a/pages/detail/productsDetail/productsDetail.vue +++ b/pages/detail/productsDetail/productsDetail.vue @@ -151,7 +151,7 @@ this.showUpdate = true } //升级VIP正在审核中 - if (dataCode == 0 && detail.mytpe == 0) { + if (dataCode == 0 && detail.mytpe == 99) { this.showUpdating = true } if (detail) { diff --git a/pages/ideasAndNeeds/ideasAndNeeds.vue b/pages/ideasAndNeeds/ideasAndNeeds.vue index 16ffe3b..374b805 100644 --- a/pages/ideasAndNeeds/ideasAndNeeds.vue +++ b/pages/ideasAndNeeds/ideasAndNeeds.vue @@ -89,10 +89,15 @@ - + 承诺声明预留文字位置承诺声明预留文字位置 + style="font-size: 24rpx;font-family: PingFangSC-Regular, PingFang SC;font-weight: 400;color: #C8C8C8;line-height: 28rpx;" + v-if="tabCurrent === 0">{{claim_r}} + {{claim_c}} + @@ -115,6 +120,8 @@ }, data() { return { + claim_r: '', + claim_c: '', tabsList: [{ name: '需求发布' }, { @@ -155,7 +162,7 @@ } }, onTabItemTap() { - this.imgUrl = uni.getStorageSync('img_url') + this.imgUrl = uni.getStorageSync('img_url') console.log('----onShow') if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) { console.log(uni.getStorageSync('loginToken')) @@ -207,11 +214,13 @@ }, getFormData() { this.$apiServe.getIdeasAndNeedsFormdata().then(res => { - console.log(res.data.data) + console.log(res.data) const formData = res.data.data this.productPickerColumn[0] = formData.product this.positionPickerColumn[0] = formData.loc this.categoryPickerList[0] = formData.class + this.claim_r = formData.claim_r + this.claim_c = formData.claim_c // this.productPickerList = res.data.data.map((item, index) => { // temp.push(item.name) // return item diff --git a/pages/my/my.vue b/pages/my/my.vue index a848e5e..0bc9977 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -55,7 +55,7 @@ } }, onTabItemTap() { - // this.$refs.myavatar.getUser() + this.$refs.myavatar.getUser() if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) { this.isLoad = false return From afccd4c183dcddb927a34f7137979147b428f141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com> Date: Fri, 24 Feb 2023 12:20:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/myAvatar/myAvatar.vue | 2 +- components/productsBtn/productsBtn.vue | 4 ++-- components/productsByThumb/productsByThumb.vue | 2 +- packageMy/memberCenter/memberCenter.vue | 7 +++---- packageSearch/search-products/search-products.vue | 13 ++++++++++--- pages/detail/productsDetail/productsDetail.vue | 14 +++++++++----- pages/ideasAndNeeds/ideasAndNeeds.vue | 1 - pages/index/index.vue | 8 +++++--- static/styles/products.scss | 5 +---- 9 files changed, 32 insertions(+), 24 deletions(-) diff --git a/components/myAvatar/myAvatar.vue b/components/myAvatar/myAvatar.vue index 9d4db2d..0a5b733 100644 --- a/components/myAvatar/myAvatar.vue +++ b/components/myAvatar/myAvatar.vue @@ -6,7 +6,7 @@ - + diff --git a/components/productsBtn/productsBtn.vue b/components/productsBtn/productsBtn.vue index 3ae1745..889c331 100644 --- a/components/productsBtn/productsBtn.vue +++ b/components/productsBtn/productsBtn.vue @@ -18,7 +18,7 @@ - {{item.desc}} + {{item.title}} {{item.name}} - + {{item.title}} @@ -24,7 +24,7 @@ :lazy-load="true"> 发布日期： - {{item.pub_time}} + {{item.pub_time_str}} @@ -44,7 +44,8 @@ }, queryTitle: null, imgUrl: null, - productList: [] + productList: [], + tagsArray: [], } }, onLoad(options) { @@ -59,6 +60,12 @@ title: this.queryTitle } this.$apiServe.getProductList(data).then(res => { + let tags = res.data.data + for (const item of tags) { + let tag = item.tags + this.tagsArray = tag.split(',') + item.tags = this.tagsArray[0] + } this.productList = res.data.data }).finally(_ => {}) }, diff --git a/pages/detail/productsDetail/productsDetail.vue b/pages/detail/productsDetail/productsDetail.vue index 751eb4c..e8e3d29 100644 --- a/pages/detail/productsDetail/productsDetail.vue +++ b/pages/detail/productsDetail/productsDetail.vue @@ -48,18 +48,18 @@ - + 点赞 - + - {{detailList.thumb}} 赞 + {{detailList.thumb==NaN?1:detailList.thumb}} 赞 @@ -151,12 +151,16 @@ this.showUpdate = true } //升级VIP正在审核中 - if (dataCode == 0 && detail.mytpe == 99) { + if (dataCode == 0 && detail.mytpe == 3) { this.showUpdating = true } + + if (detail) { detail.pub_time = dateFormatDetail(detail.pub_time) - detail.tags = detail.tags.split(',') + if (detail.tags) { + detail.tags = detail.tags.split(',') + } //点赞数 if (detail.thumbcount !== 0 && detail.is_thumb == 0) { detail.thumb = parseInt(detail.thumb) + parseInt(detail.thumbcount) diff --git a/pages/ideasAndNeeds/ideasAndNeeds.vue b/pages/ideasAndNeeds/ideasAndNeeds.vue index 374b805..9e7f885 100644 --- a/pages/ideasAndNeeds/ideasAndNeeds.vue +++ b/pages/ideasAndNeeds/ideasAndNeeds.vue @@ -214,7 +214,6 @@ }, getFormData() { this.$apiServe.getIdeasAndNeedsFormdata().then(res => { - console.log(res.data) const formData = res.data.data this.productPickerColumn[0] = formData.product this.positionPickerColumn[0] = formData.loc diff --git a/pages/index/index.vue b/pages/index/index.vue index 0d1c2fe..8e17331 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -141,10 +141,12 @@ getBanner() { this.$apiServe.getBanner().then(res => { let banner = res.data.data - for (const item of banner) { - item.img = this.imgUrl + item.img + if (banner) { + for (const item of banner) { + item.img = this.imgUrl + item.img + } + this.swiperList = res.data.data } - this.swiperList = res.data.data }).finally(_ => {}) }, //点击轮播图 diff --git a/static/styles/products.scss b/static/styles/products.scss index a2a7c32..5281675 100644 --- a/static/styles/products.scss +++ b/static/styles/products.scss @@ -8,10 +8,7 @@ position: absolute; right: 0; top: 0; - - .u-image__image { - margin-left: 6px; - } + width:356rpx; .img_tag { position: absolute; From 8bdb156ec2817e948384633883406a72e7c5f76b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com> Date: Fri, 24 Feb 2023 14:13:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/myAvatar/myAvatar.vue | 1 - components/productsBtn/productsBtn.vue | 2 +- .../productsByThumb/productsByThumb.vue | 2 +- components/productsByTime/productsByTime.vue | 2 +- components/uni-searchbar.vue | 25 +++++++------ packageMy/myRelease/myRelease.vue | 18 +++++----- .../search-products/search-products.vue | 15 ++++---- packageSearch/search/search.vue | 2 -- pages/ideasAndNeeds/ideasAndNeeds.vue | 36 ------------------- 9 files changed, 34 insertions(+), 69 deletions(-) diff --git a/components/myAvatar/myAvatar.vue b/components/myAvatar/myAvatar.vue index 0a5b733..37ada0d 100644 --- a/components/myAvatar/myAvatar.vue +++ b/components/myAvatar/myAvatar.vue @@ -67,7 +67,6 @@ //获取头像昵称和普通会员和VIP会员 getUser() { this.$apiServe.getUser().then(res => { - console.log('个人信息==', res.data); if (res.data.msg === "登录超时，请重新登录") { this.isLoad = false } diff --git a/components/productsBtn/productsBtn.vue b/components/productsBtn/productsBtn.vue index 889c331..a2df4a3 100644 --- a/components/productsBtn/productsBtn.vue +++ b/components/productsBtn/productsBtn.vue @@ -12,7 +12,7 @@ {{item.cate_name}} - + {{item.name}} diff --git a/components/productsByThumb/productsByThumb.vue b/components/productsByThumb/productsByThumb.vue index 8f98bcd..e42e113 100644 --- a/components/productsByThumb/productsByThumb.vue +++ b/components/productsByThumb/productsByThumb.vue @@ -11,7 +11,7 @@ {{item.cate_name}} - + {{item.name}} diff --git a/components/productsByTime/productsByTime.vue b/components/productsByTime/productsByTime.vue index 3a72f3f..beaa698 100644 --- a/components/productsByTime/productsByTime.vue +++ b/components/productsByTime/productsByTime.vue @@ -11,7 +11,7 @@ {{item.cate_name}} - + {{item.name}} diff --git a/components/uni-searchbar.vue b/components/uni-searchbar.vue index 825dcd8..96b2100 100644 --- a/components/uni-searchbar.vue +++ b/components/uni-searchbar.vue @@ -7,18 +7,14 @@ - - + + - 搜索优质商品 + 搜索优质商品 搜索 @@ -65,10 +61,10 @@ }, methods: { goSearch(value) { - if(!this.queryParamF && value) { + if (!this.queryParamF && value) { this.queryParamF = value } - if(this.readOnly) { + if (this.readOnly) { this.$emit('navigate') return } @@ -94,12 +90,14 @@ margin: 10rpx 10rpx; display: flex; align-items: center; + .top-left { width: calc(100% - 200rpx); display: flex; justify-content: space-around; align-items: center; height: 100%; + .search-input { display: flex; border: 2rpx solid #fff; @@ -107,6 +105,7 @@ border-radius: 50rpx; height: 100%; margin-left: 10rpx; + .search-btn { font-size: 32rpx; font-family: PingFangSC-Regular, PingFang SC; diff --git a/packageMy/myRelease/myRelease.vue b/packageMy/myRelease/myRelease.vue index 8fdea04..d3b1636 100644 --- a/packageMy/myRelease/myRelease.vue +++ b/packageMy/myRelease/myRelease.vue @@ -11,7 +11,8 @@ - {{item.pub_time}} + {{item.update_time}} + {{item.pub_time}} @@ -32,7 +33,9 @@ {{item.pname}} - {{item.pub_time}} + + {{item.update_time}} + {{item.pub_time}} @@ -74,26 +77,27 @@ name: '创意发布' }], needsList: [], - ideasList: [] + ideasList: [], + updateIndex: '' } }, onLoad(options) { - console.log(options) if (options && options.index) { - console.log(options) options.index = options.index - 1 + this.updateIndex = options.index this.tabChange(options) return } this.getIdeasAndNeeds() }, methods: { - //获取创意发布 + //获取创意发布或需求发布 getIdeasAndNeeds() { this.$apiServe.getIdeasAndNeeds(this.type).then(res => { let data = res.data.data for (const item of data) { item.pub_time = dateFormatXwDetail(item.pub_time) + item.update_time = dateFormatXwDetail(item.update_time) const imagesList = item.images && item.images.length > 0 ? item.images.split(';') : [] item.images = imagesList.map(item1 => { item1 = uni.getStorageSync('img_url') + '/' + item1 @@ -112,7 +116,6 @@ //切换需求发布和创意发布 tabChange(data) { this.tabCurrent = data.index - // console.log('data.index', data.index); if (data.index == 0) { this.type = 1 } else if (data.index == 1) { @@ -143,7 +146,6 @@ success: function(res) { if (res.confirm) { that.$apiServe.deleteIdeasAndNeeds(item.id).then(res => { - // console.log('删除发布', res); if (res.data.code == 1) { that.$toast.warn('删除成功') } diff --git a/packageSearch/search-products/search-products.vue b/packageSearch/search-products/search-products.vue index aaa4803..fb89e35 100644 --- a/packageSearch/search-products/search-products.vue +++ b/packageSearch/search-products/search-products.vue @@ -11,7 +11,7 @@ {{item.cate_name}} - + {{item.name}} @@ -59,14 +59,17 @@ ...this.queryParam, title: this.queryTitle } + this.$apiServe.getProductList(data).then(res => { let tags = res.data.data - for (const item of tags) { - let tag = item.tags - this.tagsArray = tag.split(',') - item.tags = this.tagsArray[0] + if (tags) { + for (const item of tags) { + let tag = item.tags + this.tagsArray = tag.split(',') + item.tags = this.tagsArray[0] + } + this.productList = tags } - this.productList = res.data.data }).finally(_ => {}) }, //点击图片跳转到详情页 diff --git a/packageSearch/search/search.vue b/packageSearch/search/search.vue index a293f37..b707578 100644 --- a/packageSearch/search/search.vue +++ b/packageSearch/search/search.vue @@ -58,7 +58,6 @@ this.getDiscover() const tempList = uni.getStorageSync('storage_search_record') this.recentRecordList = tempList ? tempList : []; - console.log(this.recentRecordList) const menuButtonInfo = uni.getMenuButtonBoundingClientRect(); this.searchBarTop = menuButtonInfo.top; this.searchBarHeight = menuButtonInfo.height; @@ -104,7 +103,6 @@ getDiscover() { this.$apiServe.getDiscover().then(res => { this.foundList = res.data.data - console.log(res.data.data) }).finally(_ => {}) } } diff --git a/pages/ideasAndNeeds/ideasAndNeeds.vue b/pages/ideasAndNeeds/ideasAndNeeds.vue index 9e7f885..911144f 100644 --- a/pages/ideasAndNeeds/ideasAndNeeds.vue +++ b/pages/ideasAndNeeds/ideasAndNeeds.vue @@ -163,9 +163,7 @@ }, onTabItemTap() { this.imgUrl = uni.getStorageSync('img_url') - console.log('----onShow') if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) { - console.log(uni.getStorageSync('loginToken')) this.isLoad = false // uni.navigateTo({ // url: '../../pages/my/login/login' @@ -184,14 +182,11 @@ if (options && options.item && uni.getStorageSync(options.item)) { try { let publishFormList = uni.getStorageSync(options.item) - console.log(publishFormList.images) this.fileList1 = publishFormList.images.map(item => { - console.log(this.imgUrl) return { url: item } }) - console.log(this.fileList1) this.needsPublishForm = publishFormList } catch (error) { this.$toast.warn(error) @@ -256,7 +251,6 @@ // } // }, getCityValue(data) { - console.log(data) this.showCityPicker = false this.needsPublishForm.area_name = data[0].join('-') this.needsPublishForm.area_code = data[1] @@ -265,7 +259,6 @@ this.showProductPicker = false this.showCategoryPicker = false this.needsPublishForm.product = data.value[0] - // console.log(data) // const obj = this.productPickerList.find(item => { // return item.name === data.value[0] // }) @@ -319,9 +312,6 @@ async afterRead(event) { // 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式 let lists = [].concat(event.file) - console.log(this.fileList1) - console.log(lists) - console.log(this[`fileList${event.name}`]) let fileListLen = this[`fileList${event.name}`].length lists.map((item) => { this[`fileList${event.name}`].push({ @@ -331,7 +321,6 @@ }) }) for (let i = 0; i < lists.length; i++) { - console.log(lists[i]) const result = await this.uploadFilePromise(lists[i].url) let item = this[`fileList${event.name}`][fileListLen] this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, { @@ -344,16 +333,6 @@ }, uploadFilePromise(url) { return new Promise((resolve, reject) => { - // const data = { - // file: new File - // } - // let a = apiService.postImage(data).then(res => { - // console.log(res) - // }) - console.log('--345') - console.log(url) - console.log(this.token) - console.log(apiService.uploadImgUrl) let a = uni.uploadFile({ url: apiService.uploadImgUrl, filePath: url, @@ -364,8 +343,6 @@ }, success: (res) => { setTimeout(() => { - console.log('---355') - console.log(JSON.parse(res.data).data.url) resolve(JSON.parse(res.data).data.url) }, 1000) } @@ -373,7 +350,6 @@ }) }, submitForm() { - console.log(this.fileList1) if (!/^1[3456789]\d{9}$/.test(this.needsPublishForm.mobile)) { this.$toast.warn('请输入正确的手机号') return false @@ -404,10 +380,8 @@ pub_time: null, ...this.needsPublishForm } - console.log(data) apiService.submitIdeasAndNeeds(data).then(res => { this.$toast.success('提交成功') - console.log('esf=', res); if (res.data.code == 1) { uni.navigateTo({ url: '../../packageMy/myRelease/myRelease?index=' + (this.tabCurrent + 1) @@ -422,7 +396,6 @@ }) }, reOnLoad() { - console.log('----------------true') if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) { this.$toast.warn('登录失败请重试') this.isLoad = false @@ -436,19 +409,10 @@ this.getFormData() }, failToLoad() { - console.log('----------------false') this.$toast.warn('登录失败请重试') uni.reLaunch({ url: '/pages/index/index' }) - // uni.navigateBack({ - // success: () => { - // let page = getCurrentPages().pop(); - // if (page) { - // page.onLoad(page.options);//执行上个页面的方法 - // }; - // } - // }) } }