Merge branch 'dev_lqs' into 'master'

优化

See merge request !106

H5/src/views/invite.vue

@@ -39,7 +39,8 @@ export default {
         forbidClick: true,
         message: "加载中..."
       });
-      inviteCode(this.$userId).then(res => {
+      const userId = JSON.parse(localStorage.getItem("user")).userId;
+      inviteCode(userId).then(res => {
         if (loading) _this.$toast.clear();
         _this.imgSrc = _this.getUserPhoto(res);
       });

H5/src/views/leagueNums.vue

@@ -75,7 +75,8 @@ export default {
   },
   methods: {
     getMyTeam() {
-      getMyTeam(this.$userId).then(res => {
+      const userId = JSON.parse(localStorage.getItem("user")).userId;
+      getMyTeam(userId).then(res => {
         if (res.data) {
           this.list.forEach(v => {
             v.num = res.data[v["field"]];

H5/src/views/my/myStatus.vue

@@ -28,13 +28,14 @@
           :key="`tba-${item.id}`"
           :title="`${item.name}(${item.num})`"
         >
-          <base-refresh-scroll @downLoad="onDownLoad" @upRefresh="onUpRefresh">
-            <div slot="content">
+          <!-- <base-refresh-scroll @downLoad="onDownLoad" @upRefresh="onUpRefresh"> -->
+          <div v-if="inviteeArr.length > 0">
             <div v-for="item in inviteeArr" :key="item.id">
               <invitee-item :invitee-item="item" />
             </div>
           </div>
-          </base-refresh-scroll>
+          <p class="no-data" v-else>暂无数据~</p>
+          <!-- </base-refresh-scroll> -->
         </van-tab>
       </van-tabs>
     </div>
@@ -43,13 +44,13 @@
 
 <script>
 import { recomendInfo, recommendDetail } from "@/api/myStatus";
-import BaseRefreshScroll from "../../components/BaseRefreshScroll.vue";
+// import BaseRefreshScroll from "../../components/BaseRefreshScroll.vue";
 import InviteeItem from "./components/invitee";
 export default {
   name: "MyStatus",
   components: {
-    InviteeItem,
-    BaseRefreshScroll
+    InviteeItem
+    // BaseRefreshScroll
   },
   filters: {
     userLevel(key) {
@@ -154,6 +155,7 @@ export default {
   },
   methods: {
     changeTab(name) {
+      console.log("tab", name);
       this.getRecommendDetail(name);
     },
     onDownLoad(val) {
@@ -253,6 +255,11 @@ export default {
     }
   }
 }
+.no-data {
+  text-align: center;
+  font-size: 12px;
+}
+
 ::v-deep .van-tabs__content {
   position: relative;
   height: 100vh;