diff --git a/packageA/search/index.vue b/packageA/search/index.vue index 120c3db..0502efa 100644 --- a/packageA/search/index.vue +++ b/packageA/search/index.vue @@ -63,7 +63,7 @@ {{item.release_time_text}} - {{item.views}} @@ -93,7 +93,7 @@ {{item.release_time_text}} - {{item.views}} @@ -120,7 +120,7 @@ {{item.release_time_text}} - {{item.views}} diff --git a/pages.json b/pages.json index 0207575..156b9fe 100644 --- a/pages.json +++ b/pages.json @@ -34,8 +34,7 @@ { "path": "pages/index/user", "style": { - "navigationBarTitleText": "个人中心", - "enablePullDownRefresh": true + "navigationBarTitleText": "个人中心" }, "meta": { "sync": true, diff --git a/pages/canteenRent/rentDetail.vue b/pages/canteenRent/rentDetail.vue index 434b4f5..8eaa6d5 100644 --- a/pages/canteenRent/rentDetail.vue +++ b/pages/canteenRent/rentDetail.vue @@ -47,7 +47,7 @@ - + {{detailRent.views}} @@ -577,7 +577,7 @@ padding-bottom: 0rpx; box-sizing: border-box; position: fixed; - bottom: 5rpx; + bottom: 0rpx; display: flex; align-items: center; justify-content: space-between; @@ -602,6 +602,10 @@ display: flex; align-items: center; justify-content: center; + font-size: 32rpx; + line-height: 20rpx; + font-weight: 400; + color: #333333; } } diff --git a/pages/canteenRent/rentList.vue b/pages/canteenRent/rentList.vue index 7c3717b..09bc4ea 100644 --- a/pages/canteenRent/rentList.vue +++ b/pages/canteenRent/rentList.vue @@ -81,7 +81,7 @@ {{item.release_time_text}} - {{item.views}} diff --git a/pages/index/fabu.vue b/pages/index/fabu.vue index 93da608..7e0c5ab 100644 --- a/pages/index/fabu.vue +++ b/pages/index/fabu.vue @@ -68,7 +68,7 @@ + style="margin-top: 20rpx;padding: 30rpx"> 详细信息 @@ -113,9 +113,9 @@ src="https://jiangxiaoxian.0rui.cn/rightMore.png"> - + - + {{ item.name }} @@ -136,7 +136,7 @@ - + @@ -146,7 +146,7 @@ src="https://jiangxiaoxian.0rui.cn/fbxySelected.png"> 我已阅读并同意 - 《发布须知》 + 《发布须知》 @@ -185,7 +185,7 @@ - @@ -350,37 +350,20 @@ getTagList(); getTypeList(); }) + //身份认证 function getAuthentied() { - sheep.$api.rent.isAuthentied().then((res) => { - if (res.code == 1) { - if (res.data.status == 1) { - cardShow.value = false; - } else { - cardShow.value = true; - } - } - }) - } - //发布须知 - function getFbKnow() { - sheep.$api.rent.fabuAgree().then((res) => { - if (res.code == 1) { - console.log('发布须知', res.data); - Negotiate.value = res.data.notice_publication_agreement - console.log('发布须知——Negotiate:', Negotiate.value); - } - }) - } - - function toAuthen() { if (isLogin.value == true) { - cardShow.value = false - uni.navigateTo({ - url: '/pages/user/authentication' + sheep.$api.rent.isAuthentied().then((res) => { + if (res.code == 1) { + if (res.data.status == 1) { + cardShow.value = false; + } else { + cardShow.value = true; + } + } }) - } else { - + }else { uni.showToast({ title: '请先登录', icon: 'none', @@ -392,10 +375,66 @@ url: '/pages/index/user' }) }, 2000); - + } + + } + function toAuthen() { + console.log('isLogin.value',isLogin.value); + if (isLogin.value == true) { + cardShow.value = false + uni.navigateTo({ + url: '/pages/user/authentication' + }) + } else { + + uni.showToast({ + title: '请先登录', + icon: 'none', + }) + cardShow.value = false + setTimeout(function() { + uni.switchTab({ + url: '/pages/index/user' + }) + }, 2000); + } } + + + //发布须知 + function getFbKnow() { + if (isLogin.value == true) { + sheep.$api.rent.fabuAgree().then((res) => { + if (res.code == 1) { + console.log('发布须知', res.data); + Negotiate.value = res.data.notice_publication_agreement + console.log('发布须知——Negotiate:', Negotiate.value); + } + }) + }else { + setTimeout(() => { + uni.showToast({ + title: '请先登录', + icon: 'none', + }) + + }, 500); + setTimeout(() => { + uni.switchTab({ + url: '/pages/index/user' + }) + + }, 2000); + + + + } + + + } + async function getTagList() { const res = await sheep.$api.rent.tagsList({}); if (res.code == 1) { @@ -716,10 +755,11 @@ align-items: center; .tagLab { - width: 197rpx; + width: 182rpx; height: 30rpx; - margin-right: 20rpx; - margin-bottom: 20rpx; + margin-right: 8rpx; + margin-top: 20rpx; + // margin-bottom: 20rpx; // display: grid; // box-sizing: border-box; // column-gap: 20rpx; @@ -955,6 +995,7 @@ width: 750rpx; // height: 200rpx; background: #FFFFFF; + // margin-top: 30rpx; border-radius: 0rpx 0rpx 0rpx 0rpx; position: fixed; bottom: 0; @@ -970,13 +1011,13 @@ .submitPublish { margin-left: 20rpx; width: 100%; - height: 98rpx; + height: 100rpx; // border: 2rpx solid #323232; background-color: #fcc74e; color: #333333; font-family: YouSheBiaoTiHei; font-size: 36rpx; - font-weight: 400; + font-weight: bold; text-align: center; margin: 0 auto; display: grid; diff --git a/pages/index/index.vue b/pages/index/index.vue index 7aad1b4..da4ecac 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -12,7 +12,7 @@ src="https://jiangxiaoxian.0rui.cn/locationTop.png" mode=""> + white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width: 200rpx;"> {{state.model.city_name ? proCity:'全国' }} @@ -117,7 +117,7 @@ {{item.release_time_text}} - {{item.views}} @@ -493,7 +493,7 @@ // align-items: center; .locTop-left { - width: 330rpx; + width: 250rpx; display: flex; align-items: center; justify-content: flex-start; @@ -501,7 +501,7 @@ } .locTop-right { - width: 360rpx; + width: 426rpx; height: 70rpx; } diff --git a/pages/index/user.vue b/pages/index/user.vue index 0f0d3e3..275c1e6 100644 --- a/pages/index/user.vue +++ b/pages/index/user.vue @@ -1,176 +1,194 @@