diff --git a/App.vue b/App.vue index a99d304..cfedc98 100644 --- a/App.vue +++ b/App.vue @@ -21,5 +21,11 @@ } .page{ padding-top: var(--window-top); + + } + .pageList{ + /deep/ .uv-search__content__input{ + padding: 10rpx !important; + } } diff --git a/api/api.js b/api/api.js index 00af5ed..e510310 100644 --- a/api/api.js +++ b/api/api.js @@ -91,11 +91,16 @@ const config = { url: '/city/getRentDetail', method: 'GET', }, - //根据分类获取动态帖子列表带分页 + //获取动态帖子列表 getPostPage: { url: '/city/getPostPage', method: 'GET', }, + //获取帖子详情 + getPostDetail: { + url: '/city/getPostDetail', + method: 'GET', + }, //获取活动列表信息 getActivityPage: { url: '/city/getActivityPage', @@ -121,6 +126,11 @@ const config = { url: '/city/getCityList', method: 'GET', }, + //获取景点列表带分页 + getScenicPage: { + url: '/city/getScenicPage', + method: 'GET', + }, @@ -134,6 +144,18 @@ const config = { limit : 1000, auth : true, }, + //查询自己发布的动态 + getMyPostPage: { + url: '/token/getMyPostPage', + method: 'GET', + auth : true, + }, + //删除自己发布的动态 + deletePost: { + url: '/token/deletePost', + method: 'POST', + auth : true, + }, //店铺认证 companyAuthentication: { url: '/token/companyAuthentication', diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue index 444ba15..fbb0adf 100644 --- a/components/base/tabbar.vue +++ b/components/base/tabbar.vue @@ -9,9 +9,13 @@ v-if="!item.isNotShop || !userShop" @click="toPath(item, index)"> - + item.iconPath" class="icon-image" mode=""> --> + {{ item.title }} @@ -36,25 +40,29 @@ "selectedIconPath": "/static/image/tabbar/home-a.png", "iconPath": "/static/image/tabbar/home.png", "pagePath": "/pages/index/index", - "title": "首页" + "title": "首页", + icon : 'home', }, { "selectedIconPath": "/static/image/tabbar/order-a.png", "iconPath": "/static/image/tabbar/order.png", "pagePath": "/pages/index/activity", - "title": "活动" + "title": "活动", + icon : 'gift', }, { "selectedIconPath": "/static/image/tabbar/cart-a.png", "iconPath": "/static/image/tabbar/cart.png", "pagePath": "/pages/index/message", "title": "消息", + icon : 'chat', }, { "selectedIconPath": "/static/image/tabbar/center-a.png", "iconPath": "/static/image/tabbar/center.png", "pagePath": "/pages/index/center", - "title": "我的" + "title": "我的", + icon : 'account', } ] }; @@ -100,6 +108,10 @@ .icon{ width: 54rpx; height: 54rpx; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; .icon-image{ width: 54rpx; height: 54rpx; diff --git a/components/list/dynamic/dynamicItem.vue b/components/list/dynamic/dynamicItem.vue index 048651b..ba45c81 100644 --- a/components/list/dynamic/dynamicItem.vue +++ b/components/list/dynamic/dynamicItem.vue @@ -1,25 +1,34 @@ \ No newline at end of file diff --git a/components/user/sharePopup.vue b/components/user/sharePopup.vue new file mode 100644 index 0000000..084cc99 --- /dev/null +++ b/components/user/sharePopup.vue @@ -0,0 +1,46 @@ + + + + + \ No newline at end of file diff --git a/dict/dict.js b/dict/dict.js new file mode 100644 index 0000000..3a2664f --- /dev/null +++ b/dict/dict.js @@ -0,0 +1,14 @@ + + +export default { + sex : { + 男 : { + name : 'man', + color : '#5baaff', + }, + 女 : { + name : 'woman', + color : '#ff50b3', + }, + }, +} \ No newline at end of file diff --git a/mixins/sex.js b/mixins/sex.js new file mode 100644 index 0000000..94bf59e --- /dev/null +++ b/mixins/sex.js @@ -0,0 +1,30 @@ + + +export default { + data() { + return { + sex : { + 男 : { + name : 'man', + color : '#5baaff', + }, + 女 : { + name : 'woman', + color : '#ff50b3', + }, + }, + sexList : [ + { + value : '男', + icon : 'man', + actColor : '#5baaff', + }, + { + value : '女', + icon : 'woman', + actColor : '#ff50b3', + }, + ], + } + }, +} \ No newline at end of file diff --git a/pages.json b/pages.json index 8ea147b..430e449 100644 --- a/pages.json +++ b/pages.json @@ -127,6 +127,12 @@ "style": { "enablePullDownRefresh" : true } + }, + { + "path": "scenicSpot/scenicSpotList", + "style": { + "enablePullDownRefresh" : true + } } ] }], diff --git a/pages/index/center.vue b/pages/index/center.vue index b615e26..6f339b3 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -8,43 +8,45 @@ + :src="userInfo.headImage" + mode="aspectFill"> - + 设置 - 狐友1712378974678376 + {{ userInfo.nickName || '墙友1712378974678376' }} - + - 未认证 + {{ auth[userInfo.idCardOpen] || '未认证' }} - 你已经成为狐友133天啦~ + - 2 + 0 关注 - - | @@ -62,12 +64,22 @@ - - + + + + @@ -76,18 +88,31 @@ \ No newline at end of file diff --git a/pages_order/components/list/workList/index.vue b/pages_order/components/list/workList/index.vue index 40d5b59..779552a 100644 --- a/pages_order/components/list/workList/index.vue +++ b/pages_order/components/list/workList/index.vue @@ -39,8 +39,10 @@ } }, methods: { - getData(){ + getData(title){ + this.queryParams.title = title this.$api(this.api, this.queryParams, res => { + uni.stopPullDownRefresh() if(res.code == 200){ this.list = res.result.records || res.result this.total = res.result.total || res.result.length diff --git a/pages_order/gourmet/gourmetList.vue b/pages_order/gourmet/gourmetList.vue index 821cb0b..8f13990 100644 --- a/pages_order/gourmet/gourmetList.vue +++ b/pages_order/gourmet/gourmetList.vue @@ -1,7 +1,18 @@