-
请选择:
@@ -49,7 +48,9 @@
+
+
\ No newline at end of file
diff --git a/src/components/user/systematic-notification-pop.vue b/src/components/user/systematic-notification-pop.vue
index 2971371..2648be0 100644
--- a/src/components/user/systematic-notification-pop.vue
+++ b/src/components/user/systematic-notification-pop.vue
@@ -10,13 +10,13 @@
-
+
@@ -65,14 +65,31 @@
}
.attention {
- // margin: 0 auto;
- // width: 660px;
- // height: 50px;
- // background-color: rgba(255, 255, 255, 1);
- // border-radius: 230px;
- // -moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.0784313725490196);
- // -webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.0784313725490196);
- // box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.0784313725490196);
+ margin: -26px auto 0;
+ width: 660px;
+ height: 50px;
+ background-color: rgba(255, 255, 255, 1);
+ border-radius: 230px;
+ -moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.0784313725490196);
+ -webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.0784313725490196);
+ box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.0784313725490196);
+ font-size: 14px;
+ color: #7F7F7F;
+ justify-content: space-between;
+ padding-left: 16px;
+ padding-right: 8px;
+
+ .attention-btn {
+ width: 80px;
+ height: 36px;
+ background-color: rgba(253, 218, 85, 1);
+ border-radius: 54px;
+ font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
+ font-weight: 400;
+ font-size: 14px;
+ color: #000000;
+ cursor: pointer;
+ }
}
}
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 534e188..0eec708 100644
--- a/src/main.js
+++ b/src/main.js
@@ -42,7 +42,8 @@ api.index().then(res => {
store.state.ListSelectBtn = res.data.recommendedTab
store.state.user = res.data.user
store.state.nav = res.data.nav
- console.log(store.state.seachTypeData)
+ store.state.wechat = res.data.wechat
+ // console.log(store.state.seachTypeData)
}
})
diff --git a/src/store/index.js b/src/store/index.js
index f4f61d0..38cafb6 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2,14 +2,15 @@ import { createStore } from 'vuex'
export default createStore({
state: {
- seachTypeData:[],
- indexData:[],
- ListSelectBtn:[],
- user:{},
- nav:[],
+ seachTypeData: [],
+ indexData: [],
+ ListSelectBtn: [],
+ user: {}, // 我的信息数据
+ wechat: {}, // 微信号 二维码等数据
+ nav: [], // 顶部的导航数据
},
getters: {
-
+
},
mutations: {
},
diff --git a/src/views/user.vue b/src/views/user.vue
index e984790..194ffda 100644
--- a/src/views/user.vue
+++ b/src/views/user.vue
@@ -39,7 +39,7 @@