diff --git a/pages/mall/fragment/index.wxml b/pages/mall/fragment/index.wxml
index cf4530e..a7e3a32 100644
--- a/pages/mall/fragment/index.wxml
+++ b/pages/mall/fragment/index.wxml
@@ -100,7 +100,8 @@
暂无数据
- 查看更多行情
+ 查看更多行情
+
\ No newline at end of file
diff --git a/pages/mall/fragment/index.wxss b/pages/mall/fragment/index.wxss
index 7e4c267..b4619b1 100644
--- a/pages/mall/fragment/index.wxss
+++ b/pages/mall/fragment/index.wxss
@@ -52,4 +52,16 @@
.moment-pad{
padding: 0rpx 24rpx 24rpx 24rpx;
+}
+
+.btn-more{
+ width: 240rpx;
+ height: 56rpx;
+ line-height: 56rpx;
+ background-color: #F4F4F4;
+ font-size: 26rpx;
+ color: #888888;
+ border-radius: 28rpx;
+ text-align: center;
+ padding-top: 2rpx;
}
\ No newline at end of file
diff --git a/pages/moment/attention/index.wxml b/pages/moment/attention/index.wxml
index f21293f..1f2e633 100644
--- a/pages/moment/attention/index.wxml
+++ b/pages/moment/attention/index.wxml
@@ -10,10 +10,11 @@
- 纸厂名称
- 涨跌幅
- 车辆排队
- 起扣点
+ 纸厂名称
+ 涨跌幅
+ 车辆排队
+ 起扣点
+
diff --git a/pages/moment/attention/index.wxss b/pages/moment/attention/index.wxss
index 5e8814f..26c4d9d 100644
--- a/pages/moment/attention/index.wxss
+++ b/pages/moment/attention/index.wxss
@@ -1,4 +1,3 @@
-/* pages/mall/shops/index.wxss */
.item-content {
background: rgba(255, 255, 255, 1);
padding:32rpx
diff --git a/pages/moment/fragment/index.wxml b/pages/moment/fragment/index.wxml
index bf74929..c2b4815 100644
--- a/pages/moment/fragment/index.wxml
+++ b/pages/moment/fragment/index.wxml
@@ -46,14 +46,14 @@
-
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/pages/moment/index.wxs b/pages/moment/index.wxs
index 10b85c7..61ec000 100644
--- a/pages/moment/index.wxs
+++ b/pages/moment/index.wxs
@@ -27,6 +27,16 @@ function formateText(text, length) {
return text.substring(0, length)
}
+function formateTimes(text, start, end) {
+ if (!text) {
+ return ''
+ }
+ if (text.length <= end) {
+ return text
+ }
+ return text.substring(start, end)
+}
+
function colorText(price) {
if(!price || price == 0){
return 'text-gray'
@@ -87,6 +97,7 @@ function checkPrice(price){
module.exports = {
formateDate: formateDate,
formateText: formateText,
+ formateTimes: formateTimes,
colorText: colorText,
floatImage: floatImage,
infoTime: infoTime,
diff --git a/pages/moment/moment-item/index.wxml b/pages/moment/moment-item/index.wxml
index 76e09ce..a9ef15e 100644
--- a/pages/moment/moment-item/index.wxml
+++ b/pages/moment/moment-item/index.wxml
@@ -1,31 +1,31 @@
{{moment.formateDate(item.tipsTime)}}
-
-
- {{item.shortName}}
-
- {{loading ? '' : item.hasFollowed ? '已关注' : '点击关注'}}
+
+
+ {{item.shortName}}
+
+ {{item.hasFollowed ? '已关注' : '点击关注'}}
+
-
-
- {{formate.formatePrice(item.typicalFloatingQuotedPrice, 0)}}
+
+
+ {{formate.formatePrice(item.typicalFloatingQuotedPrice, 0)}}
- 更新时间:{{moment.formateText(item.latestQuoteTime, 10)}}
+ 调价时间：{{moment.formateTimes(item.latestQuoteTime, 5, 10)}}
+
+ {{stringUtil.queue(item.retainedReceivedQuantity)}}
+ {{stringUtil.precent(item.startDeductionPoints)}}
+
+
- {{item.retainedReceivedQuantity || '- -'}}
- {{item.startDeductionPoints || '- -'}}
-
-
暂无数据，点击刷新
@@ -54,4 +54,21 @@
-
\ No newline at end of file
+
+
+
+ var queue = function(val) {
+ if(val > 0){
+ return val + '辆'
+ }
+ return '- -'
+ }
+ var precent = function(val) {
+ if(val > 0){
+ return (val * 100) + '%'
+ }
+ return '- -'
+ }
+ module.exports.queue = queue;
+ module.exports.precent = precent;
+
\ No newline at end of file
diff --git a/pages/moment/moment-item/index.wxss b/pages/moment/moment-item/index.wxss
index 87083c5..79b0036 100644
--- a/pages/moment/moment-item/index.wxss
+++ b/pages/moment/moment-item/index.wxss
@@ -1,9 +1,23 @@
/* pages/main/index.wxss */
+.attention-unbg{
+ width: 100rpx;
+ height: 32rpx;
+ line-height: 32rpx;
+ background-color: #F4F4F4;
+ font-size: 20rpx;
+ color: #888888;
+ border-radius: 4rpx;
+ text-align: center;
+ padding-top: 2rpx;
+ margin-top: 4rpx;
+}
+
.attention-bg{
- width: 120rpx;
- height: 40rpx;
- line-height: 40rpx;
- background-color: rgba(0,0,0,0.10);
+ width: 84rpx;
+ height: 32rpx;
+ line-height: 32rpx;
+ color: #007AFF;
+ background-color: #007AFF20;
font-size: 20rpx;
border-radius: 4rpx;
text-align: center;
diff --git a/pages/moment/recommend/index.wxml b/pages/moment/recommend/index.wxml
index 65c62b9..e1b9ffd 100644
--- a/pages/moment/recommend/index.wxml
+++ b/pages/moment/recommend/index.wxml
@@ -10,10 +10,11 @@
- 纸厂名称
- 涨跌幅
- 车辆排队
- 起扣点
+ 纸厂名称
+ 涨跌幅
+ 车辆排队
+ 起扣点
+
diff --git a/pages/moment/theall/index.wxml b/pages/moment/theall/index.wxml
index 3a82693..3c85e0d 100644
--- a/pages/moment/theall/index.wxml
+++ b/pages/moment/theall/index.wxml
@@ -17,10 +17,11 @@
- 纸厂名称
- 涨跌幅
- 车辆排队
- 起扣点
+ 纸厂名称
+ 涨跌幅
+ 车辆排队
+ 起扣点
+