From 08ebc6574d3eeb2d8c302b350994c5354c08af6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Sat, 4 Feb 2023 19:03:41 +0800
Subject: [PATCH] =?UTF-8?q?dengjie=20=EF=BC=9A=E8=A7=A3=E5=86=B3=E7=82=B9?=
=?UTF-8?q?=E8=B5=9E=E3=80=81=E6=94=B6=E8=97=8F=E3=80=81=E5=AE=A2=E6=9C=8D?=
=?UTF-8?q?=E7=94=B5=E8=AF=9D=E7=AD=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/myAvatar/myAvatar.vue | 33 +++----
components/myForm/myForm.vue | 5 +-
components/productsBtn/productsBtn.vue | 2 +-
packageMy/changeAvatar/changeAvatar.vue | 6 +-
packageMy/myRelease/myRelease.vue | 22 ++---
.../detail/productsDetail/productsDetail.vue | 97 ++++++++++++-------
pages/index/index.vue | 20 ----
pages/my/my.vue | 29 ++++--
service/request.js | 14 +++
static/styles/myAvatar.scss | 2 +-
10 files changed, 128 insertions(+), 102 deletions(-)
diff --git a/components/myAvatar/myAvatar.vue b/components/myAvatar/myAvatar.vue
index 3e488e0..e454c4d 100644
--- a/components/myAvatar/myAvatar.vue
+++ b/components/myAvatar/myAvatar.vue
@@ -44,7 +44,7 @@
nickname: '用户',
normal: '/static/my/wo_icon_pthy.png',
VIP: '/static/my/wo_icon_vip.png',
- isLoad: true,
+ isLoad: true
};
},
created() {
@@ -67,39 +67,34 @@
getUser() {
this.$apiServe.getUser().then(res => {
console.log('个人信息==', res.data);
- if (res.data.msg == "登录超时，请重新登录") {
- if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
- this.$toast.warn('登录失败请重试')
- this.isLoad = false
- // uni.navigateTo({
- // url: '../../pages/my/login/login'
- // })
- return
- }
- }
+ // if (res.data.msg === "登录超时，请重新登录") {
+ // this.$toast.warn('登录超时，请重新登录')
+ // this.isLoad = false
+ // // uni.navigateTo({
+ // // url: '/pages/my/login/login'
+ // // })
+ // }
var data = res.data.data
- this.avatar = data.avatar
+ this.avatar = uni.getStorageSync('img_url') + data.avatar
this.nickname = data.nickname
this.member = data.member
+ uni.setStorageSync('com_name', data.com_name)
+ uni.setStorageSync('com_mobile', data.com_mobile)
}).finally(_ => {})
},
reOnLoad() {
if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
this.$toast.warn('登录失败请重试')
this.isLoad = false
- // uni.navigateTo({
- // url: '../../pages/my/login/login'
- // })
return
}
this.isLoad = true
this.$refs.myavatar.getUser()
},
failToLoad() {
- // uni.navigateBack({
- // url: '/pages/my/my'
- // })
- this.$toast.warn('登录失败请重试')
+ uni.navigateBack({
+ url: '/pages/index/index'
+ })
}
}
}
diff --git a/components/myForm/myForm.vue b/components/myForm/myForm.vue
index 9525f90..f29679c 100644
--- a/components/myForm/myForm.vue
+++ b/components/myForm/myForm.vue
@@ -28,7 +28,10 @@
};
},
created() {
-
+ // if (uni.getStorageSync('com_mobile') && uni.getStorageSync('com_name')) {
+ // this.model.userInfo.name = uni.getStorageSync('com_name')
+ // this.model.userInfo.phone = uni.getStorageSync('com_mobile')
+ // }
}
}
diff --git a/components/productsBtn/productsBtn.vue b/components/productsBtn/productsBtn.vue
index 3b27092..4b531e3 100644
--- a/components/productsBtn/productsBtn.vue
+++ b/components/productsBtn/productsBtn.vue
@@ -74,6 +74,7 @@
getHistoryOrCollection() {
this.$apiServe.getHistoryOrCollection(this.type).then(res => {
let data = res.data.data
+ console.log('历史记录或收藏', data);
for (const item of data) {
let tag = item.tags
this.tagsArray = tag.split(',')
@@ -81,7 +82,6 @@
item.create_time = dateFormatHistory(item.create_time)
}
this.productList = data
- console.log('获取历史记录', this.productList);
}).finally(_ => {
})
diff --git a/packageMy/changeAvatar/changeAvatar.vue b/packageMy/changeAvatar/changeAvatar.vue
index f22e39a..a056931 100644
--- a/packageMy/changeAvatar/changeAvatar.vue
+++ b/packageMy/changeAvatar/changeAvatar.vue
@@ -40,9 +40,8 @@
//获取头像昵称
getUser() {
this.$apiServe.getUser().then(res => {
- console.log('头像昵称', res.data);
var data = res.data.data
- this.avatar = data.avatar
+ this.avatar = uni.getStorageSync('img_url') + data.avatar
this.model.userInfo.name = data.nickname
}).finally(_ => {})
},
@@ -58,10 +57,7 @@
'Authorization': token
},
success: (res) => {
- console.log('上传头像', JSON.parse(res.data));
- // setTimeout(() => {
resolve(JSON.parse(res.data).data.url)
- // }, 1000)
}
});
})
diff --git a/packageMy/myRelease/myRelease.vue b/packageMy/myRelease/myRelease.vue
index 55949ca..8fdea04 100644
--- a/packageMy/myRelease/myRelease.vue
+++ b/packageMy/myRelease/myRelease.vue
@@ -79,7 +79,7 @@
},
onLoad(options) {
console.log(options)
- if(options && options.index) {
+ if (options && options.index) {
console.log(options)
options.index = options.index - 1
this.tabChange(options)
@@ -91,7 +91,6 @@
//获取创意发布
getIdeasAndNeeds() {
this.$apiServe.getIdeasAndNeeds(this.type).then(res => {
- console.log('获取创意发布&需求发布', res.data.data);
let data = res.data.data
for (const item of data) {
item.pub_time = dateFormatXwDetail(item.pub_time)
@@ -123,15 +122,16 @@
},
//修改我的需求
editIdeasAndNeeds(item) {
- const tabCurrent = this .tabCurrent
- uni.removeStorage({ //删除Storage
- key:'update_item',
- success: () => {
- uni.setStorageSync('update_item', item);
- uni.reLaunch({
- url: '/pages/ideasAndNeeds/ideasAndNeeds?item=update_item' + '&index=' + tabCurrent
- })
- }
+ const tabCurrent = this.tabCurrent
+ uni.removeStorage({ //删除Storage
+ key: 'update_item',
+ success: () => {
+ uni.setStorageSync('update_item', item);
+ uni.reLaunch({
+ url: '/pages/ideasAndNeeds/ideasAndNeeds?item=update_item' + '&index=' +
+ tabCurrent
+ })
+ }
})
},
//二次确认删除我的需求或创意
diff --git a/pages/detail/productsDetail/productsDetail.vue b/pages/detail/productsDetail/productsDetail.vue
index 976af68..b2f8c61 100644
--- a/pages/detail/productsDetail/productsDetail.vue
+++ b/pages/detail/productsDetail/productsDetail.vue
@@ -11,7 +11,7 @@
-
+
@@ -34,19 +34,33 @@
{{item}}
+
-
+
+
- {{detailList.thumb}}赞
+
+
+
+ {{detailList.thumb}} 赞
-
-
-
-
-
- 点赞
+
+
+
+
+
+ 点赞
+
+
+
+
+
+ {{detailList.thumb}} 赞
+
@@ -75,7 +89,7 @@
+ confirmText="升级VIP" @confirm="confirm" @cancel="cancel" confirmColor="#0EBB5B">
@@ -110,9 +124,6 @@
this.imgUrl = uni.getStorageSync('img_url')
if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
this.isLoad = false
- // uni.navigateTo({
- // url: '../../pages/my/login/login'
- // })
return
}
this.isLoad = true
@@ -121,10 +132,7 @@
//获取详情信息
getProductDetail() {
this.$apiServe.getProductDetail(this.id).then(res => {
- console.log('产品详情页', res.data)
- if (res.data.data.thumb) {
- this.isThumb = true
- }
+ console.log('产品详情', res.data);
if (res.data.msg == "没有权限访问" && uni.getStorageSync('loginToken')) {
this.showM = true
}
@@ -132,16 +140,21 @@
let detail = res.data.data
detail.pub_time = dateFormatDetail(detail.pub_time)
detail.tags = detail.tags.split(',')
+ if (detail.is_thumb == 1) {
+ detail.thumb = parseInt(detail.thumb) + parseInt(detail.thumbcount)
+ } else {
+ detail.thumb = parseInt(detail.thumb) - parseInt(detail.thumbcount)
+ }
this.detailList = detail
- } else {
- this.$toast.warn('没有更多详情了')
}
+ // else {
+ // this.$toast.warn('没有更多详情了')
+ // }
}).finally(_ => {})
},
//点击star收藏
starTap() {
this.$apiServe.collect(this.id).then(res => {
- // console.log('收藏成功', res.data)
if (res.data.code == 1) {
this.$toast.warn('收藏成功')
this.getProductDetail()
@@ -151,31 +164,38 @@
}).finally(_ => {})
},
//点击star取消收藏
- cancelStarTap(id) {
- // console.log('this.detailList.id', id);
- // this.$apiServe.deleteHistoryOrCollection(id).then(res => {
- // console.log('取消收藏', res.data);
- // // if (res.data.code == 1) {
- // // this.$toast.warn('取消收藏')
- // // this.getProductDetail()
- // // } else {
- // // this.$toast.warn('收藏失败')
- // // }
- // }).finally(_ => {})
+ cancelStarTap(fav_id) {
+ this.$apiServe.deleteHistoryOrCollection(fav_id).then(res => {
+ if (res.data.code == 1) {
+ this.$toast.warn('取消收藏')
+ this.getProductDetail()
+ } else {
+ this.$toast.warn('取消收藏失败')
+ }
+ }).finally(_ => {})
},
//点赞按钮
heartTap() {
- // this.showHeart = !this.showHeart
this.$apiServe.thumb(this.id).then(res => {
- console.log('点赞成功', res.data)
if (res.data.code == 1) {
- this.showHeart = 1
+ this.getProductDetail()
this.$toast.warn('点赞成功')
} else {
this.$toast.warn('点赞失败')
}
}).finally(_ => {})
},
+ //取消点赞
+ cancelHeartTap(thumb_id) {
+ this.$apiServe.cancelThumb(thumb_id).then(res => {
+ if (res.data.code == 1) {
+ this.getProductDetail()
+ this.$toast.warn('取消点赞')
+ } else {
+ this.$toast.warn('取消点赞失败')
+ }
+ }).finally(_ => {})
+ },
reOnLoad() {
if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
this.$toast.warn('登录失败请重试')
@@ -198,6 +218,11 @@
url: '../../../packageMy/memberCenter/memberCenter?ask=' + 1
})
},
+ cancel() {
+ uni.reLaunch({
+ url: '/pages/index/index'
+ })
+ },
// 联系客服模态框
showModal() {
this.showCall = true
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7672fa0..1dfb68d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -76,32 +76,12 @@
}
},
onLoad() {
- // this.login()
this.getCategories()
this.getBanner()
this.getImgUrl()
this.imgUrl = uni.getStorageSync('img_url')
},
methods: {
- // login() {
- // var that = this
- // uni.login({
- // "provider": "weixin",
- // "onlyAuthorize": true, // 微信登录仅请求授权认证
- // success: function(event) {
- // const {
- // code
- // } = event
- // that.$apiServe.login({
- // code: code
- // }).then(res => {
- // var data = res.data.data
- // // console.log('登录code换取的信息', data);
- // uni.setStorageSync('token', data.token);
- // })
- // },
- // })
- // },
//获取按上架时间排列的产品列表length
getTimeLength(e) {
this.reachBottomLength = e
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 319b525..51e964b 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -7,7 +7,10 @@
-
+
+
+ @confirm="confirm" @cancel="cancel">
- {{phone}}
+ {{mobile}}
是否拨打客服电话
@@ -46,8 +49,9 @@
data() {
return {
showM: false,
- phone: '138 1222 222',
+ mobile: '',
isLoad: true,
+ is_bind: false
}
},
onTabItemTap() {
@@ -58,7 +62,19 @@
}
this.isLoad = true
},
+ onLoad() {
+ if (uni.getStorageSync('com_mobile')) {
+ this.is_bind = true
+ }
+ this.getCsTel()
+ },
methods: {
+ //获取客服电话
+ getCsTel() {
+ this.$apiServe.getCsTel().then(res => {
+ this.mobile = res.data.data.cs_tel
+ }).finally(_ => {})
+ },
//跳转到绑定公司页面
bindCompany() {
uni.navigateTo({
@@ -95,7 +111,7 @@
},
confirm() {
this.showM = false
- let phone = '1381222222'
+ let phone = ''
uni.makePhoneCall({
phoneNumber: phone,
success: function() {
@@ -109,9 +125,6 @@
cancel() {
this.showM = false
},
- close() {
- this.showM = false
- },
reOnLoad() {
if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
this.$toast.warn('登录失败请重试')
diff --git a/service/request.js b/service/request.js
index 3956ffc..f5e760a 100644
--- a/service/request.js
+++ b/service/request.js
@@ -319,6 +319,13 @@ const apiService = {
resolve(service.post(url, pid))
})
},
+ //取消（清除）点赞
+ cancelThumb(id) {
+ const url = `/center/thumbcls/?id=${id}`
+ return new Promise((resolve, reject) => {
+ resolve(service.post(url, id))
+ })
+ },
//获取个人信息
getUser() {
const url = `/center/userinfo`
@@ -333,6 +340,13 @@ const apiService = {
resolve(service.post(url, data))
})
},
+ // 获取客服电话
+ getCsTel() {
+ const url = `/center/cfg?key=cs_tel`
+ return new Promise((resolve, reject) => {
+ resolve(service.get(url))
+ })
+ },
// 获取首页分类Tag
getTags(data) {
const url = `/home/tags`
diff --git a/static/styles/myAvatar.scss b/static/styles/myAvatar.scss
index 96e4b43..0a82fd0 100644
--- a/static/styles/myAvatar.scss
+++ b/static/styles/myAvatar.scss
@@ -16,7 +16,7 @@
}
.my_avatar {
- margin-top: -200rpx;
+ margin-top: -184rpx;
display: flex;
flex-direction: column;
align-items: center;