Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
施宇
/
icsalesProgram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
21094872
authored
Oct 10, 2019
by
施宇
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
111
parent
8f2cccb3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
8 deletions
pages/form/xj/index.wxml
pages/list/notice/index.js
pages/person/auth/index.wxml
pages/person/getphone/index.wxml
pages/tab/message/message.js
pages/form/xj/index.wxml
View file @
21094872
...
...
@@ -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>
...
...
pages/list/notice/index.js
View file @
21094872
...
...
@@ -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
);
}
...
...
pages/person/auth/index.wxml
View file @
21094872
...
...
@@ -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>
<!-- 授权 -->
...
...
pages/person/getphone/index.wxml
View file @
21094872
...
...
@@ -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>
<!-- 授权 -->
...
...
pages/tab/message/message.js
View file @
21094872
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment