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 @@
-
-
+
+
-
+ {{ item.userName }}
-
- 男性
+
+
+ {{ item.sex }}
-
- 99年
+
+
+ {{ item.yearDate }}
-
- 大路铺镇
+
+
+ {{ item.address }}
-
- 官方认证
+
+
+ {{ item.isContent }}
@@ -37,7 +46,9 @@
-
+
@@ -49,16 +60,24 @@
{{ item.isComment }}条评论
-
+
+
+
+
\ 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 @@
-
+
+
+
+
+
{
+ n.detailsImage = n.detailsImage ? n.detailsImage.split(',') : []
+ n.details = n.details ? n.details.split(',') : []
+ })
+ },
}
}
@@ -35,7 +51,7 @@
diff --git a/pages_order/post/addPost.vue b/pages_order/post/addPost.vue
index d873052..e84a4ac 100644
--- a/pages_order/post/addPost.vue
+++ b/pages_order/post/addPost.vue
@@ -18,6 +18,7 @@
:maxlength="200"
autoHeight
count
+ style="min-height: 400rpx;"
placeholder="说点什么吧">
@@ -25,7 +26,7 @@
{{ t.title }}
@@ -49,6 +50,25 @@
+
+
+ 选择地区
+
+
+
+ {{ t.name }}
+
+
+
+
+
+
+
+
+ style="padding: 20rpx;">
+ item.image.split(',')[0]" />
{{ item.title }}
@@ -82,6 +75,7 @@
diff --git a/pages_order/work/workList.vue b/pages_order/work/workList.vue
index 183b571..a93826e 100644
--- a/pages_order/work/workList.vue
+++ b/pages_order/work/workList.vue
@@ -1,7 +1,18 @@
-
+
+
+
+
+
@@ -15,24 +26,25 @@
},
data() {
return {
-
+ title : '',
}
},
onShow() {
- this.$refs.workList.getData()
+ this.getData()
},
onPullDownRefresh() {
- this.$refs.workList.getData()
+ this.getData()
},
onReachBottom() {
this.$refs.workList.loadMoreData()
},
methods: {
-
+ getData(){
+ this.$refs.workList.getData(this.title)
+ },
}
}
diff --git a/static/image/cart/1.png b/static/image/cart/1.png
deleted file mode 100644
index 9807f34..0000000
Binary files a/static/image/cart/1.png and /dev/null differ
diff --git a/static/image/center/1.png b/static/image/center/1.png
deleted file mode 100644
index 264e553..0000000
Binary files a/static/image/center/1.png and /dev/null differ
diff --git a/static/image/center/11.svg b/static/image/center/11.svg
deleted file mode 100644
index 99950a8..0000000
--- a/static/image/center/11.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/static/image/center/2.png b/static/image/center/2.png
deleted file mode 100644
index 5e0bedc..0000000
Binary files a/static/image/center/2.png and /dev/null differ
diff --git a/static/image/center/3.png b/static/image/center/3.png
deleted file mode 100644
index 8b521ac..0000000
Binary files a/static/image/center/3.png and /dev/null differ
diff --git a/static/image/center/4.png b/static/image/center/4.png
deleted file mode 100644
index 5ad41ea..0000000
Binary files a/static/image/center/4.png and /dev/null differ
diff --git a/static/image/center/5.png b/static/image/center/5.png
deleted file mode 100644
index 4f4a8ac..0000000
Binary files a/static/image/center/5.png and /dev/null differ
diff --git a/static/image/center/6.png b/static/image/center/6.png
deleted file mode 100644
index 9208b06..0000000
Binary files a/static/image/center/6.png and /dev/null differ
diff --git a/static/image/center/7.png b/static/image/center/7.png
deleted file mode 100644
index ea1a427..0000000
Binary files a/static/image/center/7.png and /dev/null differ
diff --git a/static/image/center/8.png b/static/image/center/8.png
deleted file mode 100644
index 856616c..0000000
Binary files a/static/image/center/8.png and /dev/null differ
diff --git a/static/image/center/9.png b/static/image/center/9.png
deleted file mode 100644
index 5a4b2bd..0000000
Binary files a/static/image/center/9.png and /dev/null differ
diff --git a/static/image/home/0.png b/static/image/home/0.png
deleted file mode 100644
index e221211..0000000
Binary files a/static/image/home/0.png and /dev/null differ
diff --git a/static/image/home/1.png b/static/image/home/1.png
deleted file mode 100644
index 0b7d3dc..0000000
Binary files a/static/image/home/1.png and /dev/null differ
diff --git a/static/image/home/2.png b/static/image/home/2.png
deleted file mode 100644
index 8ba997f..0000000
Binary files a/static/image/home/2.png and /dev/null differ
diff --git a/static/image/home/3.png b/static/image/home/3.png
deleted file mode 100644
index a7f85f3..0000000
Binary files a/static/image/home/3.png and /dev/null differ
diff --git a/static/image/home/address-icon.png b/static/image/home/address-icon.png
deleted file mode 100644
index 51a11d2..0000000
Binary files a/static/image/home/address-icon.png and /dev/null differ
diff --git a/static/image/home/arrow-icon.png b/static/image/home/arrow-icon.png
deleted file mode 100644
index 9f3431a..0000000
Binary files a/static/image/home/arrow-icon.png and /dev/null differ
diff --git a/static/image/home/cart.png b/static/image/home/cart.png
new file mode 100644
index 0000000..371977b
Binary files /dev/null and b/static/image/home/cart.png differ
diff --git a/static/image/home/photo.png b/static/image/home/photo.png
new file mode 100644
index 0000000..c730a2b
Binary files /dev/null and b/static/image/home/photo.png differ
diff --git a/static/image/home/search-icon.png b/static/image/home/search-icon.png
deleted file mode 100644
index 58bde8a..0000000
Binary files a/static/image/home/search-icon.png and /dev/null differ
diff --git a/static/image/tabbar/cart-a.png b/static/image/tabbar/cart-a.png
deleted file mode 100644
index b48261c..0000000
Binary files a/static/image/tabbar/cart-a.png and /dev/null differ
diff --git a/static/image/tabbar/cart.png b/static/image/tabbar/cart.png
deleted file mode 100644
index d211ea1..0000000
Binary files a/static/image/tabbar/cart.png and /dev/null differ
diff --git a/static/image/tabbar/category-a.png b/static/image/tabbar/category-a.png
deleted file mode 100644
index 6dd7bc6..0000000
Binary files a/static/image/tabbar/category-a.png and /dev/null differ
diff --git a/static/image/tabbar/category.png b/static/image/tabbar/category.png
deleted file mode 100644
index f667e88..0000000
Binary files a/static/image/tabbar/category.png and /dev/null differ
diff --git a/static/image/tabbar/center-a.png b/static/image/tabbar/center-a.png
deleted file mode 100644
index 61df5ef..0000000
Binary files a/static/image/tabbar/center-a.png and /dev/null differ
diff --git a/static/image/tabbar/center.png b/static/image/tabbar/center.png
deleted file mode 100644
index 74f685c..0000000
Binary files a/static/image/tabbar/center.png and /dev/null differ
diff --git a/static/image/tabbar/home-a.png b/static/image/tabbar/home-a.png
deleted file mode 100644
index 5388253..0000000
Binary files a/static/image/tabbar/home-a.png and /dev/null differ
diff --git a/static/image/tabbar/home.png b/static/image/tabbar/home.png
deleted file mode 100644
index 6f7accb..0000000
Binary files a/static/image/tabbar/home.png and /dev/null differ
diff --git a/static/image/tabbar/order-a.png b/static/image/tabbar/order-a.png
deleted file mode 100644
index 6192093..0000000
Binary files a/static/image/tabbar/order-a.png and /dev/null differ
diff --git a/static/image/tabbar/order.png b/static/image/tabbar/order.png
deleted file mode 100644
index df9eeb8..0000000
Binary files a/static/image/tabbar/order.png and /dev/null differ
diff --git a/uni.scss b/uni.scss
index 8397e52..9d1e07c 100644
--- a/uni.scss
+++ b/uni.scss
@@ -14,6 +14,7 @@
/* 颜色变量 */
$uni-color: #5baaff;
+
/* 行为相关颜色 */
$uni-color-primary: #1671ff;
$uni-color-success: #4cd964;
diff --git a/utils/index.js b/utils/index.js
index b40f098..b9514f5 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -27,4 +27,12 @@ Vue.prototype.$dayjs = dayjs
Vue.prototype.$timeUtils = time
Vue.prototype.$utils = util
-Vue.prototype.$md5 = md5
\ No newline at end of file
+Vue.prototype.$md5 = md5
+
+
+Vue.prototype.previewImage = (urls, current) => {
+ uni.previewImage({
+ urls,
+ current,
+ })
+}
\ No newline at end of file