Merge remote-tracking branch 'origin/master'

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"
   ],

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/';
 

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();
 

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) {}
 

litemall-wx/pages/logs/logs.js

@@ -1,14 +0,0 @@
-//logs.js
-var util = require('../../utils/util.js')
-Page({
-  data: {
-    logs: []
-  },
-  onLoad: function () {
-    this.setData({
-      logs: (wx.getStorageSync('logs') || []).map(function (log) {
-        return util.formatTime(new Date(log))
-      })
-    })
-  }
-})

litemall-wx/pages/logs/logs.json

@@ -1,3 +0,0 @@
-{
-    "navigationBarTitleText": "查看启动日志"
-}

litemall-wx/pages/logs/logs.wxml

@@ -1,6 +0,0 @@
-<!--logs.wxml-->
-<view class="container log-list">
-  <block wx:for="{{logs}}" wx:for-item="log">
-    <text class="log-item">{{index + 1}}. {{log}}</text>
-  </block>
-</view>

litemall-wx/pages/logs/logs.wxss

@@ -1,8 +0,0 @@
-.log-list {
-  display: flex;
-  flex-direction: column;
-  padding: 40rpx;
-}
-.log-item {
-  margin: 10rpx;
-}

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

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
           })

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": "支付结果",