diff --git a/components/myAvatar/myAvatar.vue b/components/myAvatar/myAvatar.vue index 7bb3d68..bb648e4 100644 --- a/components/myAvatar/myAvatar.vue +++ b/components/myAvatar/myAvatar.vue @@ -4,7 +4,7 @@ - + @@ -71,10 +71,12 @@ this.isLoad = false } var data = res.data.data + console.log('data个人信息', data); if (data) { this.avatar = uni.getStorageSync('img_url') + data.avatar this.nickname = data.nickname this.member = data.member + uni.setStorageSync('user_id', data.user_id) uni.setStorageSync('member', data.member) uni.setStorageSync('agreement', data.agreement) uni.setStorageSync('com_name', data.com_name) diff --git a/components/myForm/myForm.vue b/components/myForm/myForm.vue index f29679c..4550eb0 100644 --- a/components/myForm/myForm.vue +++ b/components/myForm/myForm.vue @@ -3,11 +3,11 @@ + placeholderStyle="color: #CCCCCC;font-size: 24rpx;" :disabled="disabled"> + placeholderStyle="color: #CCCCCC;font-size: 24rpx;" :disabled="disabled"> @@ -19,6 +19,7 @@ name: "myForm", data() { return { + disabled: false, model: { userInfo: { name: '', @@ -27,6 +28,9 @@ }, }; }, + options: { + styleIsolation: 'shared', // 解除样式隔离 + }, created() { // if (uni.getStorageSync('com_mobile') && uni.getStorageSync('com_name')) { // this.model.userInfo.name = uni.getStorageSync('com_name') @@ -36,6 +40,8 @@ } - diff --git a/packageMy/bindCompany/bindCompany.vue b/packageMy/bindCompany/bindCompany.vue index 5384b85..ca58d82 100644 --- a/packageMy/bindCompany/bindCompany.vue +++ b/packageMy/bindCompany/bindCompany.vue @@ -21,32 +21,32 @@ } }, methods: { - handleSureClick() { - let name = this.$refs.nameAndphone.model.userInfo.name - let phone = this.$refs.nameAndphone.model.userInfo.phone - if (!/^1[3456789]\d{9}$/.test(phone)) { - this.$toast.warn('请输入正确的手机号') - return false - } - this.$apiServe.bindComponyAndUpdate({ - uid: 1, - type: 1, - companyName: name, - companyPhone: phone - }).then(res => { - console.log('绑定公司', res.data); - if (res.data.code == 20003) { - this.showM = true - } else if (res.data.code == 20005) { - this.$toast.warn('请完善数据') - } - }).finally(_ => {}) - }, - confirm() { - uni.reLaunch({ - url: '/pages/my/my' - }) - } + // handleSureClick() { + // let name = this.$refs.nameAndphone.model.userInfo.name + // let phone = this.$refs.nameAndphone.model.userInfo.phone + // if (!/^1[3456789]\d{9}$/.test(phone)) { + // this.$toast.warn('请输入正确的手机号') + // return false + // } + // // this.$apiServe.bindComponyAndUpdate({ + // // uid: 1, + // // type: 1, + // // companyName: name, + // // companyPhone: phone + // // }).then(res => { + // // console.log('绑定公司', res.data); + // // if (res.data.code == 20003) { + // // this.showM = true + // // } else if (res.data.code == 20005) { + // // this.$toast.warn('请完善数据') + // // } + // // }).finally(_ => {}) + // }, + // confirm() { + // uni.reLaunch({ + // url: '/pages/my/my' + // }) + // } } } diff --git a/packageMy/memberCenter/memberCenter.vue b/packageMy/memberCenter/memberCenter.vue index f146f9a..7028ea0 100644 --- a/packageMy/memberCenter/memberCenter.vue +++ b/packageMy/memberCenter/memberCenter.vue @@ -49,6 +49,11 @@ if (option.ask == 1) { this.needAsk = option.ask } + if (uni.getStorageSync('com_name') && uni.getStorageSync('com_mobile')) { + this.$refs.nameAndphone.model.userInfo.name = uni.getStorageSync('com_name') + this.$refs.nameAndphone.model.userInfo.phone = uni.getStorageSync('com_mobile') + this.$refs.nameAndphone.disabled = true + } }, methods: { handleSureClick() { @@ -69,7 +74,7 @@ if (name && phone) { console.log('数据已完善'); this.$apiServe.bindComponyAndUpdate({ - uid: 1, + uid: uni.getStorageSync('user_id'), type: 2, companyName: name, companyPhone: phone diff --git a/packageMy/myRelease/myRelease.vue b/packageMy/myRelease/myRelease.vue index 2aa3869..9818231 100644 --- a/packageMy/myRelease/myRelease.vue +++ b/packageMy/myRelease/myRelease.vue @@ -12,7 +12,7 @@ {{item.update_time}} - {{item.pub_time}} + {{item.update_time}} @@ -39,7 +39,7 @@ {{item.update_time}} - {{item.pub_time}} + {{item.update_time}} diff --git a/pages/detail/productsDetail/productsDetail.vue b/pages/detail/productsDetail/productsDetail.vue index 2f29982..acd673b 100644 --- a/pages/detail/productsDetail/productsDetail.vue +++ b/pages/detail/productsDetail/productsDetail.vue @@ -155,22 +155,13 @@ this.showUpdating = true } - if (detail) { detail.pub_time = dateFormatDetail(detail.pub_time) if (detail.tags) { detail.tags = detail.tags.split(',') } //点赞数 - if (detail.thumbcount !== 0 && detail.is_thumb == 0) { - detail.thumb = parseInt(detail.thumb) + parseInt(detail.thumbcount) - } else { - if (detail.is_thumb == 1) { - detail.thumb = parseInt(detail.thumb) + parseInt(detail.thumbcount) - } else { - detail.thumb = parseInt(detail.thumb) - parseInt(detail.thumbcount) - } - } + detail.thumb = parseInt(detail.thumb) + parseInt(detail.thumbcount) this.detailList = detail } }).finally(_ => {}) diff --git a/pages/ideasAndNeeds/ideasAndNeeds.vue b/pages/ideasAndNeeds/ideasAndNeeds.vue index f06ab2e..312e6c8 100644 --- a/pages/ideasAndNeeds/ideasAndNeeds.vue +++ b/pages/ideasAndNeeds/ideasAndNeeds.vue @@ -9,10 +9,10 @@ + placeholder-style="color:#CCCCCC" :disabled="btnDisabled" disabledColor="#ffffff" /> - + {{needsPublishForm.area_name}} 请选择所在城市 @@ -26,39 +26,46 @@ + placeholder-style="color:#CCCCCC" :disabled="btnDisabled" disabledColor="#ffffff" /> - + {{needsPublishForm.class}} 请选择分类 + @cancel="showCategoryPicker = false" @confirm="getCategoryValue"> + - + {{needsPublishForm.product}} 请选择产品类型 + @cancel="showProductPicker = false" @confirm="getProductValue"> + - + {{needsPublishForm.loc}} 请选择产品定位 + @cancel="showPositionPicker = false" @confirm="getPositionValue"> + + :maxlength="120" placeholder-style="color:#CCCCCC" :disabled="btnDisabled" + disabledColor="#ffffff"> @@ -66,7 +73,7 @@ + name="1" multiple :maxCount="10" :disabled="btnDisabled"> @@ -74,7 +81,7 @@ + placeholder-style="color:#CCCCCC" :disabled="btnDisabled" disabledColor="#ffffff">