update

src/action/LoginAction.js

@@ -19,8 +19,8 @@ export default class LoginAction extends BaseACTION {
     })
   }
 
-  login (obj) {
-    return Login.login(obj).then(res => {
+  login (obj, param) {
+    return Login.login(obj, param).then(res => {
       return res || { test: 'OK' }
     }).catch(res => {
       return res || { test: 'OK' }

src/api/login_api.js

@@ -15,7 +15,7 @@ export default class LoginAPI extends BaseAPI {
    * 登录
    * @param {[string]} id resource_id
    */
-  login = (obj) => this.post('/share/v1/live-activity/login', obj, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' } })
+  login = (obj, param) => this.post(`/share/v1/live-activity/login?${param}`, obj, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' } })
   /**
    * 获取用户信息
    * @param {[object]} obj

src/pages/list/details.vue

 <template>
   <div>
-    <div class="top-f">
-      <top-title :title="detailData.name"></top-title>
-    </div>
-    <ul class="img-scroll">
-      <template v-for="(item, index) in JSON.parse(detailData.poster_url)">
-        <li :key="index"><img :src="item.file_url" alt=""></li>
-      </template>
-    </ul>
-    <div class="content">
-      <div class="live-state">
-        <div class="time">
-          <p>活动开始时间</p>
-          <p>{{ getDate(detailData.start_at) }}</p>
+    <div class="d-padd">
+      <div class="top-f">
+        <top-title :title="detailData.name"></top-title>
+      </div>
+      <ul class="img-scroll">
+        <template v-for="(item, index) in JSON.parse(detailData.poster_url)">
+          <li :key="index"><img :src="item.file_url" alt=""></li>
+        </template>
+      </ul>
+      <div class="content">
+        <div class="live-state">
+          <div class="time">
+            <p>活动开始时间</p>
+            <p>{{ getDate(detailData.start_at) }}</p>
+          </div>
+          <div class="state">
+            <p>活动直播间状态</p>
+            <p :class="detailData.live_status == 1 ? 'active1' : detailData.live_status == 2 ? 'active2' : 'active3'" @click="joinActivity(detailData.live_status)">
+              <span>{{ detailData.live_status == 1 ? '直播未开始' : detailData.live_status == 2 ? '直播进行中' : '直播已结束' }}</span>
+              <span v-if="detailData.live_status == 2" class="icon"></span>
+            </p>
+            <!-- <p
+              :class="detailData.live_status == 1 ? 'active1' : detailData.live_status == 2 ? 'active2' : ''"
+            >{{ detailData.live_status == 1 ? '直播未开始' : detailData.live_status == 2 ? '直播进行中' : '直播已结束' }}</p> -->
+          </div>
         </div>
-        <div class="state">
-          <p>活动直播间状态</p>
-          <p :class="detailData.live_status == 1 ? 'active1' : detailData.live_status == 2 ? 'active2' : 'active3'" @click="joinActivity(detailData.live_status)">
-            <span>{{ detailData.live_status == 1 ? '直播未开始' : detailData.live_status == 2 ? '直播进行中' : '直播已结束' }}</span>
-            <span v-if="detailData.live_status == 2" class="icon"></span>
-          </p>
-          <!-- <p
-            :class="detailData.live_status == 1 ? 'active1' : detailData.live_status == 2 ? 'active2' : ''"
-          >{{ detailData.live_status == 1 ? '直播未开始' : detailData.live_status == 2 ? '直播进行中' : '直播已结束' }}</p> -->
+        <div class="duce">
+          <div class="title">活动介绍</div>
+          <div class="txt" v-html="detailData.introduce"></div>
+        </div>
+        <div class="duce">
+          <div class="title">活动内容</div>
+          <div class="txt" v-html="detailData.content"></div>
+        </div>
+        <div class="list" v-if="detailData.live_status == 3" @click="goPlayback">
+          <div class="title">活动回放记录</div>
+          <van-icon name="arrow" class="icon"/>
+        </div>
+        <div class="join-user">
+          <div class="title">参与活动的用户</div>
+          <ul>
+            <template v-for="(item, index) in userList">
+              <li :key="index" v-if="item.user_info">
+                <img :src="item.user_info.avatar" alt="">
+                <div class="info">
+                  <div class="name">{{ item.user_info.nickname }}</div>
+                  <div class="time">{{ getDate(item.join_activity_time) }}</div>
+                </div>
+              </li>
+            </template>
+          </ul>
         </div>
       </div>
-      <div class="duce">
-        <div class="title">活动介绍</div>
-        <div class="txt" v-html="detailData.introduce"></div>
-      </div>
-      <div class="duce">
-        <div class="title">活动内容</div>
-        <div class="txt" v-html="detailData.content"></div>
-      </div>
-      <div class="list" v-if="detailData.live_status == 3" @click="goPlayback">
-        <div class="title">活动回放记录</div>
-        <van-icon name="arrow" class="icon"/>
-      </div>
-      <div class="join-user">
-        <div class="title">参与活动的用户</div>
-        <ul>
-          <template v-for="(item, index) in userList">
-            <li :key="index" v-if="item.user_info">
-              <img :src="item.user_info.avatar" alt="">
-              <div class="info">
-                <div class="name">{{ item.user_info.nickname }}</div>
-                <div class="time">{{ getDate(item.join_activity_time) }}</div>
-              </div>
-            </li>
-          </template>
-        </ul>
-      </div>
+    </div>
+    <div class="tabbar-box">
+      <tabbar></tabbar>
     </div>
   </div>
 </template>
 <script>
+import tabbar from '../../components/tabbar.vue'
 import { Toast } from 'vant'
 import action from '@action'
 import topTitle from '../../components/topTitle.vue'
 export default {
   components: {
-    topTitle
+    topTitle,
+    tabbar
   },
   data() {
     return {
@@ -283,4 +290,13 @@ export default {
     }
   }
 }
+.tabbar-box{
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+}
+.d-padd{
+  padding-bottom: 1rem;
+}
 </style>

src/pages/login/index.vue

@@ -99,48 +99,50 @@ export default {
           return false
         }
       }
-      const urlParam = {}
+      let urlParam = ''
+      const urlParams = {}
       if (this.$route.query.activity_id) {
-        urlParam.activity_id = this.$route.query.activity_id
-        urlParam.source = this.$route.query.source
-        this.form.accountLogin2.activity_id = this.$route.query.activity_id
-        this.form.accountLogin2.source = this.$route.query.source
-        this.form.accountLogin1.activity_id = this.$route.query.activity_id
-        this.form.accountLogin1.source = this.$route.query.source
+        urlParam = `activity_id=${this.$route.query.activity_id}&source=${this.$route.query.source}`
+        urlParams.activity_id = this.$route.query.activity_id
+        urlParams.source = this.$route.query.source
+        // this.form.accountLogin2.activity_id = this.$route.query.activity_id
+        // this.form.accountLogin2.source = this.$route.query.source
+        // this.form.accountLogin1.activity_id = this.$route.query.activity_id
+        // this.form.accountLogin1.source = this.$route.query.source
       }
       Toast.loading({
         message: '加载中...',
         duration: 3000
       })
-      action.Login.login(this.loginType ? this.form.accountLogin2 : this.form.accountLogin1).then((res) => {
+      action.Login.login(this.loginType ? this.form.accountLogin2 : this.form.accountLogin1, urlParam).then((res) => {
         Toast.clear()
         if (res.code === 0) {
           this.$router.push({
             path: '/details',
-            query: urlParam
+            query: urlParams
           })
         }
         Toast(res.msg)
       })
     },
     isLogin() {
-      const param = {
-        action: 3
-      }
+      let param = ''
+      const pathParam = {}
       if (this.$route.query.activity_id) {
-        param.activity_id = this.$route.query.activity_id
-        param.source = this.$route.query.source
+        param = `activity_id=${this.$route.query.activity_id}&source=${this.$route.query.source}`
+        pathParam.activity_id = this.$route.query.activity_id
+        pathParam.source = this.$route.query.source
       }
       Toast.loading({
         message: '加载中...',
         duration: 3000
       })
-      action.Login.login(param).then((res) => {
+      action.Login.login({ action: 3 }, param).then((res) => {
         Toast(res.msg)
         if (res.code === 5004) {
           this.$router.push({
             path: '/details',
-            query: param
+            query: pathParam
           })
           // 跳转
         }