From 840f1bc00fe22939a5fca9bc8738a5e9efb6008b Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Sun, 19 Apr 2020 21:52:10 +0800
Subject: [PATCH] =?UTF-8?q?=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9B=B4?=
 =?UTF-8?q?=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/service/ResourcesService.php      |  43 +++++
 application/tags.php                          |   9 +
 extend/base/Wechat.php                        |   2 +-
 public/static/admin/default/css/article.css   |   2 +-
 public/static/common/css/common.css           |   6 +
 public/static/common/js/common.js             |   6 +-
 sourcecode/weixin/app.js                      |   3 +-
 sourcecode/weixin/app.json                    |  12 +-
 .../plugins/weixinliveplayer/player-icon.png  | Bin 0 -> 1733 bytes
 .../plugins/weixinliveplayer/share-icon.png   | Bin 0 -> 1727 bytes
 .../plugins/weixinliveplayer/status-icon.png  | Bin 0 -> 1380 bytes
 .../plugins/weixinliveplayer/time-icon.png    | Bin 0 -> 2896 bytes
 .../plugins/weixinliveplayer/detail/detail.js | 160 +++++++++++++++++
 .../weixinliveplayer/detail/detail.json       |   4 +
 .../weixinliveplayer/detail/detail.wxml       |  43 +++++
 .../weixinliveplayer/detail/detail.wxss       |  82 +++++++++
 .../plugins/weixinliveplayer/index/index.js   |  98 +++++++++++
 .../plugins/weixinliveplayer/index/index.json |   7 +
 .../plugins/weixinliveplayer/index/index.wxml |  36 ++++
 .../plugins/weixinliveplayer/index/index.wxss |  73 ++++++++
 .../plugins/weixinliveplayer/search/search.js | 163 ++++++++++++++++++
 .../weixinliveplayer/search/search.json       |   4 +
 .../weixinliveplayer/search/search.wxml       |  34 ++++
 .../weixinliveplayer/search/search.wxss       |  72 ++++++++
 24 files changed, 851 insertions(+), 8 deletions(-)
 create mode 100644 sourcecode/weixin/images/plugins/weixinliveplayer/player-icon.png
 create mode 100644 sourcecode/weixin/images/plugins/weixinliveplayer/share-icon.png
 create mode 100644 sourcecode/weixin/images/plugins/weixinliveplayer/status-icon.png
 create mode 100644 sourcecode/weixin/images/plugins/weixinliveplayer/time-icon.png
 create mode 100644 sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.js
 create mode 100644 sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.json
 create mode 100644 sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.wxml
 create mode 100644 sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.wxss
 create mode 100644 sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.js
 create mode 100644 sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.json
 create mode 100644 sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.wxml
 create mode 100644 sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.wxss
 create mode 100644 sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.js
 create mode 100644 sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.json
 create mode 100644 sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.wxml
 create mode 100644 sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.wxss

diff --git a/application/service/ResourcesService.php b/application/service/ResourcesService.php
index c06dad929..f208e0ca7 100755
--- a/application/service/ResourcesService.php
+++ b/application/service/ResourcesService.php
@@ -107,6 +107,49 @@ class ResourcesService
         return '';
     }
 
+    /**
+     * 相对路径文件新增
+     * @author  Devil
+     * @blog    http://gong.gg/
+     * @version 1.0.0
+     * @date    2020-04-16
+     * @desc    description
+     * @param   [string]          $value        [相对路径文件 /static 开头]
+     * @param   [string]          $path_type    [文件存储路径]
+     */
+    public static function AttachmentPathAdd($value, $path_type)
+    {
+        // 文件是否存在
+        $file = ROOT.'public'.$value;
+        if(!file_exists($file))
+        {
+            return DataReturn('文件不存在', -1);
+        }
+
+        // 配置信息
+        $config = config('ueditor.');
+
+        // 文件信息
+        $info = pathinfo($file);
+        $title = empty($info['basename']) ? substr(strrchr($file, '/'), 1) : $info['basename'];
+        $ext = strtolower(strrchr($file, '.'));
+        $type = in_array($ext, $config['imageAllowFiles']) ? 'image' : (in_array($ext, $config['videoAllowFiles']) ? 'video' : 'file');
+
+        // 添加文件
+        $data = [
+            "url"       => $value,
+            "path"      => $file,
+            "title"     => $title,
+            "original"  => $title,
+            "ext"       => $ext,
+            "size"      => filesize($file),
+            'type'      => $type,
+            "hash"      => hash_file('sha256', $file, false),
+            'path_type' => $path_type,
+        ];
+        return self::AttachmentAdd($data);
+    }
+
     /**
      * 附件添加
      * @author   Devil
diff --git a/application/tags.php b/application/tags.php
index 417ea5f33..c1b0bd59e 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -57,11 +57,19 @@ return array (
   array (
     0 => 'app\\plugins\\orderexportprint\\Hook',
   ),
+  'plugins_view_admin_order_top_operation' => 
+  array (
+    0 => 'app\\plugins\\orderexportprint\\Hook',
+  ),
   'plugins_view_admin_order_list_operate' => 
   array (
     0 => 'app\\plugins\\orderexportprint\\Hook',
     1 => 'app\\plugins\\orderpricerevision\\Hook',
   ),
+  'plugins_view_admin_order_list_operation' => 
+  array (
+    0 => 'app\\plugins\\orderexportprint\\Hook',
+  ),
   'plugins_view_user_login_info_top' => 
   array (
     0 => 'app\\plugins\\weixinwebauthorization\\Hook',
@@ -146,6 +154,7 @@ return array (
     0 => 'app\\plugins\\coupon\\Hook',
     1 => 'app\\plugins\\membershiplevelvip\\Hook',
     2 => 'app\\plugins\\speedplaceorder\\Hook',
+    3 => 'app\\plugins\\weixinliveplayer\\Hook',
   ),
   'plugins_view_buy_goods_bottom' => 
   array (
diff --git a/extend/base/Wechat.php b/extend/base/Wechat.php
index 197c61fd4..314237422 100755
--- a/extend/base/Wechat.php
+++ b/extend/base/Wechat.php
@@ -186,7 +186,7 @@ class Wechat
      * @version  1.0.0
      * @datetime 2018-01-02T19:53:42+0800
      */
