Merge branch 'master' of https://gitlab.ezijing.com/ezijing/ezijing-friends-h5

src/store/index.js

@@ -32,7 +32,7 @@ export default new Vuex.Store({
       const isLogin = await getUser()
         .then(response => {
           if (response.code === 0) {
-            commit('setUser', response)
+            commit('setUser', response.data)
             return true
           } else {
             commit('setUser', {})

src/views/attestation/buy/components/h5Pay.vue

@@ -34,7 +34,7 @@ export default {
   methods: {
     // 获取openid
     getOpenId() {
-      api.getOpenId({ id: this.user.data.id, identity: 'alumni' }).then(response => {
+      api.getOpenId({ id: this.user.id, identity: 'alumni' }).then(response => {
         this.openId = response.data.openid
         // 生成订单
         this.genOrder()

src/views/home/Index.vue

@@ -71,22 +71,33 @@ export default {
         { src: 'img/home_nav_03.png', title: '直播课', type: 3 },
         // { src: 'img/home_nav_04.png', title: '找工作', type: 4 },
         { src: 'img/home_nav_04.png', title: '运动家', type: 5 }
-      ],
-      popularList: [
+      ]
+    }
+  },
+  computed: {
+    user() {
+      return this.$store.state.user
+    },
+    popularList() {
+      return [
         {
-          title: '紫荆-索菲亚FMBA项目',
-          src: 'img/home_sofia.png',
-          href: 'https://pages.ezijing.com/sofia-mba/mobile/channel.html?channel_num=29756'
+          title: '紫荆-玛丽伍德MBA项目',
+          src: 'img/home_marywood.png',
+          href: `https://pages.ezijing.com/marywood/m204001490516.html?channel_num=19963&user_id=${this.user.id}`
         },
         {
           title: '紫荆-Kelley金融硕士项目',
           src: 'img/home_kelley.png',
-          href: 'https://pages.ezijing.com/sofia-mba/mobile/channel.html?channel_num=29756'
+          href: `https://pages.ezijing.com/sofia-mba/mobile/channel.html?channel_num=29756&user_id=${this.user.id}`
+        },
+        {
+          title: '紫荆-索菲亚FMBA项目',
+          src: 'img/home_sofia.png',
+          href: `https://pages.ezijing.com/sofia-mba/mobile/channel.html?channel_num=29756&user_id=${this.user.id}`
         }
       ]
     }
   },
-
   methods: {
     handleNavClick({ type }) {
       this.$router.push({ name: 'activity', query: { type } })
@@ -158,28 +169,28 @@ export default {
   background-size: contain;
 }
 .popular-list {
-  display: flex;
-  justify-content: space-between;
   // display: flex;
-  // overflow-x: auto;
-  // overflow-y: hidden;
-  // margin-left: -15px;
-  // margin-right: -15px;
-  // -webkit-overflow-scrolling: touch;
+  // justify-content: space-between;
+  display: flex;
+  overflow-x: auto;
+  overflow-y: hidden;
+  margin-left: -15px;
+  margin-right: -15px;
+  -webkit-overflow-scrolling: touch;
 }
 .popular-item {
   flex-shrink: 0;
   margin-bottom: 0.18rem;
-  // margin-right: 0.15rem;
+  margin-right: 0.15rem;
   width: 1.65rem;
   min-height: 1.4rem;
   background: #ffffff;
   box-shadow: 0px 2px 6px 0px rgba(74, 9, 25, 0.05);
   border-radius: 6px;
   overflow: hidden;
-  // &:first-child {
-  //   margin-left: 15px;
-  // }
+  &:first-child {
+    margin-left: 15px;
+  }
 }
 .popular-item-pic {
   height: 0.95rem;

src/views/my/Index.vue

@@ -18,6 +18,7 @@
         <div class="user-content">
           <div class="user-content__name">{{ user.personal_name }}</div>
           <div class="user-content__info">{{ user.class_name }}</div>
+          <div class="user-content__info">紫荆币：0</div>
         </div>
         <!-- <van-icon name="arrow" class="arrow-right"/> -->
         <!-- <div class="user-aside">

vue.config.js

@@ -10,7 +10,7 @@ module.exports = {
     },
     proxy: {
       '/api': {
-        target: 'https://alumni2.ezijing.com'
+        target: 'https://alumni.ezijing.com'
       }
     }
   }