diff --git a/packageA/pages/liveStream/liveStream.wxml b/packageA/pages/liveStream/liveStream.wxml
index e16789f..a5e8e5f 100644
--- a/packageA/pages/liveStream/liveStream.wxml
+++ b/packageA/pages/liveStream/liveStream.wxml
@@ -15,7 +15,7 @@
{{item.name}}
{{filter.format_time(item.start_time, 2)}} 开始
-
+ 主播：{{item['anchor_name']}}
@@ -36,7 +36,11 @@
- {{item.name}}
+
+ {{item.name}}
+ {{filter.format_time(item.start_time, 2)}} 开始
+ 主播：{{item['anchor_name']}}
+
观看直播
@@ -57,7 +61,7 @@
{{item.name}}
- {{filter.format_time(item.start_time, 2)}} 开始
+ {{filter.format_time(item.end_time, 2)}} 结束
主播：{{item['anchor_name']}}
观看回放
diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.js b/packageA/pages/liveStreamDetails/liveStreamDetails.js
index 1235639..86807b2 100644
--- a/packageA/pages/liveStreamDetails/liveStreamDetails.js
+++ b/packageA/pages/liveStreamDetails/liveStreamDetails.js
@@ -191,7 +191,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
// 绘制文字
ctx.setFontSize(24);
ctx.setFillStyle('#1E1E1E');
- this.drawText(ctx, '发的电视剧覅是覅世界佛教阿松i范吉奥i是房间都是金佛ex哎', 51, 563, 300, 300, 2);
+ this.drawText(ctx, title, 51, 563, 300, 300, 2);
// 绘制小程序码
ctx.drawImage(this.data.ewm, 310, 525, 132, 132);
diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.wxml b/packageA/pages/liveStreamDetails/liveStreamDetails.wxml
index e676284..8d3d478 100644
--- a/packageA/pages/liveStreamDetails/liveStreamDetails.wxml
+++ b/packageA/pages/liveStreamDetails/liveStreamDetails.wxml
@@ -5,22 +5,22 @@
-
+
{{details.name}}
+
+ {{filter.format_time(details.start_time, 2)}} 锁定直播
+
+
{{myUtils.liveStatus(details.live_status)}}
-
diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.wxss b/packageA/pages/liveStreamDetails/liveStreamDetails.wxss
index a23b30e..86b5f2d 100644
--- a/packageA/pages/liveStreamDetails/liveStreamDetails.wxss
+++ b/packageA/pages/liveStreamDetails/liveStreamDetails.wxss
@@ -54,11 +54,13 @@
line-height: 50rpx;
padding: 0 30rpx;
background-color: #eee;
- margin-top: 22rpx;
- margin-bottom: 44rpx;
+ /* margin-top: 22rpx;
+ margin-bottom: 44rpx; */
}
.desc-content {
font-size: 29rpx;
+ padding-top: 22rpx;
+ padding-bottom: 22rpx;
}
.list {
padding: 0 36rpx;
diff --git a/utils/filter.wxs b/utils/filter.wxs
index aa3ba54..93eddaf 100644
--- a/utils/filter.wxs
+++ b/utils/filter.wxs
@@ -1,49 +1,68 @@
var filters = {
- toFix:function(val,count){
- val=parseFloat(val);
- return val.toFixed(count)
- },
- replace_time:function(val){
- if(!val) return "不限";
- return val.replace("00:00:00","");
- },
-
- replace_time2: function (val) {
- if(val==null || val==undefined || val=='') return "";
- var a = val.split(" ");
- return a[0];
- },
+ toFix: function (val, count) {
+ val = parseFloat(val);
+ return val.toFixed(count)
+ },
+ replace_time: function (val) {
+ if (!val) return "不限";
+ return val.replace("00:00:00", "");
+ },
- format_time:function(ts,isFull) {
- if(ts==null || ts==undefined || ts=='') return "";
- var d = getDate(ts*1000)
- var fm=[d.getFullYear(), d.getMonth()+1, d.getDate()].join('-');
- if(isFull==1)
- fm=fm + ' '+ [d.getHours(), d.getMinutes(), d.getSeconds()].join(':')
- return fm;
- },
+ replace_time2: function (val) {
+ if (val == null || val == undefined || val == '') return "";
+ var a = val.split(" ");
+ return a[0];
+ },
- pInt:function(t) {
- var d = parseInt(t); return d;
- },
+ format_time: function (ts, isFull) {
+ // 如果数值位数为1，则补0
+ function appendZero(obj) {
+ if (obj < 10) {
+ return "0" + "" + obj;
+ } else {
+ return obj;
+ }
+ };
+
+ if (ts == null || ts == undefined || ts == '') return "";
+ var d = getDate(ts * 1000)
+ var fm = [d.getFullYear(), d.getMonth() + 1, d.getDate()].join('-');
+ var md = (d.getMonth() + 1) + '月' + d.getDate() + '日';
+ if (isFull == 1)
+ fm = fm + ' ' + [d.getHours(), d.getMinutes(), d.getSeconds()].join(':');
+ if (isFull == 2) {
+ fm = md + ' ' + [appendZero(d.getHours()), appendZero(d.getMinutes())].join(':');
+ }
+ return fm;
+ },
+
+ pInt: function (t) {
+ var d = parseInt(t);
+ return d;
+ },
+
+ show_gui_ge: function (spec, color) {
+ if ((spec == "" || spec == null || spec == "null")) {
+ if ((color == "" || color == null || color == "null")) {
+ return "规格1";
+ } else {
+ return color;
+ }
+ } else {
+ if ((color == "" || color == null || color == "null")) {
+ return spec;
+ } else {
+ return spec + "/" + color;
+ }
+ }
+ }
+};
- show_gui_ge:function(spec,color){
- if((spec=="" || spec==null || spec=="null")){
- if((color=="" || color==null || color=="null")){ return "规格1";
- }else{return color; }
- }else{
- if((color=="" || color==null || color=="null")){ return spec;
- }else{ return spec+"/"+color; }
- }
- },
-
-
-}
module.exports = {
- toFix: filters.toFix,
- replace_time:filters.replace_time,
- replace_time2: filters.replace_time2,
- format_time:filters.format_time,
- pInt:filters.pInt,
- show_gui_ge:filters.show_gui_ge,
+ toFix: filters.toFix,
+ replace_time: filters.replace_time,
+ replace_time2: filters.replace_time2,
+ format_time: filters.format_time,
+ pInt: filters.pInt,
+ show_gui_ge: filters.show_gui_ge,
}
\ No newline at end of file
diff --git a/utils/myUtils.wxs b/utils/myUtils.wxs
index bf9f277..8983b98 100644
--- a/utils/myUtils.wxs
+++ b/utils/myUtils.wxs
@@ -8,7 +8,7 @@ var myUtils = {
break;
}
case '102': {
- statusText = '未开始';
+ statusText = '即将开始';
break;
}
case '103': {