-    private function GetMiniAccessToken()
+    public function GetMiniAccessToken()
     {
         // 缓存key
         $key = $this->_appid.'_access_token';
diff --git a/public/static/admin/default/css/article.css b/public/static/admin/default/css/article.css
index 2760a2042..3efeb8eac 100755
--- a/public/static/admin/default/css/article.css
+++ b/public/static/admin/default/css/article.css
@@ -1,4 +1,4 @@
 /**
  * 编辑/添加页面
  */
-.colorpicker-submit img { width: 18px; height: 18px; }
\ No newline at end of file
+.colorpicker-submit img { width: 16px; height: 16px; }
\ No newline at end of file
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index 3b824e775..037293581 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -276,6 +276,12 @@ button.colorpicker-submit:active {
     -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.15);
     box-shadow: inset 0 3px 5px rgba(255, 255, 255, 0.15);
 }
+button.colorpicker-submit img {
+    margin-right: 7px;
+    width: 14px;
+    height: 14px;
+    float: right;
+}
 
 
 /**
diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js
index 1cb7e7dd9..a25e9d89c 100755
--- a/public/static/common/js/common.js
+++ b/public/static/common/js/common.js
@@ -777,7 +777,7 @@ function ModalLoad(url, title, tag, class_tag)
 	var html = '<div class="am-popup popup-iframe '+class_tag+'" id="'+tag+'">';
 		html += '<div class="am-popup-inner">';
 	    html += '<div class="am-popup-hd">';
-	    html += '<h4 class="am-popup-title">'+(title || '温馨提示')+'</h4>';
+	    html += '<h4 class="am-popup-title">'+(title || '详情')+'</h4>';
 	    html += '<span data-am-modal-close class="am-close">&times;</span>';
 		html += '</div>';
 	    html += '<iframe src="'+url+'" width="100%" height="100%"></iframe>';
@@ -1571,7 +1571,7 @@ function TableContainerInit()
 	        	var first_width = $(this).find('th').first().data('width') || $(this).find('th').first().innerWidth();
 	        	if(first_width > 0)
 	        	{
-		        	$(this).find('th').eq(1).css('min-width', ($(this).find('th').eq(1).innerWidth()+first_width)+'px');
+		        	$(this).find('th').eq(1).css('min-width', (($(this).find('th').eq(1).data('width') || 0)+first_width)+'px');
 	        		$(this).find('th').eq(1).css('padding-left', (first_width+10)+'px');
 	        	}
 	        }
@@ -1589,7 +1589,7 @@ function TableContainerInit()
 	        	var last_width = $(this).find('th').last().data('width') || $(this).find('th').last().innerWidth();
 	        	if(last_width > 0)
 	        	{
-	        		$(this).find('th').eq(-2).css('min-width', ($(this).find('th').eq(-2).innerWidth()+last_width)+'px');
+	        		$(this).find('th').eq(-2).css('min-width', (($(this).find('th').eq(-2).data('width') || 0)+last_width)+'px');
 	        		$(this).find('th').eq(-2).css('padding-right', (last_width+10)+'px');
 	        	}
 	        }
diff --git a/sourcecode/weixin/app.js b/sourcecode/weixin/app.js
index be1e8ebcd..949d3408a 100755
--- a/sourcecode/weixin/app.js
+++ b/sourcecode/weixin/app.js
@@ -75,7 +75,8 @@ App({
     application_describe: "{{application_describe}}",
 
     // 价格符号
-    price_symbol: "{{price_symbol}}"
+    price_symbol: "{{price_symbol}}",
+    price_symbol: "￥",
   },
 
   /**
diff --git a/sourcecode/weixin/app.json b/sourcecode/weixin/app.json
index d1581d9e3..fb10b556b 100755
--- a/sourcecode/weixin/app.json
+++ b/sourcecode/weixin/app.json
@@ -63,7 +63,10 @@
     "pages/plugins/wallet/user-cash/user-cash",
     "pages/plugins/wallet/user-cash-detail/user-cash-detail",
     "pages/plugins/excellentbuyreturntocash/profit/profit",
-    "pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail"
+    "pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail",
+    "pages/plugins/weixinliveplayer/index/index",
+    "pages/plugins/weixinliveplayer/search/search",
+    "pages/plugins/weixinliveplayer/detail/detail"
   ],
   "permission": {
     "scope.userLocation": {
@@ -111,7 +114,12 @@
     "request": 10000,
     "downloadFile": 10000
   },
-  "plugins": {},
+  "plugins": {
+    "live-player-plugin": {
+      "version": "1.0.5",
+      "provider": "wx2b03c6e691cd7370"
+    }
+  },
   "debug": true,
   "sitemapLocation": "sitemap.json"
 }
\ No newline at end of file
diff --git a/sourcecode/weixin/images/plugins/weixinliveplayer/player-icon.png b/sourcecode/weixin/images/plugins/weixinliveplayer/player-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..680663b9079a6e5343102f43fc4a87fa5e63624c
GIT binary patch
literal 1733
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
bi=NQ`D+k_pVX9w<00000NkvXXu0mjf6oezF

literal 0
HcmV?d00001

diff --git a/sourcecode/weixin/images/plugins/weixinliveplayer/share-icon.png b/sourcecode/weixin/images/plugins/weixinliveplayer/share-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d30242686fe27dcc0c97b37cf27240c0b88069ac
GIT binary patch
literal 1727
zcmV;w20;0VP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk000JtNkl<ZXhYRo
zS;!Vu7=9k=s>Li@C<<C2FAOSLOlZ+E%50;>N~L`vDN0g<x+pI)+Q<yD#mbAc#UirB
zR?-y8G7`$5s1%B9F*D2V;)&;PM$Ui!neUtV{yC$)Fns_2eP`bHea@Vj^DfU22}RN=
z08R$5cXsR({QU`lWhC!R=)wTiY|@ydeF2OCa4LZF01WA(e+|jQn)IQYu0{Y$Ivv0i
z0A~Q$p_|d*_oXB~L9NN4082Uv!1Vww>cQhR0ABoGENMx{WLNa^E<iT|SOVZP06zj)
zpMR44vxi9<^eMHku%w#-JlMhVDgbW-c!%WDL3`M+f?9wjJqF;~5+9ZWc!=an4g1)r
zy2^kheE{Hu0_$I8K<75<St4bX089E6z@7y@%*??4p2)wBY9$>(a&;ZsT>(p43*f*4
zrPE2?U&mOJV<o*0U^IYr0A`R}R7HPBz>=N@Q1m38P}M*cC+d!obSMDdN}*KpsT8oJ
z8367naOMD#Kh$-y>G35iuPf+6z>=;6@MM9L!$^8>-R2_cY5-3ZIMNaH0Ki#L@o|Bo
z<4CS-6RD&f0Spa}T_XFwhwrEZx(IO5eLI=tf;PZP8Vevlj_T3o3X(-zDEa};V&gbE
znwdJ@l{5^%r2sAiaCna(<I_fv{4)MB2K-!<2>3}jie$2VR?=hucLUhJA)r?C2T9)w
z17s`UEX8x6AIcPx$s#C8Hvo9J3(&s-{03lyfs~B(y&TG1l1^7U0$vQ@tYE})k|#De
z>-|(oa;2l_f%8rF^!0N5l%zAPLXq?WfD5A^7m=J$c23_FmUIw+@1j8$q)G%NjRN4<
z+)v?9e6?qh{HfbS_X5^BbHFzOm=hRTP4dWYMtl8T(rW<5N9R|*eI%U=;N?13HXoY<
zegnX`K*4O1Q+ox}={!kZZqG+!t|2+Esy#`L?H%Li(s3DwdMRmV0Dncs#*_3UG%k|7
zlDwjFd5@&`-C82adHE%tJd%%AJ=uVL(!$_`O(b`(s-W&TN#6oEI5_Vdl73*eA_jaf
zfa!rX&)CH&tV?o9_VYk@`(@gK6mS~J2ND5}1ODVuT#Un4`1P!woc}hF<g<wYd)sla
zk;_PuMTtrZ^L;uE*als8&1FogYNI3<`i>854JBC?JtYBcz;Ov@ILWV5Sd-*hbe`g^
zC%In=JE6`jqI1K*vdn<JC3$PgWk`x5xul%{YzgeN(q@tL1%MHm-8F3jb_en2HUUf8
z6~N}e<`x5X4DDDtmn2JC(jfqx803=t3Ktan)*A3f07j;MXt{=*^_bcO?6lG4++0=~
z@GAh$4!%sXElG08#TinYfa54~u>rgC=YSxWB!P#dy#TmH>Q76u1SJO|=@tNCvtXV9
z-v!{d0Pq5mF1s`?l3ax_J77hY+$ZfWN_qysqyWe)12zxi-QdfOBwbYd--{%dhV}@6
zjLq|5M>`=OBU!Z7)+|bjA6T17?v?|NYtb&V+}@URDeM&7s`E)+kprFxAS|@6A{oZl
zDSS$*Q<7;>M+ZhGkzAMqHr?p^h=G%=h?f-Ue?`gjO_&Mn`~$#E!1ZBWy45mmO3(#t
zg;z=T#TwhR5T63HB-5xKiFA)6`DQ=B{zp>lt(GQ1OL8slLjc1Az5Pm7+eI_2DbOX|
zjL{^Q<u<CeOSdVXqsoLxng-y$Xl&nB6n<ByA>NfvP{pwnV<fr1<UUg@$CC8+v{lL|
z4`pn-?SkJC0+8f3tGCoxrjnc;f7yxDQpUR5o_HRPlN~R|@;J%sidIuM+EN+&u64dg
z?7SowEnK{arDL173NfvWh1VMIqX4W^KBs=MY#^EE+l7ydu7G`32R5FY+H+D;BBJ}%
z`|M36jr4US!`fW$fHTl#th`pprC9`JuwhV<gBq~?6rv47%d!E{441L<JS+))I7<W!
zw2+1b;8v1u2v(9xOF9Bw#?s4&nceErjS1pC^_V63-3gb1oW#4@SteJJe5w-CY*1~$
z+48RX3cw}+ZvpV;-|rQG%)Zl7w_Ea0>pd-F-gUw;-w8q-R8#@p6X0C&AYbyR;$J+*
zR0&g(w#LSFl?)1S06c$<C!{^q^`&gQlXu@5zM_38-e9B=zyWY?3uk5onUEw?*GG35
z{i2AEB_xYN$GSTE#y1K$dbqhG=_-TiPYwp$O!H@cc=#{b;U-)Dw<D!NU&*rB_!lP2
VhC+10TUh`A002ovPDHLkV1kb4Ff#xE

literal 0
HcmV?d00001

diff --git a/sourcecode/weixin/images/plugins/weixinliveplayer/status-icon.png b/sourcecode/weixin/images/plugins/weixinliveplayer/status-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ed6af8913050fba502d56c1c8ee18970439155e
GIT binary patch
literal 1380
zcmV-q1)KVbP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk000FmNkl<ZXhZFq
zTWDNG7{~wrO<PQ&MMV_z;H5;YMa5cgw2H}@*$sVBkxHq8;;juzk!qh(unp1rAVw>;
zXl(l+;zJdJsaTS8CW%4>wQ39E1#R`k8y2A`i9)iUoU@mlvzKgk_au9=$$8teGvD|B
z%{OOezL_Bw*~3M~izVQCk9cSi7At-qgr_+&^hMZ>CYIiV27XD~9;nuKD8ORrS3zt~
ziIGkk^G3D8GWA8N4*_oUekWtMab)PzYHWuCtkh2cugD5nvHW5lJN9Qa!n~$a>Is1R
zr|rm-H0D4xcEbVI`b7wKW`zj8=CE^JHNwQQE(c>j`)r&+vO#lX@MJZ1!vO{erH26M
ztQg{HI?l_LiW8;30dS2ky4z?>U#0dk^+Eymx}Vl-A#kBD%8H7yjkf(!xgtfyUk7B{
zbUhxTu^%hfPNDLl0jHrKhTyQz(P<Dj(s9ntR;(!X0Km8Xp9d(K#{4l`8#9$F3s|(i
z48W=qj<-W_udmDpAYPi4SdsJ7gH(&JEAImNNzwYr<T#Sa(;OW=GaDZzfyIh<g7P?k
zRsbt!W3(n^h~FSM1;{=c^IkCxMS-QQ?OZf0I|yKNO#rHKO1wtLNv{inh6)0UQmX)-
zs>Wx{>k<QWoV#;%6amhi5^65LG6BS9I?fS)<vd`q^ezz374Xmpp~GSO-O9YrO)cr@
zxDb<*8v#BA;O2ZUatn?5Jo7#uSZQ}9bA6zqu!F<4JI6-)5lim|u_ve<Z*th#S`b*2
zx&+|wITgA&>;#QO7+aM7EGN<@Xq>f$fvtD~l)(T`a%we4M!t_QV=z9J?gg<U@bce@
zl^h%U+kF@4(q7(4><)b7#wj^hN2xJH>oy2R0-A_+I?m`4@KS``J|9At_8QXbPjZCD
zxM|;<JvHyr`MpNEXv_<9MO=GerTYQg17ZMzyHcR+M+3V!H1u8A;86f}M@)C*>;~mO
zfP1r$#6xtPx59*u6tKI15vAHe_Cjz&8nh41O*=U-;LVfOK9K`<fn?2^6=-SM2SH~R
zFh)(=HgyS{ffB7BL=vxnxF8d48ppSnRX%<sBkaeJMB++JP3_Naw!42OV>eZLf)RP(
zY_wIp3y|ltjUlKgX<0D9-nXsP9S|M>ajgfwtl=sS4*pn9$6ipt*=Sq(2N139R90?k
zx}bn19&bTXdH_69_YoGQHbK|}VzmcbL3F)pwN4L3>Fi3YQ1_HXq8XD(7j!yluh&sp
zl!^m%N9N4tTVLJI!=h9-z-Q}zr6ui&TM?Vu3(%_jwKRZ#K)Bh`@>G^skJ*ye??A8x
z!21BwM<4Z^59jTK*7=TyH#b`GEr48&7)CSOrR6La%PCv)dAJ<0VU%40P7RJlHsZD3
z0YPt|rJEX?dGzRb7_C1aHoO~wl)w?GKflg7YO&UXv9W-#)TNZK=0j{4K19V20`jQO
z)&z~yl=&S5PF-{OD?3l7N*$(g{073%H77QtqvKLcP8|o}yA;EZY3w@-0(&E>ijM)Z
zKA>pfoDb(61_JD*v7ea%SZxJZ=yGTuh!X(5os;lXYE<ML2wOq#^3ClzW_|%=o&Szk
zu}dw-0j{f5LuBd|=$VCqQ{Td`kr7^z5cbp9{tI&H<@*fA3LT$T<a>TAO#sqU?7*(%
z>AtseN#cIcOVTsPBlC+;+S@q5F;Gq-7CSW4Azevezc1Oa;XE`pM(x`^Th2P6Ea1`&
m9sLqZz|oIUbqW_<g#QQLA@*CkX$%?w0000<MNUMnLSTY1!-sJI

literal 0
HcmV?d00001

diff --git a/sourcecode/weixin/images/plugins/weixinliveplayer/time-icon.png b/sourcecode/weixin/images/plugins/weixinliveplayer/time-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3092f3c44041c5dadf31734fe9dd59fae6b974b2
GIT binary patch
literal 2896
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

literal 0
HcmV?d00001

diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.js b/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.js
new file mode 100644
index 000000000..79c6654b8
--- /dev/null
+++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.js
@@ -0,0 +1,160 @@
+const app = getApp();
+Page({
+  data: {
+    params: null,
+    data_list_loding_status: 1,
+    data_list_loding_msg: '',
+    data_bottom_line_status: false,
+    detail: null,
+  },
+
+  onLoad(params) {
+    // 启动参数处理
+    params = app.launch_params_handle(params);
+
+    //params['id'] = 1;
+    this.setData({ params: params });
+    this.init();
+  },
+
+  onShow() {},
+
+  init() {
+    var self = this;
+    wx.showLoading({ title: "加载中..." });
+    this.setData({
+      data_list_loding_status: 1
+    });
+
+    wx.request({
+      url: app.get_request_url("detail", "search", "weixinliveplayer"),
+      method: "POST",
+      data: {
+        id: this.data.params.id
+      },
+      dataType: "json",
+      success: res => {
+        wx.hideLoading();
+        wx.stopPullDownRefresh();
+        if (res.data.code == 0) {
+          var data = res.data.data;
+          self.setData({
+            detail: data.data,
+            data_list_loding_status: 3,
+            data_bottom_line_status: true,
+            data_list_loding_msg: '',
+          });
+
+          // 标题
+          wx.setNavigationBarTitle({ title: data.data.name });
+        } else {
+          self.setData({
+            data_list_loding_status: 2,
+            data_bottom_line_status: false,
+            data_list_loding_msg: res.data.msg,
+          });
+          app.showToast(res.data.msg);
+        }
+      },
+      fail: () => {
+        wx.hideLoading();
+        wx.stopPullDownRefresh();
+        self.setData({
+          data_list_loding_status: 2,
+          data_bottom_line_status: false,
+          data_list_loding_msg: '服务器请求出错',
+        });
+
+        app.showToast("服务器请求出错");
+      }
+    });
+  },
+
+  // 下拉刷新
+  onPullDownRefresh() {
+    this.init();
+  },
+
+  // 详情图片查看
+  detail_images_view_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if (value != null) {
+      wx.previewImage({
+        current: value,
+        urls: [value]
+      });
+    }
+  },
+
+  // 进入直播
+  player_event(e) {
+    if ((this.data.detail || null) != null)
+    {
+      if (this.data.detail.status == 1 || this.data.detail.status == 2) {
+        var room_id = this.data.detail.id
+        var params = encodeURIComponent(JSON.stringify({type: 'detail'}));
+        wx.navigateTo({
+          url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${this.data.detail.id}&custom_params=${params}`
+        });
+      }
+    } else {
+      app.showToast('数据有误');
+    }
+  },
+
+  // 海报分享
+  share_event() {
+    var user = app.get_user_info(this, 'poster_event');
+    if (user != false) {
+      // 用户未绑定用户则转到登录页面
+      if (app.user_is_need_login(user)) {
+        wx.navigateTo({
+          url: "/pages/login/login?event_callback=poster_event"
+        });
+        return false;
+      } else {
+        wx.showLoading({ title: '生成中...' });
+        wx.request({
+          url: app.get_request_url('poster', 'index', 'weixinliveplayer'),
+          method: 'POST',
+          data: { "id": this.data.detail.id },
+          dataType: 'json',
+          success: (res) => {
+            wx.hideLoading();
+            if (res.data.code == 0) {
+              wx.previewImage({
+                current: res.data.data,
+                urls: [res.data.data]
+              });
+            } else {
+              app.showToast(res.data.msg);
+            }
+          },
+          fail: () => {
+            wx.hideLoading();
+            app.showToast("服务器请求出错");
+          }
+        });
+      }
+    }
+  },
+
+  // 自定义分享
+  onShareAppMessage() {
+    var user = app.get_user_cache_info() || null;
+    var user_id = (user != null && (user.id || null) != null) ? user.id : 0;
+    if ((this.data.detail || null) == null)
+    {
+      var did = this.data.detail.id;
+      var name = this.data.detail.name;
+    } else {
+      var did = 0;
+      var name = '';
+    }
+    return {
+      title: app.data.application_title + name,
+      desc: app.data.application_describe,
+      path: '/pages/plugins/weixinliveplayer/detail/detail?id=' + did + '&referrer=' + user_id
+    };
+  },
+});
\ No newline at end of file
diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.json b/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.json
new file mode 100644
index 000000000..ff92292e5
--- /dev/null
+++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.json
@@ -0,0 +1,4 @@
+{
+  "enablePullDownRefresh": true,
+  "navigationBarTitleText": "直播详情"
+}
\ No newline at end of file
diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.wxml b/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.wxml
new file mode 100644
index 000000000..c7ed7ce7b
--- /dev/null
+++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.wxml
@@ -0,0 +1,43 @@
+<view wx:if="{{detail != null}}" class="detail">
+  <!-- 封面图片 -->
+  <image wx:if="{{(detail || null) != null && (detail.share_img || null) != null}}" class="banner wh-auto dis-block" src="{{detail.share_img}}" mode="widthFix" bindtap="detail_images_view_event" data-value="{{detail.share_img}}" />
+
+  <!-- 标题 -->
+  <view class="name">{{detail.name}}</view>
+
+  <!-- 基础信息 -->
+  <view class="bg-white base">
+    <view class="item">
+      <image class="item-icon" src="/images/plugins/weixinliveplayer/status-icon.png" mode="widthFix" />
+      <text class="cr-888">直播状态</text>
+      <view class="fr more status-{{detail.status}}">{{detail.status_name}}</view>
+    </view>
+    <view class="item br-t item-time">
+      <image class="item-icon" src="/images/plugins/weixinliveplayer/time-icon.png" mode="widthFix" />
+      <text class="cr-888">开播时间</text>
+      <view class="fr time">
+        <view class="start-time">{{detail.start_time}}</view>
+        <view class="end-time">{{detail.end_time}}</view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 导航 -->
+  <view class="nav wh-auto">
+    <button type="primary" class="share-submit fl" hover-class="none" bindtap="share_event">
+      <image class="item-icon" src="/images/plugins/weixinliveplayer/share-icon.png" mode="widthFix" />
+      <text>分享</text>
+    </button>
+    <button type="default" class="player-submit fr {{detail.status == 1 || detail.status == 2 ? '' : 'disabled'}}" hover-class="none" bindtap="player_event">
+      <image class="item-icon" src="/images/plugins/weixinliveplayer/player-icon.png" mode="widthFix" />
+      <text>{{detail.status_name}}</text>
+    </button>
+  </view>
+
+  <import src="/pages/common/bottom_line.wxml" />
+  <template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
+</view>
+<view wx:else>
+  <import src="/pages/common/nodata.wxml" />
+  <template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
+</view>
\ No newline at end of file
diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.wxss b/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.wxss
new file mode 100644
index 000000000..dadd7c0b1
--- /dev/null
+++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.wxss
@@ -0,0 +1,82 @@
+/**
+ * 内容
+ */
+.detail {
+  padding-bottom: 100rpx;
+}
+.name {
+  font-size: 32rpx;
+  line-height: 44rpx;
+  font-weight: 500;
+  padding: 15rpx 10rpx;
+}
+.base {
+  overflow: hidden;
+  position: relative;
+  padding: 15rpx 10rpx 0 10rpx;
+}
+.base .item {
+  line-height: 50rpx;
+  padding: 20rpx 0;
+}
+.base .item .item-icon {
+  width: 35rpx;
+  height: 35rpx;
+  vertical-align: middle;
+  margin-right: 10rpx;
+}
+.base .item .more {
+  color: #999;
+}
+.base .item .status-0 {
+  color: #0e90d2;
+}
+.base .item .status-1 {
+  color: #5eb95e;
+}
+.base .item .status-2 {
+  color: #F37B1D;
+}
+.base .item-time {
+  line-height: 75rpx;
+}
+.base .item-time .time {
+  line-height: 38rpx;
+}
+.base .item-time .start-time {
+  color: #5eb95e;
+}
+.base .item-time .end-time {
+  color: #dd514c;
+}
+
+/**
+ * 导航
+ */
+.nav {
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  overflow: hidden;
+  height: 100rpx;
+}
+.nav button {
+  width: 50%;
+  height: 100% !important;
+  border-radius: 0;
+  font-size: 32rpx;
+  line-height: 100rpx;
+}
+.nav button image {
+  width: 40rpx;
+  height: 40rpx !important;
+  vertical-align: middle;
+  margin-right: 10rpx;
+}
+.nav button.player-submit {
+  background: #d2364c;
+  color: #fff;
+}
+.nav button.disabled {
+  background: #ffc5cd;
+}
\ No newline at end of file
diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.js b/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.js
new file mode 100644
index 000000000..c7785b7db
--- /dev/null
+++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.js
@@ -0,0 +1,98 @@
+const app = getApp();
+Page({
+  data: {
+    load_status: 0,
+    data_list_loding_status: 1,
+    data_bottom_line_status: false,
+    data_list_loding_msg: '',
+    data_list: [],
+    data_base: null,
+    banner_list: [],
+  },
+
+  onLoad(params) {
+    // 启动参数处理
+    params = app.launch_params_handle(params);
+
+    this.init();
+  },
+
+  onShow() {},
+
+  init() {
+    // 获取数据
+    this.get_data_list();
+  },
+
+  // 获取数据
+  get_data_list() {
+    var self = this;
+
+    // 加载loding
+    wx.showLoading({ title: "加载中..." });
+    this.setData({
+      data_list_loding_status: 1,
+    });
+
+    wx.request({
+      url: app.get_request_url("index", "index", "weixinliveplayer"),
+      method: "POST",
+      data: {},
+      dataType: "json",
+      success: res => {
+        wx.hideLoading();
+        wx.stopPullDownRefresh();
+        self.setData({ load_status: 1 });
+        
+        if (res.data.code == 0) {
+          var data = res.data.data;
+          var status = ((data.data || null) == null || data.data.length == 0);
+          this.setData({
+            data_base: data.base || null,
+            banner_list: data.banner_list || [],
+            data_list: data.data,
+            data_list_loding_status: status ? 0 : 3,
+            data_bottom_line_status: !status,
+          });
+
+          // 导航名称
+          if ((data.base || null) != null && (data.base.application_name || null) != null) {
+            wx.setNavigationBarTitle({ title: data.base.application_name });
+          }
+        } else {
+          self.setData({
+            data_bottom_line_status: true,
+            data_list_loding_status: 2,
+            data_list_loding_msg: res.data.msg,
+          });
+          app.showToast(res.data.msg);
+        }
+      },
+      fail: () => {
+        wx.hideLoading();
+        wx.stopPullDownRefresh();
+        self.setData({
+          data_bottom_line_status: false,
+          data_list_loding_status: 2,
+          data_list_loding_msg: '服务器请求出错',
+        });
+      }
+    });
+  },
+
+  // 下拉刷新
+  onPullDownRefresh() {
+    this.init();
+  },
+
+  // 自定义分享
+  onShareAppMessage() {
+    var user = app.get_user_cache_info() || null;
+    var user_id = (user != null && (user.id || null) != null) ? user.id : 0;
+    return {
+      title: app.data.application_title,
+      desc: app.data.application_describe,
+      path: '/pages/plugins/weixinliveplayer/index/index?referrer=' + user_id
+    };
+  },
+});
\ No newline at end of file
diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.json b/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.json
new file mode 100644
index 000000000..af5489237
--- /dev/null
+++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.json
@@ -0,0 +1,7 @@
+{
+  "enablePullDownRefresh": true,
+  "navigationBarTitleText": "直播",
+  "usingComponents": {
+    "component-banner": "/components/slider/slider"
+  }
+}
\ No newline at end of file
diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.wxml b/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.wxml
new file mode 100644
index 000000000..79494d1a7
--- /dev/null
+++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.wxml
@@ -0,0 +1,36 @@
+<!-- 轮播 -->
+<component-banner prop-data="{{banner_list}}"></component-banner>
+
+<!-- 导航 -->
+<view wx:if="{{load_status == 1}}" class="nav bg-white spacing-mb">
+  <view class="title">最新直播</view>
+  <navigator url="/pages/plugins/weixinliveplayer/search/search" hover-class="none">
+    <view class="arrow-right more">查看更多</view>
+  </navigator>
+</view>
+
+<!-- 数据列表 -->
+<view wx:if="{{data_list.length > 0}}" class="data-list">
+  <view wx:for="{{data_list}}" wx:key="key" wx:for-item="item" class="item bg-white spacing-mb">
+    <navigator url="/pages/plugins/weixinliveplayer/detail/detail?id={{item.id}}" hover-class="none">
+        <image src="{{item.share_img}}" mode="aspectFit" class="fl" />
+        <view class="fl base">
+          <view class="single-text name">{{item.name}}</view>
+          <view class="time">
+          <view class="fl time-title">开播时间</view>
+            <view class="start-time">{{item.start_time}}</view>
+            <view class="end-time">{{item.end_time}}</view>
+          </view>
+          <view class="status status-{{item.status}}">{{item.status_name}}</view>
+        </view>
+      </navigator>
+  </view>
+</view>
+<view wx:else>
+  <import src="/pages/common/nodata.wxml" />
+  <template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
+</view>
+
+<!-- 结尾 -->
+<import src="/pages/common/bottom_line.wxml" />
+<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
\ No newline at end of file
diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.wxss b/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.wxss
new file mode 100644
index 000000000..f15fd8df2
--- /dev/null
+++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.wxss
@@ -0,0 +1,73 @@
+/*
+ * 导航
+ */
+.nav {
+  padding: 20rpx 10rpx;
+  position: relative;
+  border-bottom: 1px solid #eee;
+}
+.nav .title {
+  font-size: 32rpx;
+}
+.nav .more {
+  position: absolute;
+  top: 22rpx;
+  right: 10rpx;
+  color: #888;
+  padding-right: 15px;
+}
+
+/**
+ * 数据列表
+ */
+.data-list .item {
+  overflow: hidden;
+  padding: 20rpx 10rpx;
+  position: relative;
+}
+.data-list .item image {
+    width: 160rpx;
+    height: 160rpx !important;
+}
+.data-list .item .base {
+  width: calc(100% - 190rpx);
+  text-align: left;
+  padding: 0 10rpx 0 20rpx;
+}
+.data-list .item .base .name {
+  font-size: 32rpx;
+}
+.data-list .item .base .time {
+  margin-top: 25rpx;
+}
+.data-list .item .base .time-title {
+  width: 60rpx;
+  background: #7ad2ff;
+  color: #fff;
+  text-align: center;
+  padding: 10rpx;
+  line-height: 30rpx;
+  border-radius: 6rpx;
+  margin-right: 10rpx;
+}
+.data-list .item .base .start-time {
+  color: #5eb95e;
+}
+.data-list .item .base .end-time {
+  color: #dd514c;
+}
+.data-list .item .base .status {
+  position: absolute;
+  right: 10rpx;
+  bottom: 20rpx;
+  color: #999;
+}
+.data-list .item .base .status-0 {
+  color: #0e90d2;
+}
+.data-list .item .base .status-1 {
+  color: #5eb95e;
+}
+.data-list .item .base .status-2 {
+  color: #F37B1D;
+}
\ No newline at end of file
diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.js b/sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.js
new file mode 100644
index 000000000..a82c8986d
--- /dev/null
+++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.js
@@ -0,0 +1,163 @@
+const app = getApp();
+Page({
+  data: {
+    data_list: [],
+    data_page_total: 0,
+    data_page: 1,
+    data_list_loding_status: 1,
+    data_bottom_line_status: false,
+    params: null,
+    nav_status_list: [
+      { name: "全部", value: "-1" },
+      { name: "未开始", value: "0" },
+      { name: "直播中", value: "1" },
+      { name: "暂停中", value: "2" },
+      { name: "已结束", value: "3" },
+    ],
+    nav_status_index: 0,
+  },
+
+  onLoad(params) {
+    // 启动参数处理
+    params = app.launch_params_handle(params);
+
+    // 是否指定状态
+    var nav_status_index = 0;
+    if ((params.status || null) != null) {
+      for (var i in this.data.nav_status_list) {
+        if (this.data.nav_status_list[i]['value'] == params.status) {
+          nav_status_index = i;
+          break;
+        }
+      }
+    }
+
+    this.setData({
+      params: params,
+      nav_status_index: nav_status_index,
+    });
+    this.init();
+  },
+
+  onShow() {},
+
+  init() {
+    // 获取数据
+    this.get_data_list();
+  },
+
+  // 获取数据
+  get_data_list(is_mandatory) {
+    // 分页是否还有数据
+    if ((is_mandatory || 0) == 0) {
+      if (this.data.data_bottom_line_status == true) {
+        return false;
+      }
+    }
+
+    // 加载loding
+    wx.showLoading({ title: "加载中..." });
+    this.setData({
+      data_list_loding_status: 1
+    });
+
+    // 参数
+    var status = ((this.data.nav_status_list[this.data.nav_status_index] || null) == null) ? -1 : this.data.nav_status_list[this.data.nav_status_index]['value'];
+
+    // 获取数据
+    wx.request({
+      url: app.get_request_url("index", "search", "weixinliveplayer"),
+      method: "POST",
+      data: {
+        page: this.data.data_page,
+        status: status,
+        is_more: 1,
+      },
+      dataType: "json",
+      success: res => {
+        wx.hideLoading();
+        wx.stopPullDownRefresh();
+        if (res.data.code == 0) {
+          if (res.data.data.data.length > 0) {
+            if (this.data.data_page <= 1) {
+              var temp_data_list = res.data.data.data;
+            } else {
+              var temp_data_list = this.data.data_list;
+              var temp_data = res.data.data.data;
+              for (var i in temp_data) {
+                temp_data_list.push(temp_data[i]);
+              }
+            }
+            this.setData({
+              data_list: temp_data_list,
+              data_total: res.data.data.total,
+              data_page_total: res.data.data.page_total,
+              data_list_loding_status: 3,
+              data_page: this.data.data_page + 1,
+            });
+
+            // 是否还有数据
+            if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) {
+              this.setData({ data_bottom_line_status: true });
+            } else {
+              this.setData({ data_bottom_line_status: false });
+            }
+          } else {
+            this.setData({
+              data_list_loding_status: 0,
+              data_list: [],
+              data_bottom_line_status: false,
+            });
+          }
+        } else {
+          this.setData({
+            data_list_loding_status: 0,
+          });
+          app.showToast(res.data.msg);
+        }
+      },
+      fail: () => {
+        wx.hideLoading();
+        wx.stopPullDownRefresh();
+
+        this.setData({
+          data_list_loding_status: 2,
+        });
+        app.showToast("服务器请求出错");
+      }
+    });
+  },
+
+  // 下拉刷新
+  onPullDownRefresh() {
+    this.setData({
+      data_page: 1
+    });
+    this.get_data_list(1);
+  },
+
+  // 滚动加载
+  scroll_lower(e) {
+    this.get_data_list();
+  },
+
+  // 导航事件
+  nav_event(e) {
+    this.setData({
+      nav_status_index: e.currentTarget.dataset.index || 0,
+      data_page: 1,
+    });
+    this.get_data_list(1);
+  },
+
+  // 自定义分享
+  onShareAppMessage() {
+    var user = app.get_user_cache_info() || null;
+    var user_id = (user != null && (user.id || null) != null) ? user.id : 0;
+    return {
+      title: app.data.application_title,
+      desc: app.data.application_describe,
+      path: '/pages/plugins/weixinliveplayer/search/search?referrer=' + user_id
+    };
+  },
+});
\ No newline at end of file
diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.json b/sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.json
new file mode 100644
index 000000000..fb429bc43
--- /dev/null
+++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.json
@@ -0,0 +1,4 @@
+{
+  "enablePullDownRefresh": true,
+  "navigationBarTitleText": "直播列表"
+}
\ No newline at end of file
diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.wxml b/sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.wxml
new file mode 100644
index 000000000..19dade8ec
--- /dev/null
+++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.wxml
@@ -0,0 +1,34 @@
+<!-- 导航 -->
+<view class="nav">
+  <block wx:for="{{nav_status_list}}" wx:key="key">
+    <view class="item fl tc cr-888 {{nav_status_index == index ? 'active' : ''}}" data-index="{{index}}" bindtap="nav_event">{{item.name}}</view>
+  </block>
+</view>
+
+<!-- 列表 -->
+<scroll-view scroll-y="{{true}}" class="scroll-box" bindscrolltolower="scroll_lower" lower-threshold="30">
+  <view wx:if="{{data_list.length > 0}}" class="data-list">
+    <view wx:for="{{data_list}}" wx:key="key" wx:for-item="item" class="item bg-white spacing-mb">
+      <navigator url="/pages/plugins/weixinliveplayer/detail/detail?id={{item.id}}" hover-class="none">
+          <image src="{{item.share_img}}" mode="aspectFit" class="fl" />
+          <view class="base fl">
+            <view class="single-text name">{{item.name}}</view>
+            <view class="time">
+            <view class="time-title fl">开播时间</view>
+              <view class="start-time">{{item.start_time}}</view>
+              <view class="end-time">{{item.end_time}}</view>
+            </view>
+            <view class="status status-{{item.status}}">{{item.status_name}}</view>
+          </view>
+        </navigator>
+    </view>
+  </view>
+  <view wx:else>
+    <import src="/pages/common/nodata.wxml" />
+    <template is="nodata" data="{{status: data_list_loding_status}}">
+    </template>
+  </view>
+
+  <import src="/pages/common/bottom_line.wxml" />
+  <template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
+</scroll-view>
\ No newline at end of file
diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.wxss b/sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.wxss
new file mode 100644
index 000000000..b4c8e358f
--- /dev/null
+++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.wxss
@@ -0,0 +1,72 @@
+/*
+ * 导航
+ */
+.nav {
+  background: #eee;
+  height: 80rpx;
+  line-height: 80rpx;
+}
+.nav .item {
+  width: 20%;
+}
+.nav .active {
+  color: #d2364c;
+}
+
+/**
+ * 数据列表
+ */
+.scroll-box {
+  height: calc(100vh - 80rpx);
+}
+.data-list .item {
+  overflow: hidden;
+  padding: 20rpx 10rpx;
+  position: relative;
+}
+.data-list .item image {
+  width: 160rpx;
+  height: 160rpx !important;
+}
+.data-list .item .base {
+  width: calc(100% - 190rpx);
+  text-align: left;
+  padding: 0 10rpx 0 20rpx;
+}
+.data-list .item .base .name {
+  font-size: 32rpx;
+}
+.data-list .item .base .time {
+  margin-top: 25rpx;
+}
+.data-list .item .base .time-title {
+  width: 60rpx;
+  background: #7ad2ff;
+  color: #fff;
+  text-align: center;
+  padding: 10rpx;
+  line-height: 30rpx;
+  border-radius: 6rpx;
+  margin-right: 10rpx;
+}
+.data-list .item .base .start-time {
+  color: #5eb95e;
+}
+.data-list .item .base .end-time {
+  color: #dd514c;
+}
+.data-list .item .base .status {
+  position: absolute;
+  right: 10rpx;
+  bottom: 20rpx;
+  color: #999;
+}
+.data-list .item .base .status-0 {
+  color: #0e90d2;
+}
+.data-list .item .base .status-1 {
+  color: #5eb95e;
+}
+.data-list .item .base .status-2 {
+  color: #F37B1D;
+}
\ No newline at end of file
-- 
GitLab