diff --git a/pages.json b/pages.json
index c158908..628bd3f 100644
--- a/pages.json
+++ b/pages.json
@@ -16,8 +16,8 @@
"text": "分类"
}, {
"pagePath": "pages/shopList/index",
- "iconPath": "static/tabbar/serve.png",
- "selectedIconPath": "static/tabbar/serve-active.png",
+ "iconPath": "static/tabbar/shop.png",
+ "selectedIconPath": "static/tabbar/shop-active.png",
"text": "商户"
}, {
"pagePath": "pages/cart/index",
diff --git a/pages/feedback/form.vue b/pages/feedback/form.vue
index a4248e2..967da2f 100644
--- a/pages/feedback/form.vue
+++ b/pages/feedback/form.vue
@@ -1,59 +1,70 @@
-
-
-
- *问题类型
-
-
-
-
-
- {{ item }}
+
+
+
+
+ *问题类型
+
+
+
+
+
+ {{ item }}
+
-
-
-
- *反馈与建议
-
-
-
-
- 已写{{ form.suggest.length }}/299个字
+
+
+ *反馈与建议
-
-
-
-
+
+
+
+ 已写{{ form.suggest.length }}/299个字
-
-
- 添加照片
- 最多5张
+
+
+
+
+
+
+
+ 添加照片
+ 最多5张
+
+ {{ form.images.length }}/5
- {{ form.images.length }}/5
-
-
-
-
- 您的姓名
-
-
-
- 您的电话
-
-
-
- 您的单位
-
+
+
+
+ 您的姓名
+
+
+
+ 您的电话
+
+
+
+ 您的单位
+
+
-
- 提交
+ 提交
+
+
+
+
+ 提交成功
+ 您的反馈意见已经提交成功，
+ 预计1-2个工作日内与您联系。
+
+ 完成
+
@@ -79,6 +90,7 @@ import * as Api from '@/api/feedback/index.js'
unit: '',
},
loading: false,
+ isSubmit: false,
};
},
methods: {
@@ -192,18 +204,17 @@ import * as Api from '@/api/feedback/index.js'
.then(res => {
console.log(res);
this.loading = false;
- uni.showToast({
- title: '添加成功！'
- });
- setTimeout(() => {
- uni.navigateBack();
- }, 1500);
+ this.isPublish = true;
})
.catch(() => {
this.loading = false;
})
}
},
+
+ back() {
+ uni.navigateBack();
+ },
},
};
@@ -360,5 +371,33 @@ import * as Api from '@/api/feedback/index.js'
text-align: center;
margin-top: 30rpx;
}
+
+ .success {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ padding-top: 140rpx;
+ >image {
+ width: 189rpx;
+ height: 166rpx;
+ }
+ .success-tip {
+ margin: 34rpx 0 28rpx;
+ color: #222222;
+ font-size: 36rpx;
+ line-height: 36rpx;
+ }
+ uni-text {
+ color: #666666;
+ font-size: 28rpx;
+ line-height: 40rpx;
+ }
+ }
+ .back {
+ position: fixed;
+ left: 24rpx;
+ width: 702rpx;
+ bottom: 43rpx;
+ }
}
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index eb9e583..e4dc1a6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -607,23 +607,17 @@
type: 2
},
{
- image: `${this.$picUrl}/static/index/g5.png?n=` + new Date().getTime(),
+ image: '/static/tabbar/serve-active.png',
text: "服务",
path: '/pages/serve/index',
type: 2
},
{
- image: `${this.$picUrl}/static/index/g5.png?n=` + new Date().getTime(),
+ image: `${this.$picUrl}/static/index/g6.png?n=` + new Date().getTime(),
text: "广场动态",
path: '/pages/squareDynamic/index',
type: 2
},
- {
- image: `${this.$picUrl}/static/index/g5.png?n=` + new Date().getTime(),
- text: "意见反馈",
- path: '/pages/feedback/index',
- type: 2
- },
],
catagoryList: [],
paihangList: [],
diff --git a/pages/squareDynamic/index.vue b/pages/squareDynamic/index.vue
index a6b178e..7e2fb5b 100644
--- a/pages/squareDynamic/index.vue
+++ b/pages/squareDynamic/index.vue
@@ -47,6 +47,7 @@
暂无动态
import * as Api from '@/api/squareDynamic/index.js'
+ import {
+ checkLogin
+ } from '@/core/app'
+ import * as UserApi from '@/api/user';
export default {
components: {
@@ -89,6 +94,8 @@
windowHeight: 0,
isMove: true,
edge: 20,
+ userInfo: {},
+ isLogin: false,
};
},
watch: {
@@ -125,8 +132,45 @@
this.page = 1;
this.dynamicList = [];
this.getDynamicList();
+ if (uni.getStorageSync("userInfo").user_id) {
+ this.isLogin = true
+ this.onRefreshPage()
+ } else {
+ this.userInfo = {}
+ }
},
methods: {
+ // 刷新页面
+ onRefreshPage() {
+ this.isLogin = checkLogin()
+ console.log(this.isLogin, '是否登录')
+ // 获取页面数据
+ this.getUserInfo();
+ },
+ // 获取当前用户信息
+ getUserInfo() {
+ const that = this
+ return new Promise((resolve, reject) => {
+ !that.isLogin ? resolve(null) : UserApi.info({}, {
+ load: false
+ })
+ .then(result => {
+ let data = result.data.userInfo
+
+ that.userInfo = data
+ uni.setStorageSync('userInfo', that.userInfo)
+ resolve(that.userInfo)
+ })
+ .catch(err => {
+ if (err.result && err.result.status == 401) {
+ that.isLogin = false
+ resolve(null)
+ } else {
+ reject(err)
+ }
+ })
+ })
+ },
async getDynamicList() {
if (this.loading || this.finished) {
return;
diff --git a/pages/squareDynamic/publish.vue b/pages/squareDynamic/publish.vue
index cf3c7d0..b72af3e 100644
--- a/pages/squareDynamic/publish.vue
+++ b/pages/squareDynamic/publish.vue
@@ -48,7 +48,7 @@ import * as Api from '@/api/squareDynamic/index.js'
imageList: [],
uploadImages: [],
content: '',
- cateList: ['晒单', '日常', '文章'],
+ cateList: ['推荐', '精选','晒单', '日常', '文章'],
cateIndex: -1,
isPublish: false,
loading: false,
diff --git a/pages/user/index.vue b/pages/user/index.vue
index ed7ac19..30f1aee 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -509,6 +509,12 @@
进群有礼
+
+
+
+ 意见反馈
+
+
diff --git a/static/feedback/feedback.png b/static/feedback/feedback.png
new file mode 100644
index 0000000..8e6f04c
Binary files /dev/null and b/static/feedback/feedback.png differ
diff --git a/static/tabbar/shop-active.png b/static/tabbar/shop-active.png
new file mode 100644
index 0000000..4cf5619
Binary files /dev/null and b/static/tabbar/shop-active.png differ
diff --git a/static/tabbar/shop.png b/static/tabbar/shop.png
new file mode 100644
index 0000000..b7fc37f
Binary files /dev/null and b/static/tabbar/shop.png differ