Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mayi-mp-shop
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
程默
mayi-mp-shop
Commits
41705f5d
Commit
41705f5d
authored
Dec 31, 2019
by
程默
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix2
parent
ba289fd9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
config/dev.env.js
+1
-1
src/pages/address/index.vue
+5
-4
No files found.
config/dev.env.js
View file @
41705f5d
...
@@ -6,7 +6,7 @@ module.exports = merge(prodEnv, {//zjgyl
...
@@ -6,7 +6,7 @@ module.exports = merge(prodEnv, {//zjgyl
SHOP_MIXID
:
"'antgood'"
,
SHOP_MIXID
:
"'antgood'"
,
NODE_ENV
:
'"development"'
,
NODE_ENV
:
'"development"'
,
// BASE_URL:"'https://shop.mayi888.com'",
// BASE_URL:"'https://shop.mayi888.com'",
BASE_URL
:
"'http
://192.168.1.146:30004
'"
,
BASE_URL
:
"'http
s://test-m-shop.mayi888.cn
'"
,
OLSHOP_URL
:
'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"'
,
OLSHOP_URL
:
'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"'
,
// OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',
// OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',
...
...
src/pages/address/index.vue
View file @
41705f5d
...
@@ -46,6 +46,8 @@ export default {
...
@@ -46,6 +46,8 @@ export default {
onShow
()
{
onShow
()
{
console
.
log
(
"onshow"
,
this
.
openSetting
);
console
.
log
(
"onshow"
,
this
.
openSetting
);
if
(
this
.
openSetting
)
{
if
(
this
.
openSetting
)
{
this
.
openSetting
=
false
;
this
.
init
();
this
.
init
();
}
}
},
},
...
@@ -64,13 +66,12 @@ export default {
...
@@ -64,13 +66,12 @@ export default {
fail
:
function
(
res
)
{
fail
:
function
(
res
)
{
// chooseAddress:fail auth deny ---用户拒绝后msg
// chooseAddress:fail auth deny ---用户拒绝后msg
// chooseAddress:fail cancel ---用户点击取消按钮
// chooseAddress:fail cancel ---用户点击取消按钮
console
.
log
(
res
,
'-------------------65'
)
console
.
log
(
res
,
"-------------------65"
);
//用户取消
//用户取消
console
.
log
(
5
);
console
.
log
(
5
);
if
(
res
.
errMsg
.
indexOf
(
"cancel"
)
!=-
1
){
if
(
res
.
errMsg
.
indexOf
(
"cancel"
)
!=
-
1
)
{
this
.
openSetting
=
false
;
wx
.
navigateBack
();
wx
.
navigateBack
();
}
else
{
}
else
{
that
.
getSett
();
that
.
getSett
();
}
}
}
}
...
...
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