直播

components/My_NavTabs/index.wxss

@@ -8,20 +8,22 @@
 }
 
 .tbas_list {
+    width: 90%;
     display: flex;
+    justify-content: space-around;
     font-size: 28rpx;
-    margin-left: 44rpx;
+    /* margin-left: 44rpx; */
+    margin: 0 auto;
 }
 
 .tbas_list>view {
-    margin-left: 32rpx;
     line-height: 32rpx;
     height: 60rpx;
 }
 
-.tbas_list>view:first-child {
+/* .tbas_list>view:first-child {
     margin-left: 0;
-}
+} */
 
 .active {
     position: relative;

components/My_RoundedCornerButtonTabs/index.js

@@ -11,15 +11,18 @@ Component({
         /* 回调 */
         tabsSelectedIitem: {
             type: Function
+        },
+        /* 默认选中项 */
+        active: {
+            type: Number,
+            value: 0
         }
     },
 
     /**
      * 组件的初始数据
      */
-    data: {
-        active: 0, //默认选中项
-    },
+    data: {},
 
     /**
      * 组件的方法列表

pages/liveStreaming/index.js

@@ -8,21 +8,24 @@ Page({
    */
   data: {
     dataTypes: 0, //0-全部数据 1-单独数据
-    tabsList: ["私域直播", "展会直播"], //tabs列表
+    tabsList: ["私域直播", "展会直播", "合作商直播"], //tabs列表
+    buttonTabs: ["当前直播", "历史直播"], //按钮tabs
     tabsIndex: 0, //tabs下标
     accountStatus: -1, //直播账号状态 1-账号正常 2-账号审核中 3-没有账号
     //liveDataCount: {}, 实时数据统计
     liveDataCountForSession: {}, //单场次数据统计
     liveSessionList: [], //直播场次列表
     liveUserList: [], //直播用户观看记录
+    crLiveUserList: [], //当前直播用户观看记录
     pageNumber: 1, //当前页码
     pageTotal: 1, //列表总页数
     userPageNumber: 1, //用户当前页码
     userPageTotal: 1, //用户总列表
-    optionRow: -1, //列表选中项
     isSy: true, //是否为私域直播
     myShowModel: false, //自定义model
     myShowModel2: false, // 真正申请中提示
+    listRowIndex: -1, //列表选中项
+    CheckTheType: '当前直播', //查看类型
   },
 
   /**
@@ -32,20 +35,70 @@ Page({
     //获取直播账号
     this.getLiveInfo()
   },
+  /* 按钮tab回调 */
+  tabsSelectedIitem({
+    detail
+  }) {
+    if (detail == this.data.CheckTheType) return;
+    this.setData({
+      CheckTheType: detail
+    })
+  },
   /* 实时 */
   realTime() {
-    const that = this;
+    const that = this,
+      token = wx.getStorageSync('userData').token,
+      channelid = this.data.accountMsg.channelid;
+    /* 获取当前用户列表 */
+    this.getRealTimeViewerList();
+    //获取聊天
+    /* setInterval(() => {
+      _Http.basic({
+        "accesstoken": token,
+        "classname": "customer.live.live",
+        "method": "getRealTimeMessageList",
+        "content": {
+          "channelid": channelid
+        }
+      }, false).then(res => {
+        console.log("聊天", res)
+      })
+    }, 2000); */
+    _Http.basic({
+      "accesstoken": token,
+      "classname": "customer.live.live",
+      "method": "getRealTimeViewers",
+      "content": {
+        "channelid": channelid
+      }
+    }).then(res => {
+      console.log(res)
+    })
+  },
+  /* 获取当前用户列表 */
+  getRealTimeViewerList() {
     _Http.basic({
       "accesstoken": wx.getStorageSync('userData').token,
       "classname": "customer.live.live",
       "method": "getRealTimeViewerList",
       "content": {
-        "pageNumber": 1,
+        "pageNumber": this.data.pageNumber,
         "pageSize": 20,
-        "channelid": that.data.accountMsg.channelid
+        "channelid": this.data.accountMsg.channelid
       }
     }, false).then(res => {
       console.log(res)
+      if (res.msg != '成功') {
+        if (res.data.liveUserList.length <= 0) return wx.showToast({
+          title: res.data,
+          icon: "none"
+        });
+        return;
+      }
+      this.setData({
+        crLiveUserList: res.data,
+        pageTotal: res.pageTotal
+      })
     })
   },
   /* 自定义model回调 */
@@ -106,7 +159,6 @@ Page({
       "method": method,
       "content": {}
     }).then(res => {
-      console.log("不显示")
       const isSy = (method == "getSYLiveInfo") ? true : false;
       this.setData({
         accountStatus: res.code,
@@ -115,7 +167,7 @@ Page({
       })
       //获取实时数据
       this.realTime()
-      /* 直播场次列表查询 */
+      //直播场次列表查询
       this.getLiveSessionList()
     })
   },
@@ -137,21 +189,27 @@ Page({
         title: res.data,
         icon: "none"
       });
+      let sessionList = [];
       for (let i = 0; i < res.data.length; i++) {
-        let checkdate = res.data[i].starttime;
-        res.data[i].starttime = checkdate.slice(0, checkdate.lastIndexOf('.'));
-      }
+        let checkdate = res.data[i].starttime,
+          time = checkdate.slice(0, checkdate.lastIndexOf('.')),
+          t = time.split(' ');
+        res.data[i].starttime = t[0];
+        sessionList.push(t[0])
+      };
       this.setData({
         liveSessionList: res.data,
-        pageTotal: res.pageTotal
-      })
+        pageTotal: res.pageTotal,
+        sessionList
+      });
+      this.viewDetails(0)
     })
   },
   /* 查看场次详情 */
