From f2999cf2e50fcadc02a0fc5a8e911d202a7317a8 Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Fri, 10 Aug 2018 10:52:04 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-admin/config/dep.env.js                       |  2 +-
 litemall-admin/src/views/groupon/list.vue              | 10 +++++-----
 litemall-admin/src/views/groupon/record.vue            |  6 +++---
 litemall-all/src/main/resources/application.yml        |  2 +-
 .../litemall/wx/web/WxAddressController.java           |  6 +++++-
 .../linlinjava/litemall/wx/web/WxHomeController.java   |  1 +
 litemall-wx/config/api.js                              |  4 ++--
 litemall-wx/{dist => lib/zanui-weapp}/capsule/index.js |  0
 .../{dist => lib/zanui-weapp}/capsule/index.json       |  0
 .../{dist => lib/zanui-weapp}/capsule/index.wxml       |  0
 .../{dist => lib/zanui-weapp}/capsule/index.wxss       |  0
 litemall-wx/pages/groupon/myGroupon/myGroupon.json     |  2 +-
 litemall-wx/pages/index/index.json                     |  2 +-
 litemall-wx/pages/ucenter/index/index.js               |  5 +++++
 14 files changed, 25 insertions(+), 15 deletions(-)
 rename litemall-wx/{dist => lib/zanui-weapp}/capsule/index.js (100%)
 rename litemall-wx/{dist => lib/zanui-weapp}/capsule/index.json (100%)
 rename litemall-wx/{dist => lib/zanui-weapp}/capsule/index.wxml (100%)
 rename litemall-wx/{dist => lib/zanui-weapp}/capsule/index.wxss (100%)

diff --git a/litemall-admin/config/dep.env.js b/litemall-admin/config/dep.env.js
index 5a9b6b74..4f61bd0c 100644
--- a/litemall-admin/config/dep.env.js
+++ b/litemall-admin/config/dep.env.js
@@ -1,5 +1,5 @@
 module.exports = {
 	NODE_ENV: '"production"',
   ENV_CONFIG: '"dep"',
-  BASE_API: '"https://www.menethil.com.cn/admin"'
+  BASE_API: '"http://122.152.206.172:8080/admin"'
 }
diff --git a/litemall-admin/src/views/groupon/list.vue b/litemall-admin/src/views/groupon/list.vue
index 03580304..e4ee8b83 100644
--- a/litemall-admin/src/views/groupon/list.vue
+++ b/litemall-admin/src/views/groupon/list.vue
@@ -137,12 +137,12 @@
 </style>
 
 <script>
-  import {listGroupon, publishGroupon, deleteGroupon, editGroupon} from '@/api/groupon'
+  import { listGroupon, publishGroupon, deleteGroupon, editGroupon } from '@/api/groupon'
   import BackToTop from '@/components/BackToTop'
 
   export default {
     name: 'GoodsList',
-    components: {BackToTop},
+    components: { BackToTop },
     data() {
       return {
         list: [],
@@ -163,14 +163,14 @@
           goodsId: '',
           discount: '',
           discountMember: '',
-          expireTime: undefined,
+          expireTime: undefined
         },
         dialogFormVisible: false,
         dialogStatus: '',
         textMap: {
           update: '编辑',
           create: '创建'
-        },
+        }
       }
     },
     created() {
@@ -207,7 +207,7 @@
           goodsId: '',
           discount: '',
           discountMember: '',
-          expireTime: undefined,
+          expireTime: undefined
         }
       },
       handleCreate() {
diff --git a/litemall-admin/src/views/groupon/record.vue b/litemall-admin/src/views/groupon/record.vue
index 4eb2944d..a913cfdb 100644
--- a/litemall-admin/src/views/groupon/record.vue
+++ b/litemall-admin/src/views/groupon/record.vue
@@ -93,12 +93,12 @@
 </style>
 
 <script>
-  import {listRecord} from '@/api/groupon'
+  import { listRecord } from '@/api/groupon'
   import BackToTop from '@/components/BackToTop'
 
   export default {
     name: 'GoodsList',
-    components: {BackToTop},
+    components: { BackToTop },
     data() {
       return {
         list: [],
@@ -113,7 +113,7 @@
         },
         goodsDetail: '',
         detailDialogVisible: false,
-        downloadLoading: false,
+        downloadLoading: false
       }
     },
     created() {
diff --git a/litemall-all/src/main/resources/application.yml b/litemall-all/src/main/resources/application.yml
index 5d88f408..3802b74f 100644
--- a/litemall-all/src/main/resources/application.yml
+++ b/litemall-all/src/main/resources/application.yml
@@ -5,7 +5,7 @@ spring:
     encoding: UTF-8
 
 server:
-  port: 8082
+  port: 8080
 
 logging:
   level:
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java
index f86b5858..076d0988 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java
@@ -182,8 +182,12 @@ public class WxAddressController {
         if(address == null){
             return ResponseUtil.badArgument();
         }
+        Integer id = address.getId();
+        if(id == null){
+            return ResponseUtil.badArgumentValue();
+        }
 
-        addressService.delete(address.getId());
+        addressService.delete(id);
         return ResponseUtil.ok();
     }
 }
\ No newline at end of file
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java
index f7e9e4e9..30577e48 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java
@@ -61,6 +61,7 @@ public class WxHomeController {
      * newGoodsList: xxx,
      * hotGoodsList: xxx,
      * topicList: xxx,
+     * grouponList: xxx,
      * floorGoodsList: xxx
      * }
      * }
