Commit 21094872 by 施宇

111

parent 8f2cccb3
......@@ -3,7 +3,7 @@
<view class="tip row bothSide verCenter {{isShowTip?'':'noheight'}}">
<view class="tip-left row verCenter">
<text class="icon iconfont iconiconxiantiaoshouji12 tip-icon"></text>
<text class="tip-c">填写完整信息,有利于提高回复报价效率</text>
<text class="tip-c">请提供真实的商品信息和图片,有助于使搜索排名靠前</text>
</view>
<text class="icon iconfont iconiconxiantiaoshouji13 close-icon" bindtap="closeTip"></text>
</view>
......
......@@ -105,8 +105,11 @@ Page({
newArr = me.data.messageList;
}
newArr = newArr.concat(arr);
for (let i = 0; i < newArr.length; i++) {
let etime = Date.parse(new Date(newArr[i]['create_time']));
let reg = /-/g;
let creatTime = newArr[i]['create_time'].replace(reg, "\/");
let etime = Date.parse(new Date(creatTime));
newArr[i].content = matchReg(newArr[i].content);
newArr[i].create_time = interval(nowDate - etime);
}
......
......@@ -5,7 +5,7 @@
<image src="/res/images/imgs/iclogo.png" class="img"></image>
</view>
<text class="t1">芯掌柜</text>
<text class='t2'>让询报价更轻松、便捷</text>
<text class='t2'>让元器件询报价更便捷</text>
</view>
<!-- 授权 -->
......
......@@ -5,7 +5,7 @@
<image src="/res/images/imgs/iclogo.png" class="img"></image>
</view>
<text class="t1">芯掌柜</text>
<text class='t2'>让询报价更轻松、便捷</text>
<text class='t2'>让元器件询报价更便捷</text>
</view>
<!-- 授权 -->
......
......@@ -228,19 +228,20 @@ Page({
}, function (res) {
if (res.errcode == 0) {
let actarr = res.data['act_msg'].data;
let reg = /-/g;
let nowDate = Date.parse(new Date());
let etime, text;
if (!sysarr.length && !actarr.length) {
return
} else if (sysarr.length && !actarr.length) {
etime = Date.parse(new Date(sysarr[0]['create_time']));
etime = Date.parse(new Date(sysarr[0]['create_time'].replace(reg, "\/")));
text = sysarr[0].content
} else if (!sysarr.length && actarr.length) {
etime = Date.parse(new Date(actarr[0]['create_time']));
etime = Date.parse(new Date(actarr[0]['create_time'].replace(reg, "\/")));
text = actarr[0].content
} else {
let sysTime = Date.parse(new Date(sysarr[0]['create_time']));
let actTime = Date.parse(new Date(actarr[0]['create_time']));
let sysTime = Date.parse(new Date(sysarr[0]['create_time'].replace(reg, "\/")));
let actTime = Date.parse(new Date(actarr[0]['create_time'].replace(reg, "\/")));
if (sysTime > actTime) {
etime = sysTime;
text = sysarr[0].content
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment