Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
上
上药订单生命周期升级
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
sph
上药订单生命周期升级
Commits
50cc2b17
Commit
50cc2b17
authored
Sep 10, 2021
by
xiejb
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.jiucaiyun.cn/sph/SH_OrderLifeCycleU
parents
39d6d7c3
c6e83854
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
516 additions
and
322 deletions
+516
-322
.gitignore
.gitignore
+2
-0
config/dev.env.js
config/dev.env.js
+8
-8
src/views/myOrder/detail/logisticsDetail.vue
src/views/myOrder/detail/logisticsDetail.vue
+252
-147
src/views/myOrder/detail/orderDetail.vue
src/views/myOrder/detail/orderDetail.vue
+254
-167
No files found.
.gitignore
View file @
50cc2b17
...
@@ -9,8 +9,10 @@ yarn-error.log*
...
@@ -9,8 +9,10 @@ yarn-error.log*
# Editor directories and files
# Editor directories and files
.idea
.idea
.prettierrc
.vscode
.vscode
*.suo
*.suo
*.ntvs*
*.ntvs*
*.njsproj
*.njsproj
*.sln
*.sln
config/dev.env.js
View file @
50cc2b17
...
@@ -5,18 +5,18 @@ const prodEnv = require('./prod.env')
...
@@ -5,18 +5,18 @@ const prodEnv = require('./prod.env')
module
.
exports
=
merge
(
prodEnv
,
{
module
.
exports
=
merge
(
prodEnv
,
{
NODE_ENV
:
'
"development"
'
,
NODE_ENV
:
'
"development"
'
,
// 测试
// 测试
//
HOST_URL: '"http://222.66.127.246"',
HOST_URL
:
'
"http://222.66.127.246"
'
,
//
PORT: '":8020"',
PORT
:
'
":8020"
'
,
//
BASE_URL: '""',
BASE_URL
:
'
""
'
,
//
appRealDb: '"app_test_shaphar"',
appRealDb
:
'
"app_test_shaphar"
'
,
// 正式
// 正式
// HOST_URL: '"http://mobileportal.shaphar.com"',
// HOST_URL: '"http://mobileportal.shaphar.com"',
// PORT: '":8028"',
// PORT: '":8028"',
// BASE_URL: '"/basservice"',
// BASE_URL: '"/basservice"',
// appRealDb: '"app_real_shaphar"',
// appRealDb: '"app_real_shaphar"',
//NEW 正式
//NEW 正式
HOST_URL
:
'
"https://mobileportal.shaphar.com"
'
,
//
HOST_URL: '"https://mobileportal.shaphar.com"',
PORT
:
'
":8443"
'
,
//
PORT: '":8443"',
BASE_URL
:
'
"/basservicenew"
'
,
//
BASE_URL: '"/basservicenew"',
appRealDb
:
'
"app_real_shaphar"
'
//
appRealDb: '"app_real_shaphar"'
})
})
src/views/myOrder/detail/logisticsDetail.vue
View file @
50cc2b17
This diff is collapsed.
Click to expand it.
src/views/myOrder/detail/orderDetail.vue
View file @
50cc2b17
This diff is collapsed.
Click to expand it.
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