diff --git a/litemall-wx/config/api.js b/litemall-wx/config/api.js
index d0b2c3e8..8c3f7599 100644
--- a/litemall-wx/config/api.js
+++ b/litemall-wx/config/api.js
@@ -1,12 +1,12 @@
 // 以下是业务服务器API地址
 // 本机开发时使用
-//  var WxApiRoot = 'http://localhost:8080/wx/';
+ var WxApiRoot = 'http://localhost:8080/wx/';
 // 局域网测试使用
 // var WxApiRoot = 'http://192.168.0.101:8080/wx/';
 // 云平台部署时使用
 // var WxApiRoot = 'http://122.152.206.172:8080/wx/';
 // 云平台上线时使用
-var WxApiRoot = 'https://www.menethil.com.cn/wx/';
+// var WxApiRoot = 'https://www.menethil.com.cn/wx/';
 
 module.exports = {
  IndexUrl: WxApiRoot + 'home/index', //首页数据接口
diff --git a/litemall-wx/dist/capsule/index.js b/litemall-wx/lib/zanui-weapp/capsule/index.js
similarity index 100%
rename from litemall-wx/dist/capsule/index.js
rename to litemall-wx/lib/zanui-weapp/capsule/index.js
diff --git a/litemall-wx/dist/capsule/index.json b/litemall-wx/lib/zanui-weapp/capsule/index.json
similarity index 100%
rename from litemall-wx/dist/capsule/index.json
rename to litemall-wx/lib/zanui-weapp/capsule/index.json
diff --git a/litemall-wx/dist/capsule/index.wxml b/litemall-wx/lib/zanui-weapp/capsule/index.wxml
similarity index 100%
rename from litemall-wx/dist/capsule/index.wxml
rename to litemall-wx/lib/zanui-weapp/capsule/index.wxml
diff --git a/litemall-wx/dist/capsule/index.wxss b/litemall-wx/lib/zanui-weapp/capsule/index.wxss
similarity index 100%
rename from litemall-wx/dist/capsule/index.wxss
rename to litemall-wx/lib/zanui-weapp/capsule/index.wxss
diff --git a/litemall-wx/pages/groupon/myGroupon/myGroupon.json b/litemall-wx/pages/groupon/myGroupon/myGroupon.json
index c2b4bb9a..98c420b5 100644
--- a/litemall-wx/pages/groupon/myGroupon/myGroupon.json
+++ b/litemall-wx/pages/groupon/myGroupon/myGroupon.json
@@ -1,6 +1,6 @@
 {
  "navigationBarTitleText": "我的团购",
  "usingComponents": {
-  "zan-capsule": "../../../dist/capsule/index"
+  "zan-capsule": "../../../lib/zanui-weapp/capsule/index"
  }
 }
\ No newline at end of file
diff --git a/litemall-wx/pages/index/index.json b/litemall-wx/pages/index/index.json
index dbc82c1b..6731ba36 100644
--- a/litemall-wx/pages/index/index.json
+++ b/litemall-wx/pages/index/index.json
@@ -2,6 +2,6 @@
  "navigationBarTitleText": "",
  
  "usingComponents": {
-  "zan-capsule": "../../dist/capsule/index"
+  "zan-capsule": "../../lib/zanui-weapp/capsule/index"
  }
 }
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/index/index.js b/litemall-wx/pages/ucenter/index/index.js
index 2fa0f5b1..569ef0ac 100644
--- a/litemall-wx/pages/ucenter/index/index.js
+++ b/litemall-wx/pages/ucenter/index/index.js
@@ -107,6 +107,11 @@ Page({
    });
   };
  },
+aboutUs: function () {
+  wx.navigateTo({
+    url: '/pages/about/about'
+  });
+}, 
  exitLogin: function() {
   wx.showModal({
    title: '',