diff --git a/pages.json b/pages.json
index 6b4ce37..1b74136 100644
--- a/pages.json
+++ b/pages.json
@@ -74,6 +74,15 @@
},
{
"path": "mine/promotion"
+ },
+ {
+ "path": "mine/IntegralRecord"
+ },
+ {
+ "path": "mine/MemberRecharge"
+ },
+ {
+ "path": "mine/GainPoints"
}
]
}],
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 168401c..5d31f90 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -19,10 +19,10 @@
手机号:1300000000
-
@@ -95,12 +95,12 @@
-
+
我的找活
-
+
谁看过我
@@ -111,23 +111,23 @@
我的服务
-
-
+
+
会员充值
-
+
获取积分
-
+
积分记录
-
+
实名认证
@@ -136,7 +136,7 @@
-
+
考证咨询
@@ -157,17 +157,17 @@
-
+
系统设置
-
+
帮助与反馈
-
+
关于本程序
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e76602c..458c5bb 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -21,7 +21,9 @@
-
+
@@ -34,14 +36,17 @@
- -->
+
-
-
-
+
+
+
+
+
+
@@ -55,6 +60,10 @@
import userList from '@/components/list/userList/index.vue'
import tabber from '@/components/base/tabbar.vue'
import screenWork from '@/components/screen/screenWork.vue'
+ import {
+ mapState,
+ mapGetters
+ } from 'vuex'
export default {
components : {
PrivacyAgreementPoup,
@@ -63,6 +72,9 @@
screenWork,
userList
},
+ computed: {
+ ...mapState(['userInfo', 'role']),
+ },
data() {
return {
baseList : [
@@ -101,8 +113,6 @@
keyword : '',
}
},
- computed : {
- },
// onPullDownRefresh(){
// this.$refs.videoList.queryVideoList()
// this.queryBannerList()
diff --git a/pages_order/mine/GainPoints.vue b/pages_order/mine/GainPoints.vue
new file mode 100644
index 0000000..8bc993c
--- /dev/null
+++ b/pages_order/mine/GainPoints.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/pages_order/mine/IntegralRecord.vue b/pages_order/mine/IntegralRecord.vue
new file mode 100644
index 0000000..d32b578
--- /dev/null
+++ b/pages_order/mine/IntegralRecord.vue
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+ 当前积分
+
+ 0
+
+
+
+
+ 正式积分:0
+
+
+ 临时积分:0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages_order/mine/MemberRecharge.vue b/pages_order/mine/MemberRecharge.vue
new file mode 100644
index 0000000..4fb0167
--- /dev/null
+++ b/pages_order/mine/MemberRecharge.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
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/cart/2.png b/static/image/cart/2.png
deleted file mode 100644
index 64b1c45..0000000
Binary files a/static/image/cart/2.png and /dev/null differ
diff --git a/static/image/center/2.png b/static/image/center/a1.png
similarity index 100%
rename from static/image/center/2.png
rename to static/image/center/a1.png
diff --git a/static/image/center/a2.png b/static/image/center/a2.png
new file mode 100644
index 0000000..b81a659
Binary files /dev/null and b/static/image/center/a2.png differ
diff --git a/static/image/center/3.png b/static/image/center/setting.png
similarity index 100%
rename from static/image/center/3.png
rename to static/image/center/setting.png
diff --git a/static/image/home/banner.png b/static/image/home/banner.png
index efd3d89..310fb64 100644
Binary files a/static/image/home/banner.png and b/static/image/home/banner.png differ
diff --git a/static/logo.png b/static/logo.png
deleted file mode 100644
index b5771e2..0000000
Binary files a/static/logo.png and /dev/null differ
diff --git a/store/store.js b/store/store.js
index 7c3e47c..9f0e776 100644
--- a/store/store.js
+++ b/store/store.js
@@ -9,14 +9,11 @@ import api from '@/api/api.js'
const store = new Vuex.Store({
state: {
configList: [], //配置列表
- shop : false,
+ // 角色 true为老板 false为工人
+ role : false,
userInfo : {}, //用户信息
},
getters: {
- // 角色 true为水洗店 false为酒店
- userShop(state){
- return state.shop
- }
},
mutations: {
// 初始化配置