Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
H
h5-base
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
new-sing
h5-base
Commits
1f5e63c2
Commit
1f5e63c2
authored
Aug 08, 2019
by
linking2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复分享文案字段读错的问题
新增分享文案换行展示
parent
baf7a9bc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
13 deletions
+45
-13
dev.env.js
config/dev.env.js
+15
-2
index.js
config/index.js
+16
-3
success.vue
src/components/buy/success.vue
+12
-8
wechatEmoji.js
src/util/wechatEmoji.js
+2
-0
No files found.
config/dev.env.js
View file @
1f5e63c2
'use strict'
;
const
merge
=
require
(
'webpack-merge'
);
const
prodEnv
=
require
(
'./prod.env'
);
// const ip = 'http://10.1.23.212:8085/'
const
ip
=
'http://192.168.0.111:8085/'
const
ip
=
`http://
${
getIP
()}
:8085/`
;
function
getIP
()
{
var
interfaces
=
require
(
'os'
).
networkInterfaces
();
for
(
var
devName
in
interfaces
)
{
var
iface
=
interfaces
[
devName
];
for
(
var
i
=
0
;
i
<
iface
.
length
;
i
++
)
{
var
alias
=
iface
[
i
];
if
(
alias
.
family
===
'IPv4'
&&
alias
.
address
!==
'127.0.0.1'
&&
!
alias
.
internal
)
{
return
alias
.
address
;
}
}
}
}
module
.
exports
=
merge
(
prodEnv
,
{
NODE_ENV
:
'"development"'
,
API_URL
:
`"
${
ip
}
"`
,
...
...
config/index.js
View file @
1f5e63c2
...
...
@@ -7,7 +7,21 @@ const env = process.env.NODE_ENV === 'testing'
?
require
(
'../config/test.env'
)
:
require
(
'../config/prod.env'
)
// let Paths = 'static/'+env.versionTime
let
Paths
=
'static'
let
Paths
=
'static'
;
function
getIP
()
{
var
interfaces
=
require
(
'os'
).
networkInterfaces
();
for
(
var
devName
in
interfaces
)
{
var
iface
=
interfaces
[
devName
];
for
(
var
i
=
0
;
i
<
iface
.
length
;
i
++
)
{
var
alias
=
iface
[
i
];
if
(
alias
.
family
===
'IPv4'
&&
alias
.
address
!==
'127.0.0.1'
&&
!
alias
.
internal
)
{
return
alias
.
address
;
}
}
}
}
module
.
exports
=
{
dev
:
{
// Paths
...
...
@@ -20,9 +34,8 @@ module.exports = {
}
},
// Various Dev Server settings
// host: '10.1.23.212', // can be overwritten by process.env.HOST
host
:
'192.168.0.111'
,
// can be overwritten by process.env.HOST
// host: 'localhost', // can be overwritten by process.env.HOST
host
:
getIP
(),
// can be overwritten by process.env.HOST
port
:
8085
,
// can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser
:
false
,
errorOverlay
:
true
,
...
...
src/components/buy/success.vue
View file @
1f5e63c2
...
...
@@ -187,21 +187,24 @@ export default {
},
changeText
()
{
if
(
this
.
textIndex
==
1
)
{
this
.
textContent
=
`[跳跳]发现一个对孩子启蒙特别有用的平台,原来英语还可以这样学!
this
.
textContent
=
`[跳跳]发现一个对孩子启蒙特别有用的平台,原来英语还可以这样学!
🎉现在他们的课程在做团购活动
[红包]只要
${
this
.
groupDetail
.
current_price
/
100
}
元就可以团购价值
${
this
.
groupDetail
.
original_price
/
100
}
元
${
this
.
groupDetail
.
course_nam
e
}
[红包]只要
${
this
.
groupDetail
.
current_price
/
100
}
元就可以团购价值
${
this
.
groupDetail
.
original_price
/
100
}
元
${
this
.
groupDetail
.
goods_desc
.
course_titl
e
}
[爱心]
${
this
.
groupDetail
.
desc
.
group_number
}
人即可成团
[机智]快来和我一起拼团上课吧`
;
this
.
textIndex
=
2
;
}
else
if
(
this
.
textIndex
==
2
)
{
this
.
textContent
=
`[强]百万家长都在带宝宝学的唱唱启蒙英语课
🎉现在只要
${
this
.
groupDetail
.
current_price
/
100
}
元就可以团购价值
${
this
.
groupDetail
.
original_price
/
100
}
元
${
this
.
groupDetail
.
course_name
}
this
.
textContent
=
`[强]百万家长都在带宝宝学的唱唱启蒙英语课
🎉现在只要
${
this
.
groupDetail
.
current_price
/
100
}
元就可以团购价值
${
this
.
groupDetail
.
original_price
/
100
}
元
${
this
.
groupDetail
.
goods_desc
.
course_title
}
🎤每天10分钟,让宝宝爱学敢说会唱
[机智]抓住宝宝的语言黄金期,快来和我一起拼团上课吧`
;
this
.
textIndex
=
3
;
}
else
{
this
.
textContent
=
`[激动]发现一款超赞的启蒙英语课
👉只要
${
this
.
groupDetail
.
current_price
/
100
}
元就可以团购价值
${
this
.
groupDetail
.
original_price
/
100
}
元
${
this
.
groupDetail
.
course_name
}
this
.
textContent
=
`[激动]发现一款超赞的启蒙英语课
👉只要
${
this
.
groupDetail
.
current_price
/
100
}
元就可以团购价值
${
this
.
groupDetail
.
original_price
/
100
}
元
${
this
.
groupDetail
.
goods_desc
.
course_title
}
[爱心]
${
this
.
groupDetail
.
desc
.
group_number
}
人即可成团获得课程
[强]哈佛名师亲授,比动画片更有趣哦
[机智]快来和我一起拼团上课吧`
;
...
...
@@ -361,8 +364,9 @@ export default {
data
.
goods_desc
=
JSON
.
parse
(
data
.
goods_desc
);
data
.
share_desc
=
JSON
.
parse
(
data
.
share_desc
);
this
.
groupDetail
=
data
;
this
.
textContent
=
`[激动]发现一款超赞的启蒙英语课
[太阳]只要
${
this
.
groupDetail
.
current_price
/
100
}
元就可以团购价值
${
this
.
groupDetail
.
original_price
/
100
}
元
${
this
.
groupDetail
.
course_name
}
this
.
textContent
=
`[激动]发现一款超赞的启蒙英语课
[太阳]只要
${
this
.
groupDetail
.
current_price
/
100
}
元就可以团购价值
${
this
.
groupDetail
.
original_price
/
100
}
元
${
this
.
groupDetail
.
goods_desc
.
course_title
}
[爱心]
${
this
.
groupDetail
.
desc
.
group_number
}
人即可成团获得课程
[强]哈佛名师亲授,比动画片更有趣哦
[机智]快来和我一起拼团上课吧`
;
...
...
src/util/wechatEmoji.js
View file @
1f5e63c2
...
...
@@ -123,6 +123,8 @@ export function addEmoji(string) {
"[耶]"
:
"114.png"
};
string
=
string
.
replace
(
/
\n
/g
,
"<br/>"
);
for
(
let
key
in
map
)
{
if
(
string
.
indexOf
(
key
)
!=
-
1
)
{
string
=
replaceAll
(
key
,
`<img src="/static/images/wechat/
${
map
[
key
]}
">`
,
string
);
...
...
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