chore: 调整代码结构

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"'
 }

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

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

litemall-all/src/main/resources/application.yml

@@ -5,7 +5,7 @@ spring:
     encoding: UTF-8
 
 server:
-  port: 8082
+  port: 8080
 
 logging:
   level:

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

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

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', //首页数据接口

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

litemall-wx/pages/index/index.json

@@ -2,6 +2,6 @@
  "navigationBarTitleText": "",
  
  "usingComponents": {
-  "zan-capsule": "../../dist/capsule/index"
+  "zan-capsule": "../../lib/zanui-weapp/capsule/index"
  }
 }

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: '',