edit-market-sylive

This commit is contained in:
lccsw
2022-10-08 17:57:01 +08:00
parent 1a4284b215
commit 62ad6fceab
9 changed files with 284 additions and 59 deletions
+12 -7
View File
@@ -75,13 +75,13 @@ class Act extends Wx {
);
//直播参数
$user = $this->user_model->get(['userId'=>$this->uid],'unionid,nickname,headimg');
$live_user = ['userId' => $user['unionid'], 'userName' => $user['nickname'], 'pic' => $user['headimg']];
$this->load->library('PolyvApi');
$polyv = new PolyvApi(['channel_id'=>$row['channelId']]);
$liveSdk = $polyv->getLiveSdk();
$liveSdk['user'] = $live_user;
// $live_user = ['userId' => $user['unionid'], 'userName' => $user['nickname'], 'pic' => $user['headimg']];
// $this->load->library('PolyvApi');
// $polyv = new PolyvApi(['channel_id'=>$row['channelId']]);
// $liveSdk = $polyv->getLiveSdk();
// $liveSdk['user'] = $live_user;
$info['live_status'] = $live_status;
$info['liveSdk'] = $liveSdk;
// $info['liveSdk'] = $liveSdk;
$info['skey'] = $this->myencryption->base64url_encode($share_skey);
$info['a_id'] = $a_id;
$info['org_id'] = $this->session['org_id'];
@@ -92,7 +92,12 @@ class Act extends Wx {
}
$info['statisticsurl'] = '/h5/market/sylive/stic?skey='.$info['skey'];
$info['channelImg'] = build_qiniu_image_url($row['channelImg']);
$info['live_url'] = 'https://live.liche.cn/watch/'.$row['channelId'];
// $info['live_url'] = 'https://live.liche.cn/watch/'.$row['channelId'];
$secretkey = '7a23vx9257';
$userid = $user['unionid'] ? $user['unionid'] : $this->uid;
$ts = time()*1000;
$sign = md5($secretkey.$userid.$secretkey.$ts);
$info['live_url'] = "https://live.polyv.cn/watch/3410468?userid={$userid}&ts={$ts}&sign={$sign}";
$this->data['info'] = $info;
$this->data['sign_package'] = $sign_package;
$this->data['share'] = $share;
@@ -0,0 +1,54 @@
<?php
defined('APPPATH') OR exit('No direct script access allowed');
/**
* User: lcc
* Date: 2022/09/18
* Time: 17:13
*/
class Polyv extends CI_Controller{
public function __construct(){
parent::__construct();
$this->load->model('market/market_sylive_user_model', 'user_model');
$this->load->library('hd_exception');
}
public function error(){
throw new Hd_exception('验证失败',400);
}
public function auth(){
header("Content-type:application/json;charset=UTF-8");
$secretkey = "7a23vx9257";
$userid = isset($_GET["userid"]) ? $_GET["userid"] : "";
$ts = isset($_GET["ts"]) ? $_GET["ts"] : "";
$channelId = isset($_GET["channelId"]) ? $_GET["channelId"] : "";
$token = isset($_GET["token"]) ? $_GET["token"] : "";
$sign = md5($secretkey . $userid . $secretkey . $ts);
//用户进行授权验证,返回对应的数据(json格式)
$user = $this->user_model->get(['unionid'=>$userid]);
!$user && $user = $this->user_model->get(['userId'=>$userid]);
if ($sign == $token && $user) {
//验证正确
$nickname = $user['nickname'] ? $user['nickname'] : '用户'.$user['id'];
$array1 = array(
"status" => 1, //返回状态
"userid" => $user['unionid'], //学员唯一标识
"nickname" => $nickname, //学员昵称
"marqueeName" => $nickname, //自定义跑马灯字段
"avatar" => $user['headimg'] ? $user['headimg']:"http://live.polyv.net/assets/images/avatars/9avatar.jpg", //学员头像
// "actor" => "VIP", // 学员头衔,可以不传递
// "actorFColor" => "#5C96E5", // 学员头衔字体颜色,可以不传递
// "actorBgColor" => "#FFFFFF" // 学员头衔背景颜色,可以不传递
);
$json1 = json_encode($array1,JSON_UNESCAPED_UNICODE);
echo $json1;
} else {
//验证错误
$array0 = array(
"status" => 0,
"errorUrl" => http_host_com('home')."/h5/market/sylive/polyv/error", //验证错误跳转的自定义页面
);
$json0 = json_encode($array0,JSON_UNESCAPED_UNICODE);
echo $json0;
}
}
}
+93 -12
View File
@@ -28,15 +28,15 @@ class Stic extends Admin{
$browse_count = $this->mdSytActivityKpiData->count(['a_id'=>$a_id,'kpi'=>'browse','cf_uid'=>$this->uid]);
$subscribe_count = $this->mdSytActivityKpiData->count(['a_id'=>$a_id,'kpi'=>'subscribe','cf_uid'=>$this->uid]);
$info['begin'] = [
['title' => '访问用户', 'num' => "{$browse_count}"],
['title' => '预约用户', 'num' => "{$subscribe_count}"],
['title' => '访问用户', 'num' => "{$browse_count}",'url'=>'/h5/market/sylive/stic/users?type=owner&kpi=browse&a_id='.$a_id],
['title' => '预约用户', 'num' => "{$subscribe_count}",'url'=>'/h5/market/sylive/stic/users?type=owner&kpi=subscribe&a_id='.$a_id],
['title' => '预约率', 'num' => $subscribe_count ? round($subscribe_count/$browse_count*100,2)."%" : 0],
];
$watch_count = $this->mdSytActivityKpiData->count(['a_id'=>$a_id,'kpi'=>'watch','cf_uid'=>$this->uid]);
$order_count = $this->mdSytActivityKpiData->count(['a_id'=>$a_id,'kpi'=>'order','cf_uid'=>$this->uid]);
$info['live'] = [
['title' => '观看用户', 'num' => "{$watch_count}"],
['title' => '下单用户', 'num' => "{$order_count}"],
['title' => '观看用户', 'num' => "{$watch_count}",'url' => '/h5/market/sylive/stic/users?type=owner&kpi=watch&a_id='.$a_id],
['title' => '下单用户', 'num' => "{$order_count}",'url' => '/h5/market/sylive/stic/users?type=owner&kpi=order&a_id='.$a_id],
['title' => '转化率', 'num' => $watch_count ? round($watch_count/$order_count*100,2)."%" : 0],
];
$this->data['info'] = $info;
@@ -54,7 +54,7 @@ class Stic extends Admin{
if(!$row && $this->group_id>=3){
$this->show_json([],200);
}
$cell2 = [];
$cell3 = $cell2 = [];
if($this->group_id<2){ //所有大区
$where = [
'a_id' => $a_id,
@@ -65,7 +65,7 @@ class Stic extends Admin{
$org_id = $org_row['parentId'] ? $org_row['parentId'] : 0;
$where["area_id in (select organizationId from lc_market_sylive_organization where parentId={$org_id} and status=0)"] = null;
}else{
$where["area_id in (select organizationId from lc_market_sylive_organization where parentId={$this->session['org_id']} and status=0)"] = null;
$where["a_id"] = $a_id;
}
$browse_count = $this->mdSytActivityKpiData->count($where); //浏览数据
$where['kpi'] = 'subscribe';
@@ -86,6 +86,19 @@ class Stic extends Admin{
['title' => '参与门店', 'num' => "{$biz_count['total']}"],
['title' => '参与人数', 'num' => "{$gw_count}"],
];
$where = [
'a_id' => $a_id,
'kpi' => 'browse',
'biz_id' => $this->uid
];
$owner_browse_count = $this->mdSytActivityKpiData->count($where); //浏览数据
$where['kpi'] = 'subscribe';
$owner_subscribe_count = $this->mdSytActivityKpiData->count($where); //浏览数据
$cell3 = [
['title' => '访问用户', 'num' => "{$owner_browse_count}",'url'=>'/h5/market/sylive/stic/users?type=owner&kpi=browse&a_id='.$a_id],
['title' => '预约用户', 'num' => "{$owner_subscribe_count}",'url'=>'/h5/market/sylive/stic/users?type=owner&kpi=subscribe&a_id='.$a_id],
['title' => '预约率', 'num' => $owner_browse_count ? round($owner_browse_count/$owner_subscribe_count*100,2)."%" : 0],
];
}else{ //门店
$where = [
'a_id' => $a_id,
@@ -97,8 +110,8 @@ class Stic extends Admin{
$subscribe_count = $this->mdSytActivityKpiData->count($where); //浏览数据
}
$cell1 = [
['title' => '访问用户', 'num' => "{$browse_count}"],
['title' => '预约用户', 'num' => "{$subscribe_count}"],
['title' => '访问用户', 'num' => "{$browse_count}",'url'=>'/h5/market/sylive/stic/users?type=all&kpi=browse&a_id='.$a_id],
['title' => '预约用户', 'num' => "{$subscribe_count}",'url'=>'/h5/market/sylive/stic/users?type=all&kpi=subscribe&a_id='.$a_id],
['title' => '预约率', 'num' => $subscribe_count ? round($subscribe_count/$browse_count*100,2)."%" : 0],
];
$biz_id = $this->group_id==3 ? $this->session['org_id'] : 0;
@@ -117,6 +130,7 @@ class Stic extends Admin{
$data = [
'cell1' => $cell1,
'cell2' => $cell2,
'cell3' => $cell3,
'browse' => $browse,
'book' => $book
];
@@ -132,7 +146,7 @@ class Stic extends Admin{
if(!$row && $this->group_id>=3){
$this->show_json([],200);
}
$cell3 = [];
$cell4 = $cell3 = [];
if($this->group_id<2){ //所有大区
$where = [
'a_id' => $a_id,
@@ -143,7 +157,7 @@ class Stic extends Admin{
$org_id = $org_row['parentId'] ? $org_row['parentId'] : 0;
$where["area_id in (select organizationId from lc_market_sylive_organization where parentId={$org_id} and status=0)"] = null;
}else{
$where["area_id in (select organizationId from lc_market_sylive_organization where parentId={$this->session['org_id']} and status=0)"] = null;
$where["a_id"] = $a_id;
}
$view_count = $this->mdSytActivityKpiData->count($where); //浏览数据
$where['kpi'] = 'order';
@@ -164,6 +178,19 @@ class Stic extends Admin{
['title' => '参与门店', 'num' => "{$biz_count['total']}"],
['title' => '参与人数', 'num' => "{$gw_count}"],
];
$where = [
'a_id' => $a_id,
'kpi' => 'watch',
'cf_uid' => $this->uid
];
$owner_view_count = $this->mdSytActivityKpiData->count($where); //观看数据
$where['kpi'] = 'order';
$owner_order_count = $this->mdSytActivityKpiData->count($where); //下单数据
$cell4 = [
['title' => '观看用户', 'num' => "{$owner_view_count}",'url'=>'/h5/market/sylive/stic/users?type=owner&kpi=watch&a_id='.$a_id],
['title' => '下单用户', 'num' => "{$owner_order_count}",'url'=>'/h5/market/sylive/stic/users?type=owner&kpi=order&a_id='.$a_id],
['title' => '转化率', 'num' => $owner_order_count ? round($owner_view_count/$owner_order_count*100,2)."%" : 0],
];
}else{ //门店
$where = [
'a_id' => $a_id,
@@ -175,8 +202,8 @@ class Stic extends Admin{
$order_count = $this->mdSytActivityKpiData->count($where); //下单数据
}
$cell1 = [
['title' => '观看用户', 'num' => "{$view_count}"],
['title' => '下单用户', 'num' => "{$order_count}"],
['title' => '观看用户', 'num' => "{$view_count}",'url'=>'/h5/market/sylive/stic/users?type=all&kpi=watch&a_id='.$a_id],
['title' => '下单用户', 'num' => "{$order_count}",'url'=>'/h5/market/sylive/stic/users?type=all&kpi=order&a_id='.$a_id],
['title' => '转化率', 'num' => $order_count ? round($order_count/$view_count*100,2)."%" : 0],
];
$poly_row = $this->mdPolyvSession->get(['channelId'=>$row['channelId']]);
@@ -205,6 +232,7 @@ class Stic extends Admin{
'cell1' => $cell1,
'cell2' => $cell2,
'cell3' => $cell3,
'cell4' => $cell4,
'view' => $view,
'order' => $order
];
@@ -275,4 +303,57 @@ class Stic extends Admin{
];
$this->show_json($data,200);
}
public function users(){
$params = $this->input->get();
if($this->input->is_ajax_request()){
$page = $params['page'] ? intval($params['page']) : 1;
$where = [
'a_id' => $params['a_id'],
'kpi' => $params['kpi'],
];
if($params['type']=='all' && $this->group_id<3){ //所有
if(!$this->group_id){ //品牌
$where["a_id"] = $params['a_id'];
}elseif($this->group_id==1){ //大区
$org_row = $this->market_sylive_organization_model->get(['organizationId'=>$this->session['org_id']],'parentId');
$org_id = $org_row['parentId'] ? $org_row['parentId'] : 0;
$where["area_id in (select organizationId from lc_market_sylive_organization where parentId={$org_id} and status=0)"] = null;
}else{ //店长
$where['biz_id'] = $this->session['org_id'];
}
}else{ //只显示个人
$where['cf_uid'] = $this->uid;
}
$total = $this->mdSytActivityKpiData->count($where);
$lists = [];
if($total){
$rows = $this->mdSytActivityKpiData->select($where,'id desc',$page,20,'uid');
$uids = implode(',',array_unique(array_column($rows,'uid')));
$users = [];
if($uids){
$where = [
"userId in ($uids)" => null,
];
$users = $this->user_model->map('userId','',$where,'','','','userId,nickname,headimg');
}
foreach ($rows as $key => $item) {
$user = $users[$item['uid']] ? $users[$item['uid']][0] : [];
$nickname = $user['nickname'] ? $user['nickname'] : '用户'.$user['userId'];
$headimg = $user['headimg'] ? $user['headimg'] : 'https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM483tlYWFg5RWQ1Xat94ib82prnDSicm2GHuxI49swU08N2I1aHb7B1gmicyxXF8R1BsVWahU9SiaPEzA/132';
$lists[] = [
'nickname' => $nickname,
'headimg' => $headimg,
];
}
}
$data = [
'total' => $total,
'lists' => $lists
];
$this->show_json($data,200);
}
$this->data['params'] = $params;
$this->show_view('h5/market/sylive/stic/users');
}
}
+7 -20
View File
@@ -10,39 +10,24 @@
<a class="fn-flex-item bg-000-op50 ml1 pl20 pr20 font-22 color-fff" v-if="info.org_id>0" :href="info.statisticsurl">
<i class="iconfont icon-shuju text-middle"></i><span class="text-middle ml10">数据</span></a>
</div>
<div class="h-260"></div>
<div class="h-750"></div>
<div>
<!--
<div class="relative ml80 mr180 pl200 bg-ad4635 line-height-63 font-22 color-fff" v-if="info.e_time>0" v-html="showTime"></div>
<div class="relative">
<a class="block absolute top-0 bottom-0 left-0 right-0 z-index-4" :href="info.live_url"></a>
<div id="player" class="relative z-index-0 player pt30 pb30"></div>
</div>
-->
<div class="mt10 ml25 pl30 pr30 font-22 line-height-17 color-666" v-html="info.content"></div>
</div>
<!--
<div class="pl25 pr25" v-else>
<div class="relative ml60 mr180 pl200 bg-ad4635 line-height-63 font-22 color-fff" v-if="info.e_time>0" v-html="showTime"></div>
<div id="player" class="player pt30 pb30">
<template>
<div class="pv-ppt-layout pv-ppt-normal" style="width:100%;height:100%">
<div class="pv-player-layout pv-player-zh_CN">
<div class="plwrap" style="width: 100%; height: 100%;">
<div class="plv_mask" style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; z-index: 3;background: url(<?=$info['channelImg']?>) 0% 0% / 100% 100% no-repeat;"></div>
</div>
</div>
</div>
</template>
</div>
<div class="mt10 pl30 pr30 font-22 line-height-17 color-666" v-html="info.content"></div>
</div>
-->
<div class="fixed left-0 bottom-0 right-0 inner30 bg-fff z-index-4" >
<template v-if="info.live_status<2">
<a class="block bg-1a1a1a pt20 pb20 text-center font-36 color-fff ulib-r10" v-if="info.live_status==1" href="/h5/market/sylive/act/item?skey=<?=$info['skey']?>">立即抢购</a>
<a class="block bg-1a1a1a pt20 pb20 text-center font-36 color-fff ulib-r10" v-if="info.live_status==1" href="<?=$info['live_url']?>">进入直播间</a>
<a class="block bg-1a1a1a pt20 pb20 text-center font-36 color-fff ulib-r10" v-else href="javascript:;" @click="showCode">开播提醒</a>
</template>
<template v-else>
<a class="block bg-999 pt20 pb20 text-center font-36 color-fff ulib-r10" href="javascript:;">活动已结束</a>
<a class="block bg-999 pt20 pb20 text-center font-36 color-fff ulib-r10" href="<?=$info['live_url']?>">查看回放</a>
</template>
</div>
@@ -84,6 +69,7 @@
</div>
</div>
<!--
<script>
var chatroom = null;
var liveSdk = null;
@@ -113,6 +99,7 @@
/******函数*******/
};
</script>
-->
<script>
let hostUrl = ''
var app = new Vue({
+1 -1
View File
@@ -7,7 +7,7 @@
content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title><?=$_title?></title>
<link rel="stylesheet" href="/css/h5/market/sylive/h5.css?2022092901">
<link rel="stylesheet" href="/css/h5/market/sylive/h5.css?20221008">
<link rel="stylesheet" href="https://qs.haodian.cn/web/javascript/swiper/css/swiper.min.css">
<script type="text/javascript" src="https://qs.haodian.cn/web/javascript/jquery.3.4.1.min.js"></script>
<script type="text/javascript" src="https://qs.haodian.cn/web/javascript/vue.2.6.10.min.js"></script>
+32 -12
View File
@@ -20,16 +20,26 @@
<div v-if="tabid==1">
<div class="mt30 overflowhidden ulib-r20">
<div class="bg-fff5ec fn-flex text-center">
<div class="fn-flex-item pt40 pb40" v-for="item in begin.cell1">
<a class="fn-flex-item pt40 pb40" v-for="item in begin.cell1" :href="item.url">
<div class="font-32 color-fe9538">{{item.num}}</div>
<div class="mt10 font-22 color-666">{{item.title}}</div>
</div>
<div class="mt10 font-22 color-666">
{{item.title}}<i v-if="item.url" class="iconfont icon-gengduo"></i>
</div>
</a>
</div>
<div class="bg-f6 fn-flex text-center">
<div class="fn-flex-item pt40 pb40" v-for="item in begin.cell2">
<a class="fn-flex-item pt40 pb40" v-for="item in begin.cell2" :href="item.url">
<div class="font-32">{{item.num}}</div>
<div class="mt10 font-22 color-666">{{item.title}}</div>
</div>
</a>
</div>
<div class="bg-f6 fn-flex text-center" v-if="begin.cell3 && begin.cell3.length>0">
<a class="bg-fff5ec fn-flex-item pt40 pb40" v-for="item in begin.cell3" :href="item.url">
<div class="font-32 color-fe9538">{{item.num}}</div>
<div class="mt10 font-22 color-666">
{{item.title}}<i v-if="item.url" class="iconfont icon-gengduo"></i>
</div>
</a>
</div>
</div>
@@ -82,22 +92,32 @@
<div class="mt30 bg-f9 inner20 overflowhidden text-center font-24 color-666 ulib-r20">直播结束后2小时同步数据</div>
<div class="mt30 overflowhidden ulib-r20">
<div class="bg-fff5ec fn-flex text-center">
<div class="fn-flex-item pt40 pb40" v-for="item in live.cell1">
<a class="fn-flex-item pt40 pb40" v-for="item in live.cell1" :href="item.url">
<div class="font-32 color-fe9538">{{item.num}}</div>
<div class="mt10 font-22 color-666">{{item.title}}</div>
</div>
<div class="mt10 font-22 color-666">
{{item.title}}<i v-if="item.url" class="iconfont icon-gengduo"></i>
</div>
</a>
</div>
<div class="bg-f6 fn-flex text-center">
<div class="fn-flex-item pt40 pb40" v-for="item in live.cell2">
<a class="fn-flex-item pt40 pb40" v-for="item in live.cell2" :href="item.url">
<div class="font-32">{{item.num}}</div>
<div class="mt10 font-22 color-666">{{item.title}}</div>
</div>
</a>
</div>
<div class="bg-fff5ec fn-flex text-center">
<div class="fn-flex-item pt40 pb40" v-for="item in live.cell3">
<a class="fn-flex-item pt40 pb40" v-for="item in live.cell3" :href="item.url">
<div class="font-32">{{item.num}}</div>
<div class="mt10 font-22 color-666">{{item.title}}</div>
</div>
</a>
</div>
<div class="bg-f6 fn-flex text-center" v-if="live.cell4 && live.cell4.length>0">
<a class="fn-flex-item pt40 pb40" v-for="item in live.cell4" :href="item.url">
<div class="font-32 color-fe9538">{{item.num}}</div>
<div class="mt10 font-22 color-666">
{{item.title}}<i v-if="item.url" class="iconfont icon-gengduo"></i>
</div>
</a>
</div>
</div>
+10 -6
View File
@@ -20,10 +20,12 @@
<div v-if="tabid==1">
<div class="mt30 overflowhidden ulib-r20">
<div class="bg-fff5ec fn-flex text-center">
<div class="fn-flex-item pt40 pb40" v-for="item in begin.cell1">
<a class="fn-flex-item pt40 pb40" v-for="item in begin.cell1" :href="item.url">
<div class="font-32 color-fe9538">{{item.num}}</div>
<div class="mt10 font-22 color-666">{{item.title}}</div>
</div>
<div class="mt10 font-22 color-666">
{{item.title}}<i v-if="item.url" class="iconfont icon-gengduo"></i>
</div>
</a>
</div>
</div>
</div>
@@ -32,10 +34,12 @@
<div v-if="tabid==2">
<div class="mt30 overflowhidden ulib-r20">
<div class="bg-fff5ec fn-flex text-center">
<div class="fn-flex-item pt40 pb40" v-for="item in live.cell1">
<a class="fn-flex-item pt40 pb40" v-for="item in live.cell1" :href="item.url">
<div class="font-32 color-fe9538">{{item.num}}</div>
<div class="mt10 font-22 color-666">{{item.title}}</div>
</div>
<div class="mt10 font-22 color-666">
{{item.title}}<i v-if="item.url" class="iconfont icon-gengduo"></i>
</div>
</a>
</div>
</div>
</div>
@@ -0,0 +1,74 @@
<body class="bg-f6">
<div id="app">
<div class="container relative bg-no-repeat bg-size-fullwidth bg-pos-top pb50">
<div class="inner40 fn-flex fn-flex-wrap text-center">
<div class="wp33 pt20 pb20" v-for="(item,index) in list">
<img class="imgsize-130X130 text-middle ulib-r750" :src="item.headimg" alt="#" />
<div class="mt10 font-28 color-666">{{item.nickname}}</div>
</div>
</div>
<mugen-scroll :handler="fetchData" :should-handle="!loading">
<div class="pt100 pb100 text-center color-ccc" v-if="isNoData"></i><span class="text-middle fongt-22">暂无数据</span></div>
<div class="pt20 pb20 text-center color-ccc" v-else-if="loading"><i class="iconfont icon-jiazai text-middle"></i><span class="text-middle fongt-22">请稍等...</span></div>
<div class="pt20 pb20 text-center fongt-22 color-ccc" v-else-if="isDataEnd">我们是有底线的</div>
</mugen-scroll>
</div>
</div>
<script>
let hostUrl = ''
var app = new Vue({
el: '#app',
data: {
loading: false,
isDataEnd: false,
isNoData: false,
page: 1, //页数
size: 20, //每页取多少个数据
list:[],
},
created(){
},
computed: {
},
mounted() {
},
beforeDestroy() {
},
//离开页面时
destroyed () {
},
methods: {
//拉取数据
fetchData: function() {
this.getActivityList()
},
//获取大区列表
getActivityList(){
let that=this;
//请求接口
if (!that.isNoData && !that.isDataEnd && !that.loading) {
that.loading = true;
//请求接口
$.get('/h5/market/sylive/stic/users',{'a_id':'<?=$params['a_id']?>','type':'<?=$params['type']?>','kpi':'<?=$params['kpi']?>','page':that.page},function (res){
that.loading = false;
that.page = that.page + 1;
that.title = res.data.title
that.list = that.list.concat(res.data.lists);
if (res.data.total == 0) {
that.isNoData = true;
} else if (that.list.length == res.data.total) {
that.isDataEnd = true;
}
},'json');
}
},
},
})
</script>
</body>
File diff suppressed because one or more lines are too long