Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Litemall
Commits
73942dc3
Commit
73942dc3
authored
Jul 19, 2018
by
Junling Bu
Browse files
chore[litemall-wx]: 调整checkout页面路径
parent
3ccc4298
Changes
10
Hide whitespace changes
Inline
Side-by-side
litemall-wx/app.json
View file @
73942dc3
...
...
@@ -28,7 +28,7 @@
"pages/search/search"
,
"pages/category/category"
,
"pages/cart/cart"
,
"pages/
shopping/
checkout/checkout"
,
"pages/checkout/checkout"
,
"pages/goods/goods"
,
"pages/about/about"
],
...
...
litemall-wx/config/api.js
View file @
73942dc3
// 以下是业务服务器API地址
// 本机开发时使用
var
WxApiRoot
=
'
http://localhost:8082/wx/
'
;
//
var WxApiRoot = 'http://localhost:8082/wx/';
// 局域网测试使用
// var WxApiRoot = 'http://192.168.0.101:8082/wx/';
// 云平台部署时使用
//
var WxApiRoot = 'http://122.152.206.172:8082/wx/';
var
WxApiRoot
=
'
http://122.152.206.172:8082/wx/
'
;
// 云平台上线时使用
// var WxApiRoot = 'https://www.example.com/wx/';
...
...
litemall-wx/pages/
shopping/
checkout/checkout.js
→
litemall-wx/pages/checkout/checkout.js
View file @
73942dc3
var
util
=
require
(
'
../../
../
utils/util.js
'
);
var
api
=
require
(
'
../../
../
config/api.js
'
);
var
util
=
require
(
'
../../utils/util.js
'
);
var
api
=
require
(
'
../../config/api.js
'
);
var
app
=
getApp
();
...
...
litemall-wx/pages/
shopping/
checkout/checkout.json
→
litemall-wx/pages/checkout/checkout.json
View file @
73942dc3
File moved
litemall-wx/pages/
shopping/
checkout/checkout.wxml
→
litemall-wx/pages/checkout/checkout.wxml
View file @
73942dc3
File moved
litemall-wx/pages/
shopping/
checkout/checkout.wxss
→
litemall-wx/pages/checkout/checkout.wxss
View file @
73942dc3
File moved
litemall-wx/pages/goods/goods.js
View file @
73942dc3
...
...
@@ -370,7 +370,7 @@ Page({
try
{
wx
.
setStorageSync
(
'
cartId
'
,
res
.
data
);
wx
.
navigateTo
({
url
:
'
/pages/
shopping/
checkout/checkout
'
url
:
'
/pages/checkout/checkout
'
})
}
catch
(
e
)
{}
...
...
litemall-wx/pages/ucenter/address/address.js
View file @
73942dc3
...
...
@@ -33,7 +33,7 @@ Page({
var
pages
=
getCurrentPages
();
var
prevPage
=
pages
[
pages
.
length
-
2
];
if
(
prevPage
.
route
==
"
pages/
shopping/
checkout/checkout
"
)
{
if
(
prevPage
.
route
==
"
pages/checkout/checkout
"
)
{
console
.
log
(
event
.
currentTarget
.
dataset
.
addressId
);
prevPage
.
setData
({
addressId
:
event
.
currentTarget
.
dataset
.
addressId
...
...
litemall-wx/pages/ucenter/addressAdd/addressAdd.js
View file @
73942dc3
...
...
@@ -311,7 +311,7 @@ Page({
var
pages
=
getCurrentPages
();
var
prevPage
=
pages
[
pages
.
length
-
2
];
console
.
log
(
prevPage
);
if
(
prevPage
.
route
==
"
pages/
shopping/
checkout/checkout
"
)
{
if
(
prevPage
.
route
==
"
pages/checkout/checkout
"
)
{
prevPage
.
setData
({
addressId
:
res
.
data
})
...
...
litemall-wx/project.config.json
View file @
73942dc3
...
...
@@ -126,18 +126,6 @@
"pathName"
:
"pages/shopping/checkout/checkout"
,
"query"
:
""
},
{
"id"
:
-1
,
"name"
:
"下单地址"
,
"pathName"
:
"pages/shopping/address/address"
,
"query"
:
""
},
{
"id"
:
-1
,
"name"
:
"下单地址添加"
,
"pathName"
:
"pages/shopping/addressAdd/addressAdd"
,
"query"
:
""
},
{
"id"
:
-1
,
"name"
:
"支付结果"
,
...
...
Write
Preview
Supports
Markdown
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