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
57290a35
Commit
57290a35
authored
Apr 28, 2021
by
xiejb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
二维码扫描下载页面
parent
51b72ef7
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
21 deletions
+38
-21
config/dev.env.js
config/dev.env.js
+8
-7
config/prod.env.js
config/prod.env.js
+4
-4
src/views/myOrder/detail/logisticsDetail.vue
src/views/myOrder/detail/logisticsDetail.vue
+12
-5
src/views/scanQRCode/index.vue
src/views/scanQRCode/index.vue
+14
-5
No files found.
config/dev.env.js
View file @
57290a35
...
@@ -5,17 +5,18 @@ const prodEnv = require('./prod.env')
...
@@ -5,17 +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"
'
})
})
config/prod.env.js
View file @
57290a35
...
@@ -2,13 +2,13 @@
...
@@ -2,13 +2,13 @@
module
.
exports
=
{
module
.
exports
=
{
NODE_ENV
:
'
"production"
'
,
NODE_ENV
:
'
"production"
'
,
// 正式版
// 正式版
//
HOST_URL: '"https://mobileportal.shaphar.com:8443/basservicenew"',
HOST_URL
:
'
"https://mobileportal.shaphar.com:8443/basservicenew"
'
,
//
appRealDb: '"app_real_shaphar"',
appRealDb
:
'
"app_real_shaphar"
'
,
// 体验版
// 体验版
// HOST_URL: '"http://mobileportal.shaphar.com:8028/basservicenew"',
// HOST_URL: '"http://mobileportal.shaphar.com:8028/basservicenew"',
// 测试版
// 测试版
HOST_URL
:
'
"http://222.66.127.246:8020"
'
,
//
HOST_URL: '"http://222.66.127.246:8020"',
appRealDb
:
'
"app_test_shaphar"
'
,
//
appRealDb: '"app_test_shaphar"',
// HOST_URL: '"http://192.168.1.139:8020"'
// HOST_URL: '"http://192.168.1.139:8020"'
PORT
:
'
""
'
,
PORT
:
'
""
'
,
BASE_URL
:
'
""
'
,
BASE_URL
:
'
""
'
,
...
...
src/views/myOrder/detail/logisticsDetail.vue
View file @
57290a35
...
@@ -234,12 +234,19 @@ export default {
...
@@ -234,12 +234,19 @@ export default {
/* GPS 定位信息 */
/* GPS 定位信息 */
getGpsPoint
()
{
getGpsPoint
()
{
this
.
gpsLoading
=
true
this
.
gpsLoading
=
true
// let data = {
// 'orderType': this.orderInfo.orderType, // 'SALE',
// 'shippingNo': this.shippingInfo.shippingNo, // '3S1255202103190010',
// 'sourceDb': this.orderInfo.sourceDb, // 'SHYY',
// 'gisTime': this.shippingInfo.actualArrivalTime,
// 'orderNo': this.orderInfo.orderNo // '879202103190016'
// }
let
data
=
{
let
data
=
{
'
orderType
'
:
this
.
orderInfo
.
orderType
,
// 'SALE',
'
orderType
'
:
'
SALE
'
,
// 'SALE',
'
shippingNo
'
:
this
.
shippingInfo
.
shippingNo
,
// '3S1255202103190010',
'
shippingNo
'
:
'
543533082508945661
'
,
// '3S1255202103190010',
'
sourceDb
'
:
this
.
orderInfo
.
sourceDb
,
// 'SHYY',
'
sourceDb
'
:
'
SHYY
'
,
// 'SHYY',
'
gisTime
'
:
this
.
shippingInfo
.
actualArrivalTime
,
'
gisTime
'
:
''
,
'
orderNo
'
:
this
.
orderInfo
.
orderNo
// '879202103190016'
'
orderNo
'
:
'
543533035211583431
'
// '879202103190016'
}
}
getGpsMapPoint
(
data
).
then
(
res
=>
{
getGpsMapPoint
(
data
).
then
(
res
=>
{
if
(
res
.
code
===
200
&&
res
.
data
.
code
===
'
00000
'
&&
if
(
res
.
code
===
200
&&
res
.
data
.
code
===
'
00000
'
&&
...
...
src/views/scanQRCode/index.vue
View file @
57290a35
<
template
>
<
template
>
<div
id=
"scanQRCode"
>
<div
id=
"scanQRCode"
>
<!--
<h1>
{{
activeTab
}}
</h1>
-->
<!--
<h1>
{{
activeTab
}}
</h1>
-->
<van-notice-bar
v-if=
"isShowNoticeBar"
:scrollable=
"false"
text=
"请使用默认浏览器打开本页面!"
/>
<van-notice-bar
v-if=
"isShowNoticeBar"
:scrollable=
"false"
text=
"请点击左上角按钮,使用默认浏览器打开本页面!"
>
<div
slot=
"right-icon"
>
SSSS
</div>
</van-notice-bar>
<van-empty
class=
"customEmpty"
:description=
"activeTab"
:image=
"sphImage"
>
<van-empty
class=
"customEmpty"
:description=
"activeTab"
:image=
"sphImage"
>
<div
slot=
"description"
class=
"description"
>
<div
slot=
"description"
class=
"description"
>
<div
class=
"subTitle"
>
上药移动APP
</div>
<div
class=
"subTitle"
>
上药移动APP
</div>
...
@@ -114,10 +118,15 @@ export default {
...
@@ -114,10 +118,15 @@ export default {
}
}
}
}
if
(
browser
.
versions
.
android
)
{
if
(
browser
.
versions
.
android
)
{
if
(
browser
.
versions
.
weixin
)
{
this
.
activeTab
=
this
.
activeTab
+
'
/weixin
'
this
.
isShowNoticeBar
=
true
}
else
{
this
.
activeTab
=
this
.
activeTab
+
'
/android
'
this
.
activeTab
=
this
.
activeTab
+
'
/android
'
this
.
versionUpdateHttpAction
(
'
40
'
)
this
.
versionUpdateHttpAction
(
'
40
'
)
}
}
}
}
}
}
else
if
(
browser
.
versions
.
weixin
){
}
else
if
(
browser
.
versions
.
weixin
){
this
.
activeTab
=
'
weixin
'
this
.
activeTab
=
'
weixin
'
}
}
...
@@ -138,8 +147,8 @@ export default {
...
@@ -138,8 +147,8 @@ export default {
}
}
activityQueryDocList
(
dict
).
then
(
rt
=>
{
activityQueryDocList
(
dict
).
then
(
rt
=>
{
if
(
rt
)
{
if
(
rt
)
{
//
window.location.href = rt.list[0].comments
window
.
location
.
href
=
rt
.
list
[
0
].
comments
_this
.
$toast
(
rt
.
list
[
0
].
comments
)
//
_this.$toast(rt.list[0].comments)
}
else
{
}
else
{
_this
.
$toast
(
rt
.
message
)
_this
.
$toast
(
rt
.
message
)
}
}
...
...
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