From 73942dc3f1bcae4a12b105c44ce59d32d42ca95e Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Thu, 19 Jul 2018 20:35:10 +0800 Subject: [PATCH] =?UTF-8?q?chore[litemall-wx]:=20=E8=B0=83=E6=95=B4checkou?= =?UTF-8?q?t=E9=A1=B5=E9=9D=A2=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- litemall-wx/app.json | 2 +- litemall-wx/config/api.js | 4 ++-- .../pages/{shopping => }/checkout/checkout.js | 4 ++-- .../pages/{shopping => }/checkout/checkout.json | 0 .../pages/{shopping => }/checkout/checkout.wxml | 0 .../pages/{shopping => }/checkout/checkout.wxss | 0 litemall-wx/pages/goods/goods.js | 2 +- litemall-wx/pages/ucenter/address/address.js | 2 +- litemall-wx/pages/ucenter/addressAdd/addressAdd.js | 2 +- litemall-wx/project.config.json | 12 ------------ 10 files changed, 8 insertions(+), 20 deletions(-) rename litemall-wx/pages/{shopping => }/checkout/checkout.js (98%) rename litemall-wx/pages/{shopping => }/checkout/checkout.json (100%) rename litemall-wx/pages/{shopping => }/checkout/checkout.wxml (100%) rename litemall-wx/pages/{shopping => }/checkout/checkout.wxss (100%) diff --git a/litemall-wx/app.json b/litemall-wx/app.json index edc02b1e..d1614bcd 100644 --- a/litemall-wx/app.json +++ b/litemall-wx/app.json @@ -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" ], diff --git a/litemall-wx/config/api.js b/litemall-wx/config/api.js index 8f750458..cd20f7a4 100644 --- a/litemall-wx/config/api.js +++ b/litemall-wx/config/api.js @@ -1,10 +1,10 @@ // 以下是业务服务器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/'; diff --git a/litemall-wx/pages/shopping/checkout/checkout.js b/litemall-wx/pages/checkout/checkout.js similarity index 98% rename from litemall-wx/pages/shopping/checkout/checkout.js rename to litemall-wx/pages/checkout/checkout.js index acf4d155..ccf18894 100644 --- a/litemall-wx/pages/shopping/checkout/checkout.js +++ b/litemall-wx/pages/checkout/checkout.js @@ -1,5 +1,5 @@ -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(); diff --git a/litemall-wx/pages/shopping/checkout/checkout.json b/litemall-wx/pages/checkout/checkout.json similarity index 100% rename from litemall-wx/pages/shopping/checkout/checkout.json rename to litemall-wx/pages/checkout/checkout.json diff --git a/litemall-wx/pages/shopping/checkout/checkout.wxml b/litemall-wx/pages/checkout/checkout.wxml similarity index 100% rename from litemall-wx/pages/shopping/checkout/checkout.wxml rename to litemall-wx/pages/checkout/checkout.wxml diff --git a/litemall-wx/pages/shopping/checkout/checkout.wxss b/litemall-wx/pages/checkout/checkout.wxss similarity index 100% rename from litemall-wx/pages/shopping/checkout/checkout.wxss rename to litemall-wx/pages/checkout/checkout.wxss diff --git a/litemall-wx/pages/goods/goods.js b/litemall-wx/pages/goods/goods.js index 532a11bd..4d940357 100644 --- a/litemall-wx/pages/goods/goods.js +++ b/litemall-wx/pages/goods/goods.js @@ -370,7 +370,7 @@ Page({ try { wx.setStorageSync('cartId', res.data); wx.navigateTo({ - url: '/pages/shopping/checkout/checkout' + url: '/pages/checkout/checkout' }) } catch (e) {} diff --git a/litemall-wx/pages/ucenter/address/address.js b/litemall-wx/pages/ucenter/address/address.js index 71dad500..8d13fc07 100644 --- a/litemall-wx/pages/ucenter/address/address.js +++ b/litemall-wx/pages/ucenter/address/address.js @@ -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 diff --git a/litemall-wx/pages/ucenter/addressAdd/addressAdd.js b/litemall-wx/pages/ucenter/addressAdd/addressAdd.js index 30ec7d31..9fc20665 100644 --- a/litemall-wx/pages/ucenter/addressAdd/addressAdd.js +++ b/litemall-wx/pages/ucenter/addressAdd/addressAdd.js @@ -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 }) diff --git a/litemall-wx/project.config.json b/litemall-wx/project.config.json index d8447b7d..c25e1b74 100644 --- a/litemall-wx/project.config.json +++ b/litemall-wx/project.config.json @@ -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": "支付结果",