-  viewDetails(e) {
-    const {
-      index
-    } = e.currentTarget.dataset;
+  selectorChange(e) {
+    this.viewDetails(e.detail.value);
+  },
+  viewDetails(index) {
     const sessionid = this.data.liveSessionList[index].sessionid;
     this.setData({
       showStartTime: this.data.liveSessionList[index].starttime,
@@ -209,18 +267,9 @@ Page({
       })
     });
   },
-  /* 场次列表选中 */
-  optionItemIndex(e) {
-    const {
-      index
-    } = e.currentTarget.dataset;
-    this.setData({
-      optionRow: index
-    })
-  },
   /* 下一页 */
   buttonRightClick() {
-    if (this.data.dataTypes == 0) {
+    if (this.data.CheckTheType == '当前直播') {
       if (this.data.pageNumber == this.data.pageTotal) return wx.showToast({
         title: '已经到达最后一页',
         icon: "none"
@@ -228,7 +277,7 @@ Page({
       this.setData({
         pageNumber: this.data.pageNumber + 1
       })
-      this.getSYLiveSessionList()
+      this.getRealTimeViewerList()
     } else {
       if (this.data.userPageNumber == this.data.userPageTotal) return wx.showToast({
         title: '已经到达最后一页',
@@ -242,18 +291,18 @@ Page({
   },
   /* 上一页 */
   buttonLifeClick() {
-    if (this.data.dataTypes == 0) {
+    if (this.data.CheckTheType == '当前直播') {
       if (this.data.pageNumber == 1) return wx.showToast({
-        title: '已经在第一页了哦',
+        title: '已经在第一页了',
         icon: "none"
       });
       this.setData({
         pageNumber: this.data.pageNumber - 1
       })
-      this.getSYLiveSessionList()
+      this.getRealTimeViewerList()
     } else {
       if (this.data.userPageNumber == 1) return wx.showToast({
-        title: '已经在第一页了哦',
+        title: '已经在第一页了',
         icon: "none"
       });
       this.setData({
@@ -262,6 +311,12 @@ Page({
       this.LiveUserList()
     }
   },
+  /* 选中行 */
+  listRowAvtion(e) {
+    this.setData({
+      listRowIndex: e.currentTarget.dataset.index
+    })
+  },
   /* tabs回调 */
   setIndex({
     detail
@@ -272,50 +327,62 @@ Page({
       pageTotal: 1,
       userPageNumber: 1,
       userPageTotal: 1
-    })
+    });
+    if (detail == undefined) return;
     this.getLiveInfo();
+    if (detail == 2) this.getCooperationAgentsLiveList();
+  },
+  /* 获取合作商直播列表 */
+  getCooperationAgentsLiveList() {
+    _Http.basic({
+      "accesstoken": wx.getStorageSync('userData').token,
+      "classname": "customer.live.live",
+      "method": "getCooperationAgentsLiveList",
+      "content": {}
+    }).then(res => {
+      this.setData({
+        partnerLiveList: res.data
+      })
+    })
+  },
+  /* 查看合作商直播 */
+  toLive(e) {
+    const {
+      fliveshowurl
+    } = e.currentTarget.dataset;
+    wx.navigateTo({
+      url: '/pages/webView/index?url=' + fliveshowurl,
+    })
   },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function () {
-
-  },
+  onReady: function () {},
 
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {
-
-  },
+  onShow: function () {},
 
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function () {
-
-  },
+  onHide: function () {},
 
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload: function () {
-
-  },
+  onUnload: function () {},
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh: function () {
-
-  },
+  onPullDownRefresh: function () {},
 
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function () {
-
-  },
+  onReachBottom: function () {},
 
   /**
    * 用户点击右上角分享

pages/liveStreaming/index.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
-    "My_liveAccountMsg": "/components/My_liveAccountMsg/index"
+    "My_liveAccountMsg": "/components/My_liveAccountMsg/index",
+    "My_RoundedCornerButtonTabs": "/components/My_RoundedCornerButtonTabs/index"
   }
 }

pages/liveStreaming/index.wxml

@@ -1,78 +1,91 @@
-<view style="height: 14rpx;"></view>
 <My_NavTabs tabsList="{{tabsList}}" tabsIndex="{{tabsIndex}}" bindsetIndex="setIndex" />
-<!-- 直播账号信息 -->
-<My_liveAccountMsg title='直播账号信息'>
-    <view slot='but' wx:if="{{accountStatus==1}}" class="msgBox-but">
-        <van-button custom-class="custom-class-msgBox-but" catchtap="showMyModel">我要开播</van-button>
-    </view>
-    <view slot='con'>
-        <view wx:if="{{accountStatus==1}}" class="live-msg">
-            <view class="live-msg-row">
-                <view class="row-title">直播账号</view>
-                <view class="row-content u-line-1">{{accountMsg.channelid}}</view>
+<view hidden="{{tabsIndex==2}}">
+    <!-- 直播账号信息 -->
+    <My_liveAccountMsg title='直播账号信息'>
+        <view slot='but' wx:if="{{accountStatus==1}}" class="msgBox-but">
+            <van-button custom-class="custom-class-msgBox-but" catchtap="showMyModel">我要开播</van-button>
+        </view>
+        <view slot='con'>
+            <view wx:if="{{accountStatus==1}}" class="live-msg">
+                <view class="live-msg-row">
+                    <view class="row-title">直播账号</view>
+                    <view class="row-content u-line-1">{{accountMsg.channelid}}</view>
+                </view>
+                <view class="live-msg-row">
+                    <view class="row-title">账号密码</view>
+                    <view class="row-content u-line-1">{{accountMsg.channelpasswd}}</view>
+                </view>
+                <view class="live-msg-row">
+                    <view class="row-title">web端开播地址</view>
+                    <view class="row-content u-line-1">{{accountMsg.fliveurl_web}}</view>
+                    <view class="row-title copy" data-url='{{accountMsg.fliveurl_web}}' catchtap="copyTheAddress">复制</view>
+                </view>
             </view>
-            <view class="live-msg-row">
-                <view class="row-title">账号密码</view>
-                <view class="row-content u-line-1">{{accountMsg.channelpasswd}}</view>
+            <view wx:if="{{accountStatus!=1 && isSy}}" class="go-to-apply-for" catchtap="applyForLive">
+                {{accountStatus==3?'暂无账号 点击申请 ':'正在申请中 请稍等 '}}<image style="width: 20rpx; height: 22rpx; margin-left: 8rpx;" src="/static/icon-07.png"></image>
             </view>
-            <view class="live-msg-row">
-                <view class="row-title">web端开播地址</view>
-                <view class="row-content u-line-1">{{accountMsg.fliveurl_web}}</view>
-                <view class="row-title copy" data-url='{{accountMsg.fliveurl_web}}' catchtap="copyTheAddress">复制</view>
+            <view wx:if="{{accountStatus!=1 && !isSy}}" class="go-to-apply-for">
+                暂无展会直播账号
             </view>
         </view>
-        <view wx:if="{{accountStatus!=1 && isSy}}" class="go-to-apply-for" catchtap="applyForLive">
-            {{accountStatus==3?'暂无账号 点击申请 ':'正在申请中 请稍等 '}}<image style="width: 20rpx; height: 22rpx; margin-left: 8rpx;" src="/static/icon-07.png"></image>
+    </My_liveAccountMsg>
+    <!-- 观看信息 -->
+    <My_liveAccountMsg wx:if="{{accountStatus==1}}" title='观看信息'>
+        <view slot='but' class="msgBox-but">
+            <van-button open-type='share' custom-class="custom-class-msgBox-but">一键分享</van-button>
         </view>
-        <view wx:if="{{accountStatus!=1 && !isSy}}" class="go-to-apply-for">
-            暂无展会直播账号
-        </view>
-    </view>
-</My_liveAccountMsg>
-<!-- 观看信息 -->
-<My_liveAccountMsg wx:if="{{accountStatus==1}}" title='观看信息'>
-    <view slot='but' class="msgBox-but">
-        <van-button open-type='share' custom-class="custom-class-msgBox-but">一键分享</van-button>
-    </view>
-    <view slot='con'>
-        <view class="live-msg">
-            <view class="live-msg-row">
-                <view class="row-title">观看地址</view>
-                <view class="row-content u-line-1">{{accountMsg.fliveshowurl}}</view>
-                <view class="row-title copy" data-url='{{accountMsg.fliveshowurl}}' catchtap="copyTheAddress">复制</view>
+        <view slot='con'>
+            <view class="live-msg">
+                <view class="live-msg-row">
+                    <view class="row-title">观看地址</view>
+                    <view class="row-content u-line-1">{{accountMsg.fliveshowurl}}</view>
+                    <view class="row-title copy" data-url='{{accountMsg.fliveshowurl}}' catchtap="copyTheAddress">复制</view>
+                </view>
             </view>
         </view>
-    </view>
-</My_liveAccountMsg>
-<!-- 数据 -->
-<view wx:if="{{accountStatus==1}}" class="msgBox clearfix" style="white-space:nowrap;">
-    <!-- 标题和按钮 -->
-    <view class="msgBox-title-and-but">
-        <view wx:if="{{dataTypes==0}}" class="msgBox-title">直播数据</view>
-        <view wx:else class="msgBox-title">直播场次:{{showStartTime}}</view>
-    </view>
-    <!-- 数据宫格 -->
-    <block>
-        <view wx:if="{{false}}" class="data-grid">
-            <view>
-                <view class="title">观看次数(次)</view>
-                <view class="number">{{liveDataCountForSession.viewCounts}}</view>
-            </view>
-            <view>
-                <view class="title">观看人数(人)</view>
-                <view class="number">{{liveDataCountForSession.viewers}}</view>
+    </My_liveAccountMsg>
+    <!-- 数据 -->
+    <view wx:if="{{accountStatus==1}}" class="msgBox clearfix" style="white-space:nowrap;">
+        <!-- 标题和按钮 -->
+        <view class="msgBox-title-and-but">
+            <view class="msgBox-title">直播数据
             </view>
-            <view>
-                <view class="title">观看时长(分钟)</view>
-                <view class="number">{{liveDataCountForSession.viewDuration}}</view>
-            </view>
-            <view>
-                <view class="title">人均观看次数(次)</view>
-                <view class="number">{{liveDataCountForSession.viewCountsAvg}}</view>
+        </view>
+        <!-- 圆角tabs -->
+        <view style="height: 18rpx;"></view>
+        <My_RoundedCornerButtonTabs list='{{buttonTabs}}' bind:tabsSelectedIitem='tabsSelectedIitem'></My_RoundedCornerButtonTabs>
+        <!-- 实时聊天信息 -->
+        <view class="live-chat" hidden="{{CheckTheType!='当前直播'}}">
+            <view class="live-chat-title">观看人数：{{onlineNumber}}</view>
+        </view>
+        <!-- 数据宫格 -->
+        <view hidden="{{CheckTheType!='历史直播'}}" class="live-chat" style="height: 274rpx;" hidden="{{CheckTheType!='历史直播'}}">
+            <view class="live-chat-title">直播场次：
+                <picker mode="selector" range='{{sessionList}}' bindchange='selectorChange'>{{showStartTime}}
+                    <image style="width: 14rpx; height: 8rpx;margin-bottom: 5rpx; margin-left: 10rpx;" src="/static/icon-13.png" />
+                </picker>
             </view>
-            <view>
-                <view class="title">人均观看时长(分钟)</view>
-                <view class="number">{{liveDataCountForSession.viewDurationAvg}}</view>
+            <view class="data-grid">
+                <view>
+                    <view class="title">观看次数(次)</view>
+                    <view class="number">{{liveDataCountForSession.viewCounts}}</view>
+                </view>
+                <view>
+                    <view class="title">观看人数(人)</view>
+                    <view class="number">{{liveDataCountForSession.viewers}}</view>
+                </view>
+                <view>
+                    <view class="title">观看时长(分钟)</view>
+                    <view class="number">{{liveDataCountForSession.viewDuration}}</view>
+                </view>
+                <view>
+                    <view class="title">人均观看次数(次)</view>
+                    <view class="number">{{liveDataCountForSession.viewCountsAvg}}</view>
+                </view>
+                <view>
+                    <view class="title">人均观看时长(分钟)</view>
+                    <view class="number">{{liveDataCountForSession.viewDurationAvg}}</view>
+                </view>
             </view>
         </view>
         <scroll-view scroll-x="{{true}}" class="data-formlist">
@@ -90,7 +103,7 @@
                 <view style="width: 180rpx;">观看类型</view>
             </view>
             <!-- 表格 -->
-            <view wx:for="{{liveUserList}}" class="data-formlist-row live-for-details">
+            <view wx:for="{{CheckTheType=='当前直播'?crLiveUserList:liveUserList}}" class="data-formlist-row live-for-details {{listRowIndex==index?'acRow':''}}" data-index="{{index}}" catchtap="listRowAvtion">
                 <view class="w200rpx u-line-1">{{item.name}}</view>
                 <view class="u-line-1" style="width: 180rpx;">{{item.userid}}</view>
                 <view class="u-line-1" style="width: 160rpx;">{{item.playduration}}</view>
@@ -103,12 +116,27 @@
                 <view class="u-line-1" style="width: 180rpx;">{{item.viewtype=='live'?'直播':'回放'}}</view>
             </view>
         </scroll-view>
-    </block>
-    <!-- 分页 -->
-    <My_paging show="{{liveSessionList.length>=1}}" count='{{dataTypes==0?pageNumber:userPageNumber}}' bind:lifeClick='buttonLifeClick' bind:rightClick='buttonRightClick'></My_paging>
+        <!-- 分页 -->
+        <My_paging show="{{liveSessionList.length>=1}}" count='{{dataTypes==0?pageNumber:userPageNumber}}' bind:lifeClick='buttonLifeClick' bind:rightClick='buttonRightClick'></My_paging>
+    </view>
+</view>
+<view hidden="{{tabsIndex!=2}}">
+    <My_liveAccountMsg title='观看信息'>
+        <view slot='con' class="clearfix" style="padding-left: 10rpx;">
+            <view wx:for="{{partnerLiveList}}" class="exhibition" data-fliveshowurl="{{item.fliveshowurl}}" catchtap="toLive">
+                <image class="exhibition-img" src="{{item.channelcoverimageurl}}" mode="aspectFill"></image>
+                <view class="exhibition-bottom">
+                    <view class="exhibition-bottom-title u-line-1">{{item.fagentname}}</view>
+                    <view class="exhibition-bottom-data">
+                        <image src="/static/icon-11.png" />
+                        <view class="exhibition-bottom-data-text u-line-1">{{item.viewers}}</view>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </My_liveAccountMsg>
 </view>
 <!-- 自定义model -->
 <My_showModel isShow='{{myShowModel}}' content="直播地址:{{accountMsg.fliveurl_web}}" confirm='一键复制' cancel='知道了' bindcallBack='showModelCallBack' />
-
 <!-- 自定义model -->
 <My_showModel isShow='{{myShowModel2}}' content="您的私域直播账号正在申请中" hideCancel />

pages/liveStreaming/index.wxss

@@ -1,4 +1,5 @@
 @import "/components/My_liveAccountMsg/index.wxss";
+@import "/pages/tradeShow/index.wxss";
 
 /* 直播数据网格 */
 .data-grid {
@@ -7,7 +8,7 @@
     width: 100%;
     padding: 0 20rpx;
     box-sizing: border-box;
-    margin: 20rpx 0;
+    margin: 30rpx 0;
 }
 
 .data-grid>view {
@@ -120,6 +121,10 @@
     margin-top: 10rpx;
 }
 
+.acRow {
+    background-color: #FAFAFA;
+}
+
 .live-msg-row:first-child {
     margin-top: 0;
 }
@@ -135,4 +140,33 @@
     font-size: 20rpx;
     color: #4DC2D4;
     padding-left: 4rpx;
+}
+
+/* 在线聊天 */
+.live-chat {
+    height: 450rpx;
+    width: 662rpx;
+    margin: 0 auto;
+    background: #FFFFFF;
+    border-radius: 8rpx;
+    border: 2rpx solid rgba(151, 151, 151, 0.14);
+    overflow: hidden;
+    margin-bottom: 20rpx;
+}
+
+.live-chat-title {
+    display: flex;
+    height: 64rpx;
+    line-height: 64rpx;
+    font-size: 24rpx;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 550;
+    color: rgba(0, 0, 0, 0.85);
+    background-color: rgba(151, 151, 151, .15);
+    padding-left: 20rpx;
+}
+
+.exhibition {
+    float: left;
+    margin-top: 10rpx;
 }

pages/tradeShow/index.wxml

@@ -42,7 +42,7 @@
     <!-- 主要展示 -->
     <swiper class="exhibition-swiper" style="height: {{showLiveList[0].length>2?'700':'355'}}rpx;" indicator-dots indicator-active-color="#4DC2D4" indicator-color="#D8D8D8">
         <swiper-item wx:for="{{showLiveList}}" class="exhibition-swiper-item">
-            <view wx:for="{{item}}" class="exhibition">
+            <view wx:for="{{item}}" class="exhibition" style="float: right;">
                 <image class="exhibition-img" src="{{item.channelcoverimageurl}}" mode="aspectFill"></image>
                 <view class="exhibition-bottom">
                     <view class="exhibition-bottom-title u-line-1">{{item.fbrand}}</view>

pages/webView/index.js

@@ -17,7 +17,10 @@ Page({
         console.log(options)
         //判断是否纯在登录态度
         if (!wx.getStorageSync('userData').token) {
-            this.toLogin("当前未登录,是否前去登录", options.url);
+            getApp().globalData.liveUrl = url;
+            wx.reLaunch({
+                url: '/pages/login/index'
+            })
         } else {
             _Http.basic({
                 "accesstoken": wx.getStorageSync('userData').token,
@@ -25,29 +28,16 @@ Page({
                 "method": "query_usermsg",
                 "content": {}
             }).then(res => {
-                if (res.msg != '成功') this.toLogin("当前登录状态已过期,请重新登录", options.url);
+                getApp().globalData.liveUrl = url;
+                wx.reLaunch({
+                    url: '/pages/login/index'
+                })
             })
         };
         this.setData({
             url: options.url
         })
     },
-    /* 去登陆 */
-    toLogin(content, url) {
-        console.log(url)
-        wx.showModal({
-            title: "提示",
-            content: content,
-            success: (res) => {
-                if (res.confirm) {
-                    getApp().globalData.liveUrl = url;
-                    wx.reLaunch({
-                        url: '/pages/login/index'
-                    })
-                }
-            }
-        });
-    },
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

utils/api.js

@@ -18,7 +18,6 @@ class ApiModel extends HTTP {
     }
     /* 基本通用 */
     basic(data, loading = true) {
-        console.log(loading,data)
         return this.request({
             url: "",
             data,