From d5f7b860ab839f1181483df21e360d4389a3ca2c Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Mon, 10 Oct 2022 14:34:15 +0800
Subject: [PATCH] edit-sylive

---
 home/controllers/h5/market/sylive/Act.php  | 2 +-
 home/views/h5/market/sylive/biz/brands.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/home/controllers/h5/market/sylive/Act.php b/home/controllers/h5/market/sylive/Act.php
index b41f3812..52c23cb5 100644
--- a/home/controllers/h5/market/sylive/Act.php
+++ b/home/controllers/h5/market/sylive/Act.php
@@ -95,7 +95,7 @@ class Act extends Wx {
         $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}";
+        $info['live_url'] = "https://live.polyv.cn/watch/{$row['channelId']}?userid={$userid}&ts={$ts}&sign={$sign}";
         $this->data['info'] = $info;
         $this->data['sign_package'] = $sign_package;
         $this->data['share'] = $share;
diff --git a/home/views/h5/market/sylive/biz/brands.php b/home/views/h5/market/sylive/biz/brands.php
index d0d72940..8cbb77fe 100644
--- a/home/views/h5/market/sylive/biz/brands.php
+++ b/home/views/h5/market/sylive/biz/brands.php
@@ -66,7 +66,7 @@
             <mugen-scroll :handler="fetchData" :should-handle="!loading">
                 <div class="pt100 pb100 text-center color-ccc" v-if="isNoData"></i><span class="text-middle font-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 font-22">请稍等...</span></div>
-                <div class="pt20 pb20 text-center font-22 color-ccc" v-else-if="isDataEnd">我们是有底线的</div>
+                <div class="pt20 pb20 text-center font-22 color-ccc" v-else-if="isDataEnd && list.length>10">我们是有底线的</div>
             </mugen-scroll>
         </div>
     </div>
@@ -185,7 +185,7 @@
                         that.list = that.list.concat(result.data.list);
                         if (result.data.total == 0) {
                             that.isNoData = true;
-                        } else if (that.list.length == result.data.total && result.data.total>10) {
+                        } else if (that.list.length == result.data.total) {
                             that.isDataEnd = true;
                         }
                     },'json')