Commit 73942dc3 authored by Junling Bu's avatar Junling Bu
Browse files

chore[litemall-wx]: 调整checkout页面路径

parent 3ccc4298
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
"pages/search/search", "pages/search/search",
"pages/category/category", "pages/category/category",
"pages/cart/cart", "pages/cart/cart",
"pages/shopping/checkout/checkout", "pages/checkout/checkout",
"pages/goods/goods", "pages/goods/goods",
"pages/about/about" "pages/about/about"
], ],
......
// 以下是业务服务器API地址 // 以下是业务服务器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://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/'; // var WxApiRoot = 'https://www.example.com/wx/';
......
var util = require('../../../utils/util.js'); var util = require('../../utils/util.js');
var api = require('../../../config/api.js'); var api = require('../../config/api.js');
var app = getApp(); var app = getApp();
......
...@@ -370,7 +370,7 @@ Page({ ...@@ -370,7 +370,7 @@ Page({
try { try {
wx.setStorageSync('cartId', res.data); wx.setStorageSync('cartId', res.data);
wx.navigateTo({ wx.navigateTo({
url: '/pages/shopping/checkout/checkout' url: '/pages/checkout/checkout'
}) })
} catch (e) {} } catch (e) {}
......
...@@ -33,7 +33,7 @@ Page({ ...@@ -33,7 +33,7 @@ Page({
var pages = getCurrentPages(); var pages = getCurrentPages();
var prevPage = pages[pages.length - 2]; 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); console.log(event.currentTarget.dataset.addressId);
prevPage.setData({ prevPage.setData({
addressId: event.currentTarget.dataset.addressId addressId: event.currentTarget.dataset.addressId
......
...@@ -311,7 +311,7 @@ Page({ ...@@ -311,7 +311,7 @@ Page({
var pages = getCurrentPages(); var pages = getCurrentPages();
var prevPage = pages[pages.length - 2]; var prevPage = pages[pages.length - 2];
console.log(prevPage); console.log(prevPage);
if (prevPage.route == "pages/shopping/checkout/checkout") { if (prevPage.route == "pages/checkout/checkout") {
prevPage.setData({ prevPage.setData({
addressId: res.data addressId: res.data
}) })
......
...@@ -126,18 +126,6 @@ ...@@ -126,18 +126,6 @@
"pathName": "pages/shopping/checkout/checkout", "pathName": "pages/shopping/checkout/checkout",
"query": "" "query": ""
}, },
{
"id": -1,
"name": "下单地址",
"pathName": "pages/shopping/address/address",
"query": ""
},
{
"id": -1,
"name": "下单地址添加",
"pathName": "pages/shopping/addressAdd/addressAdd",
"query": ""
},
{ {
"id": -1, "id": -1,
"name": "支付结果", "name": "支付结果",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment