From efdac48dc15379fcdc6efce88a2f2021b78d86e8 Mon Sep 17 00:00:00 2001
From: raowenbin <raowenbin@jygps.com.cn>
Date: Sun, 7 Apr 2024 13:47:22 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/litemall/application.yml               |   6 +-
 .../litemall/admin/job/CouponJob.java         |   2 +-
 .../admin/service/AdminGoodsService.java      |  13 +-
 .../admin/web/AdminDashbordController.java    |   9 +-
 .../admin/web/AdminDictController.java        | 110 +++
 .../admin/web/AdminUserController.java        |   6 +-
 .../src/main/resources/application.yml        |   2 +-
 litemall-admin/.env.production                |   2 +-
 litemall-admin/package.json                   |   4 +-
 litemall-admin/src/router/index.js            | 447 ++++------
 litemall-admin/src/views/config/mall.vue      |  16 +-
 litemall-admin/src/views/dashboard/index.vue  |  20 +-
 litemall-admin/src/views/errorPage/404.vue    |   4 +-
 litemall-admin/src/views/goods/create.vue     |   2 +-
 litemall-admin/src/views/goods/list.vue       | 105 ++-
 .../src/views/layout/components/Navbar.vue    |   4 +-
 litemall-admin/src/views/login/index.vue      |   8 +-
 litemall-admin/src/views/promotion/topic.vue  |  80 +-
 litemall-admin/src/views/user/collect.vue     |  26 +-
 litemall-admin/src/views/user/footprint.vue   |  14 +-
 litemall-admin/src/views/user/user.vue        |  52 +-
 litemall-admin/vue.config.js                  |   7 +-
 .../src/main/resources/application.yml        |   2 +-
 .../src/main/resources/application-core.yml   |   6 +-
 .../litemall/db/dao/LitemallDictMapper.java   |  28 +
 .../litemall/db/domain/LitemallDict.java      | 408 +++++++++
 .../db/domain/LitemallDictExample.java        | 795 ++++++++++++++++++
 .../litemall/db/domain/LitemallGoods.java     | 239 ++++++
 .../db/domain/LitemallGoodsExample.java       | 126 +++
 .../litemall/db/domain/LitemallTopic.java     | 199 ++++-
 .../db/domain/LitemallTopicExample.java       | 262 +++---
 .../litemall/db/domain/LitemallUser.java      |  14 +
 .../db/domain/LitemallUserExample.java        |   5 +
 .../litemall/db/enums/UserType.java           |  19 +
 .../db/service/LitemallDictService.java       |  90 ++
 .../db/service/LitemallGoodsService.java      |  12 +-
 .../db/service/LitemallTopicService.java      |  25 +-
 .../db/service/LitemallUserService.java       |   7 +-
 .../src/main/resources/application-db.yml     |  10 +-
 .../litemall/db/dao/LitemallDictMapper.xml    | 517 ++++++++++++
 .../litemall/db/dao/LitemallGoodsMapper.xml   | 462 +++++++++-
 .../litemall/db/dao/LitemallTopicMapper.xml   | 386 ++++++++-
 .../litemall/db/dao/LitemallUserMapper.xml    |  26 +-
 .../litemall/wx/dto/GoodsAllinone.java        |  46 +
 .../linlinjava/litemall/wx/dto/UserInfo.java  |  11 +
 .../litemall/wx/service/WxGoodsService.java   | 327 +++++++
 .../litemall/wx/web/WxAuthController.java     |   8 +-
 .../litemall/wx/web/WxDictController.java     |  68 ++
 .../litemall/wx/web/WxGoodsController.java    |  46 +-
 .../litemall/wx/web/WxStorageController.java  |   7 +
 .../litemall/wx/web/WxTopicController.java    |  67 +-
 litemall-wx/config/api.js                     |   3 +-
 litemall-wx/pages/auth/login/login.js         |   4 +-
 litemall-wx/project.config.json               | 648 +++++++-------
 54 files changed, 4863 insertions(+), 949 deletions(-)
 create mode 100644 litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminDictController.java
 create mode 100644 litemall-db/src/main/java/org/linlinjava/litemall/db/dao/LitemallDictMapper.java
 create mode 100644 litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallDict.java
 create mode 100644 litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallDictExample.java
 create mode 100644 litemall-db/src/main/java/org/linlinjava/litemall/db/enums/UserType.java
 create mode 100644 litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallDictService.java
 create mode 100644 litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallDictMapper.xml
 create mode 100644 litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/GoodsAllinone.java
 create mode 100644 litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxGoodsService.java
 create mode 100644 litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxDictController.java

diff --git a/deploy/litemall/application.yml b/deploy/litemall/application.yml
index 4ef7446b..40ee1198 100644
--- a/deploy/litemall/application.yml
+++ b/deploy/litemall/application.yml
@@ -5,10 +5,10 @@ spring:
     encoding: UTF-8
   datasource:
     druid:
-      url:  jdbc:mysql://localhost:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
+      url:  jdbc:mysql://124.222.53.90:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
       driver-class-name:  com.mysql.cj.jdbc.Driver
-      username:  litemall
-      password:  litemall123456
+      username:  mysql
+      password:  czy@2024
       initial-size:  10
       max-active:  50
       min-idle:  10
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/CouponJob.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/CouponJob.java
index 4e09ca53..2669e67a 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/CouponJob.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/CouponJob.java
@@ -31,7 +31,7 @@ public class CouponJob {
      * TODO
      * 注意，因为是相隔一个小时检查，因此导致优惠券真正超时时间可能比设定时间延迟1个小时
      */
-    @Scheduled(fixedDelay = 60 * 60 * 1000)
+//    @Scheduled(fixedDelay = 60 * 60 * 1000)
     public void checkCouponExpired() {
         logger.info("系统开启任务检查优惠券是否已经过期");
 
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java
index a049e925..62edde52 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java
@@ -14,10 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static org.linlinjava.litemall.admin.util.AdminResponseCode.GOODS_NAME_EXIST;
 
@@ -56,7 +53,7 @@ public class AdminGoodsService {
         }
         String goodsSn = goods.getGoodsSn();
         if (StringUtils.isEmpty(goodsSn)) {
-            return ResponseUtil.badArgument();
+            goods.setGoodsSn(UUID.randomUUID().toString());
         }
         // 品牌商可以不设置，如果设置则需要验证品牌商存在
         Integer brandId = goods.getBrandId();
@@ -241,9 +238,9 @@ public class AdminGoodsService {
         LitemallGoodsProduct[] products = goodsAllinone.getProducts();
 
         String name = goods.getName();
-        if (goodsService.checkExistByName(name)) {
-            return ResponseUtil.fail(GOODS_NAME_EXIST, "商品名已经存在");
-        }
+//        if (goodsService.checkExistByName(name)) {
+//            return ResponseUtil.fail(GOODS_NAME_EXIST, "商品名已经存在");
+//        }
 
         // 商品表里面有一个字段retailPrice记录当前商品的最低价
         BigDecimal retailPrice = new BigDecimal(Integer.MAX_VALUE);
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminDashbordController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminDashbordController.java
index ace32f99..07e8d51c 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminDashbordController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminDashbordController.java
@@ -3,10 +3,7 @@ package org.linlinjava.litemall.admin.web;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.core.util.ResponseUtil;
-import org.linlinjava.litemall.db.service.LitemallGoodsProductService;
-import org.linlinjava.litemall.db.service.LitemallGoodsService;
-import org.linlinjava.litemall.db.service.LitemallOrderService;
-import org.linlinjava.litemall.db.service.LitemallUserService;
+import org.linlinjava.litemall.db.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,13 +26,15 @@ public class AdminDashbordController {
     @Autowired
     private LitemallGoodsProductService productService;
     @Autowired
+    private LitemallTopicService topicService;
+    @Autowired
     private LitemallOrderService orderService;
 
     @GetMapping("")
     public Object info() {
         int userTotal = userService.count();
         int goodsTotal = goodsService.count();
-        int productTotal = productService.count();
+        int productTotal = topicService.count();
         int orderTotal = orderService.count();
         Map<String, Integer> data = new HashMap<>();
         data.put("userTotal", userTotal);
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminDictController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminDictController.java
new file mode 100644
index 00000000..b3081cca
--- /dev/null
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminDictController.java
@@ -0,0 +1,110 @@
+package org.linlinjava.litemall.admin.web;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.linlinjava.litemall.admin.annotation.RequiresPermissionsDesc;
+import org.linlinjava.litemall.core.util.JacksonUtil;
+import org.linlinjava.litemall.core.util.ResponseUtil;
+import org.linlinjava.litemall.core.validator.Order;
+import org.linlinjava.litemall.core.validator.Sort;
+import org.linlinjava.litemall.db.domain.LitemallDict;
+import org.linlinjava.litemall.db.domain.LitemallDictExample;
+import org.linlinjava.litemall.db.service.LitemallDictService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 字典维护
+ * @author rwb
+ */
+@RestController
+@RequestMapping("/admin/dict")
+@Validated
+public class AdminDictController {
+
+    private final Log logger = LogFactory.getLog(AdminDictController.class);
+
+    @Autowired
+    private LitemallDictService dictService;
+
+    @RequiresPermissions("admin:dict:list")
+    @RequiresPermissionsDesc(menu = {"配置管理", "字典配置"}, button = "查询")
+    @GetMapping("/list")
+    public Object list(String name, String code, String category,
+                       @RequestParam(defaultValue = "1") Integer page,
+                       @RequestParam(defaultValue = "10") Integer limit,
+                       @Sort @RequestParam(defaultValue = "add_time") String sort,
+                       @Order @RequestParam(defaultValue = "desc") String order) {
+        List<LitemallDict> dictList = dictService.querySelective(code, name, category, page, limit, sort, order);
+        return ResponseUtil.okList(dictList);
+    }
+
+    private Object validate(LitemallDict dict) {
+        if (StringUtils.isEmpty(dict)) {
+            return ResponseUtil.badArgument();
+        }
+        return null;
+    }
+
+    @RequiresPermissions("admin:dict:create")
+    @RequiresPermissionsDesc(menu = {"配置管理", "字典配置"}, button = "添加")
+    @PostMapping("/create")
+    public Object create(@RequestBody LitemallDict dict) {
+        Object error = validate(dict);
+        if (error != null) {
+            return error;
+        }
+        dictService.add(dict);
+        return ResponseUtil.ok(dict);
+    }
+
+    @RequiresPermissions("admin:dict:read")
+    @RequiresPermissionsDesc(menu = {"配置管理", "字典配置"}, button = "详情")
+    @GetMapping("/read")
+    public Object read(@NotNull Integer id) {
+        LitemallDict dict = dictService.findById(id);
+        return ResponseUtil.ok(dict);
+    }
+
+    @RequiresPermissions("admin:dict:update")
+    @RequiresPermissionsDesc(menu = {"配置管理", "字典配置"}, button = "编辑")
+    @PostMapping("/update")
+    public Object update(@RequestBody LitemallDict dict) {
+        Object error = validate(dict);
+        if (error != null) {
+            return error;
+        }
+        if (dictService.updateById(dict) == 0) {
+            return ResponseUtil.updatedDataFailed();
+        }
+        return ResponseUtil.ok(dict);
+    }
+
+    @RequiresPermissions("admin:dict:delete")
+    @RequiresPermissionsDesc(menu = {"配置管理", "字典配置"}, button = "删除")
+    @PostMapping("/delete")
+    public Object delete(@RequestBody LitemallDict dict) {
+        Integer id = dict.getId();
+        if (id == null) {
+            return ResponseUtil.badArgument();
+        }
+        dictService.deleteById(id);
+        return ResponseUtil.ok();
+    }
+
+    @RequiresPermissions("admin:dict:batchDelete")
+    @RequiresPermissionsDesc(menu = {"配置管理", "字典配置"}, button = "批量删除")
+    @PostMapping("/batchDelete")
+    public Object batchDelete(@RequestBody String body) {
+        List<Integer> ids = JacksonUtil.parseIntegerList(body, "ids");
+        dictService.deleteByIds(ids);
+        return ResponseUtil.ok();
+    }
+
+}
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java
index 839a83d8..a54f18f2 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java
@@ -34,14 +34,15 @@ public class AdminUserController {
     @RequiresPermissions("admin:user:list")
     @RequiresPermissionsDesc(menu = {"用户管理", "会员管理"}, button = "查询")
     @GetMapping("/list")
-    public Object list(String username, String mobile,
+    public Object list(String username, String mobile, String userType,
                        @RequestParam(defaultValue = "1") Integer page,
                        @RequestParam(defaultValue = "10") Integer limit,
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
-        List<LitemallUser> userList = userService.querySelective(username, mobile, page, limit, sort, order);
+        List<LitemallUser> userList = userService.querySelective(username, mobile, userType, page, limit, sort, order);
         return ResponseUtil.okList(userList);
     }
+
     @RequiresPermissions("admin:user:list")
     @RequiresPermissionsDesc(menu = {"用户管理", "会员管理"}, button = "详情")
     @GetMapping("/detail")
@@ -49,6 +50,7 @@ public class AdminUserController {
     	LitemallUser user=userService.findById(id);
         return ResponseUtil.ok(user);
     }
+
     @RequiresPermissions("admin:user:list")
     @RequiresPermissionsDesc(menu = {"用户管理", "会员管理"}, button = "编辑")
     @PostMapping("/update")
diff --git a/litemall-admin-api/src/main/resources/application.yml b/litemall-admin-api/src/main/resources/application.yml
index d3ca4367..80cb1a49 100644
--- a/litemall-admin-api/src/main/resources/application.yml
+++ b/litemall-admin-api/src/main/resources/application.yml
@@ -5,7 +5,7 @@ spring:
     encoding: UTF-8
 
 server:
-  port: 8083
+  port: 8080
 
 logging:
   level:
diff --git a/litemall-admin/.env.production b/litemall-admin/.env.production
index 4c05b967..3568ef10 100644
--- a/litemall-admin/.env.production
+++ b/litemall-admin/.env.production
@@ -4,5 +4,5 @@ NODE_ENV = production
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = 'https://www.example.com/admin'
+VUE_APP_BASE_API = 'https://www.czyinfo.cn/admin'
 
diff --git a/litemall-admin/package.json b/litemall-admin/package.json
index 35749a43..d76851b7 100644
--- a/litemall-admin/package.json
+++ b/litemall-admin/package.json
@@ -100,5 +100,7 @@
   "browserslist": [
     "> 1%",
     "last 2 versions"
-  ]
+  ],
+  "homepage": "https://github.com/linlinjava/litemall#readme",
+  "main": ".eslintrc.js"
 }
diff --git a/litemall-admin/src/router/index.js b/litemall-admin/src/router/index.js
index 836d62e8..a39a972b 100644
--- a/litemall-admin/src/router/index.js
+++ b/litemall-admin/src/router/index.js
@@ -93,16 +93,16 @@ export const asyncRoutes = [
           noCache: true
         }
       },
-      {
-        path: 'address',
-        component: () => import('@/views/user/address'),
-        name: 'address',
-        meta: {
-          perms: ['GET /admin/address/list'],
-          title: '收货地址',
-          noCache: true
-        }
-      },
+      // {
+      //   path: 'address',
+      //   component: () => import('@/views/user/address'),
+      //   name: 'address',
+      //   meta: {
+      //     perms: ['GET /admin/address/list'],
+      //     title: '收货地址',
+      //     noCache: true
+      //   }
+      // },
       {
         path: 'collect',
         component: () => import('@/views/user/collect'),
@@ -153,7 +153,7 @@ export const asyncRoutes = [
     alwaysShow: true,
     name: 'mallManage',
     meta: {
-      title: '商场管理',
+      title: '平台管理',
       icon: 'chart'
     },
     children: [
@@ -166,46 +166,46 @@ export const asyncRoutes = [
           noCache: true
         }
       },
-      {
-        path: 'brand',
-        component: () => import('@/views/mall/brand'),
-        name: 'brand',
-        meta: {
-          perms: ['GET /admin/brand/list', 'POST /admin/brand/create', 'GET /admin/brand/read', 'POST /admin/brand/update', 'POST /admin/brand/delete'],
-          title: '品牌制造商',
-          noCache: true
-        }
-      },
-      {
-        path: 'category',
-        component: () => import('@/views/mall/category'),
-        name: 'category',
-        meta: {
-          perms: ['GET /admin/category/list', 'POST /admin/category/create', 'GET /admin/category/read', 'POST /admin/category/update', 'POST /admin/category/delete'],
-          title: '商品类目',
-          noCache: true
-        }
-      },
-      {
-        path: 'order',
-        component: () => import('@/views/mall/order'),
-        name: 'order',
-        meta: {
-          perms: ['GET /admin/order/list', 'GET /admin/order/detail', 'POST /admin/order/ship', 'POST /admin/order/refund', 'POST /admin/order/delete', 'POST /admin/order/reply'],
-          title: '订单管理',
-          noCache: true
-        }
-      },
-      {
-        path: 'aftersale',
-        component: () => import('@/views/mall/aftersale'),
-        name: 'aftersale',
-        meta: {
-          perms: ['GET /admin/aftersale/list', 'GET /admin/aftersale/detail', 'POST /admin/order/receive', 'POST /admin/aftersale/complete', 'POST /admin/aftersale/reject'],
-          title: '售后管理',
-          noCache: true
-        }
-      },
+      // {
+      //   path: 'brand',
+      //   component: () => import('@/views/mall/brand'),
+      //   name: 'brand',
+      //   meta: {
+      //     perms: ['GET /admin/brand/list', 'POST /admin/brand/create', 'GET /admin/brand/read', 'POST /admin/brand/update', 'POST /admin/brand/delete'],
+      //     title: '第三方公司',
+      //     noCache: true
+      //   }
+      // },
+      // {
+      //   path: 'category',
+      //   component: () => import('@/views/mall/category'),
+      //   name: 'category',
+      //   meta: {
+      //     perms: ['GET /admin/category/list', 'POST /admin/category/create', 'GET /admin/category/read', 'POST /admin/category/update', 'POST /admin/category/delete'],
+      //     title: '主播类别',
+      //     noCache: true
+      //   }
+      // },
+      // {
+      //   path: 'order',
+      //   component: () => import('@/views/mall/order'),
+      //   name: 'order',
+      //   meta: {
+      //     perms: ['GET /admin/order/list', 'GET /admin/order/detail', 'POST /admin/order/ship', 'POST /admin/order/refund', 'POST /admin/order/delete', 'POST /admin/order/reply'],
+      //     title: '订单管理',
+      //     noCache: true
+      //   }
+      // },
+      // {
+      //   path: 'aftersale',
+      //   component: () => import('@/views/mall/aftersale'),
+      //   name: 'aftersale',
+      //   meta: {
+      //     perms: ['GET /admin/aftersale/list', 'GET /admin/aftersale/detail', 'POST /admin/order/receive', 'POST /admin/aftersale/complete', 'POST /admin/aftersale/reject'],
+      //     title: '售后管理',
+      //     noCache: true
+      //   }
+      // },
       {
         path: 'issue',
         component: () => import('@/views/mall/issue'),
@@ -215,17 +215,18 @@ export const asyncRoutes = [
           title: '通用问题',
           noCache: true
         }
-      },
-      {
-        path: 'keyword',
-        component: () => import('@/views/mall/keyword'),
-        name: 'keyword',
-        meta: {
-          perms: ['GET /admin/keyword/list', 'POST /admin/keyword/create', 'GET /admin/keyword/read', 'POST /admin/keyword/update', 'POST /admin/keyword/delete'],
-          title: '关键词',
-          noCache: true
-        }
       }
+      // ,
+      // {
+      //   path: 'keyword',
+      //   component: () => import('@/views/mall/keyword'),
+      //   name: 'keyword',
+      //   meta: {
+      //     perms: ['GET /admin/keyword/list', 'POST /admin/keyword/create', 'GET /admin/keyword/read', 'POST /admin/keyword/update', 'POST /admin/keyword/delete'],
+      //     title: '关键词',
+      //     noCache: true
+      //   }
+      // }
     ]
   },
 
@@ -236,7 +237,7 @@ export const asyncRoutes = [
     alwaysShow: true,
     name: 'goodsManage',
     meta: {
-      title: '商品管理',
+      title: '主播管理',
       icon: 'chart'
     },
     children: [
@@ -246,41 +247,42 @@ export const asyncRoutes = [
         name: 'goodsList',
         meta: {
           perms: ['GET /admin/goods/list', 'POST /admin/goods/delete'],
-          title: '商品列表',
-          noCache: true
-        }
-      },
-      {
-        path: 'create',
-        component: () => import('@/views/goods/create'),
-        name: 'goodsCreate',
-        meta: {
-          perms: ['POST /admin/goods/create'],
-          title: '商品上架',
-          noCache: true
-        }
-      },
-      {
-        path: 'edit',
-        component: () => import('@/views/goods/edit'),
-        name: 'goodsEdit',
-        meta: {
-          perms: ['GET /admin/goods/detail', 'POST /admin/goods/update', 'POST /admin/goods/catAndBrand'],
-          title: '商品编辑',
-          noCache: true
-        },
-        hidden: true
-      },
-      {
-        path: 'comment',
-        component: () => import('@/views/goods/comment'),
-        name: 'goodsComment',
-        meta: {
-          perms: ['GET /admin/comment/list', 'POST /admin/comment/delete'],
-          title: '商品评论',
+          title: '主播列表',
           noCache: true
         }
       }
+      // ,
+      // {
+      //   path: 'create',
+      //   component: () => import('@/views/goods/create'),
+      //   name: 'goodsCreate',
+      //   meta: {
+      //     perms: ['POST /admin/goods/create'],
+      //     title: '主播新增',
+      //     noCache: true
+      //   }
+      // },
+      // {
+      //   path: 'edit',
+      //   component: () => import('@/views/goods/edit'),
+      //   name: 'goodsEdit',
+      //   meta: {
+      //     perms: ['GET /admin/goods/detail', 'POST /admin/goods/update', 'POST /admin/goods/catAndBrand'],
+      //     title: '主播编辑',
+      //     noCache: true
+      //   },
+      //   hidden: true
+      // },
+      // {
+      //   path: 'comment',
+      //   component: () => import('@/views/goods/comment'),
+      //   name: 'goodsComment',
+      //   meta: {
+      //     perms: ['GET /admin/comment/list', 'POST /admin/comment/delete'],
+      //     title: '主播评论',
+      //     noCache: true
+      //   }
+      // }
     ]
   },
   {
@@ -290,48 +292,17 @@ export const asyncRoutes = [
     alwaysShow: true,
     name: 'promotionManage',
     meta: {
-      title: '推广管理',
+      title: '客户管理',
       icon: 'chart'
     },
     children: [
-      {
-        path: 'ad',
-        component: () => import('@/views/promotion/ad'),
-        name: 'ad',
-        meta: {
-          perms: ['GET /admin/ad/list', 'POST /admin/ad/create', 'GET /admin/ad/read', 'POST /admin/ad/update', 'POST /admin/ad/delete'],
-          title: '广告管理',
-          noCache: true
-        }
-      },
-      {
-        path: 'coupon',
-        component: () => import('@/views/promotion/coupon'),
-        name: 'coupon',
-        meta: {
-          perms: ['GET /admin/coupon/list', 'POST /admin/coupon/create', 'POST /admin/coupon/update', 'POST /admin/coupon/delete'],
-          title: '优惠券管理',
-          noCache: true
-        }
-      },
-      {
-        path: 'couponDetail',
-        component: () => import('@/views/promotion/couponDetail'),
-        name: 'couponDetail',
-        meta: {
-          perms: ['GET /admin/coupon/list', 'GET /admin/coupon/listuser'],
-          title: '优惠券详情',
-          noCache: true
-        },
-        hidden: true
-      },
       {
         path: 'topic',
         component: () => import('@/views/promotion/topic'),
         name: 'topic',
         meta: {
           perms: ['GET /admin/topic/list', 'POST /admin/topic/create', 'GET /admin/topic/read', 'POST /admin/topic/update', 'POST /admin/topic/delete'],
-          title: '专题管理',
+          title: '客户列表',
           noCache: true
         }
       },
@@ -341,7 +312,7 @@ export const asyncRoutes = [
         name: 'topicCreate',
         meta: {
           perms: ['POST /admin/topic/create'],
-          title: '专题创建',
+          title: '客户新增',
           noCache: true
         },
         hidden: true
@@ -352,30 +323,10 @@ export const asyncRoutes = [
         name: 'topicEdit',
         meta: {
           perms: ['GET /admin/topic/read', 'POST /admin/topic/update'],
-          title: '专题编辑',
+          title: '客户编辑',
           noCache: true
         },
         hidden: true
-      },
-      {
-        path: 'groupon-rule',
-        component: () => import('@/views/promotion/grouponRule'),
-        name: 'grouponRule',
-        meta: {
-          perms: ['GET /admin/groupon/list', 'POST /admin/groupon/create', 'POST /admin/groupon/update', 'POST /admin/groupon/delete'],
-          title: '团购规则',
-          noCache: true
-        }
-      },
-      {
-        path: 'groupon-activity',
-        component: () => import('@/views/promotion/grouponActivity'),
-        name: 'grouponActivity',
-        meta: {
-          perms: ['GET /admin/groupon/listRecord'],
-          title: '团购活动',
-          noCache: true
-        }
       }
     ]
   },
@@ -456,132 +407,102 @@ export const asyncRoutes = [
     },
     children: [
       {
-        path: 'mall',
-        component: () => import('@/views/config/mall'),
-        name: 'configMall',
-        meta: {
-          perms: ['GET /admin/config/mall', 'POST /admin/config/mall'],
-          title: '商场配置',
-          noCache: true
-        }
-      },
-      {
-        path: 'express',
-        component: () => import('@/views/config/express'),
-        name: 'configExpress',
+        path: 'dict',
+        component: () => import('@/views/config/dict'),
+        name: 'configdict',
         meta: {
-          perms: ['GET /admin/config/express', 'POST /admin/config/express'],
-          title: '运费配置',
+          perms: ['GET /admin/config/dict', 'POST /admin/config/dict'],
+          title: '字典配置',
           noCache: true
         }
       },
       {
-        path: 'order',
-        component: () => import('@/views/config/order'),
-        name: 'configOrder',
-        meta: {
-          perms: ['GET /admin/config/order', 'POST /admin/config/order'],
-          title: '订单配置',
-          noCache: true
-        }
-      },
-      {
-        path: 'wx',
-        component: () => import('@/views/config/wx'),
-        name: 'configWx',
+        path: 'mall',
+        component: () => import('@/views/config/mall'),
+        name: 'configMall',
         meta: {
-          perms: ['GET /admin/config/wx', 'POST /admin/config/wx'],
-          title: '小程序配置',
+          perms: ['GET /admin/config/mall', 'POST /admin/config/mall'],
+          title: '平台配置',
           noCache: true
         }
       }
+      // ,
+      // {
+      //   path: 'express',
+      //   component: () => import('@/views/config/express'),
+      //   name: 'configExpress',
+      //   meta: {
+      //     perms: ['GET /admin/config/express', 'POST /admin/config/express'],
+      //     title: '运费配置',
+      //     noCache: true
+      //   }
+      // },
+      // {
+      //   path: 'order',
+      //   component: () => import('@/views/config/order'),
+      //   name: 'configOrder',
+      //   meta: {
+      //     perms: ['GET /admin/config/order', 'POST /admin/config/order'],
+      //     title: '订单配置',
+      //     noCache: true
+      //   }
+      // },
+      // {
+      //   path: 'wx',
+      //   component: () => import('@/views/config/wx'),
+      //   name: 'configWx',
+      //   meta: {
+      //     perms: ['GET /admin/config/wx', 'POST /admin/config/wx'],
+      //     title: '小程序配置',
+      //     noCache: true
+      //   }
+      // }
     ]
   },
 
-  {
-    path: '/stat',
-    component: Layout,
-    redirect: 'noredirect',
-    alwaysShow: true,
-    name: 'statManage',
-    meta: {
-      title: '统计报表',
-      icon: 'chart'
-    },
-    children: [
-      {
-        path: 'user',
-        component: () => import('@/views/stat/user'),
-        name: 'statUser',
-        meta: {
-          perms: ['GET /admin/stat/user'],
-          title: '用户统计',
-          noCache: true
-        }
-      },
-      {
-        path: 'order',
-        component: () => import('@/views/stat/order'),
-        name: 'statOrder',
-        meta: {
-          perms: ['GET /admin/stat/order'],
-          title: '订单统计',
-          noCache: true
-        }
-      },
-      {
-        path: 'goods',
-        component: () => import('@/views/stat/goods'),
-        name: 'statGoods',
-        meta: {
-          perms: ['GET /admin/stat/goods'],
-          title: '商品统计',
-          noCache: true
-        }
-      }
-    ]
-  },
-  {
-    path: 'external-link',
-    component: Layout,
-    redirect: 'noredirect',
-    alwaysShow: true,
-    name: 'externalLink',
-    meta: {
-      title: '外链',
-      icon: 'link'
-    },
-    children: [
-      {
-        path: 'https://cloud.tencent.com/product/cos',
-        meta: { title: '腾讯云存储', icon: 'link' }
-      },
-      {
-        path: 'https://cloud.tencent.com/product/sms',
-        meta: { title: '腾讯云短信', icon: 'link' }
-      },
-      {
-        path: 'https://pay.weixin.qq.com/index.php/core/home/login',
-        meta: { title: '微信支付', icon: 'link' }
-      },
-      {
-        path: 'https://mpkf.weixin.qq.com/',
-        meta: { title: '小程序客服', icon: 'link' }
-      },
-      {
-        path: 'https://www.alibabacloud.com/zh/product/oss',
-        meta: { title: '阿里云存储', icon: 'link' }
-      },
-      {
-        path: 'https://www.qiniu.com/products/kodo',
-        meta: { title: '七牛云存储', icon: 'link' }
-      },
-      {
-        path: 'http://www.kdniao.com/api-track',
-        meta: { title: '快递鸟', icon: 'link' }
-      }
-    ]
-  },
+  // {
+  //   path: '/stat',
+  //   component: Layout,
+  //   redirect: 'noredirect',
+  //   alwaysShow: true,
+  //   name: 'statManage',
+  //   meta: {
+  //     title: '统计报表',
+  //     icon: 'chart'
+  //   },
+  //   children: [
+  //     {
+  //       path: 'user',
+  //       component: () => import('@/views/stat/user'),
+  //       name: 'statUser',
+  //       meta: {
+  //         perms: ['GET /admin/stat/user'],
+  //         title: '用户统计',
+  //         noCache: true
+  //       }
+  //     },
+  //     {
+  //       path: 'order',
+  //       component: () => import('@/views/stat/order'),
+  //       name: 'statOrder',
+  //       meta: {
+  //         perms: ['GET /admin/stat/order'],
+  //         title: '订单统计',
+  //         noCache: true
+  //       }
+  //     },
+  //     {
+  //       path: 'goods',
+  //       component: () => import('@/views/stat/goods'),
+  //       name: 'statGoods',
+  //       meta: {
+  //         perms: ['GET /admin/stat/goods'],
+  //         title: '商品统计',
+  //         noCache: true
+  //       }
+  //     }
+  //   ]
+  // },
   {
     path: '/profile',
     component: Layout,
diff --git a/litemall-admin/src/views/config/mall.vue b/litemall-admin/src/views/config/mall.vue
index a7ac934b..bc38efaf 100644
--- a/litemall-admin/src/views/config/mall.vue
+++ b/litemall-admin/src/views/config/mall.vue
@@ -1,26 +1,26 @@
 <template>
   <div class="app-container">
     <el-form ref="dataForm" :rules="rules" :model="dataForm" status-icon label-width="300px">
-      <el-form-item label="商场名称" prop="litemall_mall_name">
-        <el-input v-model="dataForm.litemall_mall_name"/>
+      <el-form-item label="平台名称" prop="litemall_mall_name">
+        <el-input v-model="dataForm.litemall_mall_name" />
       </el-form-item>
-      <el-form-item label="商场地址" prop="litemall_mall_address">
-        <el-input v-model="dataForm.litemall_mall_address"/>
+      <el-form-item label="联系地址" prop="litemall_mall_address">
+        <el-input v-model="dataForm.litemall_mall_address" />
       </el-form-item>
       <el-form-item label="地理坐标">
         <el-col :span="11">
-          <el-input v-model="dataForm.litemall_mall_longitude" placeholder="经度"/>
+          <el-input v-model="dataForm.litemall_mall_longitude" placeholder="经度" />
         </el-col>
         <el-col :span="2" style="text-align: center;">-</el-col>
         <el-col :span="11">
-          <el-input v-model="dataForm.litemall_mall_latitude" placeholder="纬度"/>
+          <el-input v-model="dataForm.litemall_mall_latitude" placeholder="纬度" />
         </el-col>
       </el-form-item>
       <el-form-item label="联系电话" prop="litemall_mall_phone">
-        <el-input v-model="dataForm.litemall_mall_phone"/>
+        <el-input v-model="dataForm.litemall_mall_phone" />
       </el-form-item>
       <el-form-item label="联系QQ" prop="litemall_mall_qq">
-        <el-input v-model="dataForm.litemall_mall_qq"/>
+        <el-input v-model="dataForm.litemall_mall_qq" />
       </el-form-item>
       <el-form-item>
         <el-button @click="cancel">取消</el-button>
diff --git a/litemall-admin/src/views/dashboard/index.vue b/litemall-admin/src/views/dashboard/index.vue
index 7d7a0f89..e8f3ee5f 100644
--- a/litemall-admin/src/views/dashboard/index.vue
+++ b/litemall-admin/src/views/dashboard/index.vue
@@ -2,40 +2,40 @@
   <div class="dashboard-editor-container">
 
     <el-row :gutter="40" class="panel-group">
-      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <el-col :xs="16" :sm="16" :lg="8" class="card-panel-col">
         <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
           <div class="card-panel-icon-wrapper icon-people">
             <svg-icon icon-class="peoples" class-name="card-panel-icon" />
           </div>
           <div class="card-panel-description">
             <div class="card-panel-text">用户数量</div>
-            <count-to :start-val="0" :end-val="userTotal" :duration="2600" class="card-panel-num"/>
+            <count-to :start-val="0" :end-val="userTotal" :duration="2600" class="card-panel-num" />
           </div>
         </div>
       </el-col>
-      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <el-col :xs="16" :sm="16" :lg="8" class="card-panel-col">
         <div class="card-panel" @click="handleSetLineChartData('messages')">
           <div class="card-panel-icon-wrapper icon-message">
             <svg-icon icon-class="message" class-name="card-panel-icon" />
           </div>
           <div class="card-panel-description">
-            <div class="card-panel-text">商品数量</div>
-            <count-to :start-val="0" :end-val="goodsTotal" :duration="3000" class="card-panel-num"/>
+            <div class="card-panel-text">主播数量</div>
+            <count-to :start-val="0" :end-val="goodsTotal" :duration="3000" class="card-panel-num" />
           </div>
         </div>
       </el-col>
-      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <el-col :xs="16" :sm="16" :lg="8" class="card-panel-col">
         <div class="card-panel" @click="handleSetLineChartData('purchases')">
           <div class="card-panel-icon-wrapper icon-money">
             <svg-icon icon-class="message" class-name="card-panel-icon" />
           </div>
           <div class="card-panel-description">
-            <div class="card-panel-text">货品数量</div>
-            <count-to :start-val="0" :end-val="productTotal" :duration="3200" class="card-panel-num"/>
+            <div class="card-panel-text">客户数量</div>
+            <count-to :start-val="0" :end-val="productTotal" :duration="3200" class="card-panel-num" />
           </div>
         </div>
       </el-col>
-      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <!-- <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
         <div class="card-panel" @click="handleSetLineChartData('shoppings')">
           <div class="card-panel-icon-wrapper icon-shoppingCard">
             <svg-icon icon-class="money" class-name="card-panel-icon" />
@@ -45,7 +45,7 @@
             <count-to :start-val="0" :end-val="orderTotal" :duration="3600" class="card-panel-num"/>
           </div>
         </div>
-      </el-col>
+      </el-col> -->
     </el-row>
   </div>
 </template>
diff --git a/litemall-admin/src/views/errorPage/404.vue b/litemall-admin/src/views/errorPage/404.vue
index c3eafea0..8fba0831 100644
--- a/litemall-admin/src/views/errorPage/404.vue
+++ b/litemall-admin/src/views/errorPage/404.vue
@@ -9,9 +9,9 @@
       </div>
       <div class="bullshit">
         <div class="bullshit__oops">OOPS!</div>
-        <div class="bullshit__info">版权所有
+        <!-- <div class="bullshit__info">版权所有
           <a class="link-type" href="https://wallstreetcn.com" target="_blank">华尔街见闻</a>
-        </div>
+        </div> -->
         <div class="bullshit__headline">{{ message }}</div>
         <div class="bullshit__info">请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告</div>
         <a href="" class="bullshit__return-home">返回首页</a>
diff --git a/litemall-admin/src/views/goods/create.vue b/litemall-admin/src/views/goods/create.vue
index 312edefa..bac984a7 100644
--- a/litemall-admin/src/views/goods/create.vue
+++ b/litemall-admin/src/views/goods/create.vue
@@ -34,7 +34,7 @@
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item label="商品图片">
+        <el-form-item label="主播图片">
           <el-upload
             :action="uploadPath"
             :show-file-list="false"
diff --git a/litemall-admin/src/views/goods/list.vue b/litemall-admin/src/views/goods/list.vue
index 08dad402..3be5407d 100644
--- a/litemall-admin/src/views/goods/list.vue
+++ b/litemall-admin/src/views/goods/list.vue
@@ -3,12 +3,13 @@
 
     <!-- 查询和其他操作 -->
     <div class="filter-container">
-      <el-input v-model="listQuery.goodsId" clearable class="filter-item" style="width: 160px;" placeholder="请输入商品ID" />
-      <el-input v-model="listQuery.goodsSn" clearable class="filter-item" style="width: 160px;" placeholder="请输入商品编号" />
-      <el-input v-model="listQuery.name" clearable class="filter-item" style="width: 160px;" placeholder="请输入商品名称" />
+      <el-input v-model="listQuery.name" clearable class="filter-item" style="width: 160px;" placeholder="请输入主播名称" />
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
-      <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">添加</el-button>
+      <!-- <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">添加</el-button> -->
       <el-button :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">导出</el-button>
+    </div>
+
+    <div class="operator-container">
       <el-button class="filter-item" type="danger" icon="el-icon-delete" :disabled="batchDeleteArr.length === 0" @click="handleDeleteRows">批量删除</el-button>
     </div>
 
@@ -17,35 +18,58 @@
       <el-table-column type="expand">
         <template slot-scope="props">
           <el-form label-position="left" class="table-expand">
-            <el-form-item label="商品编号">
-              <span>{{ props.row.goodsSn }}</span>
+            <el-form-item label="直播品类">
+              <el-tag
+                v-for="item in props.row.workCategory"
+                :key="item"
+                hit
+              >
+                {{ item }}
+              </el-tag>
             </el-form-item>
-            <el-form-item label="宣传画廊">
-              <el-image v-for="pic in props.row.gallery" :key="pic" :src="pic" class="gallery" :preview-src-list="props.row.gallery" style="width: 40px; height: 40px" />
+            <el-form-item label="擅长品类">
+              <el-tag
+                v-for="item in props.row.goodCategory"
+                :key="item"
+                hit
+              >
+                {{ item }}
+              </el-tag>
             </el-form-item>
-            <el-form-item label="商品介绍">
-              <span>{{ props.row.brief }}</span>
+            <el-form-item label="账号类型">
+              <el-tag
+                v-for="item in props.row.accountType"
+                :key="item"
+                hit
+              >
+                {{ item }}
+              </el-tag>
             </el-form-item>
-            <el-form-item label="商品单位">
-              <span>{{ props.row.unit }}</span>
+            <el-form-item label="风格要求">
+              <el-tag
+                v-for="item in props.row.workStyle"
+                :key="item"
+                hit
+              >
+                {{ item }}
+              </el-tag>
             </el-form-item>
-            <el-form-item label="关键字">
-              <span>{{ props.row.keywords }}</span>
+            <el-form-item label="图片展示">
+              <el-image v-for="pic in props.row.gallery" :key="pic" :src="pic" class="gallery" :preview-src-list="props.row.gallery" style="width: 40px; height: 40px" />
             </el-form-item>
-            <el-form-item label="类目ID">
-              <span>{{ props.row.categoryId }}</span>
+            <el-form-item label="视频介绍">
+              <span v-for="videoAddr in props.row.videoUrl" :key="videoAddr">
+                <video :src="videoAddr" controls autoplay class="video" />
+              </span>
             </el-form-item>
-            <el-form-item label="品牌商ID">
-              <span>{{ props.row.brandId }}</span>
+            <el-form-item label="链接">
+              <span>{{ props.row.brief }}</span>
             </el-form-item>
-
           </el-form>
         </template>
       </el-table-column>
       <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="商品ID" prop="id" />
-
-      <el-table-column align="center" min-width="100" label="名称" prop="name" />
+      <el-table-column align="center" label="主播ID" prop="id" />
 
       <el-table-column align="center" property="iconUrl" label="图片">
         <template slot-scope="scope">
@@ -53,25 +77,34 @@
         </template>
       </el-table-column>
 
+      <el-table-column align="center" min-width="100" label="名称" prop="name" />
+      <el-table-column align="center" min-width="50" label="性别" prop="sex" />
+      <el-table-column align="center" min-width="100" label="出生年月" prop="brithday" />
+      <el-table-column align="center" min-width="50" label="身高(cm)" prop="height" />
+      <el-table-column align="center" min-width="50" label="体重(kg)" prop="weight" />
+      <el-table-column align="center" min-width="60" label="常住省份" prop="currentProvince" />
+      <el-table-column align="center" min-width="60" label="常住城市" prop="currentCity" />
+      <el-table-column align="center" min-width="60" label="学历" prop="degree" />
+      <el-table-column align="center" min-width="60" label="直播语言" prop="language" />
+      <el-table-column align="center" min-width="60" label="工作方式" prop="workWay" />
+      <el-table-column align="center" label="时薪" prop="counterPrice" />
+
       <el-table-column align="center" property="iconUrl" label="分享图">
         <template slot-scope="scope">
           <img :src="scope.row.shareUrl" width="40">
         </template>
       </el-table-column>
 
+      <!--
       <el-table-column align="center" label="详情" prop="detail">
         <template slot-scope="scope">
-          <el-dialog :visible.sync="detailDialogVisible" title="商品详情">
+          <el-dialog :visible.sync="detailDialogVisible" title="主播详情">
             <div class="goods-detail-box" v-html="goodsDetail" />
           </el-dialog>
           <el-button type="primary" size="mini" @click="showDetail(scope.row.detail)">查看</el-button>
         </template>
       </el-table-column>
 
-      <el-table-column align="center" label="市场售价" prop="counterPrice" />
-
-      <el-table-column align="center" label="当前价格" prop="retailPrice" />
-
       <el-table-column align="center" label="是否新品" prop="isNew">
         <template slot-scope="scope">
           <el-tag :type="scope.row.isNew ? 'success' : 'error' ">{{ scope.row.isNew ? '新品' : '非新品' }}</el-tag>
@@ -82,17 +115,17 @@
         <template slot-scope="scope">
           <el-tag :type="scope.row.isHot ? 'success' : 'error' ">{{ scope.row.isHot ? '热品' : '非热品' }}</el-tag>
         </template>
-      </el-table-column>
+      </el-table-column> -->
 
-      <el-table-column align="center" label="是否在售" prop="isOnSale">
+      <el-table-column align="center" label="是否上架" prop="isOnSale">
         <template slot-scope="scope">
-          <el-tag :type="scope.row.isOnSale ? 'success' : 'error' ">{{ scope.row.isOnSale ? '在售' : '未售' }}</el-tag>
+          <el-tag :type="scope.row.isOnSale ? 'success' : 'error' ">{{ scope.row.isOnSale ? '已上架' : '未上架' }}</el-tag>
         </template>
       </el-table-column>
 
       <el-table-column align="center" label="操作" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button type="primary" size="mini" @click="handleUpdate(scope.row)">编辑</el-button>
+          <!-- <el-button type="primary" size="mini" @click="handleUpdate(scope.row)">编辑</el-button>  -->
           <el-button type="danger" size="mini" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
@@ -120,6 +153,10 @@
     margin-right: 0;
     margin-bottom: 0;
   }
+  .video {
+    width: 80px;
+    margin-right: 10px;
+  }
   .gallery {
     width: 80px;
     margin-right: 10px;
@@ -234,9 +271,9 @@ export default {
     handleDownload() {
       this.downloadLoading = true
       import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['商品ID', '商品编号', '名称', '专柜价格', '当前价格', '是否新品', '是否热品', '是否在售', '首页主图', '宣传图片列表', '商品介绍', '详细介绍', '商品图片', '商品单位', '关键字', '类目ID', '品牌商ID']
-        const filterVal = ['id', 'goodsSn', 'name', 'counterPrice', 'retailPrice', 'isNew', 'isHot', 'isOnSale', 'listPicUrl', 'gallery', 'brief', 'detail', 'picUrl', 'goodsUnit', 'keywords', 'categoryId', 'brandId']
-        excel.export_json_to_excel2(tHeader, this.list, filterVal, '商品信息')
+        const tHeader = ['主播ID', '名称', '性别(1男、2女)', '出生年月', '身高(cm)', '体重(kg)', '常住省份', '常住城市', '学历', '直播语言', '工作方式', '直播品类', '擅长品类', '账号类型', '风格要求', '时薪', '是否上架']
+        const filterVal = ['id', 'name', 'sex', 'birthday', 'height', 'weight', 'currentProvince', 'currentCity', 'counterPrice', 'degree', 'language', 'workWay', 'workCategory', 'goodCategory', 'accountType', 'workStyle', 'isOnSale']
+        excel.export_json_to_excel2(tHeader, this.list, filterVal, '主播信息')
         this.downloadLoading = false
       })
     }
diff --git a/litemall-admin/src/views/layout/components/Navbar.vue b/litemall-admin/src/views/layout/components/Navbar.vue
index 991a5ac3..1746b474 100644
--- a/litemall-admin/src/views/layout/components/Navbar.vue
+++ b/litemall-admin/src/views/layout/components/Navbar.vue
@@ -31,7 +31,7 @@
               首页
             </el-dropdown-item>
           </router-link>
-          <el-dropdown-item divided>
+          <!-- <el-dropdown-item divided>
             <a target="_blank" href="https://github.com/linlinjava/litemall">
               GitHub
             </a>
@@ -40,7 +40,7 @@
             <a target="_blank" href="https://gitee.com/linlinjava/litemall">
               码云
             </a>
-          </el-dropdown-item>
+          </el-dropdown-item> -->
           <el-dropdown-item divided>
             <router-link to="/profile/password">
               密码修改
diff --git a/litemall-admin/src/views/login/index.vue b/litemall-admin/src/views/login/index.vue
index fdce0b94..32337910 100644
--- a/litemall-admin/src/views/login/index.vue
+++ b/litemall-admin/src/views/login/index.vue
@@ -30,7 +30,7 @@
 
       <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">登录</el-button>
 
-      <div style="position:relative">
+      <!-- <div style="position:relative">
         <div class="tips">
           <span> 超级管理员用户名: admin123</span>
           <span> 超级管理员用户名：admin123</span>
@@ -43,7 +43,7 @@
           <span> 推广管理员用户名: promotion123</span>
           <span> 推广管理员用户名：promotion123</span>
         </div>
-      </div>
+      </div> -->
     </el-form>
 
     <div class="copyright">
@@ -67,8 +67,8 @@ export default {
     }
     return {
       loginForm: {
-        username: 'admin123',
-        password: 'admin123',
+        username: '',
+        password: '',
         code: ''
       },
       codeImg: '',
diff --git a/litemall-admin/src/views/promotion/topic.vue b/litemall-admin/src/views/promotion/topic.vue
index 9083d3d1..e245b659 100644
--- a/litemall-admin/src/views/promotion/topic.vue
+++ b/litemall-admin/src/views/promotion/topic.vue
@@ -3,8 +3,7 @@
 
     <!-- 查询和其他操作 -->
     <div class="filter-container">
-      <el-input v-model="listQuery.title" clearable class="filter-item" style="width: 200px;" placeholder="请输入专题标题" />
-      <el-input v-model="listQuery.subtitle" clearable class="filter-item" style="width: 200px;" placeholder="请输入专题子标题" />
+      <el-input v-model="listQuery.title" clearable class="filter-item" style="width: 200px;" placeholder="请输入客户标题" />
       <el-select v-model="listQuery.sort" class="filter-item" placeholder="请选择排序字段">
         <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
@@ -13,7 +12,7 @@
     </div>
 
     <div class="operator-container">
-      <el-button v-permission="['POST /admin/topic/create']" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">添加</el-button>
+      <!-- <el-button v-permission="['POST /admin/topic/create']" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">添加</el-button> -->
       <el-button v-permission="['POST /admin/topic/batch-delete']" class="filter-item" type="danger" icon="el-icon-delete" @click="handleBatchDelete">批量删除</el-button>
     </div>
 
@@ -21,32 +20,31 @@
     <el-table v-loading="listLoading" :data="list" element-loading-text="正在查询中。。。" border fit highlight-current-row @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" />
 
-      <el-table-column align="center" label="专题标题" prop="title" />
-
-      <el-table-column align="center" label="专题子标题" min-width="200" prop="subtitle" />
-
-      <el-table-column align="center" property="picUrl" label="图片">
+      <el-table-column align="center" label="公司名称" prop="title" />
+      <el-table-column align="center" label="城市" prop="city" />
+      <el-table-column align="center" label="详细地址" prop="address" />
+      <el-table-column align="center" label="需求城市" prop="demandCity" />
+      <el-table-column align="center" label="联系人" prop="contact" />
+      <el-table-column align="center" label="联系人电话" prop="contactMobile" />
+      <el-table-column align="center" label="工作方式" prop="workWay" />
+      <el-table-column align="center" label="直播品类" prop="workCategory" />
+      <el-table-column align="center" label="风格要求" prop="workStyle" />
+      <el-table-column align="center" label="底薪" prop="salary" />
+      <el-table-column align="center" label="提成(%)" prop="commission" />
+      <!-- <el-table-column align="center" label="详情" prop="content">
         <template slot-scope="scope">
-          <el-image :src="thumbnail(scope.row.picUrl)" :preview-src-list="toPreview(scope.row, scope.row.picUrl)" style="width: 40px; height: 40px" />
-        </template>
-      </el-table-column>
-
-      <el-table-column align="center" label="专题详情" prop="content">
-        <template slot-scope="scope">
-          <el-dialog :visible.sync="contentDialogVisible" title="专题详情">
+          <el-dialog :visible.sync="contentDialogVisible" title="客户详情">
             <div v-html="contentDetail" />
           </el-dialog>
           <el-button type="primary" size="mini" @click="showContent(scope.row.content)">查看</el-button>
         </template>
       </el-table-column>
 
-      <el-table-column align="center" label="底价" prop="price" />
-
-      <el-table-column align="center" label="阅读数量" prop="readCount" />
+      <el-table-column align="center" label="阅读数量" prop="readCount" />  -->
 
-      <el-table-column align="center" label="操作" min-width="100" class-name="small-padding fixed-width">
+      <el-table-column align="center" label="操作" min-width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button v-permission="['POST /admin/topic/update']" type="primary" size="mini" @click="handleUpdate(scope.row)">编辑</el-button>
+          <!-- <el-button v-permission="['POST /admin/topic/update']" type="primary" size="mini" @click="handleUpdate(scope.row)">编辑</el-button> -->
           <el-button v-permission="['POST /admin/topic/delete']" type="danger" size="mini" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
@@ -164,7 +162,7 @@ export default {
         .then(response => {
           this.$notify.success({
             title: '成功',
-            message: '删除专题成功'
+            message: '删除客户成功'
           })
           this.getList()
         })
@@ -195,7 +193,7 @@ export default {
         .then(response => {
           this.$notify.success({
             title: '成功',
-            message: '批量删除专题成功'
+            message: '批量删除客户成功'
           })
           this.getList()
         })
@@ -210,26 +208,32 @@ export default {
       this.downloadLoading = true
       import('@/vendor/Export2Excel').then(excel => {
         const tHeader = [
-          '专题ID',
-          '专题标题',
-          '专题子标题',
-          '专题内容',
-          '专题图片',
-          '商品低价',
-          '阅读量',
-          '专题商品'
+          '公司名称',
+          '城市',
+          '详细地址',
+          '需求城市',
+          '联系人',
+          '联系人电话',
+          '工作方式',
+          '直播品类',
+          '风格要求',
+          '底薪',
+          '提成'
         ]
         const filterVal = [
-          'id',
           'title',
-          'subtitle',
-          'content',
-          'picUrl',
-          'price',
-          'readCount',
-          'goods'
+          'city',
+          'address',
+          'demandCity',
+          'contact',
+          'contactMobile',
+          'workWay',
+          'workCategory',
+          'workStyle',
+          'salary',
+          'commission'
         ]
-        excel.export_json_to_excel2(tHeader, this.list, filterVal, '专题信息')
+        excel.export_json_to_excel2(tHeader, this.list, filterVal, '客户信息')
         this.downloadLoading = false
       })
     }
diff --git a/litemall-admin/src/views/user/collect.vue b/litemall-admin/src/views/user/collect.vue
index 139867be..62327e82 100644
--- a/litemall-admin/src/views/user/collect.vue
+++ b/litemall-admin/src/views/user/collect.vue
@@ -3,21 +3,31 @@
 
     <!-- 查询和其他操作 -->
     <div class="filter-container">
-      <el-input v-model="listQuery.userId" clearable class="filter-item" style="width: 200px;" placeholder="请输入用户ID"/>
-      <el-input v-model="listQuery.valueId" clearable class="filter-item" style="width: 200px;" placeholder="请输入商品ID"/>
+      <el-input v-model="listQuery.userId" clearable class="filter-item" style="width: 200px;" placeholder="请输入用户ID" />
+      <el-input v-model="listQuery.valueId" clearable class="filter-item" style="width: 200px;" placeholder="请输入关注ID" />
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
       <el-button :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">导出</el-button>
     </div>
 
     <!-- 查询结果 -->
     <el-table v-loading="listLoading" :data="list" element-loading-text="正在查询中。。。" border fit highlight-current-row>
-      <el-table-column align="center" width="100px" label="收藏ID" prop="id" sortable/>
+      <el-table-column align="center" width="100px" label="收藏ID" prop="id" sortable />
 
-      <el-table-column align="center" min-width="100px" label="用户ID" prop="userId"/>
+      <el-table-column align="center" min-width="100px" label="用户ID" prop="userId" />
 
-      <el-table-column align="center" min-width="100px" label="商品ID" prop="valueId"/>
+      <el-table-column align="center" min-width="100px" label="关注ID" prop="valueId" />
 
-      <el-table-column align="center" min-width="100px" label="添加时间" prop="addTime"/>
+      <el-table-column align="center" min-width="100px" label="关注类型">
+        <template slot-scope="scope">
+          <el-tag
+            disable-transitions="true"
+          >
+            {{ scope.row.type === 0 ? '主播' : '客户' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" min-width="100px" label="添加时间" prop="addTime" />
 
     </el-table>
 
@@ -80,8 +90,8 @@ export default {
     handleDownload() {
       this.downloadLoading = true
       import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['用户ID', '商品ID', '添加时间']
-        const filterVal = ['userId', 'valueId', 'addTime']
+        const tHeader = ['用户ID', '关注ID', '类型(0主播、1客户)', '添加时间']
+        const filterVal = ['userId', 'valueId', 'type', 'addTime']
         excel.export_json_to_excel2(tHeader, this.list, filterVal, '用户收藏信息')
         this.downloadLoading = false
       })
diff --git a/litemall-admin/src/views/user/footprint.vue b/litemall-admin/src/views/user/footprint.vue
index a711e960..e0018cb2 100644
--- a/litemall-admin/src/views/user/footprint.vue
+++ b/litemall-admin/src/views/user/footprint.vue
@@ -3,21 +3,21 @@
 
     <!-- 查询和其他操作 -->
     <div class="filter-container">
-      <el-input v-model="listQuery.userId" clearable class="filter-item" style="width: 200px;" placeholder="请输入用户ID"/>
-      <el-input v-model="listQuery.goodsId" clearable class="filter-item" style="width: 200px;" placeholder="请输入商品ID"/>
+      <el-input v-model="listQuery.userId" clearable class="filter-item" style="width: 200px;" placeholder="请输入用户ID" />
+      <el-input v-model="listQuery.goodsId" clearable class="filter-item" style="width: 200px;" placeholder="请输入主播ID" />
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
       <el-button :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">导出</el-button>
     </div>
 
     <!-- 查询结果 -->
     <el-table v-loading="listLoading" :data="list" element-loading-text="正在查询中。。。" border fit highlight-current-row>
-      <el-table-column align="center" width="100px" label="足迹ID" prop="id" sortable/>
+      <el-table-column align="center" width="100px" label="足迹ID" prop="id" sortable />
 
-      <el-table-column align="center" min-width="100px" label="用户ID" prop="userId"/>
+      <el-table-column align="center" min-width="100px" label="用户ID" prop="userId" />
 
-      <el-table-column align="center" min-width="100px" label="商品ID" prop="goodsId"/>
+      <el-table-column align="center" min-width="100px" label="主播ID" prop="goodsId" />
 
-      <el-table-column align="center" min-width="100px" label="添加时间" prop="addTime"/>
+      <el-table-column align="center" min-width="100px" label="添加时间" prop="addTime" />
 
     </el-table>
 
@@ -74,7 +74,7 @@ export default {
     handleDownload() {
       this.downloadLoading = true
       import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['用户ID', '商品ID', '添加时间']
+        const tHeader = ['用户ID', '主播ID', '添加时间']
         const filterVal = ['userId', 'goodsId', 'addTime']
         excel.export_json_to_excel2(
           tHeader,
diff --git a/litemall-admin/src/views/user/user.vue b/litemall-admin/src/views/user/user.vue
index ecfe77f8..d89bce24 100644
--- a/litemall-admin/src/views/user/user.vue
+++ b/litemall-admin/src/views/user/user.vue
@@ -3,18 +3,20 @@
 
     <!-- 查询和其他操作 -->
     <div class="filter-container">
-      <el-input v-model="listQuery.username" clearable class="filter-item" style="width: 200px;" placeholder="请输入用户名"/>
-      <el-input v-model="listQuery.userId" clearable class="filter-item" style="width: 200px;" placeholder="请输入用户Id"/>
-      <el-input v-model="listQuery.mobile" clearable class="filter-item" style="width: 200px;" placeholder="请输入手机号"/>
+      <el-input v-model="listQuery.username" clearable class="filter-item" style="width: 200px;" placeholder="请输入用户昵称" />
+      <el-input v-model="listQuery.mobile" clearable class="filter-item" style="width: 200px;" placeholder="请输入手机号" />
+      <el-select v-model="listQuery.userType" clearable style="width: 200px" class="filter-item" placeholder="请选择用户类型">
+        <el-option v-for="(key, value) in userTypeDic" :key="key" :label="key" :value="value" />
+      </el-select>
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
       <el-button :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">导出</el-button>
     </div>
 
     <!-- 查询结果 -->
     <el-table v-loading="listLoading" :data="list" element-loading-text="正在查询中。。。" border fit highlight-current-row>
-      <el-table-column align="center" width="100px" label="用户ID" prop="id" sortable/>
+      <el-table-column align="center" width="100px" label="用户ID" prop="id" sortable />
 
-      <el-table-column align="center" label="用户昵称" prop="nickname"/>
+      <el-table-column align="center" label="用户昵称" prop="nickname" />
 
       <el-table-column align="center" label="用户头像" width="80">
         <template slot-scope="scope">
@@ -22,19 +24,19 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" label="手机号码" prop="mobile"/>
+      <el-table-column align="center" label="手机号码" prop="mobile" />
 
       <el-table-column align="center" label="性别" prop="gender">
         <template slot-scope="scope">
-          <el-tag >{{ genderDic[scope.row.gender] }}</el-tag>
+          <el-tag>{{ genderDic[scope.row.gender] }}</el-tag>
         </template>
       </el-table-column>
 
-      <el-table-column align="center" label="生日" prop="birthday"/>
+      <el-table-column align="center" label="生日" prop="birthday" />
 
       <el-table-column align="center" label="用户等级" prop="userLevel">
         <template slot-scope="scope">
-          <el-tag >{{ levelDic[scope.row.userLevel] }}</el-tag>
+          <el-tag>{{ levelDic[scope.row.userLevel] }}</el-tag>
         </template>
       </el-table-column>
 
@@ -43,6 +45,13 @@
           <el-tag>{{ statusDic[scope.row.status] }}</el-tag>
         </template>
       </el-table-column>
+
+      <el-table-column align="center" label="用户类型" prop="userType">
+        <template slot-scope="scope">
+          <el-tag>{{ userTypeDic[scope.row.userType] }}</el-tag>
+        </template>
+      </el-table-column>
+
       <el-table-column align="center" label="操作" width="250" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button type="primary" size="mini" @click="handleDetail(scope.row)">详情</el-button>
@@ -72,6 +81,9 @@
         <el-form-item label="状态" prop="status">
           <el-select v-model="userDetail.status" placeholder="请选择"><el-option v-for="(item, index) in statusDic" :key="index" :label="item" :value="index" /></el-select>
         </el-form-item>
+        <el-form-item label="用户类型" prop="userType">
+          <el-select v-model="userDetail.userType" placeholder="请选择"><el-option v-for="(item, index) in userTypeDic" :key="index" :label="item" :value="index" /></el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="userDialogVisible = false">取消</el-button>
@@ -82,7 +94,7 @@
 </template>
 
 <script>
-import { fetchList ,userDetail ,updateUser } from '@/api/user'
+import { fetchList, userDetail, updateUser } from '@/api/user'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 
 export default {
@@ -106,9 +118,11 @@ export default {
       genderDic: ['未知', '男', '女'],
       levelDic: ['普通用户', 'VIP用户', '高级VIP用户'],
       statusDic: ['可用', '禁用', '注销'],
+      userTypeDic: {
+        'ZB_EMP': '主播', 'CUSTOMER': '客户'
+      },
       userDialogVisible: false,
-      userDetail:{
-      }
+      userDetail: {}
     }
   },
   created() {
@@ -117,14 +131,14 @@ export default {
   methods: {
     getList() {
       this.listLoading = true
-      if(this.listQuery.userId){
+      if (this.listQuery.userId) {
         userDetail(this.listQuery.userId).then(response => {
-          this.list = [];
-          if(response.data.data){
+          this.list = []
+          if (response.data.data) {
             this.list.push(response.data.data)
             this.total = 1
             this.listLoading = false
-          }else{
+          } else {
             this.list = []
             this.total = 0
             this.listLoading = false
@@ -134,7 +148,7 @@ export default {
           this.total = 0
           this.listLoading = false
         })
-      }else{
+      } else {
         fetchList(this.listQuery).then(response => {
           this.list = response.data.data.list
           this.total = response.data.data.total
@@ -163,8 +177,8 @@ export default {
       this.userDetail = row
       this.userDialogVisible = true
     },
-    handleUserUpdate(){
-     updateUser(this.userDetail)
+    handleUserUpdate() {
+      updateUser(this.userDetail)
         .then((response) => {
           this.userDialogVisible = false
           this.$notify.success({
diff --git a/litemall-admin/vue.config.js b/litemall-admin/vue.config.js
index 2bd2e20c..19d6bd3b 100644
--- a/litemall-admin/vue.config.js
+++ b/litemall-admin/vue.config.js
@@ -5,7 +5,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = 'litemall' // page title
+const name = '夏鸟星选管理后台' // page title
 
 // If your port is set to 80,
 // use administrator privileges to execute the command line.
@@ -31,8 +31,9 @@ module.exports = {
   devServer: {
     proxy: {
       '/admin': {
-        target: 'http://localhost:8080'
-      },
+        // target: 'http://localhost:8082'
+        target: 'https://www.czyinfo.cn'
+      }
     },
     port: port,
     open: true,
diff --git a/litemall-all/src/main/resources/application.yml b/litemall-all/src/main/resources/application.yml
index 6caba810..be128db9 100644
--- a/litemall-all/src/main/resources/application.yml
+++ b/litemall-all/src/main/resources/application.yml
@@ -9,7 +9,7 @@ spring:
       max-request-size: 20MB
 
 server:
-  port: 8080
+  port: 8082
   compression:
     enabled: true
     min-response-size: 2048
diff --git a/litemall-core/src/main/resources/application-core.yml b/litemall-core/src/main/resources/application-core.yml
index 7300e9b1..32152c68 100644
--- a/litemall-core/src/main/resources/application-core.yml
+++ b/litemall-core/src/main/resources/application-core.yml
@@ -1,8 +1,8 @@
 litemall:
   # 开发者应该设置成自己的wx相关信息
   wx:
-    app-id: wxa5b486c6b918ecfb
-    app-secret: e04004829d4c383b4db7769d88dfbca1
+    app-id: wxa0e9fb31b14297e2
+    app-secret: 75deefeacaf19576a849f8c88ec5655f
     mch-id: 111111
     mch-key: xxxxxx
     notify-url: http://www.example.com/wx/order/pay-notify
@@ -91,7 +91,7 @@ litemall:
     local:
       storagePath: storage
       # 这个地方应该是wx模块的WxStorageController的fetch方法对应的地址
-      address: http://localhost:8080/wx/storage/fetch/
+      address: https://www.czyinfo.cn/wx/storage/fetch/
     # 阿里云对象存储配置信息
     aliyun:
       endpoint: oss-cn-shenzhen.aliyuncs.com
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/dao/LitemallDictMapper.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/dao/LitemallDictMapper.java
new file mode 100644
index 00000000..f786606b
--- /dev/null
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/dao/LitemallDictMapper.java
@@ -0,0 +1,28 @@
+package org.linlinjava.litemall.db.dao;
+
+import org.apache.ibatis.annotations.Param;
+import org.linlinjava.litemall.db.domain.LitemallDict;
+import org.linlinjava.litemall.db.domain.LitemallDictExample;
+
+import java.util.List;
+
+public interface LitemallDictMapper {
+
+    int insertSelective(LitemallDict dict);
+
+    int update(LitemallDict dict);
+
+    List<LitemallDict> selectByExample(LitemallDictExample litemallDict);
+
+    List<LitemallDict> selectByExampleSelective(@Param("example") LitemallDictExample example, @Param("selective") LitemallDict.Column ... selective);
+
+    LitemallDict selectByPrimaryKey(Integer id);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(LitemallDict dict);
+
+    void logicalDeleteByPrimaryKey(Integer id);
+
+    void deleteByKeys(@Param("ids")  List<Integer> ids);
+}
\ No newline at end of file
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallDict.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallDict.java
new file mode 100644
index 00000000..64c873e7
--- /dev/null
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallDict.java
@@ -0,0 +1,408 @@
+package org.linlinjava.litemall.db.domain;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class LitemallDict {
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_feedback
+     *
+     * @mbg.generated
+     */
+    public static final Boolean IS_DELETED = LitemallFeedback.Deleted.IS_DELETED.value();
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_feedback
+     *
+     * @mbg.generated
+     */
+    public static final Boolean NOT_DELETED = LitemallFeedback.Deleted.NOT_DELETED.value();
+
+    private Integer id;
+
+    private String category;
+
+    private List<String> categoryList;
+
+    private String code;
+
+    private String name;
+
+    private String fldS1;
+    private String fldS2;
+
+    private Integer fldN1;
+    private Integer fldN2;
+
+    private String remark;
+    private LocalDateTime addTime;
+    private LocalDateTime updateTime;
+    private Boolean deleted;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public List<String> getCategoryList() {
+        return categoryList;
+    }
+
+    public void setCategoryList(List<String> categoryList) {
+        this.categoryList = categoryList;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getFldS1() {
+        return fldS1;
+    }
+
+    public void setFldS1(String fldS1) {
+        this.fldS1 = fldS1;
+    }
+
+    public String getFldS2() {
+        return fldS2;
+    }
+
+    public void setFldS2(String fldS2) {
+        this.fldS2 = fldS2;
+    }
+
+    public Integer getFldN1() {
+        return fldN1;
+    }
+
+    public void setFldN1(Integer fldN1) {
+        this.fldN1 = fldN1;
+    }
+
+    public Integer getFldN2() {
+        return fldN2;
+    }
+
+    public void setFldN2(Integer fldN2) {
+        this.fldN2 = fldN2;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public LocalDateTime getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(LocalDateTime addTime) {
+        this.addTime = addTime;
+    }
+
+    public LocalDateTime getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(LocalDateTime updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_feedback
+     *
+     * @mbg.generated
+     */
+    public void andLogicalDeleted(boolean deleted) {
+        setDeleted(deleted ? LitemallFeedback.Deleted.IS_DELETED.value() : LitemallFeedback.Deleted.NOT_DELETED.value());
+    }
+
+    public Boolean getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Boolean deleted) {
+        this.deleted = deleted;
+    }
+
+    /**
+     * This enum was generated by MyBatis Generator.
+     * This enum corresponds to the database table litemall_feedback
+     *
+     * @mbg.generated
+     */
+    public enum Deleted {
+        NOT_DELETED(new Boolean("0"), "未删除"),
+        IS_DELETED(new Boolean("1"), "已删除");
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_feedback
+         *
+         * @mbg.generated
+         */
+        private final Boolean value;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_feedback
+         *
+         * @mbg.generated
+         */
+        private final String name;
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_feedback
+         *
+         * @mbg.generated
+         */
+        Deleted(Boolean value, String name) {
+            this.value = value;
+            this.name = name;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_feedback
+         *
+         * @mbg.generated
+         */
+        public Boolean getValue() {
+            return this.value;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_feedback
+         *
+         * @mbg.generated
+         */
+        public Boolean value() {
+            return this.value;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_feedback
+         *
+         * @mbg.generated
+         */
+        public String getName() {
+            return this.name;
+        }
+    }
+
+    /**
+     * This enum was generated by MyBatis Generator.
+     * This enum corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    public enum Column {
+        id("id", "id", "INTEGER", false),
+        category("category", "category", "VARCHAR", false),
+        code("code", "code", "VARCHAR", false),
+        name("name", "name", "VARCHAR", false),
+        fldS1("fld_s1", "fldS1", "VARCHAR", false),
+        fldS2("fld_s2", "fldS2", "VARCHAR", false),
+        fldN1("fld_n1", "fldN1", "INTEGER", false),
+        fldN2("fld_n2", "fldN2", "INTEGER", false),
+        remark("remark", "remark", "VARCHAR", false),
+        addTime("add_time", "addTime", "TIMESTAMP", false),
+        updateTime("update_time", "updateTime", "TIMESTAMP", false),
+        deleted("deleted", "deleted", "INTEGER", false);
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        private static final String BEGINNING_DELIMITER = "`";
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        private static final String ENDING_DELIMITER = "`";
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        private final String column;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        private final boolean isColumnNameDelimited;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        private final String javaProperty;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        private final String jdbcType;
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public String value() {
+            return this.column;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public String getValue() {
+            return this.column;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public String getJavaProperty() {
+            return this.javaProperty;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public String getJdbcType() {
+            return this.jdbcType;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        Column(String column, String javaProperty, String jdbcType, boolean isColumnNameDelimited) {
+            this.column = column;
+            this.javaProperty = javaProperty;
+            this.jdbcType = jdbcType;
+            this.isColumnNameDelimited = isColumnNameDelimited;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public String desc() {
+            return this.getEscapedColumnName() + " DESC";
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public String asc() {
+            return this.getEscapedColumnName() + " ASC";
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public static LitemallFeedback.Column[] excludes(LitemallFeedback.Column... excludes) {
+            ArrayList<LitemallFeedback.Column> columns = new ArrayList<>(Arrays.asList(LitemallFeedback.Column.values()));
+            if (excludes != null && excludes.length > 0) {
+                columns.removeAll(new ArrayList<>(Arrays.asList(excludes)));
+            }
+            return columns.toArray(new LitemallFeedback.Column[]{});
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public String getEscapedColumnName() {
+            if (this.isColumnNameDelimited) {
+                return new StringBuilder().append(BEGINNING_DELIMITER).append(this.column).append(ENDING_DELIMITER).toString();
+            } else {
+                return this.column;
+            }
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public String getAliasedEscapedColumnName() {
+            return this.getEscapedColumnName();
+        }
+    }
+}
\ No newline at end of file
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallDictExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallDictExample.java
new file mode 100644
index 00000000..5acec226
--- /dev/null
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallDictExample.java
@@ -0,0 +1,795 @@
+package org.linlinjava.litemall.db.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LitemallDictExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    protected List<Integer> ids;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    public LitemallDictExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    public LitemallDictExample orderBy(String orderByClause) {
+        this.setOrderByClause(orderByClause);
+        return this;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    public LitemallDictExample orderBy(String ... orderByClauses) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < orderByClauses.length; i++) {
+            sb.append(orderByClauses[i]);
+            if (i < orderByClauses.length - 1) {
+                sb.append(" , ");
+            }
+        }
+        this.setOrderByClause(sb.toString());
+        return this;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria(this);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    public static Criteria newAndCreateCriteria() {
+        LitemallDictExample example = new LitemallDictExample();
+        return example.createCriteria();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    public LitemallDictExample when(boolean condition, IExampleWhen then) {
+        if (condition) {
+            then.example(this);
+        }
+        return this;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    public LitemallDictExample when(boolean condition, IExampleWhen then, IExampleWhen otherwise) {
+        if (condition) {
+            then.example(this);
+        } else {
+            otherwise.example(this);
+        }
+        return this;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> picUrlsCriteria;
+
+        protected List<Criterion> allCriteria;
+
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+            picUrlsCriteria = new ArrayList<Criterion>();
+        }
+
+        public List<Criterion> getPicUrlsCriteria() {
+            return picUrlsCriteria;
+        }
+
+        protected void addPicUrlsCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            picUrlsCriteria.add(new Criterion(condition, value, "org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler"));
+            allCriteria = null;
+        }
+
+        protected void addPicUrlsCriterion(String condition, String[] value1, String[] value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            picUrlsCriteria.add(new Criterion(condition, value1, value2, "org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler"));
+            allCriteria = null;
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0
+                || picUrlsCriteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            if (allCriteria == null) {
+                allCriteria = new ArrayList<Criterion>();
+                allCriteria.addAll(criteria);
+                allCriteria.addAll(picUrlsCriteria);
+            }
+            return allCriteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+            allCriteria = null;
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+            allCriteria = null;
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+            allCriteria = null;
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public Criteria andIdEqualToColumn(LitemallDict.Column column) {
+            addCriterion(new StringBuilder("id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public Criteria andIdNotEqualToColumn(LitemallDict.Column column) {
+            addCriterion(new StringBuilder("id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public Criteria andIdGreaterThanColumn(LitemallDict.Column column) {
+            addCriterion(new StringBuilder("id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public Criteria andIdGreaterThanOrEqualToColumn(LitemallDict.Column column) {
+            addCriterion(new StringBuilder("id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public Criteria andIdLessThanColumn(LitemallDict.Column column) {
+            addCriterion(new StringBuilder("id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public Criteria andIdLessThanOrEqualToColumn(LitemallDict.Column column) {
+            addCriterion(new StringBuilder("id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public LitemallDictExample.Criteria andCodeEqualTo(String value) {
+            addCriterion("code =", value, "code");
+            return (LitemallDictExample.Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("code in", values, "code");
+            return (Criteria) this;
+        }
+
+        public LitemallDictExample.Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (LitemallDictExample.Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public LitemallDictExample.Criteria andCategoryEqualTo(String value) {
+            addCriterion("category =", value, "category");
+            return (LitemallDictExample.Criteria) this;
+        }
+
+        public Criteria andCategoryIn(List<String> values) {
+            addCriterion("category in", values, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIsNull() {
+            addCriterion("deleted is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIsNotNull() {
+            addCriterion("deleted is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedEqualTo(Boolean value) {
+            addCriterion("deleted =", value, "deleted");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_feedback
+         *
+         * @mbg.generated
+         */
+        public Criteria andDeletedEqualToColumn(LitemallFeedback.Column column) {
+            addCriterion(new StringBuilder("deleted = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotEqualTo(Boolean value) {
+            addCriterion("deleted <>", value, "deleted");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_feedback
+         *
+         * @mbg.generated
+         */
+        public Criteria andDeletedNotEqualToColumn(LitemallFeedback.Column column) {
+            addCriterion(new StringBuilder("deleted <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedGreaterThan(Boolean value) {
+            addCriterion("deleted >", value, "deleted");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_feedback
+         *
+         * @mbg.generated
+         */
+        public Criteria andDeletedGreaterThanColumn(LitemallFeedback.Column column) {
+            addCriterion(new StringBuilder("deleted > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("deleted >=", value, "deleted");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_feedback
+         *
+         * @mbg.generated
+         */
+        public Criteria andDeletedGreaterThanOrEqualToColumn(LitemallFeedback.Column column) {
+            addCriterion(new StringBuilder("deleted >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedLessThan(Boolean value) {
+            addCriterion("deleted <", value, "deleted");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_feedback
+         *
+         * @mbg.generated
+         */
+        public Criteria andDeletedLessThanColumn(LitemallFeedback.Column column) {
+            addCriterion(new StringBuilder("deleted < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedLessThanOrEqualTo(Boolean value) {
+            addCriterion("deleted <=", value, "deleted");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_feedback
+         *
+         * @mbg.generated
+         */
+        public Criteria andDeletedLessThanOrEqualToColumn(LitemallFeedback.Column column) {
+            addCriterion(new StringBuilder("deleted <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIn(List<Boolean> values) {
+            addCriterion("deleted in", values, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotIn(List<Boolean> values) {
+            addCriterion("deleted not in", values, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedBetween(Boolean value1, Boolean value2) {
+            addCriterion("deleted between", value1, value2, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("deleted not between", value1, value2, "deleted");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table litemall_dict
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        private LitemallDictExample example;
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        protected Criteria(LitemallDictExample example) {
+            super();
+            this.example = example;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public LitemallDictExample example() {
+            return this.example;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        @Deprecated
+        public Criteria andIf(boolean ifAdd, ICriteriaAdd add) {
+            if (ifAdd) {
+                add.add(this);
+            }
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public Criteria when(boolean condition, ICriteriaWhen then) {
+            if (condition) {
+                then.criteria(this);
+            }
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public Criteria when(boolean condition, ICriteriaWhen then, ICriteriaWhen otherwise) {
+            if (condition) {
+                then.criteria(this);
+            } else {
+                otherwise.criteria(this);
+            }
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        public Criteria andLogicalDeleted(boolean deleted) {
+            return deleted ? andDeletedEqualTo(LitemallDict.Deleted.IS_DELETED.value()) : andDeletedNotEqualTo(LitemallDict.Deleted.IS_DELETED.value());
+        }
+
+        @Deprecated
+        public interface ICriteriaAdd {
+            /**
+             * This method was generated by MyBatis Generator.
+             * This method corresponds to the database table litemall_dict
+             *
+             * @mbg.generated
+             */
+            Criteria add(Criteria add);
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table litemall_dict
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+
+    public interface ICriteriaWhen {
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        void criteria(Criteria criteria);
+    }
+
+    public interface IExampleWhen {
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_dict
+         *
+         * @mbg.generated
+         */
+        void example(LitemallDictExample example);
+    }
+}
\ No newline at end of file
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoods.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoods.java
index 5dc0055b..bacaf294 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoods.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoods.java
@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 
 public class LitemallGoods {
     /**
@@ -49,6 +50,40 @@ public class LitemallGoods {
      */
     private String name;
 
+    private Integer sex;
+
+    private Date birthday;
+
+    private Double height;
+
+    private Double weight;
+
+    private String province;
+    private String provinceCode;
+
+    private String city;
+    private String cityCode;
+
+    private String county;
+    private String countyCode;
+
+    private String currentProvince;
+    private String currentProvinceCode;
+
+    private String currentCity;
+    private String currentCityCode;
+
+    private String currentCounty;
+    private String currentCountyCode;
+
+    private String degree;
+    private String language;
+    private String workWay;
+    private String[] workCategory;
+    private String[] goodCategory;
+    private String[] accountType;
+    private String[] workStyle;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -67,6 +102,8 @@ public class LitemallGoods {
      */
     private Integer brandId;
 
+    private Integer userId;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -130,6 +167,8 @@ public class LitemallGoods {
      */
     private String shareUrl;
 
+    private String[] videoUrl;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -283,6 +322,190 @@ public class LitemallGoods {
         this.name = name;
     }
 
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    public Date getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
+    }
+
+    public Double getHeight() {
+        return height;
+    }
+
+    public void setHeight(Double height) {
+        this.height = height;
+    }
+
+    public Double getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Double weight) {
+        this.weight = weight;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getProvinceCode() {
+        return provinceCode;
+    }
+
+    public void setProvinceCode(String provinceCode) {
+        this.provinceCode = provinceCode;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getCityCode() {
+        return cityCode;
+    }
+
+    public void setCityCode(String cityCode) {
+        this.cityCode = cityCode;
+    }
+
+    public String getCounty() {
+        return county;
+    }
+
+    public void setCounty(String county) {
+        this.county = county;
+    }
+
+    public String getCountyCode() {
+        return countyCode;
+    }
+
+    public void setCountyCode(String countyCode) {
+        this.countyCode = countyCode;
+    }
+
+    public String getCurrentProvince() {
+        return currentProvince;
+    }
+
+    public void setCurrentProvince(String currentProvince) {
+        this.currentProvince = currentProvince;
+    }
+
+    public String getCurrentProvinceCode() {
+        return currentProvinceCode;
+    }
+
+    public void setCurrentProvinceCode(String currentProvinceCode) {
+        this.currentProvinceCode = currentProvinceCode;
+    }
+
+    public String getCurrentCity() {
+        return currentCity;
+    }
+
+    public void setCurrentCity(String currentCity) {
+        this.currentCity = currentCity;
+    }
+
+    public String getCurrentCityCode() {
+        return currentCityCode;
+    }
+
+    public void setCurrentCityCode(String currentCityCode) {
+        this.currentCityCode = currentCityCode;
+    }
+
+    public String getCurrentCounty() {
+        return currentCounty;
+    }
+
+    public void setCurrentCounty(String currentCounty) {
+        this.currentCounty = currentCounty;
+    }
+
+    public String getCurrentCountyCode() {
+        return currentCountyCode;
+    }
+
+    public void setCurrentCountyCode(String currentCountyCode) {
+        this.currentCountyCode = currentCountyCode;
+    }
+
+    public String getDegree() {
+        return degree;
+    }
+
+    public void setDegree(String degree) {
+        this.degree = degree;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public String getWorkWay() {
+        return workWay;
+    }
+
+    public void setWorkWay(String workWay) {
+        this.workWay = workWay;
+    }
+
+    public String[] getWorkCategory() {
+        return workCategory;
+    }
+
+    public void setWorkCategory(String[] workCategory) {
+        this.workCategory = workCategory;
+    }
+
+    public String[] getGoodCategory() {
+        return goodCategory;
+    }
+
+    public void setGoodCategory(String[] goodCategory) {
+        this.goodCategory = goodCategory;
+    }
+
+    public String[] getAccountType() {
+        return accountType;
+    }
+
+    public void setAccountType(String[] accountType) {
+        this.accountType = accountType;
+    }
+
+    public String[] getWorkStyle() {
+        return workStyle;
+    }
+
+    public void setWorkStyle(String[] workStyle) {
+        this.workStyle = workStyle;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column litemall_goods.category_id
@@ -331,6 +554,14 @@ public class LitemallGoods {
         this.brandId = brandId;
     }
 
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column litemall_goods.gallery
@@ -499,6 +730,14 @@ public class LitemallGoods {
         this.shareUrl = shareUrl;
     }
 
+    public String[] getVideoUrl() {
+        return videoUrl;
+    }
+
+    public void setVideoUrl(String[] videoUrl) {
+        this.videoUrl = videoUrl;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column litemall_goods.is_new
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsExample.java
index d4c331c1..95eeba57 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsExample.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsExample.java
@@ -948,6 +948,132 @@ public class LitemallGoodsExample {
             return (Criteria) this;
         }
 
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(Integer value) {
+            addCriterion("user_id =", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_goods
+         *
+         * @mbg.generated
+         */
+        public Criteria andUserIdEqualToColumn(LitemallGoods.Column column) {
+            addCriterion(new StringBuilder("user_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(Integer value) {
+            addCriterion("user_id <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_goods
+         *
+         * @mbg.generated
+         */
+        public Criteria andUserIdNotEqualToColumn(LitemallGoods.Column column) {
+            addCriterion(new StringBuilder("user_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(Integer value) {
+            addCriterion("user_id >", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_goods
+         *
+         * @mbg.generated
+         */
+        public Criteria andUserIdGreaterThanColumn(LitemallGoods.Column column) {
+            addCriterion(new StringBuilder("user_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("user_id >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_goods
+         *
+         * @mbg.generated
+         */
+        public Criteria andUserIdGreaterThanOrEqualToColumn(LitemallGoods.Column column) {
+            addCriterion(new StringBuilder("user_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(Integer value) {
+            addCriterion("user_id <", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_goods
+         *
+         * @mbg.generated
+         */
+        public Criteria andUserIdLessThanColumn(LitemallGoods.Column column) {
+            addCriterion(new StringBuilder("user_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(Integer value) {
+            addCriterion("user_id <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_goods
+         *
+         * @mbg.generated
+         */
+        public Criteria andUserIdLessThanOrEqualToColumn(LitemallGoods.Column column) {
+            addCriterion(new StringBuilder("user_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<Integer> values) {
+            addCriterion("user_id in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<Integer> values) {
+            addCriterion("user_id not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(Integer value1, Integer value2) {
+            addCriterion("user_id between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
         public Criteria andGalleryIsNull() {
             addCriterion("gallery is null");
             return (Criteria) this;
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopic.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopic.java
index 9c763aba..39c891e8 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopic.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopic.java
@@ -74,7 +74,40 @@ public class LitemallTopic {
      *
      * @mbg.generated
      */
-    private String picUrl;
+    private String[] picUrl;
+
+    private String contact;
+
+    private String contactMobile;
+
+    private String contactPost;
+
+    private String demandProvince;
+
+    private String demandProvinceCode;
+
+    private String demandCity;
+
+    private String demandCityCode;
+
+    private String province;
+    private String provinceCode;
+
+    private String city;
+    private String cityCode;
+
+    private String county;
+    private String countyCode;
+
+    private String address;
+
+    private String workWay;
+    private String[] workCategory;
+    private String[] workStyle;
+    private Integer salary;
+    private Integer commission;
+
+    private Integer userId;
 
     /**
      *
@@ -258,7 +291,7 @@ public class LitemallTopic {
      *
      * @mbg.generated
      */
-    public String getPicUrl() {
+    public String[] getPicUrl() {
         return picUrl;
     }
 
@@ -270,10 +303,170 @@ public class LitemallTopic {
      *
      * @mbg.generated
      */
-    public void setPicUrl(String picUrl) {
+    public void setPicUrl(String[] picUrl) {
         this.picUrl = picUrl;
     }
 
+    public String getContact() {
+        return contact;
+    }
+
+    public void setContact(String contact) {
+        this.contact = contact;
+    }
+
+    public String getContactMobile() {
+        return contactMobile;
+    }
+
+    public void setContactMobile(String contactMobile) {
+        this.contactMobile = contactMobile;
+    }
+
+    public String getContactPost() {
+        return contactPost;
+    }
+
+    public void setContactPost(String contactPost) {
+        this.contactPost = contactPost;
+    }
+
+    public String getDemandProvince() {
+        return demandProvince;
+    }
+
+    public void setDemandProvince(String demandProvince) {
+        this.demandProvince = demandProvince;
+    }
+
+    public String getDemandProvinceCode() {
+        return demandProvinceCode;
+    }
+
+    public void setDemandProvinceCode(String demandProvinceCode) {
+        this.demandProvinceCode = demandProvinceCode;
+    }
+
+    public String getDemandCity() {
+        return demandCity;
+    }
+
+    public void setDemandCity(String demandCity) {
+        this.demandCity = demandCity;
+    }
+
+    public String getDemandCityCode() {
+        return demandCityCode;
+    }
+
+    public void setDemandCityCode(String demandCityCode) {
+        this.demandCityCode = demandCityCode;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getProvinceCode() {
+        return provinceCode;
+    }
+
+    public void setProvinceCode(String provinceCode) {
+        this.provinceCode = provinceCode;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getCityCode() {
+        return cityCode;
+    }
+
+    public void setCityCode(String cityCode) {
+        this.cityCode = cityCode;
+    }
+
+    public String getCounty() {
+        return county;
+    }
+
+    public void setCounty(String county) {
+        this.county = county;
+    }
+
+    public String getCountyCode() {
+        return countyCode;
+    }
+
+    public void setCountyCode(String countyCode) {
+        this.countyCode = countyCode;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getWorkWay() {
+        return workWay;
+    }
+
+    public void setWorkWay(String workWay) {
+        this.workWay = workWay;
+    }
+
+    public String[] getWorkCategory() {
+        return workCategory;
+    }
+
+    public void setWorkCategory(String[] workCategory) {
+        this.workCategory = workCategory;
+    }
+
+    public String[] getWorkStyle() {
+        return workStyle;
+    }
+
+    public void setWorkStyle(String[] workStyle) {
+        this.workStyle = workStyle;
+    }
+
+    public Integer getSalary() {
+        return salary;
+    }
+
+    public void setSalary(Integer salary) {
+        this.salary = salary;
+    }
+
+    public Integer getCommission() {
+        return commission;
+    }
+
+    public void setCommission(Integer commission) {
+        this.commission = commission;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column litemall_topic.sort_order
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopicExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopicExample.java
index 9d4d848e..06557760 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopicExample.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopicExample.java
@@ -424,6 +424,132 @@ public class LitemallTopicExample {
             return (Criteria) this;
         }
 
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(Integer value) {
+            addCriterion("user_id =", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_goods
+         *
+         * @mbg.generated
+         */
+        public Criteria andUserIdEqualToColumn(LitemallTopic.Column column) {
+            addCriterion(new StringBuilder("user_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(Integer value) {
+            addCriterion("user_id <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_goods
+         *
+         * @mbg.generated
+         */
+        public Criteria andUserIdNotEqualToColumn(LitemallTopic.Column column) {
+            addCriterion(new StringBuilder("user_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(Integer value) {
+            addCriterion("user_id >", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_goods
+         *
+         * @mbg.generated
+         */
+        public Criteria andUserIdGreaterThanColumn(LitemallTopic.Column column) {
+            addCriterion(new StringBuilder("user_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("user_id >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_goods
+         *
+         * @mbg.generated
+         */
+        public Criteria andUserIdGreaterThanOrEqualToColumn(LitemallTopic.Column column) {
+            addCriterion(new StringBuilder("user_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(Integer value) {
+            addCriterion("user_id <", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_goods
+         *
+         * @mbg.generated
+         */
+        public Criteria andUserIdLessThanColumn(LitemallTopic.Column column) {
+            addCriterion(new StringBuilder("user_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(Integer value) {
+            addCriterion("user_id <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_goods
+         *
+         * @mbg.generated
+         */
+        public Criteria andUserIdLessThanOrEqualToColumn(LitemallTopic.Column column) {
+            addCriterion(new StringBuilder("user_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<Integer> values) {
+            addCriterion("user_id in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<Integer> values) {
+            addCriterion("user_id not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(Integer value1, Integer value2) {
+            addCriterion("user_id between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
         public Criteria andTitleIsNull() {
             addCriterion("title is null");
             return (Criteria) this;
@@ -958,142 +1084,6 @@ public class LitemallTopicExample {
             return (Criteria) this;
         }
 
-        public Criteria andPicUrlIsNull() {
-            addCriterion("pic_url is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPicUrlIsNotNull() {
-            addCriterion("pic_url is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPicUrlEqualTo(String value) {
-            addCriterion("pic_url =", value, "picUrl");
-            return (Criteria) this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table litemall_topic
-         *
-         * @mbg.generated
-         */
-        public Criteria andPicUrlEqualToColumn(LitemallTopic.Column column) {
-            addCriterion(new StringBuilder("pic_url = ").append(column.getEscapedColumnName()).toString());
-            return (Criteria) this;
-        }
-
-        public Criteria andPicUrlNotEqualTo(String value) {
-            addCriterion("pic_url <>", value, "picUrl");
-            return (Criteria) this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table litemall_topic
-         *
-         * @mbg.generated
-         */
-        public Criteria andPicUrlNotEqualToColumn(LitemallTopic.Column column) {
-            addCriterion(new StringBuilder("pic_url <> ").append(column.getEscapedColumnName()).toString());
-            return (Criteria) this;
-        }
-
-        public Criteria andPicUrlGreaterThan(String value) {
-            addCriterion("pic_url >", value, "picUrl");
-            return (Criteria) this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table litemall_topic
-         *
-         * @mbg.generated
-         */
-        public Criteria andPicUrlGreaterThanColumn(LitemallTopic.Column column) {
-            addCriterion(new StringBuilder("pic_url > ").append(column.getEscapedColumnName()).toString());
-            return (Criteria) this;
-        }
-
-        public Criteria andPicUrlGreaterThanOrEqualTo(String value) {
-            addCriterion("pic_url >=", value, "picUrl");
-            return (Criteria) this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table litemall_topic
-         *
-         * @mbg.generated
-         */
-        public Criteria andPicUrlGreaterThanOrEqualToColumn(LitemallTopic.Column column) {
-            addCriterion(new StringBuilder("pic_url >= ").append(column.getEscapedColumnName()).toString());
-            return (Criteria) this;
-        }
-
-        public Criteria andPicUrlLessThan(String value) {
-            addCriterion("pic_url <", value, "picUrl");
-            return (Criteria) this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table litemall_topic
-         *
-         * @mbg.generated
-         */
-        public Criteria andPicUrlLessThanColumn(LitemallTopic.Column column) {
-            addCriterion(new StringBuilder("pic_url < ").append(column.getEscapedColumnName()).toString());
-            return (Criteria) this;
-        }
-
-        public Criteria andPicUrlLessThanOrEqualTo(String value) {
-            addCriterion("pic_url <=", value, "picUrl");
-            return (Criteria) this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table litemall_topic
-         *
-         * @mbg.generated
-         */
-        public Criteria andPicUrlLessThanOrEqualToColumn(LitemallTopic.Column column) {
-            addCriterion(new StringBuilder("pic_url <= ").append(column.getEscapedColumnName()).toString());
-            return (Criteria) this;
-        }
-
-        public Criteria andPicUrlLike(String value) {
-            addCriterion("pic_url like", value, "picUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andPicUrlNotLike(String value) {
-            addCriterion("pic_url not like", value, "picUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andPicUrlIn(List<String> values) {
-            addCriterion("pic_url in", values, "picUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andPicUrlNotIn(List<String> values) {
-            addCriterion("pic_url not in", values, "picUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andPicUrlBetween(String value1, String value2) {
-            addCriterion("pic_url between", value1, value2, "picUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andPicUrlNotBetween(String value1, String value2) {
-            addCriterion("pic_url not between", value1, value2, "picUrl");
-            return (Criteria) this;
-        }
-
         public Criteria andSortOrderIsNull() {
             addCriterion("sort_order is null");
             return (Criteria) this;
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUser.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUser.java
index 2da90579..78abfbf6 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUser.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUser.java
@@ -1,5 +1,7 @@
 package org.linlinjava.litemall.db.domain;
 
+import org.linlinjava.litemall.db.enums.UserType;
+
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -139,6 +141,8 @@ public class LitemallUser {
      */
     private String sessionKey;
 
+    private UserType userType;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -223,6 +227,14 @@ public class LitemallUser {
         this.username = username;
     }
 
+    public UserType getUserType() {
+        return userType;
+    }
+
+    public void setUserType(UserType userType) {
+        this.userType = userType;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column litemall_user.password
@@ -678,6 +690,7 @@ public class LitemallUser {
         result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
         result = prime * result + ((getUsername() == null) ? 0 : getUsername().hashCode());
         result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode());
+        result = prime * result + ((getUserType() == null) ? 0 : getUserType().hashCode());
         result = prime * result + ((getGender() == null) ? 0 : getGender().hashCode());
         result = prime * result + ((getBirthday() == null) ? 0 : getBirthday().hashCode());
         result = prime * result + ((getLastLoginTime() == null) ? 0 : getLastLoginTime().hashCode());
@@ -773,6 +786,7 @@ public class LitemallUser {
         id("id", "id", "INTEGER", false),
         username("username", "username", "VARCHAR", false),
         password("password", "password", "VARCHAR", true),
+        userType("user_type", "userType", "VARCHAR", true),
         gender("gender", "gender", "TINYINT", false),
         birthday("birthday", "birthday", "DATE", false),
         lastLoginTime("last_login_time", "lastLoginTime", "TIMESTAMP", false),
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserExample.java
index 8976d291..3bc017cf 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserExample.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserExample.java
@@ -1992,6 +1992,11 @@ public class LitemallUserExample {
             return (Criteria) this;
         }
 
+        public Criteria andUserTypeEqualTo(String value) {
+            addCriterion("`user_type` =", value, "userType");
+            return (Criteria) this;
+        }
+
         public Criteria andStatusEqualTo(Byte value) {
             addCriterion("`status` =", value, "status");
             return (Criteria) this;
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/enums/UserType.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/enums/UserType.java
new file mode 100644
index 00000000..11fc238c
--- /dev/null
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/enums/UserType.java
@@ -0,0 +1,19 @@
+package org.linlinjava.litemall.db.enums;
+
+/**
+ * 用户类型
+ * @author rwb
+ */
+public enum UserType {
+
+    ZB_EMP("主播"),
+    CUSTOMER("客户")
+    ;
+
+    String name;
+
+    UserType(String name) {
+        this.name = name;
+    }
+
+}
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallDictService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallDictService.java
new file mode 100644
index 00000000..b7c9c065
--- /dev/null
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallDictService.java
@@ -0,0 +1,90 @@
+package org.linlinjava.litemall.db.service;
+
+import com.github.pagehelper.PageHelper;
+import org.apache.ibatis.annotations.Param;
+import org.linlinjava.litemall.db.dao.LitemallDictMapper;
+import org.linlinjava.litemall.db.domain.LitemallDict;
+import org.linlinjava.litemall.db.domain.LitemallDictExample;
+import org.linlinjava.litemall.db.domain.LitemallTopic;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+public class LitemallDictService {
+
+    @Resource
+    private LitemallDictMapper litemallDictMapper;
+
+    public Integer add(LitemallDict dict) {
+        dict.setAddTime(LocalDateTime.now());
+        dict.setUpdateTime(LocalDateTime.now());
+        return litemallDictMapper.insertSelective(dict);
+    }
+
+    public int insertSelective(LitemallDict dict) {
+        return litemallDictMapper.insertSelective(dict);
+    }
+
+    public int update(LitemallDict dict) {
+        return litemallDictMapper.update(dict);
+    }
+
+    public int updateById(LitemallDict dict) {
+        dict.setUpdateTime(LocalDateTime.now());
+        return litemallDictMapper.updateByPrimaryKeySelective(dict);
+    }
+
+    public List<LitemallDict> querySelective(LitemallDictExample litemallDict) {
+        return litemallDictMapper.selectByExample(litemallDict);
+    }
+
+    public List<LitemallDict> querySelective(String code, String name, String category, Integer page, Integer limit, String sort, String order) {
+        LitemallDictExample.Criteria criteria = new LitemallDictExample().createCriteria();
+
+        if (!StringUtils.isEmpty(code)) {
+            criteria.andCodeEqualTo(code);
+        }
+
+        if (!StringUtils.isEmpty(name)) {
+            criteria.andNameEqualTo(name);
+        }
+
+        if (!StringUtils.isEmpty(category)) {
+            criteria.andCategoryEqualTo(category);
+        }
+
+        criteria.andDeletedEqualTo(false);
+
+        LitemallDictExample example = criteria.example();
+        if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
+            example.setOrderByClause(sort + " " + order);
+        }
+        PageHelper.startPage(page, limit);
+        return litemallDictMapper.selectByExample(example);
+    }
+
+    public LitemallDict selectByPrimaryKey(Integer id) {
+        return litemallDictMapper.selectByPrimaryKey(id);
+    }
+
+    public int deleteByPrimaryKey(Integer id) {
+        return litemallDictMapper.deleteByPrimaryKey(id);
+    }
+
+    public LitemallDict findById(Integer id) {
+        return litemallDictMapper.selectByPrimaryKey(id);
+    }
+
+    public void deleteById(Integer id) {
+        litemallDictMapper.deleteByPrimaryKey(id);
+    }
+
+    public void deleteByIds(List<Integer> ids) {
+        litemallDictMapper.deleteByKeys(ids);
+    }
+
+}
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsService.java
index 22c8b0cd..9ee9a15c 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsService.java
@@ -124,7 +124,7 @@ public class LitemallGoodsService {
 
         PageHelper.startPage(offset, limit);
 
-        return goodsMapper.selectByExampleSelective(example, columns);
+        return goodsMapper.selectByExampleSelective(example);
     }
 
     public List<LitemallGoods> querySelective(Integer goodsId, String goodsSn, String name, Integer page, Integer size, String sort, String order) {
@@ -257,4 +257,14 @@ public class LitemallGoodsService {
         example.or().andIdIn(Arrays.asList(ids)).andIsOnSaleEqualTo(true).andDeletedEqualTo(false);
         return goodsMapper.selectByExampleSelective(example, columns);
     }
+
+    public LitemallGoods findbyUserId(Integer userId) {
+        LitemallGoodsExample example = new LitemallGoodsExample();
+        example.createCriteria().andUserIdEqualTo(userId);
+        List<LitemallGoods> litemallGoods = goodsMapper.selectByExampleSelective(example);
+        if (litemallGoods == null || litemallGoods.isEmpty()) {
+            return null;
+        }
+        return litemallGoods.get(0);
+    }
 }
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallTopicService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallTopicService.java
index a51a0a5b..b8969bf0 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallTopicService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallTopicService.java
@@ -2,11 +2,11 @@ package org.linlinjava.litemall.db.service;
 
 import com.github.pagehelper.PageHelper;
 import org.linlinjava.litemall.db.dao.LitemallTopicMapper;
-import org.linlinjava.litemall.db.domain.LitemallGroupon;
 import org.linlinjava.litemall.db.domain.LitemallTopic;
 import org.linlinjava.litemall.db.domain.LitemallTopic.Column;
 import org.linlinjava.litemall.db.domain.LitemallTopicExample;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
@@ -28,7 +28,7 @@ public class LitemallTopicService {
         example.or().andDeletedEqualTo(false);
         example.setOrderByClause(sort + " " + order);
         PageHelper.startPage(offset, limit);
-        return topicMapper.selectByExampleSelective(example, columns);
+        return topicMapper.selectByExampleSelective(example);
     }
 
     public int queryTotal() {
@@ -109,4 +109,25 @@ public class LitemallTopicService {
         topic.setDeleted(true);
         topicMapper.updateByExampleSelective(topic, example);
     }
+
+    public LitemallTopic findByUserId(Integer userId) {
+        LitemallTopicExample example = new LitemallTopicExample();
+        example.createCriteria().andUserIdEqualTo(userId);
+        List<LitemallTopic> topics = topicMapper.selectByExampleSelective(example);
+        if (CollectionUtils.isEmpty(topics)) {
+            return null;
+        }
+        return topics.get(0);
+    }
+
+    /**
+     * 获取所有物品总数，包括在售的和下架的，但是不包括已删除的商品
+     *
+     * @return
+     */
+    public int count() {
+        LitemallTopicExample example = new LitemallTopicExample();
+        example.or().andDeletedEqualTo(false);
+        return (int) topicMapper.countByExample(example);
+    }
 }
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallUserService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallUserService.java
index 034fa3f4..91210861 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallUserService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallUserService.java
@@ -46,16 +46,19 @@ public class LitemallUserService {
         return userMapper.updateByPrimaryKeySelective(user);
     }
 
-    public List<LitemallUser> querySelective(String username, String mobile, Integer page, Integer size, String sort, String order) {
+    public List<LitemallUser> querySelective(String username, String mobile, String userType, Integer page, Integer size, String sort, String order) {
         LitemallUserExample example = new LitemallUserExample();
         LitemallUserExample.Criteria criteria = example.createCriteria();
 
         if (!StringUtils.isEmpty(username)) {
-            criteria.andUsernameLike("%" + username + "%");
+            criteria.andNicknameLike("%" + username + "%");
         }
         if (!StringUtils.isEmpty(mobile)) {
             criteria.andMobileEqualTo(mobile);
         }
+        if (!StringUtils.isEmpty(userType)) {
+            criteria.andUserTypeEqualTo(userType);
+        }
         criteria.andDeletedEqualTo(false);
 
         if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
diff --git a/litemall-db/src/main/resources/application-db.yml b/litemall-db/src/main/resources/application-db.yml
index c102c306..1e6cd8c7 100644
--- a/litemall-db/src/main/resources/application-db.yml
+++ b/litemall-db/src/main/resources/application-db.yml
@@ -7,10 +7,10 @@ pagehelper:
 spring:
   datasource:
     druid:
-      url:  jdbc:mysql://localhost:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
+      url:  jdbc:mysql://124.222.53.90:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
       driver-class-name:  com.mysql.cj.jdbc.Driver
-      username:  litemall
-      password:  litemall123456
+      username:  mysql
+      password:  czy@2024
       initial-size:  10
       max-active:  50
       min-idle:  10
@@ -29,3 +29,7 @@ spring:
       filter:
         stat:
           enabled: false
+
+druid:
+  mysql:
+    use-ping-method: false
diff --git a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallDictMapper.xml b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallDictMapper.xml
new file mode 100644
index 00000000..df412a99
--- /dev/null
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallDictMapper.xml
@@ -0,0 +1,517 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.linlinjava.litemall.db.dao.LitemallDictMapper">
+
+  <resultMap id="BaseResultMap" type="org.linlinjava.litemall.db.domain.LitemallDict">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="category" jdbcType="VARCHAR" property="category" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="fld_s1" jdbcType="VARCHAR" property="fldS1" />
+    <result column="fld_s2" jdbcType="VARCHAR" property="fldS2" />
+    <result column="fld_n1" jdbcType="INTEGER" property="fldN1" />
+    <result column="fld_n2" jdbcType="INTEGER" property="fldN2" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="deleted" jdbcType="BIT" property="deleted" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+            <foreach collection="criteria.picUrlsCriteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler} and #{criterion.secondValue,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+            <foreach collection="criteria.picUrlsCriteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler} and #{criterion.secondValue,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, category, code, name, fld_s1, fld_s2, fld_n1, fld_n2, remark,
+    add_time, update_time, deleted
+  </sql>
+  <select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallDictExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from litemall_dict
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExampleSelective" parameterType="map" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="example.distinct">
+      distinct
+    </if>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.aliasedEscapedColumnName}
+        </foreach>
+      </when>
+      <otherwise>
+        <include refid="Base_Column_List" />
+      </otherwise>
+    </choose>
+    from litemall_dict
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+    <if test="example.orderByClause != null">
+      order by ${example.orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from litemall_dict
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from litemall_dict
+    where id = #{id,jdbcType=INTEGER}
+      and deleted = 
+    <choose>
+      <when test="andLogicalDeleted">
+        1
+      </when>
+      <otherwise>
+        0
+      </otherwise>
+    </choose>
+  </select>
+  <select id="selectByPrimaryKeySelective" parameterType="map" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.aliasedEscapedColumnName}
+        </foreach>
+      </when>
+      <otherwise>
+        <include refid="Base_Column_List" />
+      </otherwise>
+    </choose>
+    from litemall_dict
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from litemall_dict
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByKeys" parameterType="java.util.List">
+    delete from litemall_dict
+    where id in
+    <foreach item="item" collection="ids" open="(" separator="," close=")">
+      #{item}
+    </foreach>
+  </delete>
+  <delete id="deleteByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallDictExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from litemall_dict
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="org.linlinjava.litemall.db.domain.LitemallDict">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into litemall_dict (category, code, name,
+    fld_s1, fld_s2, fld_n1, fld_n2, remark,
+      add_time, update_time, deleted
+      )
+    values (#{category,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
+      #{fldS1,jdbcType=VARCHAR}, #{fldS1,jdbcType=VARCHAR}, #{fldN1,jdbcType=INTEGER}, #{fldN2,jdbcType=INTEGER},
+      #{remark,jdbcType=VARCHAR},
+      #{addTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallDict">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into litemall_dict
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="category != null">
+        category,
+      </if>
+      <if test="code != null">
+        code,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="fldS1 != null">
+        fld_s1,
+      </if>
+      <if test="fldS2 != null">
+        fld_s2,
+      </if>
+      <if test="fldN1 != null">
+        fld_n1,
+      </if>
+      <if test="fldN1 != null">
+        fld_n2,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="addTime != null">
+        add_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="deleted != null">
+        deleted,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="category != null">
+        #{category,jdbcType=INTEGER},
+      </if>
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="fldS1 != null">
+        #{fldS1,jdbcType=VARCHAR},
+      </if>
+      <if test="fldS2 != null">
+        #{fldS2,jdbcType=VARCHAR},
+      </if>
+      <if test="fldN1 != null">
+        #{fldN1,jdbcType=INTEGER},
+      </if>
+      <if test="fldN2 != null">
+        #{fldN2,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="addTime != null">
+        #{addTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=BIT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallDictExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from litemall_dict
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update litemall_dict
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.category != null">
+        category = #{record.category,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        code = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fldS1 != null">
+        fld_s1 = #{record.fldS1,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fldS2 != null">
+        fld_s2 = #{record.fldS2,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fldN1 != null">
+        `fld_n1` = #{record.fldN1,jdbcType=INTEGER},
+      </if>
+      <if test="record.fldN2 != null">
+        `fld_n2` = #{record.fldN2,jdbcType=INTEGER},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.addTime != null">
+        add_time = #{record.addTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.deleted != null">
+        deleted = #{record.deleted,jdbcType=BIT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update litemall_dict
+    set id = #{record.id,jdbcType=INTEGER},
+      code = #{record.code,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+    category = #{record.category,jdbcType=VARCHAR},
+    fld_s1 = #{record.fldS1,jdbcType=VARCHAR},
+    fld_s2 = #{record.fldS2,jdbcType=VARCHAR},
+    fld_n1 = #{record.fldN1,jdbcType=INTEGER},
+    fld_n1 = #{record.fldN2,jdbcType=INTEGER},
+    remark = #{record.remark,jdbcType=VARCHAR},
+    add_time = #{record.addTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      deleted = #{record.deleted,jdbcType=BIT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="org.linlinjava.litemall.db.domain.LitemallDict">
+    update litemall_dict
+    <set>
+      <if test="code != null">
+        code = #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="category != null">
+        category = #{category,jdbcType=VARCHAR},
+      </if>
+      <if test="fldS1 != null">
+        fld_s1 = #{fldS1,jdbcType=VARCHAR},
+      </if>
+      <if test="fldS2 != null">
+        fld_s2 = #{fldS2,jdbcType=VARCHAR},
+      </if>
+      <if test="fldN1 != null">
+        fld_n1 = #{fldN1,jdbcType=INTEGER},
+      </if>
+      <if test="fldN2 != null">
+        fld_n2 = #{fldN2,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="addTime != null">
+        add_time = #{addTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleted != null">
+        deleted = #{deleted,jdbcType=BIT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallDictExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <include refid="Base_Column_List" />
+    from litemall_dict
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+    limit 1
+  </select>
+  <select id="selectOneByExampleSelective" parameterType="map" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.aliasedEscapedColumnName}
+        </foreach>
+      </when>
+      <otherwise>
+        <include refid="Base_Column_List" />
+      </otherwise>
+    </choose>
+    from litemall_dict
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+    <if test="example.orderByClause != null">
+      order by ${example.orderByClause}
+    </if>
+    limit 1
+  </select>
+  <update id="logicalDeleteByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update litemall_dict set deleted = 1
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="logicalDeleteByPrimaryKey" parameterType="java.lang.Integer">
+    update litemall_dict set deleted = 1
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsMapper.xml b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsMapper.xml
index 5c6c47ea..d762c980 100644
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsMapper.xml
@@ -9,8 +9,32 @@
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="goods_sn" jdbcType="VARCHAR" property="goodsSn" />
     <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="sex" jdbcType="INTEGER" property="sex" />
+    <result column="birthday" jdbcType="DATE" property="birthday" />
+    <result column="height" jdbcType="DECIMAL" property="height" />
+    <result column="weight" jdbcType="DECIMAL" property="weight" />
+    <result column="province" jdbcType="VARCHAR" property="province" />
+    <result column="province_code" jdbcType="VARCHAR" property="provinceCode" />
+    <result column="city" jdbcType="VARCHAR" property="city" />
+    <result column="city_code" jdbcType="VARCHAR" property="cityCode" />
+    <result column="county" jdbcType="VARCHAR" property="county" />
+    <result column="county_code" jdbcType="VARCHAR" property="countyCode" />
+    <result column="current_province" jdbcType="VARCHAR" property="currentProvince" />
+    <result column="current_province_code" jdbcType="VARCHAR" property="currentProvinceCode" />
+    <result column="current_city" jdbcType="VARCHAR" property="currentCity" />
+    <result column="current_city_code" jdbcType="VARCHAR" property="currentCityCode" />
+    <result column="current_county" jdbcType="VARCHAR" property="currentCounty" />
+    <result column="current_county_code" jdbcType="VARCHAR" property="currentCountyCode" />
+    <result column="degree" jdbcType="VARCHAR" property="degree" />
+    <result column="language" jdbcType="VARCHAR" property="language" />
+    <result column="work_way" jdbcType="VARCHAR" property="workWay" />
+    <result column="work_category" jdbcType="VARCHAR" property="workCategory" typeHandler="org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler"/>
+    <result column="good_category" jdbcType="VARCHAR" property="goodCategory" typeHandler="org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler"/>
+    <result column="account_type" jdbcType="VARCHAR" property="accountType" typeHandler="org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler"/>
+    <result column="work_style" jdbcType="VARCHAR" property="workStyle" typeHandler="org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler"/>
     <result column="category_id" jdbcType="INTEGER" property="categoryId" />
     <result column="brand_id" jdbcType="INTEGER" property="brandId" />
+    <result column="user_id" jdbcType="INTEGER" property="userId" />
     <result column="gallery" jdbcType="VARCHAR" property="gallery" typeHandler="org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler" />
     <result column="keywords" jdbcType="VARCHAR" property="keywords" />
     <result column="brief" jdbcType="VARCHAR" property="brief" />
@@ -18,6 +42,7 @@
     <result column="sort_order" jdbcType="SMALLINT" property="sortOrder" />
     <result column="pic_url" jdbcType="VARCHAR" property="picUrl" />
     <result column="share_url" jdbcType="VARCHAR" property="shareUrl" />
+    <result column="video_url" jdbcType="VARCHAR" property="videoUrl" typeHandler="org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler"/>
     <result column="is_new" jdbcType="BIT" property="isNew" />
     <result column="is_hot" jdbcType="BIT" property="isHot" />
     <result column="unit" jdbcType="VARCHAR" property="unit" />
@@ -143,8 +168,13 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, goods_sn, `name`, category_id, brand_id, gallery, keywords, brief, is_on_sale, 
-    sort_order, pic_url, share_url, is_new, is_hot, unit, counter_price, retail_price, 
+    id, goods_sn, `name`,
+    sex, birthday, height, weight,
+    province, province_code, city, city_code, county, county_code,
+    current_province, current_province_code, current_city, current_city_code, current_county, current_county_code,
+    `degree`, `language`, work_way, work_category, good_category, account_type, work_style,
+    category_id, brand_id, gallery, keywords, brief, is_on_sale,
+    sort_order, pic_url, share_url, video_url, is_new, is_hot, unit, counter_price, retail_price,
     add_time, update_time, deleted
   </sql>
   <sql id="Blob_Column_List">
@@ -301,18 +331,29 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into litemall_goods (goods_sn, `name`, category_id, 
-      brand_id, gallery, 
+    insert into litemall_goods (goods_sn, `name`,
+      sex, birthday, height, weight,
+      province, province_code, city, city_code, county, county_code,
+      current_province, current_province_code, current_city, current_city_code, current_county, current_county_code,
+      `degree`, `language`, work_way, work_category, good_category, account_type, work_style,
+      category_id,
+      brand_id, user_id, gallery,
       keywords, brief, is_on_sale, 
-      sort_order, pic_url, share_url, 
-      is_new, is_hot, unit, counter_price, 
+      sort_order, pic_url, share_url, video_url,
+      is_new, is_hot, unit, counter_price,
       retail_price, add_time, update_time, 
       deleted, detail)
-    values (#{goodsSn,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{categoryId,jdbcType=INTEGER}, 
-      #{brandId,jdbcType=INTEGER}, #{gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler}, 
+    values (#{goodsSn,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
+      #{sex,jdbcType=INTEGER}, #{birthday,jdbcType=DECIMAL}, #{height,jdbcType=DECIMAL},  #{weight,jdbcType=DECIMAL},
+      #{province,jdbcType=VARCHAR}, #{provinceCode,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{cityCode,jdbcType=VARCHAR}, #{county,jdbcType=VARCHAR}, #{countyCode,jdbcType=VARCHAR},
+      #{currentProvince,jdbcType=VARCHAR}, #{currentProvinceCode,jdbcType=VARCHAR}, #{currentCity,jdbcType=VARCHAR}, #{currentCityCode,jdbcType=VARCHAR}, #{currentCounty,jdbcType=VARCHAR}, #{currentCountyCode,jdbcType=VARCHAR},
+      #{degree,jdbcType=VARCHAR}, #{language,jdbcType=VARCHAR}, #{workWay,jdbcType=VARCHAR},
+      #{workCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler}, #{goodCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler}, #{accountType,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler}, #{workStyle,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      #{categoryId,jdbcType=INTEGER},
+      #{brandId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       #{keywords,jdbcType=VARCHAR}, #{brief,jdbcType=VARCHAR}, #{isOnSale,jdbcType=BIT}, 
-      #{sortOrder,jdbcType=SMALLINT}, #{picUrl,jdbcType=VARCHAR}, #{shareUrl,jdbcType=VARCHAR}, 
-      #{isNew,jdbcType=BIT}, #{isHot,jdbcType=BIT}, #{unit,jdbcType=VARCHAR}, #{counterPrice,jdbcType=DECIMAL}, 
+      #{sortOrder,jdbcType=SMALLINT}, #{picUrl,jdbcType=VARCHAR}, #{shareUrl,jdbcType=VARCHAR}, #{videoUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+    #{isNew,jdbcType=BIT}, #{isHot,jdbcType=BIT}, #{unit,jdbcType=VARCHAR}, #{counterPrice,jdbcType=DECIMAL},
       #{retailPrice,jdbcType=DECIMAL}, #{addTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{deleted,jdbcType=BIT}, #{detail,jdbcType=LONGVARCHAR})
   </insert>
@@ -332,12 +373,84 @@
       <if test="name != null">
         `name`,
       </if>
+      <if test="sex != null">
+        sex,
+      </if>
+      <if test="birthday != null">
+        birthday,
+      </if>
+      <if test="height != null">
+        height,
+      </if>
+      <if test="weight != null">
+        weight,
+      </if>
+      <if test="province != null">
+        province,
+      </if>
+      <if test="provinceCode != null">
+        province_code,
+      </if>
+      <if test="city != null">
+        city,
+      </if>
+      <if test="cityCode != null">
+        city_code,
+      </if>
+      <if test="county != null">
+        county,
+      </if>
+      <if test="countyCode != null">
+        county_code,
+      </if>
+      <if test="currentProvince != null">
+        current_province,
+      </if>
+      <if test="currentProvinceCode != null">
+        current_province_code,
+      </if>
+      <if test="currentCity != null">
+        current_city,
+      </if>
+      <if test="currentCityCode != null">
+        current_city_code,
+      </if>
+      <if test="currentCounty != null">
+        current_county,
+      </if>
+      <if test="currentCountyCode != null">
+        current_county_code,
+      </if>
+      <if test="degree != null">
+        `degree`,
+      </if>
+      <if test="language != null">
+        `language`,
+      </if>
+      <if test="workWay != null">
+        work_way,
+      </if>
+      <if test="workCategory != null">
+        work_category,
+      </if>
+      <if test="goodCategory != null">
+        good_category,
+      </if>
+      <if test="accountType != null">
+        account_type,
+      </if>
+      <if test="workStyle != null">
+        work_style,
+      </if>
       <if test="categoryId != null">
         category_id,
       </if>
       <if test="brandId != null">
         brand_id,
       </if>
+      <if test="userId != null">
+        user_id,
+      </if>
       <if test="gallery != null">
         gallery,
       </if>
@@ -359,6 +472,9 @@
       <if test="shareUrl != null">
         share_url,
       </if>
+      <if test="videoUrl != null">
+        video_url,
+      </if>
       <if test="isNew != null">
         is_new,
       </if>
@@ -394,12 +510,84 @@
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
+      <if test="sex != null">
+        #{sex,jdbcType=INTEGER},
+      </if>
+      <if test="birthday != null">
+        #{birthday,jdbcType=DATE},
+      </if>
+      <if test="height != null">
+        #{height,jdbcType=DECIMAL},
+      </if>
+      <if test="weight != null">
+        #{weight,jdbcType=DECIMAL},
+      </if>
+      <if test="province != null">
+        #{province,jdbcType=VARCHAR},
+      </if>
+      <if test="provinceCode != null">
+        #{provinceCode,jdbcType=VARCHAR},
+      </if>
+      <if test="city != null">
+        #{city,jdbcType=VARCHAR},
+      </if>
+      <if test="cityCode != null">
+        #{cityCode,jdbcType=VARCHAR},
+      </if>
+      <if test="county != null">
+        #{county,jdbcType=VARCHAR},
+      </if>
+      <if test="countyCode != null">
+        #{countyCode,jdbcType=VARCHAR},
+      </if>
+      <if test="currentProvince != null">
+        #{currentProvince,jdbcType=VARCHAR},
+      </if>
+      <if test="currentProvinceCode != null">
+        #{currentProvinceCode,jdbcType=VARCHAR},
+      </if>
+      <if test="currentCity != null">
+        #{currentCity,jdbcType=VARCHAR},
+      </if>
+      <if test="currentCityCode != null">
+        #{currentCityCode,jdbcType=VARCHAR},
+      </if>
+      <if test="currentCounty != null">
+        #{currentCounty,jdbcType=VARCHAR},
+      </if>
+      <if test="currentCountyCode != null">
+        #{currentCountyCode,jdbcType=VARCHAR},
+      </if>
+      <if test="degree != null">
+        #{degree,jdbcType=VARCHAR},
+      </if>
+      <if test="language != null">
+        #{language,jdbcType=VARCHAR},
+      </if>
+      <if test="workWay != null">
+        #{workWay,jdbcType=VARCHAR},
+      </if>
+      <if test="workCategory != null">
+        #{workCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
+      <if test="goodCategory != null">
+        #{goodCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
+      <if test="accountType != null">
+        #{accountType,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
+      <if test="workStyle != null">
+        #{workStyle,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
       <if test="categoryId != null">
         #{categoryId,jdbcType=INTEGER},
       </if>
       <if test="brandId != null">
         #{brandId,jdbcType=INTEGER},
       </if>
+      <if test="userId != null">
+        #{userId,jdbcType=INTEGER},
+      </if>
       <if test="gallery != null">
         #{gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       </if>
@@ -421,6 +609,9 @@
       <if test="shareUrl != null">
         #{shareUrl,jdbcType=VARCHAR},
       </if>
+      <if test="videoUrl != null">
+        #{videoUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
       <if test="isNew != null">
         #{isNew,jdbcType=BIT},
       </if>
@@ -476,12 +667,85 @@
       <if test="record.name != null">
         `name` = #{record.name,jdbcType=VARCHAR},
       </if>
+
+      <if test="record.sex != null">
+        sex = #{record.sex,jdbcType=INTEGER},
+      </if>
+      <if test="record.birthday != null">
+        birthday = #{record.birthday,jdbcType=DATE},
+      </if>
+      <if test="record.height != null">
+        height = #{record.height,jdbcType=DECIMAL},
+      </if>
+      <if test="record.weight != null">
+        weight = #{record.weight,jdbcType=DECIMAL},
+      </if>
+      <if test="record.province != null">
+        province = #{record.province,jdbcType=VARCHAR},
+      </if>
+      <if test="record.provinceCode != null">
+        province_code = #{record.provinceCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.city != null">
+        city = #{record.city,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cityCode != null">
+        city_code = #{record.cityCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.county != null">
+        county = #{record.county,jdbcType=VARCHAR},
+      </if>
+      <if test="record.countyCode != null">
+        county_code = #{record.countyCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.currentProvince != null">
+        current_province = #{record.currentProvince,jdbcType=VARCHAR},
+      </if>
+      <if test="record.currentProvinceCode != null">
+        current_province_code = #{record.currentProvinceCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.currentCity != null">
+        current_city = #{record.currentCity,jdbcType=VARCHAR},
+      </if>
+      <if test="record.currentCityCode != null">
+        current_city_code = #{record.currentCityCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.currentCounty != null">
+        current_county = #{record.currentCounty,jdbcType=VARCHAR},
+      </if>
+      <if test="record.currentCountyCode != null">
+        current_county_code= #{record.currentCountyCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.degree != null">
+        `degree` = #{record.degree,jdbcType=VARCHAR},
+      </if>
+      <if test="record.language != null">
+        `language` = #{record.language,jdbcType=VARCHAR},
+      </if>
+      <if test="record.workWay != null">
+        work_way = #{record.workWay,jdbcType=VARCHAR},
+      </if>
+      <if test="record.workCategory != null">
+        work_category = #{record.workCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
+      <if test="record.goodCategory != null">
+        good_category = #{record.goodCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
+      <if test="record.accountType != null">
+        account_type = #{record.accountType,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
+      <if test="record.workStyle != null">
+        work_style = #{record.workStyle,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
       <if test="record.categoryId != null">
         category_id = #{record.categoryId,jdbcType=INTEGER},
       </if>
       <if test="record.brandId != null">
         brand_id = #{record.brandId,jdbcType=INTEGER},
       </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=INTEGER},
+      </if>
       <if test="record.gallery != null">
         gallery = #{record.gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       </if>
@@ -503,6 +767,9 @@
       <if test="record.shareUrl != null">
         share_url = #{record.shareUrl,jdbcType=VARCHAR},
       </if>
+      <if test="record.videoUrl != null">
+        video_url = #{record.videoUrl,jdbcType=VARCHAR},
+      </if>
       <if test="record.isNew != null">
         is_new = #{record.isNew,jdbcType=BIT},
       </if>
@@ -544,8 +811,32 @@
     set id = #{record.id,jdbcType=INTEGER},
       goods_sn = #{record.goodsSn,jdbcType=VARCHAR},
       `name` = #{record.name,jdbcType=VARCHAR},
+      sex = #{sex,jdbcType=INTEGER},
+      birthday = #{birthday,jdbcType=DATE},
+      height = #{height,jdbcType=DECIMAL},
+      weight = #{weight,jdbcType=DECIMAL},
+      province = #{province,jdbcType=VARCHAR},
+      province_code = #{provinceCode,jdbcType=VARCHAR},
+      city = #{city,jdbcType=VARCHAR},
+      city_code = #{cityCode,jdbcType=VARCHAR},
+      county = #{county,jdbcType=VARCHAR},
+      county_code = #{countyCode,jdbcType=VARCHAR},
+      current_province = #{currentProvince,jdbcType=VARCHAR},
+      current_province_code = #{currentProvinceCode,jdbcType=VARCHAR},
+      current_city = #{currentCity,jdbcType=VARCHAR},
+      current_city_code = #{currentCityCode,jdbcType=VARCHAR},
+      current_county = #{currentCounty,jdbcType=VARCHAR},
+      current_county_code= #{currentCountyCode,jdbcType=VARCHAR},
+      `degree` = #{degree,jdbcType=VARCHAR},
+      `language` = #{language,jdbcType=VARCHAR},
+      work_way = #{workWay,jdbcType=VARCHAR},
+      work_category = #{workCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      good_category = #{goodCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      account_type = #{accountType,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      work_style = #{workStyle,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       category_id = #{record.categoryId,jdbcType=INTEGER},
       brand_id = #{record.brandId,jdbcType=INTEGER},
+      user_id = #{record.userId,jdbcType=INTEGER},
       gallery = #{record.gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       keywords = #{record.keywords,jdbcType=VARCHAR},
       brief = #{record.brief,jdbcType=VARCHAR},
@@ -553,6 +844,7 @@
       sort_order = #{record.sortOrder,jdbcType=SMALLINT},
       pic_url = #{record.picUrl,jdbcType=VARCHAR},
       share_url = #{record.shareUrl,jdbcType=VARCHAR},
+      video_url = #{record.videoUrl,jdbcType=VARCHAR},
       is_new = #{record.isNew,jdbcType=BIT},
       is_hot = #{record.isHot,jdbcType=BIT},
       unit = #{record.unit,jdbcType=VARCHAR},
@@ -575,8 +867,32 @@
     set id = #{record.id,jdbcType=INTEGER},
       goods_sn = #{record.goodsSn,jdbcType=VARCHAR},
       `name` = #{record.name,jdbcType=VARCHAR},
+      sex = #{sex,jdbcType=INTEGER},
+      birthday = #{birthday,jdbcType=DATE},
+      height = #{height,jdbcType=DECIMAL},
+      weight = #{weight,jdbcType=DECIMAL},
+      province = #{province,jdbcType=VARCHAR},
+      province_code = #{provinceCode,jdbcType=VARCHAR},
+      city = #{city,jdbcType=VARCHAR},
+      city_code = #{cityCode,jdbcType=VARCHAR},
+      county = #{county,jdbcType=VARCHAR},
+      county_code = #{countyCode,jdbcType=VARCHAR},
+      current_province = #{currentProvince,jdbcType=VARCHAR},
+      current_province_code = #{currentProvinceCode,jdbcType=VARCHAR},
+      current_city = #{currentCity,jdbcType=VARCHAR},
+      current_city_code = #{currentCityCode,jdbcType=VARCHAR},
+      current_county = #{currentCounty,jdbcType=VARCHAR},
+      current_county_code= #{currentCountyCode,jdbcType=VARCHAR},
+      `degree` = #{degree,jdbcType=VARCHAR},
+      `language` = #{language,jdbcType=VARCHAR},
+      work_way = #{workWay,jdbcType=VARCHAR},
+      work_category = #{workCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      good_category = #{goodCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      account_type = #{accountType,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      work_style = #{workStyle,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       category_id = #{record.categoryId,jdbcType=INTEGER},
       brand_id = #{record.brandId,jdbcType=INTEGER},
+      user_id = #{record.userId,jdbcType=INTEGER},
       gallery = #{record.gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       keywords = #{record.keywords,jdbcType=VARCHAR},
       brief = #{record.brief,jdbcType=VARCHAR},
@@ -584,6 +900,7 @@
       sort_order = #{record.sortOrder,jdbcType=SMALLINT},
       pic_url = #{record.picUrl,jdbcType=VARCHAR},
       share_url = #{record.shareUrl,jdbcType=VARCHAR},
+      video_url = #{record.videoUrl,jdbcType=VARCHAR},
       is_new = #{record.isNew,jdbcType=BIT},
       is_hot = #{record.isHot,jdbcType=BIT},
       unit = #{record.unit,jdbcType=VARCHAR},
@@ -609,12 +926,84 @@
       <if test="name != null">
         `name` = #{name,jdbcType=VARCHAR},
       </if>
+      <if test="sex != null">
+        sex = #{sex,jdbcType=INTEGER},
+      </if>
+      <if test="birthday != null">
+        birthday = #{birthday,jdbcType=DATE},
+      </if>
+      <if test="height != null">
+        height = #{height,jdbcType=DECIMAL},
+      </if>
+      <if test="weight != null">
+        weight = #{weight,jdbcType=DECIMAL},
+      </if>
+      <if test="province != null">
+        province = #{province,jdbcType=VARCHAR},
+      </if>
+      <if test="provinceCode != null">
+        province_code = #{provinceCode,jdbcType=VARCHAR},
+      </if>
+      <if test="city != null">
+        city = #{city,jdbcType=VARCHAR},
+      </if>
+      <if test="cityCode != null">
+        city_code = #{cityCode,jdbcType=VARCHAR},
+      </if>
+      <if test="county != null">
+        county = #{county,jdbcType=VARCHAR},
+      </if>
+      <if test="countyCode != null">
+        county_code = #{countyCode,jdbcType=VARCHAR},
+      </if>
+      <if test="currentProvince != null">
+        current_province = #{currentProvince,jdbcType=VARCHAR},
+      </if>
+      <if test="currentProvinceCode != null">
+        current_province_code = #{currentProvinceCode,jdbcType=VARCHAR},
+      </if>
+      <if test="currentCity != null">
+        current_city = #{currentCity,jdbcType=VARCHAR},
+      </if>
+      <if test="currentCityCode != null">
+        current_city_code = #{currentCityCode,jdbcType=VARCHAR},
+      </if>
+      <if test="currentCounty != null">
+        current_county = #{currentCounty,jdbcType=VARCHAR},
+      </if>
+      <if test="currentCountyCode != null">
+        current_county_code= #{currentCountyCode,jdbcType=VARCHAR},
+      </if>
+      <if test="degree != null">
+        `degree` = #{degree,jdbcType=VARCHAR},
+      </if>
+      <if test="language != null">
+        `language` = #{language,jdbcType=VARCHAR},
+      </if>
+      <if test="workWay != null">
+        work_way = #{workWay,jdbcType=VARCHAR},
+      </if>
+      <if test="workCategory != null">
+        work_category = #{workCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
+      <if test="goodCategory != null">
+        good_category = #{goodCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
+      <if test="accountType != null">
+        account_type = #{accountType,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
+      <if test="workStyle != null">
+        work_style = #{workStyle,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
       <if test="categoryId != null">
         category_id = #{categoryId,jdbcType=INTEGER},
       </if>
       <if test="brandId != null">
         brand_id = #{brandId,jdbcType=INTEGER},
       </if>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=INTEGER},
+      </if>
       <if test="gallery != null">
         gallery = #{gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       </if>
@@ -636,6 +1025,9 @@
       <if test="shareUrl != null">
         share_url = #{shareUrl,jdbcType=VARCHAR},
       </if>
+      <if test="videoUrl != null">
+        video_url = #{videoUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
       <if test="isNew != null">
         is_new = #{isNew,jdbcType=BIT},
       </if>
@@ -674,8 +1066,32 @@
     update litemall_goods
     set goods_sn = #{goodsSn,jdbcType=VARCHAR},
       `name` = #{name,jdbcType=VARCHAR},
+      sex = #{sex,jdbcType=INTEGER},
+      birthday = #{birthday,jdbcType=DATE},
+      height = #{height,jdbcType=DECIMAL},
+      weight = #{weight,jdbcType=DECIMAL},
+      province = #{province,jdbcType=VARCHAR},
+      province_code = #{provinceCode,jdbcType=VARCHAR},
+      city = #{city,jdbcType=VARCHAR},
+      city_code = #{cityCode,jdbcType=VARCHAR},
+      county = #{county,jdbcType=VARCHAR},
+      county_code = #{countyCode,jdbcType=VARCHAR},
+      current_province = #{currentProvince,jdbcType=VARCHAR},
+      current_province_code = #{currentProvinceCode,jdbcType=VARCHAR},
+      current_city = #{currentCity,jdbcType=VARCHAR},
+      current_city_code = #{currentCityCode,jdbcType=VARCHAR},
+      current_county = #{currentCounty,jdbcType=VARCHAR},
+      current_county_code= #{currentCountyCode,jdbcType=VARCHAR},
+      `degree` = #{degree,jdbcType=VARCHAR},
+      `language` = #{language,jdbcType=VARCHAR},
+      work_way = #{workWay,jdbcType=VARCHAR},
+      work_category = #{workCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      good_category = #{goodCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      account_type = #{accountType,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      work_style = #{workStyle,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       category_id = #{categoryId,jdbcType=INTEGER},
       brand_id = #{brandId,jdbcType=INTEGER},
+      user_id = #{userId,jdbcType=INTEGER},
       gallery = #{gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       keywords = #{keywords,jdbcType=VARCHAR},
       brief = #{brief,jdbcType=VARCHAR},
@@ -683,6 +1099,7 @@
       sort_order = #{sortOrder,jdbcType=SMALLINT},
       pic_url = #{picUrl,jdbcType=VARCHAR},
       share_url = #{shareUrl,jdbcType=VARCHAR},
+      video_url = #{videoUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       is_new = #{isNew,jdbcType=BIT},
       is_hot = #{isHot,jdbcType=BIT},
       unit = #{unit,jdbcType=VARCHAR},
@@ -702,8 +1119,32 @@
     update litemall_goods
     set goods_sn = #{goodsSn,jdbcType=VARCHAR},
       `name` = #{name,jdbcType=VARCHAR},
+      sex = #{sex,jdbcType=INTEGER},
+      birthday = #{birthday,jdbcType=DATE},
+      height = #{height,jdbcType=DECIMAL},
+      weight = #{weight,jdbcType=DECIMAL},
+      province = #{province,jdbcType=VARCHAR},
+      province_code = #{provinceCode,jdbcType=VARCHAR},
+      city = #{city,jdbcType=VARCHAR},
+      city_code = #{cityCode,jdbcType=VARCHAR},
+      county = #{county,jdbcType=VARCHAR},
+      county_code = #{countyCode,jdbcType=VARCHAR},
+      current_province = #{currentProvince,jdbcType=VARCHAR},
+      current_province_code = #{currentProvinceCode,jdbcType=VARCHAR},
+      current_city = #{currentCity,jdbcType=VARCHAR},
+      current_city_code = #{currentCityCode,jdbcType=VARCHAR},
+      current_county = #{currentCounty,jdbcType=VARCHAR},
+      current_county_code= #{currentCountyCode,jdbcType=VARCHAR},
+      `degree` = #{degree,jdbcType=VARCHAR},
+      `language` = #{language,jdbcType=VARCHAR},
+      work_way = #{workWay,jdbcType=VARCHAR},
+      work_category = #{workCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      good_category = #{goodCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      account_type = #{accountType,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      work_style = #{workStyle,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       category_id = #{categoryId,jdbcType=INTEGER},
       brand_id = #{brandId,jdbcType=INTEGER},
+      user_id = #{userId,jdbcType=INTEGER},
       gallery = #{gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       keywords = #{keywords,jdbcType=VARCHAR},
       brief = #{brief,jdbcType=VARCHAR},
@@ -711,6 +1152,7 @@
       sort_order = #{sortOrder,jdbcType=SMALLINT},
       pic_url = #{picUrl,jdbcType=VARCHAR},
       share_url = #{shareUrl,jdbcType=VARCHAR},
+      video_url = #{videoUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       is_new = #{isNew,jdbcType=BIT},
       is_hot = #{isHot,jdbcType=BIT},
       unit = #{unit,jdbcType=VARCHAR},
diff --git a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallTopicMapper.xml b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallTopicMapper.xml
index f71135c1..34efd0d8 100644
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallTopicMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallTopicMapper.xml
@@ -11,7 +11,27 @@
     <result column="subtitle" jdbcType="VARCHAR" property="subtitle" />
     <result column="price" jdbcType="DECIMAL" property="price" />
     <result column="read_count" jdbcType="VARCHAR" property="readCount" />
-    <result column="pic_url" jdbcType="VARCHAR" property="picUrl" />
+    <result column="pic_url" jdbcType="VARCHAR" property="picUrl" typeHandler="org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler" />
+    <result column="contact" jdbcType="VARCHAR" property="contact" />
+    <result column="contact_mobile" jdbcType="VARCHAR" property="contactMobile" />
+    <result column="contact_post" jdbcType="VARCHAR" property="contactPost" />
+    <result column="demand_province" jdbcType="VARCHAR" property="demandProvince" />
+    <result column="demand_province_code" jdbcType="VARCHAR" property="demandProvinceCode" />
+    <result column="demand_city" jdbcType="VARCHAR" property="demandCity" />
+    <result column="demand_city_code" jdbcType="VARCHAR" property="demandCityCode" />
+    <result column="province" jdbcType="VARCHAR" property="province" />
+    <result column="province_code" jdbcType="VARCHAR" property="provinceCode" />
+    <result column="city" jdbcType="VARCHAR" property="city" />
+    <result column="city_code" jdbcType="VARCHAR" property="cityCode" />
+    <result column="county" jdbcType="VARCHAR" property="county" />
+    <result column="county_code" jdbcType="VARCHAR" property="countyCode" />
+    <result column="address" jdbcType="VARCHAR" property="address" />
+    <result column="work_way" jdbcType="VARCHAR" property="workWay" />
+    <result column="work_category" jdbcType="VARCHAR" property="workCategory" typeHandler="org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler"/>
+    <result column="work_style" jdbcType="VARCHAR" property="workStyle" typeHandler="org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler"/>
+    <result column="salary" jdbcType="INTEGER" property="salary" />
+    <result column="commission" jdbcType="INTEGER" property="commission" />
+    <result column="user_id" jdbcType="INTEGER" property="userId" />
     <result column="sort_order" jdbcType="INTEGER" property="sortOrder" />
     <result column="goods" jdbcType="VARCHAR" property="goods" typeHandler="org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler" />
     <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
@@ -134,8 +154,11 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, title, subtitle, price, read_count, pic_url, sort_order, goods, add_time, update_time, 
-    deleted
+    id, title, subtitle, price, read_count, pic_url,
+    contact, contact_mobile, contact_post, demand_province, demand_province_code, demand_city, demand_city_code,
+    province, province_code, city, city_code, county, county_code, address,
+    work_way, work_category, work_style, salary, commission,
+    user_id, sort_order, goods, add_time, update_time, deleted
   </sql>
   <sql id="Blob_Column_List">
     <!--
@@ -292,12 +315,25 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into litemall_topic (title, subtitle, price, 
-      read_count, pic_url, sort_order, 
+      read_count, pic_url,
+      contact, contact_mobile, contact_post, demand_province, demand_province_code, demand_city, demand_city_code,
+      province, province_code, city, city_code, county, county_code, address,
+      work_way, work_category, work_style, salary, commission,
+      user_id,
+      sort_order,
       goods, 
       add_time, update_time, deleted, 
       content)
     values (#{title,jdbcType=VARCHAR}, #{subtitle,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, 
-      #{readCount,jdbcType=VARCHAR}, #{picUrl,jdbcType=VARCHAR}, #{sortOrder,jdbcType=INTEGER}, 
+      #{readCount,jdbcType=VARCHAR}, #{picUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      #{contact,jdbcType=VARCHAR}, #{contactMobile,jdbcType=VARCHAR}, #{contactPost,jdbcType=VARCHAR},
+      #{demandProvince,jdbcType=VARCHAR}, #{demandProvinceCode,jdbcType=VARCHAR}, #{demandCity,jdbcType=VARCHAR}, #{demandCityCode,jdbcType=VARCHAR},
+      #{province,jdbcType=VARCHAR}, #{provinceCode,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{cityCode,jdbcType=VARCHAR}, #{county,jdbcType=VARCHAR}, #{countyCode,jdbcType=VARCHAR},
+      #{address,jdbcType=VARCHAR}, #{workWay,jdbcType=VARCHAR},
+      #{workCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      #{workStyle,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      #{salary,jdbcType=INTEGER}, #{commission,jdbcType=INTEGER},
+      #{userId,jdbcType=INTEGER}, #{sortOrder,jdbcType=INTEGER},
       #{goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler}, 
       #{addTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}, 
       #{content,jdbcType=LONGVARCHAR})
@@ -327,6 +363,66 @@
       <if test="picUrl != null">
         pic_url,
       </if>
+      <if test="contact != null">
+        contact,
+      </if>
+      <if test="contactMobile != null">
+        contact_mobile,
+      </if>
+      <if test="contactPost != null">
+        contact_post,
+      </if>
+      <if test="demandProvince != null">
+        demand_province,
+      </if>
+      <if test="demandProvinceCode != null">
+        demand_province_code,
+      </if>
+      <if test="demandCity != null">
+        demand_city,
+      </if>
+      <if test="demandCityCode != null">
+        demand_city_code,
+      </if>
+      <if test="province != null">
+        province,
+      </if>
+      <if test="provinceCode != null">
+        province_code,
+      </if>
+      <if test="city != null">
+        city,
+      </if>
+      <if test="cityCode != null">
+        city_code,
+      </if>
+      <if test="county != null">
+        county,
+      </if>
+      <if test="countyCode != null">
+        county_code,
+      </if>
+      <if test="address != null">
+        address,
+      </if>
+      <if test="workWay != null">
+        work_way,
+      </if>
+      <if test="workCategory != null">
+        work_category,
+      </if>
+      <if test="workStyle != null">
+        work_style,
+      </if>
+      <if test="salary != null">
+        salary,
+      </if>
+      <if test="commission != null">
+        commission,
+      </if>
+      <if test="userId != null">
+        user_id,
+      </if>
       <if test="sortOrder != null">
         sort_order,
       </if>
@@ -360,7 +456,67 @@
         #{readCount,jdbcType=VARCHAR},
       </if>
       <if test="picUrl != null">
-        #{picUrl,jdbcType=VARCHAR},
+        #{picUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
+      <if test="contact != null">
+        #{contact,jdbcType=VARCHAR},
+      </if>
+      <if test="contactMobile != null">
+        #{contactMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="contactPost != null">
+        #{contactPost,jdbcType=VARCHAR},
+      </if>
+      <if test="demandProvince != null">
+        #{demandProvince,jdbcType=VARCHAR},
+      </if>
+      <if test="demandProvinceCode != null">
+        #{demandProvinceCode,jdbcType=VARCHAR},
+      </if>
+      <if test="demandCity != null">
+        #{demandCity,jdbcType=VARCHAR},
+      </if>
+      <if test="demandCityCode != null">
+        #{demandCityCode,jdbcType=VARCHAR},
+      </if>
+      <if test="province != null">
+        #{province,jdbcType=VARCHAR},
+      </if>
+      <if test="provinceCode != null">
+        #{provinceCode,jdbcType=VARCHAR},
+      </if>
+      <if test="city != null">
+        #{city,jdbcType=VARCHAR},
+      </if>
+      <if test="cityCode != null">
+        #{cityCode,jdbcType=VARCHAR},
+      </if>
+      <if test="county != null">
+        #{county,jdbcType=VARCHAR},
+      </if>
+      <if test="countyCode != null">
+        #{countyCode,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null">
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="workWay != null">
+        #{workWay,jdbcType=VARCHAR},
+      </if>
+      <if test="workCategory != null">
+        #{workCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
+      <if test="workStyle != null">
+        #{workStyle,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
+      <if test="salary != null">
+        #{salary,jdbcType=INTEGER},
+      </if>
+      <if test="commission != null">
+        #{commission,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=INTEGER},
       </if>
       <if test="sortOrder != null">
         #{sortOrder,jdbcType=INTEGER},
@@ -415,7 +571,73 @@
         read_count = #{record.readCount,jdbcType=VARCHAR},
       </if>
       <if test="record.picUrl != null">
-        pic_url = #{record.picUrl,jdbcType=VARCHAR},
+        pic_url = #{record.picUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
+      <if test="record.contact != null">
+        contact = #{record.contact,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contactMobile != null">
+        contact_mobile = #{record.contactMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contactPost != null">
+        contact_post = #{record.contactPost,jdbcType=VARCHAR},
+      </if>
+      <if test="record.demandProvince != null">
+        demand_province = #{record.demandProvince,jdbcType=VARCHAR},
+      </if>
+      <if test="record.demandProvinceCode != null">
+        demand_province_code = #{record.demandProvinceCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.demandCity != null">
+        demand_city = #{record.demandCity,jdbcType=VARCHAR},
+      </if>
+      <if test="record.demandCityCode != null">
+        demand_city_code = #{record.demandCityCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.province != null">
+        province = #{record.province,jdbcType=VARCHAR},
+      </if>
+      <if test="record.provinceCode != null">
+        province_code = #{record.provinceCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.city != null">
+        city = #{record.city,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cityCode != null">
+        city_code = #{record.cityCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.county != null">
+        county = #{record.county,jdbcType=VARCHAR},
+      </if>
+      <if test="record.countyCode != null">
+        county_code = #{record.countyCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.address != null">
+        address = #{record.address,jdbcType=VARCHAR},
+      </if>
+      <if test="record.workWay != null">
+        work_way = #{record.workWay,jdbcType=VARCHAR},
+      </if>
+      <if test="record.workCategory != null">
+        work_category = #{record.workCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
+      <if test="record.workStyle != null">
+        work_style = #{record.workStyle,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
+      <if test="record.salary != null">
+        salary = #{record.salary,jdbcType=INTEGER},
+      </if>
+      <if test="record.salary == null">
+        salary = null
+      </if>
+      <if test="record.commission == null">
+        commission = #{record.commission,jdbcType=INTEGER},
+      </if>
+      <if test="record.commission == null">
+        commission = null
+      </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=INTEGER},
       </if>
       <if test="record.sortOrder != null">
         sort_order = #{record.sortOrder,jdbcType=INTEGER},
@@ -451,7 +673,27 @@
       subtitle = #{record.subtitle,jdbcType=VARCHAR},
       price = #{record.price,jdbcType=DECIMAL},
       read_count = #{record.readCount,jdbcType=VARCHAR},
-      pic_url = #{record.picUrl,jdbcType=VARCHAR},
+      pic_url = #{record.picUrl,jdbcType=VARCHAR,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      contact = #{record.contact,jdbcType=VARCHAR},
+      contact_mobile = #{record.contactMobile,jdbcType=VARCHAR},
+      contact_post = #{record.contactPost,jdbcType=VARCHAR},
+      demand_province = #{record.demandProvince,jdbcType=VARCHAR},
+      demand_province_code = #{record.demandProvinceCode,jdbcType=VARCHAR},
+      demand_city = #{record.demandCity,jdbcType=VARCHAR},
+      demand_city_code = #{record.demandCityCode,jdbcType=VARCHAR},
+      province = #{record.province,jdbcType=VARCHAR},
+      province_code = #{record.provinceCode,jdbcType=VARCHAR},
+      city = #{record.city,jdbcType=VARCHAR},
+      city_code = #{record.cityCode,jdbcType=VARCHAR},
+      county = #{record.county,jdbcType=VARCHAR},
+      county_code = #{record.countyCode,jdbcType=VARCHAR},
+      address = #{record.address,jdbcType=VARCHAR},
+      work_way = #{record.workWay,jdbcType=VARCHAR},
+      work_category = #{record.workCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      work_style = #{record.workStyle,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      salary = #{record.salary,jdbcType=INTEGER},
+      commission = #{record.commission,jdbcType=INTEGER},
+      user_id = #{record.user_id,jdbcType=INTEGER},
       sort_order = #{record.sortOrder,jdbcType=INTEGER},
       goods = #{record.goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
       add_time = #{record.addTime,jdbcType=TIMESTAMP},
@@ -473,7 +715,27 @@
       subtitle = #{record.subtitle,jdbcType=VARCHAR},
       price = #{record.price,jdbcType=DECIMAL},
       read_count = #{record.readCount,jdbcType=VARCHAR},
-      pic_url = #{record.picUrl,jdbcType=VARCHAR},
+      pic_url = #{record.picUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      contact = #{record.contact,jdbcType=VARCHAR},
+      contact_mobile = #{record.contactMobile,jdbcType=VARCHAR},
+      contact_post = #{record.contactPost,jdbcType=VARCHAR},
+      demand_province = #{record.demandProvince,jdbcType=VARCHAR},
+      demand_province_code = #{record.demandProvinceCode,jdbcType=VARCHAR},
+      demand_city = #{record.demandCity,jdbcType=VARCHAR},
+      demand_city_code = #{record.demandCityCode,jdbcType=VARCHAR},
+      province = #{record.province,jdbcType=VARCHAR},
+      province_code = #{record.provinceCode,jdbcType=VARCHAR},
+      city = #{record.city,jdbcType=VARCHAR},
+      city_code = #{record.cityCode,jdbcType=VARCHAR},
+      county = #{record.county,jdbcType=VARCHAR},
+      county_code = #{record.countyCode,jdbcType=VARCHAR},
+      address = #{record.address,jdbcType=VARCHAR},
+      work_way = #{record.workWay,jdbcType=VARCHAR},
+      work_category = #{record.workCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      work_style = #{record.workStyle,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      salary = #{record.salary,jdbcType=INTEGER},
+      commission = #{record.commission,jdbcType=INTEGER},
+      user_id = #{record.userId,jdbcType=INTEGER},
       sort_order = #{record.sortOrder,jdbcType=INTEGER},
       goods = #{record.goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
       add_time = #{record.addTime,jdbcType=TIMESTAMP},
@@ -503,7 +765,67 @@
         read_count = #{readCount,jdbcType=VARCHAR},
       </if>
       <if test="picUrl != null">
-        pic_url = #{picUrl,jdbcType=VARCHAR},
+        pic_url = #{picUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
+      <if test="contact != null">
+        contact = #{contact,jdbcType=VARCHAR},
+      </if>
+      <if test="contactMobile != null">
+        contact_mobile = #{contactMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="contactPost != null">
+        contact_post = #{contactPost,jdbcType=VARCHAR},
+      </if>
+      <if test="demandProvince != null">
+        demand_province = #{demandProvince,jdbcType=VARCHAR},
+      </if>
+      <if test="demandProvinceCode != null">
+        demand_province_code = #{demandProvinceCode,jdbcType=VARCHAR},
+      </if>
+      <if test="demandCity != null">
+        demand_city = #{demandCity,jdbcType=VARCHAR},
+      </if>
+      <if test="demandCityCode != null">
+        demand_city_code = #{demandCityCode,jdbcType=VARCHAR},
+      </if>
+      <if test="province != null">
+        province = #{province,jdbcType=VARCHAR},
+      </if>
+      <if test="provinceCode != null">
+        province_code = #{provinceCode,jdbcType=VARCHAR},
+      </if>
+      <if test="city != null">
+        city = #{city,jdbcType=VARCHAR},
+      </if>
+      <if test="cityCode != null">
+        city_code = #{cityCode,jdbcType=VARCHAR},
+      </if>
+      <if test="county != null">
+        county = #{county,jdbcType=VARCHAR},
+      </if>
+      <if test="countyCode != null">
+        county_code = #{countyCode,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null">
+        address = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="workWay != null">
+        work_way = #{workWay,jdbcType=VARCHAR},
+      </if>
+      <if test="workCategory != null">
+        work_category = #{workCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
+      <if test="workStyle != null">
+        work_style = #{workStyle,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      </if>
+      <if test="salary != null">
+        salary = #{salary,jdbcType=INTEGER},
+      </if>
+      <if test="commission != null">
+        commission = #{commission,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=INTEGER},
       </if>
       <if test="sortOrder != null">
         sort_order = #{sortOrder,jdbcType=INTEGER},
@@ -536,7 +858,27 @@
       subtitle = #{subtitle,jdbcType=VARCHAR},
       price = #{price,jdbcType=DECIMAL},
       read_count = #{readCount,jdbcType=VARCHAR},
-      pic_url = #{picUrl,jdbcType=VARCHAR},
+      pic_url = #{picUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      contact = #{contact,jdbcType=VARCHAR},
+      contact_mobile = #{contactMobile,jdbcType=VARCHAR},
+      contact_post = #{contactPost,jdbcType=VARCHAR},
+      demand_province = #{demandProvince,jdbcType=VARCHAR},
+      demand_province_code = #{demandProvinceCode,jdbcType=VARCHAR},
+      demand_city = #{demandCity,jdbcType=VARCHAR},
+      demand_city_code = #{demandCityCode,jdbcType=VARCHAR},
+      province = #{province,jdbcType=VARCHAR},
+      province_code = #{provinceCode,jdbcType=VARCHAR},
+      city = #{city,jdbcType=VARCHAR},
+      city_code = #{cityCode,jdbcType=VARCHAR},
+      county = #{county,jdbcType=VARCHAR},
+      county_code = #{countyCode,jdbcType=VARCHAR},
+      address = #{address,jdbcType=VARCHAR},
+      work_way = #{workWay,jdbcType=VARCHAR},
+      work_category = #{workCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      work_style = #{workStyle,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      salary = #{salary,jdbcType=INTEGER},
+      commission = #{commission,jdbcType=INTEGER},
+      user_id = #{userId,jdbcType=INTEGER},
       sort_order = #{sortOrder,jdbcType=INTEGER},
       goods = #{goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
       add_time = #{addTime,jdbcType=TIMESTAMP},
@@ -555,7 +897,27 @@
       subtitle = #{subtitle,jdbcType=VARCHAR},
       price = #{price,jdbcType=DECIMAL},
       read_count = #{readCount,jdbcType=VARCHAR},
-      pic_url = #{picUrl,jdbcType=VARCHAR},
+      pic_url = #{picUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      contact = #{record.contact,jdbcType=VARCHAR},
+      contact_mobile = #{record.contactMobile,jdbcType=VARCHAR},
+      contact_post = #{record.contactPost,jdbcType=VARCHAR},
+      demand_province = #{demandProvince,jdbcType=VARCHAR},
+      demand_province_code = #{demandProvinceCode,jdbcType=VARCHAR},
+      demand_city = #{record.demandCity,jdbcType=VARCHAR},
+      demand_city_code = #{record.demandCityCode,jdbcType=VARCHAR},
+      province = #{record.province,jdbcType=VARCHAR},
+      province_code = #{record.provinceCode,jdbcType=VARCHAR},
+      city = #{record.city,jdbcType=VARCHAR},
+      city_code = #{record.cityCode,jdbcType=VARCHAR},
+      county = #{record.county,jdbcType=VARCHAR},
+      county_code = #{record.countyCode,jdbcType=VARCHAR},
+      address = #{address,jdbcType=VARCHAR},
+      work_way = #{workWay,jdbcType=VARCHAR},
+      work_category = #{workCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      work_style = #{workStyle,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      salary = #{salary,jdbcType=INTEGER},
+      commission = #{commission,jdbcType=INTEGER},
+      user_id = #{userId,jdbcType=INTEGER},
       sort_order = #{sortOrder,jdbcType=INTEGER},
       goods = #{goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
       add_time = #{addTime,jdbcType=TIMESTAMP},
diff --git a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserMapper.xml b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserMapper.xml
index 90c14fdd..01dde26b 100644
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserMapper.xml
@@ -9,6 +9,7 @@
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="username" jdbcType="VARCHAR" property="username" />
     <result column="password" jdbcType="VARCHAR" property="password" />
+    <result column="user_type" jdbcType="VARCHAR" property="userType" />
     <result column="gender" jdbcType="TINYINT" property="gender" />
     <result column="birthday" jdbcType="DATE" property="birthday" />
     <result column="last_login_time" jdbcType="TIMESTAMP" property="lastLoginTime" />
@@ -95,7 +96,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level, 
+    id, username, `password`, user_type, gender, birthday, last_login_time, last_login_ip, user_level,
     nickname, mobile, avatar, weixin_openid, session_key, `status`, add_time, update_time, 
     deleted
   </sql>
@@ -218,13 +219,13 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into litemall_user (username, `password`, gender, 
+    insert into litemall_user (username, `password`, user_type, gender,
       birthday, last_login_time, last_login_ip, 
       user_level, nickname, mobile, 
       avatar, weixin_openid, session_key, 
       `status`, add_time, update_time, 
       deleted)
-    values (#{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{gender,jdbcType=TINYINT}, 
+    values (#{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{userType,jdbcType=VARCHAR}, #{gender,jdbcType=TINYINT},
       #{birthday,jdbcType=DATE}, #{lastLoginTime,jdbcType=TIMESTAMP}, #{lastLoginIp,jdbcType=VARCHAR}, 
       #{userLevel,jdbcType=TINYINT}, #{nickname,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, 
       #{avatar,jdbcType=VARCHAR}, #{weixinOpenid,jdbcType=VARCHAR}, #{sessionKey,jdbcType=VARCHAR}, 
@@ -247,6 +248,9 @@
       <if test="password != null">
         `password`,
       </if>
+      <if test="userType != null">
+        `user_type`,
+      </if>
       <if test="gender != null">
         gender,
       </if>
@@ -297,6 +301,9 @@
       <if test="password != null">
         #{password,jdbcType=VARCHAR},
       </if>
+      <if test="userType != null">
+        #{userType,jdbcType=VARCHAR},
+      </if>
       <if test="gender != null">
         #{gender,jdbcType=TINYINT},
       </if>
@@ -487,6 +494,9 @@
       <if test="status != null">
         `status` = #{status,jdbcType=TINYINT},
       </if>
+      <if test="userType != null">
+        `user_type` = #{userType,jdbcType=VARCHAR},
+      </if>
       <if test="addTime != null">
         add_time = #{addTime,jdbcType=TIMESTAMP},
       </if>
@@ -564,21 +574,15 @@
     </if>
     limit 1
   </select>
+
   <update id="logicalDeleteByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     update litemall_user set deleted = 1
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
+
   <update id="logicalDeleteByPrimaryKey" parameterType="java.lang.Integer">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     update litemall_user set deleted = 1
     where id = #{id,jdbcType=INTEGER}
   </update>
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/GoodsAllinone.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/GoodsAllinone.java
new file mode 100644
index 00000000..4641e1a4
--- /dev/null
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/GoodsAllinone.java
@@ -0,0 +1,46 @@
+package org.linlinjava.litemall.wx.dto;
+
+import org.linlinjava.litemall.db.domain.LitemallGoods;
+import org.linlinjava.litemall.db.domain.LitemallGoodsAttribute;
+import org.linlinjava.litemall.db.domain.LitemallGoodsProduct;
+import org.linlinjava.litemall.db.domain.LitemallGoodsSpecification;
+
+public class GoodsAllinone {
+    LitemallGoods goods;
+    LitemallGoodsSpecification[] specifications;
+    LitemallGoodsAttribute[] attributes;
+    LitemallGoodsProduct[] products;
+
+    public LitemallGoods getGoods() {
+        return goods;
+    }
+
+    public void setGoods(LitemallGoods goods) {
+        this.goods = goods;
+    }
+
+    public LitemallGoodsProduct[] getProducts() {
+        return products;
+    }
+
+    public void setProducts(LitemallGoodsProduct[] products) {
+        this.products = products;
+    }
+
+    public LitemallGoodsSpecification[] getSpecifications() {
+        return specifications;
+    }
+
+    public void setSpecifications(LitemallGoodsSpecification[] specifications) {
+        this.specifications = specifications;
+    }
+
+    public LitemallGoodsAttribute[] getAttributes() {
+        return attributes;
+    }
+
+    public void setAttributes(LitemallGoodsAttribute[] attributes) {
+        this.attributes = attributes;
+    }
+
+}
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/UserInfo.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/UserInfo.java
index 6b934999..9d777a9c 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/UserInfo.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/UserInfo.java
@@ -1,5 +1,7 @@
 package org.linlinjava.litemall.wx.dto;
 
+import org.linlinjava.litemall.db.enums.UserType;
+
 public class UserInfo {
     private String nickName;
     private String avatarUrl;
@@ -8,6 +10,7 @@ public class UserInfo {
     private String city;
     private String language;
     private Byte gender;
+    private UserType userType;
 
     public String getCountry() {
         return country;
@@ -64,4 +67,12 @@ public class UserInfo {
     public void setAvatarUrl(String avatarUrl) {
         this.avatarUrl = avatarUrl;
     }
+
+    public UserType getUserType() {
+        return userType;
+    }
+
+    public void setUserType(UserType userType) {
+        this.userType = userType;
+    }
 }
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxGoodsService.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxGoodsService.java
new file mode 100644
index 00000000..97e791d8
--- /dev/null
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxGoodsService.java
@@ -0,0 +1,327 @@
+package org.linlinjava.litemall.wx.service;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.linlinjava.litemall.core.qcode.QCodeService;
+import org.linlinjava.litemall.core.util.ResponseUtil;
+import org.linlinjava.litemall.db.domain.*;
+import org.linlinjava.litemall.db.service.*;
+import org.linlinjava.litemall.wx.dto.GoodsAllinone;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.sql.Array;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+@Service
+public class WxGoodsService {
+    private final Log logger = LogFactory.getLog(WxGoodsService.class);
+
+    @Autowired
+    private LitemallGoodsService goodsService;
+    @Autowired
+    private LitemallGoodsSpecificationService specificationService;
+    @Autowired
+    private LitemallGoodsAttributeService attributeService;
+    @Autowired
+    private LitemallGoodsProductService productService;
+    @Autowired
+    private LitemallCategoryService categoryService;
+    @Autowired
+    private LitemallBrandService brandService;
+    @Autowired
+    private LitemallCartService cartService;
+    @Autowired
+    private QCodeService qCodeService;
+
+    public Object list(Integer goodsId, String goodsSn, String name,
+                       Integer page, Integer limit, String sort, String order) {
+        List<LitemallGoods> goodsList = goodsService.querySelective(goodsId, goodsSn, name, page, limit, sort, order);
+        return ResponseUtil.okList(goodsList);
+    }
+
+    private Object validate(LitemallGoods goods) {
+        String name = goods.getName();
+        if (StringUtils.isEmpty(name)) {
+            return ResponseUtil.badArgument();
+        }
+        String goodsSn = goods.getGoodsSn();
+        if (StringUtils.isEmpty(goodsSn)) {
+            goods.setGoodsSn(UUID.randomUUID().toString());
+        }
+        // 品牌商可以不设置，如果设置则需要验证品牌商存在
+        Integer brandId = goods.getBrandId();
+        if (brandId != null && brandId != 0) {
+            if (brandService.findById(brandId) == null) {
+                return ResponseUtil.badArgumentValue();
+            }
+        }
+        // 分类可以不设置，如果设置则需要验证分类存在
+        Integer categoryId = goods.getCategoryId();
+        if (categoryId != null && categoryId != 0) {
+            if (categoryService.findById(categoryId) == null) {
+                return ResponseUtil.badArgumentValue();
+            }
+        }
+
+//        LitemallGoodsAttribute[] attributes = goodsAllinone.getAttributes();
+//        for (LitemallGoodsAttribute attribute : attributes) {
+//            String attr = attribute.getAttribute();
+//            if (StringUtils.isEmpty(attr)) {
+//                return ResponseUtil.badArgument();
+//            }
+//            String value = attribute.getValue();
+//            if (StringUtils.isEmpty(value)) {
+//                return ResponseUtil.badArgument();
+//            }
+//        }
+//
+//        LitemallGoodsSpecification[] specifications = goodsAllinone.getSpecifications();
+//        for (LitemallGoodsSpecification specification : specifications) {
+//            String spec = specification.getSpecification();
+//            if (StringUtils.isEmpty(spec)) {
+//                return ResponseUtil.badArgument();
+//            }
+//            String value = specification.getValue();
+//            if (StringUtils.isEmpty(value)) {
+//                return ResponseUtil.badArgument();
+//            }
+//        }
+//
+//        LitemallGoodsProduct[] products = goodsAllinone.getProducts();
+//        for (LitemallGoodsProduct product : products) {
+//            Integer number = product.getNumber();
+//            if (number == null || number < 0) {
+//                return ResponseUtil.badArgument();
+//            }
+//
+//            BigDecimal price = product.getPrice();
+//            if (price == null) {
+//                return ResponseUtil.badArgument();
+//            }
+//
+//            String[] productSpecifications = product.getSpecifications();
+//            if (productSpecifications.length == 0) {
+//                return ResponseUtil.badArgument();
+//            }
+//        }
+
+        return null;
+    }
+
+    /**
+     * 编辑商品
+     *
+     * NOTE：
+     * 由于商品涉及到四个表，特别是litemall_goods_product表依赖litemall_goods_specification表，
+     * 这导致允许所有字段都是可编辑会带来一些问题，因此这里商品编辑功能是受限制：
+     * （1）litemall_goods表可以编辑字段；
+     * （2）litemall_goods_specification表只能编辑pic_url字段，其他操作不支持；
+     * （3）litemall_goods_product表只能编辑price, number和url字段，其他操作不支持；
+     * （4）litemall_goods_attribute表支持编辑、添加和删除操作。
+     *
+     * NOTE2:
+     * 前后端这里使用了一个小技巧：
+     * 如果前端传来的update_time字段是空，则说明前端已经更新了某个记录，则这个记录会更新；
+     * 否则说明这个记录没有编辑过，无需更新该记录。
+     *
+     * NOTE3:
+     * （1）购物车缓存了一些商品信息，因此需要及时更新。
+     * 目前这些字段是goods_sn, goods_name, price, pic_url。
+     * （2）但是订单里面的商品信息则是不会更新。
+     * 如果订单是未支付订单，此时仍然以旧的价格支付。
+     */
+    @Transactional
+    public Object update(LitemallGoods goods) {
+        Object error = validate(goods);
+        if (error != null) {
+            return error;
+        }
+
+        //将生成的分享图片地址写入数据库
+        String url = qCodeService.createGoodShareImage(goods.getId().toString(), goods.getPicUrl(), goods.getName());
+        goods.setShareUrl(url);
+
+//        // 商品表里面有一个字段retailPrice记录当前商品的最低价
+//        BigDecimal retailPrice = new BigDecimal(Integer.MAX_VALUE);
+//        for (LitemallGoodsProduct product : products) {
+//            BigDecimal productPrice = product.getPrice();
+//            if(retailPrice.compareTo(productPrice) == 1){
+//                retailPrice = productPrice;
+//            }
+//        }
+//        goods.setRetailPrice(retailPrice);
+        
+        // 商品基本信息表litemall_goods
+        if (goodsService.updateById(goods) == 0) {
+            throw new RuntimeException("更新数据失败");
+        }
+
+        Integer gid = goods.getId();
+
+        // 商品规格表litemall_goods_specification
+//        for (LitemallGoodsSpecification specification : specifications) {
+//            // 目前只支持更新规格表的图片字段
+//            if(specification.getUpdateTime() == null){
+//                specification.setSpecification(null);
+//                specification.setValue(null);
+//                specificationService.updateById(specification);
+//            }
+//        }
+//
+//        // 商品货品表litemall_product
+//        for (LitemallGoodsProduct product : products) {
+//            if(product.getUpdateTime() == null) {
+//                productService.updateById(product);
+//            }
+//        }
+//
+//        // 商品参数表litemall_goods_attribute
+//        for (LitemallGoodsAttribute attribute : attributes) {
+//            if (attribute.getId() == null || attribute.getId().equals(0)){
+//                attribute.setGoodsId(goods.getId());
+//                attributeService.add(attribute);
+//            }
+//            else if(attribute.getDeleted()){
+//                attributeService.deleteById(attribute.getId());
+//            }
+//            else if(attribute.getUpdateTime() == null){
+//                attributeService.updateById(attribute);
+//            }
+//        }
+
+        // 这里需要注意的是购物车litemall_cart有些字段是拷贝商品的一些字段，因此需要及时更新
+        // 目前这些字段是goods_sn, goods_name, price, pic_url
+//        for (LitemallGoodsProduct product : products) {
+//            cartService.updateProduct(product.getId(), goods.getGoodsSn(), goods.getName(), product.getPrice(), product.getUrl());
+//        }
+
+        return ResponseUtil.ok();
+    }
+
+    @Transactional
+    public Object create(LitemallGoods goods) {
+        Object error = validate(goods);
+        if (error != null) {
+            return error;
+        }
+
+        String name = goods.getName();
+//        if (goodsService.checkExistByName(name)) {
+//            return ResponseUtil.fail(611, "商品名已经存在");
+//        }
+
+        // 商品表里面有一个字段retailPrice记录当前商品的最低价
+//        BigDecimal retailPrice = new BigDecimal(Integer.MAX_VALUE);
+//        for (LitemallGoodsProduct product : products) {
+//            BigDecimal productPrice = product.getPrice();
+//            if(retailPrice.compareTo(productPrice) == 1){
+//                retailPrice = productPrice;
+//            }
+//        }
+//        goods.setRetailPrice(retailPrice);
+
+        // 商品基本信息表litemall_goods
+        goodsService.add(goods);
+
+        //将生成的分享图片地址写入数据库
+        String url = qCodeService.createGoodShareImage(goods.getId().toString(), goods.getPicUrl(), goods.getName());
+        if (!StringUtils.isEmpty(url)) {
+            goods.setShareUrl(url);
+            if (goodsService.updateById(goods) == 0) {
+                throw new RuntimeException("更新数据失败");
+            }
+        }
+
+        // 商品规格表litemall_goods_specification
+//        for (LitemallGoodsSpecification specification : specifications) {
+//            specification.setGoodsId(goods.getId());
+//            specificationService.add(specification);
+//        }
+//
+//        // 商品参数表litemall_goods_attribute
+//        for (LitemallGoodsAttribute attribute : attributes) {
+//            attribute.setGoodsId(goods.getId());
+//            attributeService.add(attribute);
+//        }
+//
+//        // 商品货品表litemall_product
+//        for (LitemallGoodsProduct product : products) {
+//            product.setGoodsId(goods.getId());
+//            productService.add(product);
+//        }
+        return ResponseUtil.ok();
+    }
+//
+//    public Object list2() {
+//        // http://element-cn.eleme.io/#/zh-CN/component/cascader
+//        // 管理员设置“所属分类”
+//        List<LitemallCategory> l1CatList = categoryService.queryL1();
+//        List<CatVo> categoryList = new ArrayList<>(l1CatList.size());
+//
+//        for (LitemallCategory l1 : l1CatList) {
+//            CatVo l1CatVo = new CatVo();
+//            l1CatVo.setValue(l1.getId());
+//            l1CatVo.setLabel(l1.getName());
+//
+//            List<LitemallCategory> l2CatList = categoryService.queryByPid(l1.getId());
+//            List<CatVo> children = new ArrayList<>(l2CatList.size());
+//            for (LitemallCategory l2 : l2CatList) {
+//                CatVo l2CatVo = new CatVo();
+//                l2CatVo.setValue(l2.getId());
+//                l2CatVo.setLabel(l2.getName());
+//                children.add(l2CatVo);
+//            }
+//            l1CatVo.setChildren(children);
+//
+//            categoryList.add(l1CatVo);
+//        }
+//
+//        // http://element-cn.eleme.io/#/zh-CN/component/select
+//        // 管理员设置“所属品牌商”
+//        List<LitemallBrand> list = brandService.all();
+//        List<Map<String, Object>> brandList = new ArrayList<>(l1CatList.size());
+//        for (LitemallBrand brand : list) {
+//            Map<String, Object> b = new HashMap<>(2);
+//            b.put("value", brand.getId());
+//            b.put("label", brand.getName());
+//            brandList.add(b);
+//        }
+//
+//        Map<String, Object> data = new HashMap<>();
+//        data.put("categoryList", categoryList);
+//        data.put("brandList", brandList);
+//        return ResponseUtil.ok(data);
+//    }
+
+    public Object detail(Integer id) {
+        LitemallGoods goods = goodsService.findById(id);
+        List<LitemallGoodsProduct> products = productService.queryByGid(id);
+        List<LitemallGoodsSpecification> specifications = specificationService.queryByGid(id);
+        List<LitemallGoodsAttribute> attributes = attributeService.queryByGid(id);
+
+        Integer categoryId = goods.getCategoryId();
+        LitemallCategory category = categoryService.findById(categoryId);
+        Integer[] categoryIds = new Integer[]{};
+        if (category != null) {
+            Integer parentCategoryId = category.getPid();
+            categoryIds = new Integer[]{parentCategoryId, categoryId};
+        }
+
+        Map<String, Object> data = new HashMap<>();
+        data.put("goods", goods);
+        data.put("specifications", specifications);
+        data.put("products", products);
+        data.put("attributes", attributes);
+        data.put("categoryIds", categoryIds);
+
+        return ResponseUtil.ok(data);
+    }
+
+}
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java
index 93a8a730..9db7a3b1 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java
@@ -7,21 +7,16 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.core.notify.NotifyService;
 import org.linlinjava.litemall.core.notify.NotifyType;
-import org.linlinjava.litemall.core.util.CharUtil;
-import org.linlinjava.litemall.core.util.JacksonUtil;
-import org.linlinjava.litemall.core.util.RegexUtil;
-import org.linlinjava.litemall.core.util.ResponseUtil;
+import org.linlinjava.litemall.core.util.*;
 import org.linlinjava.litemall.core.util.bcrypt.BCryptPasswordEncoder;
 import org.linlinjava.litemall.db.domain.LitemallUser;
 import org.linlinjava.litemall.db.service.CouponAssignService;
 import org.linlinjava.litemall.db.service.LitemallUserService;
 import org.linlinjava.litemall.wx.annotation.LoginUser;
 import org.linlinjava.litemall.wx.dto.UserInfo;
-import org.linlinjava.litemall.wx.dto.UserToken;
 import org.linlinjava.litemall.wx.dto.WxLoginInfo;
 import org.linlinjava.litemall.wx.service.CaptchaCodeManager;
 import org.linlinjava.litemall.wx.service.UserTokenManager;
-import org.linlinjava.litemall.core.util.IpUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
@@ -146,6 +141,7 @@ public class WxAuthController {
             user.setNickname(userInfo.getNickName());
             user.setGender(userInfo.getGender());
             user.setUserLevel((byte) 0);
+            user.setUserType(userInfo.getUserType());
             user.setStatus((byte) 0);
             user.setLastLoginTime(LocalDateTime.now());
             user.setLastLoginIp(IpUtil.getIpAddr(request));
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxDictController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxDictController.java
new file mode 100644
index 00000000..1ca90664
--- /dev/null
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxDictController.java
@@ -0,0 +1,68 @@
+package org.linlinjava.litemall.wx.web;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.linlinjava.litemall.core.util.RegexUtil;
+import org.linlinjava.litemall.core.util.ResponseUtil;
+import org.linlinjava.litemall.db.domain.*;
+import org.linlinjava.litemall.db.service.LitemallDictService;
+import org.linlinjava.litemall.db.service.LitemallFeedbackService;
+import org.linlinjava.litemall.db.service.LitemallUserService;
+import org.linlinjava.litemall.wx.annotation.LoginUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 意见反馈服务
+ *
+ * @author Yogeek
+ * @date 2018/8/25 14:10
+ */
+@RestController
+@RequestMapping("/wx/dict")
+@Validated
+public class WxDictController {
+    private final Log logger = LogFactory.getLog(WxDictController.class);
+
+    @Autowired
+    private LitemallDictService dictService;
+
+    /**
+     * 根据类别查询，返回字典列表
+     *
+     * @param dict
+     * @return 操作结果
+     */
+    @PostMapping("getByCategory")
+    public Object findByCategory(@LoginUser Integer userId,@RequestBody LitemallDict dict) {
+        if (userId == null) {
+            return ResponseUtil.unlogin();
+        }
+
+        String category = dict.getCategory();
+        if (StringUtils.isEmpty(category) && dict.getCategoryList() == null) {
+            return ResponseUtil.badArgument();
+        }
+
+
+        LitemallDictExample.Criteria criteria = new LitemallDictExample().createCriteria();
+
+        if (dict.getCategory() != null) {
+            criteria.andCategoryEqualTo(dict.getCategory());
+        }
+
+        if (dict.getCategoryList() != null && !dict.getCategoryList().isEmpty()) {
+            criteria.andCategoryIn(dict.getCategoryList());
+        }
+
+        LitemallDictExample litemallDictExample = criteria.example();
+
+        List<LitemallDict> dictList = dictService.querySelective(litemallDictExample);
+        return ResponseUtil.okList(dictList);
+    }
+
+}
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
index ae53efa5..3b3d45e0 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
@@ -10,13 +10,12 @@ import org.linlinjava.litemall.core.validator.Sort;
 import org.linlinjava.litemall.db.domain.*;
 import org.linlinjava.litemall.db.service.*;
 import org.linlinjava.litemall.wx.annotation.LoginUser;
+import org.linlinjava.litemall.wx.dto.GoodsAllinone;
+import org.linlinjava.litemall.wx.service.WxGoodsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
@@ -73,12 +72,28 @@ public class WxGoodsController {
 	@Autowired
 	private LitemallGrouponRulesService rulesService;
 
+	@Autowired
+	private WxGoodsService wxGoodsService;
+
 	private final static ArrayBlockingQueue<Runnable> WORK_QUEUE = new ArrayBlockingQueue<>(9);
 
 	private final static RejectedExecutionHandler HANDLER = new ThreadPoolExecutor.CallerRunsPolicy();
 
 	private static ThreadPoolExecutor executorService = new ThreadPoolExecutor(16, 16, 1000, TimeUnit.MILLISECONDS, WORK_QUEUE, HANDLER);
 
+	/**
+	 * 主播信息
+	 *
+	 * @param userId 用户ID
+	 * @return 主播信息
+	 */
+	@GetMapping("info")
+	public Object info(@LoginUser Integer userId) {
+		// 商品信息
+		LitemallGoods info = goodsService.findbyUserId(userId);
+		return ResponseUtil.ok(info);
+	}
+
 	/**
 	 * 商品详情
 	 * <p>
@@ -227,6 +242,29 @@ public class WxGoodsController {
 		return ResponseUtil.ok(data);
 	}
 
+	/**
+	 * 编辑商品
+	 *
+	 * @param goods
+	 * @return
+	 */
+	@PostMapping("/update")
+	public Object update(@RequestBody LitemallGoods goods) {
+		return wxGoodsService.update(goods);
+	}
+
+	/**
+	 * 添加商品
+	 *
+	 * @param goods
+	 * @return
+	 */
+	@PostMapping("/create")
+	public Object create(@LoginUser Integer userId, @RequestBody  LitemallGoods goods) {
+		goods.setUserId(userId);
+		return wxGoodsService.create(goods);
+	}
+
 	/**
 	 * 根据条件搜素商品
 	 * <p>
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxStorageController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxStorageController.java
index 7d87ad06..bc2ebe80 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxStorageController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxStorageController.java
@@ -57,6 +57,13 @@ public class WxStorageController {
         return ResponseUtil.ok(litemallStorage);
     }
 
+    @PostMapping(value = "/uploadVideo")
+    public Object uploadVideo(@RequestParam("file") MultipartFile file) throws IOException {
+        String originalFilename = file.getOriginalFilename();
+        LitemallStorage litemallStorage = storageService.store(file.getInputStream(), file.getSize(), file.getContentType(), originalFilename);
+        return ResponseUtil.ok(litemallStorage);
+    }
+
     /**
      * 访问存储对象
      *
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java
index c009e1be..0622b70f 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java
@@ -12,13 +12,13 @@ import org.linlinjava.litemall.db.service.LitemallGoodsService;
 import org.linlinjava.litemall.db.service.LitemallTopicService;
 import org.linlinjava.litemall.wx.annotation.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -66,12 +66,14 @@ public class WxTopicController {
     public Object detail(@LoginUser Integer userId, @NotNull Integer id) {
         LitemallTopic topic = topicService.findById(id);
         List<LitemallGoods> goods = new ArrayList<>();
-        for (Integer i : topic.getGoods()) {
-            LitemallGoods good = goodsService.findByIdVO(i);
-            if (null != good)
-                goods.add(good);
+        if (topic != null && topic.getGoods() != null && topic.getGoods().length > 0) {
+            for (Integer i : topic.getGoods()) {
+                LitemallGoods good = goodsService.findByIdVO(i);
+                if (null != good)
+                    goods.add(good);
+            }
         }
-        
+
 		// 用户收藏
 		int userHasCollect = 0;
 		if (userId != null) {
@@ -96,4 +98,51 @@ public class WxTopicController {
         List<LitemallTopic> topicRelatedList = topicService.queryRelatedList(id, 0, 4);
         return ResponseUtil.okList(topicRelatedList);
     }
+
+    private Object validate(LitemallTopic topic) {
+        String title = topic.getTitle();
+        if (StringUtils.isEmpty(title)) {
+            return ResponseUtil.badArgument();
+        }
+        return null;
+    }
+
+    @PostMapping("/create")
+    public Object create(@LoginUser Integer userId, @RequestBody LitemallTopic topic) {
+        topic.setUserId(userId);
+        Object error = validate(topic);
+        if (error != null) {
+            return error;
+        }
+        topicService.add(topic);
+        return ResponseUtil.ok(topic);
+    }
+
+    @GetMapping("/info")
+    public Object read(@LoginUser Integer userId) {
+        LitemallTopic topic = topicService.findByUserId(userId);
+        Integer[] goodsIds = topic.getGoods();
+        List<LitemallGoods> goodsList = null;
+        if (goodsIds == null || goodsIds.length == 0) {
+            goodsList = new ArrayList<>();
+        } else {
+            goodsList = goodsService.queryByIds(goodsIds);
+        }
+        Map<String, Object> data = new HashMap<>(2);
+        data.put("topic", topic);
+        data.put("goodsList", goodsList);
+        return ResponseUtil.ok(data);
+    }
+
+    @PostMapping("/update")
+    public Object update(@RequestBody LitemallTopic topic) {
+        Object error = validate(topic);
+        if (error != null) {
+            return error;
+        }
+        if (topicService.updateById(topic) == 0) {
+            return ResponseUtil.updatedDataFailed();
+        }
+        return ResponseUtil.ok(topic);
+    }
 }
\ No newline at end of file
diff --git a/litemall-wx/config/api.js b/litemall-wx/config/api.js
index 3d9ebbfc..7092078e 100644
--- a/litemall-wx/config/api.js
+++ b/litemall-wx/config/api.js
@@ -1,6 +1,7 @@
 // 以下是业务服务器API地址
 // 本机开发时使用
-var WxApiRoot = 'http://localhost:8080/wx/';
+// var WxApiRoot = 'http://kaneee.natappfree.cc/wx/';
+var WxApiRoot = 'https://www.czyinfo.cn//wx/';
 // 局域网测试使用
 // var WxApiRoot = 'http://192.168.1.3:8080/wx/';
 // 云平台部署时使用
diff --git a/litemall-wx/pages/auth/login/login.js b/litemall-wx/pages/auth/login/login.js
index d89aff6c..9fff27c1 100644
--- a/litemall-wx/pages/auth/login/login.js
+++ b/litemall-wx/pages/auth/login/login.js
@@ -35,7 +35,7 @@ Page({
       wx.getUserProfile({
         desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
         success: (res) => {
-          this.doLogin(res.userInfo)
+          this.doLogin({...res.userInfo, ...{userType:'ZB_EMP'}})
         },
         fail: () => {
           util.showErrorToast('微信登录失败');
@@ -48,7 +48,7 @@ Page({
         util.showErrorToast('微信登录失败');
         return;
       }
-      this.doLogin(e.detail.userInfo)
+      this.doLogin({...e.detail.userInfo, ...{userType:'ZB_EMP'}})
     }
   },
   doLogin: function(userInfo) {
diff --git a/litemall-wx/project.config.json b/litemall-wx/project.config.json
index 0a6c5e06..62140918 100644
--- a/litemall-wx/project.config.json
+++ b/litemall-wx/project.config.json
@@ -1,327 +1,331 @@
 {
-  "description": "项目配置文件。",
-  "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "postcss": true,
-    "minified": true,
-    "newFeature": true,
-    "coverView": true,
-    "nodeModules": true,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": true,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
+    "description": "项目配置文件。",
+    "setting": {
+        "urlCheck": false,
+        "es6": true,
+        "enhance": true,
+        "postcss": true,
+        "preloadBackgroundData": false,
+        "minified": true,
+        "newFeature": true,
+        "coverView": true,
+        "nodeModules": true,
+        "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "scopeDataCheck": false,
+        "uglifyFileName": true,
+        "checkInvalidKey": true,
+        "checkSiteMap": true,
+        "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": true,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        },
+        "enableEngineNative": false,
+        "useIsolateContext": true,
+        "userConfirmedBundleSwitch": false,
+        "packNpmManually": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true,
+        "disableUseStrict": false,
+        "minifyWXML": true,
+        "showES6CompileOption": false,
+        "useCompilerPlugins": false
     },
-    "useIsolateContext": true,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "disableUseStrict": false,
-    "minifyWXML": true,
-    "showES6CompileOption": false,
-    "useCompilerPlugins": false,
-    "ignoreUploadUnusedFiles": true
-  },
-  "compileType": "miniprogram",
-  "libVersion": "2.4.0",
-  "appid": "wxa5b486c6b918ecfb",
-  "projectname": "litemall-wx",
-  "simulatorType": "wechat",
-  "simulatorPluginLibVersion": {},
-  "condition": {
-    "search": {
-      "list": []
-    },
-    "conversation": {
-      "list": []
-    },
-    "plugin": {
-      "list": []
-    },
-    "game": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
-    "miniprogram": {
-      "list": [
-        {
-          "id": -1,
-          "name": "首页",
-          "pathName": "pages/index/index",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "专题",
-          "pathName": "pages/topic/topic",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "专题详情",
-          "pathName": "pages/topicDetail/topicDetail",
-          "query": "id=314"
-        },
-        {
-          "id": -1,
-          "name": "专题评论列表",
-          "pathName": "pages/topicComment/topicComment",
-          "query": "valueId=314&type=1"
-        },
-        {
-          "id": -1,
-          "name": "专题评论添加",
-          "pathName": "pages/topicCommentPost/topicCommentPost",
-          "query": "valueId=314&type=1"
-        },
-        {
-          "id": -1,
-          "name": "品牌",
-          "pathName": "pages/brand/brand",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "品牌详情",
-          "pathName": "pages/brandDetail/brandDetail",
-          "query": "id=1001000"
-        },
-        {
-          "id": -1,
-          "name": "人气推荐",
-          "pathName": "pages/hotGoods/hotGoods",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "新品首发",
-          "pathName": "pages/newGoods/newGoods",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "分类",
-          "pathName": "pages/catalog/catalog",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "分类详情",
-          "pathName": "pages/category/category",
-          "query": "id=1008002"
-        },
-        {
-          "id": -1,
-          "name": "查找",
-          "pathName": "pages/search/search",
-          "query": ""
-        },
-        {
-          "id": 12,
-          "name": "商品",
-          "pathName": "pages/goods/goods",
-          "query": "id=1181003"
-        },
-        {
-          "id": -1,
-          "name": "商品评论列表",
-          "pathName": "pages/comment/comment",
-          "query": "valueId=1181000&type=0"
-        },
-        {
-          "id": -1,
-          "name": "购物车",
-          "pathName": "pages/cart/cart",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "下单",
-          "pathName": "pages/checkout/checkout",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "支付结果",
-          "pathName": "pages/payResult/payResult",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "我的",
-          "pathName": "pages/ucenter/index/index",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "我的订单列表",
-          "pathName": "pages/ucenter/order/order",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "我的订单详情",
-          "pathName": "pages/ucenter/orderDetail/orderDetail",
-          "query": "id=1"
-        },
-        {
-          "id": 22,
-          "name": "待评价的订单详情",
-          "pathName": "pages/ucenter/orderDetail/orderDetail",
-          "query": "id=1"
-        },
-        {
-          "id": -1,
-          "name": "购买商品评价",
-          "pathName": "pages/commentPost/commentPost",
-          "query": "orderId=2&type=0&valueId=1116011"
-        },
-        {
-          "id": 22,
-          "name": "我的优惠券",
-          "pathName": "pages/ucenter/couponList/couponList",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "我的收藏",
-          "pathName": "pages/ucenter/collect/collect",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "我的足迹",
-          "pathName": "pages/ucenter/footprint/footprint",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "我的地址",
-          "pathName": "pages/ucenter/address/address",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "我的地址添加",
-          "pathName": "pages/ucenter/addressAdd/addressAdd",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "登录",
-          "pathName": "pages/auth/login/login",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "账号登录",
-          "pathName": "pages/auth/accountLogin/accountLogin",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "注册",
-          "pathName": "pages/auth/register/register",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "找回密码",
-          "pathName": "pages/auth/reset/reset",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "关于",
-          "pathName": "pages/about/about",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "测试更新",
-          "pathName": "pages/index/index",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "意见反馈",
-          "pathName": "pages/ucenter/feedback/feedback",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "团购专区",
-          "pathName": "pages/groupon/grouponList/grouponList",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "选择优惠券",
-          "pathName": "pages/ucenter/couponSelect/couponSelect",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "我的优惠券列表",
-          "pathName": "pages/ucenter/couponList/couponList",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "优惠券列表",
-          "pathName": "pages/coupon/coupon",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "帮助中心",
-          "pathName": "pages/help/help",
-          "query": "",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "我的团购",
-          "pathName": "pages/groupon/myGroupon/myGroupon",
-          "query": "",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "申请售后",
-          "pathName": "pages/ucenter/aftersale/aftersale",
-          "query": "id=2",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "售后列表",
-          "pathName": "pages/ucenter/aftersaleList/aftersaleList",
-          "query": "",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "售后详情",
-          "pathName": "pages/ucenter/aftersaleDetail/aftersaleDetail",
-          "query": "id=1",
-          "scene": null
+    "compileType": "miniprogram",
+    "libVersion": "2.4.0",
+    "appid": "wxa0e9fb31b14297e2",
+    "projectname": "litemall-wx",
+    "simulatorType": "wechat",
+    "simulatorPluginLibVersion": {},
+    "condition": {
+        "search": {
+            "list": []
+        },
+        "conversation": {
+            "list": []
+        },
+        "plugin": {
+            "list": []
+        },
+        "game": {
+            "list": []
+        },
+        "gamePlugin": {
+            "list": []
+        },
+        "miniprogram": {
+            "list": [
+                {
+                    "id": -1,
+                    "name": "首页",
+                    "pathName": "pages/index/index",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "专题",
+                    "pathName": "pages/topic/topic",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "专题详情",
+                    "pathName": "pages/topicDetail/topicDetail",
+                    "query": "id=314"
+                },
+                {
+                    "id": -1,
+                    "name": "专题评论列表",
+                    "pathName": "pages/topicComment/topicComment",
+                    "query": "valueId=314&type=1"
+                },
+                {
+                    "id": -1,
+                    "name": "专题评论添加",
+                    "pathName": "pages/topicCommentPost/topicCommentPost",
+                    "query": "valueId=314&type=1"
+                },
+                {
+                    "id": -1,
+                    "name": "品牌",
+                    "pathName": "pages/brand/brand",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "品牌详情",
+                    "pathName": "pages/brandDetail/brandDetail",
+                    "query": "id=1001000"
+                },
+                {
+                    "id": -1,
+                    "name": "人气推荐",
+                    "pathName": "pages/hotGoods/hotGoods",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "新品首发",
+                    "pathName": "pages/newGoods/newGoods",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "分类",
+                    "pathName": "pages/catalog/catalog",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "分类详情",
+                    "pathName": "pages/category/category",
+                    "query": "id=1008002"
+                },
+                {
+                    "id": -1,
+                    "name": "查找",
+                    "pathName": "pages/search/search",
+                    "query": ""
+                },
+                {
+                    "id": 12,
+                    "name": "商品",
+                    "pathName": "pages/goods/goods",
+                    "query": "id=1181003"
+                },
+                {
+                    "id": -1,
+                    "name": "商品评论列表",
+                    "pathName": "pages/comment/comment",
+                    "query": "valueId=1181000&type=0"
+                },
+                {
+                    "id": -1,
+                    "name": "购物车",
+                    "pathName": "pages/cart/cart",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "下单",
+                    "pathName": "pages/checkout/checkout",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "支付结果",
+                    "pathName": "pages/payResult/payResult",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "我的",
+                    "pathName": "pages/ucenter/index/index",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "我的订单列表",
+                    "pathName": "pages/ucenter/order/order",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "我的订单详情",
+                    "pathName": "pages/ucenter/orderDetail/orderDetail",
+                    "query": "id=1"
+                },
+                {
+                    "id": 22,
+                    "name": "待评价的订单详情",
+                    "pathName": "pages/ucenter/orderDetail/orderDetail",
+                    "query": "id=1"
+                },
+                {
+                    "id": -1,
+                    "name": "购买商品评价",
+                    "pathName": "pages/commentPost/commentPost",
+                    "query": "orderId=2&type=0&valueId=1116011"
+                },
+                {
+                    "id": 22,
+                    "name": "我的优惠券",
+                    "pathName": "pages/ucenter/couponList/couponList",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "我的收藏",
+                    "pathName": "pages/ucenter/collect/collect",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "我的足迹",
+                    "pathName": "pages/ucenter/footprint/footprint",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "我的地址",
+                    "pathName": "pages/ucenter/address/address",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "我的地址添加",
+                    "pathName": "pages/ucenter/addressAdd/addressAdd",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "登录",
+                    "pathName": "pages/auth/login/login",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "账号登录",
+                    "pathName": "pages/auth/accountLogin/accountLogin",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "注册",
+                    "pathName": "pages/auth/register/register",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "找回密码",
+                    "pathName": "pages/auth/reset/reset",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "关于",
+                    "pathName": "pages/about/about",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "测试更新",
+                    "pathName": "pages/index/index",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "意见反馈",
+                    "pathName": "pages/ucenter/feedback/feedback",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "团购专区",
+                    "pathName": "pages/groupon/grouponList/grouponList",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "选择优惠券",
+                    "pathName": "pages/ucenter/couponSelect/couponSelect",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "我的优惠券列表",
+                    "pathName": "pages/ucenter/couponList/couponList",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "优惠券列表",
+                    "pathName": "pages/coupon/coupon",
+                    "query": ""
+                },
+                {
+                    "id": -1,
+                    "name": "帮助中心",
+                    "pathName": "pages/help/help",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "我的团购",
+                    "pathName": "pages/groupon/myGroupon/myGroupon",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "申请售后",
+                    "pathName": "pages/ucenter/aftersale/aftersale",
+                    "query": "id=2",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "售后列表",
+                    "pathName": "pages/ucenter/aftersaleList/aftersaleList",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "售后详情",
+                    "pathName": "pages/ucenter/aftersaleDetail/aftersaleDetail",
+                    "query": "id=1",
+                    "scene": null
+                }
+            ]
         }
-      ]
     }
-  }
 }
\ No newline at end of file
-- 
Gitee


From bc50ea5d2dc1e5567dc88ad882d412791ccd9ff6 Mon Sep 17 00:00:00 2001
From: raowenbin <raowenbin@jygps.com.cn>
Date: Wed, 5 Jun 2024 09:30:36 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E7=89=88=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../linlinjava/litemall/admin/job/DbJob.java  |   2 +-
 .../litemall/admin/job/OrderJob.java          |   4 +-
 .../admin/service/AdminGoodsService.java      |  18 +-
 .../admin/web/AdminDashbordController.java    |   6 +-
 .../admin/web/AdminFootprintController.java   |   5 +-
 .../admin/web/AdminGoodsController.java       |  29 +-
 .../admin/web/AdminNoticeController.java      |  47 +++-
 .../admin/web/AdminProfileController.java     |   9 +-
 .../admin/web/AdminTopicController.java       |  34 +--
 .../admin/web/AdminWorkController.java        |  80 ++++++
 .../src/main/resources/logback-spring.xml     |   4 +-
 .../src/main/resources/logback-spring.xml     |   2 +-
 .../litemall/core/storage/LocalStorage.java   |   1 -
 .../src/main/resources/application-core.yml   |   7 +-
 litemall-db/pom.xml                           |   6 +
 .../litemall/db/domain/LitemallFootprint.java |  40 +++
 .../db/domain/LitemallFootprintExample.java   |  20 ++
 .../litemall/db/domain/LitemallGoods.java     |  36 +++
 .../db/domain/LitemallGoodsExample.java       | 111 ++++++++
 .../litemall/db/domain/LitemallNotice.java    |  10 +
 .../db/domain/LitemallNoticeAdmin.java        |   9 +
 .../db/domain/LitemallNoticeAdminExample.java |   5 +
 .../litemall/db/domain/LitemallTopic.java     |  25 +-
 .../db/domain/LitemallTopicExample.java       |  25 ++
 .../litemall/db/domain/LitemallUser.java      |  10 +
 .../litemall/db/enums/UserType.java           |   3 +-
 .../litemall/db/param/BasePageParam.java      |  45 +++
 .../litemall/db/param/GoodsParam.java         | 182 ++++++++++++
 .../litemall/db/param/TopicParam.java         |  81 ++++++
 .../litemall/db/param/WorkParam.java          | 101 +++++++
 .../db/service/LitemallFootprintService.java  |  21 +-
 .../db/service/LitemallGoodsService.java      | 258 +++++++++++++++++-
 .../service/LitemallNoticeAdminService.java   |  14 +-
 .../db/service/LitemallTopicService.java      |  46 ++++
 .../db/service/LitemallUserService.java       |  38 ++-
 .../src/main/resources/application-db.yml     |  32 ++-
 .../db/dao/LitemallFootprintMapper.xml        |  66 ++++-
 .../litemall/db/dao/LitemallGoodsMapper.xml   |  80 +++++-
 .../db/dao/LitemallNoticeAdminMapper.xml      |  21 +-
 .../litemall/db/dao/LitemallNoticeMapper.xml  |  33 ++-
 .../litemall/db/dao/LitemallTopicMapper.xml   |  69 +++--
 .../litemall/db/dao/LitemallUserMapper.xml    |  21 +-
 .../litemall/wx/dto/WxLoginInfo.java          |  10 +
 .../litemall/wx/dto/WxMobileInfo.java         |  33 +++
 .../litemall/wx/service/WxGoodsService.java   |  43 ++-
 .../litemall/wx/util/JwtHelper.java           |   4 +-
 .../litemall/wx/util/WXBizDataCryptUtil.java  |  84 ++++++
 .../litemall/wx/web/WxAuthController.java     | 119 +++++++-
 .../wx/web/WxFootprintController.java         |  42 ++-
 .../litemall/wx/web/WxGoodsController.java    |  97 ++++++-
 .../litemall/wx/web/WxNoticeController.java   |  96 +++++++
 .../litemall/wx/web/WxTopicController.java    |  65 ++++-
 .../litemall/wx/web/WxUserController.java     |  19 +-
 .../src/main/resources/application-wx.yml     |   8 +
 54 files changed, 2053 insertions(+), 223 deletions(-)
 create mode 100644 litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminWorkController.java
 create mode 100644 litemall-db/src/main/java/org/linlinjava/litemall/db/param/BasePageParam.java
 create mode 100644 litemall-db/src/main/java/org/linlinjava/litemall/db/param/GoodsParam.java
 create mode 100644 litemall-db/src/main/java/org/linlinjava/litemall/db/param/TopicParam.java
 create mode 100644 litemall-db/src/main/java/org/linlinjava/litemall/db/param/WorkParam.java
 create mode 100644 litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/WxMobileInfo.java
 create mode 100644 litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/util/WXBizDataCryptUtil.java
 create mode 100644 litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxNoticeController.java

diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/DbJob.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/DbJob.java
index b4271283..b6a1a83b 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/DbJob.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/DbJob.java
@@ -26,7 +26,7 @@ public class DbJob {
     /*
      * 定时时间是每天凌晨5点。
      */
-    @Scheduled(cron = "0 0 5 * * ?")
+//    @Scheduled(cron = "0 0 5 * * ?")
     public void backup() throws IOException {
         logger.info("系统开启定时任务数据库备份");
 
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/OrderJob.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/OrderJob.java
index e9c0b529..262f70ba 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/OrderJob.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/OrderJob.java
@@ -41,7 +41,7 @@ public class OrderJob {
      * TODO
      * 注意，因为是相隔一天检查，因此导致订单真正超时时间是 [LITEMALL_ORDER_UNCONFIRM, 1 + LITEMALL_ORDER_UNCONFIRM]
      */
-    @Scheduled(cron = "0 0 3 * * ?")
+//    @Scheduled(cron = "0 0 3 * * ?")
     public void checkOrderUnconfirm() {
         logger.info("系统开启定时任务检查订单是否已经超期自动确认收货");
 
@@ -70,7 +70,7 @@ public class OrderJob {
      * TODO
      * 注意，因为是相隔一天检查，因此导致订单真正超时时间是 [LITEMALL_ORDER_COMMENT, 1 + LITEMALL_ORDER_COMMENT]
      */
-    @Scheduled(cron = "0 0 4 * * ?")
+//    @Scheduled(cron = "0 0 4 * * ?")
     public void checkOrderComment() {
         logger.info("系统开启任务检查订单是否已经超期未评价");
 
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java
index 62edde52..8acb83a6 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java
@@ -7,6 +7,8 @@ import org.linlinjava.litemall.admin.vo.CatVo;
 import org.linlinjava.litemall.core.qcode.QCodeService;
 import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.linlinjava.litemall.db.domain.*;
+import org.linlinjava.litemall.db.param.GoodsParam;
+import org.linlinjava.litemall.db.param.WorkParam;
 import org.linlinjava.litemall.db.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -16,8 +18,6 @@ import org.springframework.util.StringUtils;
 import java.math.BigDecimal;
 import java.util.*;
 
-import static org.linlinjava.litemall.admin.util.AdminResponseCode.GOODS_NAME_EXIST;
-
 @Service
 public class AdminGoodsService {
     private final Log logger = LogFactory.getLog(AdminGoodsService.class);
@@ -39,9 +39,19 @@ public class AdminGoodsService {
     @Autowired
     private QCodeService qCodeService;
 
+    public Object list(WorkParam param) {
+        List<LitemallGoods> goodsList = goodsService.querySelective(param);
+        return ResponseUtil.okList(goodsList);
+    }
+
+    public Object list(GoodsParam param) {
+        List<LitemallGoods> goodsList = goodsService.querySelective(param);
+        return ResponseUtil.okList(goodsList);
+    }
+
     public Object list(Integer goodsId, String goodsSn, String name,
-                       Integer page, Integer limit, String sort, String order) {
-        List<LitemallGoods> goodsList = goodsService.querySelective(goodsId, goodsSn, name, page, limit, sort, order);
+                       String userType, Integer page, Integer limit, String sort, String order) {
+        List<LitemallGoods> goodsList = goodsService.querySelective(goodsId, goodsSn, name, userType, page, limit, sort, order);
         return ResponseUtil.okList(goodsList);
     }
 
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminDashbordController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminDashbordController.java
index 07e8d51c..42748b92 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminDashbordController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminDashbordController.java
@@ -33,14 +33,14 @@ public class AdminDashbordController {
     @GetMapping("")
     public Object info() {
         int userTotal = userService.count();
-        int goodsTotal = goodsService.count();
+        int goodsTotal = goodsService.count("ZB_EMP");
         int productTotal = topicService.count();
-        int orderTotal = orderService.count();
+        int workTotal = goodsService.count("CUSTOMER");
         Map<String, Integer> data = new HashMap<>();
         data.put("userTotal", userTotal);
         data.put("goodsTotal", goodsTotal);
         data.put("productTotal", productTotal);
-        data.put("orderTotal", orderTotal);
+        data.put("workTotal", workTotal);
 
         return ResponseUtil.ok(data);
     }
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminFootprintController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminFootprintController.java
index d940c32a..6849d373 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminFootprintController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminFootprintController.java
@@ -30,13 +30,12 @@ public class AdminFootprintController {
     @RequiresPermissions("admin:footprint:list")
     @RequiresPermissionsDesc(menu = {"用户管理", "用户足迹"}, button = "查询")
     @GetMapping("/list")
-    public Object list(String userId, String goodsId,
+    public Object list(String userName, String goodsName, Integer type,
                        @RequestParam(defaultValue = "1") Integer page,
                        @RequestParam(defaultValue = "10") Integer limit,
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
-        List<LitemallFootprint> footprintList = footprintService.querySelective(userId, goodsId, page, limit, sort,
-                order);
+        List<LitemallFootprint> footprintList = footprintService.querySelective(userName, goodsName, type, page, limit, sort, order);
         return ResponseUtil.okList(footprintList);
     }
 }
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java
index c0fe6de0..ff9391fc 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java
@@ -9,6 +9,7 @@ import org.linlinjava.litemall.admin.service.AdminGoodsService;
 import org.linlinjava.litemall.core.validator.Order;
 import org.linlinjava.litemall.core.validator.Sort;
 import org.linlinjava.litemall.db.domain.LitemallGoods;
+import org.linlinjava.litemall.db.param.GoodsParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -27,24 +28,14 @@ public class AdminGoodsController {
     /**
      * 查询商品
      *
-     * @param goodsId
-     * @param goodsSn
-     * @param name
-     * @param page
-     * @param limit
-     * @param sort
-     * @param order
+     * @param param
      * @return
      */
     @RequiresPermissions("admin:goods:list")
-    @RequiresPermissionsDesc(menu = {"商品管理", "商品管理"}, button = "查询")
-    @GetMapping("/list")
-    public Object list(Integer goodsId, String goodsSn, String name,
-                       @RequestParam(defaultValue = "1") Integer page,
-                       @RequestParam(defaultValue = "10") Integer limit,
-                       @Sort @RequestParam(defaultValue = "add_time") String sort,
-                       @Order @RequestParam(defaultValue = "desc") String order) {
-        return adminGoodsService.list(goodsId, goodsSn, name, page, limit, sort, order);
+    @RequiresPermissionsDesc(menu = {"商品管理", "商品列表"}, button = "查询")
+    @PostMapping("/list")
+    public Object list(@RequestBody GoodsParam param) {
+        return adminGoodsService.list(param);
     }
 
     @GetMapping("/catAndBrand")
@@ -59,7 +50,7 @@ public class AdminGoodsController {
      * @return
      */
     @RequiresPermissions("admin:goods:update")
-    @RequiresPermissionsDesc(menu = {"商品管理", "商品管理"}, button = "编辑")
+    @RequiresPermissionsDesc(menu = {"商品管理", "商品列表"}, button = "编辑")
     @PostMapping("/update")
     public Object update(@RequestBody GoodsAllinone goodsAllinone) {
         return adminGoodsService.update(goodsAllinone);
@@ -72,7 +63,7 @@ public class AdminGoodsController {
      * @return
      */
     @RequiresPermissions("admin:goods:delete")
-    @RequiresPermissionsDesc(menu = {"商品管理", "商品管理"}, button = "删除")
+    @RequiresPermissionsDesc(menu = {"商品管理", "商品列表"}, button = "删除")
     @PostMapping("/delete")
     public Object delete(@RequestBody LitemallGoods goods) {
         return adminGoodsService.delete(goods);
@@ -85,7 +76,7 @@ public class AdminGoodsController {
      * @return
      */
     @RequiresPermissions("admin:goods:create")
-    @RequiresPermissionsDesc(menu = {"商品管理", "商品管理"}, button = "上架")
+    @RequiresPermissionsDesc(menu = {"商品管理", "商品列表"}, button = "上架")
     @PostMapping("/create")
     public Object create(@RequestBody GoodsAllinone goodsAllinone) {
         return adminGoodsService.create(goodsAllinone);
@@ -98,7 +89,7 @@ public class AdminGoodsController {
      * @return
      */
     @RequiresPermissions("admin:goods:read")
-    @RequiresPermissionsDesc(menu = {"商品管理", "商品管理"}, button = "详情")
+    @RequiresPermissionsDesc(menu = {"商品管理", "商品列表"}, button = "详情")
     @GetMapping("/detail")
     public Object detail(@NotNull Integer id) {
         return adminGoodsService.detail(id);
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminNoticeController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminNoticeController.java
index 04531ef5..8f250b20 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminNoticeController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminNoticeController.java
@@ -11,9 +11,11 @@ import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.linlinjava.litemall.core.validator.Order;
 import org.linlinjava.litemall.core.validator.Sort;
 import org.linlinjava.litemall.db.domain.*;
+import org.linlinjava.litemall.db.enums.UserType;
 import org.linlinjava.litemall.db.service.LitemallAdminService;
 import org.linlinjava.litemall.db.service.LitemallNoticeAdminService;
 import org.linlinjava.litemall.db.service.LitemallNoticeService;
+import org.linlinjava.litemall.db.service.LitemallUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
@@ -37,6 +39,8 @@ public class AdminNoticeController {
     @Autowired
     private LitemallAdminService adminService;
     @Autowired
+    private LitemallUserService userService;
+    @Autowired
     private LitemallNoticeAdminService noticeAdminService;
 
     @RequiresPermissions("admin:notice:list")
@@ -56,6 +60,11 @@ public class AdminNoticeController {
         if (StringUtils.isEmpty(title)) {
             return ResponseUtil.badArgument();
         }
+        Integer type = notice.getNoticeType();
+        if (type == null) {
+            return ResponseUtil.badArgument();
+        }
+
         return null;
     }
 
@@ -77,13 +86,37 @@ public class AdminNoticeController {
         notice.setAdminId(getAdminId());
         noticeService.add(notice);
         // 2. 添加管理员通知记录
-        List<LitemallAdmin> adminList = adminService.all();
-        LitemallNoticeAdmin noticeAdmin = new LitemallNoticeAdmin();
-        noticeAdmin.setNoticeId(notice.getId());
-        noticeAdmin.setNoticeTitle(notice.getTitle());
-        for(LitemallAdmin admin : adminList){
-            noticeAdmin.setAdminId(admin.getId());
-            noticeAdminService.add(noticeAdmin);
+        if (notice.getNoticeType() != null && notice.getNoticeType() <= 1) {
+            List<LitemallAdmin> adminList = adminService.all();
+            LitemallNoticeAdmin noticeAdmin = new LitemallNoticeAdmin();
+            noticeAdmin.setNoticeId(notice.getId());
+            noticeAdmin.setNoticeTitle(notice.getTitle());
+            for(LitemallAdmin admin : adminList){
+                noticeAdmin.setAdminId(admin.getId());
+                noticeAdmin.setAdminType(1);
+                noticeAdminService.add(noticeAdmin);
+            }
+        }
+        // 3. 添加主播
+        if (notice.getNoticeType() != null && notice.getNoticeType() != 1) {
+            String userType = null;
+            if (notice.getNoticeType() == 2) {
+                userType = UserType.ZB_EMP.name();
+            } else if (notice.getNoticeType() == 3) {
+                userType = UserType.CUSTOMER.name();
+            }
+            List<LitemallUser> users = userService.queryByUserType(userType);
+            LitemallNoticeAdmin noticeAdmin = new LitemallNoticeAdmin();
+            noticeAdmin.setNoticeId(notice.getId());
+            noticeAdmin.setNoticeTitle(notice.getTitle());
+            for(LitemallUser user : users){
+                if (user.getUserType() == null) {
+                    continue;
+                }
+                noticeAdmin.setAdminId(user.getId());
+                noticeAdmin.setAdminType(UserType.ZB_EMP.equals(user.getUserType()) ? 2 : 3);
+                noticeAdminService.add(noticeAdmin);
+            }
         }
         return ResponseUtil.ok(notice);
     }
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminProfileController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminProfileController.java
index faa2dccb..3b05419c 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminProfileController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminProfileController.java
@@ -1,6 +1,5 @@
 package org.linlinjava.litemall.admin.web;
 
-import io.swagger.models.auth.In;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.SecurityUtils;
@@ -12,7 +11,6 @@ import org.linlinjava.litemall.core.util.bcrypt.BCryptPasswordEncoder;
 import org.linlinjava.litemall.core.validator.Order;
 import org.linlinjava.litemall.core.validator.Sort;
 import org.linlinjava.litemall.db.domain.LitemallAdmin;
-import org.linlinjava.litemall.db.domain.LitemallIssue;
 import org.linlinjava.litemall.db.domain.LitemallNotice;
 import org.linlinjava.litemall.db.domain.LitemallNoticeAdmin;
 import org.linlinjava.litemall.db.service.LitemallAdminService;
@@ -23,7 +21,6 @@ import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
@@ -80,7 +77,7 @@ public class AdminProfileController {
     @RequiresAuthentication
     @GetMapping("/nnotice")
     public Object nNotice() {
-        int count = noticeAdminService.countUnread(getAdminId());
+        int count = noticeAdminService.countUnread(getAdminId(), 1);
         return ResponseUtil.ok(count);
     }
 
@@ -91,7 +88,7 @@ public class AdminProfileController {
                             @RequestParam(defaultValue = "10") Integer limit,
                             @Sort @RequestParam(defaultValue = "add_time") String sort,
                             @Order @RequestParam(defaultValue = "desc") String order) {
-        List<LitemallNoticeAdmin> noticeList = noticeAdminService.querySelective(title, type, getAdminId(), page, limit, sort, order);
+        List<LitemallNoticeAdmin> noticeList = noticeAdminService.querySelective(title, type, getAdminId(), 1, page, limit, sort, order);
         return ResponseUtil.okList(noticeList);
     }
 
@@ -103,7 +100,7 @@ public class AdminProfileController {
             return ResponseUtil.badArgument();
         }
 
-        LitemallNoticeAdmin noticeAdmin = noticeAdminService.find(noticeId, getAdminId());
+        LitemallNoticeAdmin noticeAdmin = noticeAdminService.find(noticeId, getAdminId(), 1);
         if(noticeAdmin == null){
            return ResponseUtil.badArgumentValue();
         }
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java
index 4894444d..c48d6a51 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java
@@ -1,14 +1,13 @@
 package org.linlinjava.litemall.admin.web;
 
-import io.swagger.models.auth.In;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.linlinjava.litemall.admin.annotation.RequiresPermissionsDesc;
+import org.linlinjava.litemall.db.param.TopicParam;
+import org.linlinjava.litemall.db.param.WorkParam;
 import org.linlinjava.litemall.core.util.JacksonUtil;
 import org.linlinjava.litemall.core.util.ResponseUtil;
-import org.linlinjava.litemall.core.validator.Order;
-import org.linlinjava.litemall.core.validator.Sort;
 import org.linlinjava.litemall.db.domain.LitemallGoods;
 import org.linlinjava.litemall.db.domain.LitemallTopic;
 import org.linlinjava.litemall.db.service.LitemallGoodsService;
@@ -37,20 +36,15 @@ public class AdminTopicController {
     private LitemallGoodsService goodsService;
 
     @RequiresPermissions("admin:topic:list")
-    @RequiresPermissionsDesc(menu = {"推广管理", "专题管理"}, button = "查询")
-    @GetMapping("/list")
-    public Object list(String title, String subtitle,
-                       @RequestParam(defaultValue = "1") Integer page,
-                       @RequestParam(defaultValue = "10") Integer limit,
-                       @Sort(accepts = {"id", "add_time", "price"}) @RequestParam(defaultValue = "add_time") String sort,
-                       @Order @RequestParam(defaultValue = "desc") String order) {
-        List<LitemallTopic> topicList = topicService.querySelective(title, subtitle, page, limit, sort, order);
+    @RequiresPermissionsDesc(menu = {"客户管理", "客户列表"}, button = "查询")
+    @PostMapping("/list")
+    public Object list(@RequestBody TopicParam param) {
+        List<LitemallTopic> topicList = topicService.querySelective(param);
         return ResponseUtil.okList(topicList);
     }
 
     private Object validate(LitemallTopic topic) {
-        String title = topic.getTitle();
-        if (StringUtils.isEmpty(title)) {
+        if (StringUtils.isEmpty(topic.getId())) {
             return ResponseUtil.badArgument();
         }
         String content = topic.getContent();
@@ -65,7 +59,7 @@ public class AdminTopicController {
     }
 
     @RequiresPermissions("admin:topic:create")
-    @RequiresPermissionsDesc(menu = {"推广管理", "专题管理"}, button = "添加")
+    @RequiresPermissionsDesc(menu = {"客户管理", "客户列表"}, button = "添加")
     @PostMapping("/create")
     public Object create(@RequestBody LitemallTopic topic) {
         Object error = validate(topic);
@@ -77,7 +71,7 @@ public class AdminTopicController {
     }
 
     @RequiresPermissions("admin:topic:read")
-    @RequiresPermissionsDesc(menu = {"推广管理", "专题管理"}, button = "详情")
+    @RequiresPermissionsDesc(menu = {"客户管理", "客户列表"}, button = "详情")
     @GetMapping("/read")
     public Object read(@NotNull Integer id) {
         LitemallTopic topic = topicService.findById(id);
@@ -95,13 +89,9 @@ public class AdminTopicController {
     }
 
     @RequiresPermissions("admin:topic:update")
-    @RequiresPermissionsDesc(menu = {"推广管理", "专题管理"}, button = "编辑")
+    @RequiresPermissionsDesc(menu = {"客户管理", "客户列表"}, button = "编辑")
     @PostMapping("/update")
     public Object update(@RequestBody LitemallTopic topic) {
-        Object error = validate(topic);
-        if (error != null) {
-            return error;
-        }
         if (topicService.updateById(topic) == 0) {
             return ResponseUtil.updatedDataFailed();
         }
@@ -109,7 +99,7 @@ public class AdminTopicController {
     }
 
     @RequiresPermissions("admin:topic:delete")
-    @RequiresPermissionsDesc(menu = {"推广管理", "专题管理"}, button = "删除")
+    @RequiresPermissionsDesc(menu = {"客户管理", "客户列表"}, button = "删除")
     @PostMapping("/delete")
     public Object delete(@RequestBody LitemallTopic topic) {
         topicService.deleteById(topic.getId());
@@ -117,7 +107,7 @@ public class AdminTopicController {
     }
 
     @RequiresPermissions("admin:topic:batch-delete")
-    @RequiresPermissionsDesc(menu = {"推广管理", "专题管理"}, button = "批量删除")
+    @RequiresPermissionsDesc(menu = {"客户管理", "客户列表"}, button = "批量删除")
     @PostMapping("/batch-delete")
     public Object batchDelete(@RequestBody String body) {
         List<Integer> ids = JacksonUtil.parseIntegerList(body, "ids");
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminWorkController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminWorkController.java
new file mode 100644
index 00000000..bcca9204
--- /dev/null
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminWorkController.java
@@ -0,0 +1,80 @@
+package org.linlinjava.litemall.admin.web;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.linlinjava.litemall.admin.annotation.RequiresPermissionsDesc;
+import org.linlinjava.litemall.admin.dto.GoodsAllinone;
+import org.linlinjava.litemall.admin.service.AdminGoodsService;
+import org.linlinjava.litemall.core.validator.Order;
+import org.linlinjava.litemall.core.validator.Sort;
+import org.linlinjava.litemall.db.domain.LitemallGoods;
+import org.linlinjava.litemall.db.param.WorkParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotNull;
+
+@RestController
+@RequestMapping("/admin/work")
+@Validated
+public class AdminWorkController {
+    private final Log logger = LogFactory.getLog(AdminGoodsController.class);
+
+    @Autowired
+    private AdminGoodsService adminGoodsService;
+
+    /**
+     * 查询商品
+     *
+     * @param workParam
+     * @return
+     */
+    @RequiresPermissions("admin:work:list")
+    @RequiresPermissionsDesc(menu = {"客户管理", "职位列表"}, button = "查询")
+    @PostMapping("/list")
+    public Object list(@RequestBody WorkParam workParam) {
+        return adminGoodsService.list(workParam);
+    }
+
+    /**
+     * 编辑商品
+     *
+     * @param goodsAllinone
+     * @return
+     */
+    @RequiresPermissions("admin:work:update")
+    @RequiresPermissionsDesc(menu = {"客户管理", "职位列表"}, button = "编辑")
+    @PostMapping("/update")
+    public Object update(@RequestBody GoodsAllinone goodsAllinone) {
+        return adminGoodsService.update(goodsAllinone);
+    }
+
+    /**
+     * 删除商品
+     *
+     * @param goods
+     * @return
+     */
+    @RequiresPermissions("admin:work:delete")
+    @RequiresPermissionsDesc(menu = {"客户管理", "职位列表"}, button = "删除")
+    @PostMapping("/delete")
+    public Object delete(@RequestBody LitemallGoods goods) {
+        return adminGoodsService.delete(goods);
+    }
+
+    /**
+     * 添加商品
+     *
+     * @param goodsAllinone
+     * @return
+     */
+    @RequiresPermissions("admin:work:create")
+    @RequiresPermissionsDesc(menu = {"客户管理", "职位列表"}, button = "上架")
+    @PostMapping("/create")
+    public Object create(@RequestBody GoodsAllinone goodsAllinone) {
+        return adminGoodsService.create(goodsAllinone);
+    }
+
+}
diff --git a/litemall-all-war/src/main/resources/logback-spring.xml b/litemall-all-war/src/main/resources/logback-spring.xml
index 3845eb4b..3fd91981 100644
--- a/litemall-all-war/src/main/resources/logback-spring.xml
+++ b/litemall-all-war/src/main/resources/logback-spring.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="true">
     <contextName>logback</contextName>
-    <property name="log.path" value="logs" />
+    <property name="log.path" value="/mnt/logs/litemall" />
 
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
@@ -51,7 +51,7 @@
     <logger name="org.mybatis" level="ERROR" />
     <logger name="org.springframework" level="ERROR" />
     <logger name="org.linlinjava.litemall.core" level="ERROR" />
-    <logger name="org.linlinjava.litemall.db" level="ERROR" />
+    <logger name="org.linlinjava.litemall.db" level="ERROR" />
     <logger name="org.linlinjava.litemall.admin" level="DEBUG" />
     <logger name="org.linlinjava.litemall.wx" level="DEBUG" />
     <logger name="org.linlinjava.litemall" level="DEBUG" />
diff --git a/litemall-all/src/main/resources/logback-spring.xml b/litemall-all/src/main/resources/logback-spring.xml
index 3845eb4b..572fa320 100644
--- a/litemall-all/src/main/resources/logback-spring.xml
+++ b/litemall-all/src/main/resources/logback-spring.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="true">
     <contextName>logback</contextName>
-    <property name="log.path" value="logs" />
+    <property name="log.path" value="/mnt/logs/litemall" />
 
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/storage/LocalStorage.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/storage/LocalStorage.java
index 3c182b57..bc8a849d 100644
--- a/litemall-core/src/main/java/org/linlinjava/litemall/core/storage/LocalStorage.java
+++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/storage/LocalStorage.java
@@ -105,7 +105,6 @@ public class LocalStorage implements Storage {
 
     @Override
     public String generateUrl(String keyName) {
-
         return address + keyName;
     }
 }
\ No newline at end of file
diff --git a/litemall-core/src/main/resources/application-core.yml b/litemall-core/src/main/resources/application-core.yml
index 32152c68..b09ab425 100644
--- a/litemall-core/src/main/resources/application-core.yml
+++ b/litemall-core/src/main/resources/application-core.yml
@@ -87,11 +87,12 @@ litemall:
   storage:
     # 当前工作的对象存储模式，分别是local、aliyun、tencent、qiniu
     active: local
-    # 本地对象存储配置信息
+    # 本地对象存储配置信息N
     local:
-      storagePath: storage
+      storagePath: /mnt/storage
       # 这个地方应该是wx模块的WxStorageController的fetch方法对应的地址
-      address: https://www.czyinfo.cn/wx/storage/fetch/
+#      address: https://www.czyinfo.cn/wx/storage/fetch/
+      address: https://www.xianiaoai.cn/wx/storage/fetch/
     # 阿里云对象存储配置信息
     aliyun:
       endpoint: oss-cn-shenzhen.aliyuncs.com
diff --git a/litemall-db/pom.xml b/litemall-db/pom.xml
index 43b08a1c..a13deb75 100644
--- a/litemall-db/pom.xml
+++ b/litemall-db/pom.xml
@@ -37,6 +37,12 @@
             <artifactId>druid-spring-boot-starter</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>2.0.16</version>
+        </dependency>
+
     </dependencies>
 
 
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallFootprint.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallFootprint.java
index 00dd4703..2a3cfaa4 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallFootprint.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallFootprint.java
@@ -39,6 +39,8 @@ public class LitemallFootprint {
      */
     private Integer userId;
 
+    private String userName;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -46,8 +48,14 @@ public class LitemallFootprint {
      *
      * @mbg.generated
      */
+    private Integer goodsUserId;
+
     private Integer goodsId;
 
+    private String goodsName;
+
+    private Integer type;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -229,6 +237,38 @@ public class LitemallFootprint {
         this.deleted = deleted;
     }
 
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public Integer getGoodsUserId() {
+        return goodsUserId;
+    }
+
+    public void setGoodsUserId(Integer goodsUserId) {
+        this.goodsUserId = goodsUserId;
+    }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table litemall_footprint
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallFootprintExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallFootprintExample.java
index d551e7e9..9691d1c6 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallFootprintExample.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallFootprintExample.java
@@ -389,6 +389,21 @@ public class LitemallFootprintExample {
             return (Criteria) this;
         }
 
+        public Criteria andUserNameLike(String value) {
+            addCriterion("user_name like", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsNameLike(String value) {
+            addCriterion("goods_name like", value, "goodsName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(Integer value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
         public Criteria andUserIdIsNull() {
             addCriterion("user_id is null");
             return (Criteria) this;
@@ -404,6 +419,11 @@ public class LitemallFootprintExample {
             return (Criteria) this;
         }
 
+        public Criteria andGoodsUserIdEqualTo(Integer value) {
+            addCriterion("goods_user_id =", value, "goodsUserId");
+            return (Criteria) this;
+        }
+
         /**
          * This method was generated by MyBatis Generator.
          * This method corresponds to the database table litemall_footprint
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoods.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoods.java
index bacaf294..0c383641 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoods.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoods.java
@@ -1,5 +1,7 @@
 package org.linlinjava.litemall.db.domain;
 
+import org.linlinjava.litemall.db.enums.UserType;
+
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -104,6 +106,10 @@ public class LitemallGoods {
 
     private Integer userId;
 
+    private String userName;
+
+    private UserType userType;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -214,6 +220,8 @@ public class LitemallGoods {
      */
     private BigDecimal retailPrice;
 
+    private Date expireTime;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -562,6 +570,22 @@ public class LitemallGoods {
         this.userId = userId;
     }
 
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public UserType getUserType() {
+        return userType;
+    }
+
+    public void setUserType(UserType userType) {
+        this.userType = userType;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column litemall_goods.gallery
@@ -858,6 +882,14 @@ public class LitemallGoods {
         this.retailPrice = retailPrice;
     }
 
+    public Date getExpireTime() {
+        return expireTime;
+    }
+
+    public void setExpireTime(Date expireTime) {
+        this.expireTime = expireTime;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column litemall_goods.add_time
@@ -1168,6 +1200,10 @@ public class LitemallGoods {
         isNew("is_new", "isNew", "BIT", false),
         isHot("is_hot", "isHot", "BIT", false),
         unit("unit", "unit", "VARCHAR", false),
+        currentCity("current_city", "currentCity", "VARCHAR", false),
+        workStyle("work_style", "workStyle", "VARCHAR", false),
+        workWay("work_way", "workWay", "VARCHAR", false),
+        workCategory("work_category", "workCategory", "VARCHAR", false),
         counterPrice("counter_price", "counterPrice", "DECIMAL", false),
         retailPrice("retail_price", "retailPrice", "DECIMAL", false),
         addTime("add_time", "addTime", "TIMESTAMP", false),
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsExample.java
index 95eeba57..b0314840 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsExample.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsExample.java
@@ -3,6 +3,7 @@ package org.linlinjava.litemall.db.domain;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 public class LitemallGoodsExample {
@@ -424,6 +425,71 @@ public class LitemallGoodsExample {
             return (Criteria) this;
         }
 
+        public Criteria andUserTypeEqualTo(String value) {
+            addCriterion("user_type =", value, "userType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexEqualTo(Integer value) {
+            addCriterion("sex =", value, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceEqualTo(String value) {
+            addCriterion("province =", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityEqualTo(String value) {
+            addCriterion("city =", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentProvinceEqualTo(String value) {
+            addCriterion("current_province =", value, "currentProvince");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentCityEqualTo(String value) {
+            addCriterion("current_city =", value, "currentCity");
+            return (Criteria) this;
+        }
+
+        public Criteria andWorkCategoryEqualJsonTo(String value) {
+            addCriterion("json_contains(work_category, CONCAT('\"','" + value + "','\"'))");
+            return (Criteria) this;
+        }
+
+        public Criteria andWorkStyleEqualJsonTo(String value) {
+            addCriterion("json_contains(work_style, CONCAT('\"','" + value + "','\"'))");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodCategoryEqualJsonTo(String value) {
+            addCriterion("json_contains(good_category, CONCAT('\"','" + value + "','\"'))");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountTypeEqualJsonTo(String value) {
+            addCriterion("json_contains(account_type, CONCAT('\"','" + value + "','\"'))");
+            return (Criteria) this;
+        }
+
+        public Criteria andWorkWayEqualTo(String value) {
+            addCriterion("work_way =", value, "workWay");
+            return (Criteria) this;
+        }
+
+        public Criteria andLanguageEqualTo(String value) {
+            addCriterion("language =", value, "language");
+            return (Criteria) this;
+        }
+
+        public Criteria andDegreeEqualTo(String value) {
+            addCriterion("degree =", value, "degree");
+            return (Criteria) this;
+        }
+
         public Criteria andGoodsSnIsNull() {
             addCriterion("goods_sn is null");
             return (Criteria) this;
@@ -671,6 +737,11 @@ public class LitemallGoodsExample {
             return (Criteria) this;
         }
 
+        public Criteria andUserNameLike(String value) {
+            addCriterion("`user_name` like", value, "userName");
+            return (Criteria) this;
+        }
+
         public Criteria andNameNotLike(String value) {
             addCriterion("`name` not like", value, "name");
             return (Criteria) this;
@@ -2457,6 +2528,16 @@ public class LitemallGoodsExample {
             return (Criteria) this;
         }
 
+        public Criteria andHeightGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("height >=", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight >=", value, "weight");
+            return (Criteria) this;
+        }
+
         /**
          * This method was generated by MyBatis Generator.
          * This method corresponds to the database table litemall_goods
@@ -2489,6 +2570,16 @@ public class LitemallGoodsExample {
             return (Criteria) this;
         }
 
+        public Criteria andHeightLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("height <=", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight <=", value, "weight");
+            return (Criteria) this;
+        }
+
         /**
          * This method was generated by MyBatis Generator.
          * This method corresponds to the database table litemall_goods
@@ -2688,6 +2779,21 @@ public class LitemallGoodsExample {
             return (Criteria) this;
         }
 
+        public Criteria andExpireTimeGreaterThan(Date value) {
+            addCriterion("expire_time >", value, "expireTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpireTimeGreaterOrEqualThan(Date value) {
+            addCriterion("expire_time >=", value, "expireTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpireTimeLessThan(Date value) {
+            addCriterion("expire_time <", value, "expireTime");
+            return (Criteria) this;
+        }
+
         public Criteria andAddTimeGreaterThan(LocalDateTime value) {
             addCriterion("add_time >", value, "addTime");
             return (Criteria) this;
@@ -2762,6 +2868,11 @@ public class LitemallGoodsExample {
             return (Criteria) this;
         }
 
+        public Criteria andBirthdayBetween(Date value1, Date value2) {
+            addCriterion("birthday between", value1, value2, "birthday");
+            return (Criteria) this;
+        }
+
         public Criteria andAddTimeBetween(LocalDateTime value1, LocalDateTime value2) {
             addCriterion("add_time between", value1, value2, "addTime");
             return (Criteria) this;
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallNotice.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallNotice.java
index ea2a383e..1b3f6fec 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallNotice.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallNotice.java
@@ -57,6 +57,8 @@ public class LitemallNotice {
      */
     private Integer adminId;
 
+    private Integer noticeType;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -180,6 +182,14 @@ public class LitemallNotice {
         this.adminId = adminId;
     }
 
+    public Integer getNoticeType() {
+        return noticeType;
+    }
+
+    public void setNoticeType(Integer noticeType) {
+        this.noticeType = noticeType;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column litemall_notice.add_time
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallNoticeAdmin.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallNoticeAdmin.java
index 75ec721f..dbaa23b8 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallNoticeAdmin.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallNoticeAdmin.java
@@ -56,6 +56,7 @@ public class LitemallNoticeAdmin {
      * @mbg.generated
      */
     private Integer adminId;
+    private Integer adminType;
 
     /**
      *
@@ -189,6 +190,14 @@ public class LitemallNoticeAdmin {
         this.adminId = adminId;
     }
 
+    public Integer getAdminType() {
+        return adminType;
+    }
+
+    public void setAdminType(Integer adminType) {
+        this.adminType = adminType;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column litemall_notice_admin.read_time
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallNoticeAdminExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallNoticeAdminExample.java
index c3b233d0..ad750f79 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallNoticeAdminExample.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallNoticeAdminExample.java
@@ -530,6 +530,11 @@ public class LitemallNoticeAdminExample {
             return (Criteria) this;
         }
 
+        public Criteria andAdminTypeEqualTo(Integer value) {
+            addCriterion("admin_type =", value, "adminType");
+            return (Criteria) this;
+        }
+
         /**
          * This method was generated by MyBatis Generator.
          * This method corresponds to the database table litemall_notice_admin
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopic.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopic.java
index 39c891e8..73d74d77 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopic.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopic.java
@@ -74,7 +74,9 @@ public class LitemallTopic {
      *
      * @mbg.generated
      */
-    private String[] picUrl;
+    private String picUrl;
+
+    private String[] gallery;
 
     private String contact;
 
@@ -107,6 +109,8 @@ public class LitemallTopic {
     private Integer salary;
     private Integer commission;
 
+    private Boolean isOnSale;
+
     private Integer userId;
 
     /**
@@ -291,7 +295,7 @@ public class LitemallTopic {
      *
      * @mbg.generated
      */
-    public String[] getPicUrl() {
+    public String getPicUrl() {
         return picUrl;
     }
 
@@ -303,10 +307,25 @@ public class LitemallTopic {
      *
      * @mbg.generated
      */
-    public void setPicUrl(String[] picUrl) {
+    public void setPicUrl(String picUrl) {
         this.picUrl = picUrl;
     }
 
+    public String[] getGallery() {
+        return gallery;
+    }
+
+    public void setGallery(String[] gallery) {
+        this.gallery = gallery;
+    }
+
+    public Boolean getIsOnSale() {
+        return isOnSale;
+    }
+    public void setIsOnSale(Boolean isOnSale) {
+        this.isOnSale = isOnSale;
+    }
+
     public String getContact() {
         return contact;
     }
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopicExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopicExample.java
index 06557760..d8227d6d 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopicExample.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopicExample.java
@@ -696,6 +696,16 @@ public class LitemallTopicExample {
             return (Criteria) this;
         }
 
+        public Criteria andProvinceEqualTo(String value) {
+            addCriterion("province =", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityEqualTo(String value) {
+            addCriterion("city =", value, "city");
+            return (Criteria) this;
+        }
+
         public Criteria andSubtitleEqualTo(String value) {
             addCriterion("subtitle =", value, "subtitle");
             return (Criteria) this;
@@ -797,6 +807,21 @@ public class LitemallTopicExample {
             return (Criteria) this;
         }
 
+        public Criteria andContactLike(String value) {
+            addCriterion("contact like", value, "contact");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactMobileLike(String value) {
+            addCriterion("contact_mobile like", value, "contactMobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressLike(String value) {
+            addCriterion("address like", value, "address");
+            return (Criteria) this;
+        }
+
         public Criteria andSubtitleNotLike(String value) {
             addCriterion("subtitle not like", value, "subtitle");
             return (Criteria) this;
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUser.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUser.java
index 78abfbf6..2b091a01 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUser.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUser.java
@@ -143,6 +143,8 @@ public class LitemallUser {
 
     private UserType userType;
 
+    private Integer managerFlag;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -235,6 +237,14 @@ public class LitemallUser {
         this.userType = userType;
     }
 
+    public Integer getManagerFlag() {
+        return managerFlag;
+    }
+
+    public void setManagerFlag(Integer managerFlag) {
+        this.managerFlag = managerFlag;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column litemall_user.password
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/enums/UserType.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/enums/UserType.java
index 11fc238c..e6213fbe 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/enums/UserType.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/enums/UserType.java
@@ -7,7 +7,8 @@ package org.linlinjava.litemall.db.enums;
 public enum UserType {
 
     ZB_EMP("主播"),
-    CUSTOMER("客户")
+    CUSTOMER("客户"),
+    MANAGER("经纪人")
     ;
 
     String name;
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/param/BasePageParam.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/param/BasePageParam.java
new file mode 100644
index 00000000..e1b313c6
--- /dev/null
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/param/BasePageParam.java
@@ -0,0 +1,45 @@
+package org.linlinjava.litemall.db.param;
+
+/**
+ * 分页参数
+ * @author rwb
+ */
+public class BasePageParam {
+
+    private Integer page = 1;
+    private Integer limit = 10;
+    private String sort = "add_time";
+    private String order = "desc";
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getLimit() {
+        return limit;
+    }
+
+    public void setLimit(Integer limit) {
+        this.limit = limit;
+    }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort;
+    }
+
+    public String getOrder() {
+        return order;
+    }
+
+    public void setOrder(String order) {
+        this.order = order;
+    }
+}
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/param/GoodsParam.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/param/GoodsParam.java
new file mode 100644
index 00000000..b9d1ae3e
--- /dev/null
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/param/GoodsParam.java
@@ -0,0 +1,182 @@
+package org.linlinjava.litemall.db.param;
+
+import java.util.List;
+
+/**
+ * 主播查询
+ * @author rwb
+ */
+public class GoodsParam extends BasePageParam {
+
+    private String goodsSn;
+    private String name;
+    private Integer sex;
+    private String degreeValue;
+    private String workTypeValue;
+    private String goodCategoryValue;
+    private String accountTypeValue;
+    private String workStyleValue;
+    private String languageValue;
+    private String workWayValue;
+    private String province;
+    private String city;
+    private String currentProvince;
+    private String currentCity;
+    private List<String> birthdayRange;
+    private List<Integer> heightRange;
+    private List<Integer> weightRange;
+    private List<Integer> counterPriceRange;
+    private String userType;
+
+    public String getGoodsSn() {
+        return goodsSn;
+    }
+
+    public void setGoodsSn(String goodsSn) {
+        this.goodsSn = goodsSn;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    public String getDegreeValue() {
+        return degreeValue;
+    }
+
+    public void setDegreeValue(String degreeValue) {
+        this.degreeValue = degreeValue;
+    }
+
+    public String getWorkTypeValue() {
+        return workTypeValue;
+    }
+
+    public void setWorkTypeValue(String workTypeValue) {
+        this.workTypeValue = workTypeValue;
+    }
+
+    public String getGoodCategoryValue() {
+        return goodCategoryValue;
+    }
+
+    public void setGoodCategoryValue(String goodCategoryValue) {
+        this.goodCategoryValue = goodCategoryValue;
+    }
+
+    public String getAccountTypeValue() {
+        return accountTypeValue;
+    }
+
+    public void setAccountTypeValue(String accountTypeValue) {
+        this.accountTypeValue = accountTypeValue;
+    }
+
+    public String getWorkStyleValue() {
+        return workStyleValue;
+    }
+
+    public void setWorkStyleValue(String workStyleValue) {
+        this.workStyleValue = workStyleValue;
+    }
+
+    public String getLanguageValue() {
+        return languageValue;
+    }
+
+    public void setLanguageValue(String languageValue) {
+        this.languageValue = languageValue;
+    }
+
+    public String getWorkWayValue() {
+        return workWayValue;
+    }
+
+    public void setWorkWayValue(String workWayValue) {
+        this.workWayValue = workWayValue;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getCurrentProvince() {
+        return currentProvince;
+    }
+
+    public void setCurrentProvince(String currentProvince) {
+        this.currentProvince = currentProvince;
+    }
+
+    public String getCurrentCity() {
+        return currentCity;
+    }
+
+    public void setCurrentCity(String currentCity) {
+        this.currentCity = currentCity;
+    }
+
+    public List<String> getBirthdayRange() {
+        return birthdayRange;
+    }
+
+    public void setBirthdayRange(List<String> birthdayRange) {
+        this.birthdayRange = birthdayRange;
+    }
+
+    public List<Integer> getHeightRange() {
+        return heightRange;
+    }
+
+    public void setHeightRange(List<Integer> heightRange) {
+        this.heightRange = heightRange;
+    }
+
+    public List<Integer> getWeightRange() {
+        return weightRange;
+    }
+
+    public void setWeightRange(List<Integer> weightRange) {
+        this.weightRange = weightRange;
+    }
+
+    public List<Integer> getCounterPriceRange() {
+        return counterPriceRange;
+    }
+
+    public void setCounterPriceRange(List<Integer> counterPriceRange) {
+        this.counterPriceRange = counterPriceRange;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+}
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/param/TopicParam.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/param/TopicParam.java
new file mode 100644
index 00000000..7edd6b34
--- /dev/null
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/param/TopicParam.java
@@ -0,0 +1,81 @@
+package org.linlinjava.litemall.db.param;
+
+/**
+ * 客户查询
+ * @author rwb
+ */
+public class TopicParam extends BasePageParam {
+
+    private String title;
+    private String subtitle;
+    private String province;
+    private String city;
+    private String address;
+    private String contact;
+    private String contactMobile;
+    private String userType;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getSubtitle() {
+        return subtitle;
+    }
+
+    public void setSubtitle(String subtitle) {
+        this.subtitle = subtitle;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getContact() {
+        return contact;
+    }
+
+    public void setContact(String contact) {
+        this.contact = contact;
+    }
+
+    public String getContactMobile() {
+        return contactMobile;
+    }
+
+    public void setContactMobile(String contactMobile) {
+        this.contactMobile = contactMobile;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+}
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/param/WorkParam.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/param/WorkParam.java
new file mode 100644
index 00000000..e31d0719
--- /dev/null
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/param/WorkParam.java
@@ -0,0 +1,101 @@
+package org.linlinjava.litemall.db.param;
+
+import java.util.List;
+
+/**
+ * 职位查询
+ * @author rwb
+ */
+public class WorkParam extends BasePageParam {
+
+    private String name;
+    private String userName;
+    private String workCategoryValue;
+    private String currentCity;
+    private String workStyleValue;
+    private String workWayValue;
+    private List<Integer> counterPriceRange;
+    private List<Integer> retailPriceRange;
+    private String goodsSn;
+    private String userType;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getWorkCategoryValue() {
+        return workCategoryValue;
+    }
+
+    public void setWorkCategoryValue(String workCategoryValue) {
+        this.workCategoryValue = workCategoryValue;
+    }
+
+    public String getCurrentCity() {
+        return currentCity;
+    }
+
+    public void setCurrentCity(String currentCity) {
+        this.currentCity = currentCity;
+    }
+
+    public String getWorkStyleValue() {
+        return workStyleValue;
+    }
+
+    public void setWorkStyleValue(String workStyleValue) {
+        this.workStyleValue = workStyleValue;
+    }
+
+    public String getWorkWayValue() {
+        return workWayValue;
+    }
+
+    public void setWorkWayValue(String workWayValue) {
+        this.workWayValue = workWayValue;
+    }
+
+    public List<Integer> getCounterPriceRange() {
+        return counterPriceRange;
+    }
+
+    public void setCounterPriceRange(List<Integer> counterPriceRange) {
+        this.counterPriceRange = counterPriceRange;
+    }
+
+    public List<Integer> getRetailPriceRange() {
+        return retailPriceRange;
+    }
+
+    public void setRetailPriceRange(List<Integer> retailPriceRange) {
+        this.retailPriceRange = retailPriceRange;
+    }
+
+    public String getGoodsSn() {
+        return goodsSn;
+    }
+
+    public void setGoodsSn(String goodsSn) {
+        this.goodsSn = goodsSn;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+}
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallFootprintService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallFootprintService.java
index 65e79c01..0b41e8d3 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallFootprintService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallFootprintService.java
@@ -16,9 +16,13 @@ public class LitemallFootprintService {
     @Resource
     private LitemallFootprintMapper footprintMapper;
 
-    public List<LitemallFootprint> queryByAddTime(Integer userId, Integer page, Integer size) {
+    public List<LitemallFootprint> queryByAddTime(Integer userId, Integer isMe, Integer page, Integer size) {
         LitemallFootprintExample example = new LitemallFootprintExample();
-        example.or().andUserIdEqualTo(userId).andDeletedEqualTo(false);
+        if (isMe == null || isMe.intValue() == 1) {
+            example.or().andUserIdEqualTo(userId).andDeletedEqualTo(false);
+        } else {
+            example.or().andGoodsUserIdEqualTo(userId).andDeletedEqualTo(false);
+        }
         example.setOrderByClause(LitemallFootprint.Column.addTime.desc());
         PageHelper.startPage(page, size);
         return footprintMapper.selectByExample(example);
@@ -44,15 +48,18 @@ public class LitemallFootprintService {
         footprintMapper.insertSelective(footprint);
     }
 
-    public List<LitemallFootprint> querySelective(String userId, String goodsId, Integer page, Integer size, String sort, String order) {
+    public List<LitemallFootprint> querySelective(String userName, String goodsName, Integer type, Integer page, Integer size, String sort, String order) {
         LitemallFootprintExample example = new LitemallFootprintExample();
         LitemallFootprintExample.Criteria criteria = example.createCriteria();
 
-        if (!StringUtils.isEmpty(userId)) {
-            criteria.andUserIdEqualTo(Integer.valueOf(userId));
+        if (!StringUtils.isEmpty(userName)) {
+            criteria.andUserNameLike("%" + userName + "%");
+        }
+        if (!StringUtils.isEmpty(goodsName)) {
+            criteria.andGoodsNameLike("%" + goodsName + "%");
         }
-        if (!StringUtils.isEmpty(goodsId)) {
-            criteria.andGoodsIdEqualTo(Integer.valueOf(goodsId));
+        if (type != null) {
+            criteria.andTypeEqualTo(type);
         }
         criteria.andDeletedEqualTo(false);
 
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsService.java
index 9ee9a15c..7a96779e 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsService.java
@@ -5,18 +5,26 @@ import org.linlinjava.litemall.db.dao.LitemallGoodsMapper;
 import org.linlinjava.litemall.db.domain.LitemallGoods;
 import org.linlinjava.litemall.db.domain.LitemallGoods.Column;
 import org.linlinjava.litemall.db.domain.LitemallGoodsExample;
+import org.linlinjava.litemall.db.enums.UserType;
+import org.linlinjava.litemall.db.param.GoodsParam;
+import org.linlinjava.litemall.db.param.WorkParam;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 @Service
 public class LitemallGoodsService {
-    Column[] columns = new Column[]{Column.id, Column.name, Column.brief, Column.picUrl, Column.isHot, Column.isNew, Column.counterPrice, Column.retailPrice};
+
+    Column[] columns = new Column[]{Column.id, Column.name, Column.picUrl, Column.currentCity, Column.workCategory, Column.workWay, Column.workStyle, Column.counterPrice, Column.retailPrice};
     @Resource
     private LitemallGoodsMapper goodsMapper;
 
@@ -88,7 +96,7 @@ public class LitemallGoodsService {
     }
 
 
-    public List<LitemallGoods> querySelective(Integer catId, Integer brandId, String keywords, Boolean isHot, Boolean isNew, Integer offset, Integer limit, String sort, String order) {
+    public List<LitemallGoods> querySelective(Integer catId, Integer brandId, String userType, String keywords, Boolean isHot, Boolean isNew, Integer offset, Integer limit, String sort, String order) {
         LitemallGoodsExample example = new LitemallGoodsExample();
         LitemallGoodsExample.Criteria criteria1 = example.or();
         LitemallGoodsExample.Criteria criteria2 = example.or();
@@ -105,6 +113,10 @@ public class LitemallGoodsService {
             criteria1.andIsNewEqualTo(isNew);
             criteria2.andIsNewEqualTo(isNew);
         }
+        if (!StringUtils.isEmpty(userType)) {
+            criteria1.andUserTypeEqualTo(userType);
+            criteria2.andUserTypeEqualTo(userType);
+        }
         if (!StringUtils.isEmpty(isHot)) {
             criteria1.andIsHotEqualTo(isHot);
             criteria2.andIsHotEqualTo(isHot);
@@ -113,6 +125,15 @@ public class LitemallGoodsService {
             criteria1.andKeywordsLike("%" + keywords + "%");
             criteria2.andNameLike("%" + keywords + "%");
         }
+        if (UserType.CUSTOMER.name().equals(userType)) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.set(Calendar.HOUR_OF_DAY, 0);
+            calendar.set(Calendar.MINUTE, 0);
+            calendar.set(Calendar.SECOND, 0);
+            calendar.set(Calendar.MILLISECOND, 0);
+            criteria1.andExpireTimeGreaterOrEqualThan(calendar.getTime());
+            criteria2.andExpireTimeGreaterOrEqualThan(calendar.getTime());
+        }
         criteria1.andIsOnSaleEqualTo(true);
         criteria2.andIsOnSaleEqualTo(true);
         criteria1.andDeletedEqualTo(false);
@@ -127,6 +148,44 @@ public class LitemallGoodsService {
         return goodsMapper.selectByExampleSelective(example);
     }
 
+    public List<LitemallGoods> querySelective(Integer userId, String userType, Integer expireStatus, Integer page, Integer size, String sort, String order) {
+        LitemallGoodsExample example = new LitemallGoodsExample();
+        LitemallGoodsExample.Criteria criteria = example.createCriteria();
+
+        if (userId != null) {
+            criteria.andUserIdEqualTo(userId);
+        }
+
+        if (!StringUtils.isEmpty(userType)) {
+            criteria.andUserTypeEqualTo(userType);
+        }
+
+        if (expireStatus != null && expireStatus == 0) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.set(Calendar.HOUR_OF_DAY, 0);
+            calendar.set(Calendar.MINUTE, 0);
+            calendar.set(Calendar.SECOND, 0);
+            calendar.set(Calendar.MILLISECOND, 0);
+            criteria.andExpireTimeGreaterOrEqualThan(calendar.getTime());
+        } else if (expireStatus != null && expireStatus == 1) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.set(Calendar.HOUR_OF_DAY, 0);
+            calendar.set(Calendar.MINUTE, 0);
+            calendar.set(Calendar.SECOND, 0);
+            calendar.set(Calendar.MILLISECOND, 0);
+            criteria.andExpireTimeLessThan(calendar.getTime());
+        }
+
+        criteria.andDeletedEqualTo(false);
+
+        if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
+            example.setOrderByClause(sort + " " + order);
+        }
+
+        PageHelper.startPage(page, size);
+        return goodsMapper.selectByExampleWithBLOBs(example);
+    }
+
     public List<LitemallGoods> querySelective(Integer goodsId, String goodsSn, String name, Integer page, Integer size, String sort, String order) {
         LitemallGoodsExample example = new LitemallGoodsExample();
         LitemallGoodsExample.Criteria criteria = example.createCriteria();
@@ -170,7 +229,7 @@ public class LitemallGoodsService {
      */
     public LitemallGoods findByIdVO(Integer id) {
         LitemallGoodsExample example = new LitemallGoodsExample();
-        example.or().andIdEqualTo(id).andIsOnSaleEqualTo(true).andDeletedEqualTo(false);
+        example.or().andIdEqualTo(id).andDeletedEqualTo(false);
         return goodsMapper.selectOneByExampleSelective(example, columns);
     }
 
@@ -205,10 +264,11 @@ public class LitemallGoodsService {
      * 获取所有物品总数，包括在售的和下架的，但是不包括已删除的商品
      *
      * @return
+     * @param userType
      */
-    public int count() {
+    public int count(String userType) {
         LitemallGoodsExample example = new LitemallGoodsExample();
-        example.or().andDeletedEqualTo(false);
+        example.createCriteria().andUserTypeEqualTo(userType).andDeletedEqualTo(false);
         return (int) goodsMapper.countByExample(example);
     }
 
@@ -260,11 +320,191 @@ public class LitemallGoodsService {
 
     public LitemallGoods findbyUserId(Integer userId) {
         LitemallGoodsExample example = new LitemallGoodsExample();
-        example.createCriteria().andUserIdEqualTo(userId);
+        example.createCriteria().andUserIdEqualTo(userId).andUserTypeEqualTo(UserType.ZB_EMP.name());
         List<LitemallGoods> litemallGoods = goodsMapper.selectByExampleSelective(example);
         if (litemallGoods == null || litemallGoods.isEmpty()) {
             return null;
         }
         return litemallGoods.get(0);
     }
+
+    public List<LitemallGoods> querySelective(WorkParam param) {
+        LitemallGoodsExample example = new LitemallGoodsExample();
+        LitemallGoodsExample.Criteria criteria = example.createCriteria();
+
+        if (!StringUtils.isEmpty(param.getUserType())) {
+            criteria.andUserTypeEqualTo(param.getUserType());
+        }
+        if (!StringUtils.isEmpty(param.getName())) {
+            criteria.andNameLike("%" + param.getName() + "%");
+        }
+        if (!StringUtils.isEmpty(param.getUserName())) {
+            criteria.andUserNameLike("%" + param.getUserName() + "%");
+        }
+
+        if (!StringUtils.isEmpty(param.getCurrentCity())) {
+            criteria.andCurrentCityEqualTo(param.getCurrentCity());
+        }
+        if (!StringUtils.isEmpty(param.getWorkCategoryValue())) {
+            criteria.andWorkCategoryEqualJsonTo(param.getWorkCategoryValue());
+        }
+        if (!StringUtils.isEmpty(param.getWorkStyleValue())) {
+            criteria.andWorkStyleEqualJsonTo(param.getWorkStyleValue());
+        }
+        if (!StringUtils.isEmpty(param.getWorkWayValue())) {
+            criteria.andWorkWayEqualTo(param.getWorkWayValue());
+        }
+
+        if (!CollectionUtils.isEmpty(param.getCounterPriceRange()) && param.getCounterPriceRange().size() == 2) {
+            if (param.getCounterPriceRange().get(0) != null) {
+                criteria.andCounterPriceGreaterThanOrEqualTo(BigDecimal.valueOf(param.getCounterPriceRange().get(0)));
+            }
+            if (param.getCounterPriceRange().get(1) != null) {
+                criteria.andCounterPriceLessThanOrEqualTo(BigDecimal.valueOf(param.getCounterPriceRange().get(1)));
+            }
+        }
+
+        if (!CollectionUtils.isEmpty(param.getRetailPriceRange()) && param.getRetailPriceRange().size() == 2) {
+            if (param.getRetailPriceRange().get(0) != null) {
+                criteria.andRetailPriceGreaterThanOrEqualTo(BigDecimal.valueOf(param.getRetailPriceRange().get(0)));
+            }
+            if (param.getRetailPriceRange().get(1) != null) {
+                criteria.andRetailPriceLessThanOrEqualTo(BigDecimal.valueOf(param.getRetailPriceRange().get(1)));
+            }
+        }
+
+        criteria.andDeletedEqualTo(false);
+
+        if (!StringUtils.isEmpty(param.getSort()) && !StringUtils.isEmpty(param.getOrder())) {
+            example.setOrderByClause(param.getSort() + " " + param.getOrder());
+        }
+
+        PageHelper.startPage(param.getPage(), param.getLimit());
+        return goodsMapper.selectByExampleWithBLOBs(example);
+    }
+
+    public List<LitemallGoods> querySelective(GoodsParam param) {
+        LitemallGoodsExample example = new LitemallGoodsExample();
+        LitemallGoodsExample.Criteria criteria = example.createCriteria();
+
+        if (!StringUtils.isEmpty(param.getUserType())) {
+            criteria.andUserTypeEqualTo(param.getUserType());
+        }
+        if (!StringUtils.isEmpty(param.getSex())) {
+            criteria.andSexEqualTo(param.getSex());
+        }
+        if (!StringUtils.isEmpty(param.getName())) {
+            criteria.andNameLike("%" + param.getName() + "%");
+        }
+        if (!StringUtils.isEmpty(param.getGoodsSn())) {
+            criteria.andGoodsSnLike("%" + param.getGoodsSn() + "%");
+        }
+
+        if (!StringUtils.isEmpty(param.getProvince())) {
+            criteria.andProvinceEqualTo(param.getProvince());
+        }
+        if (!StringUtils.isEmpty(param.getCity())) {
+            criteria.andCityEqualTo(param.getCity());
+        }
+        if (!StringUtils.isEmpty(param.getCurrentProvince())) {
+            criteria.andCurrentProvinceEqualTo(param.getCurrentProvince());
+        }
+        if (!StringUtils.isEmpty(param.getCurrentCity())) {
+            criteria.andCurrentCityEqualTo(param.getCurrentCity());
+        }
+        if (!StringUtils.isEmpty(param.getGoodCategoryValue())) {
+            criteria.andGoodCategoryEqualJsonTo(param.getGoodCategoryValue());
+        }
+        if (!StringUtils.isEmpty(param.getWorkStyleValue())) {
+            criteria.andWorkStyleEqualJsonTo(param.getWorkStyleValue());
+        }
+        if (!StringUtils.isEmpty(param.getWorkWayValue())) {
+            criteria.andWorkWayEqualTo(param.getWorkWayValue());
+        }
+        if (!StringUtils.isEmpty(param.getLanguageValue())) {
+            criteria.andLanguageEqualTo(param.getLanguageValue());
+        }
+        if (!StringUtils.isEmpty(param.getDegreeValue())) {
+            criteria.andDegreeEqualTo(param.getDegreeValue());
+        }
+        if (!StringUtils.isEmpty(param.getWorkTypeValue())) {
+            criteria.andWorkCategoryEqualJsonTo(param.getWorkTypeValue());
+        }
+        if (!StringUtils.isEmpty(param.getAccountTypeValue())) {
+            criteria.andAccountTypeEqualJsonTo(param.getAccountTypeValue());
+        }
+
+        if (!CollectionUtils.isEmpty(param.getBirthdayRange()) && param.getBirthdayRange().size() == 2) {
+            SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.000'Z'");
+            try {
+                Date beginTime = new Date(dateTimeFormat.parse(param.getBirthdayRange().get(0)).getTime() + 28800000);;
+                Date endTime = new Date(dateTimeFormat.parse(param.getBirthdayRange().get(1)).getTime() + 28800000);;
+                criteria.andBirthdayBetween(beginTime, endTime);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if (!CollectionUtils.isEmpty(param.getHeightRange()) && param.getHeightRange().size() == 2) {
+            if (param.getHeightRange().get(0) != null) {
+                criteria.andHeightGreaterThanOrEqualTo(BigDecimal.valueOf(param.getHeightRange().get(0)));
+            }
+            if (param.getHeightRange().get(1) != null) {
+                criteria.andHeightLessThanOrEqualTo(BigDecimal.valueOf(param.getHeightRange().get(1)));
+            }
+        }
+
+        if (!CollectionUtils.isEmpty(param.getWeightRange()) && param.getWeightRange().size() == 2) {
+            if (param.getWeightRange().get(0) != null) {
+                criteria.andWeightGreaterThanOrEqualTo(BigDecimal.valueOf(param.getWeightRange().get(0)));
+            }
+            if (param.getWeightRange().get(1) != null) {
+                criteria.andWeightLessThanOrEqualTo(BigDecimal.valueOf(param.getWeightRange().get(1)));
+            }
+        }
+
+        if (!CollectionUtils.isEmpty(param.getCounterPriceRange()) && param.getCounterPriceRange().size() == 2) {
+            if (param.getCounterPriceRange().get(0) != null) {
+                criteria.andCounterPriceGreaterThanOrEqualTo(BigDecimal.valueOf(param.getCounterPriceRange().get(0)));
+            }
+            if (param.getCounterPriceRange().get(1) != null) {
+                criteria.andCounterPriceLessThanOrEqualTo(BigDecimal.valueOf(param.getCounterPriceRange().get(1)));
+            }
+        }
+
+        criteria.andDeletedEqualTo(false);
+
+        if (!StringUtils.isEmpty(param.getSort()) && !StringUtils.isEmpty(param.getOrder())) {
+            example.setOrderByClause(param.getSort() + " " + param.getOrder());
+        }
+
+        PageHelper.startPage(param.getPage(), param.getLimit());
+        return goodsMapper.selectByExampleWithBLOBs(example);
+    }
+
+    public List<LitemallGoods> querySelective(Integer goodsId, String goodsSn, String name, String userType, Integer page, Integer size, String sort, String order) {
+        LitemallGoodsExample example = new LitemallGoodsExample();
+        LitemallGoodsExample.Criteria criteria = example.createCriteria();
+
+        if (goodsId != null) {
+            criteria.andIdEqualTo(goodsId);
+        }
+        if (!StringUtils.isEmpty(goodsSn)) {
+            criteria.andGoodsSnEqualTo(goodsSn);
+        }
+        if (!StringUtils.isEmpty(userType)) {
+            criteria.andUserTypeEqualTo(userType);
+        }
+        if (!StringUtils.isEmpty(name)) {
+            criteria.andNameLike("%" + name + "%");
+        }
+        criteria.andDeletedEqualTo(false);
+
+        if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
+            example.setOrderByClause(sort + " " + order);
+        }
+
+        PageHelper.startPage(page, size);
+        return goodsMapper.selectByExampleWithBLOBs(example);
+    }
 }
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallNoticeAdminService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallNoticeAdminService.java
index 78cf8d19..311c91c6 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallNoticeAdminService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallNoticeAdminService.java
@@ -15,14 +15,16 @@ public class LitemallNoticeAdminService {
     @Resource
     private LitemallNoticeAdminMapper noticeAdminMapper;
 
-    public List<LitemallNoticeAdmin> querySelective(String title, String type, Integer adminId, Integer page, Integer limit, String sort, String order) {
+    public List<LitemallNoticeAdmin> querySelective(String title, String type, Integer adminId, Integer adminType, Integer page, Integer limit, String sort, String order) {
         LitemallNoticeAdminExample example = new LitemallNoticeAdminExample();
         LitemallNoticeAdminExample.Criteria criteria = example.createCriteria();
 
         if(!StringUtils.isEmpty(title)){
             criteria.andNoticeTitleLike("%" + title + "%");
         }
-
+        if (adminType != null) {
+            criteria.andAdminTypeEqualTo(adminType);
+        }
         if(type.equals("read")){
          criteria.andReadTimeIsNotNull();
         }
@@ -40,9 +42,9 @@ public class LitemallNoticeAdminService {
         return noticeAdminMapper.selectByExample(example);
     }
 
-    public LitemallNoticeAdmin find(Integer noticeId, Integer adminId) {
+    public LitemallNoticeAdmin find(Integer noticeId, Integer adminId, Integer adminType) {
         LitemallNoticeAdminExample example = new LitemallNoticeAdminExample();
-        example.or().andNoticeIdEqualTo(noticeId).andAdminIdEqualTo(adminId).andDeletedEqualTo(false);
+        example.or().andNoticeIdEqualTo(noticeId).andAdminIdEqualTo(adminId).andAdminTypeEqualTo(adminType).andDeletedEqualTo(false);
         return noticeAdminMapper.selectOneByExample(example);
     }
 
@@ -85,9 +87,9 @@ public class LitemallNoticeAdminService {
         noticeAdminMapper.updateByExampleSelective(noticeAdmin, example);
     }
 
-    public int countUnread(Integer adminId) {
+    public int countUnread(Integer adminId, Integer adminType) {
         LitemallNoticeAdminExample example = new LitemallNoticeAdminExample();
-        example.or().andAdminIdEqualTo(adminId).andReadTimeIsNull().andDeletedEqualTo(false);
+        example.or().andAdminIdEqualTo(adminId).andAdminTypeEqualTo(adminType).andReadTimeIsNull().andDeletedEqualTo(false);
         return (int)noticeAdminMapper.countByExample(example);
     }
 
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallTopicService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallTopicService.java
index b8969bf0..2a4f625b 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallTopicService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallTopicService.java
@@ -5,6 +5,7 @@ import org.linlinjava.litemall.db.dao.LitemallTopicMapper;
 import org.linlinjava.litemall.db.domain.LitemallTopic;
 import org.linlinjava.litemall.db.domain.LitemallTopic.Column;
 import org.linlinjava.litemall.db.domain.LitemallTopicExample;
+import org.linlinjava.litemall.db.param.TopicParam;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -63,6 +64,44 @@ public class LitemallTopicService {
         return queryList(offset, limit, "add_time", "desc");
     }
 
+    public List<LitemallTopic> querySelective(TopicParam param) {
+        LitemallTopicExample example = new LitemallTopicExample();
+        LitemallTopicExample.Criteria criteria = example.createCriteria();
+
+        if (!StringUtils.isEmpty(param.getTitle())) {
+            criteria.andTitleLike("%" + param.getTitle() + "%");
+        }
+        if (!StringUtils.isEmpty(param.getSubtitle())) {
+            criteria.andSubtitleLike("%" + param.getSubtitle() + "%");
+        }
+
+        if (!StringUtils.isEmpty(param.getContact())) {
+            criteria.andContactLike("%" + param.getContact() + "%");
+        }
+        if (!StringUtils.isEmpty(param.getContactMobile())) {
+            criteria.andContactMobileLike("%" + param.getContactMobile() + "%");
+        }
+        if (!StringUtils.isEmpty(param.getProvince())) {
+            criteria.andProvinceEqualTo(param.getProvince());
+        }
+        if (!StringUtils.isEmpty(param.getCity())) {
+            criteria.andCityEqualTo(param.getCity());
+        }
+        if (!StringUtils.isEmpty(param.getAddress())) {
+            criteria.andAddressLike("%" + param.getAddress() + "%");
+        }
+
+
+        criteria.andDeletedEqualTo(false);
+
+        if (!StringUtils.isEmpty(param.getSort()) && !StringUtils.isEmpty(param.getOrder())) {
+            example.setOrderByClause(param.getSort() + " " + param.getOrder());
+        }
+
+        PageHelper.startPage(param.getPage(), param.getLimit());
+        return topicMapper.selectByExampleWithBLOBs(example);
+    }
+
     public List<LitemallTopic> querySelective(String title, String subtitle, Integer page, Integer limit, String sort, String order) {
         LitemallTopicExample example = new LitemallTopicExample();
         LitemallTopicExample.Criteria criteria = example.createCriteria();
@@ -110,6 +149,13 @@ public class LitemallTopicService {
         topicMapper.updateByExampleSelective(topic, example);
     }
 
+    public List<LitemallTopic> findByUserIds(List<Integer> userIds) {
+        LitemallTopicExample example = new LitemallTopicExample();
+        example.createCriteria().andUserIdIn(userIds);
+        List<LitemallTopic> topics = topicMapper.selectByExampleSelective(example);
+        return topics;
+    }
+
     public LitemallTopic findByUserId(Integer userId) {
         LitemallTopicExample example = new LitemallTopicExample();
         example.createCriteria().andUserIdEqualTo(userId);
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallUserService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallUserService.java
index 91210861..e2518783 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallUserService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallUserService.java
@@ -2,9 +2,9 @@ package org.linlinjava.litemall.db.service;
 
 import com.github.pagehelper.PageHelper;
 import org.linlinjava.litemall.db.dao.LitemallUserMapper;
-import org.linlinjava.litemall.db.domain.LitemallUser;
-import org.linlinjava.litemall.db.domain.LitemallUserExample;
-import org.linlinjava.litemall.db.domain.UserVo;
+import org.linlinjava.litemall.db.domain.*;
+import org.linlinjava.litemall.db.enums.UserType;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -17,8 +17,28 @@ public class LitemallUserService {
     @Resource
     private LitemallUserMapper userMapper;
 
+    @Resource
+    private LitemallGoodsService goodsService;
+
+    @Resource
+    private LitemallTopicService topicService;
+
     public LitemallUser findById(Integer userId) {
-        return userMapper.selectByPrimaryKey(userId);
+        LitemallUser user = userMapper.selectByPrimaryKey(userId);
+        if (UserType.ZB_EMP.equals(user.getUserType())) {
+            LitemallGoods goods = goodsService.findbyUserId(userId);
+            if (goods != null) {
+                user.setNickname(goods.getName());
+                user.setAvatar(goods.getPicUrl());
+            }
+        } else {
+            LitemallTopic topic = topicService.findByUserId(userId);
+            if (topic != null) {
+                user.setNickname(topic.getTitle());
+                user.setAvatar(topic.getPicUrl());
+            }
+        }
+        return user;
     }
 
     public UserVo findUserVoById(Integer userId) {
@@ -103,4 +123,14 @@ public class LitemallUserService {
     public void deleteById(Integer id) {
         userMapper.logicalDeleteByPrimaryKey(id);
     }
+
+    public List<LitemallUser> queryByUserType(String userType) {
+        LitemallUserExample example = new LitemallUserExample();
+        if (StringUtils.isEmpty(userType)) {
+            example.or().andDeletedEqualTo(false);
+        } else {
+            example.or().andUserTypeEqualTo(userType).andDeletedEqualTo(false);
+        }
+        return userMapper.selectByExample(example);
+    }
 }
diff --git a/litemall-db/src/main/resources/application-db.yml b/litemall-db/src/main/resources/application-db.yml
index 1e6cd8c7..8b3c8392 100644
--- a/litemall-db/src/main/resources/application-db.yml
+++ b/litemall-db/src/main/resources/application-db.yml
@@ -7,21 +7,25 @@ pagehelper:
 spring:
   datasource:
     druid:
-      url:  jdbc:mysql://124.222.53.90:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
+#      url:  jdbc:mysql://124.222.53.90:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
+#      driver-class-name:  com.mysql.cj.jdbc.Driver
+#      username:  mysql
+#      password:  czy@2024
+      url:  jdbc:mysql://127.0.0.1:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
       driver-class-name:  com.mysql.cj.jdbc.Driver
-      username:  mysql
-      password:  czy@2024
-      initial-size:  10
-      max-active:  50
-      min-idle:  10
-      max-wait:  60000
-      pool-prepared-statements:  true
-      max-pool-prepared-statement-per-connection-size:  20
-      validation-query:  SELECT 1 FROM DUAL
-      test-on-borrow:  false
-      test-on-return:  false
-      test-while-idle:  true
-      time-between-eviction-runs-millis:  60000
+      username:  root
+      password:  xnai@QWE123
+      min-idle: 10
+      max-active: 50
+      # 获取数据库连接等待的超时时间
+      max-wait: 60000
+      # 配置多久进行一次检测，检测需要关闭的空闲连接 单位毫秒
+      time-between-eviction-runs-millis: 600000
+      min-evictable-idle-time-millis: 300000
+      validation-query: SELECT 1 FROM DUAL
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
       webStatFilter:
         enabled: true
       statViewServlet:
diff --git a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallFootprintMapper.xml b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallFootprintMapper.xml
index 568eacc3..c1d20f63 100644
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallFootprintMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallFootprintMapper.xml
@@ -8,7 +8,11 @@
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="user_id" jdbcType="INTEGER" property="userId" />
+    <result column="user_name" jdbcType="VARCHAR" property="userName" />
+    <result column="goods_user_id" jdbcType="INTEGER" property="goodsUserId" />
     <result column="goods_id" jdbcType="INTEGER" property="goodsId" />
+    <result column="goods_name" jdbcType="VARCHAR" property="goodsName" />
+    <result column="type" jdbcType="INTEGER" property="type" />
     <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="deleted" jdbcType="BIT" property="deleted" />
@@ -84,7 +88,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, user_id, goods_id, add_time, update_time, deleted
+    id, user_id, user_name, goods_user_id, goods_id, goods_name, `type`, add_time, update_time, deleted
   </sql>
   <select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallFootprintExample" resultMap="BaseResultMap">
     <!--
@@ -205,9 +209,9 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into litemall_footprint (user_id, goods_id, add_time, 
+    insert into litemall_footprint (user_id, user_name, goods_user_id, goods_id, goods_name, `type`, add_time,
       update_time, deleted)
-    values (#{userId,jdbcType=INTEGER}, #{goodsId,jdbcType=INTEGER}, #{addTime,jdbcType=TIMESTAMP}, 
+    values (#{userId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{goodsUserId,jdbcType=INTEGER}, #{goodsId,jdbcType=INTEGER}, #{goodsName,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{addTime,jdbcType=TIMESTAMP},
       #{updateTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT})
   </insert>
   <insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallFootprint">
@@ -223,9 +227,21 @@
       <if test="userId != null">
         user_id,
       </if>
+      <if test="userName != null">
+        user_name,
+      </if>
+      <if test="goodsUserId != null">
+        goods_user_id,
+      </if>
       <if test="goodsId != null">
         goods_id,
       </if>
+      <if test="goodsName != null">
+        goods_name,
+      </if>
+      <if test="type != null">
+        `type`,
+      </if>
       <if test="addTime != null">
         add_time,
       </if>
@@ -240,9 +256,21 @@
       <if test="userId != null">
         #{userId,jdbcType=INTEGER},
       </if>
+      <if test="userName != null">
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="goodsUserId != null">
+        #{goodsUserId,jdbcType=INTEGER},
+      </if>
       <if test="goodsId != null">
         #{goodsId,jdbcType=INTEGER},
       </if>
+      <if test="goodsName != null">
+        #{goodsName,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
       <if test="addTime != null">
         #{addTime,jdbcType=TIMESTAMP},
       </if>
@@ -274,12 +302,24 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=INTEGER},
       </if>
+      <if test="record.userName != null">
+        user_name = #{record.userId,jdbcType=VARCHAR},
+      </if>
       <if test="record.userId != null">
         user_id = #{record.userId,jdbcType=INTEGER},
       </if>
+      <if test="record.goodsUserId != null">
+        goods_user_id = #{record.goodsUserId,jdbcType=INTEGER},
+      </if>
       <if test="record.goodsId != null">
         goods_id = #{record.goodsId,jdbcType=INTEGER},
       </if>
+      <if test="record.goodsName != null">
+        goods_name = #{record.goodsName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.type != null">
+        `type` = #{record.type,jdbcType=INTEGER},
+      </if>
       <if test="record.addTime != null">
         add_time = #{record.addTime,jdbcType=TIMESTAMP},
       </if>
@@ -302,7 +342,11 @@
     update litemall_footprint
     set id = #{record.id,jdbcType=INTEGER},
       user_id = #{record.userId,jdbcType=INTEGER},
+      user_name = #{record.userName,jdbcType=VARCHAR},
+      goods_user_id = #{record.goodsUserId,jdbcType=INTEGER},
       goods_id = #{record.goodsId,jdbcType=INTEGER},
+      goods_name = #{record.goodsName,jdbcType=VARCHAR},
+      `type` = #{record.type,jdbcType=INTEGER},
       add_time = #{record.addTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       deleted = #{record.deleted,jdbcType=BIT}
@@ -320,12 +364,24 @@
       <if test="userId != null">
         user_id = #{userId,jdbcType=INTEGER},
       </if>
+      <if test="userName != null">
+        user_name = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="goodsUserId != null">
+        goods_user_id = #{goodsUserId,jdbcType=INTEGER},
+      </if>
       <if test="goodsId != null">
         goods_id = #{goodsId,jdbcType=INTEGER},
       </if>
+      <if test="goodsName != null">
+        goods_name = #{goodsName,jdbcType=VARCHAR},
+      </if>
       <if test="addTime != null">
         add_time = #{addTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="type != null">
+        `type` = #{type,jdbcType=INTEGER},
+      </if>
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
@@ -342,7 +398,11 @@
     -->
     update litemall_footprint
     set user_id = #{userId,jdbcType=INTEGER},
+      user_name = #{userName,jdbcType=VARCHAR},
+      goods_user_id = #{goodsUserId,jdbcType=INTEGER},
       goods_id = #{goodsId,jdbcType=INTEGER},
+      goods_name = #{goodsName,jdbcType=VARCHAR},
+      `type` = #{type,jdbcType=INTEGER},
       add_time = #{addTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       deleted = #{deleted,jdbcType=BIT}
diff --git a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsMapper.xml b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsMapper.xml
index d762c980..de177730 100644
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsMapper.xml
@@ -10,7 +10,7 @@
     <result column="goods_sn" jdbcType="VARCHAR" property="goodsSn" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="sex" jdbcType="INTEGER" property="sex" />
-    <result column="birthday" jdbcType="DATE" property="birthday" />
+    <result column="birthday" jdbcType="TIMESTAMP" property="birthday" />
     <result column="height" jdbcType="DECIMAL" property="height" />
     <result column="weight" jdbcType="DECIMAL" property="weight" />
     <result column="province" jdbcType="VARCHAR" property="province" />
@@ -35,6 +35,8 @@
     <result column="category_id" jdbcType="INTEGER" property="categoryId" />
     <result column="brand_id" jdbcType="INTEGER" property="brandId" />
     <result column="user_id" jdbcType="INTEGER" property="userId" />
+    <result column="user_name" jdbcType="VARCHAR" property="userName" />
+    <result column="user_type" jdbcType="VARCHAR" property="userType" />
     <result column="gallery" jdbcType="VARCHAR" property="gallery" typeHandler="org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler" />
     <result column="keywords" jdbcType="VARCHAR" property="keywords" />
     <result column="brief" jdbcType="VARCHAR" property="brief" />
@@ -173,9 +175,9 @@
     province, province_code, city, city_code, county, county_code,
     current_province, current_province_code, current_city, current_city_code, current_county, current_county_code,
     `degree`, `language`, work_way, work_category, good_category, account_type, work_style,
-    category_id, brand_id, gallery, keywords, brief, is_on_sale,
+    category_id, brand_id, user_id, user_name, user_type, gallery, keywords, brief, is_on_sale,
     sort_order, pic_url, share_url, video_url, is_new, is_hot, unit, counter_price, retail_price,
-    add_time, update_time, deleted
+    expire_time, add_time, update_time, deleted
   </sql>
   <sql id="Blob_Column_List">
     <!--
@@ -337,24 +339,24 @@
       current_province, current_province_code, current_city, current_city_code, current_county, current_county_code,
       `degree`, `language`, work_way, work_category, good_category, account_type, work_style,
       category_id,
-      brand_id, user_id, gallery,
+      brand_id, user_id, user_name, user_type, gallery,
       keywords, brief, is_on_sale, 
       sort_order, pic_url, share_url, video_url,
       is_new, is_hot, unit, counter_price,
-      retail_price, add_time, update_time, 
+      retail_price, expire_time, add_time, update_time,
       deleted, detail)
     values (#{goodsSn,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
-      #{sex,jdbcType=INTEGER}, #{birthday,jdbcType=DECIMAL}, #{height,jdbcType=DECIMAL},  #{weight,jdbcType=DECIMAL},
+      #{sex,jdbcType=INTEGER}, #{birthday,jdbcType=TIMESTAMP}, #{height,jdbcType=DECIMAL},  #{weight,jdbcType=DECIMAL},
       #{province,jdbcType=VARCHAR}, #{provinceCode,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{cityCode,jdbcType=VARCHAR}, #{county,jdbcType=VARCHAR}, #{countyCode,jdbcType=VARCHAR},
       #{currentProvince,jdbcType=VARCHAR}, #{currentProvinceCode,jdbcType=VARCHAR}, #{currentCity,jdbcType=VARCHAR}, #{currentCityCode,jdbcType=VARCHAR}, #{currentCounty,jdbcType=VARCHAR}, #{currentCountyCode,jdbcType=VARCHAR},
       #{degree,jdbcType=VARCHAR}, #{language,jdbcType=VARCHAR}, #{workWay,jdbcType=VARCHAR},
       #{workCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler}, #{goodCategory,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler}, #{accountType,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler}, #{workStyle,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       #{categoryId,jdbcType=INTEGER},
-      #{brandId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      #{brandId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{userType,jdbcType=VARCHAR}, #{gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       #{keywords,jdbcType=VARCHAR}, #{brief,jdbcType=VARCHAR}, #{isOnSale,jdbcType=BIT}, 
       #{sortOrder,jdbcType=SMALLINT}, #{picUrl,jdbcType=VARCHAR}, #{shareUrl,jdbcType=VARCHAR}, #{videoUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
     #{isNew,jdbcType=BIT}, #{isHot,jdbcType=BIT}, #{unit,jdbcType=VARCHAR}, #{counterPrice,jdbcType=DECIMAL},
-      #{retailPrice,jdbcType=DECIMAL}, #{addTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{retailPrice,jdbcType=DECIMAL}, #{expireTime,jdbcType=TIMESTAMP}, #{addTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
       #{deleted,jdbcType=BIT}, #{detail,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallGoods">
@@ -451,6 +453,12 @@
       <if test="userId != null">
         user_id,
       </if>
+      <if test="userName != null">
+        user_name,
+      </if>
+      <if test="userType != null">
+        user_type,
+      </if>
       <if test="gallery != null">
         gallery,
       </if>
@@ -490,6 +498,9 @@
       <if test="retailPrice != null">
         retail_price,
       </if>
+      <if test="expireTime != null">
+        expire_time,
+      </if>
       <if test="addTime != null">
         add_time,
       </if>
@@ -514,7 +525,7 @@
         #{sex,jdbcType=INTEGER},
       </if>
       <if test="birthday != null">
-        #{birthday,jdbcType=DATE},
+        #{birthday,jdbcType=TIMESTAMP},
       </if>
       <if test="height != null">
         #{height,jdbcType=DECIMAL},
@@ -588,6 +599,12 @@
       <if test="userId != null">
         #{userId,jdbcType=INTEGER},
       </if>
+      <if test="userName != null">
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="userType != null">
+        #{userType,jdbcType=VARCHAR},
+      </if>
       <if test="gallery != null">
         #{gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       </if>
@@ -627,6 +644,9 @@
       <if test="retailPrice != null">
         #{retailPrice,jdbcType=DECIMAL},
       </if>
+      <if test="expireTime != null">
+        #{expireTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="addTime != null">
         #{addTime,jdbcType=TIMESTAMP},
       </if>
@@ -672,7 +692,7 @@
         sex = #{record.sex,jdbcType=INTEGER},
       </if>
       <if test="record.birthday != null">
-        birthday = #{record.birthday,jdbcType=DATE},
+        birthday = #{record.birthday,jdbcType=TIMESTAMP},
       </if>
       <if test="record.height != null">
         height = #{record.height,jdbcType=DECIMAL},
@@ -746,6 +766,12 @@
       <if test="record.userId != null">
         user_id = #{record.userId,jdbcType=INTEGER},
       </if>
+      <if test="record.userName != null">
+        user_name = #{record.userName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userType != null">
+        user_type = #{record.userType,jdbcType=VARCHAR},
+      </if>
       <if test="record.gallery != null">
         gallery = #{record.gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       </if>
@@ -785,6 +811,9 @@
       <if test="record.retailPrice != null">
         retail_price = #{record.retailPrice,jdbcType=DECIMAL},
       </if>
+      <if test="record.expireTime != null">
+        expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="record.addTime != null">
         add_time = #{record.addTime,jdbcType=TIMESTAMP},
       </if>
@@ -812,7 +841,7 @@
       goods_sn = #{record.goodsSn,jdbcType=VARCHAR},
       `name` = #{record.name,jdbcType=VARCHAR},
       sex = #{sex,jdbcType=INTEGER},
-      birthday = #{birthday,jdbcType=DATE},
+      birthday = #{birthday,jdbcType=TIMESTAMP},
       height = #{height,jdbcType=DECIMAL},
       weight = #{weight,jdbcType=DECIMAL},
       province = #{province,jdbcType=VARCHAR},
@@ -837,6 +866,8 @@
       category_id = #{record.categoryId,jdbcType=INTEGER},
       brand_id = #{record.brandId,jdbcType=INTEGER},
       user_id = #{record.userId,jdbcType=INTEGER},
+      user_name = #{record.userName,jdbcType=VARCHAR},
+      user_type = #{record.userType,jdbcType=VARCHAR},
       gallery = #{record.gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       keywords = #{record.keywords,jdbcType=VARCHAR},
       brief = #{record.brief,jdbcType=VARCHAR},
@@ -850,6 +881,7 @@
       unit = #{record.unit,jdbcType=VARCHAR},
       counter_price = #{record.counterPrice,jdbcType=DECIMAL},
       retail_price = #{record.retailPrice,jdbcType=DECIMAL},
+      expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
       add_time = #{record.addTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       deleted = #{record.deleted,jdbcType=BIT},
@@ -868,7 +900,7 @@
       goods_sn = #{record.goodsSn,jdbcType=VARCHAR},
       `name` = #{record.name,jdbcType=VARCHAR},
       sex = #{sex,jdbcType=INTEGER},
-      birthday = #{birthday,jdbcType=DATE},
+      birthday = #{birthday,jdbcType=TIMESTAMP},
       height = #{height,jdbcType=DECIMAL},
       weight = #{weight,jdbcType=DECIMAL},
       province = #{province,jdbcType=VARCHAR},
@@ -893,6 +925,8 @@
       category_id = #{record.categoryId,jdbcType=INTEGER},
       brand_id = #{record.brandId,jdbcType=INTEGER},
       user_id = #{record.userId,jdbcType=INTEGER},
+      user_name = #{record.userName,jdbcType=VARCHAR},
+      user_type = #{record.userType,jdbcType=VARCHAR},
       gallery = #{record.gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       keywords = #{record.keywords,jdbcType=VARCHAR},
       brief = #{record.brief,jdbcType=VARCHAR},
@@ -906,6 +940,7 @@
       unit = #{record.unit,jdbcType=VARCHAR},
       counter_price = #{record.counterPrice,jdbcType=DECIMAL},
       retail_price = #{record.retailPrice,jdbcType=DECIMAL},
+      expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
       add_time = #{record.addTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       deleted = #{record.deleted,jdbcType=BIT}
@@ -930,7 +965,7 @@
         sex = #{sex,jdbcType=INTEGER},
       </if>
       <if test="birthday != null">
-        birthday = #{birthday,jdbcType=DATE},
+        birthday = #{birthday,jdbcType=TIMESTAMP},
       </if>
       <if test="height != null">
         height = #{height,jdbcType=DECIMAL},
@@ -1004,6 +1039,12 @@
       <if test="userId != null">
         user_id = #{userId,jdbcType=INTEGER},
       </if>
+      <if test="userName != null">
+        user_name = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="userType != null">
+        user_type = #{userType,jdbcType=VARCHAR},
+      </if>
       <if test="gallery != null">
         gallery = #{gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       </if>
@@ -1043,6 +1084,9 @@
       <if test="retailPrice != null">
         retail_price = #{retailPrice,jdbcType=DECIMAL},
       </if>
+      <if test="expireTime != null">
+        expire_time = #{expireTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="addTime != null">
         add_time = #{addTime,jdbcType=TIMESTAMP},
       </if>
@@ -1067,7 +1111,7 @@
     set goods_sn = #{goodsSn,jdbcType=VARCHAR},
       `name` = #{name,jdbcType=VARCHAR},
       sex = #{sex,jdbcType=INTEGER},
-      birthday = #{birthday,jdbcType=DATE},
+      birthday = #{birthday,jdbcType=TIMESTAMP},
       height = #{height,jdbcType=DECIMAL},
       weight = #{weight,jdbcType=DECIMAL},
       province = #{province,jdbcType=VARCHAR},
@@ -1092,6 +1136,8 @@
       category_id = #{categoryId,jdbcType=INTEGER},
       brand_id = #{brandId,jdbcType=INTEGER},
       user_id = #{userId,jdbcType=INTEGER},
+      user_name = #{userName,jdbcType=VARCHAR},
+      user_type = #{userType,jdbcType=VARCHAR},
       gallery = #{gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       keywords = #{keywords,jdbcType=VARCHAR},
       brief = #{brief,jdbcType=VARCHAR},
@@ -1105,6 +1151,7 @@
       unit = #{unit,jdbcType=VARCHAR},
       counter_price = #{counterPrice,jdbcType=DECIMAL},
       retail_price = #{retailPrice,jdbcType=DECIMAL},
+      expire_time = #{expireTime,jdbcType=TIMESTAMP},
       add_time = #{addTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       deleted = #{deleted,jdbcType=BIT},
@@ -1120,7 +1167,7 @@
     set goods_sn = #{goodsSn,jdbcType=VARCHAR},
       `name` = #{name,jdbcType=VARCHAR},
       sex = #{sex,jdbcType=INTEGER},
-      birthday = #{birthday,jdbcType=DATE},
+      birthday = #{birthday,jdbcType=TIMESTAMP},
       height = #{height,jdbcType=DECIMAL},
       weight = #{weight,jdbcType=DECIMAL},
       province = #{province,jdbcType=VARCHAR},
@@ -1145,6 +1192,8 @@
       category_id = #{categoryId,jdbcType=INTEGER},
       brand_id = #{brandId,jdbcType=INTEGER},
       user_id = #{userId,jdbcType=INTEGER},
+      user_name = #{userName,jdbcType=VARCHAR},
+      user_type = #{userType,jdbcType=VARCHAR},
       gallery = #{gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       keywords = #{keywords,jdbcType=VARCHAR},
       brief = #{brief,jdbcType=VARCHAR},
@@ -1158,6 +1207,7 @@
       unit = #{unit,jdbcType=VARCHAR},
       counter_price = #{counterPrice,jdbcType=DECIMAL},
       retail_price = #{retailPrice,jdbcType=DECIMAL},
+      expire_time = #{expireTime,jdbcType=TIMESTAMP},
       add_time = #{addTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       deleted = #{deleted,jdbcType=BIT}
diff --git a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallNoticeAdminMapper.xml b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallNoticeAdminMapper.xml
index 93cb203d..2c999f2e 100644
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallNoticeAdminMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallNoticeAdminMapper.xml
@@ -10,6 +10,7 @@
     <result column="notice_id" jdbcType="INTEGER" property="noticeId" />
     <result column="notice_title" jdbcType="VARCHAR" property="noticeTitle" />
     <result column="admin_id" jdbcType="INTEGER" property="adminId" />
+    <result column="admin_type" jdbcType="INTEGER" property="adminType" />
     <result column="read_time" jdbcType="TIMESTAMP" property="readTime" />
     <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -86,7 +87,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, notice_id, notice_title, admin_id, read_time, add_time, update_time, deleted
+    id, notice_id, notice_title, admin_id, admin_type, read_time, add_time, update_time, deleted
   </sql>
   <select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallNoticeAdminExample" resultMap="BaseResultMap">
     <!--
@@ -207,10 +208,10 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into litemall_notice_admin (notice_id, notice_title, admin_id, 
+    insert into litemall_notice_admin (notice_id, notice_title, admin_id, adminType,
       read_time, add_time, update_time, 
       deleted)
-    values (#{noticeId,jdbcType=INTEGER}, #{noticeTitle,jdbcType=VARCHAR}, #{adminId,jdbcType=INTEGER}, 
+    values (#{noticeId,jdbcType=INTEGER}, #{noticeTitle,jdbcType=VARCHAR}, #{adminId,jdbcType=INTEGER}, #{adminType,jdbcType=INTEGER},
       #{readTime,jdbcType=TIMESTAMP}, #{addTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{deleted,jdbcType=BIT})
   </insert>
@@ -233,6 +234,9 @@
       <if test="adminId != null">
         admin_id,
       </if>
+      <if test="adminType != null">
+        admin_type,
+      </if>
       <if test="readTime != null">
         read_time,
       </if>
@@ -256,6 +260,9 @@
       <if test="adminId != null">
         #{adminId,jdbcType=INTEGER},
       </if>
+      <if test="adminType != null">
+        #{adminType,jdbcType=INTEGER},
+      </if>
       <if test="readTime != null">
         #{readTime,jdbcType=TIMESTAMP},
       </if>
@@ -299,6 +306,9 @@
       <if test="record.adminId != null">
         admin_id = #{record.adminId,jdbcType=INTEGER},
       </if>
+      <if test="record.adminType != null">
+        admin_type = #{record.adminType,jdbcType=INTEGER},
+      </if>
       <if test="record.readTime != null">
         read_time = #{record.readTime,jdbcType=TIMESTAMP},
       </if>
@@ -326,6 +336,7 @@
       notice_id = #{record.noticeId,jdbcType=INTEGER},
       notice_title = #{record.noticeTitle,jdbcType=VARCHAR},
       admin_id = #{record.adminId,jdbcType=INTEGER},
+      admin_type = #{record.adminType,jdbcType=INTEGER},
       read_time = #{record.readTime,jdbcType=TIMESTAMP},
       add_time = #{record.addTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
@@ -350,6 +361,9 @@
       <if test="adminId != null">
         admin_id = #{adminId,jdbcType=INTEGER},
       </if>
+      <if test="adminType != null">
+        admin_type = #{adminType,jdbcType=INTEGER},
+      </if>
       <if test="readTime != null">
         read_time = #{readTime,jdbcType=TIMESTAMP},
       </if>
@@ -374,6 +388,7 @@
     set notice_id = #{noticeId,jdbcType=INTEGER},
       notice_title = #{noticeTitle,jdbcType=VARCHAR},
       admin_id = #{adminId,jdbcType=INTEGER},
+      admin_type = #{adminType,jdbcType=INTEGER},
       read_time = #{readTime,jdbcType=TIMESTAMP},
       add_time = #{addTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
diff --git a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallNoticeMapper.xml b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallNoticeMapper.xml
index c57f947b..db70a6f7 100644
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallNoticeMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallNoticeMapper.xml
@@ -8,8 +8,9 @@
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="title" jdbcType="VARCHAR" property="title" />
-    <result column="content" jdbcType="VARCHAR" property="content" />
+    <result column="content" jdbcType="LONGVARCHAR" property="content" />
     <result column="admin_id" jdbcType="INTEGER" property="adminId" />
+    <result column="notice_type" jdbcType="INTEGER" property="noticeType" />
     <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="deleted" jdbcType="BIT" property="deleted" />
@@ -85,7 +86,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, title, content, admin_id, add_time, update_time, deleted
+    id, title, content, admin_id, notice_type, add_time, update_time, deleted
   </sql>
   <select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallNoticeExample" resultMap="BaseResultMap">
     <!--
@@ -206,10 +207,10 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into litemall_notice (title, content, admin_id, 
+    insert into litemall_notice (title, content, admin_id, notice_type,
       add_time, update_time, deleted
       )
-    values (#{title,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, #{adminId,jdbcType=INTEGER}, 
+    values (#{title,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARCHAR}, #{adminId,jdbcType=INTEGER}, #{noticeType,jdbcType=INTEGER},
       #{addTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}
       )
   </insert>
@@ -232,6 +233,9 @@
       <if test="adminId != null">
         admin_id,
       </if>
+      <if test="noticeType != null">
+        notice_type,
+      </if>
       <if test="addTime != null">
         add_time,
       </if>
@@ -247,11 +251,14 @@
         #{title,jdbcType=VARCHAR},
       </if>
       <if test="content != null">
-        #{content,jdbcType=VARCHAR},
+        #{content,jdbcType=LONGVARCHAR},
       </if>
       <if test="adminId != null">
         #{adminId,jdbcType=INTEGER},
       </if>
+      <if test="noticeType != null">
+        #{noticeType,jdbcType=INTEGER},
+      </if>
       <if test="addTime != null">
         #{addTime,jdbcType=TIMESTAMP},
       </if>
@@ -287,11 +294,14 @@
         title = #{record.title,jdbcType=VARCHAR},
       </if>
       <if test="record.content != null">
-        content = #{record.content,jdbcType=VARCHAR},
+        content = #{record.content,jdbcType=LONGVARCHAR},
       </if>
       <if test="record.adminId != null">
         admin_id = #{record.adminId,jdbcType=INTEGER},
       </if>
+      <if test="record.noticeType != null">
+        notice_type = #{record.noticeType,jdbcType=INTEGER},
+      </if>
       <if test="record.addTime != null">
         add_time = #{record.addTime,jdbcType=TIMESTAMP},
       </if>
@@ -314,8 +324,9 @@
     update litemall_notice
     set id = #{record.id,jdbcType=INTEGER},
       title = #{record.title,jdbcType=VARCHAR},
-      content = #{record.content,jdbcType=VARCHAR},
+      content = #{record.content,jdbcType=LONGVARCHAR},
       admin_id = #{record.adminId,jdbcType=INTEGER},
+      notice_type = #{record.noticeType,jdbcType=INTEGER},
       add_time = #{record.addTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       deleted = #{record.deleted,jdbcType=BIT}
@@ -334,11 +345,14 @@
         title = #{title,jdbcType=VARCHAR},
       </if>
       <if test="content != null">
-        content = #{content,jdbcType=VARCHAR},
+        content = #{content,jdbcType=LONGVARCHAR},
       </if>
       <if test="adminId != null">
         admin_id = #{adminId,jdbcType=INTEGER},
       </if>
+      <if test="noticeType != null">
+        notice_type = #{noticeType,jdbcType=INTEGER},
+      </if>
       <if test="addTime != null">
         add_time = #{addTime,jdbcType=TIMESTAMP},
       </if>
@@ -358,8 +372,9 @@
     -->
     update litemall_notice
     set title = #{title,jdbcType=VARCHAR},
-      content = #{content,jdbcType=VARCHAR},
+      content = #{content,jdbcType=LONGVARCHAR},
       admin_id = #{adminId,jdbcType=INTEGER},
+      notice_type = #{noticeType,jdbcType=INTEGER},
       add_time = #{addTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       deleted = #{deleted,jdbcType=BIT}
diff --git a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallTopicMapper.xml b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallTopicMapper.xml
index 34efd0d8..114e84f8 100644
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallTopicMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallTopicMapper.xml
@@ -11,7 +11,8 @@
     <result column="subtitle" jdbcType="VARCHAR" property="subtitle" />
     <result column="price" jdbcType="DECIMAL" property="price" />
     <result column="read_count" jdbcType="VARCHAR" property="readCount" />
-    <result column="pic_url" jdbcType="VARCHAR" property="picUrl" typeHandler="org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler" />
+    <result column="pic_url" jdbcType="VARCHAR" property="picUrl" />
+    <result column="gallery" jdbcType="VARCHAR" property="gallery" typeHandler="org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler" />
     <result column="contact" jdbcType="VARCHAR" property="contact" />
     <result column="contact_mobile" jdbcType="VARCHAR" property="contactMobile" />
     <result column="contact_post" jdbcType="VARCHAR" property="contactPost" />
@@ -37,6 +38,7 @@
     <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="deleted" jdbcType="BIT" property="deleted" />
+    <result column="is_on_sale" jdbcType="BIT" property="isOnSale" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="org.linlinjava.litemall.db.domain.LitemallTopic">
     <!--
@@ -154,11 +156,11 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, title, subtitle, price, read_count, pic_url,
+    id, title, subtitle, price, read_count, pic_url, gallery,
     contact, contact_mobile, contact_post, demand_province, demand_province_code, demand_city, demand_city_code,
     province, province_code, city, city_code, county, county_code, address,
     work_way, work_category, work_style, salary, commission,
-    user_id, sort_order, goods, add_time, update_time, deleted
+    user_id, sort_order, goods, add_time, update_time, is_on_sale, deleted
   </sql>
   <sql id="Blob_Column_List">
     <!--
@@ -315,17 +317,17 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into litemall_topic (title, subtitle, price, 
-      read_count, pic_url,
+      read_count, pic_url, gallery,
       contact, contact_mobile, contact_post, demand_province, demand_province_code, demand_city, demand_city_code,
       province, province_code, city, city_code, county, county_code, address,
       work_way, work_category, work_style, salary, commission,
       user_id,
       sort_order,
       goods, 
-      add_time, update_time, deleted, 
+      add_time, update_time, is_on_sale, deleted,
       content)
     values (#{title,jdbcType=VARCHAR}, #{subtitle,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, 
-      #{readCount,jdbcType=VARCHAR}, #{picUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      #{readCount,jdbcType=VARCHAR}, #{picUrl,jdbcType=VARCHAR}, #{gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       #{contact,jdbcType=VARCHAR}, #{contactMobile,jdbcType=VARCHAR}, #{contactPost,jdbcType=VARCHAR},
       #{demandProvince,jdbcType=VARCHAR}, #{demandProvinceCode,jdbcType=VARCHAR}, #{demandCity,jdbcType=VARCHAR}, #{demandCityCode,jdbcType=VARCHAR},
       #{province,jdbcType=VARCHAR}, #{provinceCode,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{cityCode,jdbcType=VARCHAR}, #{county,jdbcType=VARCHAR}, #{countyCode,jdbcType=VARCHAR},
@@ -335,7 +337,7 @@
       #{salary,jdbcType=INTEGER}, #{commission,jdbcType=INTEGER},
       #{userId,jdbcType=INTEGER}, #{sortOrder,jdbcType=INTEGER},
       #{goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler}, 
-      #{addTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}, 
+      #{addTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{isOnSale,jdbcType=BIT}, #{deleted,jdbcType=BIT},
       #{content,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallTopic">
@@ -363,6 +365,9 @@
       <if test="picUrl != null">
         pic_url,
       </if>
+      <if test="gallery != null">
+        gallery,
+      </if>
       <if test="contact != null">
         contact,
       </if>
@@ -435,6 +440,9 @@
       <if test="updateTime != null">
         update_time,
       </if>
+      <if test="isOnSale != null">
+        is_on_sale,
+      </if>
       <if test="deleted != null">
         deleted,
       </if>
@@ -456,7 +464,10 @@
         #{readCount,jdbcType=VARCHAR},
       </if>
       <if test="picUrl != null">
-        #{picUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+        #{picUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="gallery != null">
+        #{gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       </if>
       <if test="contact != null">
         #{contact,jdbcType=VARCHAR},
@@ -530,6 +541,9 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="isOnSale != null">
+        #{isOnSale,jdbcType=BIT},
+      </if>
       <if test="deleted != null">
         #{deleted,jdbcType=BIT},
       </if>
@@ -571,7 +585,10 @@
         read_count = #{record.readCount,jdbcType=VARCHAR},
       </if>
       <if test="record.picUrl != null">
-        pic_url = #{record.picUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+        pic_url = #{record.picUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.gallery != null">
+        gallery = #{record.gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       </if>
       <if test="record.contact != null">
         contact = #{record.contact,jdbcType=VARCHAR},
@@ -627,15 +644,9 @@
       <if test="record.salary != null">
         salary = #{record.salary,jdbcType=INTEGER},
       </if>
-      <if test="record.salary == null">
-        salary = null
-      </if>
       <if test="record.commission == null">
         commission = #{record.commission,jdbcType=INTEGER},
       </if>
-      <if test="record.commission == null">
-        commission = null
-      </if>
       <if test="record.userId != null">
         user_id = #{record.userId,jdbcType=INTEGER},
       </if>
@@ -651,6 +662,9 @@
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.isOnSale != null">
+        is_on_sale = #{record.isOnSale,jdbcType=BIT},
+      </if>
       <if test="record.deleted != null">
         deleted = #{record.deleted,jdbcType=BIT},
       </if>
@@ -673,7 +687,8 @@
       subtitle = #{record.subtitle,jdbcType=VARCHAR},
       price = #{record.price,jdbcType=DECIMAL},
       read_count = #{record.readCount,jdbcType=VARCHAR},
-      pic_url = #{record.picUrl,jdbcType=VARCHAR,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      pic_url = #{record.picUrl,jdbcType=VARCHAR},
+      gallery = #{record.gallery,jdbcType=VARCHAR,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       contact = #{record.contact,jdbcType=VARCHAR},
       contact_mobile = #{record.contactMobile,jdbcType=VARCHAR},
       contact_post = #{record.contactPost,jdbcType=VARCHAR},
@@ -698,6 +713,7 @@
       goods = #{record.goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
       add_time = #{record.addTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      is_on_sale = #{record.isOnSale,jdbcType=BIT},
       deleted = #{record.deleted,jdbcType=BIT},
       content = #{record.content,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -715,7 +731,8 @@
       subtitle = #{record.subtitle,jdbcType=VARCHAR},
       price = #{record.price,jdbcType=DECIMAL},
       read_count = #{record.readCount,jdbcType=VARCHAR},
-      pic_url = #{record.picUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      pic_url = #{record.picUrl,jdbcType=VARCHAR},
+      gallery = #{record.gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       contact = #{record.contact,jdbcType=VARCHAR},
       contact_mobile = #{record.contactMobile,jdbcType=VARCHAR},
       contact_post = #{record.contactPost,jdbcType=VARCHAR},
@@ -740,6 +757,7 @@
       goods = #{record.goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
       add_time = #{record.addTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      is_on_sale = #{record.isOnSale,jdbcType=BIT},
       deleted = #{record.deleted,jdbcType=BIT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -765,7 +783,10 @@
         read_count = #{readCount,jdbcType=VARCHAR},
       </if>
       <if test="picUrl != null">
-        pic_url = #{picUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+        pic_url = #{picUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="gallery != null">
+        gallery = #{gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       </if>
       <if test="contact != null">
         contact = #{contact,jdbcType=VARCHAR},
@@ -839,6 +860,9 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="isOnSale != null">
+        is_on_sale = #{isOnSale,jdbcType=BIT},
+      </if>
       <if test="deleted != null">
         deleted = #{deleted,jdbcType=BIT},
       </if>
@@ -858,7 +882,8 @@
       subtitle = #{subtitle,jdbcType=VARCHAR},
       price = #{price,jdbcType=DECIMAL},
       read_count = #{readCount,jdbcType=VARCHAR},
-      pic_url = #{picUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      pic_url = #{picUrl,jdbcType=VARCHAR},
+      gallery = #{gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       contact = #{contact,jdbcType=VARCHAR},
       contact_mobile = #{contactMobile,jdbcType=VARCHAR},
       contact_post = #{contactPost,jdbcType=VARCHAR},
@@ -878,6 +903,8 @@
       work_style = #{workStyle,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       salary = #{salary,jdbcType=INTEGER},
       commission = #{commission,jdbcType=INTEGER},
+      is_on_sale = #{isOnSale,jdbcType=BIT},
+      deleted = #{deleted,jdbcType=BIT},
       user_id = #{userId,jdbcType=INTEGER},
       sort_order = #{sortOrder,jdbcType=INTEGER},
       goods = #{goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
@@ -897,7 +924,8 @@
       subtitle = #{subtitle,jdbcType=VARCHAR},
       price = #{price,jdbcType=DECIMAL},
       read_count = #{readCount,jdbcType=VARCHAR},
-      pic_url = #{picUrl,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
+      pic_url = #{picUrl,jdbcType=VARCHAR},
+      gallery = #{gallery,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
       contact = #{record.contact,jdbcType=VARCHAR},
       contact_mobile = #{record.contactMobile,jdbcType=VARCHAR},
       contact_post = #{record.contactPost,jdbcType=VARCHAR},
@@ -922,6 +950,7 @@
       goods = #{goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
       add_time = #{addTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
+      is_on_sale = #{isOnSale,jdbcType=BIT},
       deleted = #{deleted,jdbcType=BIT}
     where id = #{id,jdbcType=INTEGER}
   </update>
diff --git a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserMapper.xml b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserMapper.xml
index 01dde26b..c64ce64c 100644
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserMapper.xml
@@ -10,6 +10,7 @@
     <result column="username" jdbcType="VARCHAR" property="username" />
     <result column="password" jdbcType="VARCHAR" property="password" />
     <result column="user_type" jdbcType="VARCHAR" property="userType" />
+    <result column="manager_flag" jdbcType="TINYINT" property="managerFlag" />
     <result column="gender" jdbcType="TINYINT" property="gender" />
     <result column="birthday" jdbcType="DATE" property="birthday" />
     <result column="last_login_time" jdbcType="TIMESTAMP" property="lastLoginTime" />
@@ -96,7 +97,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, username, `password`, user_type, gender, birthday, last_login_time, last_login_ip, user_level,
+    id, username, `password`, user_type, manager_flag, gender, birthday, last_login_time, last_login_ip, user_level,
     nickname, mobile, avatar, weixin_openid, session_key, `status`, add_time, update_time, 
     deleted
   </sql>
@@ -219,13 +220,13 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into litemall_user (username, `password`, user_type, gender,
+    insert into litemall_user (username, `password`, user_type, manager_flag, gender,
       birthday, last_login_time, last_login_ip, 
       user_level, nickname, mobile, 
       avatar, weixin_openid, session_key, 
       `status`, add_time, update_time, 
       deleted)
-    values (#{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{userType,jdbcType=VARCHAR}, #{gender,jdbcType=TINYINT},
+    values (#{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{userType,jdbcType=VARCHAR},, #{managerFlag,jdbcType=TINYINT}, #{gender,jdbcType=TINYINT},
       #{birthday,jdbcType=DATE}, #{lastLoginTime,jdbcType=TIMESTAMP}, #{lastLoginIp,jdbcType=VARCHAR}, 
       #{userLevel,jdbcType=TINYINT}, #{nickname,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, 
       #{avatar,jdbcType=VARCHAR}, #{weixinOpenid,jdbcType=VARCHAR}, #{sessionKey,jdbcType=VARCHAR}, 
@@ -251,6 +252,9 @@
       <if test="userType != null">
         `user_type`,
       </if>
+      <if test="managerFlag != null">
+        manager_flag,
+      </if>
       <if test="gender != null">
         gender,
       </if>
@@ -304,6 +308,9 @@
       <if test="userType != null">
         #{userType,jdbcType=VARCHAR},
       </if>
+      <if test="managerFlag != null">
+        #{managerFlag,jdbcType=TINYINT},
+      </if>
       <if test="gender != null">
         #{gender,jdbcType=TINYINT},
       </if>
@@ -374,6 +381,9 @@
       <if test="record.password != null">
         `password` = #{record.password,jdbcType=VARCHAR},
       </if>
+      <if test="record.managerFlag != null">
+        manager_flag = #{record.managerFlag,jdbcType=TINYINT},
+      </if>
       <if test="record.gender != null">
         gender = #{record.gender,jdbcType=TINYINT},
       </if>
@@ -430,6 +440,7 @@
     set id = #{record.id,jdbcType=INTEGER},
       username = #{record.username,jdbcType=VARCHAR},
       `password` = #{record.password,jdbcType=VARCHAR},
+      manager_flag = #{record.managerFlag,jdbcType=TINYINT},
       gender = #{record.gender,jdbcType=TINYINT},
       birthday = #{record.birthday,jdbcType=DATE},
       last_login_time = #{record.lastLoginTime,jdbcType=TIMESTAMP},
@@ -461,6 +472,9 @@
       <if test="password != null">
         `password` = #{password,jdbcType=VARCHAR},
       </if>
+      <if test="managerFlag != null">
+        manager_flag = #{managerFlag,jdbcType=TINYINT},
+      </if>
       <if test="gender != null">
         gender = #{gender,jdbcType=TINYINT},
       </if>
@@ -518,6 +532,7 @@
     set username = #{username,jdbcType=VARCHAR},
       `password` = #{password,jdbcType=VARCHAR},
       gender = #{gender,jdbcType=TINYINT},
+      manager_flag = #{managerFlag,jdbcType=TINYINT},
       birthday = #{birthday,jdbcType=DATE},
       last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP},
       last_login_ip = #{lastLoginIp,jdbcType=VARCHAR},
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/WxLoginInfo.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/WxLoginInfo.java
index bfa763cf..598ed31e 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/WxLoginInfo.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/WxLoginInfo.java
@@ -1,8 +1,10 @@
 package org.linlinjava.litemall.wx.dto;
 
 public class WxLoginInfo {
+
     private String code;
     private UserInfo userInfo;
+    private WxMobileInfo mobileInfo;
 
     public String getCode() {
         return code;
@@ -12,6 +14,14 @@ public class WxLoginInfo {
         this.code = code;
     }
 
+    public WxMobileInfo getMobileInfo() {
+        return mobileInfo;
+    }
+
+    public void setMobileInfo(WxMobileInfo mobileInfo) {
+        this.mobileInfo = mobileInfo;
+    }
+
     public UserInfo getUserInfo() {
         return userInfo;
     }
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/WxMobileInfo.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/WxMobileInfo.java
new file mode 100644
index 00000000..9f6eccd3
--- /dev/null
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/WxMobileInfo.java
@@ -0,0 +1,33 @@
+package org.linlinjava.litemall.wx.dto;
+
+public class WxMobileInfo {
+
+    /** 解析手机号参数 */
+    private String code;
+    private String iv;
+    private String encryptedData;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getIv() {
+        return iv;
+    }
+
+    public void setIv(String iv) {
+        this.iv = iv;
+    }
+
+    public String getEncryptedData() {
+        return encryptedData;
+    }
+
+    public void setEncryptedData(String encryptedData) {
+        this.encryptedData = encryptedData;
+    }
+}
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxGoodsService.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxGoodsService.java
index 97e791d8..b2e3fbee 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxGoodsService.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxGoodsService.java
@@ -5,6 +5,7 @@ import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.core.qcode.QCodeService;
 import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.linlinjava.litemall.db.domain.*;
+import org.linlinjava.litemall.db.enums.UserType;
 import org.linlinjava.litemall.db.service.*;
 import org.linlinjava.litemall.wx.dto.GoodsAllinone;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,10 +15,7 @@ import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.sql.Array;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 @Service
 public class WxGoodsService {
@@ -39,6 +37,8 @@ public class WxGoodsService {
     private LitemallCartService cartService;
     @Autowired
     private QCodeService qCodeService;
+    @Autowired
+    private LitemallTopicService topicService;
 
     public Object list(Integer goodsId, String goodsSn, String name,
                        Integer page, Integer limit, String sort, String order) {
@@ -47,14 +47,12 @@ public class WxGoodsService {
     }
 
     private Object validate(LitemallGoods goods) {
-        String name = goods.getName();
-        if (StringUtils.isEmpty(name)) {
-            return ResponseUtil.badArgument();
-        }
+
         String goodsSn = goods.getGoodsSn();
         if (StringUtils.isEmpty(goodsSn)) {
             goods.setGoodsSn(UUID.randomUUID().toString());
         }
+
         // 品牌商可以不设置，如果设置则需要验证品牌商存在
         Integer brandId = goods.getBrandId();
         if (brandId != null && brandId != 0) {
@@ -207,12 +205,17 @@ public class WxGoodsService {
 
     @Transactional
     public Object create(LitemallGoods goods) {
+
+        String name = goods.getName();
+        if (StringUtils.isEmpty(name)) {
+            return ResponseUtil.badArgument();
+        }
+
         Object error = validate(goods);
         if (error != null) {
             return error;
         }
 
-        String name = goods.getName();
 //        if (goodsService.checkExistByName(name)) {
 //            return ResponseUtil.fail(611, "商品名已经存在");
 //        }
@@ -230,6 +233,28 @@ public class WxGoodsService {
         // 商品基本信息表litemall_goods
         goodsService.add(goods);
 
+        if (UserType.CUSTOMER.equals(goods.getUserType())) {
+            LitemallTopic topic = topicService.findByUserId(goods.getUserId());
+            if (topic == null) {
+                throw new IllegalArgumentException();
+            }
+            LitemallTopic updateTopic = new LitemallTopic();
+            updateTopic.setId(topic.getId());
+            Integer[] goodsIds;
+            if (topic.getGoods() == null || topic.getGoods().length <= 0) {
+                goodsIds = new Integer[1];
+                goodsIds[0] = goods.getId();
+            } else {
+                goodsIds = new Integer[topic.getGoods().length + 1];
+                for (int i = 0; i < topic.getGoods().length; i++) {
+                    goodsIds[i]=topic.getGoods()[i];
+                }
+                goodsIds[topic.getGoods().length] = goods.getId();
+            }
+            updateTopic.setGoods(goodsIds);
+            topicService.updateById(updateTopic);
+        }
+
         //将生成的分享图片地址写入数据库
         String url = qCodeService.createGoodShareImage(goods.getId().toString(), goods.getPicUrl(), goods.getName());
         if (!StringUtils.isEmpty(url)) {
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/util/JwtHelper.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/util/JwtHelper.java
index 8f9c30f6..396bd86d 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/util/JwtHelper.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/util/JwtHelper.java
@@ -30,8 +30,8 @@ public class JwtHelper {
 		    Algorithm algorithm = Algorithm.HMAC256(SECRET);
 		    Map<String, Object> map = new HashMap<String, Object>();
 		    Date nowDate = new Date();
-		    // 过期时间：2小时
-		    Date expireDate = getAfterDate(nowDate,0,0,0,2,0,0);
+		    // 过期时间：1天
+		    Date expireDate = getAfterDate(nowDate,0,0,30,0,0,0);
 	        map.put("alg", "HS256");
 	        map.put("typ", "JWT");
 		    String token = JWT.create()
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/util/WXBizDataCryptUtil.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/util/WXBizDataCryptUtil.java
new file mode 100644
index 00000000..746d3052
--- /dev/null
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/util/WXBizDataCryptUtil.java
@@ -0,0 +1,84 @@
+package org.linlinjava.litemall.wx.util;
+
+import com.alibaba.fastjson.JSONObject;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.AlgorithmParameters;
+import java.security.Key;
+import java.security.Security;
+import java.util.Base64;
+
+/**
+ * 微信数据解密工具
+ *
+ * @date 2023-06-08 16:51:26
+ */
+public class WXBizDataCryptUtil {
+
+    public static JSONObject getMoreInfoFromEncryptedData(String appId, String sessionKey, String encryptedData, String iv) {
+        WXBizDataCryptUtil pc = new WXBizDataCryptUtil(appId, sessionKey);
+        JSONObject decrypt = pc.decrypt(encryptedData, iv);
+        return decrypt;
+    }
+
+    private String appId;
+    private String sessionKey;
+
+    public WXBizDataCryptUtil(String appId, String sessionKey) {
+        this.appId = appId;
+        this.sessionKey = sessionKey;
+    }
+
+    /**
+     * 解密成json
+     *
+     * @param encryptedData
+     * @param iv
+     * @return
+     */
+    public JSONObject decrypt(String encryptedData, String iv) {
+        byte[] encryptedDataDecode = Base64.getDecoder().decode(encryptedData);
+        byte[] sessionKeyDecode = Base64.getDecoder().decode(this.sessionKey);
+        byte[] ivDecode = Base64.getDecoder().decode(iv);
+        Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
+        byte[] decodeData = decode(encryptedDataDecode, sessionKeyDecode, ivDecode);
+        String stringData = new String(decodeData);
+        JSONObject jsonObject = JSONObject.parseObject(stringData);
+        return jsonObject;
+    }
+    /**
+     * 解密算法 AES-128-CBC
+     * 填充模式 PKCS#7
+     *
+     * @param encryptedDataDecode 目标密文
+     * @return
+     * @throws Exception
+     */
+    private byte[] decode(byte[] encryptedDataDecode, byte[] sessionKeyDecode, byte[] iv) {
+        try {
+            Cipher cipher = Cipher.getInstance("AES/CBC/PKCS7Padding");
+            Key sKeySpec = new SecretKeySpec(sessionKeyDecode, "AES");
+            cipher.init(Cipher.DECRYPT_MODE, sKeySpec, generateIv(iv));// 初始化
+            byte[] result = cipher.doFinal(encryptedDataDecode);
+            return result;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+    /**
+     * 处理iv
+     *
+     * @param iv
+     * @return
+     * @throws Exception
+     */
+    private AlgorithmParameters generateIv(byte[] iv) throws Exception {
+        AlgorithmParameters params = AlgorithmParameters.getInstance("AES");
+        params.init(new IvParameterSpec(iv));
+        return params;
+    }
+
+}
+
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java
index 9db7a3b1..acd9a19a 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java
@@ -1,23 +1,34 @@
 package org.linlinjava.litemall.wx.web;
 
+import ch.qos.logback.core.util.SystemInfo;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.linlinjava.litemall.core.config.WxConfig;
 import org.linlinjava.litemall.core.notify.NotifyService;
 import org.linlinjava.litemall.core.notify.NotifyType;
+import org.linlinjava.litemall.core.system.SystemConfig;
 import org.linlinjava.litemall.core.util.*;
 import org.linlinjava.litemall.core.util.bcrypt.BCryptPasswordEncoder;
+import org.linlinjava.litemall.db.domain.LitemallGoods;
+import org.linlinjava.litemall.db.domain.LitemallTopic;
 import org.linlinjava.litemall.db.domain.LitemallUser;
+import org.linlinjava.litemall.db.enums.UserType;
 import org.linlinjava.litemall.db.service.CouponAssignService;
+import org.linlinjava.litemall.db.service.LitemallGoodsService;
+import org.linlinjava.litemall.db.service.LitemallTopicService;
 import org.linlinjava.litemall.db.service.LitemallUserService;
 import org.linlinjava.litemall.wx.annotation.LoginUser;
 import org.linlinjava.litemall.wx.dto.UserInfo;
 import org.linlinjava.litemall.wx.dto.WxLoginInfo;
 import org.linlinjava.litemall.wx.service.CaptchaCodeManager;
 import org.linlinjava.litemall.wx.service.UserTokenManager;
+import org.linlinjava.litemall.wx.util.WXBizDataCryptUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -45,12 +56,27 @@ public class WxAuthController {
     @Autowired
     private WxMaService wxService;
 
+    @Autowired
+    private LitemallGoodsService goodsService;
+
+    @Autowired
+    private LitemallTopicService topicService;
+
     @Autowired
     private NotifyService notifyService;
 
+    @Autowired
+    private WxConfig wxConfig;
+
     @Autowired
     private CouponAssignService couponAssignService;
 
+    @Value("${avatar.zbUrl}")
+    private String zbUrl;
+
+    @Value("${avatar.customerUrl}")
+    private String customerUrl;
+
     /**
      * 账号登录
      *
@@ -112,6 +138,7 @@ public class WxAuthController {
     @PostMapping("login_by_weixin")
     public Object loginByWeixin(@RequestBody WxLoginInfo wxLoginInfo, HttpServletRequest request) {
         String code = wxLoginInfo.getCode();
+        String mobile = null;
         UserInfo userInfo = wxLoginInfo.getUserInfo();
         if (code == null || userInfo == null) {
             return ResponseUtil.badArgument();
@@ -124,7 +151,18 @@ public class WxAuthController {
             sessionKey = result.getSessionKey();
             openId = result.getOpenid();
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error(e);
+            return ResponseUtil.fail(1001, "登陆失败.");
+        }
+
+        if (wxLoginInfo.getMobileInfo() != null && sessionKey != null) {
+            try {
+                WXBizDataCryptUtil pc = new WXBizDataCryptUtil(wxConfig.wxMaConfig().getAppid(), sessionKey);
+                JSONObject decrypt = pc.decrypt(wxLoginInfo.getMobileInfo().getEncryptedData(), wxLoginInfo.getMobileInfo().getIv());
+                mobile = String.valueOf(decrypt.get("phoneNumber"));
+            } catch (Exception e) {
+                logger.error(e);
+            }
         }
 
         if (sessionKey == null || openId == null) {
@@ -132,6 +170,7 @@ public class WxAuthController {
         }
 
         LitemallUser user = userService.queryByOid(openId);
+        int status = 0;
         if (user == null) {
             user = new LitemallUser();
             user.setUsername(openId);
@@ -139,6 +178,7 @@ public class WxAuthController {
             user.setWeixinOpenid(openId);
             user.setAvatar(userInfo.getAvatarUrl());
             user.setNickname(userInfo.getNickName());
+            user.setMobile(mobile);
             user.setGender(userInfo.getGender());
             user.setUserLevel((byte) 0);
             user.setUserType(userInfo.getUserType());
@@ -150,8 +190,34 @@ public class WxAuthController {
             userService.add(user);
 
             // 新用户发送注册优惠券
-            couponAssignService.assignForRegister(user.getId());
+//            couponAssignService.assignForRegister(user.getId());
         } else {
+            // 获取用户信息
+            if (UserType.ZB_EMP.equals(user.getUserType())) {
+                LitemallGoods zbInfo = goodsService.findbyUserId(user.getId());
+                if (zbInfo != null) {
+                    user.setNickname(zbInfo.getName());
+                    user.setAvatar(zbInfo.getPicUrl());
+                    if (zbInfo.getIsOnSale() != null && zbInfo.getIsOnSale()) {
+                        status = 1;
+                    }
+                }
+            } else if (UserType.CUSTOMER.equals(user.getUserType())) {
+                LitemallTopic customer = topicService.findByUserId(user.getId());
+                if (customer != null) {
+                    user.setNickname(customer.getTitle());
+                    user.setAvatar(customer.getPicUrl());
+                    if (customer.getIsOnSale() != null && customer.getIsOnSale()) {
+                        status = 2;
+                    }
+                }
+                if (user.getManagerFlag() != null && user.getManagerFlag().intValue() == 1) {
+                    user.setNickname(StringUtils.isEmpty(user.getNickname()) ? "经纪人" : user.getNickname()+" 经纪人");
+                    status = 2;
+                }
+            }
+
+            user.setMobile(mobile);
             user.setLastLoginTime(LocalDateTime.now());
             user.setLastLoginIp(IpUtil.getIpAddr(request));
             user.setSessionKey(sessionKey);
@@ -160,12 +226,22 @@ public class WxAuthController {
             }
         }
 
+        if (StringUtils.isEmpty(user.getAvatar())) {
+            if (UserType.ZB_EMP.equals(user.getUserType())) {
+                user.setAvatar(zbUrl);
+            } else if (UserType.CUSTOMER.equals(user.getUserType())) {
+                user.setAvatar(customerUrl);
+            }
+        }
+
         // token
         String token = UserTokenManager.generateToken(user.getId());
 
         Map<Object, Object> result = new HashMap<Object, Object>();
         result.put("token", token);
-        result.put("userInfo", userInfo);
+        result.put("userInfo", user);
+
+        result.put("status", status);
         return ResponseUtil.ok(result);
     }
 
@@ -544,11 +620,40 @@ public class WxAuthController {
         }
 
         LitemallUser user = userService.findById(userId);
+
         Map<Object, Object> data = new HashMap<Object, Object>();
-        data.put("nickName", user.getNickname());
-        data.put("avatar", user.getAvatar());
-        data.put("gender", user.getGender());
-        data.put("mobile", user.getMobile());
+        int status = 0;
+        // 获取用户信息
+        if (UserType.ZB_EMP.equals(user.getUserType())) {
+            LitemallGoods zbInfo = goodsService.findbyUserId(user.getId());
+            if (zbInfo != null) {
+                user.setNickname(zbInfo.getName());
+                user.setAvatar(zbInfo.getPicUrl());
+                if (zbInfo.getIsOnSale() != null && zbInfo.getIsOnSale()) {
+                    status = 1;
+                }
+            }
+        } else if (UserType.CUSTOMER.equals(user.getUserType())) {
+            LitemallTopic customer = topicService.findByUserId(user.getId());
+            if (customer != null) {
+                user.setNickname(customer.getTitle());
+                user.setAvatar(customer.getPicUrl());
+                if (customer.getIsOnSale() != null && customer.getIsOnSale()) {
+                    status = 2;
+                }
+            }
+        }
+
+        if (StringUtils.isEmpty(user.getAvatar())) {
+            if (UserType.ZB_EMP.equals(user.getUserType())) {
+                user.setAvatar(zbUrl);
+            } else if (UserType.CUSTOMER.equals(user.getUserType())) {
+                user.setAvatar(customerUrl);
+            }
+        }
+
+        data.put("userInfo", user);
+        data.put("status", status);
 
         return ResponseUtil.ok(data);
     }
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFootprintController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFootprintController.java
index f9fa73a3..76e05eec 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFootprintController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFootprintController.java
@@ -1,20 +1,23 @@
 package org.linlinjava.litemall.wx.web;
 
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.core.util.JacksonUtil;
 import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.linlinjava.litemall.db.domain.LitemallFootprint;
 import org.linlinjava.litemall.db.domain.LitemallGoods;
+import org.linlinjava.litemall.db.domain.LitemallTopic;
+import org.linlinjava.litemall.db.domain.LitemallUser;
+import org.linlinjava.litemall.db.enums.UserType;
 import org.linlinjava.litemall.db.service.LitemallFootprintService;
 import org.linlinjava.litemall.db.service.LitemallGoodsService;
+import org.linlinjava.litemall.db.service.LitemallTopicService;
+import org.linlinjava.litemall.db.service.LitemallUserService;
 import org.linlinjava.litemall.wx.annotation.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -33,6 +36,10 @@ public class WxFootprintController {
     private LitemallFootprintService footprintService;
     @Autowired
     private LitemallGoodsService goodsService;
+    @Autowired
+    private LitemallTopicService topicService;
+    @Autowired
+    private LitemallUserService userService;
 
     /**
      * 删除用户足迹
@@ -76,13 +83,16 @@ public class WxFootprintController {
      */
     @GetMapping("list")
     public Object list(@LoginUser Integer userId,
+                       @RequestParam(defaultValue = "1") Integer isMe,
                        @RequestParam(defaultValue = "1") Integer page,
                        @RequestParam(defaultValue = "10") Integer limit) {
         if (userId == null) {
             return ResponseUtil.unlogin();
         }
 
-        List<LitemallFootprint> footprintList = footprintService.queryByAddTime(userId, page, limit);
+        LitemallUser user = userService.findById(userId);
+
+        List<LitemallFootprint> footprintList = footprintService.queryByAddTime(userId, isMe, page, limit);
 
         List<Object> footprintVoList = new ArrayList<>(footprintList.size());
         for (LitemallFootprint footprint : footprintList) {
@@ -91,13 +101,25 @@ public class WxFootprintController {
             c.put("goodsId", footprint.getGoodsId());
             c.put("addTime", footprint.getAddTime());
 
-            LitemallGoods goods = goodsService.findById(footprint.getGoodsId());
-            c.put("name", goods.getName());
-            c.put("brief", goods.getBrief());
-            c.put("picUrl", goods.getPicUrl());
-            c.put("retailPrice", goods.getRetailPrice());
-
-            footprintVoList.add(c);
+            LitemallTopic topic = null;
+            LitemallGoods goods = null;
+            if (isMe == 2) {
+                if (UserType.ZB_EMP.equals(user.getUserType())) {
+                    topic = topicService.findByUserId(footprint.getUserId());
+                } else {
+                    goods = goodsService.findbyUserId(footprint.getUserId());
+                }
+            } else {
+                goods = goodsService.findById(footprint.getGoodsId());
+                if (UserType.CUSTOMER.equals(goods.getUserType())) {
+                    topic = topicService.findByUserId(goods.getUserId());
+                }
+            }
+            c.put("goodsInfo", goods);
+            c.put("topicInfo", topic);
+            if (goods != null || topic != null) {
+                footprintVoList.add(c);
+            }
         }
 
         return ResponseUtil.okList(footprintVoList, footprintList);
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
index 3b3d45e0..fa60b2c2 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
@@ -1,18 +1,24 @@
 package org.linlinjava.litemall.wx.web;
 
+import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
+import com.sun.mail.iap.Response;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.core.system.SystemConfig;
+import org.linlinjava.litemall.core.util.JacksonUtil;
 import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.linlinjava.litemall.core.validator.Order;
 import org.linlinjava.litemall.core.validator.Sort;
 import org.linlinjava.litemall.db.domain.*;
+import org.linlinjava.litemall.db.enums.UserType;
 import org.linlinjava.litemall.db.service.*;
 import org.linlinjava.litemall.wx.annotation.LoginUser;
 import org.linlinjava.litemall.wx.dto.GoodsAllinone;
+import org.linlinjava.litemall.wx.dto.UserInfo;
 import org.linlinjava.litemall.wx.service.WxGoodsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -23,6 +29,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.*;
+import java.util.stream.Collectors;
 
 /**
  * 商品服务
@@ -36,6 +43,9 @@ public class WxGoodsController {
 	@Autowired
 	private LitemallGoodsService goodsService;
 
+	@Autowired
+	private LitemallTopicService topicService;
+
 	@Autowired
 	private LitemallGoodsProductService productService;
 
@@ -94,6 +104,29 @@ public class WxGoodsController {
 		return ResponseUtil.ok(info);
 	}
 
+	/**
+	 * 客户获取帖子列表
+	 */
+	@GetMapping("topicDetail")
+	public Object detail(@LoginUser Integer userId,
+						 @RequestParam(name = "expireStatus") Integer expireStatus,
+						 @RequestParam(defaultValue = "1") Integer page,
+						 @RequestParam(defaultValue = "10") Integer limit,
+						 @Sort(accepts = {"add_time"}) @RequestParam(defaultValue = "add_time") String sort,
+						 @Order @RequestParam(defaultValue = "desc") String order) {
+		String userType = UserType.CUSTOMER.name();
+		//查询列表数据
+		List<LitemallGoods> goodsList = goodsService.querySelective(userId, userType, expireStatus, page, limit, sort, order);
+		PageInfo<LitemallGoods> pagedList = PageInfo.of(goodsList);
+		Map<String, Object> entity = new HashMap<>();
+		entity.put("list", goodsList);
+		entity.put("total", pagedList.getTotal());
+		entity.put("page", pagedList.getPageNum());
+		entity.put("limit", pagedList.getPageSize());
+		entity.put("pages", pagedList.getPages());
+		return ResponseUtil.ok(entity);
+	}
+
 	/**
 	 * 商品详情
 	 * <p>
@@ -107,7 +140,14 @@ public class WxGoodsController {
 	@GetMapping("detail")
 	public Object detail(@LoginUser Integer userId, @NotNull Integer id) {
 		// 商品信息
-		LitemallGoods info = goodsService.findById(id);
+		LitemallGoods goodsInfo = goodsService.findById(id);
+
+		LitemallUser userInfo = userService.findById(userId);
+
+		LitemallTopic topic = null;
+		if (UserType.CUSTOMER.equals(goodsInfo.getUserType())) {
+			topic = topicService.findByUserId(goodsInfo.getUserId());
+		}
 
 		// 商品属性
 		Callable<List> goodsAttributeListCallable = () -> goodsAttributeService.queryByGid(id);
@@ -123,12 +163,12 @@ public class WxGoodsController {
 
 		// 商品品牌商
 		Callable<LitemallBrand> brandCallable = ()->{
-			Integer brandId = info.getBrandId();
+			Integer brandId = goodsInfo.getBrandId();
 			LitemallBrand brand;
 			if (brandId == 0) {
 				brand = new LitemallBrand();
 			} else {
-				brand = brandService.findById(info.getBrandId());
+				brand = brandService.findById(goodsInfo.getBrandId());
 			}
 			return brand;
 		};
@@ -166,11 +206,15 @@ public class WxGoodsController {
 		}
 
 		// 记录用户的足迹 异步处理
-		if (userId != null) {
+		if (userId != null && !userId.equals(goodsInfo.getUserId())) {
 			executorService.execute(()->{
 				LitemallFootprint footprint = new LitemallFootprint();
 				footprint.setUserId(userId);
+				footprint.setUserName(userInfo.getNickname());
+				footprint.setGoodsUserId(goodsInfo.getUserId());
 				footprint.setGoodsId(id);
+				footprint.setGoodsName(goodsInfo.getName());
+				footprint.setType(UserType.CUSTOMER.equals(goodsInfo.getUserType()) ? 1 : 0);
 				footprintService.add(footprint);
 			});
 		}
@@ -193,7 +237,8 @@ public class WxGoodsController {
 		Map<String, Object> data = new HashMap<>();
 
 		try {
-			data.put("info", info);
+			data.put("info", goodsInfo);
+			data.put("topicInfo", topic);
 			data.put("userHasCollect", userHasCollect);
 			data.put("issue", issueCallableTask.get());
 			data.put("comment", commentsCallableTsk.get());
@@ -211,7 +256,7 @@ public class WxGoodsController {
 		}
 
 		//商品分享图片地址
-		data.put("shareImage", info.getShareUrl());
+		data.put("shareImage", goodsInfo.getShareUrl());
 		return ResponseUtil.ok(data);
 	}
 
@@ -262,6 +307,11 @@ public class WxGoodsController {
 	@PostMapping("/create")
 	public Object create(@LoginUser Integer userId, @RequestBody  LitemallGoods goods) {
 		goods.setUserId(userId);
+		LitemallUser user = userService.findById(userId);
+		if (user != null) {
+			goods.setUserName(user.getNickname());
+			goods.setUserType(user.getUserType());
+		}
 		return wxGoodsService.create(goods);
 	}
 
@@ -296,6 +346,20 @@ public class WxGoodsController {
 		@Sort(accepts = {"add_time", "retail_price", "name"}) @RequestParam(defaultValue = "add_time") String sort,
 		@Order @RequestParam(defaultValue = "desc") String order) {
 
+		LitemallUser user = userService.findById(userId);
+		if (user == null) {
+			Map<String, Object> entity = new HashMap<>();
+			entity.put("list", new ArrayList<>());
+			entity.put("total", 0);
+			entity.put("page", 0);
+			entity.put("limit", 0);
+			entity.put("pages", new ArrayList<>());
+			entity.put("filterCategoryList", new ArrayList<>());
+		}
+		// 查看广场类型
+		String userType = UserType.ZB_EMP.equals(user.getUserType()) ? UserType.CUSTOMER.name() : UserType.ZB_EMP.name();
+
+
 		//添加到搜索历史
 		if (userId != null && !StringUtils.isEmpty(keyword)) {
 			LitemallSearchHistory searchHistoryVo = new LitemallSearchHistory();
@@ -306,7 +370,16 @@ public class WxGoodsController {
 		}
 
 		//查询列表数据
-		List<LitemallGoods> goodsList = goodsService.querySelective(categoryId, brandId, keyword, isHot, isNew, page, limit, sort, order);
+		List<LitemallGoods> goodsList = goodsService.querySelective(categoryId, brandId, userType, keyword, isHot, isNew, page, limit, sort, order);
+
+		Map<Integer, LitemallTopic> topicMap = new HashMap<>();
+		if (UserType.CUSTOMER.name().equals(userType)) {
+			List<Integer> topicIds = goodsList.stream().map(LitemallGoods::getUserId).collect(Collectors.toList());
+			List<LitemallTopic> topicList = topicService.findByUserIds(topicIds);
+			if (!CollectionUtils.isEmpty(topicList)) {
+				topicMap = topicList.stream().collect(Collectors.toMap(LitemallTopic::getUserId, o -> o));
+			}
+		}
 
 		// 查询商品所属类目列表。
 		List<Integer> goodsCatIds = goodsService.getCatIds(brandId, keyword, isHot, isNew);
@@ -320,7 +393,15 @@ public class WxGoodsController {
 		PageInfo<LitemallGoods> pagedList = PageInfo.of(goodsList);
 
 		Map<String, Object> entity = new HashMap<>();
-		entity.put("list", goodsList);
+		Map<Integer, LitemallTopic> finalTopicMap = topicMap;
+		entity.put("list", goodsList.stream().map(o -> {
+			Map<String, Object> resultMap = new HashMap<>();
+			resultMap.putAll(JSON.parseObject(JSON.toJSONString(o)));
+			if (finalTopicMap.containsKey(o.getUserId())) {
+				resultMap.put("topicInfo", finalTopicMap.get(o.getUserId()));
+			}
+			return resultMap;
+		}).collect(Collectors.toList()));
 		entity.put("total", pagedList.getTotal());
 		entity.put("page", pagedList.getPageNum());
 		entity.put("limit", pagedList.getPageSize());
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxNoticeController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxNoticeController.java
new file mode 100644
index 00000000..a62abce4
--- /dev/null
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxNoticeController.java
@@ -0,0 +1,96 @@
+package org.linlinjava.litemall.wx.web;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.linlinjava.litemall.core.util.JacksonUtil;
+import org.linlinjava.litemall.core.util.ResponseUtil;
+import org.linlinjava.litemall.core.validator.Order;
+import org.linlinjava.litemall.core.validator.Sort;
+import org.linlinjava.litemall.db.domain.*;
+import org.linlinjava.litemall.db.enums.UserType;
+import org.linlinjava.litemall.db.service.*;
+import org.linlinjava.litemall.wx.annotation.LoginUser;
+import org.linlinjava.litemall.wx.service.WxGoodsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 通知查看
+ */
+@RestController
+@RequestMapping("/wx/notice")
+@Validated
+public class WxNoticeController {
+    private final Log logger = LogFactory.getLog(WxNoticeController.class);
+
+    @Autowired
+    private LitemallNoticeAdminService noticeAdminService;
+
+    @Autowired
+    private LitemallNoticeService noticeService;
+
+    @GetMapping("/nnotice")
+    public Object nNotice(@LoginUser Integer userId, @NotNull String userType) {
+        if (StringUtils.isEmpty(userType)) {
+            return ResponseUtil.badArgument();
+        }
+        Integer adminType = UserType.ZB_EMP.name().equals(userType) ? 2 : 3;
+        int count = noticeAdminService.countUnread(userId, adminType);
+        return ResponseUtil.ok(count);
+    }
+
+    @GetMapping("/lsnotice")
+    public Object lsNotice(@LoginUser Integer userId,
+                           @NotNull String userType,
+                           @RequestParam(defaultValue = "1") Integer page,
+                           @RequestParam(defaultValue = "10") Integer limit,
+                           @Sort @RequestParam(defaultValue = "add_time") String sort,
+                           @Order @RequestParam(defaultValue = "desc") String order) {
+        if (StringUtils.isEmpty(userType)) {
+            return ResponseUtil.badArgument();
+        }
+        Integer adminType = UserType.ZB_EMP.name().equals(userType) ? 2 : 3;
+
+        List<LitemallNoticeAdmin> noticeList = noticeAdminService.querySelective(null, "ALL", userId, adminType, page, limit, sort, order);
+        return ResponseUtil.okList(noticeList);
+    }
+
+    @PostMapping("/catnotice")
+    public Object catNotice(@LoginUser Integer userId, @RequestBody String body) {
+        Integer noticeId = JacksonUtil.parseInteger(body, "noticeId");
+        String userType = JacksonUtil.parseString(body, "userType");
+        if(noticeId == null || StringUtils.isEmpty(userType)){
+            return ResponseUtil.badArgument();
+        }
+        Integer adminType = UserType.ZB_EMP.name().equals(userType) ? 2 : 3;
+        LitemallNoticeAdmin noticeAdmin = noticeAdminService.find(noticeId, userId, adminType);
+        if(noticeAdmin == null){
+            return ResponseUtil.badArgumentValue();
+        }
+        // 更新通知记录中的时间
+        noticeAdmin.setReadTime(LocalDateTime.now());
+        noticeAdminService.update(noticeAdmin);
+
+        // 返回通知的相关信息
+        Map<String, Object> data = new HashMap<>();
+        LitemallNotice notice = noticeService.findById(noticeId);
+        data.put("title", notice.getTitle());
+        data.put("content", notice.getContent());
+        data.put("time", notice.getUpdateTime());
+        Integer adminId = notice.getAdminId();
+        if(adminId.equals(0)){
+            data.put("admin", "系统");
+        }
+        return ResponseUtil.ok(data);
+    }
+
+}
\ No newline at end of file
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java
index 0622b70f..0563bdaf 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java
@@ -7,10 +7,13 @@ import org.linlinjava.litemall.core.validator.Order;
 import org.linlinjava.litemall.core.validator.Sort;
 import org.linlinjava.litemall.db.domain.LitemallGoods;
 import org.linlinjava.litemall.db.domain.LitemallTopic;
+import org.linlinjava.litemall.db.domain.LitemallUser;
 import org.linlinjava.litemall.db.service.LitemallCollectService;
 import org.linlinjava.litemall.db.service.LitemallGoodsService;
 import org.linlinjava.litemall.db.service.LitemallTopicService;
+import org.linlinjava.litemall.db.service.LitemallUserService;
 import org.linlinjava.litemall.wx.annotation.LoginUser;
+import org.linlinjava.litemall.wx.service.WxGoodsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -39,6 +42,10 @@ public class WxTopicController {
     private LitemallGoodsService goodsService;
 	@Autowired
 	private LitemallCollectService collectService;
+    @Autowired
+    private LitemallUserService userService;
+    @Autowired
+    private WxGoodsService wxGoodsService;
 
     /**
      * 专题列表
@@ -65,25 +72,27 @@ public class WxTopicController {
     @GetMapping("detail")
     public Object detail(@LoginUser Integer userId, @NotNull Integer id) {
         LitemallTopic topic = topicService.findById(id);
+
         List<LitemallGoods> goods = new ArrayList<>();
         if (topic != null && topic.getGoods() != null && topic.getGoods().length > 0) {
             for (Integer i : topic.getGoods()) {
                 LitemallGoods good = goodsService.findByIdVO(i);
-                if (null != good)
+                if (null != good) {
                     goods.add(good);
+                }
             }
         }
 
 		// 用户收藏
-		int userHasCollect = 0;
-		if (userId != null) {
-			userHasCollect = collectService.count(userId, (byte)1, id);
-		}
+//		int userHasCollect = 0;
+//		if (userId != null) {
+//			userHasCollect = collectService.count(userId, (byte)1, id);
+//		}
 
         Map<String, Object> entity = new HashMap<String, Object>();
         entity.put("topic", topic);
         entity.put("goods", goods);
-        entity.put("userHasCollect", userHasCollect);
+//        entity.put("userHasCollect", userHasCollect);
         return ResponseUtil.ok(entity);
     }
 
@@ -100,33 +109,63 @@ public class WxTopicController {
     }
 
     private Object validate(LitemallTopic topic) {
-        String title = topic.getTitle();
-        if (StringUtils.isEmpty(title)) {
-            return ResponseUtil.badArgument();
-        }
         return null;
     }
 
     @PostMapping("/create")
     public Object create(@LoginUser Integer userId, @RequestBody LitemallTopic topic) {
         topic.setUserId(userId);
+
+        String title = topic.getTitle();
+        if (StringUtils.isEmpty(title)) {
+            return ResponseUtil.badArgument();
+        }
+
         Object error = validate(topic);
         if (error != null) {
             return error;
         }
+        topic.setIsOnSale(false);
         topicService.add(topic);
         return ResponseUtil.ok(topic);
     }
 
+    /**
+     * 编辑招聘帖子
+     *
+     * @param goods
+     * @return
+     */
+    @PostMapping("/updateGoods")
+    public Object update(@RequestBody LitemallGoods goods) {
+        return wxGoodsService.update(goods);
+    }
+
+    /**
+     * 添加招聘帖子
+     *
+     * @param goods
+     * @return
+     */
+    @PostMapping("/createGoods")
+    public Object createGoods(@LoginUser Integer userId, @RequestBody  LitemallGoods goods) {
+        goods.setUserId(userId);
+        LitemallUser user = userService.findById(userId);
+        if (user != null) {
+            goods.setUserName(user.getNickname());
+            goods.setUserType(user.getUserType());
+        }
+        return wxGoodsService.create(goods);
+    }
+
     @GetMapping("/info")
     public Object read(@LoginUser Integer userId) {
         LitemallTopic topic = topicService.findByUserId(userId);
-        Integer[] goodsIds = topic.getGoods();
         List<LitemallGoods> goodsList = null;
-        if (goodsIds == null || goodsIds.length == 0) {
+        if (topic.getGoods() == null || topic.getGoods().length == 0) {
             goodsList = new ArrayList<>();
         } else {
-            goodsList = goodsService.queryByIds(goodsIds);
+            goodsList = goodsService.queryByIds(topic.getGoods());
         }
         Map<String, Object> data = new HashMap<>(2);
         data.put("topic", topic);
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxUserController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxUserController.java
index b296868a..5eb6fc87 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxUserController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxUserController.java
@@ -3,13 +3,13 @@ package org.linlinjava.litemall.wx.web;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.core.util.ResponseUtil;
+import org.linlinjava.litemall.db.domain.LitemallUser;
 import org.linlinjava.litemall.db.service.LitemallOrderService;
+import org.linlinjava.litemall.db.service.LitemallUserService;
 import org.linlinjava.litemall.wx.annotation.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -26,6 +26,9 @@ public class WxUserController {
     @Autowired
     private LitemallOrderService orderService;
 
+    @Autowired
+    private LitemallUserService userService;
+
     /**
      * 用户个人页面数据
      * <p>
@@ -45,4 +48,14 @@ public class WxUserController {
         return ResponseUtil.ok(data);
     }
 
+    /**
+     * 更新用户类型
+     * @param user
+     * @return
+     */
+    @PostMapping("/update")
+    public Object userUpdate(@RequestBody LitemallUser user) {
+        return ResponseUtil.ok(userService.updateById(user));
+    }
+
 }
\ No newline at end of file
diff --git a/litemall-wx-api/src/main/resources/application-wx.yml b/litemall-wx-api/src/main/resources/application-wx.yml
index e69de29b..53a5bfa6 100644
--- a/litemall-wx-api/src/main/resources/application-wx.yml
+++ b/litemall-wx-api/src/main/resources/application-wx.yml
@@ -0,0 +1,8 @@
+# 测试环境默认头像
+#avatar:
+#  zbUrl: https://www.czyinfo.cn/wx/storage/fetch/hbo7hhrn5z08a2qn3352.png
+#  customerUrl: https://www.czyinfo.cn/wx/storage/fetch/o1eqeujd5om16t33weo5.jpg
+# 正式环境默认头像
+avatar:
+  zbUrl: https://www.xianiaoai.cn/wx/storage/fetch/gzcvbvox66om49gom8wc.png
+  customerUrl: https://www.xianiaoai.cn/wx/storage/fetch/9psasix9rjsmg6xpia35.jpg
\ No newline at end of file
-- 
Gitee


From f59fc61062eca07eb3f291573710f44956d32c0a Mon Sep 17 00:00:00 2001
From: raowenbin <raowenbin@jygps.com.cn>
Date: Wed, 5 Jun 2024 09:37:35 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E7=89=88=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E4=B8=8A=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-admin/.env.production                |   4 +-
 litemall-admin/package.json                   |   1 +
 litemall-admin/public/favicon.ico             | Bin 67646 -> 141566 bytes
 litemall-admin/src/api/dict.js                |  49 ++
 litemall-admin/src/api/goods.js               |   5 +-
 litemall-admin/src/api/topic.js               |   5 +-
 litemall-admin/src/api/work.js                |  26 +
 .../NumberRange/inputNumberRange.vue          | 204 ++++++++
 litemall-admin/src/router/index.js            |  10 +
 litemall-admin/src/utils/request.js           |   1 +
 litemall-admin/src/views/config/dict.vue      | 482 ++++++++++++++++++
 litemall-admin/src/views/dashboard/index.vue  |  21 +-
 litemall-admin/src/views/goods/list.vue       | 191 ++++++-
 .../layout/components/TagsView/index.vue      |   8 +-
 litemall-admin/src/views/promotion/topic.vue  |  72 ++-
 litemall-admin/src/views/promotion/work.vue   | 333 ++++++++++++
 litemall-admin/src/views/sys/notice.vue       |  24 +-
 litemall-admin/src/views/user/collect.vue     |   8 +-
 litemall-admin/src/views/user/feedback.vue    |  20 +-
 litemall-admin/src/views/user/footprint.vue   |  37 +-
 litemall-admin/src/views/user/history.vue     |  16 +-
 litemall-admin/src/views/user/user.vue        |  44 +-
 litemall-admin/vue.config.js                  |   3 +-
 litemall-wx/config/api.js                     |   4 +-
 24 files changed, 1467 insertions(+), 101 deletions(-)
 create mode 100644 litemall-admin/src/api/dict.js
 create mode 100644 litemall-admin/src/api/work.js
 create mode 100644 litemall-admin/src/components/NumberRange/inputNumberRange.vue
 create mode 100644 litemall-admin/src/views/config/dict.vue
 create mode 100644 litemall-admin/src/views/promotion/work.vue

diff --git a/litemall-admin/.env.production b/litemall-admin/.env.production
index 3568ef10..9f724aa9 100644
--- a/litemall-admin/.env.production
+++ b/litemall-admin/.env.production
@@ -4,5 +4,7 @@ NODE_ENV = production
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = 'https://www.czyinfo.cn/admin'
+# VUE_APP_BASE_API = 'http://localhost:8082/admin'
+# VUE_APP_BASE_API = 'https://www.czyinfo.cn/admin'
+VUE_APP_BASE_API = 'https://www.xianiaoai.cn/admin'
 
diff --git a/litemall-admin/package.json b/litemall-admin/package.json
index d76851b7..8865ac61 100644
--- a/litemall-admin/package.json
+++ b/litemall-admin/package.json
@@ -53,6 +53,7 @@
     "file-saver": "1.3.8",
     "js-cookie": "2.2.0",
     "lodash": "^4.17.11",
+    "moment": "^2.30.1",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
diff --git a/litemall-admin/public/favicon.ico b/litemall-admin/public/favicon.ico
index 7fc0eab364ce36daac2ca8e29addea2d3841df24..d8d7ed9d9191317055098d57647442fee6f61752 100644
GIT binary patch
literal 141566
zcmeHQ33yaRwvIpmQ4vQFVZ^5(j88>TP!v=I+;9cOWdH>QLBLT*Ma5-s`vw)C3o7WK
zG9!)~i|qTpCxj#r5<(yeNg#X3MhFQc=hc61Zujj@chYOp-S-sVr8~Fl)~z~Kf7Pi|
zX9){CL;VZ;XPEl`lCbQ{n}l5u78Z87x^Vk!b>Tjz3!8*>xjKw5?M7G_5uH%iX}N?3
zG6qaJ1}ap)OA-nQ1<XkS!M{2CU0N*^00jj9G7f|S=B0q(-@JV<Ef)$1{$&gZ1<XqU
z!M}O?URo{`5d6y+5DJ)=0)l_@_Pw-RC?NQkF(4E$F9ihu=IwiFxllmxFJnL`U|tFc
z{>|I>(sH4I;9tgoP{6zt5d53B@1^BJ0l~kF0il3-DIoYaZ{JJHg#v<q83RHA^HM<Y
zZ{EI_mJ0<0|1t)I0_LTF;NQG`FD(}e2>xXZ2nEbb0l~j{`(9cu6cGH&7!V4WmjZ%+
z^Y*>8Tqq#;moXp|FfRoJ|K{y`Dk&+UO`A5+ym|9z+qP{~US7`BsIIQ2xVSi)KYu>0
zTept$;fJ!aGTOg?Kb<~(nyRX*C?zF@Dl04bnF9w7P+?&q=f!uFaq845&ZFnYvv?=+
zZQZ(+Hg4QV8#Zj9<m6<^%gdvK2M=;t_%A0XhvMVoxg5*QnlA+f1(xSyV`J&$$&>uc
zp+kqb9JC`LA%WkIA5d@P%gxQD?c2BWdw1>H#r3Eu(ySkXf3x<yYWIp2D`?oTVKjO2
zWP0?`N9m0>-e7G1_S<iC+ikbei!Z)N!-o&2v17+lX=y3r@$ttWXFR2*rqV69+(J8d
z?qmv%88e2~u3byO)l*MB#pUeXyO(ah`DVsqMMVYSS^SQCJ$m$@apT5u*$Wpg<T+^K
z#ED!M=9KZ{$J6JZf9|k%mMmF9*IjoVO_(r&1`i%glO|1~6DLk^eKD6|9(efShb{R2
z>Z`A~y!GqX)3w)LOV2#>3_bbelQeYbP+GZirNeia<Yvg@|8!*$73XfC%JNK;bgApj
z#99p8Ann_?kNWoQOG!yd^x%UJ^4gF4z&)_EeED+5KYqh{3QYCt)r;PI^G(M3h!G=b
z)v8rIA7D<w+W)}^A8?+JKmM54XgrJg0%c)d0S}?4pMU<Daf!bdEm}nP-+w=^<@)c&
zPw*upM~>uMM~@z*e*OAUL_`EV_uO;z%P+rh8}7aLUOImKIDfzW_S-2YCWf|b*+N5x
z4B<9oj#;y24GkPPka+`R`6l`v^7zkAo<Wg|&Y^u9`%p>VW)pR->rDk8kF^vS#=3sj
zU3b~=;;+5-8qJt7gV%B32YK{4;jzaaqr}8S#-omZlmng~YctkY<iX!~7B~g|@f-Mk
zl!dwC*I$37`|i7se*gV<em{5wXKBHL1zaZf2-vp_7%+h6FW?{Lpxj$;y_L%X&!O`X
z*l#@a&_kB}0?L2&)mQ2L_uqH+s!+cl^7v1Qd6st0KZABIXhN~8x>0f7rcm!wm)nOm
z@SAVGVXXZ9?|-KwM~?8m8~6tgt*6&tf1RdJpU(IP&pd0^Eau&@$N%ud4{6%8X*6oo
zD9ic}-WvH|dF2%@0{e=uzy6x%46Of{C%Sa$!h4P<o_K=ikGXT_QuprNx!im1xrcuI
z@kfVye-w!QLf5Wc`FZg3s1FkM48T9?e)ZK?)9BHo>466xpea+PFy<la0RDA32cAJa
zF>jbOg%JL$sp`~m)s59QUCH=Y*pK+5xtar-(%yB~(utD&HhIkY2l(GUefsbks?#7l
zJDb;ENBD>QZqT4Xyg$Gij)Z%d6YjqIZd$#1HLvgBy}`d@ZAOZWjAZPC57*a!$QyKd
zA@Ugc|2=#5u>2uCJsm&QN?8A~u0x(TbLLEX;e{7?52E8Adl=NAsHli9%qNgzLgonk
zLl&VY$Q&?#nKW4m5#$6Y%vSr;P5me>?p3Ndkzr{~`o1@K?Fat#IUs50!*sf`*pkPr
zUw|WE1DFR^GBY#zy5o*JYVrSHeDMXZ)0bRw31b^_0VMDMFTeaUwQJYTBLC~yu_N#A
zb)12}$6DN>LkE`sEnBvXaftVUhX)@5{6lVla{&B~c_}R|&0*JI|Bv|td4Krf2fFjl
zJ6R_2?6c2W_WybtAlJZNK*vAYi*m8=`0~pyx&7Fim^6h5{;MfD>M7bWKaAJ-gw6e_
ztT>LlG$-X7h5K;EzCH&;ENn@cN&jckF1I!tm<Ml<y*#d|Q>XHp3VFYA?fvYt&*;DZ
z{VyFpe3)haKmGKRwGj0UYdU0y;O%i{chgNb(bA<$ZSsKEKpy-Kz5p^iVEB<o9$`5g
ze#bqm>yQ)9o;}+s{|`An@<OhFynp=h2fqvZc<?0|85zu{plrw)!2g5ikB*L}{{8#&
zJMkONH&7oFr;x$_p<Pc})_L&x`!?K2<t2$M^V_xfT-!NdK{JY3aS0tSj5cxCYfZ=5
zJg^R)8S?>T^7zDkJwc9+a{}DM**n&2W5P4XjveFsSnH7opT?v=i~D#UygT>~TsThv
zub|&6F0Pw5Gv>t^hMvHaKo<b-%FoZ|vQZcCC`foOcm})^_0{j|&ztZwMDR~^^uR|7
z|IIAxJm!FeEd!~vU<d78d$rAP`aS@2Ms-!lkidk)SDNf41wv-<mmZ6x-Amistn-);
z4n{miNjo3meSwAlXIVfv?OJjk6=tvSl7#ZOP#|b25H$FQ{?4(?#dM+=I-yqHRHuA(
z)k%f*$1QsR9qW+`&r<9EH59q<Obc(I|AsTc13QLL)oD!!MlVY~g#sp_K+xbn>(Cbp
zzbz?x#l@7odyL}ip?7L~)>o9XmZFxNZ^Hv<SZ|^3;nL0kte=VpSbQE8<*YGDcS|#c
z0yY!~8vN&H{HCqpil@iAy?c2_O5Zox=B%%}x{^|&$2#Ek?Qw7Y8)YT$9_^5)u%VRv
zAruHb3Iq-QPgNeH{af!g@b^mAr{;pV^*7M5qkmZNd!i(PVpsn~<+I8Ht?RuN_m+Dq
zU(Cu&sk}5X^m<oXBowHd0zrd+G~;+-6zy4kh0Xd7IX~ohX?tH*Ha=P0+MLu`O6UJ9
z2m1gA_^;U$<fQzoZc2sludtzk4lT~YjW#*HYBF?u@Q#K`XoEXfL)9w)-xF~7uR2}E
z`nhFAF;ss1kkZpDvLRb>?mE`v2ktFvIP3R>Q^Mxks3d=j>icrm2eQrM9Q)V<9E==h
z;UR2ZXo5eWLwCj*XAt!Eo__ji)|Jz3>b+?`^l)H%16yC{`Rn?C-jrG2v(Qz5O%L>$
zpyN~5g*>or!ZRjK0fqm{lR0!~*9eMU{%49>dI9U`z-})kdK~4Y{it~KBqj2z;xqlY
z^}THP0L%rzd-RG<1f4(Z1NLp`T`P}u&alo0cn&%Oc)uCbd+)tRXP<pGg@uLjb<R2G
zFn(ZzXRpWO3VpEFL#O`AE3dSadEtc@vW=cA&wG;xdOcTMafRi*dYhbmUUSVg7C!;r
zyf;Xn4JiB<W-TS?=3-yZI=ku<*u?q_`91dOSf}%k{H|>J*U^FP4`}&~`n~EI@cyZ>
z&#5`%KWZ-NR8yW6@3rTEa6UIEE!ZBU-RNDlp*IKHc-YZEzhB2n>(;GVZy!4Jt|aIU
ze*5jW1Wf5=v~1auZR}ysSD#*=EAOZ;588ruK+hjGNY1X#ojY?K;YS2^NG44Ig?~+U
zcX<uo?R56BPv`ld37-SRt?NmtF%wuOxNC81!(IS5$Ft2?{||Nnwe){$odarRXC{4Y
z(qUk2HuQksdFLI{@c|rPdg-O?@533NjJ-DW_hEC>v}seuRrBV}*^Ur4Mn)Z7>zn-d
zP1iAozOSPT^@Z*~+9vq-Uq5(KGVJsBZ@E*g;b-$apzYyn&jtGZ-OD<ty+S)X{A+7H
z&H$k2AG5Nv!{3d30Lp{ikk|!ky#^nCz{q*$oyRz7)~p%Z<`{kSAt!i!*!j0<(}wc_
zQ?UPmA0FLC(35fC?`K|m=_SEGQ9!N#dY_*@RZQ3mq{dF<^S#~6E>vqi<oOz|Z9g$L
z)Se%#dDL&%Q#gFqSf0`aTGU$U7%tMQVfs(3ldzkGt)0%#Lzahou${r0-@A8j%WoH7
zd@;e-7wmWfJqiA~hXM}&u*W%FSx6P-N0kgOp7rxH4}Qw>{Cyj4BCPk0b@_}~_Ut=&
zfW&S0(CJf}O&RJ?dMtv^Ax>2&J2I2n3IWfMsh@S$S&a2gojUP3!37swz<+}`fSesZ
z_JSn|{sRO5Rj13TtVsE0KKwl$-t!_QZoglx`PZv6zOFUr0PR>d7q#S1ypPw;^*zIP
z{X9T(#b>lq=Lg?1aiC+2y+ibh|50`7spO3h(&4=?5%ddi&RC&r5~{0h?OcOp{JUFE
z*woIMGl$OzbzT6Um<!-X!<lTr-S;$9e!)Lex)Im^YSz1l{f)M!<NU6Pb<eN%?iycT
zAAj%Txj?-aa}V?npihkYY5oJXa|rD$LbDy*v*t=lQuc*e2S2Cd%Kq^5Da|KNLyh5v
zeh*{<@V95gKl}y;V-oyxuQeL};jat0*YV_dZ3gyn253D8w9XNjE1&~Z*WTZ=xdG+w
z-+GtQ2gqfcL--G_{hsiedf{xc8S5(~Y#u<F$`3(V(cX~b3lKj;-|Iuhugm+|wrxv@
z7Z7Yo@ZY%jhwaXedGObz;n;|4ob$n67d$`g{r0T6isCo+WlVwx$F+aU9qh|<_cG1q
z-}iGtGo_341f48P<2{KsPt`S_U_Mauk*a(2@{827BNczMIwWk1v9H(H{qXQ`miNQ2
zceifcm>0O{qKjzr=HT+JF8FU;{FfE&VY@q=xj}C?aofF&H~8<&Iy9XMjxJDoe%o2+
zukvIz%j6&{sIIEy3pV?wD)QKeSC*0wq8!-rGENl+9rF`);n(qR&>zS>{BPx3<N^mg
zfa7PtE1({z4}6Ul<*p4{egOV`ufP6!#(9etEoh4JrKjr#BYsf(_U-vM<bhAkU`c}i
z#>GFsUFq^d-yeRv;lG2(8V|<ZafCBN=mZ{)eV*<AfPdfc1mVnUU_apgxq~(jL@jB{
zx=O6S>~6yvF+cqC!e=-3`&jp(7X*D8V}iaPbo`J9aleed^^N%g?YrQgd!*6!|Na~g
zC(BX^aeu%QVDGN+?%v1=pdb7v-jjI7S7>{KJ!`uY{1`a$U*u1Ecv3d}eZm$9xQ1;I
ze0=NczOg*a2Z$Yne9-xut^D=|LxRo{>MZ(y!O&Zt)e*LX@C|Ta$6&>ax2fR=obl}S
z-S=kx(8>lsf;~Y-{99^2Q@4*>&syxer{M1&=la0NU;p~oI(7G9=Z9E;$b0$am)pb+
z@}x#PcI=?<zWa`S`@=TT*B9m}#5fZC2d4g?Cu63rXCNzpJ|Scb&>ztD1@+<GU%z7>
zX~FtTI9~|F1V8?;1qMEDxZwu&`(Ix@;e%h-55k$CH@>wIj|=Z^h)dT0`g%5WeurLP
zZrZ=qxj_%BjbXid!Ty*B)EuB>l<-#?XmbGcco0(q*gOCH^I6B&l@Wk_z{rs!`8ntX
zA|{BZ3Go8)Zpaq>b+u~Mit8%)_q3OS_c_Q1U|Ya;fj&Gda9=hM&SxNvr8fk-UVEKg
z#P-2H9{7Ljt+(9j<fy19f}KB}edd{GY+{JGQxM{F;M@Umh5d2C#u2hg)Kl>9PS1o+
zUYsMsr%24I%NlV%fW1IVI<o&=_G{9R)CKNg%Y*$o_S;BU!x6g|xIp||!~=FGf#?6*
z-~PtWg9kvotw2qXXA1t!vH!1Y3_`~rK86}kCV;brwybAZS3Q0G8|-s+9vJ>|^f>@A
z{ty#fkE!SGdw1>HMbHTZwh&t|P?MbhanFS0`JcOEuDtZ1k_`^3kqP)?zh8Hmn0pYf
z5cY-*m0-^^efo5Z-!IGoko$R?;CllxJb{1s|AG!dASS^-_ln@ZW^h)VNN0ayjmZZb
z+5bU<LIw8ym;-dVJ@D#_Ibhzrd8{vl^TWAw=Qe1YTz#3~pD88yHw>7H6GxPP!Qq;o
zUqj0U)%#*sb<=#D8tUZlub2aH*6+(XAS)}&;`?*Vm@!_R1^TP~f`6v0;NNb5K`$pW
zX&U<)WnQ2m=K=Muqly2ttC9cz#2f%W-TEAG)m2w9AAtMVCwOv=9Xpoy04NLo{{t-v
z{<%j4|4s&GS@B*KQ{)vDZ{&Yj?-x46+NIg};ryO2AKD*dzKPp#1KTw@sg~bv+s^@A
zx^$t39(u^5Yv|CS)V+Im#y@<CZ{51pZ}s-HV8K6APVisP0D@eg;K)2mi<`vq0m$k0
ztm)1+M(`~Py8!p?f}F_%;e+s;MvF;~IpDL;KC_$)K!)dw3$cX)EeZYw|IWsw=7SLW
z`PTTtxQDr*ICnk!`+;u&#1)5Kf%|$t&hW4KKuU{y%~{p_ejmL4%$YM;2XOG<!Q|})
z|NFoG`m5jT?d}T%|4cDi{~ZjR%mW{*^SGN>M;~!S;L8KCM-d}P^F`cB<NaAS;Jsat
zasI#_1Ac^H6Wy4}lRdw)XTVnkS`z&q?h(Pi-N1y+Ajb`xulpv__x=9!H)g~?WC|RQ
zSj9eUhy;6m#O*<B9)Df1CH5piAJHFmLR<pf#z^#kJ?WXyeFi!>kojq{J?DJ74Q736
zL!@K?i_fLvyp0V)<WD~NgmvKIzsDaJ@b&iFZ+mnGxOnkmztjmfjk=uzbf60g3L1pg
z0r(PG|Lr;jIsmb&|I&!~$DGrG^3#8|tC@fP)b;g!A?I^e2K)zjVh;=-0M5$v)qR{#
z3jX~wwt}(LO6Ajk&l;r*%X|CASpU^K)w{C~ec2%7d;a<78DkwfbfAe7ClYM;eQ}{&
zJ(lS3;ln+`Km2|G=g><SHEI+=X6K8#>17~JDEJ>w_a_a~LH>P-tp9fOMGSDr`5I3T
zSo2$WRQVBah@|5mG5dTO!vl5zg9Z&^{CbOj@apz)2OEMmCU}S7->#G4j|1m=jgS8i
z?P}(qKXv@yc;k&ejni9EQQ=ekBld`=33CyA6Qc~+{^NpQ0r(ieeVkjEGztFgI=-?z
zD<Js)tV3Ve)yzMCngRdtC(@@+AND1LeGV@06z$rzqX7d3P+?)Ae~26Sr3(J-`lwu;
zyTzz@e~l;quaW;{{9;!#|NLnN{3Awr=gyrS$`aw{MC5<|8C$_vYH7ia8l7I>>h-vO
zUZ}+uEXm*2Amnp~f9UK(=H}`J-+zb)qNhOO|I5nC=;xn*rWrG4ux=y#o9J;35ZCC~
zv159*&Gsqlzg>^#XZ%VL3tReBr`L7tYqEd%Bs*Dl*sf;&`O_KxzyJPwhwEis=WZW<
zXq8z668;@gPW=BfRRsTbgCis1AB`^ii{I3*!D0zJ!~d#Pt7zcBfi7SD`}e2cfB)S=
z%|OS$=>H4;ErYe@3v7H4D@2PI)HrAVc=w^GQL08(+avpW`tomQ_=ij!y20*TkhAN_
z7x>qC5cm@HM*gqY$@nSwXKKj$Zx|G??`v$`Kb$*eB)ns&m4ClF!@sw0^#%SHELcGB
zOW3bpKR&1Pwob<91^-M9!M|Zp6lJeu`+K+c>o&Uo;VMpWd$tio3}Da738(ConTA^V
z_iG^IAG}9yZZ75L=llGOUhpsYw?~$Dd;b=EW(eE8_>DKaaDJ%826lALh<M`-m7L)p
z>o?BD-MNhML4C3QJEH;iCa_s_r*1d{Febr2Q$yDOnn3}3`-CmGd$jjQjA4!?q}KeX
zCFd)@0i#r$!L#dF|5d)F7bst&!_<D`a+S}PSI9m5gK?<(^}93t!}bogd#+xvqnk5l
zj-{^t#6RK|-Ezw<gtI$W>W4Fa#4a}`!9P<&@Lw}1%8FtY-`=4X7G2@tW7T=xuEni2
zyer$Cl-<uz{H9x+o+CiUcVNd5_2z0idSI%`r+f+O`v}<nB!6Wbs($_M4F9_9t*-Mv
z``<qL$ZE6TPyEA2d5ab;+&Z5eF=B)b9R>eP4#9uTsKA<Q!Jv-CdOy{Ef7yj9p6GR!
zd4qj;uIs5V{5A6e_G`QLj&Rm7L>zGV88Yqx@O<*_r<J{2!|0?t!$0EqOqw)_a8B;Z
z1%Eo5Hf^$C%%AvAPfzFAgs#*Jd4Tobe*4W*H+&KNGdTqRHKQUmW}*kYf4K71HISlL
zTx`KV<6G$uL56qqz=z6raE-69T5}2Z|24jZZGOYv0P(;U)zr+tA36?t_Uy@fYG1t#
zvODMxfJcCCV4x*^-h(d?_!u&268x)<NBrIR&9^z_*B$Z&icgPLb^=Kek0|Ub*`EQ!
z!1cb3eW{`>P0axxF`nJgDZqXJJ_t&WMf!bMPMtcHF$!D#w6rvzy)Q2>&*B3dYp^E?
z^;x)ZAwd>_m?FMPkRLw$@Wb5hyYIf6z^j-vnYQ7^{$`sWCAT;7;YK_={vOV;g5uWq
zbU1HBE;@?}vzGE}3bU8f{w;T~Oc3(`ulsf~Kl^te56V7XxZ7A&pMPJpXc5Qi!hU+$
zvSmIif7`Zg)Vg(R#@OuHvpp&o&mo3blO|1Q+O%mNmEq_i#5L~LtsB=3{Evx~;9qrq
zQO;Vc{LZkB+hfx5w_2ZLR(7HEeXl!_^XoP|*0>k&D|+ncA8KzuTKN~~p?HFJ+TMWQ
z2l>Bt27q}3=LwjLcFsRT$rgH0NxrolUyoI+v6o$T8DjyqKEASr*Y_2$wT+LD_o&*s
z{~zoj;Ge`-c6yL)Hf`FJnm2DwnEy<i1plh@vy*37@MpnzUGsp#Cj5dYZol8*+7ImF
zT(9CpM(v?hT}ALQgmwK`<`T+F`w!)$e50;!)%Q8fGZf{lCddY3R(4i%K$waP*wwG`
z!Ql@J7(4geb7}eV<+bbV<{j7$wr}5_%f#N_s2A)`QAYd&uZT_JZNhwqb3?QjK2Ll#
zr+8bhMtWZGuLys5&kG92O>Fk?PUit&Tj4P~c_yFX>+7~LzjnSim|#!fO~RSv!HCB>
z{uuNHAXBWas`REvhtFbt*6rgFw<|U_)?q$ZZo;<?)@tAjJ~kpEB3yaQVICv?Q6A=$
zB}<k#%<IZc*!d0{HjL|r{mxH6{p8AHp`6FN0U8370Y<fT+;#k?@0(1iF%ulG{fckE
z-u-CeRG(0%>U0@F9}qqXu{S_W!c!H#w^s+&&OGx>#s>6dV9W1L+z$Bn#rYrBRA4nc
zJe)rL^i!{BpyMB9wQALh%k9{)BY}T+*Jo!!LV`u+hx&~hH;#<@ie6PTcpo-B{xyGp
zJ)C0MxUOq_{a+L>zK~#}?^s?~v-i*2?9)+kvMiOc4}Am7S0_pmd|Ezubesj~b3mIm
zZD{o9(X?{qO3KK{;4?D#2Q^+LB_#ykI_uW0W8cB>r=?^6_19nb8ecm8!AHFR{`&;%
zqkOF04?g%H+Z!h*C-b?bv0nI&7$1l`4E|%vlqrOGrg#?DqmMqyb_G5qU~m>@di<X#
ziKpo0e|ByEuXz6>3Gec`e#9RJojrrBfY1JvPLDs<Xy^-;<ZWX7$F1*Gqa)xuJ7LTL
z@VT%1?FLp_wrt7R>D{|G_3hi&=EA+MUAtP=X5<G(5lh?`YpW6e*jKDsvxfD3bsXbt
zpi`$#)T>u7n|h(1*n_}!5c8OxAF+rbmxMi$B&LAr@n4j)#x<Kig?+>Yf-F96{S8j}
z1>iqD{!PCQFX$`erhcb%kNVS*#19B(3%*QoadCvWAeUZxDa*-q{5bo>`5bUKX3Q9h
zii+}CRgC!8?f=1xy!YOFgt#59>HxQG+m?n58N$4br?N<&H7c+QGClrX*ZU3UJ$+vK
z9G1t~><cXGzh?jA&+|It@PUu8jQF>eEMg*+74J3v<n?##=TlNrXztv(^zOUwa=g6p
z<HwWnLc9?0*1!Dn3;Wb|M_%Ac1s&mEe-8RUIIDoqF~spO)(hV!Oqf8ECr@Ts0pyv!
z;79a#htQ|#@t=_}#pznEV_eh6yHa5+juN-stMWUR72^K>t#>tW?A~fBE!eJnhWvx~
z1JzY0LuPo^h5wLgWaBo(<oK^<eH>?a*71)szRaX)N>51b6&AOtQ&y1EfWAA7LkITD
zg;~oeU-=D346{&3f`7mFqN(v;rPj*CZG)Vy=fFSKew@9XJf6&U{Z8kK8u>s&`R#Q!
zG7!H6GQ#rGq<U=#5f=k-aIm-b=Y@CRoWR|r+aTlIU*G?`TZZJXlLDs3|EY=sCClqo
zFaMu)@H5uetIIzC<bG*!uhvQI2Kx~@hKdJ3Ec3ebg<!J_*%;2({CVLWPe1*%+q%W@
zCjyy0&KM;ApI=6gsqv39b?EUsKF8Pec%Xj|J>J86U#erCP<{ZGcl5ihj=LiOJ_M?(
ztv-3}pU3&WGnu}x?++e4*lqm7hA=WRl44?F*blLN{pD}3DPU^+mlegZzfMOwy!zfh
z>(F$iYZI^hbzD-%Jkf;Z2o2@4!|PtJDPYT%Ei`M^EI#wcxxc?IykqU!wI0O)_f=b^
z9ETJzHU5ip*E_ZQ13w?9{P@6D2floq@d%hZ;I9LFZb?FcAfte(@n3Lco;u5S7VE2p
z!u?m=o$34DbSfi+Jn&%TaIbBBf^6JKbwh&!rpA9x>c1SG<?-6Dbo?q$W^*s6#*BA@
ze@)*9e1s&SKoC;E)cDUl@Udf=p5h5$ldq*JI<)Hvhxo_Ze`wbTS^I-<;7gU60;a}4
z^z`k|^Rf2BCok**ksv=$+BvjVKJ5Du>!&1t3+I#ngaScG0aN4u@SYcI;TrOQoYYyC
zuEhDdqnMzWCsLxHtyjm!QjmNR3IrYnOpX7P=y5jq2c{9b>r_RarKhT^f&U>k`EV8h
z-@iCNlq3`gVhWfT|4R2i>M0vsM=m^5`P!Ln)15feKN#_tO+Mfs{`n*c1%jLcCddCM
z3$A(X-*l^5`wMDyY4YwdHu=~dK<N%j5()%41x${A>-vv4J$Y$AI_%E$eQ#Ls4;}%&
zdL;=3LVyA$#y_$A4)TAj{qUu8s?xDv%^c-xN3#WNs_gp*`P|=52#h0XLU2;R)cA+J
z9`Mg=f4XyD(4_@CR4mUwv7Rqtg-8+#ga`#pjsMJ~PdL6t!sY>LO)qrXrSPv8zo{P`
zj(uLv`<zlqeh5Mem>T~DM;EZ~&%8R;e!WkN^EMLfg(V3ELWlyU#(#NfqO#i^<51=w
zLVYYv5ehh?fT{71v;DgGerH6J`$B;bp@6CJA0mAy%@7KBN&&&Yr<9ZDgaW}&0l|Op
z_o1{vDBvjt1pl5=PM#AA1V04?|H0pf(gLA?rxXzUdrCQZPACxk6cGFee;-N<gaV#Y
zK=AJ=<>Wb`K=4yQ@E`nrC@l~QcuE1mzo(Rw=Y#^mPXWPy@b{s#Kq%lT1qA<|Qcj)|
z3Ism|ic}L$$R#w8F<`zipkh2r5()?fgaSeVp@2|8C?FIN3J3*+0zv_yfKWgv5YQC(
Ee^OPFqyPW_

literal 67646
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
T_R1&o?v`Szaclx6AOimZE^Qgw

diff --git a/litemall-admin/src/api/dict.js b/litemall-admin/src/api/dict.js
new file mode 100644
index 00000000..412215e8
--- /dev/null
+++ b/litemall-admin/src/api/dict.js
@@ -0,0 +1,49 @@
+import request from '@/utils/request'
+
+export function listDict(query) {
+  return request({
+    url: '/dict/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function createDict(data) {
+  return request({
+    url: '/dict/create',
+    method: 'post',
+    data
+  })
+}
+
+export function readDict(data) {
+  return request({
+    url: '/dict/read',
+    method: 'get',
+    data
+  })
+}
+
+export function updateDict(data) {
+  return request({
+    url: '/dict/update',
+    method: 'post',
+    data
+  })
+}
+
+export function deleteDict(data) {
+  return request({
+    url: '/dict/delete',
+    method: 'post',
+    data
+  })
+}
+
+export function batchDeleteDict(data) {
+  return request({
+    url: '/dict/batchDelete',
+    method: 'post',
+    data
+  })
+}
diff --git a/litemall-admin/src/api/goods.js b/litemall-admin/src/api/goods.js
index 0ef2834c..9a04bfee 100644
--- a/litemall-admin/src/api/goods.js
+++ b/litemall-admin/src/api/goods.js
@@ -3,8 +3,9 @@ import request from '@/utils/request'
 export function listGoods(query) {
   return request({
     url: '/goods/list',
-    method: 'get',
-    params: query
+    method: 'post',
+    headers: { 'Content-Type': 'application/json' },
+    data: JSON.stringify(query)
   })
 }
 
diff --git a/litemall-admin/src/api/topic.js b/litemall-admin/src/api/topic.js
index 697245df..425a1658 100644
--- a/litemall-admin/src/api/topic.js
+++ b/litemall-admin/src/api/topic.js
@@ -3,8 +3,9 @@ import request from '@/utils/request'
 export function listTopic(query) {
   return request({
     url: '/topic/list',
-    method: 'get',
-    params: query
+    method: 'post',
+    headers: { 'Content-Type': 'application/json' },
+    data: JSON.stringify(query)
   })
 }
 
diff --git a/litemall-admin/src/api/work.js b/litemall-admin/src/api/work.js
new file mode 100644
index 00000000..c62d3f4e
--- /dev/null
+++ b/litemall-admin/src/api/work.js
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+export function listWork(query) {
+  return request({
+    url: '/work/list',
+    method: 'post',
+    headers: { 'Content-Type': 'application/json' },
+    data: JSON.stringify(query)
+  })
+}
+
+export function deleteWork(data) {
+  return request({
+    url: '/work/delete',
+    method: 'post',
+    data
+  })
+}
+
+export function editWork(data) {
+  return request({
+    url: '/work/update',
+    method: 'post',
+    data
+  })
+}
diff --git a/litemall-admin/src/components/NumberRange/inputNumberRange.vue b/litemall-admin/src/components/NumberRange/inputNumberRange.vue
new file mode 100644
index 00000000..c1ca63b9
--- /dev/null
+++ b/litemall-admin/src/components/NumberRange/inputNumberRange.vue
@@ -0,0 +1,204 @@
+<template>
+  <div>
+    <div class="input-number-range" :class="{ 'is-disabled': disabled }">
+      <div class="flex">
+        <div class="from">
+          <el-input
+            ref="input_from"
+            v-model="userInputForm"
+            :disabled="disabled"
+            placeholder="最小值"
+            @blur="handleBlurFrom"
+            @focus="handleFocusFrom"
+            @input="handleInputFrom"
+            @change="handleInputChangeFrom"
+          />
+        </div>
+        <div class="center">
+          <span>至</span>
+        </div>
+        <div class="to">
+          <el-input
+            ref="input_to"
+            v-model="userInputTo"
+            :disabled="disabled"
+            placeholder="最大值"
+            @blur="handleBlurTo"
+            @focus="handleFocusTo"
+            @input="handleInputTo"
+            @change="handleInputChangeTo"
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'InputNumberRange',
+
+  props: {
+    // 初始化范围
+    value: { required: true },
+
+    // 是否禁用
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+
+    // 精度参数
+    precision: {
+      type: Number,
+      default: 0,
+      validator(val) {
+        return val >= 0 && val === parseInt(val, 10)
+      }
+    }
+  },
+
+  data() {
+    return {
+      userInputForm: null,
+      userInputTo: null
+    }
+  },
+
+  watch: {
+    value: {
+      immediate: true,
+      handler(value) {
+        /** 初始化范围 */
+        if (value instanceof Array && this.precision !== undefined) {
+          this.userInputForm = typeof value[0] === 'number' ? value[0] : null
+          this.userInputTo = typeof value[1] === 'number' ? value[1] : null
+        }
+      }
+    }
+  },
+
+  methods: {
+    // 根据精度保留数字
+    toPrecision(num, precision) {
+      if (precision === undefined) precision = 0
+      return parseFloat(
+        Math.round(num * Math.pow(10, precision)) / Math.pow(10, precision)
+      )
+    },
+
+    handleBlurFrom(event) {
+      this.$emit('blurfrom', event)
+    },
+
+    handleFocusFrom(event) {
+      this.$emit('focusfrom', event)
+    },
+
+    handleBlurTo(event) {
+      this.$emit('blurto', event)
+    },
+
+    handleFocusTo(event) {
+      this.$emit('focusto', event)
+    },
+
+    handleInputFrom(value) {
+      this.$emit('inputfrom', value)
+    },
+
+    handleInputTo(value) {
+      this.$emit('inputto', value)
+    },
+
+    // from输入框change事件
+    handleInputChangeFrom(value) {
+      // 如果是非数字空返回null
+      if (isNaN(value) || value === '') {
+        this.$emit('input', [null, this.userInputTo])
+        this.$emit('changefrom', this.userInputForm)
+        return
+      }
+
+      // 初始化数字精度
+      this.userInputForm = this.setPrecisionValue(value)
+
+      // 如果from > to 将from值替换成to
+      if (typeof this.userInputTo === 'number') {
+        this.userInputForm =
+          parseFloat(this.userInputForm) <= parseFloat(this.userInputTo)
+            ? this.userInputForm
+            : this.userInputTo
+      }
+      this.$emit('input', [this.userInputForm, this.userInputTo])
+      this.$emit('changefrom', this.userInputForm)
+    },
+
+    // to输入框change事件
+    handleInputChangeTo(value) {
+      // 如果是非数字空返回null
+      if (isNaN(value) || value === '') {
+        this.$emit('input', [this.userInputForm, null])
+        this.$emit('changefrom', this.userInputTo)
+        return
+      }
+
+      // 初始化数字精度
+      this.userInputTo = this.setPrecisionValue(value)
+
+      // 如果to < tfrom 将to值替换成from
+      if (typeof this.userInputForm === 'number') {
+        this.userInputTo =
+          parseFloat(this.userInputTo) >= parseFloat(this.userInputForm)
+            ? this.userInputTo
+            : this.userInputForm
+      }
+      this.$emit('input', [this.userInputForm, this.userInputTo])
+      this.$emit('changeto', this.userInputTo)
+    },
+
+    // 设置成精度数字
+    setPrecisionValue(value) {
+      if (this.precision !== undefined) {
+        const val = this.toPrecision(value, this.precision)
+        return val
+      }
+      return null
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+// 取消element原有的input框样式
+::v-deep .el-input--mini .el-input__inner {
+  border: 0px;
+  margin: 0;
+  padding: 0 15px;
+  background-color: transparent;
+}
+
+.input-number-range {
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+}
+
+.flex {
+  display: flex;
+  flex-direction: row;
+  width: 100%;
+  justify-content: center;
+  align-items: center;
+
+  .center {
+    margin-top: 1px;
+  }
+}
+
+.is-disabled {
+  background-color: #eef0f6;
+  border-color: #e4e7ed;
+  color: #c0c4cc;
+  cursor: not-allowed;
+}
+</style>
diff --git a/litemall-admin/src/router/index.js b/litemall-admin/src/router/index.js
index a39a972b..f49f5b9e 100644
--- a/litemall-admin/src/router/index.js
+++ b/litemall-admin/src/router/index.js
@@ -306,6 +306,16 @@ export const asyncRoutes = [
           noCache: true
         }
       },
+      {
+        path: 'work',
+        component: () => import('@/views/promotion/work'),
+        name: 'work',
+        meta: {
+          perms: ['GET /admin/work/list', 'POST /admin/work/update', 'POST /admin/work/delete'],
+          title: '职位列表',
+          noCache: true
+        }
+      },
       {
         path: 'topic-create',
         component: () => import('@/views/promotion/topicCreate'),
diff --git a/litemall-admin/src/utils/request.js b/litemall-admin/src/utils/request.js
index 147329f6..a3f589eb 100644
--- a/litemall-admin/src/utils/request.js
+++ b/litemall-admin/src/utils/request.js
@@ -2,6 +2,7 @@ import axios from 'axios'
 import { Message, MessageBox } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
+import { method } from 'lodash'
 
 axios.defaults.withCredentials = true
 
diff --git a/litemall-admin/src/views/config/dict.vue b/litemall-admin/src/views/config/dict.vue
new file mode 100644
index 00000000..d8b48598
--- /dev/null
+++ b/litemall-admin/src/views/config/dict.vue
@@ -0,0 +1,482 @@
+<template>
+  <section>
+    <div class="app-container">
+      <!--高级查询-->
+      <el-form :inline="true" :model="formInline">
+        <el-form-item>
+          <el-input v-model="formInline.code" placeholder="请输入编号" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="formInline.name" placeholder="请输入名称" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="formInline.category" placeholder="请选择类型" clearable>
+            <el-option v-for="item in parentSn" :key="item.code" :label="item.name" :value="item.code" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="querySubmit">查询</el-button>
+          <el-button type="success" @click="addSubmit">添加</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!--列表数据展示-->
+    <el-table v-loading="listLoading" :data="tableData" element-loading-text="正在查询中。。。" border fit highlight-current-row border:visible="drawer" @selection-change="selsChange" @row-dblclick="rowDrawerClick">
+      <!--innerDrawer = true-->
+      <el-table-column type="selection" width="55" />
+      <el-table-column type="index" align="center" label="序号" width="50" />
+      <el-table-column prop="code" align="center" label="编号" />
+      <el-table-column prop="name" align="center" label="类型" />
+      <el-table-column fixed="right" label="操作" align="center" width="150">
+        <template slot-scope="scope">
+          <el-button type="info" size="small" @click="editClick(scope.row)">编辑</el-button>
+          <el-button type="danger" size="small" @click="deleteTypeById(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-col :span="24" class="toolbar">
+      <!--批量删除-->
+      <el-button type="danger" size="mini" :disabled="sels.length===0" @click="batchTypeRemove">批量删除</el-button>
+      <!--分页-->
+      <el-pagination
+        style="float: right;"
+        :page-sizes="pageSizes"
+        :current-page="currentPage"
+        :page-size="pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </el-col>
+    <!--添加、编辑组件-->
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
+      <span>
+        <el-form ref="form" :model="addOrEditform" label-width="80px">
+          <el-form-item label="编号">
+            <el-input v-model="addOrEditform.code" />
+          </el-form-item>
+          <el-form-item label="名称">
+            <el-input v-model="addOrEditform.name" />
+          </el-form-item>
+          <el-form-item label="类型">
+            <el-select v-model="addOrEditform.category" placeholder="请选择类型" clearable>
+              <el-option v-for="item in parentSn" :key="item.code" :label="item.name" :value="item.code" />
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="addOrEditformSubmit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </section>
+</template>
+<script>
+import { listDict, createDict, updateDict, deleteDict, batchDeleteDict } from '@/api/dict'
+
+export default {
+  data() {
+    return {
+      // 默认不显示抽屉
+      drawer: false,
+      // 多层抽屉
+      innerDrawer: false,
+      listLoading: true,
+      // 多选框
+      sels: [],
+      // 数据列表
+      tableData: [],
+      // 页码
+      currentPage: 1,
+      // 每页数据数组
+      pageSizes: [5, 10, 15, 20],
+      // 每页数据条数
+      pageSize: 5,
+      // 数据总条数
+      total: 0,
+      // 高级查询公共前缀绑定
+      formInline: {
+        code: '',
+        name: '',
+        category: ''
+      },
+
+      // 添加、编辑动态标题绑定
+      title: '',
+      // 是否打开组件
+      dialogVisible: false,
+      // 添加、编辑公共前缀绑定
+      addOrEditform: {
+        id: '',
+        code: '',
+        name: '',
+        category: ''
+      },
+      // ==========================================================以下内层抽屉属性======================================================================
+      // 页码
+      drawerCurrentPage: 1,
+      // 每页数据数组
+      drawerPageSizes: [5, 10, 15, 20],
+      // 每页数据条数
+      drawerPageSize: 5,
+      // 数据总条数
+      drawerTotal: 0,
+      // 数据列表
+      drawerData: [],
+      // 高级查询公共前缀绑定
+      formDrawerInline: {
+        // 品牌id
+        parentId: '',
+        // 商品id
+        id: '',
+        // 商品名
+        name: ''
+      },
+      // 添加、修改模态框
+      drawerDialogVisible: false,
+      // 添加、编辑公共前缀绑定
+      drawerAddOrEditform: {
+        // 品牌id
+        parent: {
+          id: ''
+        },
+        // 父级id（for循环展示）
+        parentId: '',
+        // 商品id
+        id: '',
+        // 商品名
+        name: ''
+      },
+      // 内层抽屉对应第一层产品名称
+      parentSn: []
+    }
+  },
+  mounted() {
+    // 数据列表展示
+    this.loadAllDatas()
+    // 查询所有品牌类型名，无分页
+    this.loadAllType()
+  },
+  methods: {
+    // 双击显示内层抽屉
+    rowDrawerClick(row) {
+      // console.debug(row)
+      // 每次子表打开，页码重新赋值为1
+      this.drawerCurrentPage = 1
+      // 每次子表打开，每页数据条数重新赋值为5条
+      this.drawerPageSize = 5
+      // 品牌id赋值
+      this.formDrawerInline.parentId = row.id
+      // 展示内层抽屉列表
+      this.loadRowDrawerDataByQuery()
+      // 弹出内层抽屉
+      this.innerDrawer = true
+    },
+    // 每页数据量
+    drawerHandleSizeChange(val) {
+      this.drawerPageSize = val
+      // 展示内层抽屉列表（刷新页面）
+      this.loadRowDrawerDataByQuery()
+    },
+    // 当前页
+    drawerHandleCurrentChange(val) {
+      this.drawerCurrentPage = val
+      // 展示内层抽屉列表（刷新页面）
+      this.loadRowDrawerDataByQuery()
+    },
+    // 高级查询
+    queryDrawerSubmit() {
+      // 展示内层抽屉列表（刷新页面）
+      this.loadRowDrawerDataByQuery()
+    },
+    // 添加事件注册
+    addDrawerSubmit() {
+      this.title = '添加'
+      // 清空表单
+      for (const k in this.drawerAddOrEditform) {
+        this.drawerAddOrEditform[k] = ''
+      }
+      // 打开模态框
+      this.drawerDialogVisible = true
+    },
+    // 删除事件,删除一条
+    deleteDetailById(row) {
+      // console.debug(row)
+      // 发送请求
+      deleteDict({ id: row.id }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '删除成功!'
+        })
+        // 关闭模态框
+        this.dialogVisible = false
+        // 刷新页面
+        this.loadRowDrawerDataByQuery()
+      }).catch(() => {
+        // 错误提示
+        this.$message({
+          type: 'fail',
+          message: '删除失败！'
+        })
+        // 关闭模态框
+        this.dialogVisible = false
+        // 刷新页面
+        this.loadRowDrawerDataByQuery()
+      })
+    },
+    // 批量删除
+    batchDetailRemove() {
+      // console.debug(this.sels)
+      const ids = this.sels.map(item => item.id)
+
+      this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        // 发送请求
+        batchDeleteDict({ ids: ids }).then(res => {
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
+          // 刷新页面
+          this.loadRowDrawerDataByQuery()
+        }).catch(() => {
+          // 错误提示
+          this.$message({
+            type: 'fail',
+            message: '删除失败！'
+          })
+          // 刷新页面
+          this.loadRowDrawerDataByQuery()
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 列表展示方法
+    loadRowDrawerDataByQuery() {
+      // 分页、高级查询参数
+      const param = {
+        'id': this.formDrawerInline.parentId,
+        // 每页数据条数
+        'pageSizeDetail': this.drawerPageSize,
+        // 页码
+        'currentPageDetail': this.drawerCurrentPage,
+        // 高级查询参数
+        'name': this.formDrawerInline.name
+      }
+      // console.debug(param)
+      // 发送请求，查询此行所属的参数
+      this.$http.patch('/detail/loadRowDrawerDataByQuery', param).then(res => {
+        // console.debug(res.data)
+        const { total, list } = res.data
+        this.drawerTotal = total
+        this.drawerData = list
+      })
+    },
+    // ================================================以上为内层抽屉事件========================================================
+    // 每页数据量
+    handleSizeChange(val) {
+      // console.debug('每页数据量', val)
+      this.pageSize = val
+      // 刷新页面
+      this.loadAllDatas()
+    },
+    // 当前页
+    handleCurrentChange(val) {
+      // console.debug('页码', val)
+      this.currentPage = val
+      // 刷新页面
+      this.loadAllDatas()
+    },
+    // 多选事件注册
+    selsChange(sels) {
+      this.sels = sels
+    },
+    // 内层抽屉关闭提示
+    handleClose(done) {
+      this.$confirm('还有未保存的工作哦确定关闭吗？')
+        .then(_ => {
+          done()
+        })
+        .catch(_ => {
+        })
+    },
+    // 高级查询
+    querySubmit() {
+      this.loadAllDatas()
+    },
+    // 添加事件注册
+    addSubmit() {
+      this.title = '添加'
+      // 清空表单
+      for (const k in this.addOrEditform) {
+        this.addOrEditform[k] = ''
+      }
+      // 打开模态框
+      this.dialogVisible = true
+    },
+    // 编辑事件注册
+    editClick(row) {
+      this.title = '编辑'
+      // 清空表单
+      for (const k in this.addOrEditform) {
+        this.addOrEditform[k] = ''
+      }
+      // 回显数据
+      for (const k in this.addOrEditform) {
+        this.addOrEditform[k] = row[k]
+      }
+      this.addOrEditform.id = row.id
+      // 打开模态框
+      this.dialogVisible = true
+    },
+    // 编辑、添加提交事件
+    addOrEditformSubmit() {
+      // 获取参数
+      // 发送请求
+      console.log(this.addOrEditform)
+      if (typeof this.addOrEditform.id !== 'undefined' && this.addOrEditform.id !== null && this.addOrEditform.id !== '') {
+        updateDict(this.addOrEditform).then(res => {
+          this.$message({
+            type: 'success',
+            message: '更新成功!'
+          })
+          // 关闭模态框
+          this.dialogVisible = false
+          // 刷新页面
+          this.loadAllDatas()
+        }).catch(() => {
+          this.$message.error(
+            '更新失败！'
+          )
+          // 关闭模态框
+          this.dialogVisible = false
+          // 刷新页面
+          this.loadAllDatas()
+        })
+      } else {
+        createDict(this.addOrEditform).then(res => {
+          this.$message({
+            type: 'success',
+            message: '添加成功!'
+          })
+          // 关闭模态框
+          this.dialogVisible = false
+          // 刷新页面
+          this.loadAllDatas()
+        }).catch(() => {
+          this.$message.error(
+            '添加失败！'
+          )
+          // 关闭模态框
+          this.dialogVisible = false
+          // 刷新页面
+          this.loadAllDatas()
+        })
+      }
+    },
+    // 删除事件
+    deleteTypeById(row) {
+      // console.debug(row)
+      this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        // 发送请求
+        batchDeleteDict({ id: row.id }).then(res => {
+          const { success } = res.data
+          if (success) {
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            })
+            // 刷新页面
+            this.loadAllDatas()
+          } else {
+            this.$message.error('删除失败!')
+            // 刷新页面
+            this.loadAllDatas()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 批量删除
+    batchTypeRemove() {
+      // console.debug(this.sels)
+      const ids = this.sels.map(item => item.id)
+      this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        // 发送请求
+        batchDeleteDict({ ids: ids }).then(res => {
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
+          // 刷新页面
+          this.loadAllDatas()
+        }).catch(() => {
+          this.$message.error('删除失败!')
+          // 刷新页面
+          this.loadAllDatas()
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 数据列表展示
+    loadAllDatas() {
+      // 准备分页数据
+      const param = {
+        // 每页数据条数
+        'limit': this.pageSize,
+        // 页码
+        'page': this.currentPage,
+        // 高级查询参数
+        'code': this.formInline.code,
+        'name': this.formInline.name,
+        'category': this.formInline.category
+      }
+      // console.debug(param)
+      this.listLoading = true
+      listDict(param).then(response => {
+        console.debug(response.data)
+        this.tableData = response.data.data.list
+        this.total = response.data.data.total
+        this.listLoading = false
+      }).catch(() => {
+        this.tableData = []
+        this.total = 0
+        this.listLoading = false
+      })
+    },
+    // 查询所有品牌类型名，无分页
+    loadAllType() {
+      listDict({ category: 'DICT_CATEGORY' }).then(response => {
+        this.parentSn = response.data.data.list
+      }).catch(() => {
+        this.parentSn = []
+      })
+    }
+  }
+}
+</script>
diff --git a/litemall-admin/src/views/dashboard/index.vue b/litemall-admin/src/views/dashboard/index.vue
index e8f3ee5f..6e424153 100644
--- a/litemall-admin/src/views/dashboard/index.vue
+++ b/litemall-admin/src/views/dashboard/index.vue
@@ -2,7 +2,7 @@
   <div class="dashboard-editor-container">
 
     <el-row :gutter="40" class="panel-group">
-      <el-col :xs="16" :sm="16" :lg="8" class="card-panel-col">
+      <el-col :xs="16" :sm="16" :lg="6" class="card-panel-col">
         <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
           <div class="card-panel-icon-wrapper icon-people">
             <svg-icon icon-class="peoples" class-name="card-panel-icon" />
@@ -13,7 +13,7 @@
           </div>
         </div>
       </el-col>
-      <el-col :xs="16" :sm="16" :lg="8" class="card-panel-col">
+      <el-col :xs="16" :sm="16" :lg="6" class="card-panel-col">
         <div class="card-panel" @click="handleSetLineChartData('messages')">
           <div class="card-panel-icon-wrapper icon-message">
             <svg-icon icon-class="message" class-name="card-panel-icon" />
@@ -24,7 +24,18 @@
           </div>
         </div>
       </el-col>
-      <el-col :xs="16" :sm="16" :lg="8" class="card-panel-col">
+      <el-col :xs="16" :sm="16" :lg="6" class="card-panel-col">
+        <div class="card-panel" @click="handleSetLineChartData('works')">
+          <div class="card-panel-icon-wrapper icon-message">
+            <svg-icon icon-class="message" class-name="card-panel-icon" />
+          </div>
+          <div class="card-panel-description">
+            <div class="card-panel-text">职位数量</div>
+            <count-to :start-val="0" :end-val="workTotal" :duration="3000" class="card-panel-num" />
+          </div>
+        </div>
+      </el-col>
+      <el-col :xs="16" :sm="16" :lg="6" class="card-panel-col">
         <div class="card-panel" @click="handleSetLineChartData('purchases')">
           <div class="card-panel-icon-wrapper icon-money">
             <svg-icon icon-class="message" class-name="card-panel-icon" />
@@ -63,7 +74,7 @@ export default {
       userTotal: 0,
       goodsTotal: 0,
       productTotal: 0,
-      orderTotal: 0
+      workTotal: 0
     }
   },
   created() {
@@ -71,7 +82,7 @@ export default {
       this.userTotal = response.data.data.userTotal
       this.goodsTotal = response.data.data.goodsTotal
       this.productTotal = response.data.data.productTotal
-      this.orderTotal = response.data.data.orderTotal
+      this.workTotal = response.data.data.workTotal
     })
   },
   methods: {
diff --git a/litemall-admin/src/views/goods/list.vue b/litemall-admin/src/views/goods/list.vue
index 3be5407d..86e49a38 100644
--- a/litemall-admin/src/views/goods/list.vue
+++ b/litemall-admin/src/views/goods/list.vue
@@ -3,10 +3,90 @@
 
     <!-- 查询和其他操作 -->
     <div class="filter-container">
-      <el-input v-model="listQuery.name" clearable class="filter-item" style="width: 160px;" placeholder="请输入主播名称" />
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
-      <!-- <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">添加</el-button> -->
-      <el-button :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">导出</el-button>
+      <el-form :inline="true" :model="listQuery">
+        <el-form-item>
+          <el-input v-model="listQuery.name" clearable class="filter-item" style="width: 160px;" placeholder="请输入主播名称" />
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="listQuery.sex" style="width: 120px;" placeholder="请选择性别" clearable>
+            <el-option v-for="item in sexDictList" :key="item.code" :label="item.name" :value="item.code" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="listQuery.degreeValue" style="width: 120px;" placeholder="请选择学历" clearable>
+            <el-option v-for="item in degreeList" :key="item.name" :label="item.name" :value="item.name" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="listQuery.workTypeValue" style="width: 160px;" placeholder="请选择直播品类" clearable>
+            <el-option v-for="item in workTypeList" :key="item.name" :label="item.name" :value="item.name" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="listQuery.goodCategoryValue" style="width: 160px;" placeholder="请选择擅长品类" clearable>
+            <el-option v-for="item in goodCategoryList" :key="item.name" :label="item.name" :value="item.name" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="listQuery.accountTypeValue" style="width: 160px;" placeholder="请选择账号类型" clearable>
+            <el-option v-for="item in accountTypeList" :key="item.name" :label="item.name" :value="item.name" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="listQuery.workStyleValue" style="width: 160px;" placeholder="请选择直播风格" clearable>
+            <el-option v-for="item in workStyleList" :key="item.name" :label="item.name" :value="item.name" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="listQuery.languageValue" style="width: 160px;" placeholder="请选择直播语言" clearable>
+            <el-option v-for="item in languageList" :key="item.name" :label="item.name" :value="item.name" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="listQuery.workWayValue" style="width: 160px;" placeholder="请选择工作方式" clearable>
+            <el-option v-for="item in workWayList" :key="item.name" :label="item.name" :value="item.name" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="listQuery.province" clearable class="filter-item" style="width: 140px;" placeholder="请输入户籍省份" />
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="listQuery.city" clearable class="filter-item" style="width: 140px;" placeholder="请输入户籍城市" />
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="listQuery.currentProvince" clearable class="filter-item" style="width: 140px;" placeholder="请输入常住省份" />
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="listQuery.currentCity" clearable class="filter-item" style="width: 140px;" placeholder="请输入常住城市" />
+        </el-form-item>
+        <el-form-item label="出生日期">
+          <el-date-picker
+            v-model="listQuery.birthdayRange"
+            style="width: 250px;"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="身高">
+          <input-number-range v-model="listQuery.heightRange" clearable class="filter-item" :precision="num" style="width: 160px;" />
+        </el-form-item>
+        <el-form-item label="体重">
+          <input-number-range v-model="listQuery.weightRange" clearable class="filter-item" :precision="num" style="width: 160px;" />
+        </el-form-item>
+        <el-form-item label="时薪">
+          <input-number-range v-model="listQuery.counterPriceRange" clearable class="filter-item" :precision="num" style="width: 160px;" />
+        </el-form-item>
+        <el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
+        </el-form-item>
+        <el-form-item>
+          <!-- <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">添加</el-button> -->
+          <el-button :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">导出</el-button>
+        </el-form-item>
+      </el-form>
     </div>
 
     <div class="operator-container">
@@ -59,7 +139,7 @@
             </el-form-item>
             <el-form-item label="视频介绍">
               <span v-for="videoAddr in props.row.videoUrl" :key="videoAddr">
-                <video :src="videoAddr" controls autoplay class="video" />
+                <video :src="videoAddr" controls class="video" />
               </span>
             </el-form-item>
             <el-form-item label="链接">
@@ -71,17 +151,23 @@
       <el-table-column type="selection" width="55" />
       <el-table-column align="center" label="主播ID" prop="id" />
 
-      <el-table-column align="center" property="iconUrl" label="图片">
+      <el-table-column align="center" property="iconUrl" label="头像">
         <template slot-scope="scope">
           <el-image :src="thumbnail(scope.row.picUrl)" :preview-src-list="toPreview(scope.row, scope.row.picUrl)" style="width: 40px; height: 40px" />
         </template>
       </el-table-column>
 
       <el-table-column align="center" min-width="100" label="名称" prop="name" />
-      <el-table-column align="center" min-width="50" label="性别" prop="sex" />
-      <el-table-column align="center" min-width="100" label="出生年月" prop="brithday" />
+      <el-table-column align="center" min-width="50" label="性别" prop="sex">
+        <template slot-scope="scope">
+          <el-tag> {{ sexDict[scope.row.sex] }} </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" min-width="50" label="年龄" prop="birthday" :formatter="getAge" />
+      <el-table-column align="center" min-width="100" label="出生日期" prop="birthday" :formatter="formatterTime" />
       <el-table-column align="center" min-width="50" label="身高(cm)" prop="height" />
       <el-table-column align="center" min-width="50" label="体重(kg)" prop="weight" />
+      <el-table-column align="center" min-width="60" label="户籍省份" prop="province" />
       <el-table-column align="center" min-width="60" label="常住省份" prop="currentProvince" />
       <el-table-column align="center" min-width="60" label="常住城市" prop="currentCity" />
       <el-table-column align="center" min-width="60" label="学历" prop="degree" />
@@ -168,13 +254,16 @@
 
 <script>
 import { listGoods, deleteGoods } from '@/api/goods'
+import { listDict } from '@/api/dict'
+import InputNumberRange from '@/components/NumberRange/inputNumberRange'
 import BackToTop from '@/components/BackToTop'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import { thumbnail, toPreview } from '@/utils/index'
+import moment from 'moment'
 
 export default {
   name: 'GoodsList',
-  components: { BackToTop, Pagination },
+  components: { BackToTop, Pagination, InputNumberRange },
   data() {
     return {
       batchDeleteArr: [],
@@ -183,11 +272,39 @@ export default {
       list: [],
       total: 0,
       listLoading: true,
+      sexDictList: [{ code: 0, name: '未知' }, { code: 1, name: '男' }, { code: 2, name: '女' }],
+      degreeList: [],
+      workTypeList: [],
+      goodCategoryList: [],
+      accountTypeList: [],
+      workStyleList: [],
+      languageList: [],
+      workWayList: [],
+      sexDict: {
+        0: '未知', 1: '男', 2: '女'
+      },
       listQuery: {
         page: 1,
         limit: 20,
         goodsSn: undefined,
         name: undefined,
+        sex: undefined,
+        degreeValue: undefined,
+        workTypeValue: undefined,
+        goodCategoryValue: undefined,
+        accountTypeValue: undefined,
+        workStyleValue: undefined,
+        languageValue: undefined,
+        workWayValue: undefined,
+        province: undefined,
+        city: undefined,
+        currentProvince: undefined,
+        currentCity: undefined,
+        birthdayRange: [],
+        heightRange: [],
+        weightRange: [],
+        counterPriceRange: [],
+        userType: 'ZB_EMP',
         sort: 'add_time',
         order: 'desc'
       },
@@ -199,8 +316,27 @@ export default {
   created() {
     this.getList()
   },
+  mounted() {
+    this.loadAllType()
+  },
   methods: {
+    getAge(row, column, cellValue, index) {
+      if (cellValue === '' || cellValue === undefined) {
+        return ''
+      }
+      const birthdays = new Date(this.formatterTime(row, column, cellValue, index))
+      const d = new Date()
+      const age = d.getFullYear() - birthdays.getFullYear() - (d.getMonth() < birthdays.getMonth() || (d.getMonth() === birthdays.getMonth() && d.getDate() < birthdays.getDate()) ? 1 : 0)
+      return age
+    },
+    formatterTime(row, column, cellValue, index) {
+      if (cellValue === '' || cellValue === undefined) {
+        return ''
+      }
+      return moment(cellValue).format('YYYY-MM-DD')
+    },
     getList() {
+      this.listQuery.userType = 'ZB_EMP'
       this.listLoading = true
       listGoods(this.listQuery).then(response => {
         this.list = response.data.data.list
@@ -276,6 +412,43 @@ export default {
         excel.export_json_to_excel2(tHeader, this.list, filterVal, '主播信息')
         this.downloadLoading = false
       })
+    },
+    loadAllType() {
+      listDict({ category: 'DEGREE' }).then(response => {
+        this.degreeList = response.data.data.list
+      }).catch(() => {
+        this.degreeList = []
+      })
+      listDict({ category: 'ZB_ACCOUNT_TYPE' }).then(response => {
+        this.accountTypeList = response.data.data.list
+      }).catch(() => {
+        this.accountTypeList = []
+      })
+      listDict({ category: 'LANGRAGE' }).then(response => {
+        this.languageList = response.data.data.list
+      }).catch(() => {
+        this.languageList = []
+      })
+      listDict({ category: 'ZB_TYPE' }).then(response => {
+        this.workTypeList = response.data.data.list
+      }).catch(() => {
+        this.workTypeList = []
+      })
+      listDict({ category: 'GOOD_CATEGORY' }).then(response => {
+        this.goodCategoryList = response.data.data.list
+      }).catch(() => {
+        this.goodCategoryList = []
+      })
+      listDict({ category: 'WORK_TIME' }).then(response => {
+        this.workWayList = response.data.data.list
+      }).catch(() => {
+        this.workWayList = []
+      })
+      listDict({ category: 'ZB_STYLE' }).then(response => {
+        this.workStyleList = response.data.data.list
+      }).catch(() => {
+        this.workStyleList = []
+      })
     }
   }
 }
diff --git a/litemall-admin/src/views/layout/components/TagsView/index.vue b/litemall-admin/src/views/layout/components/TagsView/index.vue
index ca139102..791a9630 100644
--- a/litemall-admin/src/views/layout/components/TagsView/index.vue
+++ b/litemall-admin/src/views/layout/components/TagsView/index.vue
@@ -17,10 +17,10 @@
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)">Refresh</li>
-      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">Close</li>
-      <li @click="closeOthersTags">Close Others</li>
-      <li @click="closeAllTags(selectedTag)">Close All</li>
+      <li @click="refreshSelectedTag(selectedTag)">刷新</li>
+      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭</li>
+      <li @click="closeOthersTags">关闭其他</li>
+      <li @click="closeAllTags(selectedTag)">全部关闭</li>
     </ul>
   </div>
 </template>
diff --git a/litemall-admin/src/views/promotion/topic.vue b/litemall-admin/src/views/promotion/topic.vue
index e245b659..b86da4ec 100644
--- a/litemall-admin/src/views/promotion/topic.vue
+++ b/litemall-admin/src/views/promotion/topic.vue
@@ -3,10 +3,13 @@
 
     <!-- 查询和其他操作 -->
     <div class="filter-container">
-      <el-input v-model="listQuery.title" clearable class="filter-item" style="width: 200px;" placeholder="请输入客户标题" />
-      <el-select v-model="listQuery.sort" class="filter-item" placeholder="请选择排序字段">
-        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-      </el-select>
+      <el-input v-model="listQuery.title" clearable class="filter-item" style="width: 200px;" placeholder="请输入公司名称" />
+      <el-input v-model="listQuery.province" clearable class="filter-item" style="width: 160px;" placeholder="请输入省份" />
+      <el-input v-model="listQuery.city" clearable class="filter-item" style="width: 160px;" placeholder="请输入城市" />
+      <el-input v-model="listQuery.address" clearable class="filter-item" style="width: 160px;" placeholder="请输入地址" />
+      <el-input v-model="listQuery.contact" clearable class="filter-item" style="width: 160px;" placeholder="请输入联系人" />
+      <el-input v-model="listQuery.contactMobile" clearable class="filter-item" style="width: 160px;" placeholder="请输入联系电话" />
+      <el-input v-model="listQuery.subtitle" clearable class="filter-item" style="width: 160px;" placeholder="请输入主营业务" />
       <el-button v-permission="['GET /admin/topic/list']" class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
       <el-button :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">导出</el-button>
     </div>
@@ -18,19 +21,37 @@
 
     <!-- 查询结果 -->
     <el-table v-loading="listLoading" :data="list" element-loading-text="正在查询中。。。" border fit highlight-current-row @selection-change="handleSelectionChange">
+      <el-table-column type="expand">
+        <template slot-scope="props">
+          <el-form label-position="left" class="table-expand">
+            <el-form-item label="营业执照">
+              <el-image v-for="pic in props.row.gallery" :key="pic" :src="pic" class="gallery" :preview-src-list="props.row.gallery" style="width: 40px; height: 40px" />
+            </el-form-item>
+          </el-form>
+        </template>
+      </el-table-column>
+
       <el-table-column type="selection" width="55" />
 
       <el-table-column align="center" label="公司名称" prop="title" />
+
+      <el-table-column align="center" property="iconUrl" label="头像">
+        <template slot-scope="scope">
+          <el-image :src="thumbnail(scope.row.picUrl)" :preview-src-list="toPreview(scope.row, scope.row.picUrl)" style="width: 40px; height: 40px" />
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="主营业务" prop="subtitle" />
+      <el-table-column align="center" label="省份" prop="province" />
       <el-table-column align="center" label="城市" prop="city" />
       <el-table-column align="center" label="详细地址" prop="address" />
-      <el-table-column align="center" label="需求城市" prop="demandCity" />
       <el-table-column align="center" label="联系人" prop="contact" />
       <el-table-column align="center" label="联系人电话" prop="contactMobile" />
-      <el-table-column align="center" label="工作方式" prop="workWay" />
-      <el-table-column align="center" label="直播品类" prop="workCategory" />
-      <el-table-column align="center" label="风格要求" prop="workStyle" />
-      <el-table-column align="center" label="底薪" prop="salary" />
-      <el-table-column align="center" label="提成(%)" prop="commission" />
+      <el-table-column align="center" label="是否审核" prop="isOnSale">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.isOnSale ? 'success' : 'error' ">{{ scope.row.isOnSale ? '审核通过' : '未审核' }}</el-tag>
+        </template>
+      </el-table-column>
       <!-- <el-table-column align="center" label="详情" prop="content">
         <template slot-scope="scope">
           <el-dialog :visible.sync="contentDialogVisible" title="客户详情">
@@ -44,7 +65,8 @@
 
       <el-table-column align="center" label="操作" min-width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <!-- <el-button v-permission="['POST /admin/topic/update']" type="primary" size="mini" @click="handleUpdate(scope.row)">编辑</el-button> -->
+          <el-button v-if="scope.row.isOnSale" v-permission="['POST /admin/topic/update']" type="primary" size="mini" @click="handleUpdate(scope.row)">取消审核</el-button>
+          <el-button v-if="!scope.row.isOnSale" v-permission="['POST /admin/topic/update']" type="primary" size="mini" @click="handleUpdate(scope.row)">审核通过</el-button>
           <el-button v-permission="['POST /admin/topic/delete']" type="danger" size="mini" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
@@ -89,7 +111,7 @@
 </style>
 
 <script>
-import { listTopic, deleteTopic, batchDeleteTopic } from '@/api/topic'
+import { listTopic, updateTopic, deleteTopic, batchDeleteTopic } from '@/api/topic'
 import BackToTop from '@/components/BackToTop'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import _ from 'lodash'
@@ -110,19 +132,10 @@ export default {
         limit: 20,
         title: undefined,
         subtitle: undefined,
+        userType: 'ZB_EMP',
         sort: 'add_time',
         order: 'desc'
       },
-      options: [{
-        value: 'id',
-        label: '按序号排序'
-      }, {
-        value: 'add_time',
-        label: '按时间排序'
-      }, {
-        value: 'price',
-        label: '按价格排序'
-      }],
       multipleSelection: [],
       contentDetail: '',
       contentDialogVisible: false,
@@ -155,7 +168,20 @@ export default {
       this.$router.push({ path: '/promotion/topic-create' })
     },
     handleUpdate(row) {
-      this.$router.push({ path: '/promotion/topic-edit', query: { id: row.id }})
+      updateTopic({ id: row.id, isOnSale: !row.isOnSale })
+        .then(response => {
+          this.$notify.success({
+            title: '成功',
+            message: '审核成功'
+          })
+          this.getList()
+        })
+        .catch(response => {
+          this.$notify.error({
+            title: '审核失败',
+            message: response.data.errmsg
+          })
+        })
     },
     handleDelete(row) {
       deleteTopic(row)
diff --git a/litemall-admin/src/views/promotion/work.vue b/litemall-admin/src/views/promotion/work.vue
new file mode 100644
index 00000000..4b21113f
--- /dev/null
+++ b/litemall-admin/src/views/promotion/work.vue
@@ -0,0 +1,333 @@
+<template>
+  <div class="app-container">
+
+    <!-- 查询和其他操作 -->
+    <div class="filter-container">
+      <!--高级查询-->
+      <el-form :inline="true" :model="listQuery">
+        <el-form-item>
+          <el-input v-model="listQuery.name" clearable class="filter-item" style="width: 160px;" placeholder="请输入招聘标题" />
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="listQuery.userName" clearable class="filter-item" style="width: 160px;" placeholder="请输入客户名称" />
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="listQuery.workCategoryValue" style="width: 160px;" placeholder="请选择直播品类" clearable>
+            <el-option v-for="item in workCategoryDict" :key="item.name" :label="item.name" :value="item.name" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="listQuery.currentCity" clearable class="filter-item" style="width: 160px;" placeholder="请输入需求城市" />
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="listQuery.workStyleValue" style="width: 160px;" placeholder="请选择风格" clearable>
+            <el-option v-for="item in workStyleDict" :key="item.name" :label="item.name" :value="item.name" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="listQuery.workWayValue" style="width: 160px;" placeholder="请选择工作方式" clearable>
+            <el-option v-for="item in workWayDict" :key="item.name" :label="item.name" :value="item.name" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="底薪">
+          <input-number-range v-model="listQuery.counterPriceRange" clearable class="filter-item" :precision="num" style="width: 160px;" />
+        </el-form-item>
+        <el-form-item label="提成">
+          <input-number-range v-model="listQuery.retailPriceRange" clearable class="filter-item" :precision="num" style="width: 160px;" />
+        </el-form-item>
+        <el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
+        </el-form-item>
+        <el-form-item>
+          <!-- <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">添加</el-button> -->
+          <el-button :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">导出</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div class="operator-container">
+      <el-button class="filter-item" type="danger" icon="el-icon-delete" :disabled="batchDeleteArr.length === 0" @click="handleDeleteRows">批量删除</el-button>
+    </div>
+
+    <!-- 查询结果 -->
+    <el-table v-loading="listLoading" :data="list" element-loading-text="正在查询中。。。" border fit highlight-current-row @selection-change="handleSelectionChange">
+      <el-table-column type="expand">
+        <template slot-scope="props">
+          <el-form label-position="left" class="table-expand">
+            <el-form-item label="图片展示">
+              <el-image v-for="pic in props.row.gallery" :key="pic" :src="pic" class="gallery" :preview-src-list="props.row.gallery" style="width: 40px; height: 40px" />
+            </el-form-item>
+          </el-form>
+        </template>
+      </el-table-column>
+      <el-table-column type="selection" width="55" />
+      <el-table-column align="center" label="招聘ID" prop="id" />
+
+      <el-table-column align="center" min-width="100" label="招聘标题" prop="name" />
+      <el-table-column align="center" label="招聘详情" prop="content">
+        <template slot-scope="scope">
+          <el-dialog :visible.sync="contentDialogVisible" title="招聘详情">
+            <div v-html="contentDetail" />
+          </el-dialog>
+          <el-button type="primary" size="mini" @click="showContent(scope.row.detail)">查看</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" min-width="100" label="客户名称" prop="userName" />
+      <el-table-column align="center" min-width="60" label="需求城市" prop="currentCity" />
+      <el-table-column align="center" min-width="120" label="直播品类" prop="workCategory">
+        <template slot-scope="scope">
+          <el-tag
+            v-for="item in scope.row.workCategory"
+            :key="item"
+            hit
+          >
+            {{ item }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" min-width="120" label="风格要求" prop="workStyle">
+        <template slot-scope="scope">
+          <el-tag
+            v-for="item in scope.row.workStyle"
+            :key="item"
+            hit
+          >
+            {{ item }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" min-width="60" label="工作方式" prop="workWay" />
+      <el-table-column align="center" min-width="60" label="底薪" prop="counterPrice" />
+      <el-table-column align="center" min-width="60" label="提成(%)" prop="retailPrice" />
+
+      <!-- <el-table-column align="center" property="iconUrl" label="分享图">
+        <template slot-scope="scope">
+          <img :src="scope.row.shareUrl" width="40">
+        </template>
+      </el-table-column> -->
+
+      <!--
+      <el-table-column align="center" label="详情" prop="detail">
+        <template slot-scope="scope">
+          <el-dialog :visible.sync="detailDialogVisible" title="主播详情">
+            <div class="goods-detail-box" v-html="goodsDetail" />
+          </el-dialog>
+          <el-button type="primary" size="mini" @click="showDetail(scope.row.detail)">查看</el-button>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="是否新品" prop="isNew">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.isNew ? 'success' : 'error' ">{{ scope.row.isNew ? '新品' : '非新品' }}</el-tag>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="是否热品" prop="isHot">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.isHot ? 'success' : 'error' ">{{ scope.row.isHot ? '热品' : '非热品' }}</el-tag>
+        </template>
+      </el-table-column> -->
+
+      <el-table-column align="center" label="是否上架" prop="isOnSale">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.isOnSale ? 'success' : 'error' ">{{ scope.row.isOnSale ? '已上架' : '未上架' }}</el-tag>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="操作" width="200" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <!-- <el-button type="primary" size="mini" @click="handleUpdate(scope.row)">编辑</el-button>  -->
+          <el-button type="danger" size="mini" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+
+    <el-tooltip placement="top" content="返回顶部">
+      <back-to-top :visibility-height="100" />
+    </el-tooltip>
+
+  </div>
+</template>
+
+<style>
+  .table-expand {
+    font-size: 0;
+    padding-left: 60px;
+  }
+  .table-expand label {
+    width: 100px;
+    color: #99a9bf;
+  }
+  .table-expand .el-form-item {
+    margin-right: 0;
+    margin-bottom: 0;
+  }
+  .video {
+    width: 80px;
+    margin-right: 10px;
+  }
+  .gallery {
+    width: 80px;
+    margin-right: 10px;
+  }
+  .goods-detail-box img {
+    width: 100%;
+  }
+</style>
+
+<script>
+import { listWork, deleteWork } from '@/api/work'
+import { listDict } from '@/api/dict'
+import InputNumberRange from '@/components/NumberRange/inputNumberRange'
+import BackToTop from '@/components/BackToTop'
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+import { thumbnail, toPreview } from '@/utils/index'
+import moment from 'moment'
+
+export default {
+  name: 'GoodsList',
+  components: { BackToTop, Pagination, InputNumberRange },
+  data() {
+    return {
+      batchDeleteArr: [],
+      thumbnail,
+      toPreview,
+      list: [],
+      workCategoryDict: [],
+      workWayDict: [],
+      workStyleDict: [],
+      total: 0,
+      listLoading: true,
+      listQuery: {
+        name: undefined,
+        userName: undefined,
+        workCategoryValue: undefined,
+        currentCity: undefined,
+        workStyleValue: undefined,
+        workWayValue: undefined,
+        counterPriceRange: [],
+        retailPriceRange: [],
+        page: 1,
+        limit: 20,
+        userType: 'CUSTOMER',
+        sort: 'add_time',
+        order: 'desc'
+      },
+      goodsDetail: '',
+      detailDialogVisible: false,
+      contentDetail: '',
+      contentDialogVisible: false,
+      downloadLoading: false
+    }
+  },
+  created() {
+    this.getList()
+  },
+  mounted() {
+    this.loadAllType()
+  },
+  methods: {
+    formatterTime(row, column, cellValue, index) {
+      return moment(cellValue).format('YYYY-MM-DD')
+    },
+    getList() {
+      this.listLoading = true
+      listWork(this.listQuery).then(response => {
+        this.list = response.data.data.list
+        this.total = response.data.data.total
+        this.listLoading = false
+      }).catch(() => {
+        this.list = []
+        this.total = 0
+        this.listLoading = false
+      })
+    },
+    handleFilter() {
+      this.listQuery.page = 1
+      console.log(this.listQuery)
+      this.getList()
+    },
+    handleUpdate(row) {
+      this.$router.push({ path: '/goods/edit', query: { id: row.id }})
+    },
+    showContent(content) {
+      this.contentDetail = content
+      this.contentDialogVisible = true
+    },
+    showDetail(detail) {
+      this.goodsDetail = detail
+      this.detailDialogVisible = true
+    },
+    handleDelete(row) {
+      this.$confirm('确定删除?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+        center: true
+      }).then(() => {
+        deleteWork(row).then(response => {
+          this.$notify.success({
+            title: '成功',
+            message: '删除成功'
+          })
+          this.getList()
+        }).catch(response => {
+          this.$notify.error({
+            title: '失败',
+            message: response.data.errmsg
+          })
+        })
+      }).catch(() => {})
+    },
+    handleSelectionChange(val) {
+      console.log(val)
+      this.batchDeleteArr = val
+    },
+    handleDeleteRows() {
+      this.batchDeleteArr.forEach(row => this.handleDeleteEachRow(row))
+      this.getList()
+    },
+    handleDeleteEachRow(row) {
+      deleteWork(row).then(response => {
+        this.$notify.success({
+          title: '成功',
+          message: '删除成功'
+        })
+      }).catch(response => {
+        this.$notify.error({
+          title: '失败',
+          message: response.data.errmsg
+        })
+      })
+    },
+    handleDownload() {
+      this.downloadLoading = true
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['招聘ID', '招聘标题', '需求城市', '直播品类', '风格要求', '工作方式', '底薪', '提成']
+        const filterVal = ['id', 'name', 'currentCity', 'workCategory', 'workStyle', 'workWay', 'counterPrice', 'retailPrice']
+        excel.export_json_to_excel2(tHeader, this.list, filterVal, '招聘信息')
+        this.downloadLoading = false
+      })
+    },
+    loadAllType() {
+      listDict({ category: 'ZB_TYPE' }).then(response => {
+        this.workCategoryDict = response.data.data.list
+      }).catch(() => {
+        this.workCategoryDict = []
+      })
+      listDict({ category: 'WORK_TIME' }).then(response => {
+        this.workWayDict = response.data.data.list
+      }).catch(() => {
+        this.workWayDict = []
+      })
+      listDict({ category: 'ZB_STYLE' }).then(response => {
+        this.workStyleDict = response.data.data.list
+      }).catch(() => {
+        this.workStyleDict = []
+      })
+    }
+  }
+}
+</script>
diff --git a/litemall-admin/src/views/sys/notice.vue b/litemall-admin/src/views/sys/notice.vue
index 0c80f242..a7d9de5d 100644
--- a/litemall-admin/src/views/sys/notice.vue
+++ b/litemall-admin/src/views/sys/notice.vue
@@ -29,6 +29,12 @@
         </template>
       </el-table-column>
 
+      <el-table-column align="center" label="通知类型" prop="noticeType">
+        <template slot-scope="scope">
+          <el-tag>{{ dictData[scope.row.noticeType] }}</el-tag>
+        </template>
+      </el-table-column>
+
       <el-table-column align="center" label="添加时间" prop="addTime" />
 
       <el-table-column align="center" label="管理员ID" prop="adminId" />
@@ -49,6 +55,11 @@
         <el-form-item label="通知标题" prop="title">
           <el-input v-model="dataForm.title" />
         </el-form-item>
+        <el-form-item v-if="dialogStatus=='create'" label="通知类型">
+          <el-select v-model="dataForm.noticeType" placeholder="请选择类型">
+            <el-option v-for="item in dictDataList" :key="item.code" :label="item.name" :value="item.code" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="通知内容" prop="content">
           <editor v-model="dataForm.content" :init="editorInit" />
         </el-form-item>
@@ -84,6 +95,8 @@ export default {
       list: [],
       total: 0,
       listLoading: true,
+      dictData: { 0: '全部', 1: '管理后台', 2: '主播', 3: '客户' },
+      dictDataList: [{ 'code': 0, 'name': '全部' }, { 'code': 1, 'name': '管理后台' }, { 'code': 2, 'name': '主播' }, { 'code': 3, 'name': '客户' }],
       listQuery: {
         page: 1,
         limit: 20,
@@ -98,13 +111,14 @@ export default {
       dataForm: {
         id: undefined,
         title: undefined,
-        content: undefined
+        content: undefined,
+        noticeType: 0
       },
       dialogFormVisible: false,
       dialogStatus: '',
       textMap: {
-        update: '编辑',
-        create: '创建'
+        update: '编辑通知',
+        create: '创建通知'
       },
       rules: {
         name: [
@@ -163,7 +177,8 @@ export default {
       this.dataForm = {
         id: undefined,
         title: undefined,
-        content: undefined
+        content: undefined,
+        noticeType: 0
       }
     },
     handleCreate() {
@@ -175,6 +190,7 @@ export default {
       })
     },
     createData() {
+      this.dataForm.content = undefined
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
           createNotice(this.dataForm)
diff --git a/litemall-admin/src/views/user/collect.vue b/litemall-admin/src/views/user/collect.vue
index 62327e82..992eb389 100644
--- a/litemall-admin/src/views/user/collect.vue
+++ b/litemall-admin/src/views/user/collect.vue
@@ -3,7 +3,7 @@
 
     <!-- 查询和其他操作 -->
     <div class="filter-container">
-      <el-input v-model="listQuery.userId" clearable class="filter-item" style="width: 200px;" placeholder="请输入用户ID" />
+      <el-input v-model="listQuery.userId" clearable class="filter-item" style="width: 200px;" placeholder="请输入会员ID" />
       <el-input v-model="listQuery.valueId" clearable class="filter-item" style="width: 200px;" placeholder="请输入关注ID" />
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
       <el-button :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">导出</el-button>
@@ -13,7 +13,7 @@
     <el-table v-loading="listLoading" :data="list" element-loading-text="正在查询中。。。" border fit highlight-current-row>
       <el-table-column align="center" width="100px" label="收藏ID" prop="id" sortable />
 
-      <el-table-column align="center" min-width="100px" label="用户ID" prop="userId" />
+      <el-table-column align="center" min-width="100px" label="会员ID" prop="userId" />
 
       <el-table-column align="center" min-width="100px" label="关注ID" prop="valueId" />
 
@@ -22,7 +22,7 @@
           <el-tag
             disable-transitions="true"
           >
-            {{ scope.row.type === 0 ? '主播' : '客户' }}
+            {{ scope.row.type === 0 ? '主播' : '招聘' }}
           </el-tag>
         </template>
       </el-table-column>
@@ -90,7 +90,7 @@ export default {
     handleDownload() {
       this.downloadLoading = true
       import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['用户ID', '关注ID', '类型(0主播、1客户)', '添加时间']
+        const tHeader = ['会员ID', '关注ID', '类型(0主播、1客户)', '添加时间']
         const filterVal = ['userId', 'valueId', 'type', 'addTime']
         excel.export_json_to_excel2(tHeader, this.list, filterVal, '用户收藏信息')
         this.downloadLoading = false
diff --git a/litemall-admin/src/views/user/feedback.vue b/litemall-admin/src/views/user/feedback.vue
index 1f38520f..b3cc42c8 100644
--- a/litemall-admin/src/views/user/feedback.vue
+++ b/litemall-admin/src/views/user/feedback.vue
@@ -3,8 +3,8 @@
 
     <!-- 查询和其他操作 -->
     <div class="filter-container">
-      <el-input v-model="listQuery.username" clearable class="filter-item" style="width: 200px;" placeholder="请输入用户名"/>
-      <el-input v-model="listQuery.id" clearable class="filter-item" style="width: 200px;" placeholder="请输入反馈ID"/>
+      <el-input v-model="listQuery.username" clearable class="filter-item" style="width: 200px;" placeholder="请输入会员名" />
+      <el-input v-model="listQuery.id" clearable class="filter-item" style="width: 200px;" placeholder="请输入反馈ID" />
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
       <el-button :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">导出</el-button>
     </div>
@@ -12,23 +12,23 @@
     <!-- 查询结果 -->
     <el-table v-loading="listLoading" :data="list" element-loading-text="正在查询中。。。" border fit highlight-current-row>
 
-      <el-table-column align="center" label="反馈ID" prop="id"/>
+      <el-table-column align="center" label="反馈ID" prop="id" />
 
-      <el-table-column align="center" label="用户名" prop="username"/>
+      <el-table-column align="center" label="会员名" prop="username" />
 
-      <el-table-column align="center" label="手机号码" prop="mobile"/>
+      <el-table-column align="center" label="手机号码" prop="mobile" />
 
-      <el-table-column align="center" label="反馈类型" prop="feedType"/>
+      <el-table-column align="center" label="反馈类型" prop="feedType" />
 
-      <el-table-column align="center" label="反馈内容" prop="content"/>
+      <el-table-column align="center" label="反馈内容" prop="content" />
 
       <el-table-column align="center" label="反馈图片" prop="picUrls">
         <template slot-scope="scope">
-          <el-image v-for="item in scope.row.picUrls" :key="item" :src="item" :preview-src-list="scope.row.picUrls" :lazy="true" style="width: 40px; height: 40px; margin-right: 5px;"/>
+          <el-image v-for="item in scope.row.picUrls" :key="item" :src="item" :preview-src-list="scope.row.picUrls" :lazy="true" style="width: 40px; height: 40px; margin-right: 5px;" />
         </template>
       </el-table-column>
 
-      <el-table-column align="center" label="时间" prop="addTime"/>
+      <el-table-column align="center" label="时间" prop="addTime" />
 
     </el-table>
 
@@ -82,7 +82,7 @@ export default {
     handleDownload() {
       this.downloadLoading = true
       import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['反馈ID', '用户名称', '反馈内容', '反馈图片列表', '反馈时间']
+        const tHeader = ['反馈ID', '会员名称', '反馈内容', '反馈图片列表', '反馈时间']
         const filterVal = ['id', 'username', 'content', 'picUrls', 'addTime']
         excel.export_json_to_excel2(tHeader, this.list, filterVal, '意见反馈信息')
         this.downloadLoading = false
diff --git a/litemall-admin/src/views/user/footprint.vue b/litemall-admin/src/views/user/footprint.vue
index e0018cb2..1694e066 100644
--- a/litemall-admin/src/views/user/footprint.vue
+++ b/litemall-admin/src/views/user/footprint.vue
@@ -3,8 +3,11 @@
 
     <!-- 查询和其他操作 -->
     <div class="filter-container">
-      <el-input v-model="listQuery.userId" clearable class="filter-item" style="width: 200px;" placeholder="请输入用户ID" />
-      <el-input v-model="listQuery.goodsId" clearable class="filter-item" style="width: 200px;" placeholder="请输入主播ID" />
+      <el-input v-model="listQuery.userName" clearable class="filter-item" style="width: 200px;" placeholder="请输入会员名称" />
+      <el-input v-model="listQuery.goodsName" clearable class="filter-item" style="width: 200px;" placeholder="请输入浏览标题" />
+      <el-select v-model="listQuery.type" clearable style="width: 200px" class="filter-item" placeholder="请选择浏览类型">
+        <el-option v-for="(key, value) in typeDic" :key="key" :label="key" :value="value" />
+      </el-select>
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
       <el-button :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">导出</el-button>
     </div>
@@ -13,11 +16,21 @@
     <el-table v-loading="listLoading" :data="list" element-loading-text="正在查询中。。。" border fit highlight-current-row>
       <el-table-column align="center" width="100px" label="足迹ID" prop="id" sortable />
 
-      <el-table-column align="center" min-width="100px" label="用户ID" prop="userId" />
+      <el-table-column align="center" min-width="100px" label="会员ID" prop="userId" />
 
-      <el-table-column align="center" min-width="100px" label="主播ID" prop="goodsId" />
+      <el-table-column align="center" min-width="100px" label="会员名称" prop="userName" />
 
-      <el-table-column align="center" min-width="100px" label="添加时间" prop="addTime" />
+      <el-table-column align="center" min-width="100px" label="浏览ID" prop="goodsId" />
+
+      <el-table-column align="center" min-width="100px" label="浏览标题" prop="goodsName" />
+
+      <el-table-column align="center" min-width="100px" label="浏览类型" prop="type">
+        <template slot-scope="scope">
+          <el-tag>{{ typeDic[scope.row.type] }}</el-tag>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" min-width="100px" label="浏览时间" prop="addTime" />
 
     </el-table>
 
@@ -38,11 +51,15 @@ export default {
       list: null,
       total: 0,
       listLoading: true,
+      typeDic: {
+        0: '主播', 1: '招聘'
+      },
       listQuery: {
         page: 1,
         limit: 20,
-        userId: undefined,
-        goodsId: undefined,
+        userName: undefined,
+        goodsName: undefined,
+        type: undefined,
         sort: 'add_time',
         order: 'desc'
       },
@@ -74,13 +91,13 @@ export default {
     handleDownload() {
       this.downloadLoading = true
       import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['用户ID', '主播ID', '添加时间']
-        const filterVal = ['userId', 'goodsId', 'addTime']
+        const tHeader = ['会员ID', '会员名称', '会员类型', '浏览ID', '浏览标题', '添加时间']
+        const filterVal = ['userId', 'userName', 'userType', 'goodsId', 'goodsName', 'addTime']
         excel.export_json_to_excel2(
           tHeader,
           this.list,
           filterVal,
-          '用户收藏信息'
+          '会员足迹信息'
         )
         this.downloadLoading = false
       })
diff --git a/litemall-admin/src/views/user/history.vue b/litemall-admin/src/views/user/history.vue
index 9d12b3de..9b25fb6f 100644
--- a/litemall-admin/src/views/user/history.vue
+++ b/litemall-admin/src/views/user/history.vue
@@ -3,21 +3,21 @@
 
     <!-- 查询和其他操作 -->
     <div class="filter-container">
-      <el-input v-model="listQuery.userId" clearable class="filter-item" style="width: 200px;" placeholder="请输入用户ID"/>
-      <el-input v-model="listQuery.keyword" clearable class="filter-item" style="width: 200px;" placeholder="请输入搜索历史关键字"/>
+      <el-input v-model="listQuery.userId" clearable class="filter-item" style="width: 200px;" placeholder="请输入会员ID" />
+      <el-input v-model="listQuery.keyword" clearable class="filter-item" style="width: 200px;" placeholder="请输入搜索历史关键字" />
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
       <el-button :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">导出</el-button>
     </div>
 
     <!-- 查询结果 -->
     <el-table v-loading="listLoading" :data="list" element-loading-text="正在查询中。。。" border fit highlight-current-row>
-      <el-table-column align="center" width="100px" label="搜索ID" prop="id" sortable/>
+      <el-table-column align="center" width="100px" label="搜索ID" prop="id" sortable />
 
-      <el-table-column align="center" min-width="100px" label="用户ID" prop="userId"/>
+      <el-table-column align="center" min-width="100px" label="会员ID" prop="userId" />
 
-      <el-table-column align="center" min-width="100px" label="关键字" prop="keyword"/>
+      <el-table-column align="center" min-width="100px" label="关键字" prop="keyword" />
 
-      <el-table-column align="center" min-width="100px" label="添加时间" prop="addTime"/>
+      <el-table-column align="center" min-width="100px" label="添加时间" prop="addTime" />
     </el-table>
 
     <pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
@@ -73,13 +73,13 @@ export default {
     handleDownload() {
       this.downloadLoading = true
       import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['用户ID', '搜索历史关键字', '添加时间']
+        const tHeader = ['会员ID', '搜索历史关键字', '添加时间']
         const filterVal = ['userId', 'keyword', 'addTime']
         excel.export_json_to_excel2(
           tHeader,
           this.list,
           filterVal,
-          '用户搜索历史信息'
+          '会员搜索历史信息'
         )
         this.downloadLoading = false
       })
diff --git a/litemall-admin/src/views/user/user.vue b/litemall-admin/src/views/user/user.vue
index d89bce24..a4bb0b09 100644
--- a/litemall-admin/src/views/user/user.vue
+++ b/litemall-admin/src/views/user/user.vue
@@ -3,9 +3,9 @@
 
     <!-- 查询和其他操作 -->
     <div class="filter-container">
-      <el-input v-model="listQuery.username" clearable class="filter-item" style="width: 200px;" placeholder="请输入用户昵称" />
+      <el-input v-model="listQuery.username" clearable class="filter-item" style="width: 200px;" placeholder="请输入会员昵称" />
       <el-input v-model="listQuery.mobile" clearable class="filter-item" style="width: 200px;" placeholder="请输入手机号" />
-      <el-select v-model="listQuery.userType" clearable style="width: 200px" class="filter-item" placeholder="请选择用户类型">
+      <el-select v-model="listQuery.userType" clearable style="width: 200px" class="filter-item" placeholder="请选择会员类型">
         <el-option v-for="(key, value) in userTypeDic" :key="key" :label="key" :value="value" />
       </el-select>
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
@@ -14,11 +14,11 @@
 
     <!-- 查询结果 -->
     <el-table v-loading="listLoading" :data="list" element-loading-text="正在查询中。。。" border fit highlight-current-row>
-      <el-table-column align="center" width="100px" label="用户ID" prop="id" sortable />
+      <el-table-column align="center" width="100px" label="会员ID" prop="id" sortable />
 
-      <el-table-column align="center" label="用户昵称" prop="nickname" />
+      <el-table-column align="center" label="会员昵称" prop="nickname" />
 
-      <el-table-column align="center" label="用户头像" width="80">
+      <el-table-column align="center" label="会员头像" width="80">
         <template slot-scope="scope">
           <el-avatar :src="scope.row.avatar" />
         </template>
@@ -26,7 +26,7 @@
 
       <el-table-column align="center" label="手机号码" prop="mobile" />
 
-      <el-table-column align="center" label="性别" prop="gender">
+      <!-- <el-table-column align="center" label="性别" prop="gender">
         <template slot-scope="scope">
           <el-tag>{{ genderDic[scope.row.gender] }}</el-tag>
         </template>
@@ -34,7 +34,7 @@
 
       <el-table-column align="center" label="生日" prop="birthday" />
 
-      <el-table-column align="center" label="用户等级" prop="userLevel">
+      <el-table-column align="center" label="会员等级" prop="userLevel">
         <template slot-scope="scope">
           <el-tag>{{ levelDic[scope.row.userLevel] }}</el-tag>
         </template>
@@ -44,9 +44,15 @@
         <template slot-scope="scope">
           <el-tag>{{ statusDic[scope.row.status] }}</el-tag>
         </template>
-      </el-table-column>
+      </el-table-column> -->
+
+      <el-table-column align="center" label="是否经纪人" prop="managerFlag">
+        <template slot-scope="scope">
+          <el-tag>{{ enableDic[scope.row.managerFlag] }}</el-tag>
+        </template>
+      </el-table-column> -->
 
-      <el-table-column align="center" label="用户类型" prop="userType">
+      <el-table-column align="center" label="会员类型" prop="userType">
         <template slot-scope="scope">
           <el-tag>{{ userTypeDic[scope.row.userType] }}</el-tag>
         </template>
@@ -61,29 +67,32 @@
 
     <pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     <!-- 用户编辑对话框 -->
-    <el-dialog :visible.sync="userDialogVisible" title="用户编辑">
+    <el-dialog :visible.sync="userDialogVisible" title="会员编辑">
       <el-form ref="userDetail" :model="userDetail" status-icon label-position="left" label-width="100px" style="width: 400px; margin-left:50px;">
-        <el-form-item label="用户名" prop="username">
+        <el-form-item label="微信OPENID" prop="username">
           <el-input v-model="userDetail.username" :disabled="true" />
         </el-form-item>
-        <el-form-item label="用户昵称" prop="nickname">
+        <el-form-item label="会员昵称" prop="nickname">
           <el-input v-model="userDetail.nickname" />
         </el-form-item>
-        <el-form-item label="用户手机" prop="mobile">
+        <el-form-item label="手机" prop="mobile">
           <el-input v-model="userDetail.mobile" />
         </el-form-item>
-        <el-form-item label="用户性别" prop="gender">
+        <!-- <el-form-item label="性别" prop="gender">
           <el-select v-model="userDetail.gender" placeholder="请选择"><el-option v-for="(item, index) in genderDic" :key="index" :label="item" :value="index" /></el-select>
         </el-form-item>
-        <el-form-item label="用户等级" prop="userLevel">
+        <el-form-item label="等级" prop="userLevel">
           <el-select v-model="userDetail.userLevel" placeholder="请选择"><el-option v-for="(item, index) in levelDic" :key="index" :label="item" :value="index" /></el-select>
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-select v-model="userDetail.status" placeholder="请选择"><el-option v-for="(item, index) in statusDic" :key="index" :label="item" :value="index" /></el-select>
-        </el-form-item>
-        <el-form-item label="用户类型" prop="userType">
+        </el-form-item> -->
+        <el-form-item label="会员类型" prop="userType">
           <el-select v-model="userDetail.userType" placeholder="请选择"><el-option v-for="(item, index) in userTypeDic" :key="index" :label="item" :value="index" /></el-select>
         </el-form-item>
+        <el-form-item label="经纪人" prop="managerFlag">
+          <el-switch v-model="userDetail.managerFlag" :active-value="1" :inactive-value="0" :disabled="userDetail.userType !== 'CUSTOMER'" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="userDialogVisible = false">取消</el-button>
@@ -118,6 +127,7 @@ export default {
       genderDic: ['未知', '男', '女'],
       levelDic: ['普通用户', 'VIP用户', '高级VIP用户'],
       statusDic: ['可用', '禁用', '注销'],
+      enableDic: ['否', '是'],
       userTypeDic: {
         'ZB_EMP': '主播', 'CUSTOMER': '客户'
       },
diff --git a/litemall-admin/vue.config.js b/litemall-admin/vue.config.js
index 19d6bd3b..5dfde41e 100644
--- a/litemall-admin/vue.config.js
+++ b/litemall-admin/vue.config.js
@@ -32,7 +32,8 @@ module.exports = {
     proxy: {
       '/admin': {
         // target: 'http://localhost:8082'
-        target: 'https://www.czyinfo.cn'
+        // target: 'https://www.czyinfo.cn'
+        target: 'https://www.xianiaoai.cn'
       }
     },
     port: port,
diff --git a/litemall-wx/config/api.js b/litemall-wx/config/api.js
index 7092078e..e06d5b9d 100644
--- a/litemall-wx/config/api.js
+++ b/litemall-wx/config/api.js
@@ -1,7 +1,9 @@
 // 以下是业务服务器API地址
 // 本机开发时使用
 // var WxApiRoot = 'http://kaneee.natappfree.cc/wx/';
-var WxApiRoot = 'https://www.czyinfo.cn//wx/';
+// var WxApiRoot = 'https://www.czyinfo.cn/wx/';
+var WxApiRoot = 'https://www.xianiaoai.cn/wx/';
+
 // 局域网测试使用
 // var WxApiRoot = 'http://192.168.1.3:8080/wx/';
 // 云平台部署时使用
-- 
Gitee


From e82346fa0174b1d9109a9c4fb2da63edd246b320 Mon Sep 17 00:00:00 2001
From: raowenbin <raowenbin@jygps.com.cn>
Date: Wed, 5 Jun 2024 09:38:10 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E7=89=88=E9=83=A8?=
 =?UTF-8?q?=E7=BD=B2=E4=B8=8A=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/bin/deploy.sh            |  24 ++++----
 deploy/bin/reset.sh             |  64 ++++++++++----------
 deploy/bin/stop.sh              |  16 ++---
 deploy/litemall/application.yml |  12 ++--
 deploy/util/lazy.sh             | 104 ++++++++++++++++----------------
 deploy/util/package.sh          |  62 +++++++++----------
 docker/bin/deploy.sh            |  14 ++---
 docker/bin/reset.sh             |  72 +++++++++++-----------
 docker/util/lazy.sh             | 104 ++++++++++++++++----------------
 docker/util/package.sh          |  62 +++++++++----------
 10 files changed, 269 insertions(+), 265 deletions(-)

diff --git a/deploy/bin/deploy.sh b/deploy/bin/deploy.sh
index 7f3dc7a2..fa857906 100644
--- a/deploy/bin/deploy.sh
+++ b/deploy/bin/deploy.sh
@@ -1,12 +1,12 @@
-#!/bin/bash
-
-# 本脚本的作用是停止当前Spring Boot应用，然后再次部署
-PID=$(ps -ef | grep litemall.jar | grep -v grep | awk '{ print $2 }')
-
-if [ ! -z "$PID" ]
-then
-    kill $PID
-fi
-
-cd /home/ubuntu/deploy/litemall || exit 2
-nohup java -jar litemall.jar > log.log 2>&1 &
\ No newline at end of file
+##!/bin/bash
+#
+## 本脚本的作用是停止当前Spring Boot应用，然后再次部署
+#PID=$(ps -ef | grep litemall.jar | grep -v grep | awk '{ print $2 }')
+#
+#if [ ! -z "$PID" ]
+#then
+#    kill $PID
+#fi
+#
+#cd /home/ubuntu/deploy/litemall || exit 2
+#nohup java -jar litemall.jar > log.log 2>&1 &
\ No newline at end of file
diff --git a/deploy/bin/reset.sh b/deploy/bin/reset.sh
index aeea43a5..a762db6b 100644
--- a/deploy/bin/reset.sh
+++ b/deploy/bin/reset.sh
@@ -1,32 +1,32 @@
-#!/bin/bash
-
-# 本脚本的作用是重置部署环境
-# 1.重置数据库
-# 2.删除storage文件夹内文件
-# 3.调用deploy.sh启动服务
-# 注意：由于1和2的原因，请仅在开发测试阶段使用本脚本！
-
-# 重置数据库
-# i. 请在`XXXXXX`处设置相应的root密码
-# ii. 同时请注意root密码放在脚本是非常危险的，因此这里仅仅是用于开发测试阶段。
-ROOT=root
-PASSWORD=
-
-if test -z "$PASSWORD"
-then
-  echo "请设置云服务器MySQL的root账号密码"
-  exit 1
-fi
-
-# 导入数据
-cd /home/ubuntu/deploy/db || exit 2
-mysql -h localhost -u $ROOT -p$PASSWORD < litemall.sql
-
-# 删除storage文件夹内文件
-cd /home/ubuntu/deploy/litemall/storage || exit 2
-rm -f ./**
-
-# 重新部署服务
-cd /home/ubuntu/deploy/bin || exit 2
-sudo ./stop.sh
-sudo ./deploy.sh
\ No newline at end of file
+##!/bin/bash
+#
+## 本脚本的作用是重置部署环境
+## 1.重置数据库
+## 2.删除storage文件夹内文件
+## 3.调用deploy.sh启动服务
+## 注意：由于1和2的原因，请仅在开发测试阶段使用本脚本！
+#
+## 重置数据库
+## i. 请在`XXXXXX`处设置相应的root密码
+## ii. 同时请注意root密码放在脚本是非常危险的，因此这里仅仅是用于开发测试阶段。
+#ROOT=root
+#PASSWORD=
+#
+#if test -z "$PASSWORD"
+#then
+#  echo "请设置云服务器MySQL的root账号密码"
+#  exit 1
+#fi
+#
+## 导入数据
+#cd /home/ubuntu/deploy/db || exit 2
+#mysql -h localhost -u $ROOT -p$PASSWORD < litemall.sql
+#
+## 删除storage文件夹内文件
+#cd /home/ubuntu/deploy/litemall/storage || exit 2
+#rm -f ./**
+#
+## 重新部署服务
+#cd /home/ubuntu/deploy/bin || exit 2
+#sudo ./stop.sh
+#sudo ./deploy.sh
\ No newline at end of file
diff --git a/deploy/bin/stop.sh b/deploy/bin/stop.sh
index 82ab3f5f..3842bd93 100644
--- a/deploy/bin/stop.sh
+++ b/deploy/bin/stop.sh
@@ -1,8 +1,8 @@
-#!/bin/bash
-
-PID=$(ps -ef | grep litemall.jar | grep -v grep | awk '{ print $2 }')
-
-if [ ! -z "$PID" ]
-then
-    kill $PID
-fi
\ No newline at end of file
+##!/bin/bash
+#
+#PID=$(ps -ef | grep litemall.jar | grep -v grep | awk '{ print $2 }')
+#
+#if [ ! -z "$PID" ]
+#then
+#    kill $PID
+#fi
\ No newline at end of file
diff --git a/deploy/litemall/application.yml b/deploy/litemall/application.yml
index 40ee1198..ddaa3e3b 100644
--- a/deploy/litemall/application.yml
+++ b/deploy/litemall/application.yml
@@ -5,10 +5,14 @@ spring:
     encoding: UTF-8
   datasource:
     druid:
-      url:  jdbc:mysql://124.222.53.90:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
-      driver-class-name:  com.mysql.cj.jdbc.Driver
-      username:  mysql
-      password:  czy@2024
+#      url:  jdbc:mysql://124.222.53.90:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
+#      driver-class-name:  com.mysql.cj.jdbc.Driver
+#      username:  mysql
+#      password:  czy@2024
+      url: jdbc:mysql://127.0.0.1:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      username: root
+      password: xnai@QWE123
       initial-size:  10
       max-active:  50
       min-idle:  10
diff --git a/deploy/util/lazy.sh b/deploy/util/lazy.sh
index 04646e63..188b63f9 100644
--- a/deploy/util/lazy.sh
+++ b/deploy/util/lazy.sh
@@ -1,52 +1,52 @@
-#!/bin/bash
-
-# 本脚本的作用是
-# 1. 项目打包
-# 2. 上传云服务器
-# 3. 远程登录云服务器并执行reset脚本
-
-# 请设置云服务器的IP地址和账户
-# 例如 ubuntu@122.51.199.160
-REMOTE=
-# 请设置本地SSH私钥文件id_rsa路径
-# 例如 /home/litemall/id_rsa
-ID_RSA=
-
-if test -z "$REMOTE"
-then
-  echo "请设置云服务器登录IP地址和账户"
-  exit 1
-fi
-
-if test -z "$ID_RSA"
-then
-  echo "请设置云服务器登录IP地址和账户"
-  exit 1
-fi
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-cd $DIR/../.. || exit 2
-LITEMALL_HOME=$PWD
-echo "LITEMALL_HOME $LITEMALL_HOME"
-
-# 项目打包
-cd $LITEMALL_HOME || exit 2
-./deploy/util/package.sh
-
-# 上传云服务器
-cd $LITEMALL_HOME || exit 2
-scp -i $ID_RSA -r  ./deploy $REMOTE:/home/ubuntu/
-
-# 远程登录云服务器并执行reset脚本
-# 这里使用tr命令，因为有可能deploy.sh和reset.sh的换行格式是CRLF，而LINUX环境应该是LF
-ssh $REMOTE -i $ID_RSA << eeooff
-cd /home/ubuntu/deploy/bin
-cat deploy.sh | tr -d '\r' > deploy2.sh
-mv deploy2.sh deploy.sh
-chmod +x deploy.sh
-cat reset.sh | tr -d '\r' > reset2.sh
-mv reset2.sh reset.sh
-chmod +x reset.sh
-sudo ./reset.sh
-exit
-eeooff
\ No newline at end of file
+##!/bin/bash
+#
+## 本脚本的作用是
+## 1. 项目打包
+## 2. 上传云服务器
+## 3. 远程登录云服务器并执行reset脚本
+#
+## 请设置云服务器的IP地址和账户
+## 例如 ubuntu@122.51.199.160
+#REMOTE=
+## 请设置本地SSH私钥文件id_rsa路径
+## 例如 /home/litemall/id_rsa
+#ID_RSA=
+#
+#if test -z "$REMOTE"
+#then
+#  echo "请设置云服务器登录IP地址和账户"
+#  exit 1
+#fi
+#
+#if test -z "$ID_RSA"
+#then
+#  echo "请设置云服务器登录IP地址和账户"
+#  exit 1
+#fi
+#
+#DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+#cd $DIR/../.. || exit 2
+#LITEMALL_HOME=$PWD
+#echo "LITEMALL_HOME $LITEMALL_HOME"
+#
+## 项目打包
+#cd $LITEMALL_HOME || exit 2
+#./deploy/util/package.sh
+#
+## 上传云服务器
+#cd $LITEMALL_HOME || exit 2
+#scp -i $ID_RSA -r  ./deploy $REMOTE:/home/ubuntu/
+#
+## 远程登录云服务器并执行reset脚本
+## 这里使用tr命令，因为有可能deploy.sh和reset.sh的换行格式是CRLF，而LINUX环境应该是LF
+#ssh $REMOTE -i $ID_RSA << eeooff
+#cd /home/ubuntu/deploy/bin
+#cat deploy.sh | tr -d '\r' > deploy2.sh
+#mv deploy2.sh deploy.sh
+#chmod +x deploy.sh
+#cat reset.sh | tr -d '\r' > reset2.sh
+#mv reset2.sh reset.sh
+#chmod +x reset.sh
+#sudo ./reset.sh
+#exit
+#eeooff
\ No newline at end of file
diff --git a/deploy/util/package.sh b/deploy/util/package.sh
index 7db190d2..2e2874bc 100644
--- a/deploy/util/package.sh
+++ b/deploy/util/package.sh
@@ -1,31 +1,31 @@
-#!/bin/bash
-
-# 请注意
-# 本脚本的作用是把本项目编译的结果保存到deploy文件夹中
-# 1. 把项目数据库文件拷贝到deploy/db
-# 2. 编译litemall-admin
-# 3. 编译litemall-all模块，然后拷贝到deploy/litemall
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-cd $DIR/../..
-LITEMALL_HOME=$PWD
-echo "LITEMALL_HOME $LITEMALL_HOME"
-
-# 复制数据库
-cat $LITEMALL_HOME/litemall-db/sql/litemall_schema.sql > $LITEMALL_HOME/deploy/db/litemall.sql
-cat $LITEMALL_HOME/litemall-db/sql/litemall_table.sql >> $LITEMALL_HOME/deploy/db/litemall.sql
-cat $LITEMALL_HOME/litemall-db/sql/litemall_data.sql >> $LITEMALL_HOME/deploy/db/litemall.sql
-
-# 打包litemall-admin
-cd $LITEMALL_HOME/litemall-admin
-npm install --registry=https://registry.npm.taobao.org
-npm run build:dep
-
-# 打包litemall-vue
-cd $LITEMALL_HOME/litemall-vue
-npm install --registry=https://registry.npm.taobao.org
-npm run build:dep
-
-cd $LITEMALL_HOME
-mvn clean package
-cp -f $LITEMALL_HOME/litemall-all/target/litemall-all-*-exec.jar $LITEMALL_HOME/deploy/litemall/litemall.jar
\ No newline at end of file
+##!/bin/bash
+#
+## 请注意
+## 本脚本的作用是把本项目编译的结果保存到deploy文件夹中
+## 1. 把项目数据库文件拷贝到deploy/db
+## 2. 编译litemall-admin
+## 3. 编译litemall-all模块，然后拷贝到deploy/litemall
+#
+#DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+#cd $DIR/../..
+#LITEMALL_HOME=$PWD
+#echo "LITEMALL_HOME $LITEMALL_HOME"
+#
+## 复制数据库
+#cat $LITEMALL_HOME/litemall-db/sql/litemall_schema.sql > $LITEMALL_HOME/deploy/db/litemall.sql
+#cat $LITEMALL_HOME/litemall-db/sql/litemall_table.sql >> $LITEMALL_HOME/deploy/db/litemall.sql
+#cat $LITEMALL_HOME/litemall-db/sql/litemall_data.sql >> $LITEMALL_HOME/deploy/db/litemall.sql
+#
+## 打包litemall-admin
+#cd $LITEMALL_HOME/litemall-admin
+#npm install --registry=https://registry.npm.taobao.org
+#npm run build:dep
+#
+## 打包litemall-vue
+#cd $LITEMALL_HOME/litemall-vue
+#npm install --registry=https://registry.npm.taobao.org
+#npm run build:dep
+#
+#cd $LITEMALL_HOME
+#mvn clean package
+#cp -f $LITEMALL_HOME/litemall-all/target/litemall-all-*-exec.jar $LITEMALL_HOME/deploy/litemall/litemall.jar
\ No newline at end of file
diff --git a/docker/bin/deploy.sh b/docker/bin/deploy.sh
index 9182a2b5..98309f0c 100644
--- a/docker/bin/deploy.sh
+++ b/docker/bin/deploy.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
-
-cd /home/ubuntu/docker
-sudo docker-compose down
-sudo docker-compose build
-sudo docker image prune -f
-sudo docker-compose up -d
+##!/bin/bash
+#
+#cd /home/ubuntu/docker
+#sudo docker-compose down
+#sudo docker-compose build
+#sudo docker image prune -f
+#sudo docker-compose up -d
diff --git a/docker/bin/reset.sh b/docker/bin/reset.sh
index e9cfaa01..d5b9162a 100644
--- a/docker/bin/reset.sh
+++ b/docker/bin/reset.sh
@@ -1,36 +1,36 @@
-#!/bin/bash
-
-# 本脚本的作用是重置部署环境
-# 1.重置数据库
-# 2.删除storage文件夹内文件
-# 3.调用deploy.sh启动服务
-# 注意：由于1和2的原因，请仅在开发测试阶段使用本脚本！
-
-# 重置数据库
-# i. 请在`XXXXXX`处设置相应的root密码
-# ii. 同时请注意root密码放在脚本是非常危险的，因此这里仅仅是用于开发测试阶段。
-ROOT=root
-PASSWORD=litemall123456
-
-if test -z "$PASSWORD"
-then
-  echo "请设置云服务器MySQL的root账号密码"
-  exit 1
-fi
-
-# 删除storage文件夹内文件
-cd /home/ubuntu/docker/litemall/storage || exit 2
-sudo rm -f ./**
-
-cd /home/ubuntu/docker || exit 3
-sudo docker-compose down
-sudo docker-compose build
-sudo docker image prune -f
-
-# 删除db/data文件夹内文件重置数据
-# 这样docker启动时会自动运行db/init-sql脚本，导入新的数据
-cd /home/ubuntu/docker/db/data || exit 1
-sudo rm -rf ./**
-
-cd /home/ubuntu/docker || exit 3
-sudo docker-compose up -d
+##!/bin/bash
+#
+## 本脚本的作用是重置部署环境
+## 1.重置数据库
+## 2.删除storage文件夹内文件
+## 3.调用deploy.sh启动服务
+## 注意：由于1和2的原因，请仅在开发测试阶段使用本脚本！
+#
+## 重置数据库
+## i. 请在`XXXXXX`处设置相应的root密码
+## ii. 同时请注意root密码放在脚本是非常危险的，因此这里仅仅是用于开发测试阶段。
+#ROOT=root
+#PASSWORD=litemall123456
+#
+#if test -z "$PASSWORD"
+#then
+#  echo "请设置云服务器MySQL的root账号密码"
+#  exit 1
+#fi
+#
+## 删除storage文件夹内文件
+#cd /home/ubuntu/docker/litemall/storage || exit 2
+#sudo rm -f ./**
+#
+#cd /home/ubuntu/docker || exit 3
+#sudo docker-compose down
+#sudo docker-compose build
+#sudo docker image prune -f
+#
+## 删除db/data文件夹内文件重置数据
+## 这样docker启动时会自动运行db/init-sql脚本，导入新的数据
+#cd /home/ubuntu/docker/db/data || exit 1
+#sudo rm -rf ./**
+#
+#cd /home/ubuntu/docker || exit 3
+#sudo docker-compose up -d
diff --git a/docker/util/lazy.sh b/docker/util/lazy.sh
index 2ac2bd3c..1bce8833 100644
--- a/docker/util/lazy.sh
+++ b/docker/util/lazy.sh
@@ -1,52 +1,52 @@
-#!/bin/bash
-
-# 本脚本的作用是
-# 1. 项目打包
-# 2. 上传云服务器
-# 3. 远程登录云服务器并执行reset脚本
-
-# 请设置云服务器的IP地址和账户
-# 例如 ubuntu@122.51.199.160
-REMOTE=ubuntu@122.51.199.160
-# 请设置本地SSH私钥文件id_rsa路径
-# 例如 /home/litemall/id_rsa
-ID_RSA=/d/00/cloud/litemall.txt
-
-if test -z "$REMOTE"
-then
-  echo "请设置云服务器登录IP地址和账户"
-  exit 1
-fi
-
-if test -z "$ID_RSA"
-then
-  echo "请设置云服务器登录IP地址和账户"
-  exit 1
-fi
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-cd $DIR/../.. || exit 2
-LITEMALL_HOME=$PWD
-echo "LITEMALL_HOME $LITEMALL_HOME"
-
-# 项目打包
-cd $LITEMALL_HOME || exit 2
-./docker/util/package.sh
-
-# 上传云服务器
-cd $LITEMALL_HOME || exit 2
-scp -i $ID_RSA -r  ./docker $REMOTE:/home/ubuntu/
-
-# 远程登录云服务器并执行reset脚本
-# 这里使用tr命令，因为有可能deploy.sh和reset.sh的换行格式是CRLF，而LINUX环境应该是LF
-ssh $REMOTE -i $ID_RSA << eeooff
-cd /home/ubuntu/docker/bin
-cat deploy.sh | tr -d '\r' > deploy2.sh
-mv deploy2.sh deploy.sh
-chmod +x deploy.sh
-cat reset.sh | tr -d '\r' > reset2.sh
-mv reset2.sh reset.sh
-chmod +x reset.sh
-sudo ./reset.sh
-exit
-eeooff
\ No newline at end of file
+##!/bin/bash
+#
+## 本脚本的作用是
+## 1. 项目打包
+## 2. 上传云服务器
+## 3. 远程登录云服务器并执行reset脚本
+#
+## 请设置云服务器的IP地址和账户
+## 例如 ubuntu@122.51.199.160
+#REMOTE=ubuntu@122.51.199.160
+## 请设置本地SSH私钥文件id_rsa路径
+## 例如 /home/litemall/id_rsa
+#ID_RSA=/d/00/cloud/litemall.txt
+#
+#if test -z "$REMOTE"
+#then
+#  echo "请设置云服务器登录IP地址和账户"
+#  exit 1
+#fi
+#
+#if test -z "$ID_RSA"
+#then
+#  echo "请设置云服务器登录IP地址和账户"
+#  exit 1
+#fi
+#
+#DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+#cd $DIR/../.. || exit 2
+#LITEMALL_HOME=$PWD
+#echo "LITEMALL_HOME $LITEMALL_HOME"
+#
+## 项目打包
+#cd $LITEMALL_HOME || exit 2
+#./docker/util/package.sh
+#
+## 上传云服务器
+#cd $LITEMALL_HOME || exit 2
+#scp -i $ID_RSA -r  ./docker $REMOTE:/home/ubuntu/
+#
+## 远程登录云服务器并执行reset脚本
+## 这里使用tr命令，因为有可能deploy.sh和reset.sh的换行格式是CRLF，而LINUX环境应该是LF
+#ssh $REMOTE -i $ID_RSA << eeooff
+#cd /home/ubuntu/docker/bin
+#cat deploy.sh | tr -d '\r' > deploy2.sh
+#mv deploy2.sh deploy.sh
+#chmod +x deploy.sh
+#cat reset.sh | tr -d '\r' > reset2.sh
+#mv reset2.sh reset.sh
+#chmod +x reset.sh
+#sudo ./reset.sh
+#exit
+#eeooff
\ No newline at end of file
diff --git a/docker/util/package.sh b/docker/util/package.sh
index 4a5b98f2..80f6e0cf 100644
--- a/docker/util/package.sh
+++ b/docker/util/package.sh
@@ -1,31 +1,31 @@
-#!/bin/bash
-
-# 请注意
-# 本脚本的作用是把本项目编译的结果保存到deploy文件夹中
-# 1. 把项目数据库文件拷贝到docker/db/init-sql
-# 2. 编译litemall-admin
-# 3. 编译litemall-all模块，然后拷贝到docker/litemall
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-cd $DIR/../..
-LITEMALL_HOME=$PWD
-echo "LITEMALL_HOME $LITEMALL_HOME"
-
-# 复制数据库
-cat $LITEMALL_HOME/litemall-db/sql/litemall_schema.sql > $LITEMALL_HOME/docker/db/init-sql/litemall.sql
-cat $LITEMALL_HOME/litemall-db/sql/litemall_table.sql >> $LITEMALL_HOME/docker/db/init-sql/litemall.sql
-cat $LITEMALL_HOME/litemall-db/sql/litemall_data.sql >> $LITEMALL_HOME/docker/db/init-sql/litemall.sql
-
-# 打包litemall-admin
-cd $LITEMALL_HOME/litemall-admin
-npm install --registry=https://registry.npm.taobao.org
-npm run build:dep
-
-# 打包litemall-vue
-cd $LITEMALL_HOME/litemall-vue
-npm install --registry=https://registry.npm.taobao.org
-npm run build:dep
-
-cd $LITEMALL_HOME
-mvn clean package
-cp -f $LITEMALL_HOME/litemall-all/target/litemall-all-*-exec.jar $LITEMALL_HOME/docker/litemall/litemall.jar
\ No newline at end of file
+##!/bin/bash
+#
+## 请注意
+## 本脚本的作用是把本项目编译的结果保存到deploy文件夹中
+## 1. 把项目数据库文件拷贝到docker/db/init-sql
+## 2. 编译litemall-admin
+## 3. 编译litemall-all模块，然后拷贝到docker/litemall
+#
+#DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+#cd $DIR/../..
+#LITEMALL_HOME=$PWD
+#echo "LITEMALL_HOME $LITEMALL_HOME"
+#
+## 复制数据库
+#cat $LITEMALL_HOME/litemall-db/sql/litemall_schema.sql > $LITEMALL_HOME/docker/db/init-sql/litemall.sql
+#cat $LITEMALL_HOME/litemall-db/sql/litemall_table.sql >> $LITEMALL_HOME/docker/db/init-sql/litemall.sql
+#cat $LITEMALL_HOME/litemall-db/sql/litemall_data.sql >> $LITEMALL_HOME/docker/db/init-sql/litemall.sql
+#
+## 打包litemall-admin
+#cd $LITEMALL_HOME/litemall-admin
+#npm install --registry=https://registry.npm.taobao.org
+#npm run build:dep
+#
+## 打包litemall-vue
+#cd $LITEMALL_HOME/litemall-vue
+#npm install --registry=https://registry.npm.taobao.org
+#npm run build:dep
+#
+#cd $LITEMALL_HOME
+#mvn clean package
+#cp -f $LITEMALL_HOME/litemall-all/target/litemall-all-*-exec.jar $LITEMALL_HOME/docker/litemall/litemall.jar
\ No newline at end of file
-- 
Gitee


From 2ce9da23a453fa0ca75693eecfe9f4ad7027c656 Mon Sep 17 00:00:00 2001
From: raowenbin <raowenbin@jygps.com.cn>
Date: Thu, 27 Jun 2024 15:55:51 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E5=88=86=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/litemall/application.yml               |  8 ++---
 .../main/resources/application-admintest.yml  |  0
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-db.yml     |  4 ---
 .../src/main/resources/application-dbtest.yml | 35 +++++++++++++++++++
 .../src/main/resources/application-wx.yml     |  4 ---
 .../src/main/resources/application-wxtest.yml |  4 +++
 7 files changed, 44 insertions(+), 13 deletions(-)
 create mode 100644 litemall-admin-api/src/main/resources/application-admintest.yml
 create mode 100644 litemall-db/src/main/resources/application-dbtest.yml
 create mode 100644 litemall-wx-api/src/main/resources/application-wxtest.yml

diff --git a/deploy/litemall/application.yml b/deploy/litemall/application.yml
index ddaa3e3b..149c20e0 100644
--- a/deploy/litemall/application.yml
+++ b/deploy/litemall/application.yml
@@ -9,10 +9,10 @@ spring:
 #      driver-class-name:  com.mysql.cj.jdbc.Driver
 #      username:  mysql
 #      password:  czy@2024
-      url: jdbc:mysql://127.0.0.1:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      username: root
-      password: xnai@QWE123
+#      url: jdbc:mysql://127.0.0.1:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
+#      driver-class-name: com.mysql.cj.jdbc.Driver
+#      username: root
+#      password: xnai@QWE123
       initial-size:  10
       max-active:  50
       min-idle:  10
diff --git a/litemall-admin-api/src/main/resources/application-admintest.yml b/litemall-admin-api/src/main/resources/application-admintest.yml
new file mode 100644
index 00000000..e69de29b
diff --git a/litemall-all/src/main/resources/logback-spring.xml b/litemall-all/src/main/resources/logback-spring.xml
index 572fa320..3fd91981 100644
--- a/litemall-all/src/main/resources/logback-spring.xml
+++ b/litemall-all/src/main/resources/logback-spring.xml
@@ -51,7 +51,7 @@
     <logger name="org.mybatis" level="ERROR" />
     <logger name="org.springframework" level="ERROR" />
     <logger name="org.linlinjava.litemall.core" level="ERROR" />
-    <logger name="org.linlinjava.litemall.db" level="ERROR" />
+    <logger name="org.linlinjava.litemall.db" level="ERROR" />
     <logger name="org.linlinjava.litemall.admin" level="DEBUG" />
     <logger name="org.linlinjava.litemall.wx" level="DEBUG" />
     <logger name="org.linlinjava.litemall" level="DEBUG" />
diff --git a/litemall-db/src/main/resources/application-db.yml b/litemall-db/src/main/resources/application-db.yml
index 8b3c8392..c83bb70a 100644
--- a/litemall-db/src/main/resources/application-db.yml
+++ b/litemall-db/src/main/resources/application-db.yml
@@ -7,10 +7,6 @@ pagehelper:
 spring:
   datasource:
     druid:
-#      url:  jdbc:mysql://124.222.53.90:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
-#      driver-class-name:  com.mysql.cj.jdbc.Driver
-#      username:  mysql
-#      password:  czy@2024
       url:  jdbc:mysql://127.0.0.1:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
       driver-class-name:  com.mysql.cj.jdbc.Driver
       username:  root
diff --git a/litemall-db/src/main/resources/application-dbtest.yml b/litemall-db/src/main/resources/application-dbtest.yml
new file mode 100644
index 00000000..e00fd9e0
--- /dev/null
+++ b/litemall-db/src/main/resources/application-dbtest.yml
@@ -0,0 +1,35 @@
+pagehelper:
+  helperDialect:  mysql
+  reasonable: true
+  supportMethodsArguments:  true
+  params: count=countSql
+
+spring:
+  datasource:
+    druid:
+      url:  jdbc:mysql://124.222.53.90:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
+      driver-class-name:  com.mysql.cj.jdbc.Driver
+      username:  mysql
+      password:  czy@2024
+      min-idle: 10
+      max-active: 50
+      # 获取数据库连接等待的超时时间
+      max-wait: 60000
+      # 配置多久进行一次检测，检测需要关闭的空闲连接 单位毫秒
+      time-between-eviction-runs-millis: 600000
+      min-evictable-idle-time-millis: 300000
+      validation-query: SELECT 1 FROM DUAL
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: false
+      filter:
+        stat:
+          enabled: false
+
+druid:
+  mysql:
+    use-ping-method: false
diff --git a/litemall-wx-api/src/main/resources/application-wx.yml b/litemall-wx-api/src/main/resources/application-wx.yml
index 53a5bfa6..684f9f0c 100644
--- a/litemall-wx-api/src/main/resources/application-wx.yml
+++ b/litemall-wx-api/src/main/resources/application-wx.yml
@@ -1,7 +1,3 @@
-# 测试环境默认头像
-#avatar:
-#  zbUrl: https://www.czyinfo.cn/wx/storage/fetch/hbo7hhrn5z08a2qn3352.png
-#  customerUrl: https://www.czyinfo.cn/wx/storage/fetch/o1eqeujd5om16t33weo5.jpg
 # 正式环境默认头像
 avatar:
   zbUrl: https://www.xianiaoai.cn/wx/storage/fetch/gzcvbvox66om49gom8wc.png
diff --git a/litemall-wx-api/src/main/resources/application-wxtest.yml b/litemall-wx-api/src/main/resources/application-wxtest.yml
new file mode 100644
index 00000000..ad1d2278
--- /dev/null
+++ b/litemall-wx-api/src/main/resources/application-wxtest.yml
@@ -0,0 +1,4 @@
+# 测试环境默认头像
+avatar:
+  zbUrl: https://www.czyinfo.cn/wx/storage/fetch/hbo7hhrn5z08a2qn3352.png
+  customerUrl: https://www.czyinfo.cn/wx/storage/fetch/o1eqeujd5om16t33weo5.jpg
\ No newline at end of file
-- 
Gitee


From 04446251ed4f0389b3c720aa784fbf23417cd67e Mon Sep 17 00:00:00 2001
From: cuiyq075145 <cuiyq075145@yimidida.com>
Date: Sat, 29 Jun 2024 09:45:29 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-wx-xianiao | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 litemall-wx-xianiao

diff --git a/litemall-wx-xianiao b/litemall-wx-xianiao
new file mode 160000
index 00000000..a75e89b9
--- /dev/null
+++ b/litemall-wx-xianiao
@@ -0,0 +1 @@
+Subproject commit a75e89b9a3f944c9a3bf35f1de029b01da58d25f
-- 
Gitee


From bdfac2b19de2b94da37a61e2146802d56637eb2c Mon Sep 17 00:00:00 2001
From: cuiyq075145 <cuiyq075145@yimidida.com>
Date: Sat, 29 Jun 2024 09:50:36 +0800
Subject: [PATCH 7/7] wx

---
 litemall-wx-xianiao                           |    1 -
 litemall-wx/app.js                            |  136 +-
 litemall-wx/app.json                          |  203 +-
 litemall-wx/app.wxss                          |   45 +-
 litemall-wx/components/video-swiper/index.js  |  254 +
 .../components/video-swiper/index.json        |    4 +
 .../components/video-swiper/index.wxml        |   38 +
 .../components/video-swiper/index.wxss        |    1 +
 litemall-wx/components/weui.wxss              |    6 +
 litemall-wx/config/api.js                     |  227 +-
 .../lib/vant-weapp/action-sheet/index.d.ts    |    2 +-
 .../lib/vant-weapp/action-sheet/index.js      |  118 +-
 .../lib/vant-weapp/action-sheet/index.json    |   16 +-
 .../lib/vant-weapp/action-sheet/index.wxml    |  108 +-
 litemall-wx/lib/vant-weapp/area/index.d.ts    |    2 +-
 litemall-wx/lib/vant-weapp/area/index.js      |  420 +-
 litemall-wx/lib/vant-weapp/area/index.json    |   12 +-
 litemall-wx/lib/vant-weapp/area/index.wxml    |   36 +-
 litemall-wx/lib/vant-weapp/button/index.d.ts  |    2 +-
 litemall-wx/lib/vant-weapp/button/index.js    |  136 +-
 litemall-wx/lib/vant-weapp/button/index.json  |   14 +-
 litemall-wx/lib/vant-weapp/button/index.wxml  |  104 +-
 litemall-wx/lib/vant-weapp/card/index.d.ts    |    2 +-
 litemall-wx/lib/vant-weapp/card/index.js      |   76 +-
 litemall-wx/lib/vant-weapp/card/index.json    |   12 +-
 litemall-wx/lib/vant-weapp/card/index.wxml    |   90 +-
 .../lib/vant-weapp/cell-group/index.d.ts      |    2 +-
 .../lib/vant-weapp/cell-group/index.js        |   20 +-
 .../lib/vant-weapp/cell-group/index.json      |    4 +-
 .../lib/vant-weapp/cell-group/index.wxml      |   18 +-
 litemall-wx/lib/vant-weapp/cell/index.d.ts    |    2 +-
 litemall-wx/lib/vant-weapp/cell/index.js      |   74 +-
 litemall-wx/lib/vant-weapp/cell/index.json    |   10 +-
 litemall-wx/lib/vant-weapp/cell/index.wxml    |   90 +-
 .../lib/vant-weapp/checkbox-group/index.d.ts  |    2 +-
 .../lib/vant-weapp/checkbox-group/index.js    |   78 +-
 .../lib/vant-weapp/checkbox-group/index.json  |    6 +-
 .../lib/vant-weapp/checkbox-group/index.wxml  |    2 +-
 .../lib/vant-weapp/checkbox/index.d.ts        |    2 +-
 litemall-wx/lib/vant-weapp/checkbox/index.js  |  174 +-
 .../lib/vant-weapp/checkbox/index.json        |   12 +-
 .../lib/vant-weapp/checkbox/index.wxml        |   38 +-
 litemall-wx/lib/vant-weapp/circle/index.d.ts  |    2 +-
 litemall-wx/lib/vant-weapp/circle/index.js    |  316 +-
 litemall-wx/lib/vant-weapp/circle/index.json  |    6 +-
 litemall-wx/lib/vant-weapp/circle/index.wxml  |   12 +-
 litemall-wx/lib/vant-weapp/col/index.d.ts     |    2 +-
 litemall-wx/lib/vant-weapp/col/index.js       |   46 +-
 litemall-wx/lib/vant-weapp/col/index.json     |    6 +-
 litemall-wx/lib/vant-weapp/col/index.wxml     |   16 +-
 .../lib/vant-weapp/collapse-item/index.d.ts   |    2 +-
 .../lib/vant-weapp/collapse-item/index.js     |  192 +-
 .../lib/vant-weapp/collapse-item/index.json   |   12 +-
 .../lib/vant-weapp/collapse-item/index.wxml   |   88 +-
 .../lib/vant-weapp/collapse/index.d.ts        |    2 +-
 litemall-wx/lib/vant-weapp/collapse/index.js  |  100 +-
 .../lib/vant-weapp/collapse/index.json        |    6 +-
 .../lib/vant-weapp/collapse/index.wxml        |    6 +-
 litemall-wx/lib/vant-weapp/common/color.d.ts  |   14 +-
 litemall-wx/lib/vant-weapp/common/color.js    |   14 +-
 .../lib/vant-weapp/common/component.d.ts      |    6 +-
 .../lib/vant-weapp/common/component.js        |   96 +-
 litemall-wx/lib/vant-weapp/common/utils.d.ts  |   16 +-
 litemall-wx/lib/vant-weapp/common/utils.js    |   64 +-
 .../lib/vant-weapp/count-down/index.d.ts      |    2 +-
 .../lib/vant-weapp/count-down/index.js        |  200 +-
 .../lib/vant-weapp/count-down/index.json      |    6 +-
 .../lib/vant-weapp/count-down/index.wxml      |    8 +-
 .../lib/vant-weapp/count-down/utils.d.ts      |   20 +-
 .../lib/vant-weapp/count-down/utils.js        |  114 +-
 .../lib/vant-weapp/datetime-picker/index.d.ts |    2 +-
 .../lib/vant-weapp/datetime-picker/index.js   |  594 +-
 .../lib/vant-weapp/datetime-picker/index.json |   12 +-
 .../lib/vant-weapp/datetime-picker/index.wxml |   32 +-
 .../lib/vant-weapp/definitions/index.d.ts     |   56 +-
 .../lib/vant-weapp/definitions/weapp.d.ts     |  224 +-
 litemall-wx/lib/vant-weapp/dialog/dialog.d.ts |   94 +-
 litemall-wx/lib/vant-weapp/dialog/dialog.js   |  126 +-
 litemall-wx/lib/vant-weapp/dialog/index.d.ts  |    2 +-
 litemall-wx/lib/vant-weapp/dialog/index.js    |  238 +-
 litemall-wx/lib/vant-weapp/dialog/index.json  |   14 +-
 litemall-wx/lib/vant-weapp/dialog/index.wxml  |  138 +-
 litemall-wx/lib/vant-weapp/divider/index.d.ts |    2 +-
 litemall-wx/lib/vant-weapp/divider/index.js   |   66 +-
 litemall-wx/lib/vant-weapp/divider/index.json |    6 +-
 litemall-wx/lib/vant-weapp/divider/index.wxml |   16 +-
 .../lib/vant-weapp/dropdown-item/index.d.ts   |    2 +-
 .../lib/vant-weapp/dropdown-item/index.js     |  208 +-
 .../lib/vant-weapp/dropdown-item/index.json   |   16 +-
 .../lib/vant-weapp/dropdown-item/index.wxml   |   88 +-
 .../lib/vant-weapp/dropdown-menu/index.d.ts   |    2 +-
 .../lib/vant-weapp/dropdown-menu/index.js     |  242 +-
 .../lib/vant-weapp/dropdown-menu/index.json   |    4 +-
 .../lib/vant-weapp/dropdown-menu/index.wxml   |   46 +-
 .../lib/vant-weapp/dropdown-menu/index.wxs    |   32 +-
 litemall-wx/lib/vant-weapp/field/index.d.ts   |    2 +-
 litemall-wx/lib/vant-weapp/field/index.js     |  216 +-
 litemall-wx/lib/vant-weapp/field/index.json   |   12 +-
 litemall-wx/lib/vant-weapp/field/index.wxml   |  186 +-
 .../vant-weapp/goods-action-button/index.d.ts |    2 +-
 .../vant-weapp/goods-action-button/index.js   |   82 +-
 .../vant-weapp/goods-action-button/index.json |   12 +-
 .../vant-weapp/goods-action-button/index.wxml |   56 +-
 .../vant-weapp/goods-action-icon/index.d.ts   |    2 +-
 .../lib/vant-weapp/goods-action-icon/index.js |   44 +-
 .../vant-weapp/goods-action-icon/index.json   |   14 +-
 .../vant-weapp/goods-action-icon/index.wxml   |   76 +-
 .../lib/vant-weapp/goods-action/index.d.ts    |    2 +-
 .../lib/vant-weapp/goods-action/index.js      |   44 +-
 .../lib/vant-weapp/goods-action/index.json    |    6 +-
 .../lib/vant-weapp/goods-action/index.wxml    |   10 +-
 .../lib/vant-weapp/grid-item/index.d.ts       |    2 +-
 litemall-wx/lib/vant-weapp/grid-item/index.js |  136 +-
 .../lib/vant-weapp/grid-item/index.json       |   12 +-
 .../lib/vant-weapp/grid-item/index.wxml       |   44 +-
 litemall-wx/lib/vant-weapp/grid/index.d.ts    |    2 +-
 litemall-wx/lib/vant-weapp/grid/index.js      |  124 +-
 litemall-wx/lib/vant-weapp/grid/index.json    |    6 +-
 litemall-wx/lib/vant-weapp/grid/index.wxml    |    6 +-
 litemall-wx/lib/vant-weapp/icon/index.d.ts    |    2 +-
 litemall-wx/lib/vant-weapp/icon/index.js      |   78 +-
 litemall-wx/lib/vant-weapp/icon/index.json    |   12 +-
 litemall-wx/lib/vant-weapp/icon/index.wxml    |   36 +-
 litemall-wx/lib/vant-weapp/image/index.d.ts   |    2 +-
 litemall-wx/lib/vant-weapp/image/index.js     |  196 +-
 litemall-wx/lib/vant-weapp/image/index.json   |   14 +-
 litemall-wx/lib/vant-weapp/image/index.wxml   |   66 +-
 .../lib/vant-weapp/index-anchor/index.d.ts    |    2 +-
 .../lib/vant-weapp/index-anchor/index.js      |   44 +-
 .../lib/vant-weapp/index-anchor/index.json    |    6 +-
 .../lib/vant-weapp/index-anchor/index.wxml    |   28 +-
 .../lib/vant-weapp/index-bar/index.d.ts       |    2 +-
 litemall-wx/lib/vant-weapp/index-bar/index.js |  480 +-
 .../lib/vant-weapp/index-bar/index.json       |    6 +-
 .../lib/vant-weapp/index-bar/index.wxml       |   44 +-
 litemall-wx/lib/vant-weapp/info/index.d.ts    |    2 +-
 litemall-wx/lib/vant-weapp/info/index.js      |   16 +-
 litemall-wx/lib/vant-weapp/info/index.json    |    6 +-
 litemall-wx/lib/vant-weapp/info/index.wxml    |   14 +-
 litemall-wx/lib/vant-weapp/loading/index.d.ts |    2 +-
 litemall-wx/lib/vant-weapp/loading/index.js   |   64 +-
 litemall-wx/lib/vant-weapp/loading/index.json |    4 +-
 litemall-wx/lib/vant-weapp/loading/index.wxml |   32 +-
 litemall-wx/lib/vant-weapp/mixins/basic.d.ts  |    2 +-
 litemall-wx/lib/vant-weapp/mixins/basic.js    |   44 +-
 litemall-wx/lib/vant-weapp/mixins/button.d.ts |    2 +-
 litemall-wx/lib/vant-weapp/mixins/button.js   |   36 +-
 litemall-wx/lib/vant-weapp/mixins/link.d.ts   |    2 +-
 litemall-wx/lib/vant-weapp/mixins/link.js     |   34 +-
 .../vant-weapp/mixins/observer/behavior.d.ts  |    2 +-
 .../vant-weapp/mixins/observer/behavior.js    |   28 +-
 .../lib/vant-weapp/mixins/observer/index.d.ts |    2 +-
 .../lib/vant-weapp/mixins/observer/index.js   |   38 +-
 .../lib/vant-weapp/mixins/open-type.d.ts      |    2 +-
 .../lib/vant-weapp/mixins/open-type.js        |   50 +-
 litemall-wx/lib/vant-weapp/mixins/touch.d.ts  |    2 +-
 litemall-wx/lib/vant-weapp/mixins/touch.js    |   70 +-
 .../lib/vant-weapp/mixins/transition.d.ts     |    2 +-
 .../lib/vant-weapp/mixins/transition.js       |  240 +-
 litemall-wx/lib/vant-weapp/nav-bar/index.d.ts |    2 +-
 litemall-wx/lib/vant-weapp/nav-bar/index.js   |   76 +-
 litemall-wx/lib/vant-weapp/nav-bar/index.json |   12 +-
 litemall-wx/lib/vant-weapp/nav-bar/index.wxml |   74 +-
 .../lib/vant-weapp/notice-bar/index.d.ts      |    2 +-
 .../lib/vant-weapp/notice-bar/index.js        |  246 +-
 .../lib/vant-weapp/notice-bar/index.json      |   10 +-
 .../lib/vant-weapp/notice-bar/index.wxml      |   74 +-
 litemall-wx/lib/vant-weapp/notify/index.d.ts  |    2 +-
 litemall-wx/lib/vant-weapp/notify/index.js    |  118 +-
 litemall-wx/lib/vant-weapp/notify/index.json  |   12 +-
 litemall-wx/lib/vant-weapp/notify/index.wxml  |   30 +-
 litemall-wx/lib/vant-weapp/notify/notify.d.ts |   38 +-
 litemall-wx/lib/vant-weapp/notify/notify.js   |   82 +-
 litemall-wx/lib/vant-weapp/overlay/index.d.ts |    2 +-
 litemall-wx/lib/vant-weapp/overlay/index.js   |   44 +-
 litemall-wx/lib/vant-weapp/overlay/index.json |   12 +-
 litemall-wx/lib/vant-weapp/overlay/index.wxml |   20 +-
 litemall-wx/lib/vant-weapp/panel/index.d.ts   |    2 +-
 litemall-wx/lib/vant-weapp/panel/index.js     |   20 +-
 litemall-wx/lib/vant-weapp/panel/index.json   |   12 +-
 litemall-wx/lib/vant-weapp/panel/index.wxml   |   38 +-
 .../lib/vant-weapp/picker-column/index.d.ts   |    2 +-
 .../lib/vant-weapp/picker-column/index.js     |  238 +-
 .../lib/vant-weapp/picker-column/index.json   |    4 +-
 .../lib/vant-weapp/picker-column/index.wxml   |   44 +-
 .../lib/vant-weapp/picker-column/index.wxs    |   16 +-
 litemall-wx/lib/vant-weapp/picker/index.d.ts  |    2 +-
 litemall-wx/lib/vant-weapp/picker/index.js    |  270 +-
 litemall-wx/lib/vant-weapp/picker/index.json  |   14 +-
 litemall-wx/lib/vant-weapp/picker/index.wxml  |  130 +-
 litemall-wx/lib/vant-weapp/picker/shared.d.ts |   42 +-
 litemall-wx/lib/vant-weapp/picker/shared.js   |   42 +-
 litemall-wx/lib/vant-weapp/popup/index.d.ts   |    2 +-
 litemall-wx/lib/vant-weapp/popup/index.js     |  160 +-
 litemall-wx/lib/vant-weapp/popup/index.json   |   14 +-
 litemall-wx/lib/vant-weapp/popup/index.wxml   |   48 +-
 .../lib/vant-weapp/progress/index.d.ts        |    2 +-
 litemall-wx/lib/vant-weapp/progress/index.js  |   76 +-
 .../lib/vant-weapp/progress/index.json        |    6 +-
 .../lib/vant-weapp/progress/index.wxml        |   38 +-
 litemall-wx/lib/vant-weapp/progress/index.wxs |   10 +-
 .../lib/vant-weapp/radio-group/index.d.ts     |    2 +-
 .../lib/vant-weapp/radio-group/index.js       |   76 +-
 .../lib/vant-weapp/radio-group/index.json     |    6 +-
 .../lib/vant-weapp/radio-group/index.wxml     |    2 +-
 litemall-wx/lib/vant-weapp/radio/index.d.ts   |    2 +-
 litemall-wx/lib/vant-weapp/radio/index.js     |  120 +-
 litemall-wx/lib/vant-weapp/radio/index.json   |   12 +-
 litemall-wx/lib/vant-weapp/radio/index.wxml   |   58 +-
 litemall-wx/lib/vant-weapp/rate/index.d.ts    |    2 +-
 litemall-wx/lib/vant-weapp/rate/index.js      |  190 +-
 litemall-wx/lib/vant-weapp/rate/index.json    |   12 +-
 litemall-wx/lib/vant-weapp/rate/index.wxml    |   68 +-
 litemall-wx/lib/vant-weapp/row/index.d.ts     |    2 +-
 litemall-wx/lib/vant-weapp/row/index.js       |   72 +-
 litemall-wx/lib/vant-weapp/row/index.json     |    6 +-
 litemall-wx/lib/vant-weapp/row/index.wxml     |    6 +-
 litemall-wx/lib/vant-weapp/search/index.d.ts  |    2 +-
 litemall-wx/lib/vant-weapp/search/index.js    |  146 +-
 litemall-wx/lib/vant-weapp/search/index.json  |   12 +-
 litemall-wx/lib/vant-weapp/search/index.wxml  |  100 +-
 .../lib/vant-weapp/sidebar-item/index.d.ts    |    2 +-
 .../lib/vant-weapp/sidebar-item/index.js      |   72 +-
 .../lib/vant-weapp/sidebar-item/index.json    |   12 +-
 .../lib/vant-weapp/sidebar-item/index.wxml    |   36 +-
 litemall-wx/lib/vant-weapp/sidebar/index.d.ts |    2 +-
 litemall-wx/lib/vant-weapp/sidebar/index.js   |   86 +-
 litemall-wx/lib/vant-weapp/sidebar/index.json |    6 +-
 litemall-wx/lib/vant-weapp/sidebar/index.wxml |    6 +-
 .../lib/vant-weapp/skeleton/index.d.ts        |    2 +-
 litemall-wx/lib/vant-weapp/skeleton/index.js  |   82 +-
 .../lib/vant-weapp/skeleton/index.json        |    6 +-
 .../lib/vant-weapp/skeleton/index.wxml        |   58 +-
 litemall-wx/lib/vant-weapp/slider/index.d.ts  |    2 +-
 litemall-wx/lib/vant-weapp/slider/index.js    |  214 +-
 litemall-wx/lib/vant-weapp/slider/index.json  |    6 +-
 litemall-wx/lib/vant-weapp/slider/index.wxml  |   58 +-
 litemall-wx/lib/vant-weapp/stepper/index.d.ts |    2 +-
 litemall-wx/lib/vant-weapp/stepper/index.js   |  344 +-
 litemall-wx/lib/vant-weapp/stepper/index.json |    4 +-
 litemall-wx/lib/vant-weapp/stepper/index.wxml |   74 +-
 litemall-wx/lib/vant-weapp/steps/index.d.ts   |    2 +-
 litemall-wx/lib/vant-weapp/steps/index.js     |   44 +-
 litemall-wx/lib/vant-weapp/steps/index.json   |   12 +-
 litemall-wx/lib/vant-weapp/steps/index.wxml   |  102 +-
 litemall-wx/lib/vant-weapp/sticky/index.d.ts  |    2 +-
 litemall-wx/lib/vant-weapp/sticky/index.js    |  280 +-
 litemall-wx/lib/vant-weapp/sticky/index.json  |    6 +-
 litemall-wx/lib/vant-weapp/sticky/index.wxml  |   14 +-
 .../lib/vant-weapp/submit-bar/index.d.ts      |    2 +-
 .../lib/vant-weapp/submit-bar/index.js        |  114 +-
 .../lib/vant-weapp/submit-bar/index.json      |   14 +-
 .../lib/vant-weapp/submit-bar/index.wxml      |   84 +-
 .../lib/vant-weapp/swipe-cell/index.d.ts      |    2 +-
 .../lib/vant-weapp/swipe-cell/index.js        |  244 +-
 .../lib/vant-weapp/swipe-cell/index.json      |    6 +-
 .../lib/vant-weapp/swipe-cell/index.wxml      |   40 +-
 litemall-wx/lib/vant-weapp/switch/index.d.ts  |    2 +-
 litemall-wx/lib/vant-weapp/switch/index.js    |  102 +-
 litemall-wx/lib/vant-weapp/switch/index.json  |   12 +-
 litemall-wx/lib/vant-weapp/switch/index.wxml  |   22 +-
 litemall-wx/lib/vant-weapp/tab/index.d.ts     |    2 +-
 litemall-wx/lib/vant-weapp/tab/index.js       |  112 +-
 litemall-wx/lib/vant-weapp/tab/index.json     |    4 +-
 litemall-wx/lib/vant-weapp/tab/index.wxml     |   16 +-
 .../lib/vant-weapp/tabbar-item/index.d.ts     |    2 +-
 .../lib/vant-weapp/tabbar-item/index.js       |   94 +-
 .../lib/vant-weapp/tabbar-item/index.json     |   14 +-
 .../lib/vant-weapp/tabbar-item/index.wxml     |   60 +-
 litemall-wx/lib/vant-weapp/tabbar/index.d.ts  |    2 +-
 litemall-wx/lib/vant-weapp/tabbar/index.js    |  130 +-
 litemall-wx/lib/vant-weapp/tabbar/index.json  |    6 +-
 litemall-wx/lib/vant-weapp/tabbar/index.wxml  |   16 +-
 litemall-wx/lib/vant-weapp/tabs/index.d.ts    |    2 +-
 litemall-wx/lib/vant-weapp/tabs/index.js      |  578 +-
 litemall-wx/lib/vant-weapp/tabs/index.json    |   14 +-
 litemall-wx/lib/vant-weapp/tabs/index.wxml    |  120 +-
 litemall-wx/lib/vant-weapp/tabs/index.wxs     |  110 +-
 litemall-wx/lib/vant-weapp/tag/index.d.ts     |    2 +-
 litemall-wx/lib/vant-weapp/tag/index.js       |   42 +-
 litemall-wx/lib/vant-weapp/tag/index.json     |    4 +-
 litemall-wx/lib/vant-weapp/tag/index.wxml     |   28 +-
 litemall-wx/lib/vant-weapp/toast/index.d.ts   |    2 +-
 litemall-wx/lib/vant-weapp/toast/index.js     |   58 +-
 litemall-wx/lib/vant-weapp/toast/index.json   |   18 +-
 litemall-wx/lib/vant-weapp/toast/index.wxml   |   66 +-
 litemall-wx/lib/vant-weapp/toast/toast.d.ts   |   52 +-
 litemall-wx/lib/vant-weapp/toast/toast.js     |  132 +-
 .../lib/vant-weapp/transition/index.d.ts      |    2 +-
 .../lib/vant-weapp/transition/index.js        |   26 +-
 .../lib/vant-weapp/transition/index.json      |    4 +-
 .../lib/vant-weapp/transition/index.wxml      |   16 +-
 .../lib/vant-weapp/tree-select/index.d.ts     |    2 +-
 .../lib/vant-weapp/tree-select/index.js       |  148 +-
 .../lib/vant-weapp/tree-select/index.json     |   16 +-
 .../lib/vant-weapp/tree-select/index.wxml     |   78 +-
 .../lib/vant-weapp/tree-select/index.wxs      |   24 +-
 .../lib/vant-weapp/uploader/index.d.ts        |    2 +-
 litemall-wx/lib/vant-weapp/uploader/index.js  |  302 +-
 .../lib/vant-weapp/uploader/index.json        |   12 +-
 .../lib/vant-weapp/uploader/index.wxml        |  114 +-
 .../lib/vant-weapp/uploader/utils.d.ts        |   24 +-
 litemall-wx/lib/vant-weapp/uploader/utils.js  |   32 +-
 litemall-wx/lib/vant-weapp/wxs/array.wxs      |   10 +-
 litemall-wx/lib/vant-weapp/wxs/bem.wxs        |   76 +-
 litemall-wx/lib/vant-weapp/wxs/memoize.wxs    |  108 +-
 litemall-wx/lib/vant-weapp/wxs/object.wxs     |   26 +-
 litemall-wx/lib/vant-weapp/wxs/utils.wxs      |   14 +-
 litemall-wx/lib/weui.wxss                     | 1042 +++
 litemall-wx/lib/wxParse/html2json.js          |  484 +-
 litemall-wx/lib/wxParse/htmlparser.js         |  364 +-
 litemall-wx/lib/wxParse/showdown.js           | 5058 ++++++------
 litemall-wx/lib/wxParse/wxDiscode.js          |  410 +-
 litemall-wx/lib/wxParse/wxParse.js            |  292 +-
 litemall-wx/lib/wxParse/wxParse.wxml          | 1854 ++---
 litemall-wx/lib/wxParse/wxParse.wxss          |  404 +-
 .../MessageDetails.js}                        |   98 +-
 .../pages/MessageDetails/MessageDetails.json  |    3 +
 .../pages/MessageDetails/MessageDetails.wxml  |    5 +
 .../pages/MessageDetails/MessageDetails.wxss  |    4 +
 litemall-wx/pages/about/about.js              |   57 -
 litemall-wx/pages/about/about.json            |    1 -
 litemall-wx/pages/about/about.wxml            |   40 -
 litemall-wx/pages/about/about.wxss            |   36 -
 litemall-wx/pages/anchor/anchor.js            |   49 +
 litemall-wx/pages/anchor/anchor.json          |    6 +
 litemall-wx/pages/anchor/anchor.wxml          |   17 +
 litemall-wx/pages/anchor/anchor.wxss          |   64 +
 litemall-wx/pages/anchor/assets/mom.png       |  Bin 0 -> 7035 bytes
 litemall-wx/pages/anchor/assets/sex.png       |  Bin 0 -> 11453 bytes
 .../pages/auth/accountLogin/accountLogin.js   |  144 +-
 .../pages/auth/accountLogin/accountLogin.json |    4 +-
 .../pages/auth/accountLogin/accountLogin.wxml |   44 +-
 .../pages/auth/accountLogin/accountLogin.wxss |  117 +-
 .../auth/authorization/assets/denglu.svg      |    1 +
 .../pages/auth/authorization/authorization.js |  101 +
 .../auth/authorization/authorization.json     |    3 +
 .../auth/authorization/authorization.wxml     |   34 +
 .../auth/authorization/authorization.wxss     |   83 +
 .../pages/auth/login/assets/shangjia.png      |  Bin 0 -> 112336 bytes
 litemall-wx/pages/auth/login/assets/zhubo.png |  Bin 0 -> 3861 bytes
 .../pages/auth/login/assets/zhubop.png        |  Bin 0 -> 133080 bytes
 .../pages/auth/login/assets/zhubosousuo.png   |  Bin 0 -> 4106 bytes
 .../pages/auth/login/assets/zhubozhongxin.png |  Bin 0 -> 5466 bytes
 litemall-wx/pages/auth/login/login.js         |  185 +-
 litemall-wx/pages/auth/login/login.json       |    5 +-
 litemall-wx/pages/auth/login/login.wxml       |   67 +-
 litemall-wx/pages/auth/login/login.wxss       |  367 +-
 litemall-wx/pages/auth/register/register.js   |  422 +-
 litemall-wx/pages/auth/register/register.json |    4 +-
 litemall-wx/pages/auth/register/register.wxml |   68 +-
 litemall-wx/pages/auth/register/register.wxss |  134 +-
 litemall-wx/pages/auth/reset/reset.js         |  324 +-
 litemall-wx/pages/auth/reset/reset.json       |    4 +-
 litemall-wx/pages/auth/reset/reset.wxml       |   58 +-
 litemall-wx/pages/auth/reset/reset.wxss       |  132 +-
 litemall-wx/pages/brand/brand.json            |    3 -
 litemall-wx/pages/brand/brand.wxml            |   16 -
 litemall-wx/pages/brand/brand.wxss            |   52 -
 litemall-wx/pages/brandDetail/brandDetail.js  |   69 -
 .../pages/brandDetail/brandDetail.json        |    3 -
 .../pages/brandDetail/brandDetail.wxml        |   28 -
 .../pages/brandDetail/brandDetail.wxss        |  111 -
 litemall-wx/pages/cart/cart.js                |  303 -
 litemall-wx/pages/cart/cart.json              |    4 -
 litemall-wx/pages/cart/cart.wxml              |   61 -
 litemall-wx/pages/cart/cart.wxss              |  492 --
 litemall-wx/pages/catalog/catalog.js          |   77 -
 litemall-wx/pages/catalog/catalog.json        |    3 -
 litemall-wx/pages/catalog/catalog.wxml        |   30 -
 litemall-wx/pages/catalog/catalog.wxss        |  160 -
 litemall-wx/pages/category/category.js        |  153 -
 litemall-wx/pages/category/category.json      |    1 -
 litemall-wx/pages/category/category.wxml      |   25 -
 litemall-wx/pages/category/category.wxss      |  118 -
 litemall-wx/pages/checkout/checkout.js        |  213 -
 litemall-wx/pages/checkout/checkout.json      |    3 -
 litemall-wx/pages/checkout/checkout.wxml      |   97 -
 litemall-wx/pages/checkout/checkout.wxss      |  310 -
 litemall-wx/pages/comDetails/comDetails.js    |  116 +
 litemall-wx/pages/comDetails/comDetails.json  |    3 +
 litemall-wx/pages/comDetails/comDetails.wxml  |   73 +
 litemall-wx/pages/comDetails/comDetails.wxss  |  159 +
 litemall-wx/pages/comment/comment.js          |  140 -
 litemall-wx/pages/comment/comment.json        |    4 -
 litemall-wx/pages/comment/comment.wxml        |   30 -
 litemall-wx/pages/comment/comment.wxss        |  155 -
 litemall-wx/pages/commentPost/commentPost.js  |  172 -
 .../pages/commentPost/commentPost.json        |    3 -
 .../pages/commentPost/commentPost.wxml        |   55 -
 .../pages/commentPost/commentPost.wxss        |  246 -
 litemall-wx/pages/coupon/coupon.js            |  150 -
 litemall-wx/pages/coupon/coupon.json          |    3 -
 litemall-wx/pages/coupon/coupon.wxml          |   28 -
 litemall-wx/pages/coupon/coupon.wxss          |  132 -
 .../topicDetail.js => details/details.js}     |  136 +-
 litemall-wx/pages/details/details.json        |    3 +
 litemall-wx/pages/details/details.wxml        |   65 +
 litemall-wx/pages/details/details.wxss        |  120 +
 litemall-wx/pages/goods/goods.js              | 1332 ++--
 litemall-wx/pages/goods/goods.json            |    4 +-
 litemall-wx/pages/goods/goods.wxml            |  402 +-
 litemall-wx/pages/goods/goods.wxss            | 1868 ++---
 .../groupon/grouponDetail/grouponDetail.js    |   95 -
 .../groupon/grouponDetail/grouponDetail.json  |    3 -
 .../groupon/grouponDetail/grouponDetail.wxml  |   67 -
 .../groupon/grouponDetail/grouponDetail.wxss  |  304 -
 .../groupon/grouponList/grouponList.json      |    3 -
 .../groupon/grouponList/grouponList.wxml      |   31 -
 .../groupon/grouponList/grouponList.wxss      |  107 -
 .../pages/groupon/myGroupon/myGroupon.js      |   52 -
 .../pages/groupon/myGroupon/myGroupon.json    |    3 -
 .../pages/groupon/myGroupon/myGroupon.wxml    |   51 -
 .../pages/groupon/myGroupon/myGroupon.wxss    |  213 -
 litemall-wx/pages/help/help.json              |    3 -
 litemall-wx/pages/help/help.wxml              |   20 -
 litemall-wx/pages/help/help.wxss              |   70 -
 litemall-wx/pages/hotGoods/hotGoods.js        |  120 -
 litemall-wx/pages/hotGoods/hotGoods.json      |    3 -
 litemall-wx/pages/hotGoods/hotGoods.wxml      |   42 -
 litemall-wx/pages/hotGoods/hotGoods.wxss      |  164 -
 litemall-wx/pages/index/assets/fenxiang.png   |  Bin 0 -> 5055 bytes
 litemall-wx/pages/index/assets/mom.png        |  Bin 0 -> 7035 bytes
 litemall-wx/pages/index/assets/nan.png        |  Bin 0 -> 4459 bytes
 litemall-wx/pages/index/assets/nv.png         |  Bin 0 -> 4891 bytes
 litemall-wx/pages/index/assets/sex.png        |  Bin 0 -> 11453 bytes
 litemall-wx/pages/index/index.js              |  449 +-
 litemall-wx/pages/index/index.json            |    5 +-
 litemall-wx/pages/index/index.wxml            |  484 +-
 litemall-wx/pages/index/index.wxss            | 1279 +--
 litemall-wx/pages/information/assets/mom.png  |  Bin 0 -> 7035 bytes
 litemall-wx/pages/information/assets/sex.png  |  Bin 0 -> 11453 bytes
 litemall-wx/pages/information/information.js  |  149 +
 .../pages/information/information.json        |    3 +
 .../pages/information/information.wxml        |   70 +
 .../pages/information/information.wxss        |  349 +
 .../jobManagement.js}                         |  144 +-
 .../pages/jobManagement/jobManagement.json    |    3 +
 .../pages/jobManagement/jobManagement.wxml    |   49 +
 .../pages/jobManagement/jobManagement.wxss    |   60 +
 litemall-wx/pages/newGoods/newGoods.js        |  106 -
 litemall-wx/pages/newGoods/newGoods.json      |    3 -
 litemall-wx/pages/newGoods/newGoods.wxml      |   42 -
 litemall-wx/pages/newGoods/newGoods.wxss      |  163 -
 .../grouponList.js => news/news.js}           |  145 +-
 litemall-wx/pages/news/news.json              |    4 +
 litemall-wx/pages/news/news.wxml              |   15 +
 litemall-wx/pages/news/news.wxss              |   35 +
 litemall-wx/pages/payResult/payResult.js      |   63 -
 litemall-wx/pages/payResult/payResult.json    |    4 -
 litemall-wx/pages/payResult/payResult.wxml    |   24 -
 litemall-wx/pages/payResult/payResult.wxss    |   59 -
 .../pages/postPosition/assets/iconfont.wxss   |  240 +
 litemall-wx/pages/postPosition/assets/mom.png |  Bin 0 -> 7035 bytes
 .../pages/postPosition/postPosition.js        |  720 ++
 .../pages/postPosition/postPosition.json      |    3 +
 .../pages/postPosition/postPosition.wxml      |  158 +
 .../pages/postPosition/postPosition.wxss      |  304 +
 litemall-wx/pages/search/search.js            |  195 -
 litemall-wx/pages/search/search.json          |    3 -
 litemall-wx/pages/search/search.wxml          |   66 -
 litemall-wx/pages/search/search.wxss          |  318 -
 litemall-wx/pages/topic/topic.js              |   86 -
 litemall-wx/pages/topic/topic.json            |    3 -
 litemall-wx/pages/topic/topic.wxml            |   16 -
 litemall-wx/pages/topic/topic.wxss            |   94 -
 .../pages/topicComment/topicComment.js        |  131 -
 .../pages/topicComment/topicComment.json      |    4 -
 .../pages/topicComment/topicComment.wxml      |   26 -
 .../pages/topicComment/topicComment.wxss      |  144 -
 .../topicCommentPost/topicCommentPost.js      |  177 -
 .../topicCommentPost/topicCommentPost.json    |    3 -
 .../topicCommentPost/topicCommentPost.wxml    |   51 -
 .../topicCommentPost/topicCommentPost.wxss    |  246 -
 .../pages/topicDetail/topicDetail.json        |    3 -
 .../pages/topicDetail/topicDetail.wxml        |   68 -
 .../pages/topicDetail/topicDetail.wxss        |  268 -
 litemall-wx/pages/ucenter/address/address.js  |   93 -
 .../pages/ucenter/address/address.json        |    3 -
 .../pages/ucenter/address/address.wxml        |   21 -
 .../pages/ucenter/address/address.wxss        |  132 -
 .../pages/ucenter/addressAdd/addressAdd.js    |  370 -
 .../pages/ucenter/addressAdd/addressAdd.json  |    3 -
 .../pages/ucenter/addressAdd/addressAdd.wxml  |   39 -
 .../pages/ucenter/addressAdd/addressAdd.wxss  |  162 -
 .../pages/ucenter/aftersale/aftersale.js      |  171 -
 .../pages/ucenter/aftersale/aftersale.json    |    3 -
 .../pages/ucenter/aftersale/aftersale.wxml    |   45 -
 .../pages/ucenter/aftersale/aftersale.wxss    |  103 -
 .../aftersaleDetail/aftersaleDetail.js        |   65 -
 .../aftersaleDetail/aftersaleDetail.json      |    3 -
 .../aftersaleDetail/aftersaleDetail.wxml      |   42 -
 .../aftersaleDetail/aftersaleDetail.wxss      |  187 -
 .../ucenter/aftersaleList/aftersaleList.js    |   69 -
 .../ucenter/aftersaleList/aftersaleList.json  |    3 -
 .../ucenter/aftersaleList/aftersaleList.wxml  |   42 -
 .../ucenter/aftersaleList/aftersaleList.wxss  |  165 -
 .../pages/ucenter/business/assets/mom.png     |  Bin 0 -> 7035 bytes
 .../pages/ucenter/business/business.js        |  571 ++
 .../pages/ucenter/business/business.json      |    3 +
 .../pages/ucenter/business/business.wxml      |  153 +
 .../pages/ucenter/business/business.wxss      |  262 +
 .../pages/ucenter/categorys/categorys.js      |  110 +
 .../pages/ucenter/categorys/categorys.json    |    3 +
 .../pages/ucenter/categorys/categorys.wxml    |   15 +
 .../pages/ucenter/categorys/categorys.wxss    |   48 +
 litemall-wx/pages/ucenter/collect/collect.js  |  266 +-
 .../pages/ucenter/collect/collect.json        |    4 +-
 .../pages/ucenter/collect/collect.wxml        |   60 +-
 .../pages/ucenter/collect/collect.wxss        |  370 +-
 .../pages/ucenter/couponList/couponList.js    |  173 -
 .../pages/ucenter/couponList/couponList.json  |    4 -
 .../pages/ucenter/couponList/couponList.wxml  |   56 -
 .../pages/ucenter/couponList/couponList.wxss  |  242 -
 .../ucenter/couponSelect/couponSelect.js      |  162 -
 .../ucenter/couponSelect/couponSelect.json    |    3 -
 .../ucenter/couponSelect/couponSelect.wxml    |   26 -
 .../ucenter/couponSelect/couponSelect.wxss    |  120 -
 .../pages/ucenter/feedback/feedback.js        |  350 +-
 .../pages/ucenter/feedback/feedback.json      |    4 +-
 .../pages/ucenter/feedback/feedback.wxml      |   66 +-
 .../pages/ucenter/feedback/feedback.wxss      |  390 +-
 .../pages/ucenter/footprint/footprint.js      |  269 +-
 .../pages/ucenter/footprint/footprint.json    |    4 +-
 .../pages/ucenter/footprint/footprint.wxml    |   56 +-
 .../pages/ucenter/footprint/footprint.wxss    |  265 +-
 .../pages/ucenter/index/assets/fangke.png     |  Bin 0 -> 5568 bytes
 .../pages/ucenter/index/assets/mom.png        |  Bin 0 -> 7035 bytes
 .../pages/ucenter/index/assets/shangjia.png   |  Bin 0 -> 4917 bytes
 .../pages/ucenter/index/assets/shezhi.png     |  Bin 0 -> 7338 bytes
 .../pages/ucenter/index/assets/zhiwei.png     |  Bin 0 -> 5159 bytes
 .../pages/ucenter/index/assets/zhubo.png      |  Bin 0 -> 8104 bytes
 .../pages/ucenter/index/assets/zuji.png       |  Bin 0 -> 10053 bytes
 litemall-wx/pages/ucenter/index/index.js      |  590 +-
 litemall-wx/pages/ucenter/index/index.json    |    8 +-
 litemall-wx/pages/ucenter/index/index.wxml    |  223 +-
 litemall-wx/pages/ucenter/index/index.wxss    |  460 +-
 .../pages/ucenter/myposts/assets/fangke.png   |  Bin 0 -> 5568 bytes
 .../pages/ucenter/myposts/assets/mom.png      |  Bin 0 -> 7035 bytes
 .../pages/ucenter/myposts/assets/shangjia.png |  Bin 0 -> 4917 bytes
 .../pages/ucenter/myposts/assets/zhiwei.png   |  Bin 0 -> 5159 bytes
 .../pages/ucenter/myposts/assets/zhubo.png    |  Bin 0 -> 8104 bytes
 .../pages/ucenter/myposts/assets/zuji.png     |  Bin 0 -> 10053 bytes
 litemall-wx/pages/ucenter/myposts/myposts.js  |  779 ++
 .../pages/ucenter/myposts/myposts.json        |    3 +
 .../pages/ucenter/myposts/myposts.wxml        |  199 +
 .../pages/ucenter/myposts/myposts.wxss        |  249 +
 litemall-wx/pages/ucenter/order/order.js      |   79 -
 litemall-wx/pages/ucenter/order/order.json    |    3 -
 litemall-wx/pages/ucenter/order/order.wxml    |   46 -
 litemall-wx/pages/ucenter/order/order.wxss    |  166 -
 .../pages/ucenter/orderDetail/orderDetail.js  |  214 -
 .../ucenter/orderDetail/orderDetail.json      |    3 -
 .../ucenter/orderDetail/orderDetail.wxml      |   98 -
 .../ucenter/orderDetail/orderDetail.wxss      |  281 -
 litemall-wx/pages/ucenter/setup/setup.js      |  111 +
 litemall-wx/pages/ucenter/setup/setup.json    |    3 +
 litemall-wx/pages/ucenter/setup/setup.wxml    |   13 +
 litemall-wx/pages/ucenter/setup/setup.wxss    |   42 +
 litemall-wx/pages/ucenter/visitor/visitor.js  |  136 +
 .../pages/ucenter/visitor/visitor.json        |    3 +
 .../pages/ucenter/visitor/visitor.wxml        |   37 +
 .../pages/ucenter/visitor/visitor.wxss        |  153 +
 .../pages/ucenter/zbFootprint/zbFootprint.js  |  136 +
 .../ucenter/zbFootprint/zbFootprint.json      |    3 +
 .../ucenter/zbFootprint/zbFootprint.wxml      |   42 +
 .../ucenter/zbFootprint/zbFootprint.wxss      |  149 +
 .../pages/ucenter/zbVisitor/zbVisitor.js      |  137 +
 .../pages/ucenter/zbVisitor/zbVisitor.json    |    3 +
 .../pages/ucenter/zbVisitor/zbVisitor.wxml    |   41 +
 .../pages/ucenter/zbVisitor/zbVisitor.wxss    |  150 +
 litemall-wx/project.config.json               |  660 +-
 litemall-wx/project.private.config.json       |  177 +-
 litemall-wx/sitemap.json                      |   40 +-
 litemall-wx/static/fonts/demo.css             |  539 ++
 litemall-wx/static/fonts/demo_index.html      |  419 +
 litemall-wx/static/fonts/iconfont.css         |   56 +
 litemall-wx/static/fonts/iconfont.js          |    1 +
 litemall-wx/static/fonts/iconfont.json        |   79 +
 litemall-wx/static/fonts/iconfont.ttf         |  Bin 0 -> 4988 bytes
 litemall-wx/static/fonts/iconfont.woff        |  Bin 0 -> 3224 bytes
 litemall-wx/static/fonts/iconfont.woff2       |  Bin 0 -> 2588 bytes
 litemall-wx/static/images/about.png           |  Bin 9910 -> 0 bytes
 litemall-wx/static/images/address.png         |  Bin 5838 -> 0 bytes
 litemall-wx/static/images/aftersale.png       |  Bin 8742 -> 0 bytes
 litemall-wx/static/images/cart.png            |  Bin 3030 -> 0 bytes
 litemall-wx/static/images/cart@selected.png   |  Bin 3368 -> 0 bytes
 litemall-wx/static/images/category.png        |  Bin 10859 -> 0 bytes
 .../static/images/category@selected.png       |  Bin 11372 -> 0 bytes
 litemall-wx/static/images/comment.png         |  Bin 6330 -> 0 bytes
 litemall-wx/static/images/coupon.png          |  Bin 7827 -> 0 bytes
 litemall-wx/static/images/feedback.png        |  Bin 4132 -> 0 bytes
 litemall-wx/static/images/footprint.png       |  Bin 11739 -> 0 bytes
 litemall-wx/static/images/geren.png           |  Bin 0 -> 8012 bytes
 litemall-wx/static/images/gerens.png          |  Bin 0 -> 7879 bytes
 litemall-wx/static/images/group.png           |  Bin 11386 -> 0 bytes
 litemall-wx/static/images/help.png            |  Bin 388 -> 0 bytes
 litemall-wx/static/images/home.png            |  Bin 2887 -> 0 bytes
 litemall-wx/static/images/home@selected.png   |  Bin 3177 -> 0 bytes
 litemall-wx/static/images/hot.png             |  Bin 12228 -> 0 bytes
 litemall-wx/static/images/icon/ceshengao.png  |  Bin 0 -> 5340 bytes
 .../static/images/icon/chushengriqi.png       |  Bin 0 -> 5850 bytes
 .../static/images/icon/dianhuahaoma.png       |  Bin 0 -> 4723 bytes
 .../images/icon/duotianweishangketixing.png   |  Bin 0 -> 6246 bytes
 litemall-wx/static/images/icon/fengge.png     |  Bin 0 -> 4385 bytes
 .../static/images/icon/gongsidizhiicon.png    |  Bin 0 -> 5363 bytes
 .../static/images/icon/gongsimingcheng.png    |  Bin 0 -> 4456 bytes
 .../static/images/icon/gongzuofangshipx.png   |  Bin 0 -> 6073 bytes
 .../static/images/icon/hujichangzhudizhi.png  |  Bin 0 -> 2478 bytes
 litemall-wx/static/images/icon/hujidi.png     |  Bin 0 -> 5978 bytes
 litemall-wx/static/images/icon/icon-boy.png   |  Bin 0 -> 4917 bytes
 litemall-wx/static/images/icon/leixing.png    |  Bin 0 -> 4961 bytes
 litemall-wx/static/images/icon/lianjie.png    |  Bin 0 -> 7746 bytes
 litemall-wx/static/images/icon/lianxiren.png  |  Bin 0 -> 6143 bytes
 litemall-wx/static/images/icon/pinlei.png     |  Bin 0 -> 4174 bytes
 litemall-wx/static/images/icon/pinlei1.png    |  Bin 0 -> 6966 bytes
 litemall-wx/static/images/icon/sex.png        |  Bin 0 -> 10604 bytes
 litemall-wx/static/images/icon/shipin.png     |  Bin 0 -> 2886 bytes
 litemall-wx/static/images/icon/tupian.png     |  Bin 0 -> 7265 bytes
 litemall-wx/static/images/icon/weight.png     |  Bin 0 -> 8050 bytes
 litemall-wx/static/images/icon/xingming.png   |  Bin 0 -> 9889 bytes
 litemall-wx/static/images/icon/xueli-.png     |  Bin 0 -> 4481 bytes
 .../static/images/icon/yly_qianzhuang.png     |  Bin 0 -> 9419 bytes
 litemall-wx/static/images/icon/yuyan.png      |  Bin 0 -> 6641 bytes
 .../static/images/icon/zhuyingyewu.png        |  Bin 0 -> 9710 bytes
 litemall-wx/static/images/icon_error.png      |  Bin 1259 -> 0 bytes
 litemall-wx/static/images/mobile.png          |  Bin 3916 -> 0 bytes
 litemall-wx/static/images/my.png              |  Bin 8065 -> 0 bytes
 litemall-wx/static/images/my@selected.png     |  Bin 8466 -> 0 bytes
 litemall-wx/static/images/new.png             |  Bin 32299 -> 0 bytes
 litemall-wx/static/images/pendpay.png         |  Bin 12638 -> 0 bytes
 litemall-wx/static/images/receive.png         |  Bin 7397 -> 0 bytes
 litemall-wx/static/images/send.png            |  Bin 7783 -> 0 bytes
 litemall-wx/static/images/shouye.png          |  Bin 0 -> 7136 bytes
 litemall-wx/static/images/shouyes.png         |  Bin 0 -> 6036 bytes
 litemall-wx/static/images/xiaoxi.png          |  Bin 0 -> 5566 bytes
 litemall-wx/static/images/xiaoxis.png         |  Bin 0 -> 5327 bytes
 litemall-wx/utils/WxValidate.js               |  418 +
 litemall-wx/utils/area.js                     | 7047 +++++++++--------
 litemall-wx/utils/check.js                    |   22 +-
 litemall-wx/utils/user.js                     |  198 +-
 litemall-wx/utils/util.js                     |  182 +-
 642 files changed, 33028 insertions(+), 32784 deletions(-)
 delete mode 160000 litemall-wx-xianiao
 create mode 100644 litemall-wx/components/video-swiper/index.js
 create mode 100644 litemall-wx/components/video-swiper/index.json
 create mode 100644 litemall-wx/components/video-swiper/index.wxml
 create mode 100644 litemall-wx/components/video-swiper/index.wxss
 create mode 100644 litemall-wx/components/weui.wxss
 create mode 100644 litemall-wx/lib/weui.wxss
 rename litemall-wx/pages/{help/help.js => MessageDetails/MessageDetails.js} (41%)
 create mode 100644 litemall-wx/pages/MessageDetails/MessageDetails.json
 create mode 100644 litemall-wx/pages/MessageDetails/MessageDetails.wxml
 create mode 100644 litemall-wx/pages/MessageDetails/MessageDetails.wxss
 delete mode 100644 litemall-wx/pages/about/about.js
 delete mode 100644 litemall-wx/pages/about/about.json
 delete mode 100644 litemall-wx/pages/about/about.wxml
 delete mode 100644 litemall-wx/pages/about/about.wxss
 create mode 100644 litemall-wx/pages/anchor/anchor.js
 create mode 100644 litemall-wx/pages/anchor/anchor.json
 create mode 100644 litemall-wx/pages/anchor/anchor.wxml
 create mode 100644 litemall-wx/pages/anchor/anchor.wxss
 create mode 100644 litemall-wx/pages/anchor/assets/mom.png
 create mode 100644 litemall-wx/pages/anchor/assets/sex.png
 create mode 100644 litemall-wx/pages/auth/authorization/assets/denglu.svg
 create mode 100644 litemall-wx/pages/auth/authorization/authorization.js
 create mode 100644 litemall-wx/pages/auth/authorization/authorization.json
 create mode 100644 litemall-wx/pages/auth/authorization/authorization.wxml
 create mode 100644 litemall-wx/pages/auth/authorization/authorization.wxss
 create mode 100644 litemall-wx/pages/auth/login/assets/shangjia.png
 create mode 100644 litemall-wx/pages/auth/login/assets/zhubo.png
 create mode 100644 litemall-wx/pages/auth/login/assets/zhubop.png
 create mode 100644 litemall-wx/pages/auth/login/assets/zhubosousuo.png
 create mode 100644 litemall-wx/pages/auth/login/assets/zhubozhongxin.png
 delete mode 100644 litemall-wx/pages/brand/brand.json
 delete mode 100644 litemall-wx/pages/brand/brand.wxml
 delete mode 100644 litemall-wx/pages/brand/brand.wxss
 delete mode 100644 litemall-wx/pages/brandDetail/brandDetail.js
 delete mode 100644 litemall-wx/pages/brandDetail/brandDetail.json
 delete mode 100644 litemall-wx/pages/brandDetail/brandDetail.wxml
 delete mode 100644 litemall-wx/pages/brandDetail/brandDetail.wxss
 delete mode 100644 litemall-wx/pages/cart/cart.js
 delete mode 100644 litemall-wx/pages/cart/cart.json
 delete mode 100644 litemall-wx/pages/cart/cart.wxml
 delete mode 100644 litemall-wx/pages/cart/cart.wxss
 delete mode 100644 litemall-wx/pages/catalog/catalog.js
 delete mode 100644 litemall-wx/pages/catalog/catalog.json
 delete mode 100644 litemall-wx/pages/catalog/catalog.wxml
 delete mode 100644 litemall-wx/pages/catalog/catalog.wxss
 delete mode 100644 litemall-wx/pages/category/category.js
 delete mode 100644 litemall-wx/pages/category/category.json
 delete mode 100644 litemall-wx/pages/category/category.wxml
 delete mode 100644 litemall-wx/pages/category/category.wxss
 delete mode 100644 litemall-wx/pages/checkout/checkout.js
 delete mode 100644 litemall-wx/pages/checkout/checkout.json
 delete mode 100644 litemall-wx/pages/checkout/checkout.wxml
 delete mode 100644 litemall-wx/pages/checkout/checkout.wxss
 create mode 100644 litemall-wx/pages/comDetails/comDetails.js
 create mode 100644 litemall-wx/pages/comDetails/comDetails.json
 create mode 100644 litemall-wx/pages/comDetails/comDetails.wxml
 create mode 100644 litemall-wx/pages/comDetails/comDetails.wxss
 delete mode 100644 litemall-wx/pages/comment/comment.js
 delete mode 100644 litemall-wx/pages/comment/comment.json
 delete mode 100644 litemall-wx/pages/comment/comment.wxml
 delete mode 100644 litemall-wx/pages/comment/comment.wxss
 delete mode 100644 litemall-wx/pages/commentPost/commentPost.js
 delete mode 100644 litemall-wx/pages/commentPost/commentPost.json
 delete mode 100644 litemall-wx/pages/commentPost/commentPost.wxml
 delete mode 100644 litemall-wx/pages/commentPost/commentPost.wxss
 delete mode 100644 litemall-wx/pages/coupon/coupon.js
 delete mode 100644 litemall-wx/pages/coupon/coupon.json
 delete mode 100644 litemall-wx/pages/coupon/coupon.wxml
 delete mode 100644 litemall-wx/pages/coupon/coupon.wxss
 rename litemall-wx/pages/{topicDetail/topicDetail.js => details/details.js} (32%)
 create mode 100644 litemall-wx/pages/details/details.json
 create mode 100644 litemall-wx/pages/details/details.wxml
 create mode 100644 litemall-wx/pages/details/details.wxss
 delete mode 100644 litemall-wx/pages/groupon/grouponDetail/grouponDetail.js
 delete mode 100644 litemall-wx/pages/groupon/grouponDetail/grouponDetail.json
 delete mode 100644 litemall-wx/pages/groupon/grouponDetail/grouponDetail.wxml
 delete mode 100644 litemall-wx/pages/groupon/grouponDetail/grouponDetail.wxss
 delete mode 100644 litemall-wx/pages/groupon/grouponList/grouponList.json
 delete mode 100644 litemall-wx/pages/groupon/grouponList/grouponList.wxml
 delete mode 100644 litemall-wx/pages/groupon/grouponList/grouponList.wxss
 delete mode 100644 litemall-wx/pages/groupon/myGroupon/myGroupon.js
 delete mode 100644 litemall-wx/pages/groupon/myGroupon/myGroupon.json
 delete mode 100644 litemall-wx/pages/groupon/myGroupon/myGroupon.wxml
 delete mode 100644 litemall-wx/pages/groupon/myGroupon/myGroupon.wxss
 delete mode 100644 litemall-wx/pages/help/help.json
 delete mode 100644 litemall-wx/pages/help/help.wxml
 delete mode 100644 litemall-wx/pages/help/help.wxss
 delete mode 100644 litemall-wx/pages/hotGoods/hotGoods.js
 delete mode 100644 litemall-wx/pages/hotGoods/hotGoods.json
 delete mode 100644 litemall-wx/pages/hotGoods/hotGoods.wxml
 delete mode 100644 litemall-wx/pages/hotGoods/hotGoods.wxss
 create mode 100644 litemall-wx/pages/index/assets/fenxiang.png
 create mode 100644 litemall-wx/pages/index/assets/mom.png
 create mode 100644 litemall-wx/pages/index/assets/nan.png
 create mode 100644 litemall-wx/pages/index/assets/nv.png
 create mode 100644 litemall-wx/pages/index/assets/sex.png
 create mode 100644 litemall-wx/pages/information/assets/mom.png
 create mode 100644 litemall-wx/pages/information/assets/sex.png
 create mode 100644 litemall-wx/pages/information/information.js
 create mode 100644 litemall-wx/pages/information/information.json
 create mode 100644 litemall-wx/pages/information/information.wxml
 create mode 100644 litemall-wx/pages/information/information.wxss
 rename litemall-wx/pages/{brand/brand.js => jobManagement/jobManagement.js} (41%)
 create mode 100644 litemall-wx/pages/jobManagement/jobManagement.json
 create mode 100644 litemall-wx/pages/jobManagement/jobManagement.wxml
 create mode 100644 litemall-wx/pages/jobManagement/jobManagement.wxss
 delete mode 100644 litemall-wx/pages/newGoods/newGoods.js
 delete mode 100644 litemall-wx/pages/newGoods/newGoods.json
 delete mode 100644 litemall-wx/pages/newGoods/newGoods.wxml
 delete mode 100644 litemall-wx/pages/newGoods/newGoods.wxss
 rename litemall-wx/pages/{groupon/grouponList/grouponList.js => news/news.js} (38%)
 create mode 100644 litemall-wx/pages/news/news.json
 create mode 100644 litemall-wx/pages/news/news.wxml
 create mode 100644 litemall-wx/pages/news/news.wxss
 delete mode 100644 litemall-wx/pages/payResult/payResult.js
 delete mode 100644 litemall-wx/pages/payResult/payResult.json
 delete mode 100644 litemall-wx/pages/payResult/payResult.wxml
 delete mode 100644 litemall-wx/pages/payResult/payResult.wxss
 create mode 100644 litemall-wx/pages/postPosition/assets/iconfont.wxss
 create mode 100644 litemall-wx/pages/postPosition/assets/mom.png
 create mode 100644 litemall-wx/pages/postPosition/postPosition.js
 create mode 100644 litemall-wx/pages/postPosition/postPosition.json
 create mode 100644 litemall-wx/pages/postPosition/postPosition.wxml
 create mode 100644 litemall-wx/pages/postPosition/postPosition.wxss
 delete mode 100644 litemall-wx/pages/search/search.js
 delete mode 100644 litemall-wx/pages/search/search.json
 delete mode 100644 litemall-wx/pages/search/search.wxml
 delete mode 100644 litemall-wx/pages/search/search.wxss
 delete mode 100644 litemall-wx/pages/topic/topic.js
 delete mode 100644 litemall-wx/pages/topic/topic.json
 delete mode 100644 litemall-wx/pages/topic/topic.wxml
 delete mode 100644 litemall-wx/pages/topic/topic.wxss
 delete mode 100644 litemall-wx/pages/topicComment/topicComment.js
 delete mode 100644 litemall-wx/pages/topicComment/topicComment.json
 delete mode 100644 litemall-wx/pages/topicComment/topicComment.wxml
 delete mode 100644 litemall-wx/pages/topicComment/topicComment.wxss
 delete mode 100644 litemall-wx/pages/topicCommentPost/topicCommentPost.js
 delete mode 100644 litemall-wx/pages/topicCommentPost/topicCommentPost.json
 delete mode 100644 litemall-wx/pages/topicCommentPost/topicCommentPost.wxml
 delete mode 100644 litemall-wx/pages/topicCommentPost/topicCommentPost.wxss
 delete mode 100644 litemall-wx/pages/topicDetail/topicDetail.json
 delete mode 100644 litemall-wx/pages/topicDetail/topicDetail.wxml
 delete mode 100644 litemall-wx/pages/topicDetail/topicDetail.wxss
 delete mode 100644 litemall-wx/pages/ucenter/address/address.js
 delete mode 100644 litemall-wx/pages/ucenter/address/address.json
 delete mode 100644 litemall-wx/pages/ucenter/address/address.wxml
 delete mode 100644 litemall-wx/pages/ucenter/address/address.wxss
 delete mode 100644 litemall-wx/pages/ucenter/addressAdd/addressAdd.js
 delete mode 100644 litemall-wx/pages/ucenter/addressAdd/addressAdd.json
 delete mode 100644 litemall-wx/pages/ucenter/addressAdd/addressAdd.wxml
 delete mode 100644 litemall-wx/pages/ucenter/addressAdd/addressAdd.wxss
 delete mode 100644 litemall-wx/pages/ucenter/aftersale/aftersale.js
 delete mode 100644 litemall-wx/pages/ucenter/aftersale/aftersale.json
 delete mode 100644 litemall-wx/pages/ucenter/aftersale/aftersale.wxml
 delete mode 100644 litemall-wx/pages/ucenter/aftersale/aftersale.wxss
 delete mode 100644 litemall-wx/pages/ucenter/aftersaleDetail/aftersaleDetail.js
 delete mode 100644 litemall-wx/pages/ucenter/aftersaleDetail/aftersaleDetail.json
 delete mode 100644 litemall-wx/pages/ucenter/aftersaleDetail/aftersaleDetail.wxml
 delete mode 100644 litemall-wx/pages/ucenter/aftersaleDetail/aftersaleDetail.wxss
 delete mode 100644 litemall-wx/pages/ucenter/aftersaleList/aftersaleList.js
 delete mode 100644 litemall-wx/pages/ucenter/aftersaleList/aftersaleList.json
 delete mode 100644 litemall-wx/pages/ucenter/aftersaleList/aftersaleList.wxml
 delete mode 100644 litemall-wx/pages/ucenter/aftersaleList/aftersaleList.wxss
 create mode 100644 litemall-wx/pages/ucenter/business/assets/mom.png
 create mode 100644 litemall-wx/pages/ucenter/business/business.js
 create mode 100644 litemall-wx/pages/ucenter/business/business.json
 create mode 100644 litemall-wx/pages/ucenter/business/business.wxml
 create mode 100644 litemall-wx/pages/ucenter/business/business.wxss
 create mode 100644 litemall-wx/pages/ucenter/categorys/categorys.js
 create mode 100644 litemall-wx/pages/ucenter/categorys/categorys.json
 create mode 100644 litemall-wx/pages/ucenter/categorys/categorys.wxml
 create mode 100644 litemall-wx/pages/ucenter/categorys/categorys.wxss
 delete mode 100644 litemall-wx/pages/ucenter/couponList/couponList.js
 delete mode 100644 litemall-wx/pages/ucenter/couponList/couponList.json
 delete mode 100644 litemall-wx/pages/ucenter/couponList/couponList.wxml
 delete mode 100644 litemall-wx/pages/ucenter/couponList/couponList.wxss
 delete mode 100644 litemall-wx/pages/ucenter/couponSelect/couponSelect.js
 delete mode 100644 litemall-wx/pages/ucenter/couponSelect/couponSelect.json
 delete mode 100644 litemall-wx/pages/ucenter/couponSelect/couponSelect.wxml
 delete mode 100644 litemall-wx/pages/ucenter/couponSelect/couponSelect.wxss
 create mode 100644 litemall-wx/pages/ucenter/index/assets/fangke.png
 create mode 100644 litemall-wx/pages/ucenter/index/assets/mom.png
 create mode 100644 litemall-wx/pages/ucenter/index/assets/shangjia.png
 create mode 100644 litemall-wx/pages/ucenter/index/assets/shezhi.png
 create mode 100644 litemall-wx/pages/ucenter/index/assets/zhiwei.png
 create mode 100644 litemall-wx/pages/ucenter/index/assets/zhubo.png
 create mode 100644 litemall-wx/pages/ucenter/index/assets/zuji.png
 create mode 100644 litemall-wx/pages/ucenter/myposts/assets/fangke.png
 create mode 100644 litemall-wx/pages/ucenter/myposts/assets/mom.png
 create mode 100644 litemall-wx/pages/ucenter/myposts/assets/shangjia.png
 create mode 100644 litemall-wx/pages/ucenter/myposts/assets/zhiwei.png
 create mode 100644 litemall-wx/pages/ucenter/myposts/assets/zhubo.png
 create mode 100644 litemall-wx/pages/ucenter/myposts/assets/zuji.png
 create mode 100644 litemall-wx/pages/ucenter/myposts/myposts.js
 create mode 100644 litemall-wx/pages/ucenter/myposts/myposts.json
 create mode 100644 litemall-wx/pages/ucenter/myposts/myposts.wxml
 create mode 100644 litemall-wx/pages/ucenter/myposts/myposts.wxss
 delete mode 100644 litemall-wx/pages/ucenter/order/order.js
 delete mode 100644 litemall-wx/pages/ucenter/order/order.json
 delete mode 100644 litemall-wx/pages/ucenter/order/order.wxml
 delete mode 100644 litemall-wx/pages/ucenter/order/order.wxss
 delete mode 100644 litemall-wx/pages/ucenter/orderDetail/orderDetail.js
 delete mode 100644 litemall-wx/pages/ucenter/orderDetail/orderDetail.json
 delete mode 100644 litemall-wx/pages/ucenter/orderDetail/orderDetail.wxml
 delete mode 100644 litemall-wx/pages/ucenter/orderDetail/orderDetail.wxss
 create mode 100644 litemall-wx/pages/ucenter/setup/setup.js
 create mode 100644 litemall-wx/pages/ucenter/setup/setup.json
 create mode 100644 litemall-wx/pages/ucenter/setup/setup.wxml
 create mode 100644 litemall-wx/pages/ucenter/setup/setup.wxss
 create mode 100644 litemall-wx/pages/ucenter/visitor/visitor.js
 create mode 100644 litemall-wx/pages/ucenter/visitor/visitor.json
 create mode 100644 litemall-wx/pages/ucenter/visitor/visitor.wxml
 create mode 100644 litemall-wx/pages/ucenter/visitor/visitor.wxss
 create mode 100644 litemall-wx/pages/ucenter/zbFootprint/zbFootprint.js
 create mode 100644 litemall-wx/pages/ucenter/zbFootprint/zbFootprint.json
 create mode 100644 litemall-wx/pages/ucenter/zbFootprint/zbFootprint.wxml
 create mode 100644 litemall-wx/pages/ucenter/zbFootprint/zbFootprint.wxss
 create mode 100644 litemall-wx/pages/ucenter/zbVisitor/zbVisitor.js
 create mode 100644 litemall-wx/pages/ucenter/zbVisitor/zbVisitor.json
 create mode 100644 litemall-wx/pages/ucenter/zbVisitor/zbVisitor.wxml
 create mode 100644 litemall-wx/pages/ucenter/zbVisitor/zbVisitor.wxss
 create mode 100644 litemall-wx/static/fonts/demo.css
 create mode 100644 litemall-wx/static/fonts/demo_index.html
 create mode 100644 litemall-wx/static/fonts/iconfont.css
 create mode 100644 litemall-wx/static/fonts/iconfont.js
 create mode 100644 litemall-wx/static/fonts/iconfont.json
 create mode 100644 litemall-wx/static/fonts/iconfont.ttf
 create mode 100644 litemall-wx/static/fonts/iconfont.woff
 create mode 100644 litemall-wx/static/fonts/iconfont.woff2
 delete mode 100644 litemall-wx/static/images/about.png
 delete mode 100644 litemall-wx/static/images/address.png
 delete mode 100644 litemall-wx/static/images/aftersale.png
 delete mode 100644 litemall-wx/static/images/cart.png
 delete mode 100644 litemall-wx/static/images/cart@selected.png
 delete mode 100644 litemall-wx/static/images/category.png
 delete mode 100644 litemall-wx/static/images/category@selected.png
 delete mode 100644 litemall-wx/static/images/comment.png
 delete mode 100644 litemall-wx/static/images/coupon.png
 delete mode 100644 litemall-wx/static/images/feedback.png
 delete mode 100644 litemall-wx/static/images/footprint.png
 create mode 100644 litemall-wx/static/images/geren.png
 create mode 100644 litemall-wx/static/images/gerens.png
 delete mode 100644 litemall-wx/static/images/group.png
 delete mode 100644 litemall-wx/static/images/help.png
 delete mode 100644 litemall-wx/static/images/home.png
 delete mode 100644 litemall-wx/static/images/home@selected.png
 delete mode 100644 litemall-wx/static/images/hot.png
 create mode 100644 litemall-wx/static/images/icon/ceshengao.png
 create mode 100644 litemall-wx/static/images/icon/chushengriqi.png
 create mode 100644 litemall-wx/static/images/icon/dianhuahaoma.png
 create mode 100644 litemall-wx/static/images/icon/duotianweishangketixing.png
 create mode 100644 litemall-wx/static/images/icon/fengge.png
 create mode 100644 litemall-wx/static/images/icon/gongsidizhiicon.png
 create mode 100644 litemall-wx/static/images/icon/gongsimingcheng.png
 create mode 100644 litemall-wx/static/images/icon/gongzuofangshipx.png
 create mode 100644 litemall-wx/static/images/icon/hujichangzhudizhi.png
 create mode 100644 litemall-wx/static/images/icon/hujidi.png
 create mode 100644 litemall-wx/static/images/icon/icon-boy.png
 create mode 100644 litemall-wx/static/images/icon/leixing.png
 create mode 100644 litemall-wx/static/images/icon/lianjie.png
 create mode 100644 litemall-wx/static/images/icon/lianxiren.png
 create mode 100644 litemall-wx/static/images/icon/pinlei.png
 create mode 100644 litemall-wx/static/images/icon/pinlei1.png
 create mode 100644 litemall-wx/static/images/icon/sex.png
 create mode 100644 litemall-wx/static/images/icon/shipin.png
 create mode 100644 litemall-wx/static/images/icon/tupian.png
 create mode 100644 litemall-wx/static/images/icon/weight.png
 create mode 100644 litemall-wx/static/images/icon/xingming.png
 create mode 100644 litemall-wx/static/images/icon/xueli-.png
 create mode 100644 litemall-wx/static/images/icon/yly_qianzhuang.png
 create mode 100644 litemall-wx/static/images/icon/yuyan.png
 create mode 100644 litemall-wx/static/images/icon/zhuyingyewu.png
 delete mode 100644 litemall-wx/static/images/icon_error.png
 delete mode 100644 litemall-wx/static/images/mobile.png
 delete mode 100644 litemall-wx/static/images/my.png
 delete mode 100644 litemall-wx/static/images/my@selected.png
 delete mode 100644 litemall-wx/static/images/new.png
 delete mode 100644 litemall-wx/static/images/pendpay.png
 delete mode 100644 litemall-wx/static/images/receive.png
 delete mode 100644 litemall-wx/static/images/send.png
 create mode 100644 litemall-wx/static/images/shouye.png
 create mode 100644 litemall-wx/static/images/shouyes.png
 create mode 100644 litemall-wx/static/images/xiaoxi.png
 create mode 100644 litemall-wx/static/images/xiaoxis.png
 create mode 100644 litemall-wx/utils/WxValidate.js

diff --git a/litemall-wx-xianiao b/litemall-wx-xianiao
deleted file mode 160000
index a75e89b9..00000000
--- a/litemall-wx-xianiao
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a75e89b9a3f944c9a3bf35f1de029b01da58d25f
diff --git a/litemall-wx/app.js b/litemall-wx/app.js
index d9b0acc9..eb3aae62 100644
--- a/litemall-wx/app.js
+++ b/litemall-wx/app.js
@@ -1,42 +1,96 @@
-var util = require('./utils/util.js');
-var api = require('./config/api.js');
-var user = require('./utils/user.js');
-
-App({
-  onLaunch: function() {
-    Promise.prototype.finally = function(callback){
-      let P = this.constructor;
-      return this.then(
-              value => {
-                   P.resolve(callback()).then(() => value)
-               },
-               reason => {
-                   P.resolve(callback()).then(() => { throw reason })
-               }
-           )
-    }
-    const updateManager = wx.getUpdateManager();
-    wx.getUpdateManager().onUpdateReady(function() {
-      wx.showModal({
-        title: '更新提示',
-        content: '新版本已经准备好，是否重启应用？',
-        success: function(res) {
-          if (res.confirm) {
-            // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-            updateManager.applyUpdate()
-          }
-        }
-      })
-    })
-  },
-  onShow: function(options) {
-    user.checkLogin().then(res => {
-      this.globalData.hasLogin = true;
-    }).catch(() => {
-      this.globalData.hasLogin = false;
-    });
-  },
-  globalData: {
-    hasLogin: false
-  }
+var util = require('./utils/util.js');
+var api = require('./config/api.js');
+var user = require('./utils/user.js');
+
+App({
+  onLaunch: function() {
+    Promise.prototype.finally = function(callback){
+      let P = this.constructor;
+      return this.then(
+              value => {
+                   P.resolve(callback()).then(() => value)
+               },
+               reason => {
+                   P.resolve(callback()).then(() => { throw reason })
+               }
+           )
+    }
+    const updateManager = wx.getUpdateManager();
+    wx.getUpdateManager().onUpdateReady(function() {
+      wx.showModal({
+        title: '更新提示',
+        content: '新版本已经准备好，是否重启应用？',
+        success: function(res) {
+          if (res.confirm) {
+            // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+            updateManager.applyUpdate()
+          }
+        }
+      })
+    })
+  },
+  getAuthKey: function () {
+    let that = this
+    if (wx.getStorageSync('userInfo') && wx.getStorageSync('token')) {
+      this.globalData.hasLogin = true;
+    } else {
+      this.globalData.hasLogin = false;
+      wx.navigateTo({
+        url: "/pages/auth/authorization/authorization"
+      });
+    }
+    // return new Promise(function (resolve, reject) {
+    //   user.checkLogin().then(res => {
+    //     that.globalData.hasLogin = true;
+    //     resolve(res);
+    //   }).catch(() => {
+    //     that.globalData.hasLogin = false;
+    //     reject('error');
+    //     // wx.navigateTo({
+    //     //   url: "/pages/auth/authorization/authorization"
+    //     // });
+    //   });
+    // });
+  },
+
+  // getAuthKey: function(){
+  //     user.checkLogin().then(res => {
+  //       this.globalData.hasLogin = true;
+  //     }).catch(() => {
+  //       this.globalData.hasLogin = false;
+  //       wx.navigateTo({
+  //         url: "/pages/auth/authorization/authorization"
+  //       });
+  //     });
+  // },
+  onShow: function(options) {
+    this.getAuthKey()
+    // if(wx.getStorageSync('userInfo') && wx.getStorageSync('token')){
+    //   wx.checkSession({
+    //     success () {
+    //       this.globalData.hasLogin = true;
+    //     },
+    //     fail () {
+    //       this.globalData.hasLogin = false;
+    //   wx.navigateTo({
+    //     url: "/pages/auth/authorization/authorization"
+    //   });
+    //     }
+    //   })
+    // }else{
+    //   this.globalData.hasLogin = false;
+    //   wx.navigateTo({
+    //     url: "/pages/auth/authorization/authorization"
+    //   });
+    // }
+    
+  },
+  onPageBack: function () {
+    // 页面切换时执行的处理逻辑
+    this.getAuthKey()
+    // 这里可以添加你想要执行的逻辑
+  },
+  globalData: {
+    hasLogin: false
+  }
 })
\ No newline at end of file
diff --git a/litemall-wx/app.json b/litemall-wx/app.json
index ae996af9..2e96d948 100644
--- a/litemall-wx/app.json
+++ b/litemall-wx/app.json
@@ -1,106 +1,99 @@
-{
-  "pages": [
-    "pages/index/index",
-    "pages/catalog/catalog",
-    "pages/newGoods/newGoods",
-    "pages/hotGoods/hotGoods",
-    "pages/ucenter/index/index",
-    "pages/ucenter/address/address",
-    "pages/ucenter/addressAdd/addressAdd",
-    "pages/ucenter/feedback/feedback",
-    "pages/ucenter/footprint/footprint",
-    "pages/ucenter/order/order",
-    "pages/ucenter/orderDetail/orderDetail",
-    "pages/ucenter/couponList/couponList",
-    "pages/ucenter/couponSelect/couponSelect",
-    "pages/ucenter/collect/collect",
-    "pages/auth/login/login",
-    "pages/auth/accountLogin/accountLogin",
-    "pages/auth/register/register",
-    "pages/auth/reset/reset",
-    "pages/payResult/payResult",
-    "pages/comment/comment",
-    "pages/commentPost/commentPost",
-    "pages/topic/topic",
-    "pages/topicComment/topicComment",
-    "pages/topicDetail/topicDetail",
-    "pages/topicCommentPost/topicCommentPost",
-    "pages/brand/brand",
-    "pages/brandDetail/brandDetail",
-    "pages/search/search",
-    "pages/category/category",
-    "pages/cart/cart",
-    "pages/checkout/checkout",
-    "pages/goods/goods",
-    "pages/about/about",
-    "pages/groupon/myGroupon/myGroupon",
-    "pages/groupon/grouponDetail/grouponDetail",
-    "pages/groupon/grouponList/grouponList",
-    "pages/coupon/coupon",
-    "pages/help/help",
-    "pages/ucenter/aftersale/aftersale",
-    "pages/ucenter/aftersaleList/aftersaleList",
-    "pages/ucenter/aftersaleDetail/aftersaleDetail"
-  ],
-  "window": {
-    "navigationBarBackgroundColor": "#FFFFFF",
-    "navigationBarTitleText": "litemall小程序商城",
-    "enablePullDownRefresh": false,
-    "navigationBarTextStyle": "black",
-    "backgroundColor": "#FFFFFF",
-    "backgroundTextStyle": "dark"
-  },
-  "tabBar": {
-    "backgroundColor": "#fafafa",
-    "borderStyle": "white",
-    "selectedColor": "#AB956D",
-    "color": "#666",
-    "list": [
-      {
-        "pagePath": "pages/index/index",
-        "iconPath": "static/images/home.png",
-        "selectedIconPath": "static/images/home@selected.png",
-        "text": "首页"
-      },
-      {
-        "pagePath": "pages/catalog/catalog",
-        "iconPath": "static/images/category.png",
-        "selectedIconPath": "static/images/category@selected.png",
-        "text": "分类"
-      },
-      {
-        "pagePath": "pages/cart/cart",
-        "iconPath": "static/images/cart.png",
-        "selectedIconPath": "static/images/cart@selected.png",
-        "text": "购物车"
-      },
-      {
-        "pagePath": "pages/ucenter/index/index",
-        "iconPath": "static/images/my.png",
-        "selectedIconPath": "static/images/my@selected.png",
-        "text": "个人"
-      }
-    ]
-  },
-  "networkTimeout": {
-    "request": 10000,
-    "connectSocket": 10000,
-    "uploadFile": 10000,
-    "downloadFile": 10000
-  },
-  "debug": true,
-  "usingComponents": {
-    "van-cell": "./lib/vant-weapp/cell/index",
-    "van-cell-group": "./lib/vant-weapp/cell-group/index",
-    "van-picker": "./lib/vant-weapp/picker/index",
-    "van-popup": "./lib/vant-weapp/popup/index",
-    "van-field": "./lib/vant-weapp/field/index",
-    "van-uploader": "./lib/vant-weapp/uploader/index",
-    "van-button": "./lib/vant-weapp/button/index",
-    "van-tag": "./lib/vant-weapp/tag/index",
-    "van-icon": "./lib/vant-weapp/icon/index",
-    "van-checkbox": "./lib/vant-weapp/checkbox/index",
-    "van-steps": "./lib/vant-weapp/steps/index"
-  },
-  "sitemapLocation": "sitemap.json"
+{
+  "pages": [
+    "pages/index/index",
+    "pages/news/news",
+    "pages/MessageDetails/MessageDetails",
+    "pages/ucenter/index/index",
+    "pages/ucenter/myposts/myposts",
+    "pages/ucenter/business/business",
+    "pages/ucenter/categorys/categorys",
+    "pages/ucenter/footprint/footprint",
+    "pages/ucenter/visitor/visitor",
+    "pages/ucenter/zbFootprint/zbFootprint",
+    "pages/ucenter/zbVisitor/zbVisitor",
+    "pages/ucenter/setup/setup",
+    "pages/ucenter/collect/collect",
+    "pages/auth/login/login",
+    "pages/auth/authorization/authorization",
+    "pages/auth/accountLogin/accountLogin",
+    "pages/auth/register/register",
+    "pages/auth/reset/reset",
+    "pages/goods/goods",
+    "pages/jobManagement/jobManagement",
+    "pages/details/details",
+    "pages/comDetails/comDetails",
+    "pages/anchor/anchor",
+    "pages/information/information",
+    "pages/postPosition/postPosition"
+  ],
+  "window": {
+    "navigationBarBackgroundColor": "#FFFFFF",
+    "navigationBarTitleText": "怡播间",
+    "enablePullDownRefresh": false,
+    "navigationBarTextStyle": "black",
+    "backgroundColor": "#FFFFFF",
+    "backgroundTextStyle": "dark"
+  },
+  "tabBar": {
+    "backgroundColor": "#ffffff",
+    "borderStyle": "white",
+    "selectedColor": "#AB956D",
+    "color": "#666",
+    "list": [
+      {
+        "pagePath": "pages/index/index",
+        "iconPath": "static/images/shouye.png",
+        "selectedIconPath": "static/images/shouyes.png",
+        "text": ""
+      },
+      {
+        "pagePath": "pages/news/news",
+        "iconPath": "static/images/xiaoxi.png",
+        "selectedIconPath": "static/images/xiaoxis.png",
+        "text": ""
+      },
+      {
+        "pagePath": "pages/ucenter/index/index",
+        "iconPath": "static/images/geren.png",
+        "selectedIconPath": "static/images/gerens.png",
+        "text": ""
+      }
+    ]
+  },
+  "networkTimeout": {
+    "request": 10000,
+    "connectSocket": 10000,
+    "uploadFile": 10000,
+    "downloadFile": 10000
+  },
+  "debug": true,
+  "usingComponents": {
+    "van-cell": "./lib/vant-weapp/cell/index",
+    "van-cell-group": "./lib/vant-weapp/cell-group/index",
+    "van-picker": "./lib/vant-weapp/picker/index",
+    "van-popup": "./lib/vant-weapp/popup/index",
+    "van-field": "./lib/vant-weapp/field/index",
+    "van-uploader": "./lib/vant-weapp/uploader/index",
+    "van-button": "./lib/vant-weapp/button/index",
+    "van-tag": "./lib/vant-weapp/tag/index",
+    "van-icon": "./lib/vant-weapp/icon/index",
+    "van-checkbox": "./lib/vant-weapp/checkbox/index",
+    "van-steps": "./lib/vant-weapp/steps/index",
+    "van-row": "./lib/vant-weapp/row/index",
+    "van-col": "./lib/vant-weapp/col/index",
+    "van-radio-group": "./lib/vant-weapp/radio-group/index",
+    "van-radio": "./lib/vant-weapp/radio/index",
+    "van-datetime-picker": "./lib/vant-weapp/datetime-picker/index",
+    "van-area": "./lib/vant-weapp/area/index",
+    "van-tabs": "./lib/vant-weapp/tabs/index",
+    "van-tab": "./lib/vant-weapp/tab/index"
+    
+  },
+  "lazyCodeLoading": "requiredComponents",
+  "sitemapLocation": "sitemap.json",
+  "permission": {
+    "scope.userLocation": {
+      "desc": "你的位置信息将用于新增地址时自动获取你的位置"
+    }
+  }
 }
\ No newline at end of file
diff --git a/litemall-wx/app.wxss b/litemall-wx/app.wxss
index fc5ee9e4..dadc57bc 100644
--- a/litemall-wx/app.wxss
+++ b/litemall-wx/app.wxss
@@ -1,19 +1,26 @@
-/**app.wxss**/
-
-.container {
-  box-sizing: border-box;
-  background-color: #f4f4f4;
-  font-family: PingFangSC-Light, helvetica, 'Heiti SC';
-}
-
-view, image, text, navigator {
-  box-sizing: border-box;
-  padding: 0;
-  margin: 0;
-}
-
-view, text {
-  font-family: PingFangSC-Light, helvetica, 'Heiti SC';
-  font-size: 29rpx;
-  color: #333;
-}
+/**app.wxss**/
+
+.container {
+  box-sizing: border-box;
+  background-color: #f4f4f4;
+  font-family: PingFangSC-Light, helvetica, 'Heiti SC';
+}
+
+view, image, text, navigator {
+  box-sizing: border-box;
+  padding: 0;
+  margin: 0;
+}
+
+view, text {
+  font-family: PingFangSC-Light, helvetica, 'Heiti SC';
+  font-size: 29rpx;
+  color: #333;
+}
+.van-picker-column__item--selected{
+  color: #703EDD !important;
+}
+.van-cell__left-icon-wrap{
+  position: relative;
+  top: -10rpx;
+}
\ No newline at end of file
diff --git a/litemall-wx/components/video-swiper/index.js b/litemall-wx/components/video-swiper/index.js
new file mode 100644
index 00000000..b1bec89d
--- /dev/null
+++ b/litemall-wx/components/video-swiper/index.js
@@ -0,0 +1,254 @@
+module.exports =
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Component({
+    options: {
+        addGlobalClass: true,
+        pureDataPattern: /^_/
+    },
+    properties: {
+        duration: {
+            type: Number,
+            value: 500
+        },
+        easingFunction: {
+            type: String,
+            value: 'default'
+        },
+        loop: {
+            type: Boolean,
+            value: true
+        },
+        videoList: {
+            type: Array,
+            value: [],
+            observer: function observer() {
+                var newVal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+
+                this._videoListChanged(newVal);
+            }
+        }
+    },
+    data: {
+        nextQueue: [],
+        prevQueue: [],
+        curQueue: [],
+        circular: false,
+        _last: 1,
+        _change: -1,
+        _invalidUp: 0,
+        _invalidDown: 0,
+        _videoContexts: []
+    },
+    lifetimes: {
+        attached: function attached() {
+            this.data._videoContexts = [wx.createVideoContext('video_0', this), wx.createVideoContext('video_1', this), wx.createVideoContext('video_2', this)];
+        }
+    },
+    methods: {
+        _videoListChanged: function _videoListChanged(newVal) {
+            var _this = this;
+
+            var data = this.data;
+            newVal.forEach(function (item) {
+                data.nextQueue.push(item);
+            });
+            if (data.curQueue.length === 0) {
+                this.setData({
+                    curQueue: data.nextQueue.splice(0, 3)
+                }, function () {
+                    _this.playCurrent(1);
+                });
+            }
+        },
+        animationfinish: function animationfinish(e) {
+            var _data = this.data,
+                _last = _data._last,
+                _change = _data._change,
+                curQueue = _data.curQueue,
+                prevQueue = _data.prevQueue,
+                nextQueue = _data.nextQueue;
+
+            var current = e.detail.current;
+            var diff = current - _last;
+            if (diff === 0) return;
+            this.data._last = current;
+            this.playCurrent(current);
+            this.triggerEvent('change', { activeId: curQueue[current].id });
+            var direction = diff === 1 || diff === -2 ? 'up' : 'down';
+            if (direction === 'up') {
+                if (this.data._invalidDown === 0) {
+                    var change = (_change + 1) % 3;
+                    var add = nextQueue.shift();
+                    var remove = curQueue[change];
+                    if (add) {
+                        prevQueue.push(remove);
+                        curQueue[change] = add;
+                        this.data._change = change;
+                    } else {
+                        this.data._invalidUp += 1;
+                    }
+                } else {
+                    this.data._invalidDown -= 1;
+                }
+            }
+            if (direction === 'down') {
+                if (this.data._invalidUp === 0) {
+                    var _change2 = _change;
+                    var _remove = curQueue[_change2];
+                    var _add = prevQueue.pop();
+                    if (_add) {
+                        curQueue[_change2] = _add;
+                        nextQueue.unshift(_remove);
+                        this.data._change = (_change2 - 1 + 3) % 3;
+                    } else {
+                        this.data._invalidDown += 1;
+                    }
+                } else {
+                    this.data._invalidUp -= 1;
+                }
+            }
+            var circular = true;
+            if (nextQueue.length === 0 && current !== 0) {
+                circular = false;
+            }
+            if (prevQueue.length === 0 && current !== 2) {
+                circular = false;
+            }
+            this.setData({
+                curQueue: curQueue,
+                circular: circular
+            });
+        },
+        playCurrent: function playCurrent(current) {
+            this.data._videoContexts.forEach(function (ctx, index) {
+                index !== current ? ctx.pause() : ctx.play();
+            });
+        },
+        onPlay: function onPlay(e) {
+            this.trigger(e, 'play');
+        },
+        onPause: function onPause(e) {
+            this.trigger(e, 'pause');
+        },
+        onEnded: function onEnded(e) {
+            this.trigger(e, 'ended');
+        },
+        onError: function onError(e) {
+            this.trigger(e, 'error');
+        },
+        onTimeUpdate: function onTimeUpdate(e) {
+            this.trigger(e, 'timeupdate');
+        },
+        onWaiting: function onWaiting(e) {
+            this.trigger(e, 'wait');
+        },
+        onProgress: function onProgress(e) {
+            this.trigger(e, 'progress');
+        },
+        onLoadedMetaData: function onLoadedMetaData(e) {
+            this.trigger(e, 'loadedmetadata');
+        },
+        trigger: function trigger(e, type) {
+            var ext = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+
+            var detail = e.detail;
+            var activeId = e.target.dataset.id;
+            this.triggerEvent(type, Object.assign(Object.assign(Object.assign({}, detail), { activeId: activeId }), ext));
+        }
+    }
+});
+
+/***/ })
+/******/ ]);
\ No newline at end of file
diff --git a/litemall-wx/components/video-swiper/index.json b/litemall-wx/components/video-swiper/index.json
new file mode 100644
index 00000000..b18bd46e
--- /dev/null
+++ b/litemall-wx/components/video-swiper/index.json
@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}
\ No newline at end of file
diff --git a/litemall-wx/components/video-swiper/index.wxml b/litemall-wx/components/video-swiper/index.wxml
new file mode 100644
index 00000000..50b2fd35
--- /dev/null
+++ b/litemall-wx/components/video-swiper/index.wxml
@@ -0,0 +1,38 @@
+<view class="container">
+  <swiper 
+    class="video-swiper" 
+    circular="{{circular}}" 
+    easing-function="{{easingFunction}}" 
+    vertical 
+    current="1"
+    duration="{{duration}}" 
+    bindanimationfinish="animationfinish">
+    <!-- curQueue 循环会导致video重新插入，objectFit 不可变更 -->
+    <swiper-item wx:for="{{curQueue}}" wx:key="*this">
+      <video 
+        id="video_{{index}}" 
+        class="video_item" 
+        loop="{{loop}}" 
+        enable-play-gesture 
+        enable-progress-gesture 
+        show-center-play-btn="{{false}}"
+        controls="{{false}}"
+        src="{{item.url}}" 
+        data-id="{{item.id}}"
+        object-fit="{{item.objectFit || 'cover'}}"
+        data-index="{{index}}"
+        bindplay="onPlay"
+        bindpause="onPause"
+        bindended="onEnded"
+        binderror="onError"
+        bindtimeupdate="onTimeUpdate"
+        bindwaiting="onWaiting"
+        bindprogress="onProgress"
+        bindloadedmetadata="onLoadedMetaData"
+      >
+      
+      </video>
+    </swiper-item>
+  </swiper>
+</view>
+
diff --git a/litemall-wx/components/video-swiper/index.wxss b/litemall-wx/components/video-swiper/index.wxss
new file mode 100644
index 00000000..ea7f6f2d
--- /dev/null
+++ b/litemall-wx/components/video-swiper/index.wxss
@@ -0,0 +1 @@
+.container{width:100%;height:100%}.video-swiper{width:100%;height:100%}.video_item{height:100%;width:100%}
\ No newline at end of file
diff --git a/litemall-wx/components/weui.wxss b/litemall-wx/components/weui.wxss
new file mode 100644
index 00000000..de361dee
--- /dev/null
+++ b/litemall-wx/components/weui.wxss
@@ -0,0 +1,6 @@
+/*!
+ * WeUI v2.0.1 (https://github.com/weui/weui-wxss)
+ * Copyright 2019 Tencent, Inc.
+ * Licensed under the MIT license
+ */
+ page{line-height:1.6;font-family:-apple-system-font,Helvetica Neue,sans-serif}icon{vertical-align:middle}.weui-cells{position:relative;margin-top:8px;background-color:#fff;line-height:1.41176471;font-size:17px}.weui-cells:before{top:0;border-top:1rpx solid rgba(0,0,0,.1)}.weui-cells:after,.weui-cells:before{content:" ";position:absolute;left:0;right:0;height:1px;color:rgba(0,0,0,.1)}.weui-cells:after{bottom:0;border-bottom:1rpx solid rgba(0,0,0,.1)}.weui-cells__title{margin-top:16px;margin-bottom:3px;padding-left:16px;padding-right:16px;color:rgba(0,0,0,.5);font-size:14px}.weui-cells_after-title{margin-top:0}.weui-cells__tips{margin-top:3px;color:rgba(0,0,0,.5);padding-left:16px;padding-right:16px;font-size:14px}.weui-cell{padding:16px;position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-cell:before{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1rpx solid rgba(0,0,0,.1);color:rgba(0,0,0,.1);left:16px}.weui-cell:first-child:before{display:none}.weui-cell_active{background-color:#ececec}.weui-cell_primary{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.weui-cell__bd{-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-cell__ft{text-align:right;color:rgba(0,0,0,.5)}.weui-cell_label-block,.weui-cell_wxss.weui-cell_wxss:before{display:block}.weui-cell_label-block .weui-label{width:auto;word-break:normal;-webkit-hyphens:auto;hyphens:auto}.weui-cell_access{color:inherit;-webkit-tap-highlight-color:rgba(0,0,0,0)}.weui-cell__ft_in-access{padding-right:16px;position:relative}.weui-cell__ft_in-access:after{content:" ";display:inline-block;height:8px;width:8px;border-width:2px 2px 0 0;border-color:#b2b2b2;border-style:solid;-webkit-transform:matrix(.71,.71,-.71,.71,0,0);transform:matrix(.71,.71,-.71,.71,0,0);position:relative;top:-2px;position:absolute;top:50%;margin-top:-5px;right:0}.weui-cell_link{color:#576b95;font-size:17px}.weui-cell_link:active{background-color:#ececec}.weui-cell_link:first-child:before{display:block}.weui-cells_checkbox .weui-check__label:before{left:55px}.weui-check__label:active{background-color:#ececec}.weui-check{position:absolute;left:-9999px}.weui-check__hd_in-checkbox{padding-right:16px}.weui-cell__ft_in-radio{padding-left:16px}.weui-cell_input{padding-top:0;padding-bottom:0}.weui-label{width:105px;word-wrap:break-word;word-break:break-all}.weui-input{height:1.41176471em;min-height:1.41176471em;line-height:1.41176471}.weui-textarea{display:block;width:100%}.weui-textarea-counter{color:rgba(0,0,0,.3);text-align:right}.weui-cell_warn,.weui-textarea-counter_warn{color:#fa5151}.weui-form-preview{position:relative;background-color:#fff}.weui-form-preview:before{top:0;border-top:1rpx solid rgba(0,0,0,.1)}.weui-form-preview:after,.weui-form-preview:before{content:" ";position:absolute;left:0;right:0;height:1px;color:rgba(0,0,0,.1)}.weui-form-preview:after{bottom:0;border-bottom:1rpx solid rgba(0,0,0,.1)}.weui-form-preview__value{font-size:14px}.weui-form-preview__value_in-hd{font-size:26px}.weui-form-preview__hd{position:relative;padding:16px;text-align:right;line-height:2.5em}.weui-form-preview__hd:after{content:" ";position:absolute;left:0;bottom:0;right:0;height:1px;border-bottom:1rpx solid rgba(0,0,0,.1);color:rgba(0,0,0,.1);left:16px}.weui-form-preview__bd{padding:16px;font-size:.9em;text-align:right;color:rgba(0,0,0,.5);line-height:2}.weui-form-preview__ft{position:relative;line-height:56px;display:-webkit-box;display:-webkit-flex;display:flex}.weui-form-preview__ft:after{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1rpx solid rgba(0,0,0,.1);color:rgba(0,0,0,.1)}.weui-form-preview__item{overflow:hidden}.weui-form-preview__label{float:left;margin-right:1em;min-width:4em;color:rgba(0,0,0,.5);text-align:justify;text-align-last:justify}.weui-form-preview__value{display:block;overflow:hidden;word-break:normal;word-wrap:break-word}.weui-form-preview__btn{position:relative;display:block;-webkit-box-flex:1;-webkit-flex:1;flex:1;color:#576b95;text-align:center;font-weight:700;font-size:17px}.weui-form-preview__btn:after{content:" ";position:absolute;left:0;top:0;width:1px;bottom:0;border-left:1rpx solid rgba(0,0,0,.1);color:rgba(0,0,0,.1)}.weui-form-preview__btn:first-child:after{display:none}.weui-form-preview__btn_active{background-color:#ececec}.weui-form-preview__btn_default{color:rgba(0,0,0,.9)}.weui-form-preview__btn_primary{color:#576b95}.weui-cell_select{padding:0;overflow:hidden}.weui-cell_select .weui-select{padding-right:30px}.weui-cell_select .weui-cell__bd:after{content:" ";width:12px;height:24px;-webkit-mask-position:0 0;mask-position:0 0;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:100%;mask-size:100%;background-color:currentColor;color:rgba(0,0,0,.3);-webkit-mask-image:url("data:image/svg+xml,%3Csvg%20width%3D%2212%22%20height%3D%2224%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M2.454%206.58l1.06-1.06%205.78%205.779a.996.996%200%20010%201.413l-5.78%205.779-1.06-1.061%205.425-5.425-5.425-5.424z%22%20fill%3D%22%23B2B2B2%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E");mask-image:url("data:image/svg+xml,%3Csvg%20width%3D%2212%22%20height%3D%2224%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M2.454%206.58l1.06-1.06%205.78%205.779a.996.996%200%20010%201.413l-5.78%205.779-1.06-1.061%205.425-5.425-5.425-5.424z%22%20fill%3D%22%23B2B2B2%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E");position:absolute;top:50%;right:16px;margin-top:-12px}.weui-select{-webkit-appearance:none;border:0;outline:0;background-color:transparent;width:100%;font-size:inherit;height:56px;line-height:56px;position:relative;z-index:1;padding-left:16px}.weui-cell_select-before{padding-right:16px}.weui-cell_select-before .weui-select{width:105px;box-sizing:border-box}.weui-cell_select-before .weui-cell__hd{position:relative}.weui-cell_select-before .weui-cell__hd:after{content:" ";position:absolute;right:0;top:0;width:1px;bottom:0;border-right:1rpx solid rgba(0,0,0,.1);color:rgba(0,0,0,.1)}.weui-cell_select-before .weui-cell__hd:before{content:" ";width:12px;height:24px;-webkit-mask-position:0 0;mask-position:0 0;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:100%;mask-size:100%;background-color:currentColor;color:rgba(0,0,0,.3);-webkit-mask-image:url("data:image/svg+xml,%3Csvg%20width%3D%2212%22%20height%3D%2224%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M2.454%206.58l1.06-1.06%205.78%205.779a.996.996%200%20010%201.413l-5.78%205.779-1.06-1.061%205.425-5.425-5.425-5.424z%22%20fill%3D%22%23B2B2B2%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E");mask-image:url("data:image/svg+xml,%3Csvg%20width%3D%2212%22%20height%3D%2224%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M2.454%206.58l1.06-1.06%205.78%205.779a.996.996%200%20010%201.413l-5.78%205.779-1.06-1.061%205.425-5.425-5.425-5.424z%22%20fill%3D%22%23B2B2B2%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E");position:absolute;top:50%;right:16px;margin-top:-12px}.weui-cell_select-before .weui-cell__bd{padding-left:16px}.weui-cell_select-before .weui-cell__bd:after{display:none}.weui-cell_select-before.weui-cell_access .weui-cell__hd{line-height:56px;padding-left:32px}.weui-cell_select-after{padding-left:16px}.weui-cell_select-after .weui-select{padding-left:0}.weui-cell_select-after.weui-cell_access .weui-cell__bd{line-height:56px}.weui-cell_vcode{padding-top:0;padding-right:0;padding-bottom:0}.weui-vcode-btn,.weui-vcode-img{margin-left:5px;height:3.29411765em;vertical-align:middle}.weui-vcode-btn{display:inline-block;padding:0 .6em 0 .7em;border-left:1rpx solid rgba(0,0,0,.1);line-height:3.29411765em;font-size:17px;color:#576b95;white-space:nowrap}button.weui-vcode-btn{min-height:0;background-color:transparent;border:0;outline:0}.weui-vcode-btn:active{color:#767676}.weui-cell_switch{padding-top:12px;padding-bottom:12px}.weui-uploader{-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-uploader__hd{padding-bottom:16px}.weui-uploader__overview{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-uploader__title{-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-uploader__tips{color:rgba(0,0,0,.3);font-size:14px;line-height:1.4;padding-top:4px}.weui-uploader__info{color:rgba(0,0,0,.3)}.weui-uploader__bd{margin-bottom:-8px;margin-right:-8px;overflow:hidden}.weui-uploader__file{float:left;margin-right:8px;margin-bottom:8px}.weui-uploader__img{display:block;width:96px;height:96px}.weui-uploader__file_status{position:relative}.weui-uploader__file_status:before{content:" ";position:absolute;top:0;right:0;bottom:0;left:0;background-color:rgba(0,0,0,.5)}.weui-uploader__file-content{position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);color:#fff}.weui-uploader__input-box{float:left;position:relative;margin-right:8px;margin-bottom:8px;width:96px;height:96px;box-sizing:border-box;background-color:#ededed}.weui-uploader__input-box:after,.weui-uploader__input-box:before{content:" ";position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);background-color:#a3a3a3}.weui-uploader__input-box:before{width:2px;height:32px}.weui-uploader__input-box:after{width:32px;height:2px}.weui-uploader__input-box:active{border-color:#8b8b8b}.weui-uploader__input-box:active:after,.weui-uploader__input-box:active:before{background-color:#8b8b8b}.weui-uploader__input{position:absolute;z-index:1;top:0;left:0;width:100%;height:100%;opacity:0}.weui-article{padding:24px 16px;padding:24px calc(16px + constant(safe-area-inset-right)) calc(24px + constant(safe-area-inset-bottom)) calc(16px + constant(safe-area-inset-left));padding:24px calc(16px + env(safe-area-inset-right)) calc(24px + env(safe-area-inset-bottom)) calc(16px + env(safe-area-inset-left));font-size:17px;color:rgba(0,0,0,.9)}.weui-article__section{margin-bottom:1.5em}.weui-article__h1{font-size:22px;font-weight:700;margin-bottom:.9em;line-height:1.4}.weui-article__h2{font-size:17px}.weui-article__h2,.weui-article__h3{font-weight:700;margin-bottom:.34em;line-height:1.4}.weui-article__h3{font-size:15px}.weui-article__p{margin:0 0 .8em}.weui-msg{padding-top:36px;padding:calc(36px + constant(safe-area-inset-top)) constant(safe-area-inset-right) constant(safe-area-inset-bottom) constant(safe-area-inset-left);padding:calc(36px + env(safe-area-inset-top)) env(safe-area-inset-right) env(safe-area-inset-bottom) env(safe-area-inset-left);text-align:center;line-height:1.4;min-height:100%;box-sizing:border-box;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;background-color:#fff}.weui-msg__link{color:#576b95;display:inline-block;vertical-align:baseline}.weui-msg__icon-area{margin-bottom:32px}.weui-msg__text-area{margin-bottom:32px;padding:0 32px;-webkit-box-flex:1;-webkit-flex:1;flex:1;line-height:1.6}.weui-msg__text-area:first-child{padding-top:96px}.weui-msg__title{margin-bottom:5px;font-weight:700;font-size:22px;word-wrap:break-word;word-break:break-all}.weui-msg__desc{font-size:17px;color:rgba(0,0,0,.9)}.weui-msg__desc,.weui-msg__desc-primary{word-wrap:break-word;word-break:break-all;margin-bottom:16px}.weui-msg__desc-primary{font-size:14px;color:rgba(0,0,0,.5)}.weui-msg__opr-area{margin-bottom:16px}.weui-msg__opr-area .weui-btn-area{margin:0 16px}.weui-msg__opr-area .weui-btn+.weui-btn{margin-bottom:16px}.weui-msg__opr-area:last-child{margin-bottom:96px}.weui-msg__opr-area+.weui-msg__extra-area{margin-top:48px}.weui-msg__tips-area{margin-bottom:16px;padding:0 40px}.weui-msg__opr-area+.weui-msg__tips-area{margin-bottom:48px}.weui-msg__tips-area:last-child{margin-bottom:64px}.weui-msg__extra-area,.weui-msg__tips{font-size:12px;color:rgba(0,0,0,.5)}.weui-msg__extra-area{position:static;margin-bottom:24px}.weui-cells__group_form:first-child .weui-cells__title{margin-top:0}.weui-cells__group_form .weui-cells__title{margin-top:24px;margin-bottom:8px;padding:0 32px}.weui-cells__group_form .weui-cell:before,.weui-cells__group_form .weui-cells:before{left:32px;right:32px}.weui-cells__group_form .weui-cells_checkbox .weui-check__label:before{left:72px}.weui-cells__group_form .weui-cells:after{left:32px;right:32px}.weui-cells__group_form .weui-cell{padding:16px 32px;color:rgba(0,0,0,.9)}.weui-cells__group_form .weui-cell__hd{padding-right:16px}.weui-cells__group_form .weui-cell__ft{padding-left:16px}.weui-cells__group_form .weui-cell_warn input{color:#fa5151}.weui-cells__group_form .weui-label{max-width:5em;margin-right:8px}.weui-cells__group_form .weui-cells__tips{margin-top:8px;padding:0 32px;color:rgba(0,0,0,.3)}.weui-cells__group_form .weui-cells__tips a{font-weight:700}.weui-cells__group_form .weui-cell_vcode{padding:12px 32px}.weui-cells__group_form .weui-vcode-btn{font-size:16px;padding:0 12px;margin-left:0;height:auto;width:auto;line-height:2em;color:#06ae56;background-color:#f2f2f2}.weui-cells__group_form .weui-vcode-btn:before{display:none}.weui-cells__group_form .weui-cell_select{padding:0}.weui-cells__group_form .weui-cell_select .weui-select{padding:0 32px}.weui-cells__group_form .weui-cell_select .weui-cell__bd:after{right:32px}.weui-cells__group_form .weui-cell_select-before .weui-label{margin-right:24px}.weui-cells__group_form .weui-cell_select-before .weui-select{padding-right:24px;box-sizing:initial}.weui-cells__group_form .weui-cell_select-after{padding-left:32px}.weui-cells__group_form .weui-cell_select-after .weui-select{padding-left:0}.weui-cells__group_form .weui-cell_switch{padding:12px 32px}.weui-cells__group_wxss.weui-cells__group_wxss .weui-cells__title{margin-top:24px}.weui-form{padding:56px 0 0;padding:calc(56px + constant(safe-area-inset-top)) constant(safe-area-inset-right) constant(safe-area-inset-bottom) constant(safe-area-inset-left);padding:calc(56px + env(safe-area-inset-top)) env(safe-area-inset-right) env(safe-area-inset-bottom) env(safe-area-inset-left);display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;min-height:100%;box-sizing:border-box;line-height:1.4;background-color:#fff}.weui-form a:not(.weui-btn){color:#576b95}.weui-form .weui-footer,.weui-form .weui-footer__link{font-size:12px}.weui-form .weui-agree{padding:0}.weui-form__text-area{padding:0 32px;color:rgba(0,0,0,.9);text-align:center}.weui-form__control-area{-webkit-box-flex:1;-webkit-flex:1;flex:1;margin:48px 0}.weui-form__extra-area,.weui-form__tips-area{margin-bottom:24px;text-align:center}.weui-form__opr-area{margin-bottom:64px}.weui-form__opr-area:last-child{margin-bottom:96px}.weui-form__title{font-size:22px;font-weight:700;line-height:1.36}.weui-form__desc{font-size:17px;margin-top:16px}.weui-form__tips{color:rgba(0,0,0,.5);font-size:12px}.weui-flex{display:-webkit-box;display:-webkit-flex;display:flex}.weui-flex__item{-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-btn+.weui-btn{margin-top:16px}.weui-btn.weui-btn_inline+.weui-btn.weui-btn_inline{margin-top:auto;margin-left:16px}.weui-btn-area{margin:48px 16px 8px}.weui-btn-area_inline{display:-webkit-box;display:-webkit-flex;display:flex}.weui-btn-area_inline .weui-btn{margin-top:auto;margin-right:16px;width:100%;-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-btn-area_inline .weui-btn:last-child{margin-right:0}.weui-agree{display:block;padding:.5em 15px;font-size:13px}.weui-agree__text{color:rgba(0,0,0,.5)}.weui-agree__link{display:inline;color:#576b95}.weui-agree__checkbox{position:absolute;left:-9999px}.weui-agree__checkbox-icon{position:relative;top:2px;display:inline-block;border:1px solid #d1d1d1;background-color:#fff;border-radius:3px;width:11px;height:11px}.weui-agree__checkbox-icon-check{position:absolute;top:1px;left:1px}.weui-footer{color:rgba(0,0,0,.3);font-size:14px;line-height:1.4;text-align:center}.weui-footer_fixed-bottom{position:fixed;bottom:16px;bottom:calc(16px + constant(safe-area-inset-bottom));bottom:calc(16px + env(safe-area-inset-bottom));left:0;right:0}.weui-footer__links{font-size:0}.weui-footer__link{display:inline-block;vertical-align:top;margin:0 8px;position:relative;font-size:14px;color:#576b95}.weui-footer__link:before{content:" ";position:absolute;left:0;top:0;width:1px;bottom:0;border-left:1rpx solid #c7c7c7;color:#c7c7c7;left:-8px;top:.36em;bottom:.36em}.weui-footer__link:first-child:before{display:none}.weui-footer__text{padding:0 .34em;font-size:12px}.weui-grids{border-top:1rpx solid rgba(0,0,0,.1);border-left:1rpx solid rgba(0,0,0,.1);overflow:hidden}.weui-grid{position:relative;float:left;padding:20px 10px;width:33.33333333%;box-sizing:border-box;border-right:1rpx solid rgba(0,0,0,.1);border-bottom:1rpx solid rgba(0,0,0,.1)}.weui-grid_active{background-color:#ececec}.weui-grid__icon{display:block;width:28px;height:28px;margin:0 auto}.weui-grid__label{margin-top:5px;display:block;text-align:center;color:rgba(0,0,0,.9);font-size:14px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.weui-loading{margin:0 5px;width:20px;height:20px;display:inline-block;vertical-align:middle;-webkit-animation:a 1s steps(12) infinite;animation:a 1s steps(12) infinite;background:transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;background-size:100%}.weui-loading.weui-loading_transparent{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect xmlns='http://www.w3.org/2000/svg' width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.56)' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.5)' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.43)' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.38)' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.32)' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.28)' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.25)' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.2)' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.17)' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.14)' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.1)' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.03)' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E")}@-webkit-keyframes a{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes a{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.wx_dot_loading,.wx_dot_loading:after,.wx_dot_loading:before{display:inline-block;vertical-align:middle;width:6px;height:6px;border-radius:50%;background-color:rgba(0,0,0,.3);font-size:0;-webkit-animation:c 1.6s step-start infinite;animation:c 1.6s step-start infinite}.wx_dot_loading{position:relative}.wx_dot_loading:before{content:"";position:absolute;left:-12px;background-color:rgba(0,0,0,.1);-webkit-animation:b 1.6s step-start infinite;animation:b 1.6s step-start infinite}.wx_dot_loading:after{content:"";position:absolute;right:-12px;background-color:rgba(0,0,0,.5);-webkit-animation:d 1.6s step-start infinite;animation:d 1.6s step-start infinite}@-webkit-keyframes b{0%,to{background-color:rgba(0,0,0,.1)}30%{background-color:rgba(0,0,0,.5)}60%{background-color:rgba(0,0,0,.3)}}@keyframes b{0%,to{background-color:rgba(0,0,0,.1)}30%{background-color:rgba(0,0,0,.5)}60%{background-color:rgba(0,0,0,.3)}}@-webkit-keyframes c{0%,to{background-color:rgba(0,0,0,.3)}30%{background-color:rgba(0,0,0,.1)}60%{background-color:rgba(0,0,0,.5)}}@keyframes c{0%,to{background-color:rgba(0,0,0,.3)}30%{background-color:rgba(0,0,0,.1)}60%{background-color:rgba(0,0,0,.5)}}@-webkit-keyframes d{0%,to{background-color:rgba(0,0,0,.5)}30%{background-color:rgba(0,0,0,.3)}60%{background-color:rgba(0,0,0,.1)}}@keyframes d{0%,to{background-color:rgba(0,0,0,.5)}30%{background-color:rgba(0,0,0,.3)}60%{background-color:rgba(0,0,0,.1)}}.wx_dot_loading_white{background-color:hsla(0,0%,100%,.3);-webkit-animation:f 1.6s step-start infinite;animation:f 1.6s step-start infinite}.wx_dot_loading_white:before{background-color:hsla(0,0%,100%,.5);-webkit-animation:e 1.6s step-start infinite;animation:e 1.6s step-start infinite}.wx_dot_loading_white:after{background-color:hsla(0,0%,100%,.1);-webkit-animation:g 1.6s step-start infinite;animation:g 1.6s step-start infinite}@-webkit-keyframes e{0%,to{background-color:hsla(0,0%,100%,.5)}30%{background-color:hsla(0,0%,100%,.1)}60%{background-color:hsla(0,0%,100%,.3)}}@keyframes e{0%,to{background-color:hsla(0,0%,100%,.5)}30%{background-color:hsla(0,0%,100%,.1)}60%{background-color:hsla(0,0%,100%,.3)}}@-webkit-keyframes f{0%,to{background-color:hsla(0,0%,100%,.3)}30%{background-color:hsla(0,0%,100%,.5)}60%{background-color:hsla(0,0%,100%,.1)}}@keyframes f{0%,to{background-color:hsla(0,0%,100%,.3)}30%{background-color:hsla(0,0%,100%,.5)}60%{background-color:hsla(0,0%,100%,.1)}}@-webkit-keyframes g{0%,to{background-color:hsla(0,0%,100%,.1)}30%{background-color:hsla(0,0%,100%,.3)}60%{background-color:hsla(0,0%,100%,.5)}}@keyframes g{0%,to{background-color:hsla(0,0%,100%,.1)}30%{background-color:hsla(0,0%,100%,.3)}60%{background-color:hsla(0,0%,100%,.5)}}.weui-loadmore{width:65%;margin:1.5em auto;line-height:1.6em;font-size:14px;text-align:center}.weui-loadmore__tips{display:inline-block;vertical-align:middle}.weui-loadmore_line{border-top:1px solid rgba(0,0,0,.1);margin-top:2.4em}.weui-loadmore__tips_in-line{position:relative;top:-.9em;padding:0 .55em;background-color:#fff;color:rgba(0,0,0,.5)}.weui-loadmore__tips_in-dot{position:relative;padding:0 .16em;width:4px;height:1.6em}.weui-loadmore__tips_in-dot:before{content:" ";position:absolute;top:50%;left:50%;margin-top:-1px;margin-left:-2px;width:4px;height:4px;border-radius:50%;background-color:rgba(0,0,0,.1)}.weui-badge{display:inline-block;padding:.15em .4em;min-width:8px;border-radius:18px;background-color:#fa5151;color:#fff;line-height:1.2;text-align:center;font-size:12px;vertical-align:middle}.weui-badge_dot{padding:.4em;min-width:0}.weui-panel{background-color:#fff;margin-top:10px;position:relative;overflow:hidden}.weui-panel:first-child{margin-top:0}.weui-panel:before{top:0;border-top:1rpx solid rgba(0,0,0,.1)}.weui-panel:after,.weui-panel:before{content:" ";position:absolute;left:0;right:0;height:1px;color:rgba(0,0,0,.1)}.weui-panel:after{bottom:0;border-bottom:1rpx solid rgba(0,0,0,.1)}.weui-panel__hd{padding:16px 16px 13px;color:rgba(0,0,0,.9);font-size:15px;font-weight:700;position:relative}.weui-panel__hd:after{content:" ";position:absolute;left:0;bottom:0;right:0;height:1px;border-bottom:1rpx solid rgba(0,0,0,.1);color:rgba(0,0,0,.1);left:16px}.weui-media-box{padding:16px;position:relative}.weui-media-box:before{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1rpx solid rgba(0,0,0,.1);color:rgba(0,0,0,.1);left:1s6px}.weui-media-box:first-child:before{display:none}.weui-media-box__title{font-weight:400;font-size:17px;color:rgba(0,0,0,.9);width:auto;white-space:nowrap;word-wrap:normal;word-wrap:break-word;word-break:break-all}.weui-media-box__desc,.weui-media-box__title{line-height:1.4;overflow:hidden;text-overflow:ellipsis}.weui-media-box__desc{color:rgba(0,0,0,.5);font-size:14px;padding-top:4px;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}.weui-media-box__info{margin-top:16px;padding-bottom:4px;font-size:13px;color:#cecece;line-height:1em;list-style:none;overflow:hidden}.weui-media-box__info__meta{float:left;padding-right:1em}.weui-media-box__info__meta_extra{padding-left:1em;border-left:1px solid #cecece}.weui-media-box__title_in-text{margin-bottom:8px}.weui-media-box_appmsg{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-media-box__thumb{width:100%;height:100%;vertical-align:top}.weui-media-box__hd_in-appmsg{margin-right:16px;width:60px;height:60px;line-height:60px;text-align:center}.weui-media-box__bd_in-appmsg{-webkit-box-flex:1;-webkit-flex:1;flex:1;min-width:0}.weui-media-box_small-appmsg{padding:0}.weui-cells_in-small-appmsg{margin-top:0}.weui-cells_in-small-appmsg:before{display:none}.weui-progress{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-progress__bar{-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-progress__opr{margin-left:15px;font-size:0}.weui-navbar{display:-webkit-box;display:-webkit-flex;display:flex;position:relative;z-index:500;background-color:#fff;border-bottom:1rpx solid rgba(0,0,0,.1);padding-top:constant(safe-area-inset-top);padding-top:env(safe-area-inset-top)}.weui-navbar+.weui-tab__panel{padding-bottom:constant(safe-area-inset-bottom);padding-bottom:env(safe-area-inset-bottom)}.weui-navbar__item{position:relative;display:block;-webkit-box-flex:1;-webkit-flex:1;flex:1;padding:16px;padding:calc(16px + constant(safe-area-inset-top)) 16px 16px;padding:calc(16px + env(safe-area-inset-top)) 16px 16px;text-align:center;font-size:17px;line-height:1.41176471}.weui-navbar__item:after{content:" ";position:absolute;right:0;top:0;width:1px;bottom:0;border-right:1rpx solid rgba(0,0,0,.1);color:rgba(0,0,0,.1)}.weui-navbar__item.weui-bar__item_on{background-color:#ececec}.weui-navbar__item:first-child{padding-left:calc(16px + constant(safe-area-inset-left));padding-left:calc(16px + env(safe-area-inset-left))}.weui-navbar__item:last-child{padding-right:calc(16px + constant(safe-area-inset-right));padding-right:calc(16px + env(safe-area-inset-right))}.weui-navbar__item:last-child:after{display:none}.weui-navbar__slider{position:absolute;content:" ";left:0;bottom:0;width:6em;height:2px;background-color:#07c160;-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s;display:none}.weui-navbar__title{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1}.weui-tabbar{display:-webkit-box;display:-webkit-flex;display:flex;position:relative;z-index:500;background-color:#f7f7f7}.weui-tabbar:before{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1rpx solid rgba(0,0,0,.1);color:rgba(0,0,0,.1)}.weui-tabbar__item{display:block;-webkit-box-flex:1;-webkit-flex:1;flex:1;padding:8px 0 4px;padding-bottom:calc(8px + constant(safe-area-inset-bottom));padding-bottom:calc(8px + env(safe-area-inset-bottom));font-size:0;color:rgba(0,0,0,.5);text-align:center;-webkit-tap-highlight-color:rgba(0,0,0,0)}.weui-tabbar__item:first-child{padding-left:constant(safe-area-inset-left);padding-left:env(safe-area-inset-left)}.weui-tabbar__item:last-child{padding-right:constant(safe-area-inset-right);padding-right:env(safe-area-inset-right)}.weui-tabbar__item.weui-bar__item_on .weui-tabbar__icon,.weui-tabbar__item.weui-bar__item_on .weui-tabbar__icon>i,.weui-tabbar__item.weui-bar__item_on .weui-tabbar__label{color:#07c160}.weui-tabbar__icon{display:inline-block;width:28px;height:28px;margin-bottom:2px}.weui-tabbar__icon>i,i.weui-tabbar__icon{font-size:24px;color:rgba(0,0,0,.5)}.weui-tabbar__icon image{width:100%;height:100%}.weui-tabbar__label{color:rgba(0,0,0,.9);font-size:10px;line-height:1.4}.weui-tab{display:-webkit-box;display:-webkit-flex;display:flex;height:100%;box-sizing:border-box;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column}.weui-tab__panel{box-sizing:border-box;-webkit-box-flex:1;-webkit-flex:1;flex:1;overflow:auto;-webkit-overflow-scrolling:touch}:host{width:100%}.weui-slideview{overflow:hidden;position:relative}.weui-slideview__left{position:relative;z-index:10}.weui-slideview__right{position:absolute;z-index:1;left:100%;top:0;height:100%}.weui-slideview__btn__wrp{position:absolute;left:0;bottom:0;text-align:center;min-width:69px;height:100%;white-space:nowrap}.weui-slideview__btn{color:#fff;padding:0 17px}.weui-slideview__btn-group_default .weui-slideview__btn{background:#c7c7cc}.weui-slideview__btn-group_default~.weui-slideview__btn-group_default:before{content:" ";position:absolute;left:0;top:0;width:1px;bottom:0;border-left:1rpx solid #fff;color:#fff}.weui-slideview__btn-group_default:first-child:before{display:none}.weui-slideview__btn-group_warn .weui-slideview__btn{background:#fe3b30}.weui-slideview__btn-group_warn~.weui-slideview__btn-group_warn:before{content:" ";position:absolute;left:0;top:0;width:1px;bottom:0;border-left:1rpx solid #fff;color:#fff}.weui-slideview__btn-group_warn:first-child:before{display:none}.weui-slideview_icon .weui-slideview__btn__wrp{background:transparent;font-size:0}.weui-slideview_icon .weui-slideview__btn__wrp:after{content:"";width:0;height:100%;vertical-align:middle;display:inline-block}.weui-slideview_icon .weui-slideview__btn__wrp:first-child{padding-left:16px}.weui-slideview_icon .weui-slideview__btn__wrp:last-child{padding-right:8px}.weui-slideview_icon .weui-slideview__btn{width:48px;height:48px;line-height:48px;padding:0;display:inline-block;vertical-align:middle;border-radius:50%;background-color:#fff}.weui-slideview_icon .weui-slideview__btn__icon{display:inline-block;vertical-align:middle;width:22px;height:22px}.weui-gallery{position:fixed;top:0;right:0;bottom:0;left:0;background-color:#000;z-index:1000;-webkit-flex-direction:column;-webkit-box-orient:vertical;-webkit-box-direction:normal;flex-direction:column;-webkit-flex-wrap:nowrap;flex-wrap:nowrap;opacity:0;visibility:hidden;-webkit-transition:opacity .3s;transition:opacity .3s}.weui-gallery_show{display:-webkit-box;display:-webkit-flex;display:flex;visibility:visible;opacity:1}.weui-gallery__img__wrp{-webkit-box-flex:1;-webkit-flex:1;flex:1;position:relative;font-size:0}.weui-gallery__img{background:50% no-repeat;background-size:contain;position:absoulte;width:100%;height:100%}.weui-gallery__opr{background-color:#0d0d0d;color:#fff;line-height:60px;min-height:60px;padding-bottom:constant(safe-area-inset-bottom);padding-bottom:env(safe-area-inset-bottom);text-align:center}.weui-gallery__opr navigator{color:#fff}.weui-gallery__del{display:block}.weui-gallery__info{color:#fff;font-size:17px;line-height:60px;min-height:60px;text-align:center}.weui-search-bar{position:relative;padding:8px;display:-webkit-box;display:-webkit-flex;display:flex;box-sizing:border-box;background-color:#ededed;-webkit-text-size-adjust:100%;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-icon-search{margin-right:8px;font-size:14px;vertical-align:top;margin-top:.64em;height:1em;line-height:1em}.weui-icon-search_in-box{position:absolute;left:12px;top:50%;margin-top:-8px}.weui-search-bar__text{display:inline-block;font-size:14px;vertical-align:top}.weui-search-bar__form{position:relative;-webkit-box-flex:1;-webkit-flex:auto;flex:auto;border-radius:4px;background:#fff}.weui-search-bar__box{position:relative;padding-left:32px;padding-right:32px;width:100%;box-sizing:border-box;z-index:1}.weui-search-bar__input{height:32px;line-height:32px;font-size:14px;caret-color:#07c160}.weui-icon-clear{position:absolute;top:0;right:0;bottom:0;padding:0 12px;font-size:0}.weui-icon-clear:after{content:"";height:100%;vertical-align:middle;display:inline-block;width:0;overflow:hidden}.weui-search-bar__label{position:absolute;top:0;right:0;bottom:0;left:0;z-index:2;border-radius:4px;text-align:center;color:rgba(0,0,0,.5);background:#fff;line-height:32px}.weui-search-bar__cancel-btn{margin-left:8px;line-height:32px;color:#576b95;white-space:nowrap}icon[type=success]:after,icon[type=success]:before{color:#07c160!important}.weui-mask{background:rgba(0,0,0,.6)}.weui-mask,.weui-mask_transparent{position:fixed;z-index:1000;top:0;right:0;left:0;bottom:0}.weui-dialog__wrp{position:fixed;z-index:5000;top:16px;bottom:16px;left:16px;right:16px;text-align:center;font-size:0;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.weui-dialog__wrp .weui-dialog{max-height:100%}.weui-dialog{background-color:#fff;text-align:center;border-radius:12px;overflow:hidden;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-flex-direction:column;-webkit-box-orient:vertical;-webkit-box-direction:normal;flex-direction:column;max-height:90%}.weui-dialog__hd{padding:32px 24px 16px}.weui-dialog__title{font-weight:700;font-size:17px;line-height:1.4}.weui-dialog__bd{-webkit-box-flex:1;-webkit-flex:1;flex:1;overflow-y:auto;-webkit-overflow-scrolling:touch;padding:0 24px;margin-bottom:32px;min-height:40px;font-size:17px;line-height:1.4;overflow-wrap:break-word;-webkit-hyphens:auto;hyphens:auto;color:rgba(0,0,0,.5)}.weui-dialog__bd:first-child{padding:32px 24px 0;font-weight:700;color:rgba(0,0,0,.9);-webkit-flex-direction:column;-webkit-box-orient:vertical;-webkit-box-direction:normal;flex-direction:column;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.weui-dialog__bd:first-child,.weui-dialog__ft{display:-webkit-box;display:-webkit-flex;display:flex}.weui-dialog__ft{position:relative;line-height:64px;min-height:64px;font-size:17px}.weui-dialog__ft:after{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1rpx solid rgba(0,0,0,.1);color:rgba(0,0,0,.1)}.weui-dialog__btn{display:block;-webkit-box-flex:1;-webkit-flex:1;flex:1;color:#576b95;font-weight:700;text-decoration:none;-webkit-tap-highlight-color:rgba(0,0,0,0);position:relative}.weui-dialog__btn:active{background-color:#ececec}.weui-dialog__btn:after{content:" ";position:absolute;left:0;top:0;width:1px;bottom:0;border-left:1rpx solid rgba(0,0,0,.1);color:rgba(0,0,0,.1)}.weui-dialog__btn:first-child:after{display:none}.weui-dialog__btn_default{color:rgba(0,0,0,.9)}@media screen and (min-width:352px){.weui-dialog{width:320px;margin:0 auto}}.weui-actionsheet{position:fixed;left:0;bottom:0;-webkit-transform:translateY(100%);transform:translateY(100%);-webkit-backface-visibility:hidden;backface-visibility:hidden;z-index:5000;width:100%;background-color:#eae7e8;-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s;border-top-left-radius:12px;border-top-right-radius:12px;overflow:hidden}.weui-actionsheet__title{position:relative;height:56px;padding:0 24px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;text-align:center;font-size:12px;color:rgba(0,0,0,.5);line-height:1.4;background:#fff}.weui-actionsheet__title:before{content:" ";position:absolute;left:0;bottom:0;right:0;height:1px;border-bottom:1rpx solid rgba(0,0,0,.1);color:rgba(0,0,0,.1)}.weui-actionsheet__title .weui-actionsheet__title-text{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}.weui-actionsheet__menu{color:rgba(0,0,0,.9);background-color:#fff}.weui-actionsheet__action{margin-top:8px;background-color:#fff;padding-bottom:constant(safe-area-inset-bottom);padding-bottom:env(safe-area-inset-bottom)}.weui-actionsheet__cell{position:relative;padding:16px;text-align:center;font-size:17px;line-height:1.41176471}.weui-actionsheet__cell:before{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1rpx solid rgba(0,0,0,.1);color:rgba(0,0,0,.1)}.weui-actionsheet__cell:active{background-color:#ececec}.weui-actionsheet__cell:first-child:before{display:none}.weui-actionsheet__cell_warn{color:#fa5151}.weui-skin_android .weui-actionsheet{position:fixed;left:50%;top:50%;bottom:auto;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:274px;box-sizing:border-box;-webkit-backface-visibility:hidden;backface-visibility:hidden;background:transparent;-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s;border-radius:2px}.weui-skin_android .weui-actionsheet__action{display:none}.weui-skin_android .weui-actionsheet__menu{border-radius:2px;box-shadow:0 6px 30px 0 rgba(0,0,0,.1)}.weui-skin_android .weui-actionsheet__cell{padding:16px;font-size:17px;line-height:1.41176471;color:rgba(0,0,0,.9);text-align:left}.weui-skin_android .weui-actionsheet__cell:first-child{border-top-left-radius:2px;border-top-right-radius:2px}.weui-skin_android .weui-actionsheet__cell:last-child{border-bottom-left-radius:2px;border-bottom-right-radius:2px}.weui-actionsheet_toggle{-webkit-transform:translate(0);transform:translate(0)}.weui-half-screen-dialog{position:fixed;left:0;right:0;bottom:0;max-height:75%;z-index:5000;line-height:1.4;background-color:#fff;border-top-left-radius:12px;border-top-right-radius:12px;overflow:hidden;padding:0 24px;padding:0 calc(24px + constant(safe-area-inset-right)) constant(safe-area-inset-bottom) calc(24px + constant(safe-area-inset-left));padding:0 calc(24px + env(safe-area-inset-right)) env(safe-area-inset-bottom) calc(24px + env(safe-area-inset-left))}.weui-half-screen-dialog__hd{font-size:8px;height:8em;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-half-screen-dialog__hd .weui-icon-btn{position:absolute;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.weui-half-screen-dialog__hd__side{position:relative;left:-8px}.weui-half-screen-dialog__hd__main{-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-half-screen-dialog__hd__side+.weui-half-screen-dialog__hd__main{text-align:center;padding:0 40px}.weui-half-screen-dialog__hd__main+.weui-half-screen-dialog__hd__side{right:-8px;left:auto}.weui-half-screen-dialog__hd__main+.weui-half-screen-dialog__hd__side .weui-icon-btn{right:0}.weui-half-screen-dialog__title{display:block;color:rgba(0,0,0,.9);font-weight:700;font-size:15px}.weui-half-screen-dialog__subtitle{display:block;color:rgba(0,0,0,.5);font-size:10px}.weui-half-screen-dialog__bd{word-wrap:break-word;-webkit-hyphens:auto;hyphens:auto;overflow-y:auto}.weui-half-screen-dialog__desc{padding-top:4px;font-size:17px;font-weight:700;color:rgba(0,0,0,.9);line-height:1.4}.weui-half-screen-dialog__tips{padding-top:16px;font-size:14px;color:rgba(0,0,0,.3);line-height:1.4}.weui-half-screen-dialog__ft{padding:40px 24px 32px;text-align:center}.weui-half-screen-dialog__ft .weui-btn:nth-last-child(n+2),.weui-half-screen-dialog__ft .weui-btn:nth-last-child(n+2)+.weui-btn{display:inline-block;vertical-align:top;margin:0 8px;width:120px}.weui-icon-btn{background-color:transparent;background-repeat:no-repeat;background-position:50% 50%;background-size:100%;border:0;outline:0;font-size:0}.weui-icon-btn_goback{width:12px;height:24px;background-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='24' viewBox='0 0 12 24'%3E  %3Cg fill='none' fill-rule='evenodd' transform='translate(-16 -20)'%3E    %3Cpath fill='%23FFF' d='M0 12C0 5.373 5.367 0 12 0h390c6.628 0 12 5.374 12 12v52H0V12z'/%3E    %3Cpath fill='%23000' fill-opacity='.9' d='M26 39.438L24.955 40.5l-7.666-7.79a1.02 1.02 0 0 1 0-1.42l7.666-7.79L26 24.563 18.682 32 26 39.438z'/%3E  %3C/g%3E%3C/svg%3E")}.weui-icon-btn_close{width:24px;height:24px;background-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='24' height='24' viewBox='0 0 24 24'%3E  %3Cdefs%3E    %3Cpath id='33cf2e7b-22e9-42d7-9c56-a9f4a4e03565-a' d='M8 6.943L1.807.75.75 1.807 6.943 8 .75 14.193l1.057 1.057L8 9.057l6.193 6.193 1.057-1.057L9.057 8l6.193-6.193L14.193.75z'/%3E  %3C/defs%3E  %3Cg fill='none' fill-rule='evenodd' transform='translate(-16 -20)'%3E    %3Cpath fill='%23FFF' d='M0 12C0 5.373 5.367 0 12 0h390c6.628 0 12 5.374 12 12v52H0V12z'/%3E    %3Cuse fill='%23000' fill-opacity='.9' transform='translate(20 24)' xlink:href='%2333cf2e7b-22e9-42d7-9c56-a9f4a4e03565-a'/%3E  %3C/g%3E%3C/svg%3E")}.weui-icon-btn_more{width:24px;height:24px;background-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E  %3Cg fill='none' fill-rule='evenodd' transform='translate(-374 -20)'%3E    %3Cpath fill='%23FFF' d='M0 12C0 5.373 5.367 0 12 0h390c6.628 0 12 5.374 12 12v52H0V12z'/%3E    %3Cpath fill='%23000' fill-opacity='.9' d='M380.75 32a1.75 1.75 0 1 1-3.5 0 1.75 1.75 0 0 1 3.5 0zm5.25-1.75a1.75 1.75 0 1 1 0 3.5 1.75 1.75 0 0 1 0-3.5zm7 0a1.75 1.75 0 1 1 0 3.5 1.75 1.75 0 0 1 0-3.5z'/%3E  %3C/g%3E%3C/svg%3E")}.weui-toptips{position:fixed;-webkit-transform:translateZ(0) translateY(-108%);transform:translateZ(0) translateY(-108%);text-align:center;top:8px;left:16px;right:16px;border-radius:4px;padding:8px;-webkit-border-radius:4px;color:hsla(0,0%,100%,.9);font-size:17px;line-height:1.4;background:rgba(250,81,81,.9);z-index:5000;word-wrap:break-word;word-break:break-all;-webkit-transition:all .4s ease-in-out;transition:all .4s ease-in-out}.weui-toptips_show{-webkit-transform:translateZ(0) translateY(0);transform:translateZ(0) translateY(0);opacity:1}.weui-toptips_warn{background-color:#fa5151}.weui-toptips_success{background-color:#09bb07}.weui-toptips_error{background-color:#fa5151}.weui-toptips_info{background-color:#10aeff}page{--height:44px;--right:190rpx}.weui-navigation-bar{overflow:hidden}.weui-navigation-bar .android{--height:48px;--right:222rpx}.weui-navigation-bar__inner{position:fixed;top:0;left:0;z-index:5001;height:var(--height);padding-right:var(--right);width:calc(100% - var(--right))}.weui-navigation-bar__inner,.weui-navigation-bar__inner .weui-navigation-bar__left{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-navigation-bar__inner .weui-navigation-bar__left{position:relative;width:var(--right);padding-left:16px;-webkit-box-pack:center}.weui-navigation-bar__inner .weui-navigation-bar__left .weui-navigation-bar__btn{display:inline-block;vertical-align:middle;background-repeat:no-repeat}.weui-navigation-bar__inner .weui-navigation-bar__left .weui-navigation-bar__btn_goback{font-size:12px;width:1em;height:2em;background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='24' viewBox='0 0 12 24'%3E  %3Cpath fill-opacity='.9' fill-rule='evenodd' d='M10 19.438L8.955 20.5l-7.666-7.79a1.02 1.02 0 0 1 0-1.42L8.955 3.5 10 4.563 2.682 12 10 19.438z'/%3E%3C/svg%3E");background-position:50% 50%;background-size:cover}.weui-navigation-bar__inner .weui-navigation-bar__left .weui-navigation-bar__btn_goback:active{opacity:.5}.weui-navigation-bar__inner .weui-navigation-bar__center{font-size:17px;text-align:center;position:relative;-webkit-box-flex:1;-webkit-flex:1;flex:1;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.weui-navigation-bar__inner .weui-navigation-bar__loading{font-size:0}.weui-navigation-bar__inner .weui-navigation-bar__loading .weui-loading{margin-left:0}.weui-navigation-bar__inner .weui-navigation-bar__right{margin-right:16px}.weui-navigation-bar__placeholder{height:var(--height);background:#f8f8f8;position:relative;z-index:50}
\ No newline at end of file
diff --git a/litemall-wx/config/api.js b/litemall-wx/config/api.js
index e06d5b9d..412b32cc 100644
--- a/litemall-wx/config/api.js
+++ b/litemall-wx/config/api.js
@@ -1,106 +1,123 @@
-// 以下是业务服务器API地址
-// 本机开发时使用
-// var WxApiRoot = 'http://kaneee.natappfree.cc/wx/';
-// var WxApiRoot = 'https://www.czyinfo.cn/wx/';
-var WxApiRoot = 'https://www.xianiaoai.cn/wx/';
-
-// 局域网测试使用
-// var WxApiRoot = 'http://192.168.1.3:8080/wx/';
-// 云平台部署时使用
-// var WxApiRoot = 'http://122.51.199.160:8080/wx/';
-// 云平台上线时使用
-// var WxApiRoot = 'https://www.menethil.com.cn/wx/';
-
-module.exports = {
-  IndexUrl: WxApiRoot + 'home/index', //首页数据接口
-  AboutUrl: WxApiRoot + 'home/about', //介绍信息
-
-  CatalogList: WxApiRoot + 'catalog/index', //分类目录全部分类数据接口
-  CatalogCurrent: WxApiRoot + 'catalog/current', //分类目录当前分类数据接口
-
-  AuthLoginByWeixin: WxApiRoot + 'auth/login_by_weixin', //微信登录
-  AuthLoginByAccount: WxApiRoot + 'auth/login', //账号登录
-  AuthLogout: WxApiRoot + 'auth/logout', //账号登出
-  AuthRegister: WxApiRoot + 'auth/register', //账号注册
-  AuthReset: WxApiRoot + 'auth/reset', //账号密码重置
-  AuthRegisterCaptcha: WxApiRoot + 'auth/regCaptcha', //验证码
-  AuthBindPhone: WxApiRoot + 'auth/bindPhone', //绑定微信手机号
-
-  GoodsCount: WxApiRoot + 'goods/count', //统计商品总数
-  GoodsList: WxApiRoot + 'goods/list', //获得商品列表
-  GoodsCategory: WxApiRoot + 'goods/category', //获得分类数据
-  GoodsDetail: WxApiRoot + 'goods/detail', //获得商品的详情
-  GoodsRelated: WxApiRoot + 'goods/related', //商品详情页的关联商品（大家都在看）
-
-  BrandList: WxApiRoot + 'brand/list', //品牌列表
-  BrandDetail: WxApiRoot + 'brand/detail', //品牌详情
-
-  CartList: WxApiRoot + 'cart/index', //获取购物车的数据
-  CartAdd: WxApiRoot + 'cart/add', // 添加商品到购物车
-  CartFastAdd: WxApiRoot + 'cart/fastadd', // 立即购买商品
-  CartUpdate: WxApiRoot + 'cart/update', // 更新购物车的商品
-  CartDelete: WxApiRoot + 'cart/delete', // 删除购物车的商品
-  CartChecked: WxApiRoot + 'cart/checked', // 选择或取消选择商品
-  CartGoodsCount: WxApiRoot + 'cart/goodscount', // 获取购物车商品件数
-  CartCheckout: WxApiRoot + 'cart/checkout', // 下单前信息确认
-
-  CollectList: WxApiRoot + 'collect/list', //收藏列表
-  CollectAddOrDelete: WxApiRoot + 'collect/addordelete', //添加或取消收藏
-
-  CommentList: WxApiRoot + 'comment/list', //评论列表
-  CommentCount: WxApiRoot + 'comment/count', //评论总数
-  CommentPost: WxApiRoot + 'comment/post', //发表评论
-
-  TopicList: WxApiRoot + 'topic/list', //专题列表
-  TopicDetail: WxApiRoot + 'topic/detail', //专题详情
-  TopicRelated: WxApiRoot + 'topic/related', //相关专题
-
-  SearchIndex: WxApiRoot + 'search/index', //搜索关键字
-  SearchResult: WxApiRoot + 'search/result', //搜索结果
-  SearchHelper: WxApiRoot + 'search/helper', //搜索帮助
-  SearchClearHistory: WxApiRoot + 'search/clearhistory', //搜索历史清楚
-
-  AddressList: WxApiRoot + 'address/list', //收货地址列表
-  AddressDetail: WxApiRoot + 'address/detail', //收货地址详情
-  AddressSave: WxApiRoot + 'address/save', //保存收货地址
-  AddressDelete: WxApiRoot + 'address/delete', //保存收货地址
-
-  ExpressQuery: WxApiRoot + 'express/query', //物流查询
-
-  RegionList: WxApiRoot + 'region/list', //获取区域列表
-
-  OrderSubmit: WxApiRoot + 'order/submit', // 提交订单
-  OrderPrepay: WxApiRoot + 'order/prepay', // 订单的预支付会话
-  OrderList: WxApiRoot + 'order/list', //订单列表
-  OrderDetail: WxApiRoot + 'order/detail', //订单详情
-  OrderCancel: WxApiRoot + 'order/cancel', //取消订单
-  OrderRefund: WxApiRoot + 'order/refund', //退款取消订单
-  OrderDelete: WxApiRoot + 'order/delete', //删除订单
-  OrderConfirm: WxApiRoot + 'order/confirm', //确认收货
-  OrderGoods: WxApiRoot + 'order/goods', // 代评价商品信息
-  OrderComment: WxApiRoot + 'order/comment', // 评价订单商品信息
-
-  AftersaleSubmit: WxApiRoot + 'aftersale/submit', // 提交售后申请
-  AftersaleList: WxApiRoot + 'aftersale/list', // 售后列表
-  AftersaleDetail: WxApiRoot + 'aftersale/detail', // 售后详情
-
-  FeedbackAdd: WxApiRoot + 'feedback/submit', //添加反馈
-  FootprintList: WxApiRoot + 'footprint/list', //足迹列表
-  FootprintDelete: WxApiRoot + 'footprint/delete', //删除足迹
-
-  GroupOnList: WxApiRoot + 'groupon/list', //团购列表
-  GroupOnMy: WxApiRoot + 'groupon/my', //团购API-我的团购
-  GroupOnDetail: WxApiRoot + 'groupon/detail', //团购API-详情
-  GroupOnJoin: WxApiRoot + 'groupon/join', //团购API-详情
-
-  CouponList: WxApiRoot + 'coupon/list', //优惠券列表
-  CouponMyList: WxApiRoot + 'coupon/mylist', //我的优惠券列表
-  CouponSelectList: WxApiRoot + 'coupon/selectlist', //当前订单可用优惠券列表
-  CouponReceive: WxApiRoot + 'coupon/receive', //优惠券领取
-  CouponExchange: WxApiRoot + 'coupon/exchange', //优惠券兑换
-
-  StorageUpload: WxApiRoot + 'storage/upload', //图片上传,
-
-  UserIndex: WxApiRoot + 'user/index', //个人页面用户相关信息
-  IssueList: WxApiRoot + 'issue/list', //帮助信息
+// 以下是业务服务器API地址
+// 本机开发时使用
+// var WxApiRoot = 'https://www.czyinfo.cn/wx/';
+var WxApiRoot = 'https://www.xianiaoai.cn/wx/';
+// var WxApiRoot = 'http://cms236.natappfree.cc/wx/';
+
+// 局域网测试使用
+// var WxApiRoot = 'http://192.168.1.3:8080/wx/';
+// 云平台部署时使用
+// var WxApiRoot = 'http://122.51.199.160:8080/wx/';
+// 云平台上线时使用
+// var WxApiRoot = 'https://www.menethil.com.cn/wx/';
+
+module.exports = {
+  IndexUrl: WxApiRoot + 'home/index', //首页数据接口
+  AboutUrl: WxApiRoot + 'home/about', //介绍信息
+
+  CatalogList: WxApiRoot + 'catalog/index', //分类目录全部分类数据接口
+  CatalogCurrent: WxApiRoot + 'catalog/current', //分类目录当前分类数据接口
+
+  AuthLoginByWeixin: WxApiRoot + 'auth/login_by_weixin', //微信登录
+  UserUpdate: WxApiRoot + 'user/update',
+  AuthInfo: WxApiRoot + 'auth/info',
+  AuthLoginByAccount: WxApiRoot + 'auth/login', //账号登录
+  AuthLogout: WxApiRoot + 'auth/logout', //账号登出
+  AuthRegister: WxApiRoot + 'auth/register', //账号注册
+  AuthReset: WxApiRoot + 'auth/reset', //账号密码重置
+  AuthRegisterCaptcha: WxApiRoot + 'auth/regCaptcha', //验证码
+  AuthBindPhone: WxApiRoot + 'auth/bindPhone', //绑定微信手机号
+  NoticeLsnotice: WxApiRoot + 'notice/lsnotice',
+  NoticeCatnotice: WxApiRoot + 'notice/catnotice',
+  GoodsCreate: WxApiRoot + 'goods/create', //个人信息
+  GoodsUpdate: WxApiRoot + 'goods/update', //个人信息
+  TopicCreate: WxApiRoot + 'topic/create', //个人信息
+  TopicUpdate: WxApiRoot + 'topic/update', //个人信息
+  TopicInfo: WxApiRoot + 'topic/info', //个人信息
+
+  GoodsCount: WxApiRoot + 'goods/count', //统计商品总数
+  GoodsList: WxApiRoot + 'goods/list', //获得商品列表
+  GoodsCategory: WxApiRoot + 'goods/category', //获得分类数据
+  GoodsDetail: WxApiRoot + 'goods/detail', //获得商品的详情
+  Goodsinfo: WxApiRoot + 'goods/info', //获得商品的详情
+  GoodsRelated: WxApiRoot + 'goods/related', //商品详情页的关联商品（大家都在看）
+  TopicCreateGoods: WxApiRoot + 'topic/createGoods', 
+
+
+
+
+  TopicUpdateGoods: WxApiRoot + 'topic/updateGoods', 
+  BrandList: WxApiRoot + 'brand/list', //品牌列表
+  BrandDetail: WxApiRoot + 'brand/detail', //品牌详情
+
+  CartList: WxApiRoot + 'cart/index', //获取购物车的数据
+  CartAdd: WxApiRoot + 'cart/add', // 添加商品到购物车
+  CartFastAdd: WxApiRoot + 'cart/fastadd', // 立即购买商品
+  CartUpdate: WxApiRoot + 'cart/update', // 更新购物车的商品
+  CartDelete: WxApiRoot + 'cart/delete', // 删除购物车的商品
+  CartChecked: WxApiRoot + 'cart/checked', // 选择或取消选择商品
+  CartGoodsCount: WxApiRoot + 'cart/goodscount', // 获取购物车商品件数
+  CartCheckout: WxApiRoot + 'cart/checkout', // 下单前信息确认
+
+  CollectList: WxApiRoot + 'collect/list', //收藏列表
+  CollectAddOrDelete: WxApiRoot + 'collect/addordelete', //添加或取消收藏
+
+  CommentList: WxApiRoot + 'comment/list', //评论列表
+  CommentCount: WxApiRoot + 'comment/count', //评论总数
+  CommentPost: WxApiRoot + 'comment/post', //发表评论
+
+  TopicList: WxApiRoot + 'topic/list', //专题列表
+  TopicDetail: WxApiRoot + 'topic/detail', //专题详情
+  GoodsTopicDetail: WxApiRoot + 'goods/topicDetail',
+  TopicRelated: WxApiRoot + 'topic/related', //相关专题
+
+  SearchIndex: WxApiRoot + 'search/index', //搜索关键字
+  SearchResult: WxApiRoot + 'search/result', //搜索结果
+  SearchHelper: WxApiRoot + 'search/helper', //搜索帮助
+  SearchClearHistory: WxApiRoot + 'search/clearhistory', //搜索历史清楚
+
+  AddressList: WxApiRoot + 'address/list', //收货地址列表
+  AddressDetail: WxApiRoot + 'address/detail', //收货地址详情
+  AddressSave: WxApiRoot + 'address/save', //保存收货地址
+  AddressDelete: WxApiRoot + 'address/delete', //保存收货地址
+
+  ExpressQuery: WxApiRoot + 'express/query', //物流查询
+
+  RegionList: WxApiRoot + 'region/list', //获取区域列表
+
+  OrderSubmit: WxApiRoot + 'order/submit', // 提交订单
+  OrderPrepay: WxApiRoot + 'order/prepay', // 订单的预支付会话
+  OrderList: WxApiRoot + 'order/list', //订单列表
+  OrderDetail: WxApiRoot + 'order/detail', //订单详情
+  OrderCancel: WxApiRoot + 'order/cancel', //取消订单
+  OrderRefund: WxApiRoot + 'order/refund', //退款取消订单
+  OrderDelete: WxApiRoot + 'order/delete', //删除订单
+  OrderConfirm: WxApiRoot + 'order/confirm', //确认收货
+  OrderGoods: WxApiRoot + 'order/goods', // 代评价商品信息
+  OrderComment: WxApiRoot + 'order/comment', // 评价订单商品信息
+
+  AftersaleSubmit: WxApiRoot + 'aftersale/submit', // 提交售后申请
+  AftersaleList: WxApiRoot + 'aftersale/list', // 售后列表
+  AftersaleDetail: WxApiRoot + 'aftersale/detail', // 售后详情
+
+  FeedbackAdd: WxApiRoot + 'feedback/submit', //添加反馈
+  FootprintList: WxApiRoot + 'footprint/list', //足迹列表
+  FootprintDelete: WxApiRoot + 'footprint/delete', //删除足迹
+
+  GroupOnList: WxApiRoot + 'groupon/list', //团购列表
+  GroupOnMy: WxApiRoot + 'groupon/my', //团购API-我的团购
+  GroupOnDetail: WxApiRoot + 'groupon/detail', //团购API-详情
+  GroupOnJoin: WxApiRoot + 'groupon/join', //团购API-详情
+
+  CouponList: WxApiRoot + 'coupon/list', //优惠券列表
+  CouponMyList: WxApiRoot + 'coupon/mylist', //我的优惠券列表
+  CouponSelectList: WxApiRoot + 'coupon/selectlist', //当前订单可用优惠券列表
+  CouponReceive: WxApiRoot + 'coupon/receive', //优惠券领取
+  CouponExchange: WxApiRoot + 'coupon/exchange', //优惠券兑换
+
+  StorageUpload: WxApiRoot + 'storage/upload', //图片上传,
+  StorageUploadVideo: WxApiRoot + 'storage/uploadVideo',
+  UserIndex: WxApiRoot + 'user/index', //个人页面用户相关信息
+  IssueList: WxApiRoot + 'issue/list', //帮助信息
+  getByCategory: WxApiRoot + 'dict/getByCategory', //数据字典
 };
\ No newline at end of file
diff --git a/litemall-wx/lib/vant-weapp/action-sheet/index.d.ts b/litemall-wx/lib/vant-weapp/action-sheet/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/action-sheet/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/action-sheet/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/action-sheet/index.js b/litemall-wx/lib/vant-weapp/action-sheet/index.js
index 8065c833..0234783e 100644
--- a/litemall-wx/lib/vant-weapp/action-sheet/index.js
+++ b/litemall-wx/lib/vant-weapp/action-sheet/index.js
@@ -1,59 +1,59 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    props: {
-        show: Boolean,
-        title: String,
-        cancelText: String,
-        description: String,
-        round: {
-            type: Boolean,
-            value: true
-        },
-        zIndex: {
-            type: Number,
-            value: 100
-        },
-        actions: {
-            type: Array,
-            value: []
-        },
-        overlay: {
-            type: Boolean,
-            value: true
-        },
-        closeOnClickOverlay: {
-            type: Boolean,
-            value: true
-        },
-        closeOnClickAction: {
-            type: Boolean,
-            value: true
-        },
-        safeAreaInsetBottom: {
-            type: Boolean,
-            value: true
-        }
-    },
-    methods: {
-        onSelect(event) {
-            const { index } = event.currentTarget.dataset;
-            const item = this.data.actions[index];
-            if (item && !item.disabled && !item.loading) {
-                this.$emit('select', item);
-                if (this.data.closeOnClickAction) {
-                    this.onClose();
-                }
-            }
-        },
-        onCancel() {
-            this.$emit('cancel');
-        },
-        onClose() {
-            this.$emit('close');
-        },
-        onClickOverlay() {
-            this.$emit('click-overlay');
-            this.onClose();
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    props: {
+        show: Boolean,
+        title: String,
+        cancelText: String,
+        description: String,
+        round: {
+            type: Boolean,
+            value: true
+        },
+        zIndex: {
+            type: Number,
+            value: 100
+        },
+        actions: {
+            type: Array,
+            value: []
+        },
+        overlay: {
+            type: Boolean,
+            value: true
+        },
+        closeOnClickOverlay: {
+            type: Boolean,
+            value: true
+        },
+        closeOnClickAction: {
+            type: Boolean,
+            value: true
+        },
+        safeAreaInsetBottom: {
+            type: Boolean,
+            value: true
+        }
+    },
+    methods: {
+        onSelect(event) {
+            const { index } = event.currentTarget.dataset;
+            const item = this.data.actions[index];
+            if (item && !item.disabled && !item.loading) {
+                this.$emit('select', item);
+                if (this.data.closeOnClickAction) {
+                    this.onClose();
+                }
+            }
+        },
+        onCancel() {
+            this.$emit('cancel');
+        },
+        onClose() {
+            this.$emit('close');
+        },
+        onClickOverlay() {
+            this.$emit('click-overlay');
+            this.onClose();
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/action-sheet/index.json b/litemall-wx/lib/vant-weapp/action-sheet/index.json
index 19bf9891..b3548bd8 100644
--- a/litemall-wx/lib/vant-weapp/action-sheet/index.json
+++ b/litemall-wx/lib/vant-weapp/action-sheet/index.json
@@ -1,8 +1,8 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index",
-    "van-popup": "../popup/index",
-    "van-loading": "../loading/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-popup": "../popup/index",
+    "van-loading": "../loading/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/action-sheet/index.wxml b/litemall-wx/lib/vant-weapp/action-sheet/index.wxml
index bed9b06b..90bc5fd5 100644
--- a/litemall-wx/lib/vant-weapp/action-sheet/index.wxml
+++ b/litemall-wx/lib/vant-weapp/action-sheet/index.wxml
@@ -1,54 +1,54 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<van-popup
-  show="{{ show }}"
-  position="bottom"
-  round="{{ round }}"
-  z-index="{{ zIndex }}"
-  overlay="{{ overlay }}"
-  custom-class="van-action-sheet"
-  safe-area-inset-bottom="{{ safeAreaInsetBottom }}"
-  close-on-click-overlay="{{ closeOnClickOverlay }}"
-  bind:close="onClickOverlay"
->
-  <view wx:if="{{ title }}" class="van-hairline--bottom van-action-sheet__header">
-    {{ title }}
-    <van-icon
-      name="close"
-      custom-class="van-action-sheet__close"
-      bind:click="onClose"
-    />
-  </view>
-  <view wx:if="{{ description }}" class="van-action-sheet__description">
-    {{ description }}
-  </view>
-  <view wx:if="{{ actions && actions.length }}">
-    <!-- button外包一层view，防止actions动态变化，导致渲染时button被打散 -->
-    <button
-      wx:for="{{ actions }}"
-      wx:key="index"
-      open-type="{{ item.openType }}"
-      style="{{ item.color ? 'color: ' + item.color : '' }}"
-      class="{{ utils.bem('action-sheet__item', { disabled: item.disabled || item.loading }) }} van-hairline--top {{ item.className || '' }}"
-      hover-class="van-action-sheet__item--hover"
-      data-index="{{ index }}"
-      bind:tap="onSelect"
-    >
-      <block wx:if="{{ !item.loading }}">
-        {{ item.name }}
-        <text wx:if="{{ item.subname }}" class="van-action-sheet__subname" >{{ item.subname }}</text>
-      </block>
-      <van-loading wx:else custom-class="van-action-sheet__loading" size="20px" />
-    </button>
-  </view>
-  <slot />
-  <view
-    wx:if="{{ cancelText }}"
-    class="van-action-sheet__cancel"
-    hover-class="van-action-sheet__cancel--hover"
-    hover-stay-time="70"
-    bind:tap="onCancel"
-  >
-    {{ cancelText }}
-  </view>
-</van-popup>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<van-popup
+  show="{{ show }}"
+  position="bottom"
+  round="{{ round }}"
+  z-index="{{ zIndex }}"
+  overlay="{{ overlay }}"
+  custom-class="van-action-sheet"
+  safe-area-inset-bottom="{{ safeAreaInsetBottom }}"
+  close-on-click-overlay="{{ closeOnClickOverlay }}"
+  bind:close="onClickOverlay"
+>
+  <view wx:if="{{ title }}" class="van-hairline--bottom van-action-sheet__header">
+    {{ title }}
+    <van-icon
+      name="close"
+      custom-class="van-action-sheet__close"
+      bind:click="onClose"
+    />
+  </view>
+  <view wx:if="{{ description }}" class="van-action-sheet__description">
+    {{ description }}
+  </view>
+  <view wx:if="{{ actions && actions.length }}">
+    <!-- button外包一层view，防止actions动态变化，导致渲染时button被打散 -->
+    <button
+      wx:for="{{ actions }}"
+      wx:key="index"
+      open-type="{{ item.openType }}"
+      style="{{ item.color ? 'color: ' + item.color : '' }}"
+      class="{{ utils.bem('action-sheet__item', { disabled: item.disabled || item.loading }) }} van-hairline--top {{ item.className || '' }}"
+      hover-class="van-action-sheet__item--hover"
+      data-index="{{ index }}"
+      bind:tap="onSelect"
+    >
+      <block wx:if="{{ !item.loading }}">
+        {{ item.name }}
+        <text wx:if="{{ item.subname }}" class="van-action-sheet__subname" >{{ item.subname }}</text>
+      </block>
+      <van-loading wx:else custom-class="van-action-sheet__loading" size="20px" />
+    </button>
+  </view>
+  <slot />
+  <view
+    wx:if="{{ cancelText }}"
+    class="van-action-sheet__cancel"
+    hover-class="van-action-sheet__cancel--hover"
+    hover-stay-time="70"
+    bind:tap="onCancel"
+  >
+    {{ cancelText }}
+  </view>
+</van-popup>
diff --git a/litemall-wx/lib/vant-weapp/area/index.d.ts b/litemall-wx/lib/vant-weapp/area/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/area/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/area/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/area/index.js b/litemall-wx/lib/vant-weapp/area/index.js
index 5601d778..b90017d8 100644
--- a/litemall-wx/lib/vant-weapp/area/index.js
+++ b/litemall-wx/lib/vant-weapp/area/index.js
@@ -1,210 +1,210 @@
-import { VantComponent } from '../common/component';
-import { pickerProps } from '../picker/shared';
-const COLUMNSPLACEHOLDERCODE = '000000';
-VantComponent({
-    classes: ['active-class', 'toolbar-class', 'column-class'],
-    props: Object.assign(Object.assign({}, pickerProps), { value: String, areaList: {
-            type: Object,
-            value: {}
-        }, columnsNum: {
-            type: null,
-            value: 3
-        }, columnsPlaceholder: {
-            type: Array,
-            observer(val) {
-                this.setData({
-                    typeToColumnsPlaceholder: {
-                        province: val[0] || '',
-                        city: val[1] || '',
-                        county: val[2] || '',
-                    }
-                });
-            }
-        } }),
-    data: {
-        columns: [{ values: [] }, { values: [] }, { values: [] }],
-        displayColumns: [{ values: [] }, { values: [] }, { values: [] }],
-        typeToColumnsPlaceholder: {}
-    },
-    watch: {
-        value(value) {
-            this.code = value;
-            this.setValues();
-        },
-        areaList: 'setValues',
-        columnsNum(value) {
-            this.setData({
-                displayColumns: this.data.columns.slice(0, +value)
-            });
-        }
-    },
-    mounted() {
-        setTimeout(() => {
-            this.setValues();
-        }, 0);
-    },
-    methods: {
-        getPicker() {
-            if (this.picker == null) {
-                this.picker = this.selectComponent('.van-area__picker');
-            }
-            return this.picker;
-        },
-        onCancel(event) {
-            this.emit('cancel', event.detail);
-        },
-        onConfirm(event) {
-            const { index } = event.detail;
-            let { value } = event.detail;
-            value = this.parseOutputValues(value);
-            this.emit('confirm', { value, index });
-        },
-        emit(type, detail) {
-            detail.values = detail.value;
-            delete detail.value;
-            this.$emit(type, detail);
-        },
-        // parse output columns data
-        parseOutputValues(values) {
-            const { columnsPlaceholder } = this.data;
-            return values.map((value, index) => {
-                // save undefined value
-                if (!value)
-                    return value;
-                value = JSON.parse(JSON.stringify(value));
-                if (!value.code || value.name === columnsPlaceholder[index]) {
-                    value.code = '';
-                    value.name = '';
-                }
-                return value;
-            });
-        },
-        onChange(event) {
-            const { index, picker, value } = event.detail;
-            this.code = value[index].code;
-            this.setValues().then(() => {
-                this.$emit('change', {
-                    picker,
-                    values: this.parseOutputValues(picker.getValues()),
-                    index
-                });
-            });
-        },
-        getConfig(type) {
-            const { areaList } = this.data;
-            return (areaList && areaList[`${type}_list`]) || {};
-        },
-        getList(type, code) {
-            const { typeToColumnsPlaceholder } = this.data;
-            let result = [];
-            if (type !== 'province' && !code) {
-                return result;
-            }
-            const list = this.getConfig(type);
-            result = Object.keys(list).map(code => ({
-                code,
-                name: list[code]
-            }));
-            if (code) {
-                // oversea code
-                if (code[0] === '9' && type === 'city') {
-                    code = '9';
-                }
-                result = result.filter(item => item.code.indexOf(code) === 0);
-            }
-            if (typeToColumnsPlaceholder[type] && result.length) {
-                // set columns placeholder
-                const codeFill = type === 'province' ? '' : type === 'city' ? COLUMNSPLACEHOLDERCODE.slice(2, 4) : COLUMNSPLACEHOLDERCODE.slice(4, 6);
-                result.unshift({
-                    code: `${code}${codeFill}`,
-                    name: typeToColumnsPlaceholder[type]
-                });
-            }
-            return result;
-        },
-        getIndex(type, code) {
-            let compareNum = type === 'province' ? 2 : type === 'city' ? 4 : 6;
-            const list = this.getList(type, code.slice(0, compareNum - 2));
-            // oversea code
-            if (code[0] === '9' && type === 'province') {
-                compareNum = 1;
-            }
-            code = code.slice(0, compareNum);
-            for (let i = 0; i < list.length; i++) {
-                if (list[i].code.slice(0, compareNum) === code) {
-                    return i;
-                }
-            }
-            return 0;
-        },
-        setValues() {
-            const county = this.getConfig('county');
-            let { code } = this;
-            if (!code) {
-                if (this.data.columnsPlaceholder.length) {
-                    code = COLUMNSPLACEHOLDERCODE;
-                }
-                else if (Object.keys(county)[0]) {
-                    code = Object.keys(county)[0];
-                }
-                else {
-                    code = '';
-                }
-            }
-            const province = this.getList('province');
-            const city = this.getList('city', code.slice(0, 2));
-            const picker = this.getPicker();
-            if (!picker) {
-                return;
-            }
-            const stack = [];
-            stack.push(picker.setColumnValues(0, province, false));
-            stack.push(picker.setColumnValues(1, city, false));
-            if (city.length && code.slice(2, 4) === '00') {
-                [{ code }] = city;
-            }
-            stack.push(picker.setColumnValues(2, this.getList('county', code.slice(0, 4)), false));
-            return Promise.all(stack)
-                .catch(() => { })
-                .then(() => picker.setIndexes([
-                this.getIndex('province', code),
-                this.getIndex('city', code),
-                this.getIndex('county', code)
-            ]))
-                .catch(() => { });
-        },
-        getValues() {
-            const picker = this.getPicker();
-            return picker ? picker.getValues().filter(value => !!value) : [];
-        },
-        getDetail() {
-            const values = this.getValues();
-            const area = {
-                code: '',
-                country: '',
-                province: '',
-                city: '',
-                county: ''
-            };
-            if (!values.length) {
-                return area;
-            }
-            const names = values.map((item) => item.name);
-            area.code = values[values.length - 1].code;
-            if (area.code[0] === '9') {
-                area.country = names[1] || '';
-                area.province = names[2] || '';
-            }
-            else {
-                area.province = names[0] || '';
-                area.city = names[1] || '';
-                area.county = names[2] || '';
-            }
-            return area;
-        },
-        reset(code) {
-            this.code = code || '';
-            return this.setValues();
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { pickerProps } from '../picker/shared';
+const COLUMNSPLACEHOLDERCODE = '000000';
+VantComponent({
+    classes: ['active-class', 'toolbar-class', 'column-class'],
+    props: Object.assign(Object.assign({}, pickerProps), { value: String, areaList: {
+            type: Object,
+            value: {}
+        }, columnsNum: {
+            type: null,
+            value: 3
+        }, columnsPlaceholder: {
+            type: Array,
+            observer(val) {
+                this.setData({
+                    typeToColumnsPlaceholder: {
+                        province: val[0] || '',
+                        city: val[1] || '',
+                        county: val[2] || '',
+                    }
+                });
+            }
+        } }),
+    data: {
+        columns: [{ values: [] }, { values: [] }, { values: [] }],
+        displayColumns: [{ values: [] }, { values: [] }, { values: [] }],
+        typeToColumnsPlaceholder: {}
+    },
+    watch: {
+        value(value) {
+            this.code = value;
+            this.setValues();
+        },
+        areaList: 'setValues',
+        columnsNum(value) {
+            this.setData({
+                displayColumns: this.data.columns.slice(0, +value)
+            });
+        }
+    },
+    mounted() {
+        setTimeout(() => {
+            this.setValues();
+        }, 0);
+    },
+    methods: {
+        getPicker() {
+            if (this.picker == null) {
+                this.picker = this.selectComponent('.van-area__picker');
+            }
+            return this.picker;
+        },
+        onCancel(event) {
+            this.emit('cancel', event.detail);
+        },
+        onConfirm(event) {
+            const { index } = event.detail;
+            let { value } = event.detail;
+            value = this.parseOutputValues(value);
+            this.emit('confirm', { value, index });
+        },
+        emit(type, detail) {
+            detail.values = detail.value;
+            delete detail.value;
+            this.$emit(type, detail);
+        },
+        // parse output columns data
+        parseOutputValues(values) {
+            const { columnsPlaceholder } = this.data;
+            return values.map((value, index) => {
+                // save undefined value
+                if (!value)
+                    return value;
+                value = JSON.parse(JSON.stringify(value));
+                if (!value.code || value.name === columnsPlaceholder[index]) {
+                    value.code = '';
+                    value.name = '';
+                }
+                return value;
+            });
+        },
+        onChange(event) {
+            const { index, picker, value } = event.detail;
+            this.code = value[index].code;
+            this.setValues().then(() => {
+                this.$emit('change', {
+                    picker,
+                    values: this.parseOutputValues(picker.getValues()),
+                    index
+                });
+            });
+        },
+        getConfig(type) {
+            const { areaList } = this.data;
+            return (areaList && areaList[`${type}_list`]) || {};
+        },
+        getList(type, code) {
+            const { typeToColumnsPlaceholder } = this.data;
+            let result = [];
+            if (type !== 'province' && !code) {
+                return result;
+            }
+            const list = this.getConfig(type);
+            result = Object.keys(list).map(code => ({
+                code,
+                name: list[code]
+            }));
+            if (code) {
+                // oversea code
+                if (code[0] === '9' && type === 'city') {
+                    code = '9';
+                }
+                result = result.filter(item => item.code.indexOf(code) === 0);
+            }
+            if (typeToColumnsPlaceholder[type] && result.length) {
+                // set columns placeholder
+                const codeFill = type === 'province' ? '' : type === 'city' ? COLUMNSPLACEHOLDERCODE.slice(2, 4) : COLUMNSPLACEHOLDERCODE.slice(4, 6);
+                result.unshift({
+                    code: `${code}${codeFill}`,
+                    name: typeToColumnsPlaceholder[type]
+                });
+            }
+            return result;
+        },
+        getIndex(type, code) {
+            let compareNum = type === 'province' ? 2 : type === 'city' ? 4 : 6;
+            const list = this.getList(type, code.slice(0, compareNum - 2));
+            // oversea code
+            if (code[0] === '9' && type === 'province') {
+                compareNum = 1;
+            }
+            code = code.slice(0, compareNum);
+            for (let i = 0; i < list.length; i++) {
+                if (list[i].code.slice(0, compareNum) === code) {
+                    return i;
+                }
+            }
+            return 0;
+        },
+        setValues() {
+            const county = this.getConfig('county');
+            let { code } = this;
+            if (!code) {
+                if (this.data.columnsPlaceholder.length) {
+                    code = COLUMNSPLACEHOLDERCODE;
+                }
+                else if (Object.keys(county)[0]) {
+                    code = Object.keys(county)[0];
+                }
+                else {
+                    code = '';
+                }
+            }
+            const province = this.getList('province');
+            const city = this.getList('city', code.slice(0, 2));
+            const picker = this.getPicker();
+            if (!picker) {
+                return;
+            }
+            const stack = [];
+            stack.push(picker.setColumnValues(0, province, false));
+            stack.push(picker.setColumnValues(1, city, false));
+            if (city.length && code.slice(2, 4) === '00') {
+                [{ code }] = city;
+            }
+            stack.push(picker.setColumnValues(2, this.getList('county', code.slice(0, 4)), false));
+            return Promise.all(stack)
+                .catch(() => { })
+                .then(() => picker.setIndexes([
+                this.getIndex('province', code),
+                this.getIndex('city', code),
+                this.getIndex('county', code)
+            ]))
+                .catch(() => { });
+        },
+        getValues() {
+            const picker = this.getPicker();
+            return picker ? picker.getValues().filter(value => !!value) : [];
+        },
+        getDetail() {
+            const values = this.getValues();
+            const area = {
+                code: '',
+                country: '',
+                province: '',
+                city: '',
+                county: ''
+            };
+            if (!values.length) {
+                return area;
+            }
+            const names = values.map((item) => item.name);
+            area.code = values[values.length - 1].code;
+            if (area.code[0] === '9') {
+                area.country = names[1] || '';
+                area.province = names[2] || '';
+            }
+            else {
+                area.province = names[0] || '';
+                area.city = names[1] || '';
+                area.county = names[2] || '';
+            }
+            return area;
+        },
+        reset(code) {
+            this.code = code || '';
+            return this.setValues();
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/area/index.json b/litemall-wx/lib/vant-weapp/area/index.json
index a778e91c..9176008a 100644
--- a/litemall-wx/lib/vant-weapp/area/index.json
+++ b/litemall-wx/lib/vant-weapp/area/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-picker": "../picker/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-picker": "../picker/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/area/index.wxml b/litemall-wx/lib/vant-weapp/area/index.wxml
index 60757941..6d5e11e7 100644
--- a/litemall-wx/lib/vant-weapp/area/index.wxml
+++ b/litemall-wx/lib/vant-weapp/area/index.wxml
@@ -1,18 +1,18 @@
-<van-picker
-  class="van-area__picker"
-  active-class="active-class"
-  toolbar-class="toolbar-class"
-  column-class="column-class"
-  show-toolbar
-  value-key="name"
-  title="{{ title }}"
-  loading="{{ loading }}"
-  columns="{{ displayColumns }}"
-  item-height="{{ itemHeight }}"
-  visible-item-count="{{ visibleItemCount }}"
-  cancel-button-text="{{ cancelButtonText }}"
-  confirm-button-text="{{ confirmButtonText }}"
-  bind:change="onChange"
-  bind:confirm="onConfirm"
-  bind:cancel="onCancel"
-/>
+<van-picker
+  class="van-area__picker"
+  active-class="active-class"
+  toolbar-class="toolbar-class"
+  column-class="column-class"
+  show-toolbar
+  value-key="name"
+  title="{{ title }}"
+  loading="{{ loading }}"
+  columns="{{ displayColumns }}"
+  item-height="{{ itemHeight }}"
+  visible-item-count="{{ visibleItemCount }}"
+  cancel-button-text="{{ cancelButtonText }}"
+  confirm-button-text="{{ confirmButtonText }}"
+  bind:change="onChange"
+  bind:confirm="onConfirm"
+  bind:cancel="onCancel"
+/>
diff --git a/litemall-wx/lib/vant-weapp/button/index.d.ts b/litemall-wx/lib/vant-weapp/button/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/button/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/button/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/button/index.js b/litemall-wx/lib/vant-weapp/button/index.js
index e32509e8..5248eff4 100644
--- a/litemall-wx/lib/vant-weapp/button/index.js
+++ b/litemall-wx/lib/vant-weapp/button/index.js
@@ -1,68 +1,68 @@
-import { VantComponent } from '../common/component';
-import { button } from '../mixins/button';
-import { openType } from '../mixins/open-type';
-VantComponent({
-    mixins: [button, openType],
-    classes: ['hover-class', 'loading-class'],
-    data: {
-        style: ''
-    },
-    props: {
-        icon: String,
-        plain: Boolean,
-        block: Boolean,
-        round: Boolean,
-        square: Boolean,
-        loading: Boolean,
-        hairline: Boolean,
-        disabled: Boolean,
-        loadingText: String,
-        customStyle: String,
-        loadingType: {
-            type: String,
-            value: 'circular'
-        },
-        type: {
-            type: String,
-            value: 'default'
-        },
-        size: {
-            type: String,
-            value: 'normal'
-        },
-        loadingSize: {
-            type: String,
-            value: '20px'
-        },
-        color: {
-            type: String,
-            observer(color) {
-                let style = '';
-                if (color) {
-                    style += `color: ${this.data.plain ? color : 'white'};`;
-                    if (!this.data.plain) {
-                        // Use background instead of backgroundColor to make linear-gradient work
-                        style += `background: ${color};`;
-                    }
-                    // hide border when color is linear-gradient
-                    if (color.indexOf('gradient') !== -1) {
-                        style += 'border: 0;';
-                    }
-                    else {
-                        style += `border-color: ${color};`;
-                    }
-                }
-                if (style !== this.data.style) {
-                    this.setData({ style });
-                }
-            }
-        }
-    },
-    methods: {
-        onClick() {
-            if (!this.data.disabled && !this.data.loading) {
-                this.$emit('click');
-            }
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { button } from '../mixins/button';
+import { openType } from '../mixins/open-type';
+VantComponent({
+    mixins: [button, openType],
+    classes: ['hover-class', 'loading-class'],
+    data: {
+        style: ''
+    },
+    props: {
+        icon: String,
+        plain: Boolean,
+        block: Boolean,
+        round: Boolean,
+        square: Boolean,
+        loading: Boolean,
+        hairline: Boolean,
+        disabled: Boolean,
+        loadingText: String,
+        customStyle: String,
+        loadingType: {
+            type: String,
+            value: 'circular'
+        },
+        type: {
+            type: String,
+            value: 'default'
+        },
+        size: {
+            type: String,
+            value: 'normal'
+        },
+        loadingSize: {
+            type: String,
+            value: '20px'
+        },
+        color: {
+            type: String,
+            observer(color) {
+                let style = '';
+                if (color) {
+                    style += `color: ${this.data.plain ? color : 'white'};`;
+                    if (!this.data.plain) {
+                        // Use background instead of backgroundColor to make linear-gradient work
+                        style += `background: ${color};`;
+                    }
+                    // hide border when color is linear-gradient
+                    if (color.indexOf('gradient') !== -1) {
+                        style += 'border: 0;';
+                    }
+                    else {
+                        style += `border-color: ${color};`;
+                    }
+                }
+                if (style !== this.data.style) {
+                    this.setData({ style });
+                }
+            }
+        }
+    },
+    methods: {
+        onClick() {
+            if (!this.data.disabled && !this.data.loading) {
+                this.$emit('click');
+            }
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/button/index.json b/litemall-wx/lib/vant-weapp/button/index.json
index e00a5887..8e23ad65 100644
--- a/litemall-wx/lib/vant-weapp/button/index.json
+++ b/litemall-wx/lib/vant-weapp/button/index.json
@@ -1,7 +1,7 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index",
-    "van-loading": "../loading/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-loading": "../loading/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/button/index.wxml b/litemall-wx/lib/vant-weapp/button/index.wxml
index 77b49429..7abf6a4e 100644
--- a/litemall-wx/lib/vant-weapp/button/index.wxml
+++ b/litemall-wx/lib/vant-weapp/button/index.wxml
@@ -1,52 +1,52 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<button
-  id="{{ id }}"
-  class="custom-class {{ utils.bem('button', [type, size, { block, round, plain, square, loading, disabled, hairline, unclickable: disabled || loading }]) }} {{ hairline ? 'van-hairline--surround' : '' }}"
-  hover-class="van-button--active hover-class"
-  lang="{{ lang }}"
-  style="{{ style }} {{ customStyle }}"
-  open-type="{{ openType }}"
-  business-id="{{ businessId }}"
-  session-from="{{ sessionFrom }}"
-  send-message-title="{{ sendMessageTitle }}"
-  send-message-path="{{ sendMessagePath }}"
-  send-message-img="{{ sendMessageImg }}"
-  show-message-card="{{ showMessageCard }}"
-  app-parameter="{{ appParameter }}"
-  aria-label="{{ ariaLabel }}"
-  bindtap="onClick"
-  bindgetuserinfo="bindGetUserInfo"
-  bindcontact="bindContact"
-  bindgetphonenumber="bindGetPhoneNumber"
-  binderror="bindError"
-  bindlaunchapp="bindLaunchApp"
-  bindopensetting="bindOpenSetting"
->
-  <block wx:if="{{ loading }}">
-    <van-loading
-      custom-class="loading-class"
-      size="{{ loadingSize }}"
-      type="{{ loadingType }}"
-      color="{{ type === 'default' ? '#c9c9c9' : 'white' }}"
-    />
-    <view
-      wx:if="{{ loadingText }}"
-      class="van-button__loading-text"
-    >
-      {{ loadingText }}
-    </view>
-  </block>
-  <block wx:else>
-    <van-icon
-      wx:if="{{ icon }}"
-      size="1.2em"
-      name="{{ icon }}"
-      class="van-button__icon"
-      custom-style="line-height: inherit;"
-    />
-    <view class="van-button__text">
-      <slot />
-    </view>
-  </block>
-</button>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<button
+  id="{{ id }}"
+  class="custom-class {{ utils.bem('button', [type, size, { block, round, plain, square, loading, disabled, hairline, unclickable: disabled || loading }]) }} {{ hairline ? 'van-hairline--surround' : '' }}"
+  hover-class="van-button--active hover-class"
+  lang="{{ lang }}"
+  style="{{ style }} {{ customStyle }}"
+  open-type="{{ openType }}"
+  business-id="{{ businessId }}"
+  session-from="{{ sessionFrom }}"
+  send-message-title="{{ sendMessageTitle }}"
+  send-message-path="{{ sendMessagePath }}"
+  send-message-img="{{ sendMessageImg }}"
+  show-message-card="{{ showMessageCard }}"
+  app-parameter="{{ appParameter }}"
+  aria-label="{{ ariaLabel }}"
+  bindtap="onClick"
+  bindgetuserinfo="bindGetUserInfo"
+  bindcontact="bindContact"
+  bindgetphonenumber="bindGetPhoneNumber"
+  binderror="bindError"
+  bindlaunchapp="bindLaunchApp"
+  bindopensetting="bindOpenSetting"
+>
+  <block wx:if="{{ loading }}">
+    <van-loading
+      custom-class="loading-class"
+      size="{{ loadingSize }}"
+      type="{{ loadingType }}"
+      color="{{ type === 'default' ? '#c9c9c9' : 'white' }}"
+    />
+    <view
+      wx:if="{{ loadingText }}"
+      class="van-button__loading-text"
+    >
+      {{ loadingText }}
+    </view>
+  </block>
+  <block wx:else>
+    <van-icon
+      wx:if="{{ icon }}"
+      size="1.2em"
+      name="{{ icon }}"
+      class="van-button__icon"
+      custom-style="line-height: inherit;"
+    />
+    <view class="van-button__text">
+      <slot />
+    </view>
+  </block>
+</button>
diff --git a/litemall-wx/lib/vant-weapp/card/index.d.ts b/litemall-wx/lib/vant-weapp/card/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/card/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/card/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/card/index.js b/litemall-wx/lib/vant-weapp/card/index.js
index ae641517..290504b6 100644
--- a/litemall-wx/lib/vant-weapp/card/index.js
+++ b/litemall-wx/lib/vant-weapp/card/index.js
@@ -1,38 +1,38 @@
-import { link } from '../mixins/link';
-import { VantComponent } from '../common/component';
-VantComponent({
-    classes: [
-        'num-class',
-        'desc-class',
-        'thumb-class',
-        'title-class',
-        'price-class',
-        'origin-price-class',
-    ],
-    mixins: [link],
-    props: {
-        tag: String,
-        num: String,
-        desc: String,
-        thumb: String,
-        title: String,
-        price: String,
-        centered: Boolean,
-        lazyLoad: Boolean,
-        thumbLink: String,
-        originPrice: String,
-        thumbMode: {
-            type: String,
-            value: 'aspectFit'
-        },
-        currency: {
-            type: String,
-            value: '¥'
-        }
-    },
-    methods: {
-        onClickThumb() {
-            this.jumpLink('thumbLink');
-        }
-    }
-});
+import { link } from '../mixins/link';
+import { VantComponent } from '../common/component';
+VantComponent({
+    classes: [
+        'num-class',
+        'desc-class',
+        'thumb-class',
+        'title-class',
+        'price-class',
+        'origin-price-class',
+    ],
+    mixins: [link],
+    props: {
+        tag: String,
+        num: String,
+        desc: String,
+        thumb: String,
+        title: String,
+        price: String,
+        centered: Boolean,
+        lazyLoad: Boolean,
+        thumbLink: String,
+        originPrice: String,
+        thumbMode: {
+            type: String,
+            value: 'aspectFit'
+        },
+        currency: {
+            type: String,
+            value: '¥'
+        }
+    },
+    methods: {
+        onClickThumb() {
+            this.jumpLink('thumbLink');
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/card/index.json b/litemall-wx/lib/vant-weapp/card/index.json
index e9174076..2b603f21 100644
--- a/litemall-wx/lib/vant-weapp/card/index.json
+++ b/litemall-wx/lib/vant-weapp/card/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-tag": "../tag/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-tag": "../tag/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/card/index.wxml b/litemall-wx/lib/vant-weapp/card/index.wxml
index a17b1d62..adf80114 100644
--- a/litemall-wx/lib/vant-weapp/card/index.wxml
+++ b/litemall-wx/lib/vant-weapp/card/index.wxml
@@ -1,45 +1,45 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view class="custom-class van-card">
-  <view class="{{ utils.bem('card__header', { center: centered }) }}">
-    <view class="van-card__thumb" bind:tap="onClickThumb">
-      <image
-        wx:if="{{ thumb }}"
-        src="{{ thumb }}"
-        mode="{{ thumbMode }}"
-        lazy-load="{{ lazyLoad }}"
-        class="van-card__img thumb-class"
-      />
-      <slot name="thumb" />
-      <van-tag
-        wx:if="{{ tag }}"
-        mark
-        type="danger"
-        custom-class="van-card__tag"
-      >
-        {{ tag }}
-      </van-tag>
-    </view>
-
-    <view class="van-card__content">
-      <view wx:if="{{ title }}" class="van-card__title title-class">{{ title }}</view>
-      <slot wx:else name="title" />
-
-      <view wx:if="{{ desc }}" class="van-card__desc desc-class">{{ desc }}</view>
-      <slot wx:else name="desc" />
-
-      <slot name="tags" />
-
-      <view class="van-card__bottom">
-        <view wx:if="{{ price || price === 0 }}" class="van-card__price price-class">{{ currency }} {{ price }}</view>
-        <view wx:if="{{ originPrice || originPrice === 0 }}" class="van-card__origin-price origin-price-class">{{ currency }} {{ originPrice }}</view>
-        <view wx:if="{{ num }}" class="van-card__num num-class">x {{ num }}</view>
-        <slot name="bottom" />
-      </view>
-    </view>
-  </view>
-
-  <view class="van-card__footer">
-    <slot name="footer" />
-  </view>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="custom-class van-card">
+  <view class="{{ utils.bem('card__header', { center: centered }) }}">
+    <view class="van-card__thumb" bind:tap="onClickThumb">
+      <image
+        wx:if="{{ thumb }}"
+        src="{{ thumb }}"
+        mode="{{ thumbMode }}"
+        lazy-load="{{ lazyLoad }}"
+        class="van-card__img thumb-class"
+      />
+      <slot name="thumb" />
+      <van-tag
+        wx:if="{{ tag }}"
+        mark
+        type="danger"
+        custom-class="van-card__tag"
+      >
+        {{ tag }}
+      </van-tag>
+    </view>
+
+    <view class="van-card__content">
+      <view wx:if="{{ title }}" class="van-card__title title-class">{{ title }}</view>
+      <slot wx:else name="title" />
+
+      <view wx:if="{{ desc }}" class="van-card__desc desc-class">{{ desc }}</view>
+      <slot wx:else name="desc" />
+
+      <slot name="tags" />
+
+      <view class="van-card__bottom">
+        <view wx:if="{{ price || price === 0 }}" class="van-card__price price-class">{{ currency }} {{ price }}</view>
+        <view wx:if="{{ originPrice || originPrice === 0 }}" class="van-card__origin-price origin-price-class">{{ currency }} {{ originPrice }}</view>
+        <view wx:if="{{ num }}" class="van-card__num num-class">x {{ num }}</view>
+        <slot name="bottom" />
+      </view>
+    </view>
+  </view>
+
+  <view class="van-card__footer">
+    <slot name="footer" />
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/cell-group/index.d.ts b/litemall-wx/lib/vant-weapp/cell-group/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/cell-group/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/cell-group/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/cell-group/index.js b/litemall-wx/lib/vant-weapp/cell-group/index.js
index 3611e097..21e7cd34 100644
--- a/litemall-wx/lib/vant-weapp/cell-group/index.js
+++ b/litemall-wx/lib/vant-weapp/cell-group/index.js
@@ -1,10 +1,10 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    props: {
-        title: String,
-        border: {
-            type: Boolean,
-            value: true
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    props: {
+        title: String,
+        border: {
+            type: Boolean,
+            value: true
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/cell-group/index.json b/litemall-wx/lib/vant-weapp/cell-group/index.json
index 32640e0d..1edff938 100644
--- a/litemall-wx/lib/vant-weapp/cell-group/index.json
+++ b/litemall-wx/lib/vant-weapp/cell-group/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
+{
+  "component": true
 }
\ No newline at end of file
diff --git a/litemall-wx/lib/vant-weapp/cell-group/index.wxml b/litemall-wx/lib/vant-weapp/cell-group/index.wxml
index 6e0b471d..88351a4e 100644
--- a/litemall-wx/lib/vant-weapp/cell-group/index.wxml
+++ b/litemall-wx/lib/vant-weapp/cell-group/index.wxml
@@ -1,9 +1,9 @@
-<view
-  wx:if="{{ title }}"
-  class="van-cell-group__title"
->
-  {{ title }}
-</view>
-<view class="custom-class van-cell-group {{ border ? 'van-hairline--top-bottom' : '' }}">
-  <slot />
-</view>
+<view
+  wx:if="{{ title }}"
+  class="van-cell-group__title"
+>
+  {{ title }}
+</view>
+<view class="custom-class van-cell-group {{ border ? 'van-hairline--top-bottom' : '' }}">
+  <slot />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/cell/index.d.ts b/litemall-wx/lib/vant-weapp/cell/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/cell/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/cell/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/cell/index.js b/litemall-wx/lib/vant-weapp/cell/index.js
index 11cd042f..6f0688c2 100644
--- a/litemall-wx/lib/vant-weapp/cell/index.js
+++ b/litemall-wx/lib/vant-weapp/cell/index.js
@@ -1,37 +1,37 @@
-import { link } from '../mixins/link';
-import { VantComponent } from '../common/component';
-VantComponent({
-    classes: [
-        'title-class',
-        'label-class',
-        'value-class',
-        'right-icon-class',
-        'hover-class'
-    ],
-    mixins: [link],
-    props: {
-        title: null,
-        value: null,
-        icon: String,
-        size: String,
-        label: String,
-        center: Boolean,
-        isLink: Boolean,
-        required: Boolean,
-        clickable: Boolean,
-        titleWidth: String,
-        customStyle: String,
-        arrowDirection: String,
-        useLabelSlot: Boolean,
-        border: {
-            type: Boolean,
-            value: true
-        }
-    },
-    methods: {
-        onClick(event) {
-            this.$emit('click', event.detail);
-            this.jumpLink();
-        }
-    }
-});
+import { link } from '../mixins/link';
+import { VantComponent } from '../common/component';
+VantComponent({
+    classes: [
+        'title-class',
+        'label-class',
+        'value-class',
+        'right-icon-class',
+        'hover-class'
+    ],
+    mixins: [link],
+    props: {
+        title: null,
+        value: null,
+        icon: String,
+        size: String,
+        label: String,
+        center: Boolean,
+        isLink: Boolean,
+        required: Boolean,
+        clickable: Boolean,
+        titleWidth: String,
+        customStyle: String,
+        arrowDirection: String,
+        useLabelSlot: Boolean,
+        border: {
+            type: Boolean,
+            value: true
+        }
+    },
+    methods: {
+        onClick(event) {
+            this.$emit('click', event.detail);
+            this.jumpLink();
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/cell/index.json b/litemall-wx/lib/vant-weapp/cell/index.json
index a9ab393a..d3b324fb 100644
--- a/litemall-wx/lib/vant-weapp/cell/index.json
+++ b/litemall-wx/lib/vant-weapp/cell/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
 }
\ No newline at end of file
diff --git a/litemall-wx/lib/vant-weapp/cell/index.wxml b/litemall-wx/lib/vant-weapp/cell/index.wxml
index afaaaf86..58eccb42 100644
--- a/litemall-wx/lib/vant-weapp/cell/index.wxml
+++ b/litemall-wx/lib/vant-weapp/cell/index.wxml
@@ -1,45 +1,45 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view
-  class="custom-class {{ utils.bem('cell', [size, { center, required, borderless: !border, clickable: isLink || clickable }]) }}"
-  hover-class="van-cell--hover hover-class"
-  hover-stay-time="70"
-  style="{{ customStyle }}"
-  bind:tap="onClick"
->
-  <van-icon
-    wx:if="{{ icon }}"
-    name="{{ icon }}"
-    class="van-cell__left-icon-wrap"
-    custom-class="van-cell__left-icon"
-  />
-  <slot wx:else name="icon" />
-
-  <view
-    style="{{ titleWidth ? 'max-width:' + titleWidth + ';min-width:' + titleWidth : '' }}"
-    class="van-cell__title title-class"
-  >
-    <block wx:if="{{ title }}">{{ title }}</block>
-    <slot wx:else name="title" />
-
-    <view wx:if="{{ label || useLabelSlot }}" class="van-cell__label label-class">
-      <slot wx:if="{{ useLabelSlot }}" name="label" />
-      <block wx:elif="{{ label }}">{{ label }}</block>
-    </view>
-  </view>
-
-  <view class="van-cell__value value-class">
-    <block wx:if="{{ value || value === 0 }}">{{ value }}</block>
-    <slot wx:else />
-  </view>
-
-  <van-icon
-    wx:if="{{ isLink }}"
-    name="{{ arrowDirection ? 'arrow' + '-' + arrowDirection : 'arrow' }}"
-    class="van-cell__right-icon-wrap right-icon-class"
-    custom-class="van-cell__right-icon"
-  />
-  <slot wx:else name="right-icon" />
-
-  <slot name="extra" />
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="custom-class {{ utils.bem('cell', [size, { center, required, borderless: !border, clickable: isLink || clickable }]) }}"
+  hover-class="van-cell--hover hover-class"
+  hover-stay-time="70"
+  style="{{ customStyle }}"
+  bind:tap="onClick"
+>
+  <van-icon
+    wx:if="{{ icon }}"
+    name="{{ icon }}"
+    class="van-cell__left-icon-wrap"
+    custom-class="van-cell__left-icon"
+  />
+  <slot wx:else name="icon" />
+
+  <view
+    style="{{ titleWidth ? 'max-width:' + titleWidth + ';min-width:' + titleWidth : '' }}"
+    class="van-cell__title title-class"
+  >
+    <block wx:if="{{ title }}">{{ title }}</block>
+    <slot wx:else name="title" />
+
+    <view wx:if="{{ label || useLabelSlot }}" class="van-cell__label label-class">
+      <slot wx:if="{{ useLabelSlot }}" name="label" />
+      <block wx:elif="{{ label }}">{{ label }}</block>
+    </view>
+  </view>
+
+  <view class="van-cell__value value-class">
+    <block wx:if="{{ value || value === 0 }}">{{ value }}</block>
+    <slot wx:else />
+  </view>
+
+  <van-icon
+    wx:if="{{ isLink }}"
+    name="{{ arrowDirection ? 'arrow' + '-' + arrowDirection : 'arrow' }}"
+    class="van-cell__right-icon-wrap right-icon-class"
+    custom-class="van-cell__right-icon"
+  />
+  <slot wx:else name="right-icon" />
+
+  <slot name="extra" />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/checkbox-group/index.d.ts b/litemall-wx/lib/vant-weapp/checkbox-group/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/checkbox-group/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/checkbox-group/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/checkbox-group/index.js b/litemall-wx/lib/vant-weapp/checkbox-group/index.js
index 92438e79..8190ce40 100644
--- a/litemall-wx/lib/vant-weapp/checkbox-group/index.js
+++ b/litemall-wx/lib/vant-weapp/checkbox-group/index.js
@@ -1,39 +1,39 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    field: true,
-    relation: {
-        name: 'checkbox',
-        type: 'descendant',
-        linked(target) {
-            this.children = this.children || [];
-            this.children.push(target);
-            this.updateChild(target);
-        },
-        unlinked(target) {
-            this.children = this.children.filter((child) => child !== target);
-        }
-    },
-    props: {
-        max: Number,
-        value: {
-            type: Array,
-            observer: 'updateChildren'
-        },
-        disabled: {
-            type: Boolean,
-            observer: 'updateChildren'
-        }
-    },
-    methods: {
-        updateChildren() {
-            (this.children || []).forEach((child) => this.updateChild(child));
-        },
-        updateChild(child) {
-            const { value, disabled } = this.data;
-            child.setData({
-                value: value.indexOf(child.data.name) !== -1,
-                disabled: disabled || child.data.disabled
-            });
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    field: true,
+    relation: {
+        name: 'checkbox',
+        type: 'descendant',
+        linked(target) {
+            this.children = this.children || [];
+            this.children.push(target);
+            this.updateChild(target);
+        },
+        unlinked(target) {
+            this.children = this.children.filter((child) => child !== target);
+        }
+    },
+    props: {
+        max: Number,
+        value: {
+            type: Array,
+            observer: 'updateChildren'
+        },
+        disabled: {
+            type: Boolean,
+            observer: 'updateChildren'
+        }
+    },
+    methods: {
+        updateChildren() {
+            (this.children || []).forEach((child) => this.updateChild(child));
+        },
+        updateChild(child) {
+            const { value, disabled } = this.data;
+            child.setData({
+                value: value.indexOf(child.data.name) !== -1,
+                disabled: disabled || child.data.disabled
+            });
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/checkbox-group/index.json b/litemall-wx/lib/vant-weapp/checkbox-group/index.json
index 467ce294..efdc3c82 100644
--- a/litemall-wx/lib/vant-weapp/checkbox-group/index.json
+++ b/litemall-wx/lib/vant-weapp/checkbox-group/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
-}
+{
+  "component": true
+}
diff --git a/litemall-wx/lib/vant-weapp/checkbox-group/index.wxml b/litemall-wx/lib/vant-weapp/checkbox-group/index.wxml
index 4fa864ce..a8f3249c 100644
--- a/litemall-wx/lib/vant-weapp/checkbox-group/index.wxml
+++ b/litemall-wx/lib/vant-weapp/checkbox-group/index.wxml
@@ -1 +1 @@
-<slot />
+<slot />
diff --git a/litemall-wx/lib/vant-weapp/checkbox/index.d.ts b/litemall-wx/lib/vant-weapp/checkbox/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/checkbox/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/checkbox/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/checkbox/index.js b/litemall-wx/lib/vant-weapp/checkbox/index.js
index 4491e3be..a3acaa38 100644
--- a/litemall-wx/lib/vant-weapp/checkbox/index.js
+++ b/litemall-wx/lib/vant-weapp/checkbox/index.js
@@ -1,87 +1,87 @@
-import { VantComponent } from '../common/component';
-import { addUnit } from '../common/utils';
-function emit(target, value) {
-    target.$emit('input', value);
-    target.$emit('change', value);
-}
-VantComponent({
-    field: true,
-    relation: {
-        name: 'checkbox-group',
-        type: 'ancestor',
-        linked(target) {
-            this.parent = target;
-        },
-        unlinked() {
-            this.parent = null;
-        }
-    },
-    classes: ['icon-class', 'label-class'],
-    props: {
-        value: Boolean,
-        disabled: Boolean,
-        useIconSlot: Boolean,
-        checkedColor: String,
-        labelPosition: String,
-        labelDisabled: Boolean,
-        shape: {
-            type: String,
-            value: 'round'
-        },
-        iconSize: {
-            type: null,
-            observer: 'setSizeWithUnit'
-        }
-    },
-    data: {
-        sizeWithUnit: '20px'
-    },
-    methods: {
-        emitChange(value) {
-            if (this.parent) {
-                this.setParentValue(this.parent, value);
-            }
-            else {
-                emit(this, value);
-            }
-        },
-        toggle() {
-            const { disabled, value } = this.data;
-            if (!disabled) {
-                this.emitChange(!value);
-            }
-        },
-        onClickLabel() {
-            const { labelDisabled, disabled, value } = this.data;
-            if (!disabled && !labelDisabled) {
-                this.emitChange(!value);
-            }
-        },
-        setParentValue(parent, value) {
-            const parentValue = parent.data.value.slice();
-            const { name } = this.data;
-            const { max } = parent.data;
-            if (value) {
-                if (max && parentValue.length >= max) {
-                    return;
-                }
-                if (parentValue.indexOf(name) === -1) {
-                    parentValue.push(name);
-                    emit(parent, parentValue);
-                }
-            }
-            else {
-                const index = parentValue.indexOf(name);
-                if (index !== -1) {
-                    parentValue.splice(index, 1);
-                    emit(parent, parentValue);
-                }
-            }
-        },
-        setSizeWithUnit(size) {
-            this.set({
-                sizeWithUnit: addUnit(size)
-            });
-        },
-    }
-});
+import { VantComponent } from '../common/component';
+import { addUnit } from '../common/utils';
+function emit(target, value) {
+    target.$emit('input', value);
+    target.$emit('change', value);
+}
+VantComponent({
+    field: true,
+    relation: {
+        name: 'checkbox-group',
+        type: 'ancestor',
+        linked(target) {
+            this.parent = target;
+        },
+        unlinked() {
+            this.parent = null;
+        }
+    },
+    classes: ['icon-class', 'label-class'],
+    props: {
+        value: Boolean,
+        disabled: Boolean,
+        useIconSlot: Boolean,
+        checkedColor: String,
+        labelPosition: String,
+        labelDisabled: Boolean,
+        shape: {
+            type: String,
+            value: 'round'
+        },
+        iconSize: {
+            type: null,
+            observer: 'setSizeWithUnit'
+        }
+    },
+    data: {
+        sizeWithUnit: '20px'
+    },
+    methods: {
+        emitChange(value) {
+            if (this.parent) {
+                this.setParentValue(this.parent, value);
+            }
+            else {
+                emit(this, value);
+            }
+        },
+        toggle() {
+            const { disabled, value } = this.data;
+            if (!disabled) {
+                this.emitChange(!value);
+            }
+        },
+        onClickLabel() {
+            const { labelDisabled, disabled, value } = this.data;
+            if (!disabled && !labelDisabled) {
+                this.emitChange(!value);
+            }
+        },
+        setParentValue(parent, value) {
+            const parentValue = parent.data.value.slice();
+            const { name } = this.data;
+            const { max } = parent.data;
+            if (value) {
+                if (max && parentValue.length >= max) {
+                    return;
+                }
+                if (parentValue.indexOf(name) === -1) {
+                    parentValue.push(name);
+                    emit(parent, parentValue);
+                }
+            }
+            else {
+                const index = parentValue.indexOf(name);
+                if (index !== -1) {
+                    parentValue.splice(index, 1);
+                    emit(parent, parentValue);
+                }
+            }
+        },
+        setSizeWithUnit(size) {
+            this.set({
+                sizeWithUnit: addUnit(size)
+            });
+        },
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/checkbox/index.json b/litemall-wx/lib/vant-weapp/checkbox/index.json
index 0a336c08..8abfe203 100644
--- a/litemall-wx/lib/vant-weapp/checkbox/index.json
+++ b/litemall-wx/lib/vant-weapp/checkbox/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/checkbox/index.wxml b/litemall-wx/lib/vant-weapp/checkbox/index.wxml
index 65124a16..0deadfe4 100644
--- a/litemall-wx/lib/vant-weapp/checkbox/index.wxml
+++ b/litemall-wx/lib/vant-weapp/checkbox/index.wxml
@@ -1,19 +1,19 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view class="van-checkbox custom-class">
-  <view class="van-checkbox__icon-wrap" bindtap="toggle">
-    <slot wx:if="{{ useIconSlot }}" name="icon" />
-    <van-icon
-      wx:else
-      name="success"
-      size="0.8em"
-      class="{{ utils.bem('checkbox__icon', [shape, { disabled, checked: value }]) }}"
-      style="font-size: {{ sizeWithUnit }};{{ checkedColor && value && !disabled ? 'border-color:' + checkedColor + '; background-color:' + checkedColor : '' }}"
-      custom-class="icon-class"
-      custom-style="line-height: 1.25em;"
-    />
-  </view>
-  <view class="label-class {{ utils.bem('checkbox__label', [labelPosition, { disabled }]) }}" bindtap="onClickLabel">
-    <slot />
-  </view>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="van-checkbox custom-class">
+  <view class="van-checkbox__icon-wrap" bindtap="toggle">
+    <slot wx:if="{{ useIconSlot }}" name="icon" />
+    <van-icon
+      wx:else
+      name="success"
+      size="0.8em"
+      class="{{ utils.bem('checkbox__icon', [shape, { disabled, checked: value }]) }}"
+      style="font-size: {{ sizeWithUnit }};{{ checkedColor && value && !disabled ? 'border-color:' + checkedColor + '; background-color:' + checkedColor : '' }}"
+      custom-class="icon-class"
+      custom-style="line-height: 1.25em;"
+    />
+  </view>
+  <view class="label-class {{ utils.bem('checkbox__label', [labelPosition, { disabled }]) }}" bindtap="onClickLabel">
+    <slot />
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/circle/index.d.ts b/litemall-wx/lib/vant-weapp/circle/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/circle/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/circle/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/circle/index.js b/litemall-wx/lib/vant-weapp/circle/index.js
index 08c7eb4d..4f1f8a4c 100644
--- a/litemall-wx/lib/vant-weapp/circle/index.js
+++ b/litemall-wx/lib/vant-weapp/circle/index.js
@@ -1,158 +1,158 @@
-import { VantComponent } from '../common/component';
-import { isObj } from '../common/utils';
-import { BLUE, WHITE } from '../common/color';
-function format(rate) {
-    return Math.min(Math.max(rate, 0), 100);
-}
-const PERIMETER = 2 * Math.PI;
-const BEGIN_ANGLE = -Math.PI / 2;
-const STEP = 1;
-VantComponent({
-    props: {
-        text: String,
-        lineCap: {
-            type: String,
-            value: 'round'
-        },
-        value: {
-            type: Number,
-            value: 0,
-            observer: 'reRender'
-        },
-        speed: {
-            type: Number,
-            value: 50
-        },
-        size: {
-            type: Number,
-            value: 100,
-            observer: 'setStyle'
-        },
-        fill: String,
-        layerColor: {
-            type: String,
-            value: WHITE
-        },
-        color: {
-            type: [String, Object],
-            value: BLUE,
-            observer: 'setHoverColor'
-        },
-        strokeWidth: {
-            type: Number,
-            value: 4
-        },
-        clockwise: {
-            type: Boolean,
-            value: true
-        }
-    },
-    data: {
-        style: 'width: 100px; height: 100px;',
-        hoverColor: BLUE
-    },
-    methods: {
-        getContext() {
-            if (!this.ctx) {
-                this.ctx = wx.createCanvasContext('van-circle', this);
-            }
-            return this.ctx;
-        },
-        setHoverColor() {
-            const context = this.getContext();
-            const { color, size } = this.data;
-            let hoverColor = color;
-            if (isObj(color)) {
-                const LinearColor = context.createLinearGradient(size, 0, 0, 0);
-                Object.keys(color)
-                    .sort((a, b) => parseFloat(a) - parseFloat(b))
-                    .map(key => LinearColor.addColorStop(parseFloat(key) / 100, color[key]));
-                hoverColor = LinearColor;
-            }
-            this.setData({ hoverColor });
-        },
-        setStyle() {
-            const { size } = this.data;
-            const style = `width: ${size}px; height: ${size}px;`;
-            this.setData({ style });
-        },
-        presetCanvas(context, strokeStyle, beginAngle, endAngle, fill) {
-            const { strokeWidth, lineCap, clockwise, size } = this.data;
-            const position = size / 2;
-            const radius = position - strokeWidth / 2;
-            context.setStrokeStyle(strokeStyle);
-            context.setLineWidth(strokeWidth);
-            context.setLineCap(lineCap);
-            context.beginPath();
-            context.arc(position, position, radius, beginAngle, endAngle, !clockwise);
-            context.stroke();
-            if (fill) {
-                context.setFillStyle(fill);
-                context.fill();
-            }
-        },
-        renderLayerCircle(context) {
-            const { layerColor, fill } = this.data;
-            this.presetCanvas(context, layerColor, 0, PERIMETER, fill);
-        },
-        renderHoverCircle(context, formatValue) {
-            const { clockwise, hoverColor } = this.data;
-            // 结束角度
-            const progress = PERIMETER * (formatValue / 100);
-            const endAngle = clockwise
-                ? BEGIN_ANGLE + progress
-                : 3 * Math.PI - (BEGIN_ANGLE + progress);
-            this.presetCanvas(context, hoverColor, BEGIN_ANGLE, endAngle);
-        },
-        drawCircle(currentValue) {
-            const context = this.getContext();
-            const { size } = this.data;
-            context.clearRect(0, 0, size, size);
-            this.renderLayerCircle(context);
-            const formatValue = format(currentValue);
-            if (formatValue !== 0) {
-                this.renderHoverCircle(context, formatValue);
-            }
-            context.draw();
-        },
-        reRender() {
-            // tofector 动画暂时没有想到好的解决方案
-            const { value, speed } = this.data;
-            if (speed <= 0 || speed > 1000) {
-                this.drawCircle(value);
-                return;
-            }
-            this.clearInterval();
-            this.currentValue = this.currentValue || 0;
-            this.interval = setInterval(() => {
-                if (this.currentValue !== value) {
-                    if (this.currentValue < value) {
-                        this.currentValue += STEP;
-                    }
-                    else {
-                        this.currentValue -= STEP;
-                    }
-                    this.drawCircle(this.currentValue);
-                }
-                else {
-                    this.clearInterval();
-                }
-            }, 1000 / speed);
-        },
-        clearInterval() {
-            if (this.interval) {
-                clearInterval(this.interval);
-                this.interval = null;
-            }
-        }
-    },
-    created() {
-        const { value } = this.data;
-        this.currentValue = value;
-        this.drawCircle(value);
-    },
-    destroyed() {
-        this.ctx = null;
-        this.clearInterval();
-    }
-});
+import { VantComponent } from '../common/component';
+import { isObj } from '../common/utils';
+import { BLUE, WHITE } from '../common/color';
+function format(rate) {
+    return Math.min(Math.max(rate, 0), 100);
+}
+const PERIMETER = 2 * Math.PI;
+const BEGIN_ANGLE = -Math.PI / 2;
+const STEP = 1;
+VantComponent({
+    props: {
+        text: String,
+        lineCap: {
+            type: String,
+            value: 'round'
+        },
+        value: {
+            type: Number,
+            value: 0,
+            observer: 'reRender'
+        },
+        speed: {
+            type: Number,
+            value: 50
+        },
+        size: {
+            type: Number,
+            value: 100,
+            observer: 'setStyle'
+        },
+        fill: String,
+        layerColor: {
+            type: String,
+            value: WHITE
+        },
+        color: {
+            type: [String, Object],
+            value: BLUE,
+            observer: 'setHoverColor'
+        },
+        strokeWidth: {
+            type: Number,
+            value: 4
+        },
+        clockwise: {
+            type: Boolean,
+            value: true
+        }
+    },
+    data: {
+        style: 'width: 100px; height: 100px;',
+        hoverColor: BLUE
+    },
+    methods: {
+        getContext() {
+            if (!this.ctx) {
+                this.ctx = wx.createCanvasContext('van-circle', this);
+            }
+            return this.ctx;
+        },
+        setHoverColor() {
+            const context = this.getContext();
+            const { color, size } = this.data;
+            let hoverColor = color;
+            if (isObj(color)) {
+                const LinearColor = context.createLinearGradient(size, 0, 0, 0);
+                Object.keys(color)
+                    .sort((a, b) => parseFloat(a) - parseFloat(b))
+                    .map(key => LinearColor.addColorStop(parseFloat(key) / 100, color[key]));
+                hoverColor = LinearColor;
+            }
+            this.setData({ hoverColor });
+        },
+        setStyle() {
+            const { size } = this.data;
+            const style = `width: ${size}px; height: ${size}px;`;
+            this.setData({ style });
+        },
+        presetCanvas(context, strokeStyle, beginAngle, endAngle, fill) {
+            const { strokeWidth, lineCap, clockwise, size } = this.data;
+            const position = size / 2;
+            const radius = position - strokeWidth / 2;
+            context.setStrokeStyle(strokeStyle);
+            context.setLineWidth(strokeWidth);
+            context.setLineCap(lineCap);
+            context.beginPath();
+            context.arc(position, position, radius, beginAngle, endAngle, !clockwise);
+            context.stroke();
+            if (fill) {
+                context.setFillStyle(fill);
+                context.fill();
+            }
+        },
+        renderLayerCircle(context) {
+            const { layerColor, fill } = this.data;
+            this.presetCanvas(context, layerColor, 0, PERIMETER, fill);
+        },
+        renderHoverCircle(context, formatValue) {
+            const { clockwise, hoverColor } = this.data;
+            // 结束角度
+            const progress = PERIMETER * (formatValue / 100);
+            const endAngle = clockwise
+                ? BEGIN_ANGLE + progress
+                : 3 * Math.PI - (BEGIN_ANGLE + progress);
+            this.presetCanvas(context, hoverColor, BEGIN_ANGLE, endAngle);
+        },
+        drawCircle(currentValue) {
+            const context = this.getContext();
+            const { size } = this.data;
+            context.clearRect(0, 0, size, size);
+            this.renderLayerCircle(context);
+            const formatValue = format(currentValue);
+            if (formatValue !== 0) {
+                this.renderHoverCircle(context, formatValue);
+            }
+            context.draw();
+        },
+        reRender() {
+            // tofector 动画暂时没有想到好的解决方案
+            const { value, speed } = this.data;
+            if (speed <= 0 || speed > 1000) {
+                this.drawCircle(value);
+                return;
+            }
+            this.clearInterval();
+            this.currentValue = this.currentValue || 0;
+            this.interval = setInterval(() => {
+                if (this.currentValue !== value) {
+                    if (this.currentValue < value) {
+                        this.currentValue += STEP;
+                    }
+                    else {
+                        this.currentValue -= STEP;
+                    }
+                    this.drawCircle(this.currentValue);
+                }
+                else {
+                    this.clearInterval();
+                }
+            }, 1000 / speed);
+        },
+        clearInterval() {
+            if (this.interval) {
+                clearInterval(this.interval);
+                this.interval = null;
+            }
+        }
+    },
+    created() {
+        const { value } = this.data;
+        this.currentValue = value;
+        this.drawCircle(value);
+    },
+    destroyed() {
+        this.ctx = null;
+        this.clearInterval();
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/circle/index.json b/litemall-wx/lib/vant-weapp/circle/index.json
index 467ce294..efdc3c82 100644
--- a/litemall-wx/lib/vant-weapp/circle/index.json
+++ b/litemall-wx/lib/vant-weapp/circle/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
-}
+{
+  "component": true
+}
diff --git a/litemall-wx/lib/vant-weapp/circle/index.wxml b/litemall-wx/lib/vant-weapp/circle/index.wxml
index 215122ff..aff56c8d 100644
--- a/litemall-wx/lib/vant-weapp/circle/index.wxml
+++ b/litemall-wx/lib/vant-weapp/circle/index.wxml
@@ -1,7 +1,7 @@
-<view class="van-circle">
-  <canvas class="van-circle__canvas" style="{{ style }}" canvas-id="van-circle"></canvas>
-  <view wx:if="{{ !text }}" class="van-circle__text">
-    <slot></slot>
-  </view>
-  <cover-view wx:else class="van-circle__text">{{ text }}</cover-view>
+<view class="van-circle">
+  <canvas class="van-circle__canvas" style="{{ style }}" canvas-id="van-circle"></canvas>
+  <view wx:if="{{ !text }}" class="van-circle__text">
+    <slot></slot>
+  </view>
+  <cover-view wx:else class="van-circle__text">{{ text }}</cover-view>
 </view>
\ No newline at end of file
diff --git a/litemall-wx/lib/vant-weapp/col/index.d.ts b/litemall-wx/lib/vant-weapp/col/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/col/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/col/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/col/index.js b/litemall-wx/lib/vant-weapp/col/index.js
index 2d1d85ee..79cf9901 100644
--- a/litemall-wx/lib/vant-weapp/col/index.js
+++ b/litemall-wx/lib/vant-weapp/col/index.js
@@ -1,23 +1,23 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    relation: {
-        name: 'row',
-        type: 'ancestor'
-    },
-    props: {
-        span: Number,
-        offset: Number
-    },
-    data: {
-        style: ''
-    },
-    methods: {
-        setGutter(gutter) {
-            const padding = `${gutter / 2}px`;
-            const style = gutter ? `padding-left: ${padding}; padding-right: ${padding};` : '';
-            if (style !== this.data.style) {
-                this.setData({ style });
-            }
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    relation: {
+        name: 'row',
+        type: 'ancestor'
+    },
+    props: {
+        span: Number,
+        offset: Number
+    },
+    data: {
+        style: ''
+    },
+    methods: {
+        setGutter(gutter) {
+            const padding = `${gutter / 2}px`;
+            const style = gutter ? `padding-left: ${padding}; padding-right: ${padding};` : '';
+            if (style !== this.data.style) {
+                this.setData({ style });
+            }
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/col/index.json b/litemall-wx/lib/vant-weapp/col/index.json
index 467ce294..efdc3c82 100644
--- a/litemall-wx/lib/vant-weapp/col/index.json
+++ b/litemall-wx/lib/vant-weapp/col/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
-}
+{
+  "component": true
+}
diff --git a/litemall-wx/lib/vant-weapp/col/index.wxml b/litemall-wx/lib/vant-weapp/col/index.wxml
index a759aac5..684e5e0e 100644
--- a/litemall-wx/lib/vant-weapp/col/index.wxml
+++ b/litemall-wx/lib/vant-weapp/col/index.wxml
@@ -1,8 +1,8 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view
-  class="custom-class {{ utils.bem('col', [span]) }} {{ offset ? 'van-col--offset-' + offset : '' }}"
-  style="{{ style }}"
->
-  <slot />
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="custom-class {{ utils.bem('col', [span]) }} {{ offset ? 'van-col--offset-' + offset : '' }}"
+  style="{{ style }}"
+>
+  <slot />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/collapse-item/index.d.ts b/litemall-wx/lib/vant-weapp/collapse-item/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/collapse-item/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/collapse-item/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/collapse-item/index.js b/litemall-wx/lib/vant-weapp/collapse-item/index.js
index a869be00..1458215b 100644
--- a/litemall-wx/lib/vant-weapp/collapse-item/index.js
+++ b/litemall-wx/lib/vant-weapp/collapse-item/index.js
@@ -1,96 +1,96 @@
-import { VantComponent } from '../common/component';
-const nextTick = () => new Promise(resolve => setTimeout(resolve, 20));
-VantComponent({
-    classes: ['title-class', 'content-class'],
-    relation: {
-        name: 'collapse',
-        type: 'ancestor',
-        linked(parent) {
-            this.parent = parent;
-        }
-    },
-    props: {
-        name: null,
-        title: null,
-        value: null,
-        icon: String,
-        label: String,
-        disabled: Boolean,
-        clickable: Boolean,
-        border: {
-            type: Boolean,
-            value: true
-        },
-        isLink: {
-            type: Boolean,
-            value: true
-        }
-    },
-    data: {
-        contentHeight: 0,
-        expanded: false,
-        transition: false
-    },
-    mounted() {
-        this.updateExpanded()
-            .then(nextTick)
-            .then(() => {
-            const data = { transition: true };
-            if (this.data.expanded) {
-                data.contentHeight = 'auto';
-            }
-            this.setData(data);
-        });
-    },
-    methods: {
-        updateExpanded() {
-            if (!this.parent) {
-                return Promise.resolve();
-            }
-            const { value, accordion } = this.parent.data;
-            const { children = [] } = this.parent;
-            const { name } = this.data;
-            const index = children.indexOf(this);
-            const currentName = name == null ? index : name;
-            const expanded = accordion
-                ? value === currentName
-                : (value || []).some((name) => name === currentName);
-            const stack = [];
-            if (expanded !== this.data.expanded) {
-                stack.push(this.updateStyle(expanded));
-            }
-            stack.push(this.set({ index, expanded }));
-            return Promise.all(stack);
-        },
-        updateStyle(expanded) {
-            return this.getRect('.van-collapse-item__content')
-                .then((rect) => rect.height)
-                .then((height) => {
-                if (expanded) {
-                    return this.set({
-                        contentHeight: height ? `${height}px` : 'auto'
-                    });
-                }
-                return this.set({ contentHeight: `${height}px` })
-                    .then(nextTick)
-                    .then(() => this.set({ contentHeight: 0 }));
-            });
-        },
-        onClick() {
-            if (this.data.disabled) {
-                return;
-            }
-            const { name, expanded } = this.data;
-            const index = this.parent.children.indexOf(this);
-            const currentName = name == null ? index : name;
-            this.parent.switch(currentName, !expanded);
-        },
-        onTransitionEnd() {
-            if (this.data.expanded) {
-                this.setData({
-                    contentHeight: 'auto'
-                });
-            }
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+const nextTick = () => new Promise(resolve => setTimeout(resolve, 20));
+VantComponent({
+    classes: ['title-class', 'content-class'],
+    relation: {
+        name: 'collapse',
+        type: 'ancestor',
+        linked(parent) {
+            this.parent = parent;
+        }
+    },
+    props: {
+        name: null,
+        title: null,
+        value: null,
+        icon: String,
+        label: String,
+        disabled: Boolean,
+        clickable: Boolean,
+        border: {
+            type: Boolean,
+            value: true
+        },
+        isLink: {
+            type: Boolean,
+            value: true
+        }
+    },
+    data: {
+        contentHeight: 0,
+        expanded: false,
+        transition: false
+    },
+    mounted() {
+        this.updateExpanded()
+            .then(nextTick)
+            .then(() => {
+            const data = { transition: true };
+            if (this.data.expanded) {
+                data.contentHeight = 'auto';
+            }
+            this.setData(data);
+        });
+    },
+    methods: {
+        updateExpanded() {
+            if (!this.parent) {
+                return Promise.resolve();
+            }
+            const { value, accordion } = this.parent.data;
+            const { children = [] } = this.parent;
+            const { name } = this.data;
+            const index = children.indexOf(this);
+            const currentName = name == null ? index : name;
+            const expanded = accordion
+                ? value === currentName
+                : (value || []).some((name) => name === currentName);
+            const stack = [];
+            if (expanded !== this.data.expanded) {
+                stack.push(this.updateStyle(expanded));
+            }
+            stack.push(this.set({ index, expanded }));
+            return Promise.all(stack);
+        },
+        updateStyle(expanded) {
+            return this.getRect('.van-collapse-item__content')
+                .then((rect) => rect.height)
+                .then((height) => {
+                if (expanded) {
+                    return this.set({
+                        contentHeight: height ? `${height}px` : 'auto'
+                    });
+                }
+                return this.set({ contentHeight: `${height}px` })
+                    .then(nextTick)
+                    .then(() => this.set({ contentHeight: 0 }));
+            });
+        },
+        onClick() {
+            if (this.data.disabled) {
+                return;
+            }
+            const { name, expanded } = this.data;
+            const index = this.parent.children.indexOf(this);
+            const currentName = name == null ? index : name;
+            this.parent.switch(currentName, !expanded);
+        },
+        onTransitionEnd() {
+            if (this.data.expanded) {
+                this.setData({
+                    contentHeight: 'auto'
+                });
+            }
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/collapse-item/index.json b/litemall-wx/lib/vant-weapp/collapse-item/index.json
index 0e5425cd..7069216d 100644
--- a/litemall-wx/lib/vant-weapp/collapse-item/index.json
+++ b/litemall-wx/lib/vant-weapp/collapse-item/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-cell": "../cell/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-cell": "../cell/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/collapse-item/index.wxml b/litemall-wx/lib/vant-weapp/collapse-item/index.wxml
index 91afbc2d..943d3227 100644
--- a/litemall-wx/lib/vant-weapp/collapse-item/index.wxml
+++ b/litemall-wx/lib/vant-weapp/collapse-item/index.wxml
@@ -1,44 +1,44 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view class="van-collapse-item custom-class {{ index !== 0 ? 'van-hairline--top' : '' }}">
-  <van-cell
-    title="{{ title }}"
-    title-class="title-class"
-    icon="{{ icon }}"
-    value="{{ value }}"
-    label="{{ label }}"
-    is-link="{{ isLink }}"
-    clickable="{{ clickable }}"
-    border="{{ border && expanded }}"
-    class="{{ utils.bem('collapse-item__title', { disabled, expanded }) }}"
-    right-icon-class="van-cell__right-icon"
-    custom-class="van-cell"
-    hover-class="van-cell--hover"
-    bind:click="onClick"
-  >
-    <slot
-      name="title"
-      slot="title"
-    />
-    <slot
-      name="icon"
-      slot="icon"
-    />
-    <slot name="value" />
-    <slot
-      name="right-icon"
-      slot="right-icon"
-    />
-  </van-cell>
-  <view
-    class="{{ utils.bem('collapse-item__wrapper', { transition }) }}"
-    style="height: {{ contentHeight }};"
-    bind:transitionend="onTransitionEnd"
-  >
-    <view
-      class="van-collapse-item__content content-class"
-    >
-      <slot />
-    </view>
-  </view>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="van-collapse-item custom-class {{ index !== 0 ? 'van-hairline--top' : '' }}">
+  <van-cell
+    title="{{ title }}"
+    title-class="title-class"
+    icon="{{ icon }}"
+    value="{{ value }}"
+    label="{{ label }}"
+    is-link="{{ isLink }}"
+    clickable="{{ clickable }}"
+    border="{{ border && expanded }}"
+    class="{{ utils.bem('collapse-item__title', { disabled, expanded }) }}"
+    right-icon-class="van-cell__right-icon"
+    custom-class="van-cell"
+    hover-class="van-cell--hover"
+    bind:click="onClick"
+  >
+    <slot
+      name="title"
+      slot="title"
+    />
+    <slot
+      name="icon"
+      slot="icon"
+    />
+    <slot name="value" />
+    <slot
+      name="right-icon"
+      slot="right-icon"
+    />
+  </van-cell>
+  <view
+    class="{{ utils.bem('collapse-item__wrapper', { transition }) }}"
+    style="height: {{ contentHeight }};"
+    bind:transitionend="onTransitionEnd"
+  >
+    <view
+      class="van-collapse-item__content content-class"
+    >
+      <slot />
+    </view>
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/collapse/index.d.ts b/litemall-wx/lib/vant-weapp/collapse/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/collapse/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/collapse/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/collapse/index.js b/litemall-wx/lib/vant-weapp/collapse/index.js
index c6efb6ab..9567df03 100644
--- a/litemall-wx/lib/vant-weapp/collapse/index.js
+++ b/litemall-wx/lib/vant-weapp/collapse/index.js
@@ -1,50 +1,50 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    relation: {
-        name: 'collapse-item',
-        type: 'descendant',
-        linked(child) {
-            this.children.push(child);
-        },
-        unlinked(child) {
-            this.children = this.children.filter((item) => item !== child);
-        }
-    },
-    props: {
-        value: {
-            type: null,
-            observer: 'updateExpanded'
-        },
-        accordion: {
-            type: Boolean,
-            observer: 'updateExpanded'
-        },
-        border: {
-            type: Boolean,
-            value: true
-        }
-    },
-    beforeCreate() {
-        this.children = [];
-    },
-    methods: {
-        updateExpanded() {
-            this.children.forEach((child) => {
-                child.updateExpanded();
-            });
-        },
-        switch(name, expanded) {
-            const { accordion, value } = this.data;
-            if (!accordion) {
-                name = expanded
-                    ? (value || []).concat(name)
-                    : (value || []).filter((activeName) => activeName !== name);
-            }
-            else {
-                name = expanded ? name : '';
-            }
-            this.$emit('change', name);
-            this.$emit('input', name);
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    relation: {
+        name: 'collapse-item',
+        type: 'descendant',
+        linked(child) {
+            this.children.push(child);
+        },
+        unlinked(child) {
+            this.children = this.children.filter((item) => item !== child);
+        }
+    },
+    props: {
+        value: {
+            type: null,
+            observer: 'updateExpanded'
+        },
+        accordion: {
+            type: Boolean,
+            observer: 'updateExpanded'
+        },
+        border: {
+            type: Boolean,
+            value: true
+        }
+    },
+    beforeCreate() {
+        this.children = [];
+    },
+    methods: {
+        updateExpanded() {
+            this.children.forEach((child) => {
+                child.updateExpanded();
+            });
+        },
+        switch(name, expanded) {
+            const { accordion, value } = this.data;
+            if (!accordion) {
+                name = expanded
+                    ? (value || []).concat(name)
+                    : (value || []).filter((activeName) => activeName !== name);
+            }
+            else {
+                name = expanded ? name : '';
+            }
+            this.$emit('change', name);
+            this.$emit('input', name);
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/collapse/index.json b/litemall-wx/lib/vant-weapp/collapse/index.json
index 467ce294..efdc3c82 100644
--- a/litemall-wx/lib/vant-weapp/collapse/index.json
+++ b/litemall-wx/lib/vant-weapp/collapse/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
-}
+{
+  "component": true
+}
diff --git a/litemall-wx/lib/vant-weapp/collapse/index.wxml b/litemall-wx/lib/vant-weapp/collapse/index.wxml
index fd4e1719..f689405b 100644
--- a/litemall-wx/lib/vant-weapp/collapse/index.wxml
+++ b/litemall-wx/lib/vant-weapp/collapse/index.wxml
@@ -1,3 +1,3 @@
-<view class="custom-class van-collapse {{ border ? 'van-hairline--top-bottom' : '' }}">
-  <slot />
-</view>
+<view class="custom-class van-collapse {{ border ? 'van-hairline--top-bottom' : '' }}">
+  <slot />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/common/color.d.ts b/litemall-wx/lib/vant-weapp/common/color.d.ts
index 386f3077..6475dd22 100644
--- a/litemall-wx/lib/vant-weapp/common/color.d.ts
+++ b/litemall-wx/lib/vant-weapp/common/color.d.ts
@@ -1,7 +1,7 @@
-export declare const RED = "#ee0a24";
-export declare const BLUE = "#1989fa";
-export declare const WHITE = "#fff";
-export declare const GREEN = "#07c160";
-export declare const ORANGE = "#ff976a";
-export declare const GRAY = "#323233";
-export declare const GRAY_DARK = "#969799";
+export declare const RED = "#ee0a24";
+export declare const BLUE = "#1989fa";
+export declare const WHITE = "#fff";
+export declare const GREEN = "#07c160";
+export declare const ORANGE = "#ff976a";
+export declare const GRAY = "#323233";
+export declare const GRAY_DARK = "#969799";
diff --git a/litemall-wx/lib/vant-weapp/common/color.js b/litemall-wx/lib/vant-weapp/common/color.js
index 6b285bd6..9f9f2651 100644
--- a/litemall-wx/lib/vant-weapp/common/color.js
+++ b/litemall-wx/lib/vant-weapp/common/color.js
@@ -1,7 +1,7 @@
-export const RED = '#ee0a24';
-export const BLUE = '#1989fa';
-export const WHITE = '#fff';
-export const GREEN = '#07c160';
-export const ORANGE = '#ff976a';
-export const GRAY = '#323233';
-export const GRAY_DARK = '#969799';
+export const RED = '#ee0a24';
+export const BLUE = '#1989fa';
+export const WHITE = '#fff';
+export const GREEN = '#07c160';
+export const ORANGE = '#ff976a';
+export const GRAY = '#323233';
+export const GRAY_DARK = '#969799';
diff --git a/litemall-wx/lib/vant-weapp/common/component.d.ts b/litemall-wx/lib/vant-weapp/common/component.d.ts
index 307a96cc..0195c842 100644
--- a/litemall-wx/lib/vant-weapp/common/component.d.ts
+++ b/litemall-wx/lib/vant-weapp/common/component.d.ts
@@ -1,3 +1,3 @@
-import { VantComponentOptions, CombinedComponentInstance } from '../definitions/index';
-declare function VantComponent<Data, Props, Methods>(vantOptions?: VantComponentOptions<Data, Props, Methods, CombinedComponentInstance<Data, Props, Methods>>): void;
-export { VantComponent };
+import { VantComponentOptions, CombinedComponentInstance } from '../definitions/index';
+declare function VantComponent<Data, Props, Methods>(vantOptions?: VantComponentOptions<Data, Props, Methods, CombinedComponentInstance<Data, Props, Methods>>): void;
+export { VantComponent };
diff --git a/litemall-wx/lib/vant-weapp/common/component.js b/litemall-wx/lib/vant-weapp/common/component.js
index 63ef1a9d..874e6d08 100644
--- a/litemall-wx/lib/vant-weapp/common/component.js
+++ b/litemall-wx/lib/vant-weapp/common/component.js
@@ -1,48 +1,48 @@
-import { basic } from '../mixins/basic';
-import { observe } from '../mixins/observer/index';
-function mapKeys(source, target, map) {
-    Object.keys(map).forEach(key => {
-        if (source[key]) {
-            target[map[key]] = source[key];
-        }
-    });
-}
-function VantComponent(vantOptions = {}) {
-    const options = {};
-    mapKeys(vantOptions, options, {
-        data: 'data',
-        props: 'properties',
-        mixins: 'behaviors',
-        methods: 'methods',
-        beforeCreate: 'created',
-        created: 'attached',
-        mounted: 'ready',
-        relations: 'relations',
-        destroyed: 'detached',
-        classes: 'externalClasses'
-    });
-    const { relation } = vantOptions;
-    if (relation) {
-        options.relations = Object.assign(options.relations || {}, {
-            [`../${relation.name}/index`]: relation
-        });
-    }
-    // add default externalClasses
-    options.externalClasses = options.externalClasses || [];
-    options.externalClasses.push('custom-class');
-    // add default behaviors
-    options.behaviors = options.behaviors || [];
-    options.behaviors.push(basic);
-    // map field to form-field behavior
-    if (vantOptions.field) {
-        options.behaviors.push('wx://form-field');
-    }
-    // add default options
-    options.options = {
-        multipleSlots: true,
-        addGlobalClass: true
-    };
-    observe(vantOptions, options);
-    Component(options);
-}
-export { VantComponent };
+import { basic } from '../mixins/basic';
+import { observe } from '../mixins/observer/index';
+function mapKeys(source, target, map) {
+    Object.keys(map).forEach(key => {
+        if (source[key]) {
+            target[map[key]] = source[key];
+        }
+    });
+}
+function VantComponent(vantOptions = {}) {
+    const options = {};
+    mapKeys(vantOptions, options, {
+        data: 'data',
+        props: 'properties',
+        mixins: 'behaviors',
+        methods: 'methods',
+        beforeCreate: 'created',
+        created: 'attached',
+        mounted: 'ready',
+        relations: 'relations',
+        destroyed: 'detached',
+        classes: 'externalClasses'
+    });
+    const { relation } = vantOptions;
+    if (relation) {
+        options.relations = Object.assign(options.relations || {}, {
+            [`../${relation.name}/index`]: relation
+        });
+    }
+    // add default externalClasses
+    options.externalClasses = options.externalClasses || [];
+    options.externalClasses.push('custom-class');
+    // add default behaviors
+    options.behaviors = options.behaviors || [];
+    options.behaviors.push(basic);
+    // map field to form-field behavior
+    if (vantOptions.field) {
+        options.behaviors.push('wx://form-field');
+    }
+    // add default options
+    options.options = {
+        multipleSlots: true,
+        addGlobalClass: true
+    };
+    observe(vantOptions, options);
+    Component(options);
+}
+export { VantComponent };
diff --git a/litemall-wx/lib/vant-weapp/common/utils.d.ts b/litemall-wx/lib/vant-weapp/common/utils.d.ts
index 9fad27d9..d222e08a 100644
--- a/litemall-wx/lib/vant-weapp/common/utils.d.ts
+++ b/litemall-wx/lib/vant-weapp/common/utils.d.ts
@@ -1,8 +1,8 @@
-/// <reference types="miniprogram-api-typings" />
-export declare function isDef(value: any): boolean;
-export declare function isObj(x: any): boolean;
-export declare function isNumber(value: any): boolean;
-export declare function range(num: number, min: number, max: number): number;
-export declare function nextTick(fn: Function): void;
-export declare function getSystemInfoSync(): WechatMiniprogram.GetSystemInfoSuccessCallbackResult;
-export declare function addUnit(value?: string | number): string | undefined;
+/// <reference types="miniprogram-api-typings" />
+export declare function isDef(value: any): boolean;
+export declare function isObj(x: any): boolean;
+export declare function isNumber(value: any): boolean;
+export declare function range(num: number, min: number, max: number): number;
+export declare function nextTick(fn: Function): void;
+export declare function getSystemInfoSync(): WechatMiniprogram.GetSystemInfoSuccessCallbackResult;
+export declare function addUnit(value?: string | number): string | undefined;
diff --git a/litemall-wx/lib/vant-weapp/common/utils.js b/litemall-wx/lib/vant-weapp/common/utils.js
index cc0f8f11..d1256aa1 100644
--- a/litemall-wx/lib/vant-weapp/common/utils.js
+++ b/litemall-wx/lib/vant-weapp/common/utils.js
@@ -1,32 +1,32 @@
-export function isDef(value) {
-    return value !== undefined && value !== null;
-}
-export function isObj(x) {
-    const type = typeof x;
-    return x !== null && (type === 'object' || type === 'function');
-}
-export function isNumber(value) {
-    return /^\d+(\.\d+)?$/.test(value);
-}
-export function range(num, min, max) {
-    return Math.min(Math.max(num, min), max);
-}
-export function nextTick(fn) {
-    setTimeout(() => {
-        fn();
-    }, 1000 / 30);
-}
-let systemInfo = null;
-export function getSystemInfoSync() {
-    if (systemInfo == null) {
-        systemInfo = wx.getSystemInfoSync();
-    }
-    return systemInfo;
-}
-export function addUnit(value) {
-    if (!isDef(value)) {
-        return undefined;
-    }
-    value = String(value);
-    return isNumber(value) ? `${value}px` : value;
-}
+export function isDef(value) {
+    return value !== undefined && value !== null;
+}
+export function isObj(x) {
+    const type = typeof x;
+    return x !== null && (type === 'object' || type === 'function');
+}
+export function isNumber(value) {
+    return /^\d+(\.\d+)?$/.test(value);
+}
+export function range(num, min, max) {
+    return Math.min(Math.max(num, min), max);
+}
+export function nextTick(fn) {
+    setTimeout(() => {
+        fn();
+    }, 1000 / 30);
+}
+let systemInfo = null;
+export function getSystemInfoSync() {
+    if (systemInfo == null) {
+        systemInfo = wx.getSystemInfoSync();
+    }
+    return systemInfo;
+}
+export function addUnit(value) {
+    if (!isDef(value)) {
+        return undefined;
+    }
+    value = String(value);
+    return isNumber(value) ? `${value}px` : value;
+}
diff --git a/litemall-wx/lib/vant-weapp/count-down/index.d.ts b/litemall-wx/lib/vant-weapp/count-down/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/count-down/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/count-down/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/count-down/index.js b/litemall-wx/lib/vant-weapp/count-down/index.js
index 54a01fe1..520c7ccb 100644
--- a/litemall-wx/lib/vant-weapp/count-down/index.js
+++ b/litemall-wx/lib/vant-weapp/count-down/index.js
@@ -1,100 +1,100 @@
-import { VantComponent } from '../common/component';
-import { isSameSecond, parseFormat, parseTimeData } from './utils';
-function simpleTick(fn) {
-    return setTimeout(fn, 30);
-}
-VantComponent({
-    props: {
-        useSlot: Boolean,
-        millisecond: Boolean,
-        time: {
-            type: Number,
-            observer: 'reset'
-        },
-        format: {
-            type: String,
-            value: 'HH:mm:ss'
-        },
-        autoStart: {
-            type: Boolean,
-            value: true
-        }
-    },
-    data: {
-        timeData: parseTimeData(0),
-        formattedTime: '0'
-    },
-    destroyed() {
-        clearTimeout(this.tid);
-        this.tid = null;
-    },
-    methods: {
-        // 开始
-        start() {
-            if (this.counting) {
-                return;
-            }
-            this.counting = true;
-            this.endTime = Date.now() + this.remain;
-            this.tick();
-        },
-        // 暂停
-        pause() {
-            this.counting = false;
-            clearTimeout(this.tid);
-        },
-        // 重置
-        reset() {
-            this.pause();
-            this.remain = this.data.time;
-            this.setRemain(this.remain);
-            if (this.data.autoStart) {
-                this.start();
-            }
-        },
-        tick() {
-            if (this.data.millisecond) {
-                this.microTick();
-            }
-            else {
-                this.macroTick();
-            }
-        },
-        microTick() {
-            this.tid = simpleTick(() => {
-                this.setRemain(this.getRemain());
-                if (this.remain !== 0) {
-                    this.microTick();
-                }
-            });
-        },
-        macroTick() {
-            this.tid = simpleTick(() => {
-                const remain = this.getRemain();
-                if (!isSameSecond(remain, this.remain) || remain === 0) {
-                    this.setRemain(remain);
-                }
-                if (this.remain !== 0) {
-                    this.macroTick();
-                }
-            });
-        },
-        getRemain() {
-            return Math.max(this.endTime - Date.now(), 0);
-        },
-        setRemain(remain) {
-            this.remain = remain;
-            const timeData = parseTimeData(remain);
-            if (this.data.useSlot) {
-                this.$emit('change', timeData);
-            }
-            this.setData({
-                formattedTime: parseFormat(this.data.format, timeData)
-            });
-            if (remain === 0) {
-                this.pause();
-                this.$emit('finish');
-            }
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { isSameSecond, parseFormat, parseTimeData } from './utils';
+function simpleTick(fn) {
+    return setTimeout(fn, 30);
+}
+VantComponent({
+    props: {
+        useSlot: Boolean,
+        millisecond: Boolean,
+        time: {
+            type: Number,
+            observer: 'reset'
+        },
+        format: {
+            type: String,
+            value: 'HH:mm:ss'
+        },
+        autoStart: {
+            type: Boolean,
+            value: true
+        }
+    },
+    data: {
+        timeData: parseTimeData(0),
+        formattedTime: '0'
+    },
+    destroyed() {
+        clearTimeout(this.tid);
+        this.tid = null;
+    },
+    methods: {
+        // 开始
+        start() {
+            if (this.counting) {
+                return;
+            }
+            this.counting = true;
+            this.endTime = Date.now() + this.remain;
+            this.tick();
+        },
+        // 暂停
+        pause() {
+            this.counting = false;
+            clearTimeout(this.tid);
+        },
+        // 重置
+        reset() {
+            this.pause();
+            this.remain = this.data.time;
+            this.setRemain(this.remain);
+            if (this.data.autoStart) {
+                this.start();
+            }
+        },
+        tick() {
+            if (this.data.millisecond) {
+                this.microTick();
+            }
+            else {
+                this.macroTick();
+            }
+        },
+        microTick() {
+            this.tid = simpleTick(() => {
+                this.setRemain(this.getRemain());
+                if (this.remain !== 0) {
+                    this.microTick();
+                }
+            });
+        },
+        macroTick() {
+            this.tid = simpleTick(() => {
+                const remain = this.getRemain();
+                if (!isSameSecond(remain, this.remain) || remain === 0) {
+                    this.setRemain(remain);
+                }
+                if (this.remain !== 0) {
+                    this.macroTick();
+                }
+            });
+        },
+        getRemain() {
+            return Math.max(this.endTime - Date.now(), 0);
+        },
+        setRemain(remain) {
+            this.remain = remain;
+            const timeData = parseTimeData(remain);
+            if (this.data.useSlot) {
+                this.$emit('change', timeData);
+            }
+            this.setData({
+                formattedTime: parseFormat(this.data.format, timeData)
+            });
+            if (remain === 0) {
+                this.pause();
+                this.$emit('finish');
+            }
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/count-down/index.json b/litemall-wx/lib/vant-weapp/count-down/index.json
index 467ce294..efdc3c82 100644
--- a/litemall-wx/lib/vant-weapp/count-down/index.json
+++ b/litemall-wx/lib/vant-weapp/count-down/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
-}
+{
+  "component": true
+}
diff --git a/litemall-wx/lib/vant-weapp/count-down/index.wxml b/litemall-wx/lib/vant-weapp/count-down/index.wxml
index e206e167..49c4db29 100644
--- a/litemall-wx/lib/vant-weapp/count-down/index.wxml
+++ b/litemall-wx/lib/vant-weapp/count-down/index.wxml
@@ -1,4 +1,4 @@
-<view class="van-count-down">
-  <slot wx:if="{{ useSlot }}"/>
-  <block wx:else>{{ formattedTime }}</block>
-</view>
+<view class="van-count-down">
+  <slot wx:if="{{ useSlot }}"/>
+  <block wx:else>{{ formattedTime }}</block>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/count-down/utils.d.ts b/litemall-wx/lib/vant-weapp/count-down/utils.d.ts
index e4a58ddf..a45a5cfc 100644
--- a/litemall-wx/lib/vant-weapp/count-down/utils.d.ts
+++ b/litemall-wx/lib/vant-weapp/count-down/utils.d.ts
@@ -1,10 +1,10 @@
-export declare type TimeData = {
-    days: number;
-    hours: number;
-    minutes: number;
-    seconds: number;
-    milliseconds: number;
-};
-export declare function parseTimeData(time: number): TimeData;
-export declare function parseFormat(format: string, timeData: TimeData): string;
-export declare function isSameSecond(time1: number, time2: number): boolean;
+export declare type TimeData = {
+    days: number;
+    hours: number;
+    minutes: number;
+    seconds: number;
+    milliseconds: number;
+};
+export declare function parseTimeData(time: number): TimeData;
+export declare function parseFormat(format: string, timeData: TimeData): string;
+export declare function isSameSecond(time1: number, time2: number): boolean;
diff --git a/litemall-wx/lib/vant-weapp/count-down/utils.js b/litemall-wx/lib/vant-weapp/count-down/utils.js
index 32379881..c89f261a 100644
--- a/litemall-wx/lib/vant-weapp/count-down/utils.js
+++ b/litemall-wx/lib/vant-weapp/count-down/utils.js
@@ -1,57 +1,57 @@
-function padZero(num, targetLength = 2) {
-    let str = num + '';
-    while (str.length < targetLength) {
-        str = '0' + str;
-    }
-    return str;
-}
-const SECOND = 1000;
-const MINUTE = 60 * SECOND;
-const HOUR = 60 * MINUTE;
-const DAY = 24 * HOUR;
-export function parseTimeData(time) {
-    const days = Math.floor(time / DAY);
-    const hours = Math.floor((time % DAY) / HOUR);
-    const minutes = Math.floor((time % HOUR) / MINUTE);
-    const seconds = Math.floor((time % MINUTE) / SECOND);
-    const milliseconds = Math.floor(time % SECOND);
-    return {
-        days,
-        hours,
-        minutes,
-        seconds,
-        milliseconds
-    };
-}
-export function parseFormat(format, timeData) {
-    const { days } = timeData;
-    let { hours, minutes, seconds, milliseconds } = timeData;
-    if (format.indexOf('DD') === -1) {
-        hours += days * 24;
-    }
-    else {
-        format = format.replace('DD', padZero(days));
-    }
-    if (format.indexOf('HH') === -1) {
-        minutes += hours * 60;
-    }
-    else {
-        format = format.replace('HH', padZero(hours));
-    }
-    if (format.indexOf('mm') === -1) {
-        seconds += minutes * 60;
-    }
-    else {
-        format = format.replace('mm', padZero(minutes));
-    }
-    if (format.indexOf('ss') === -1) {
-        milliseconds += seconds * 1000;
-    }
-    else {
-        format = format.replace('ss', padZero(seconds));
-    }
-    return format.replace('SSS', padZero(milliseconds, 3));
-}
-export function isSameSecond(time1, time2) {
-    return Math.floor(time1 / 1000) === Math.floor(time2 / 1000);
-}
+function padZero(num, targetLength = 2) {
+    let str = num + '';
+    while (str.length < targetLength) {
+        str = '0' + str;
+    }
+    return str;
+}
+const SECOND = 1000;
+const MINUTE = 60 * SECOND;
+const HOUR = 60 * MINUTE;
+const DAY = 24 * HOUR;
+export function parseTimeData(time) {
+    const days = Math.floor(time / DAY);
+    const hours = Math.floor((time % DAY) / HOUR);
+    const minutes = Math.floor((time % HOUR) / MINUTE);
+    const seconds = Math.floor((time % MINUTE) / SECOND);
+    const milliseconds = Math.floor(time % SECOND);
+    return {
+        days,
+        hours,
+        minutes,
+        seconds,
+        milliseconds
+    };
+}
+export function parseFormat(format, timeData) {
+    const { days } = timeData;
+    let { hours, minutes, seconds, milliseconds } = timeData;
+    if (format.indexOf('DD') === -1) {
+        hours += days * 24;
+    }
+    else {
+        format = format.replace('DD', padZero(days));
+    }
+    if (format.indexOf('HH') === -1) {
+        minutes += hours * 60;
+    }
+    else {
+        format = format.replace('HH', padZero(hours));
+    }
+    if (format.indexOf('mm') === -1) {
+        seconds += minutes * 60;
+    }
+    else {
+        format = format.replace('mm', padZero(minutes));
+    }
+    if (format.indexOf('ss') === -1) {
+        milliseconds += seconds * 1000;
+    }
+    else {
+        format = format.replace('ss', padZero(seconds));
+    }
+    return format.replace('SSS', padZero(milliseconds, 3));
+}
+export function isSameSecond(time1, time2) {
+    return Math.floor(time1 / 1000) === Math.floor(time2 / 1000);
+}
diff --git a/litemall-wx/lib/vant-weapp/datetime-picker/index.d.ts b/litemall-wx/lib/vant-weapp/datetime-picker/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/datetime-picker/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/datetime-picker/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/datetime-picker/index.js b/litemall-wx/lib/vant-weapp/datetime-picker/index.js
index d350d117..836b49fd 100644
--- a/litemall-wx/lib/vant-weapp/datetime-picker/index.js
+++ b/litemall-wx/lib/vant-weapp/datetime-picker/index.js
@@ -1,297 +1,297 @@
-import { VantComponent } from '../common/component';
-import { isDef } from '../common/utils';
-import { pickerProps } from '../picker/shared';
-const currentYear = new Date().getFullYear();
-function isValidDate(date) {
-    return isDef(date) && !isNaN(new Date(date).getTime());
-}
-function range(num, min, max) {
-    return Math.min(Math.max(num, min), max);
-}
-function padZero(val) {
-    return `00${val}`.slice(-2);
-}
-function times(n, iteratee) {
-    let index = -1;
-    const result = Array(n < 0 ? 0 : n);
-    while (++index < n) {
-        result[index] = iteratee(index);
-    }
-    return result;
-}
-function getTrueValue(formattedValue) {
-    if (!formattedValue)
-        return;
-    while (isNaN(parseInt(formattedValue, 10))) {
-        formattedValue = formattedValue.slice(1);
-    }
-    return parseInt(formattedValue, 10);
-}
-function getMonthEndDay(year, month) {
-    return 32 - new Date(year, month - 1, 32).getDate();
-}
-const defaultFormatter = (_, value) => value;
-VantComponent({
-    classes: ['active-class', 'toolbar-class', 'column-class'],
-    props: Object.assign(Object.assign({}, pickerProps), { value: null, filter: null, type: {
-            type: String,
-            value: 'datetime'
-        }, showToolbar: {
-            type: Boolean,
-            value: true
-        }, formatter: {
-            type: null,
-            value: defaultFormatter
-        }, minDate: {
-            type: Number,
-            value: new Date(currentYear - 10, 0, 1).getTime()
-        }, maxDate: {
-            type: Number,
-            value: new Date(currentYear + 10, 11, 31).getTime()
-        }, minHour: {
-            type: Number,
-            value: 0
-        }, maxHour: {
-            type: Number,
-            value: 23
-        }, minMinute: {
-            type: Number,
-            value: 0
-        }, maxMinute: {
-            type: Number,
-            value: 59
-        } }),
-    data: {
-        innerValue: Date.now(),
-        columns: []
-    },
-    watch: {
-        value: 'updateValue',
-        type: 'updateValue',
-        minDate: 'updateValue',
-        maxDate: 'updateValue',
-        minHour: 'updateValue',
-        maxHour: 'updateValue',
-        minMinute: 'updateValue',
-        maxMinute: 'updateValue'
-    },
-    methods: {
-        updateValue() {
-            const { data } = this;
-            const val = this.correctValue(this.data.value);
-            const isEqual = val === data.innerValue;
-            if (!isEqual) {
-                this.updateColumnValue(val).then(() => {
-                    this.$emit('input', val);
-                });
-            }
-            else {
-                this.updateColumns();
-            }
-        },
-        getPicker() {
-            if (this.picker == null) {
-                this.picker = this.selectComponent('.van-datetime-picker');
-                const { picker } = this;
-                const { setColumnValues } = picker;
-                picker.setColumnValues = (...args) => setColumnValues.apply(picker, [...args, false]);
-            }
-            return this.picker;
-        },
-        updateColumns() {
-            const { formatter = defaultFormatter } = this.data;
-            const results = this.getOriginColumns().map(column => ({
-                values: column.values.map(value => formatter(column.type, value))
-            }));
-            return this.set({ columns: results });
-        },
-        getOriginColumns() {
-            const { filter } = this.data;
-            const results = this.getRanges().map(({ type, range }) => {
-                let values = times(range[1] - range[0] + 1, index => {
-                    let value = range[0] + index;
-                    value = type === 'year' ? `${value}` : padZero(value);
-                    return value;
-                });
-                if (filter) {
-                    values = filter(type, values);
-                }
-                return { type, values };
-            });
-            return results;
-        },
-        getRanges() {
-            const { data } = this;
-            if (data.type === 'time') {
-                return [
-                    {
-                        type: 'hour',
-                        range: [data.minHour, data.maxHour]
-                    },
-                    {
-                        type: 'minute',
-                        range: [data.minMinute, data.maxMinute]
-                    }
-                ];
-            }
-            const { maxYear, maxDate, maxMonth, maxHour, maxMinute } = this.getBoundary('max', data.innerValue);
-            const { minYear, minDate, minMonth, minHour, minMinute } = this.getBoundary('min', data.innerValue);
-            const result = [
-                {
-                    type: 'year',
-                    range: [minYear, maxYear]
-                },
-                {
-                    type: 'month',
-                    range: [minMonth, maxMonth]
-                },
-                {
-                    type: 'day',
-                    range: [minDate, maxDate]
-                },
-                {
-                    type: 'hour',
-                    range: [minHour, maxHour]
-                },
-                {
-                    type: 'minute',
-                    range: [minMinute, maxMinute]
-                }
-            ];
-            if (data.type === 'date')
-                result.splice(3, 2);
-            if (data.type === 'year-month')
-                result.splice(2, 3);
-            return result;
-        },
-        correctValue(value) {
-            const { data } = this;
-            // validate value
-            const isDateType = data.type !== 'time';
-            if (isDateType && !isValidDate(value)) {
-                value = data.minDate;
-            }
-            else if (!isDateType && !value) {
-                const { minHour } = data;
-                value = `${padZero(minHour)}:00`;
-            }
-            // time type
-            if (!isDateType) {
-                let [hour, minute] = value.split(':');
-                hour = padZero(range(hour, data.minHour, data.maxHour));
-                minute = padZero(range(minute, data.minMinute, data.maxMinute));
-                return `${hour}:${minute}`;
-            }
-            // date type
-            value = Math.max(value, data.minDate);
-            value = Math.min(value, data.maxDate);
-            return value;
-        },
-        getBoundary(type, innerValue) {
-            const value = new Date(innerValue);
-            const boundary = new Date(this.data[`${type}Date`]);
-            const year = boundary.getFullYear();
-            let month = 1;
-            let date = 1;
-            let hour = 0;
-            let minute = 0;
-            if (type === 'max') {
-                month = 12;
-                date = getMonthEndDay(value.getFullYear(), value.getMonth() + 1);
-                hour = 23;
-                minute = 59;
-            }
-            if (value.getFullYear() === year) {
-                month = boundary.getMonth() + 1;
-                if (value.getMonth() + 1 === month) {
-                    date = boundary.getDate();
-                    if (value.getDate() === date) {
-                        hour = boundary.getHours();
-                        if (value.getHours() === hour) {
-                            minute = boundary.getMinutes();
-                        }
-                    }
-                }
-            }
-            return {
-                [`${type}Year`]: year,
-                [`${type}Month`]: month,
-                [`${type}Date`]: date,
-                [`${type}Hour`]: hour,
-                [`${type}Minute`]: minute
-            };
-        },
-        onCancel() {
-            this.$emit('cancel');
-        },
-        onConfirm() {
-            this.$emit('confirm', this.data.innerValue);
-        },
-        onChange() {
-            const { data } = this;
-            let value;
-            const picker = this.getPicker();
-            if (data.type === 'time') {
-                const indexes = picker.getIndexes();
-                value = `${+data.columns[0].values[indexes[0]]}:${+data.columns[1].values[indexes[1]]}`;
-            }
-            else {
-                const values = picker.getValues();
-                const year = getTrueValue(values[0]);
-                const month = getTrueValue(values[1]);
-                const maxDate = getMonthEndDay(year, month);
-                let date = getTrueValue(values[2]);
-                if (data.type === 'year-month') {
-                    date = 1;
-                }
-                date = date > maxDate ? maxDate : date;
-                let hour = 0;
-                let minute = 0;
-                if (data.type === 'datetime') {
-                    hour = getTrueValue(values[3]);
-                    minute = getTrueValue(values[4]);
-                }
-                value = new Date(year, month - 1, date, hour, minute);
-            }
-            value = this.correctValue(value);
-            this.updateColumnValue(value).then(() => {
-                this.$emit('input', value);
-                this.$emit('change', picker);
-            });
-        },
-        updateColumnValue(value) {
-            let values = [];
-            const { type, formatter = defaultFormatter } = this.data;
-            const picker = this.getPicker();
-            if (type === 'time') {
-                const pair = value.split(':');
-                values = [
-                    formatter('hour', pair[0]),
-                    formatter('minute', pair[1])
-                ];
-            }
-            else {
-                const date = new Date(value);
-                values = [
-                    formatter('year', `${date.getFullYear()}`),
-                    formatter('month', padZero(date.getMonth() + 1))
-                ];
-                if (type === 'date') {
-                    values.push(formatter('day', padZero(date.getDate())));
-                }
-                if (type === 'datetime') {
-                    values.push(formatter('day', padZero(date.getDate())), formatter('hour', padZero(date.getHours())), formatter('minute', padZero(date.getMinutes())));
-                }
-            }
-            return this.set({ innerValue: value })
-                .then(() => this.updateColumns())
-                .then(() => picker.setValues(values));
-        }
-    },
-    created() {
-        const innerValue = this.correctValue(this.data.value);
-        this.updateColumnValue(innerValue).then(() => {
-            this.$emit('input', innerValue);
-        });
-    }
-});
+import { VantComponent } from '../common/component';
+import { isDef } from '../common/utils';
+import { pickerProps } from '../picker/shared';
+const currentYear = new Date().getFullYear();
+function isValidDate(date) {
+    return isDef(date) && !isNaN(new Date(date).getTime());
+}
+function range(num, min, max) {
+    return Math.min(Math.max(num, min), max);
+}
+function padZero(val) {
+    return `00${val}`.slice(-2);
+}
+function times(n, iteratee) {
+    let index = -1;
+    const result = Array(n < 0 ? 0 : n);
+    while (++index < n) {
+        result[index] = iteratee(index);
+    }
+    return result;
+}
+function getTrueValue(formattedValue) {
+    if (!formattedValue)
+        return;
+    while (isNaN(parseInt(formattedValue, 10))) {
+        formattedValue = formattedValue.slice(1);
+    }
+    return parseInt(formattedValue, 10);
+}
+function getMonthEndDay(year, month) {
+    return 32 - new Date(year, month - 1, 32).getDate();
+}
+const defaultFormatter = (_, value) => value;
+VantComponent({
+    classes: ['active-class', 'toolbar-class', 'column-class'],
+    props: Object.assign(Object.assign({}, pickerProps), { value: null, filter: null, type: {
+            type: String,
+            value: 'datetime'
+        }, showToolbar: {
+            type: Boolean,
+            value: true
+        }, formatter: {
+            type: null,
+            value: defaultFormatter
+        }, minDate: {
+            type: Number,
+            value: new Date(currentYear - 10, 0, 1).getTime()
+        }, maxDate: {
+            type: Number,
+            value: new Date(currentYear + 10, 11, 31).getTime()
+        }, minHour: {
+            type: Number,
+            value: 0
+        }, maxHour: {
+            type: Number,
+            value: 23
+        }, minMinute: {
+            type: Number,
+            value: 0
+        }, maxMinute: {
+            type: Number,
+            value: 59
+        } }),
+    data: {
+        innerValue: Date.now(),
+        columns: []
+    },
+    watch: {
+        value: 'updateValue',
+        type: 'updateValue',
+        minDate: 'updateValue',
+        maxDate: 'updateValue',
+        minHour: 'updateValue',
+        maxHour: 'updateValue',
+        minMinute: 'updateValue',
+        maxMinute: 'updateValue'
+    },
+    methods: {
+        updateValue() {
+            const { data } = this;
+            const val = this.correctValue(this.data.value);
+            const isEqual = val === data.innerValue;
+            if (!isEqual) {
+                this.updateColumnValue(val).then(() => {
+                    this.$emit('input', val);
+                });
+            }
+            else {
+                this.updateColumns();
+            }
+        },
+        getPicker() {
+            if (this.picker == null) {
+                this.picker = this.selectComponent('.van-datetime-picker');
+                const { picker } = this;
+                const { setColumnValues } = picker;
+                picker.setColumnValues = (...args) => setColumnValues.apply(picker, [...args, false]);
+            }
+            return this.picker;
+        },
+        updateColumns() {
+            const { formatter = defaultFormatter } = this.data;
+            const results = this.getOriginColumns().map(column => ({
+                values: column.values.map(value => formatter(column.type, value))
+            }));
+            return this.set({ columns: results });
+        },
+        getOriginColumns() {
+            const { filter } = this.data;
+            const results = this.getRanges().map(({ type, range }) => {
+                let values = times(range[1] - range[0] + 1, index => {
+                    let value = range[0] + index;
+                    value = type === 'year' ? `${value}` : padZero(value);
+                    return value;
+                });
+                if (filter) {
+                    values = filter(type, values);
+                }
+                return { type, values };
+            });
+            return results;
+        },
+        getRanges() {
+            const { data } = this;
+            if (data.type === 'time') {
+                return [
+                    {
+                        type: 'hour',
+                        range: [data.minHour, data.maxHour]
+                    },
+                    {
+                        type: 'minute',
+                        range: [data.minMinute, data.maxMinute]
+                    }
+                ];
+            }
+            const { maxYear, maxDate, maxMonth, maxHour, maxMinute } = this.getBoundary('max', data.innerValue);
+            const { minYear, minDate, minMonth, minHour, minMinute } = this.getBoundary('min', data.innerValue);
+            const result = [
+                {
+                    type: 'year',
+                    range: [minYear, maxYear]
+                },
+                {
+                    type: 'month',
+                    range: [minMonth, maxMonth]
+                },
+                {
+                    type: 'day',
+                    range: [minDate, maxDate]
+                },
+                {
+                    type: 'hour',
+                    range: [minHour, maxHour]
+                },
+                {
+                    type: 'minute',
+                    range: [minMinute, maxMinute]
+                }
+            ];
+            if (data.type === 'date')
+                result.splice(3, 2);
+            if (data.type === 'year-month')
+                result.splice(2, 3);
+            return result;
+        },
+        correctValue(value) {
+            const { data } = this;
+            // validate value
+            const isDateType = data.type !== 'time';
+            if (isDateType && !isValidDate(value)) {
+                value = data.minDate;
+            }
+            else if (!isDateType && !value) {
+                const { minHour } = data;
+                value = `${padZero(minHour)}:00`;
+            }
+            // time type
+            if (!isDateType) {
+                let [hour, minute] = value.split(':');
+                hour = padZero(range(hour, data.minHour, data.maxHour));
+                minute = padZero(range(minute, data.minMinute, data.maxMinute));
+                return `${hour}:${minute}`;
+            }
+            // date type
+            value = Math.max(value, data.minDate);
+            value = Math.min(value, data.maxDate);
+            return value;
+        },
+        getBoundary(type, innerValue) {
+            const value = new Date(innerValue);
+            const boundary = new Date(this.data[`${type}Date`]);
+            const year = boundary.getFullYear();
+            let month = 1;
+            let date = 1;
+            let hour = 0;
+            let minute = 0;
+            if (type === 'max') {
+                month = 12;
+                date = getMonthEndDay(value.getFullYear(), value.getMonth() + 1);
+                hour = 23;
+                minute = 59;
+            }
+            if (value.getFullYear() === year) {
+                month = boundary.getMonth() + 1;
+                if (value.getMonth() + 1 === month) {
+                    date = boundary.getDate();
+                    if (value.getDate() === date) {
+                        hour = boundary.getHours();
+                        if (value.getHours() === hour) {
+                            minute = boundary.getMinutes();
+                        }
+                    }
+                }
+            }
+            return {
+                [`${type}Year`]: year,
+                [`${type}Month`]: month,
+                [`${type}Date`]: date,
+                [`${type}Hour`]: hour,
+                [`${type}Minute`]: minute
+            };
+        },
+        onCancel() {
+            this.$emit('cancel');
+        },
+        onConfirm() {
+            this.$emit('confirm', this.data.innerValue);
+        },
+        onChange() {
+            const { data } = this;
+            let value;
+            const picker = this.getPicker();
+            if (data.type === 'time') {
+                const indexes = picker.getIndexes();
+                value = `${+data.columns[0].values[indexes[0]]}:${+data.columns[1].values[indexes[1]]}`;
+            }
+            else {
+                const values = picker.getValues();
+                const year = getTrueValue(values[0]);
+                const month = getTrueValue(values[1]);
+                const maxDate = getMonthEndDay(year, month);
+                let date = getTrueValue(values[2]);
+                if (data.type === 'year-month') {
+                    date = 1;
+                }
+                date = date > maxDate ? maxDate : date;
+                let hour = 0;
+                let minute = 0;
+                if (data.type === 'datetime') {
+                    hour = getTrueValue(values[3]);
+                    minute = getTrueValue(values[4]);
+                }
+                value = new Date(year, month - 1, date, hour, minute);
+            }
+            value = this.correctValue(value);
+            this.updateColumnValue(value).then(() => {
+                this.$emit('input', value);
+                this.$emit('change', picker);
+            });
+        },
+        updateColumnValue(value) {
+            let values = [];
+            const { type, formatter = defaultFormatter } = this.data;
+            const picker = this.getPicker();
+            if (type === 'time') {
+                const pair = value.split(':');
+                values = [
+                    formatter('hour', pair[0]),
+                    formatter('minute', pair[1])
+                ];
+            }
+            else {
+                const date = new Date(value);
+                values = [
+                    formatter('year', `${date.getFullYear()}`),
+                    formatter('month', padZero(date.getMonth() + 1))
+                ];
+                if (type === 'date') {
+                    values.push(formatter('day', padZero(date.getDate())));
+                }
+                if (type === 'datetime') {
+                    values.push(formatter('day', padZero(date.getDate())), formatter('hour', padZero(date.getHours())), formatter('minute', padZero(date.getMinutes())));
+                }
+            }
+            return this.set({ innerValue: value })
+                .then(() => this.updateColumns())
+                .then(() => picker.setValues(values));
+        }
+    },
+    created() {
+        const innerValue = this.correctValue(this.data.value);
+        this.updateColumnValue(innerValue).then(() => {
+            this.$emit('input', innerValue);
+        });
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/datetime-picker/index.json b/litemall-wx/lib/vant-weapp/datetime-picker/index.json
index a778e91c..9176008a 100644
--- a/litemall-wx/lib/vant-weapp/datetime-picker/index.json
+++ b/litemall-wx/lib/vant-weapp/datetime-picker/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-picker": "../picker/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-picker": "../picker/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/datetime-picker/index.wxml b/litemall-wx/lib/vant-weapp/datetime-picker/index.wxml
index ade22024..33659f2e 100644
--- a/litemall-wx/lib/vant-weapp/datetime-picker/index.wxml
+++ b/litemall-wx/lib/vant-weapp/datetime-picker/index.wxml
@@ -1,16 +1,16 @@
-<van-picker
-  class="van-datetime-picker"
-  active-class="active-class"
-  toolbar-class="toolbar-class"
-  column-class="column-class"
-  title="{{ title }}"
-  columns="{{ columns }}"
-  item-height="{{ itemHeight }}"
-  show-toolbar="{{ showToolbar }}"
-  visible-item-count="{{ visibleItemCount }}"
-  confirm-button-text="{{ confirmButtonText }}"
-  cancel-button-text="{{ cancelButtonText }}"
-  bind:change="onChange"
-  bind:confirm="onConfirm"
-  bind:cancel="onCancel"
-/>
+<van-picker
+  class="van-datetime-picker"
+  active-class="active-class"
+  toolbar-class="toolbar-class"
+  column-class="column-class"
+  title="{{ title }}"
+  columns="{{ columns }}"
+  item-height="{{ itemHeight }}"
+  show-toolbar="{{ showToolbar }}"
+  visible-item-count="{{ visibleItemCount }}"
+  confirm-button-text="{{ confirmButtonText }}"
+  cancel-button-text="{{ cancelButtonText }}"
+  bind:change="onChange"
+  bind:confirm="onConfirm"
+  bind:cancel="onCancel"
+/>
diff --git a/litemall-wx/lib/vant-weapp/definitions/index.d.ts b/litemall-wx/lib/vant-weapp/definitions/index.d.ts
index 3a8fc167..5623f88f 100644
--- a/litemall-wx/lib/vant-weapp/definitions/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/definitions/index.d.ts
@@ -1,28 +1,28 @@
-/// <reference types="miniprogram-api-typings" />
-import { Weapp } from './weapp';
-declare type RecordToAny<T> = {
-    [K in keyof T]: any;
-};
-export declare type CombinedComponentInstance<Data, Props, Methods> = Methods & WechatMiniprogram.Component.TrivialInstance & Weapp.FormField & {
-    data: Data & RecordToAny<Props>;
-};
-export interface VantComponentOptions<Data, Props, Methods, Instance> {
-    data?: Data;
-    field?: boolean;
-    classes?: string[];
-    mixins?: string[];
-    props?: Props & Weapp.PropertyOption;
-    watch?: Weapp.WatchOption<Instance>;
-    relation?: Weapp.RelationOption<Instance> & {
-        name: string;
-    };
-    relations?: {
-        [componentName: string]: Weapp.RelationOption<Instance>;
-    };
-    methods?: Methods & Weapp.MethodOption<Instance>;
-    beforeCreate?: (this: Instance) => void;
-    created?: (this: Instance) => void;
-    mounted?: (this: Instance) => void;
-    destroyed?: (this: Instance) => void;
-}
-export {};
+/// <reference types="miniprogram-api-typings" />
+import { Weapp } from './weapp';
+declare type RecordToAny<T> = {
+    [K in keyof T]: any;
+};
+export declare type CombinedComponentInstance<Data, Props, Methods> = Methods & WechatMiniprogram.Component.TrivialInstance & Weapp.FormField & {
+    data: Data & RecordToAny<Props>;
+};
+export interface VantComponentOptions<Data, Props, Methods, Instance> {
+    data?: Data;
+    field?: boolean;
+    classes?: string[];
+    mixins?: string[];
+    props?: Props & Weapp.PropertyOption;
+    watch?: Weapp.WatchOption<Instance>;
+    relation?: Weapp.RelationOption<Instance> & {
+        name: string;
+    };
+    relations?: {
+        [componentName: string]: Weapp.RelationOption<Instance>;
+    };
+    methods?: Methods & Weapp.MethodOption<Instance>;
+    beforeCreate?: (this: Instance) => void;
+    created?: (this: Instance) => void;
+    mounted?: (this: Instance) => void;
+    destroyed?: (this: Instance) => void;
+}
+export {};
diff --git a/litemall-wx/lib/vant-weapp/definitions/weapp.d.ts b/litemall-wx/lib/vant-weapp/definitions/weapp.d.ts
index 5fb00609..a395fca0 100644
--- a/litemall-wx/lib/vant-weapp/definitions/weapp.d.ts
+++ b/litemall-wx/lib/vant-weapp/definitions/weapp.d.ts
@@ -1,112 +1,112 @@
-/// <reference types="miniprogram-api-typings" />
-export declare namespace Weapp {
-    export interface FormField {
-        data: {
-            name: string;
-            value: any;
-        };
-    }
-    interface Target {
-        id: string;
-        tagName: string;
-        dataset: {
-            [key: string]: any;
-        };
-    }
-    export interface Event {
-        /**
-         * 代表事件的类型。
-         */
-        type: string;
-        /**
-         * 页面打开到触发事件所经过的毫秒数。
-         */
-        timeStamp: number;
-        /**
-         * 触发事件的源组件。
-         */
-        target: Target;
-        /**
-         * 事件绑定的当前组件。
-         */
-        currentTarget: Target;
-        /**
-         * 额外的信息
-         */
-        detail: any;
-    }
-    interface Touch {
-        /**
-         * 触摸点的标识符
-         */
-        identifier: number;
-        /**
-         * 距离文档左上角的距离，文档的左上角为原点 ，横向为X轴，纵向为Y轴
-         */
-        pageX: number;
-        /**
-         * 距离文档左上角的距离，文档的左上角为原点 ，横向为X轴，纵向为Y轴
-         */
-        pageY: number;
-        /**
-         * 距离页面可显示区域（屏幕除去导航条）左上角距离，横向为X轴，纵向为Y轴
-         */
-        clientX: number;
-        /**
-         * 距离页面可显示区域（屏幕除去导航条）左上角距离，横向为X轴，纵向为Y轴
-         */
-        clientY: number;
-    }
-    export interface TouchEvent extends Event {
-        touches: Array<Touch>;
-        changedTouches: Array<Touch>;
-    }
-    /**
-     * relation定义，miniprogram-api-typings缺少this定义
-     */
-    export interface RelationOption<Instance> {
-        /** 目标组件的相对关系 */
-        type: 'parent' | 'child' | 'ancestor' | 'descendant';
-        /** 关系生命周期函数，当关系被建立在页面节点树中时触发，触发时机在组件attached生命周期之后 */
-        linked?(this: Instance, target: WechatMiniprogram.Component.TrivialInstance): void;
-        /** 关系生命周期函数，当关系在页面节点树中发生改变时触发，触发时机在组件moved生命周期之后 */
-        linkChanged?(this: Instance, target: WechatMiniprogram.Component.TrivialInstance): void;
-        /** 关系生命周期函数，当关系脱离页面节点树时触发，触发时机在组件detached生命周期之后 */
-        unlinked?(this: Instance, target: WechatMiniprogram.Component.TrivialInstance): void;
-        /** 如果这一项被设置，则它表示关联的目标节点所应具有的behavior，所有拥有这一behavior的组件节点都会被关联 */
-        target?: string;
-    }
-    /**
-     * obverser定义，miniprogram-api-typings缺少this定义
-     */
-    type Observer<Instance, T> = (this: Instance, newVal: T, oldVal: T, changedPath: Array<string | number>) => void;
-    /**
-     * watch定义
-     */
-    export interface WatchOption<Instance> {
-        [name: string]: string | Observer<Instance, any>;
-    }
-    /**
-     * methods定义，miniprogram-api-typings缺少this定义
-     */
-    export interface MethodOption<Instance> {
-        [name: string]: (this: Instance, ...args: any[]) => any;
-    }
-    export interface ComputedOption<Instance> {
-        [name: string]: (this: Instance) => any;
-    }
-    type PropertyType = StringConstructor | NumberConstructor | BooleanConstructor | ArrayConstructor | ObjectConstructor | FunctionConstructor | null;
-    export interface PropertyOption {
-        [name: string]: PropertyType | PropertyType[] | {
-            /** 属性类型 */
-            type: PropertyType | PropertyType[];
-            /** 属性初始值 */
-            value?: any;
-            /** 属性值被更改时的响应函数 */
-            observer?: string | Observer<WechatMiniprogram.Component.TrivialInstance, any>;
-            /** 属性的类型（可以指定多个） */
-            optionalTypes?: PropertyType[];
-        };
-    }
-    export {};
-}
+/// <reference types="miniprogram-api-typings" />
+export declare namespace Weapp {
+    export interface FormField {
+        data: {
+            name: string;
+            value: any;
+        };
+    }
+    interface Target {
+        id: string;
+        tagName: string;
+        dataset: {
+            [key: string]: any;
+        };
+    }
+    export interface Event {
+        /**
+         * 代表事件的类型。
+         */
+        type: string;
+        /**
+         * 页面打开到触发事件所经过的毫秒数。
+         */
+        timeStamp: number;
+        /**
+         * 触发事件的源组件。
+         */
+        target: Target;
+        /**
+         * 事件绑定的当前组件。
+         */
+        currentTarget: Target;
+        /**
+         * 额外的信息
+         */
+        detail: any;
+    }
+    interface Touch {
+        /**
+         * 触摸点的标识符
+         */
+        identifier: number;
+        /**
+         * 距离文档左上角的距离，文档的左上角为原点 ，横向为X轴，纵向为Y轴
+         */
+        pageX: number;
+        /**
+         * 距离文档左上角的距离，文档的左上角为原点 ，横向为X轴，纵向为Y轴
+         */
+        pageY: number;
+        /**
+         * 距离页面可显示区域（屏幕除去导航条）左上角距离，横向为X轴，纵向为Y轴
+         */
+        clientX: number;
+        /**
+         * 距离页面可显示区域（屏幕除去导航条）左上角距离，横向为X轴，纵向为Y轴
+         */
+        clientY: number;
+    }
+    export interface TouchEvent extends Event {
+        touches: Array<Touch>;
+        changedTouches: Array<Touch>;
+    }
+    /**
+     * relation定义，miniprogram-api-typings缺少this定义
+     */
+    export interface RelationOption<Instance> {
+        /** 目标组件的相对关系 */
+        type: 'parent' | 'child' | 'ancestor' | 'descendant';
+        /** 关系生命周期函数，当关系被建立在页面节点树中时触发，触发时机在组件attached生命周期之后 */
+        linked?(this: Instance, target: WechatMiniprogram.Component.TrivialInstance): void;
+        /** 关系生命周期函数，当关系在页面节点树中发生改变时触发，触发时机在组件moved生命周期之后 */
+        linkChanged?(this: Instance, target: WechatMiniprogram.Component.TrivialInstance): void;
+        /** 关系生命周期函数，当关系脱离页面节点树时触发，触发时机在组件detached生命周期之后 */
+        unlinked?(this: Instance, target: WechatMiniprogram.Component.TrivialInstance): void;
+        /** 如果这一项被设置，则它表示关联的目标节点所应具有的behavior，所有拥有这一behavior的组件节点都会被关联 */
+        target?: string;
+    }
+    /**
+     * obverser定义，miniprogram-api-typings缺少this定义
+     */
+    type Observer<Instance, T> = (this: Instance, newVal: T, oldVal: T, changedPath: Array<string | number>) => void;
+    /**
+     * watch定义
+     */
+    export interface WatchOption<Instance> {
+        [name: string]: string | Observer<Instance, any>;
+    }
+    /**
+     * methods定义，miniprogram-api-typings缺少this定义
+     */
+    export interface MethodOption<Instance> {
+        [name: string]: (this: Instance, ...args: any[]) => any;
+    }
+    export interface ComputedOption<Instance> {
+        [name: string]: (this: Instance) => any;
+    }
+    type PropertyType = StringConstructor | NumberConstructor | BooleanConstructor | ArrayConstructor | ObjectConstructor | FunctionConstructor | null;
+    export interface PropertyOption {
+        [name: string]: PropertyType | PropertyType[] | {
+            /** 属性类型 */
+            type: PropertyType | PropertyType[];
+            /** 属性初始值 */
+            value?: any;
+            /** 属性值被更改时的响应函数 */
+            observer?: string | Observer<WechatMiniprogram.Component.TrivialInstance, any>;
+            /** 属性的类型（可以指定多个） */
+            optionalTypes?: PropertyType[];
+        };
+    }
+    export {};
+}
diff --git a/litemall-wx/lib/vant-weapp/dialog/dialog.d.ts b/litemall-wx/lib/vant-weapp/dialog/dialog.d.ts
index 66769a6d..0b679adf 100644
--- a/litemall-wx/lib/vant-weapp/dialog/dialog.d.ts
+++ b/litemall-wx/lib/vant-weapp/dialog/dialog.d.ts
@@ -1,47 +1,47 @@
-/// <reference types="miniprogram-api-typings" />
-declare type DialogAction = 'confirm' | 'cancel';
-declare type DialogOptions = {
-    lang?: string;
-    show?: boolean;
-    title?: string;
-    width?: string | number;
-    zIndex?: number;
-    context?: WechatMiniprogram.Page.TrivialInstance | WechatMiniprogram.Component.TrivialInstance;
-    message?: string;
-    overlay?: boolean;
-    selector?: string;
-    ariaLabel?: string;
-    className?: string;
-    customStyle?: string;
-    transition?: string;
-    asyncClose?: boolean;
-    businessId?: number;
-    sessionFrom?: string;
-    overlayStyle?: string;
-    appParameter?: string;
-    messageAlign?: string;
-    sendMessageImg?: string;
-    showMessageCard?: boolean;
-    sendMessagePath?: string;
-    sendMessageTitle?: string;
-    confirmButtonText?: string;
-    cancelButtonText?: string;
-    showConfirmButton?: boolean;
-    showCancelButton?: boolean;
-    closeOnClickOverlay?: boolean;
-    confirmButtonOpenType?: string;
-};
-interface Dialog {
-    (options: DialogOptions): Promise<DialogAction>;
-    alert?: (options: DialogOptions) => Promise<DialogAction>;
-    confirm?: (options: DialogOptions) => Promise<DialogAction>;
-    close?: () => void;
-    stopLoading?: () => void;
-    install?: () => void;
-    setDefaultOptions?: (options: DialogOptions) => void;
-    resetDefaultOptions?: () => void;
-    defaultOptions?: DialogOptions;
-    currentOptions?: DialogOptions;
-}
-declare const Dialog: Dialog;
-export default Dialog;
+/// <reference types="miniprogram-api-typings" />
+declare type DialogAction = 'confirm' | 'cancel';
+declare type DialogOptions = {
+    lang?: string;
+    show?: boolean;
+    title?: string;
+    width?: string | number;
+    zIndex?: number;
+    context?: WechatMiniprogram.Page.TrivialInstance | WechatMiniprogram.Component.TrivialInstance;
+    message?: string;
+    overlay?: boolean;
+    selector?: string;
+    ariaLabel?: string;
+    className?: string;
+    customStyle?: string;
+    transition?: string;
+    asyncClose?: boolean;
+    businessId?: number;
+    sessionFrom?: string;
+    overlayStyle?: string;
+    appParameter?: string;
+    messageAlign?: string;
+    sendMessageImg?: string;
+    showMessageCard?: boolean;
+    sendMessagePath?: string;
+    sendMessageTitle?: string;
+    confirmButtonText?: string;
+    cancelButtonText?: string;
+    showConfirmButton?: boolean;
+    showCancelButton?: boolean;
+    closeOnClickOverlay?: boolean;
+    confirmButtonOpenType?: string;
+};
+interface Dialog {
+    (options: DialogOptions): Promise<DialogAction>;
+    alert?: (options: DialogOptions) => Promise<DialogAction>;
+    confirm?: (options: DialogOptions) => Promise<DialogAction>;
+    close?: () => void;
+    stopLoading?: () => void;
+    install?: () => void;
+    setDefaultOptions?: (options: DialogOptions) => void;
+    resetDefaultOptions?: () => void;
+    defaultOptions?: DialogOptions;
+    currentOptions?: DialogOptions;
+}
+declare const Dialog: Dialog;
+export default Dialog;
diff --git a/litemall-wx/lib/vant-weapp/dialog/dialog.js b/litemall-wx/lib/vant-weapp/dialog/dialog.js
index 4c4f7e47..78dd2498 100644
--- a/litemall-wx/lib/vant-weapp/dialog/dialog.js
+++ b/litemall-wx/lib/vant-weapp/dialog/dialog.js
@@ -1,63 +1,63 @@
-let queue = [];
-function getContext() {
-    const pages = getCurrentPages();
-    return pages[pages.length - 1];
-}
-const Dialog = options => {
-    options = Object.assign(Object.assign({}, Dialog.currentOptions), options);
-    return new Promise((resolve, reject) => {
-        const context = options.context || getContext();
-        const dialog = context.selectComponent(options.selector);
-        delete options.context;
-        delete options.selector;
-        if (dialog) {
-            dialog.setData(Object.assign({ onCancel: reject, onConfirm: resolve }, options));
-            queue.push(dialog);
-        }
-        else {
-            console.warn('未找到 van-dialog 节点，请确认 selector 及 context 是否正确');
-        }
-    });
-};
-Dialog.defaultOptions = {
-    show: true,
-    title: '',
-    width: null,
-    message: '',
-    zIndex: 100,
-    overlay: true,
-    selector: '#van-dialog',
-    className: '',
-    asyncClose: false,
-    transition: 'scale',
-    customStyle: '',
-    messageAlign: '',
-    overlayStyle: '',
-    confirmButtonText: '确认',
-    cancelButtonText: '取消',
-    showConfirmButton: true,
-    showCancelButton: false,
-    closeOnClickOverlay: false,
-    confirmButtonOpenType: ''
-};
-Dialog.alert = Dialog;
-Dialog.confirm = options => Dialog(Object.assign({ showCancelButton: true }, options));
-Dialog.close = () => {
-    queue.forEach(dialog => {
-        dialog.close();
-    });
-    queue = [];
-};
-Dialog.stopLoading = () => {
-    queue.forEach(dialog => {
-        dialog.stopLoading();
-    });
-};
-Dialog.setDefaultOptions = options => {
-    Object.assign(Dialog.currentOptions, options);
-};
-Dialog.resetDefaultOptions = () => {
-    Dialog.currentOptions = Object.assign({}, Dialog.defaultOptions);
-};
-Dialog.resetDefaultOptions();
-export default Dialog;
+let queue = [];
+function getContext() {
+    const pages = getCurrentPages();
+    return pages[pages.length - 1];
+}
+const Dialog = options => {
+    options = Object.assign(Object.assign({}, Dialog.currentOptions), options);
+    return new Promise((resolve, reject) => {
+        const context = options.context || getContext();
+        const dialog = context.selectComponent(options.selector);
+        delete options.context;
+        delete options.selector;
+        if (dialog) {
+            dialog.setData(Object.assign({ onCancel: reject, onConfirm: resolve }, options));
+            queue.push(dialog);
+        }
+        else {
+            console.warn('未找到 van-dialog 节点，请确认 selector 及 context 是否正确');
+        }
+    });
+};
+Dialog.defaultOptions = {
+    show: true,
+    title: '',
+    width: null,
+    message: '',
+    zIndex: 100,
+    overlay: true,
+    selector: '#van-dialog',
+    className: '',
+    asyncClose: false,
+    transition: 'scale',
+    customStyle: '',
+    messageAlign: '',
+    overlayStyle: '',
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    showConfirmButton: true,
+    showCancelButton: false,
+    closeOnClickOverlay: false,
+    confirmButtonOpenType: ''
+};
+Dialog.alert = Dialog;
+Dialog.confirm = options => Dialog(Object.assign({ showCancelButton: true }, options));
+Dialog.close = () => {
+    queue.forEach(dialog => {
+        dialog.close();
+    });
+    queue = [];
+};
+Dialog.stopLoading = () => {
+    queue.forEach(dialog => {
+        dialog.stopLoading();
+    });
+};
+Dialog.setDefaultOptions = options => {
+    Object.assign(Dialog.currentOptions, options);
+};
+Dialog.resetDefaultOptions = () => {
+    Dialog.currentOptions = Object.assign({}, Dialog.defaultOptions);
+};
+Dialog.resetDefaultOptions();
+export default Dialog;
diff --git a/litemall-wx/lib/vant-weapp/dialog/index.d.ts b/litemall-wx/lib/vant-weapp/dialog/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/dialog/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/dialog/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/dialog/index.js b/litemall-wx/lib/vant-weapp/dialog/index.js
index 85d6c3c1..21ea880a 100644
--- a/litemall-wx/lib/vant-weapp/dialog/index.js
+++ b/litemall-wx/lib/vant-weapp/dialog/index.js
@@ -1,119 +1,119 @@
-import { VantComponent } from '../common/component';
-import { button } from '../mixins/button';
-import { openType } from '../mixins/open-type';
-import { addUnit } from '../common/utils';
-import { GRAY, BLUE } from '../common/color';
-VantComponent({
-    mixins: [button, openType],
-    props: {
-        show: Boolean,
-        title: String,
-        message: String,
-        useSlot: Boolean,
-        className: String,
-        customStyle: String,
-        asyncClose: Boolean,
-        messageAlign: String,
-        overlayStyle: String,
-        useTitleSlot: Boolean,
-        showCancelButton: Boolean,
-        closeOnClickOverlay: Boolean,
-        confirmButtonOpenType: String,
-        width: {
-            type: null,
-            observer: 'setWidthWithUnit'
-        },
-        zIndex: {
-            type: Number,
-            value: 2000
-        },
-        confirmButtonText: {
-            type: String,
-            value: '确认'
-        },
-        cancelButtonText: {
-            type: String,
-            value: '取消'
-        },
-        confirmButtonColor: {
-            type: String,
-            value: BLUE
-        },
-        cancelButtonColor: {
-            type: String,
-            value: GRAY
-        },
-        showConfirmButton: {
-            type: Boolean,
-            value: true
-        },
-        overlay: {
-            type: Boolean,
-            value: true
-        },
-        transition: {
-            type: String,
-            value: 'scale'
-        }
-    },
-    data: {
-        loading: {
-            confirm: false,
-            cancel: false
-        }
-    },
-    watch: {
-        show(show) {
-            !show && this.stopLoading();
-        }
-    },
-    methods: {
-        onConfirm() {
-            this.handleAction('confirm');
-        },
-        onCancel() {
-            this.handleAction('cancel');
-        },
-        onClickOverlay() {
-            this.onClose('overlay');
-        },
-        handleAction(action) {
-            if (this.data.asyncClose) {
-                this.setData({
-                    [`loading.${action}`]: true
-                });
-            }
-            this.onClose(action);
-        },
-        close() {
-            this.setData({
-                show: false
-            });
-        },
-        stopLoading() {
-            this.setData({
-                loading: {
-                    confirm: false,
-                    cancel: false
-                }
-            });
-        },
-        onClose(action) {
-            if (!this.data.asyncClose) {
-                this.close();
-            }
-            this.$emit('close', action);
-            // 把 dialog 实例传递出去，可以通过 stopLoading() 在外部关闭按钮的 loading
-            this.$emit(action, { dialog: this });
-            const callback = this.data[action === 'confirm' ? 'onConfirm' : 'onCancel'];
-            if (callback) {
-                callback(this);
-            }
-        },
-        setWidthWithUnit(val) {
-            this.setData({
-                widthWithUnit: addUnit(val)
-            });
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { button } from '../mixins/button';
+import { openType } from '../mixins/open-type';
+import { addUnit } from '../common/utils';
+import { GRAY, BLUE } from '../common/color';
+VantComponent({
+    mixins: [button, openType],
+    props: {
+        show: Boolean,
+        title: String,
+        message: String,
+        useSlot: Boolean,
+        className: String,
+        customStyle: String,
+        asyncClose: Boolean,
+        messageAlign: String,
+        overlayStyle: String,
+        useTitleSlot: Boolean,
+        showCancelButton: Boolean,
+        closeOnClickOverlay: Boolean,
+        confirmButtonOpenType: String,
+        width: {
+            type: null,
+            observer: 'setWidthWithUnit'
+        },
+        zIndex: {
+            type: Number,
+            value: 2000
+        },
+        confirmButtonText: {
+            type: String,
+            value: '确认'
+        },
+        cancelButtonText: {
+            type: String,
+            value: '取消'
+        },
+        confirmButtonColor: {
+            type: String,
+            value: BLUE
+        },
+        cancelButtonColor: {
+            type: String,
+            value: GRAY
+        },
+        showConfirmButton: {
+            type: Boolean,
+            value: true
+        },
+        overlay: {
+            type: Boolean,
+            value: true
+        },
+        transition: {
+            type: String,
+            value: 'scale'
+        }
+    },
+    data: {
+        loading: {
+            confirm: false,
+            cancel: false
+        }
+    },
+    watch: {
+        show(show) {
+            !show && this.stopLoading();
+        }
+    },
+    methods: {
+        onConfirm() {
+            this.handleAction('confirm');
+        },
+        onCancel() {
+            this.handleAction('cancel');
+        },
+        onClickOverlay() {
+            this.onClose('overlay');
+        },
+        handleAction(action) {
+            if (this.data.asyncClose) {
+                this.setData({
+                    [`loading.${action}`]: true
+                });
+            }
+            this.onClose(action);
+        },
+        close() {
+            this.setData({
+                show: false
+            });
+        },
+        stopLoading() {
+            this.setData({
+                loading: {
+                    confirm: false,
+                    cancel: false
+                }
+            });
+        },
+        onClose(action) {
+            if (!this.data.asyncClose) {
+                this.close();
+            }
+            this.$emit('close', action);
+            // 把 dialog 实例传递出去，可以通过 stopLoading() 在外部关闭按钮的 loading
+            this.$emit(action, { dialog: this });
+            const callback = this.data[action === 'confirm' ? 'onConfirm' : 'onCancel'];
+            if (callback) {
+                callback(this);
+            }
+        },
+        setWidthWithUnit(val) {
+            this.setData({
+                widthWithUnit: addUnit(val)
+            });
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/dialog/index.json b/litemall-wx/lib/vant-weapp/dialog/index.json
index e2ee09ae..75feee24 100644
--- a/litemall-wx/lib/vant-weapp/dialog/index.json
+++ b/litemall-wx/lib/vant-weapp/dialog/index.json
@@ -1,7 +1,7 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-popup": "../popup/index",
-    "van-button": "../button/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-popup": "../popup/index",
+    "van-button": "../button/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/dialog/index.wxml b/litemall-wx/lib/vant-weapp/dialog/index.wxml
index 854e8a14..fec27b02 100644
--- a/litemall-wx/lib/vant-weapp/dialog/index.wxml
+++ b/litemall-wx/lib/vant-weapp/dialog/index.wxml
@@ -1,69 +1,69 @@
-<van-popup
-  show="{{ show }}"
-  z-index="{{ zIndex }}"
-  overlay="{{ overlay }}"
-  transition="{{ transition }}"
-  custom-class="van-dialog {{ className }}"
-  custom-style="{{ widthWithUnit ? 'width: ' + widthWithUnit + ';' : '' }}{{ customStyle }}"
-  overlay-style="{{ overlayStyle }}"
-  close-on-click-overlay="{{ closeOnClickOverlay }}"
-  bind:close="onClickOverlay"
->
-  <view
-    wx:if="{{ title || useTitleSlot  }}"
-    class="van-dialog__header {{ message || useSlot ? '' : 'van-dialog--isolated' }}"
-  >
-    <slot wx:if="{{ useTitleSlot }}" name="title" />
-    <block wx:elif="{{ title }}"> {{ title }}</block>
-  </view>
-
-  <slot wx:if="{{ useSlot }}" />
-  <view
-    wx:elif="{{ message }}"
-    class="van-dialog__message {{ title ? 'van-dialog__message--has-title' : '' }} {{ messageAlign ? 'van-dialog__message--' + messageAlign : '' }}"
-  >
-    <text class="van-dialog__message-text">{{ message }}</text>
-  </view>
-
-  <view class="van-hairline--top van-dialog__footer">
-    <van-button
-      wx:if="{{ showCancelButton }}"
-      size="large"
-      loading="{{ loading.cancel }}"
-      class="van-dialog__button van-hairline--right"
-      custom-class="van-dialog__cancel"
-      custom-style="color: {{ cancelButtonColor }}"
-      bind:click="onCancel"
-    >
-      {{ cancelButtonText }}
-    </van-button>
-    <van-button
-      wx:if="{{ showConfirmButton }}"
-      size="large"
-      class="van-dialog__button"
-      loading="{{ loading.confirm }}"
-      custom-class="van-dialog__confirm"
-      custom-style="color: {{ confirmButtonColor }}"
-
-      open-type="{{ confirmButtonOpenType }}"
-      lang="{{ lang }}"
-      business-id="{{ businessId }}"
-      session-from="{{ sessionFrom }}"
-      send-message-title="{{ sendMessageTitle }}"
-      send-message-path="{{ sendMessagePath }}"
-      send-message-img="{{ sendMessageImg }}"
-      show-message-card="{{ showMessageCard }}"
-      app-parameter="{{ appParameter }}"
-
-      bind:click="onConfirm"
-      bindgetuserinfo="bindGetUserInfo"
-      bindcontact="bindContact"
-      bindgetphonenumber="bindGetPhoneNumber"
-      binderror="bindError"
-      bindlaunchapp="bindLaunchApp"
-      bindopensetting="bindOpenSetting"
-    >
-      {{ confirmButtonText }}
-    </van-button>
-  </view>
-</van-popup>
+<van-popup
+  show="{{ show }}"
+  z-index="{{ zIndex }}"
+  overlay="{{ overlay }}"
+  transition="{{ transition }}"
+  custom-class="van-dialog {{ className }}"
+  custom-style="{{ widthWithUnit ? 'width: ' + widthWithUnit + ';' : '' }}{{ customStyle }}"
+  overlay-style="{{ overlayStyle }}"
+  close-on-click-overlay="{{ closeOnClickOverlay }}"
+  bind:close="onClickOverlay"
+>
+  <view
+    wx:if="{{ title || useTitleSlot  }}"
+    class="van-dialog__header {{ message || useSlot ? '' : 'van-dialog--isolated' }}"
+  >
+    <slot wx:if="{{ useTitleSlot }}" name="title" />
+    <block wx:elif="{{ title }}"> {{ title }}</block>
+  </view>
+
+  <slot wx:if="{{ useSlot }}" />
+  <view
+    wx:elif="{{ message }}"
+    class="van-dialog__message {{ title ? 'van-dialog__message--has-title' : '' }} {{ messageAlign ? 'van-dialog__message--' + messageAlign : '' }}"
+  >
+    <text class="van-dialog__message-text">{{ message }}</text>
+  </view>
+
+  <view class="van-hairline--top van-dialog__footer">
+    <van-button
+      wx:if="{{ showCancelButton }}"
+      size="large"
+      loading="{{ loading.cancel }}"
+      class="van-dialog__button van-hairline--right"
+      custom-class="van-dialog__cancel"
+      custom-style="color: {{ cancelButtonColor }}"
+      bind:click="onCancel"
+    >
+      {{ cancelButtonText }}
+    </van-button>
+    <van-button
+      wx:if="{{ showConfirmButton }}"
+      size="large"
+      class="van-dialog__button"
+      loading="{{ loading.confirm }}"
+      custom-class="van-dialog__confirm"
+      custom-style="color: {{ confirmButtonColor }}"
+
+      open-type="{{ confirmButtonOpenType }}"
+      lang="{{ lang }}"
+      business-id="{{ businessId }}"
+      session-from="{{ sessionFrom }}"
+      send-message-title="{{ sendMessageTitle }}"
+      send-message-path="{{ sendMessagePath }}"
+      send-message-img="{{ sendMessageImg }}"
+      show-message-card="{{ showMessageCard }}"
+      app-parameter="{{ appParameter }}"
+
+      bind:click="onConfirm"
+      bindgetuserinfo="bindGetUserInfo"
+      bindcontact="bindContact"
+      bindgetphonenumber="bindGetPhoneNumber"
+      binderror="bindError"
+      bindlaunchapp="bindLaunchApp"
+      bindopensetting="bindOpenSetting"
+    >
+      {{ confirmButtonText }}
+    </van-button>
+  </view>
+</van-popup>
diff --git a/litemall-wx/lib/vant-weapp/divider/index.d.ts b/litemall-wx/lib/vant-weapp/divider/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/divider/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/divider/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/divider/index.js b/litemall-wx/lib/vant-weapp/divider/index.js
index 73f833d6..8b68f892 100644
--- a/litemall-wx/lib/vant-weapp/divider/index.js
+++ b/litemall-wx/lib/vant-weapp/divider/index.js
@@ -1,33 +1,33 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    props: {
-        dashed: {
-            type: Boolean,
-            value: false
-        },
-        hairline: {
-            type: Boolean,
-            value: false
-        },
-        contentPosition: {
-            type: String,
-            value: ''
-        },
-        fontSize: {
-            type: Number,
-            value: ''
-        },
-        borderColor: {
-            type: String,
-            value: ''
-        },
-        textColor: {
-            type: String,
-            value: ''
-        },
-        customStyle: {
-            type: String,
-            value: ''
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    props: {
+        dashed: {
+            type: Boolean,
+            value: false
+        },
+        hairline: {
+            type: Boolean,
+            value: false
+        },
+        contentPosition: {
+            type: String,
+            value: ''
+        },
+        fontSize: {
+            type: Number,
+            value: ''
+        },
+        borderColor: {
+            type: String,
+            value: ''
+        },
+        textColor: {
+            type: String,
+            value: ''
+        },
+        customStyle: {
+            type: String,
+            value: ''
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/divider/index.json b/litemall-wx/lib/vant-weapp/divider/index.json
index e8cfaaf8..011372eb 100644
--- a/litemall-wx/lib/vant-weapp/divider/index.json
+++ b/litemall-wx/lib/vant-weapp/divider/index.json
@@ -1,4 +1,4 @@
-{
-  "component": true,
-  "usingComponents": {}
+{
+  "component": true,
+  "usingComponents": {}
 }
\ No newline at end of file
diff --git a/litemall-wx/lib/vant-weapp/divider/index.wxml b/litemall-wx/lib/vant-weapp/divider/index.wxml
index 412e73f2..b1d8ba47 100644
--- a/litemall-wx/lib/vant-weapp/divider/index.wxml
+++ b/litemall-wx/lib/vant-weapp/divider/index.wxml
@@ -1,8 +1,8 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view
-  class="custom-class {{ utils.bem('divider', [{dashed, hairline}, contentPosition]) }}"
-  style="{{ borderColor  ? 'border-color: ' + borderColor + ';' : '' }}{{ textColor ? 'color: ' + textColor + ';' : '' }} {{ fontSize ? 'font-size: ' + fontSize + 'px;' : '' }} {{ customStyle }}"
->
-  <slot />
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="custom-class {{ utils.bem('divider', [{dashed, hairline}, contentPosition]) }}"
+  style="{{ borderColor  ? 'border-color: ' + borderColor + ';' : '' }}{{ textColor ? 'color: ' + textColor + ';' : '' }} {{ fontSize ? 'font-size: ' + fontSize + 'px;' : '' }} {{ customStyle }}"
+>
+  <slot />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/dropdown-item/index.d.ts b/litemall-wx/lib/vant-weapp/dropdown-item/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/dropdown-item/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/dropdown-item/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/dropdown-item/index.js b/litemall-wx/lib/vant-weapp/dropdown-item/index.js
index f2b6c481..0ec7f7f4 100644
--- a/litemall-wx/lib/vant-weapp/dropdown-item/index.js
+++ b/litemall-wx/lib/vant-weapp/dropdown-item/index.js
@@ -1,104 +1,104 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    field: true,
-    relation: {
-        name: 'dropdown-menu',
-        type: 'ancestor',
-        linked(target) {
-            this.parent = target;
-            this.updateDataFromParent();
-        },
-        unlinked() {
-            this.parent = null;
-        }
-    },
-    props: {
-        value: {
-            type: null,
-            observer: 'rerender'
-        },
-        title: {
-            type: String,
-            observer: 'rerender'
-        },
-        disabled: Boolean,
-        titleClass: {
-            type: String,
-            observer: 'rerender'
-        },
-        options: {
-            type: Array,
-            value: [],
-            observer: 'rerender'
-        }
-    },
-    data: {
-        transition: true,
-        showPopup: false,
-        showWrapper: false,
-        displayTitle: ''
-    },
-    methods: {
-        rerender() {
-            wx.nextTick(() => {
-                this.parent && this.parent.updateItemListData();
-            });
-        },
-        updateDataFromParent() {
-            if (this.parent) {
-                const { overlay, duration, activeColor, closeOnClickOverlay, direction } = this.parent.data;
-                this.setData({
-                    overlay,
-                    duration,
-                    activeColor,
-                    closeOnClickOverlay,
-                    direction
-                });
-            }
-        },
-        onClickOverlay() {
-            this.toggle();
-            this.$emit('close');
-        },
-        onOptionTap(event) {
-            const { option } = event.currentTarget.dataset;
-            const { value } = option;
-            const shouldEmitChange = this.data.value !== value;
-            this.setData({ showPopup: false, value });
-            setTimeout(() => {
-                this.setData({ showWrapper: false });
-            }, this.data.duration || 0);
-            this.rerender();
-            if (shouldEmitChange) {
-                this.$emit('change', value);
-            }
-        },
-        toggle(show, options = {}) {
-            const { showPopup, duration } = this.data;
-            if (show == null) {
-                show = !showPopup;
-            }
-            if (show === showPopup) {
-                return;
-            }
-            if (!show) {
-                const time = options.immediate ? 0 : duration;
-                this.setData({ transition: !options.immediate, showPopup: show });
-                setTimeout(() => {
-                    this.setData({ showWrapper: false });
-                }, time);
-                this.rerender();
-                return;
-            }
-            this.parent.getChildWrapperStyle().then((wrapperStyle = '') => {
-                this.setData({
-                    transition: !options.immediate,
-                    showPopup: show,
-                    wrapperStyle,
-                    showWrapper: true
-                });
-                this.rerender();
-            });
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    field: true,
+    relation: {
+        name: 'dropdown-menu',
+        type: 'ancestor',
+        linked(target) {
+            this.parent = target;
+            this.updateDataFromParent();
+        },
+        unlinked() {
+            this.parent = null;
+        }
+    },
+    props: {
+        value: {
+            type: null,
+            observer: 'rerender'
+        },
+        title: {
+            type: String,
+            observer: 'rerender'
+        },
+        disabled: Boolean,
+        titleClass: {
+            type: String,
+            observer: 'rerender'
+        },
+        options: {
+            type: Array,
+            value: [],
+            observer: 'rerender'
+        }
+    },
+    data: {
+        transition: true,
+        showPopup: false,
+        showWrapper: false,
+        displayTitle: ''
+    },
+    methods: {
+        rerender() {
+            wx.nextTick(() => {
+                this.parent && this.parent.updateItemListData();
+            });
+        },
+        updateDataFromParent() {
+            if (this.parent) {
+                const { overlay, duration, activeColor, closeOnClickOverlay, direction } = this.parent.data;
+                this.setData({
+                    overlay,
+                    duration,
+                    activeColor,
+                    closeOnClickOverlay,
+                    direction
+                });
+            }
+        },
+        onClickOverlay() {
+            this.toggle();
+            this.$emit('close');
+        },
+        onOptionTap(event) {
+            const { option } = event.currentTarget.dataset;
+            const { value } = option;
+            const shouldEmitChange = this.data.value !== value;
+            this.setData({ showPopup: false, value });
+            setTimeout(() => {
+                this.setData({ showWrapper: false });
+            }, this.data.duration || 0);
+            this.rerender();
+            if (shouldEmitChange) {
+                this.$emit('change', value);
+            }
+        },
+        toggle(show, options = {}) {
+            const { showPopup, duration } = this.data;
+            if (show == null) {
+                show = !showPopup;
+            }
+            if (show === showPopup) {
+                return;
+            }
+            if (!show) {
+                const time = options.immediate ? 0 : duration;
+                this.setData({ transition: !options.immediate, showPopup: show });
+                setTimeout(() => {
+                    this.setData({ showWrapper: false });
+                }, time);
+                this.rerender();
+                return;
+            }
+            this.parent.getChildWrapperStyle().then((wrapperStyle = '') => {
+                this.setData({
+                    transition: !options.immediate,
+                    showPopup: show,
+                    wrapperStyle,
+                    showWrapper: true
+                });
+                this.rerender();
+            });
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/dropdown-item/index.json b/litemall-wx/lib/vant-weapp/dropdown-item/index.json
index 88d54099..b30d74be 100644
--- a/litemall-wx/lib/vant-weapp/dropdown-item/index.json
+++ b/litemall-wx/lib/vant-weapp/dropdown-item/index.json
@@ -1,8 +1,8 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-popup": "../popup/index",
-    "van-cell": "../cell/index",
-    "van-icon": "../icon/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-popup": "../popup/index",
+    "van-cell": "../cell/index",
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/dropdown-item/index.wxml b/litemall-wx/lib/vant-weapp/dropdown-item/index.wxml
index 07bca8d5..be8fd06b 100644
--- a/litemall-wx/lib/vant-weapp/dropdown-item/index.wxml
+++ b/litemall-wx/lib/vant-weapp/dropdown-item/index.wxml
@@ -1,44 +1,44 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view
-  wx:if="{{ showWrapper }}"
-  class="{{ utils.bem('dropdown-item', direction) }}"
-  style="{{ wrapperStyle }}"
->
-  <van-popup
-    show="{{ showPopup }}"
-    custom-style="position: absolute;"
-    overlay-style="position: absolute;"
-    overlay="{{ overlay }}"
-    position="{{ direction === 'down' ? 'top' : 'bottom' }}"
-    duration="{{ transition ? duration : 0 }}"
-    close-on-click-overlay="{{ closeOnClickOverlay }}"
-    bind:close="onClickOverlay"
-  >
-    <van-cell
-      wx:for="{{ options }}"
-      wx:key="{{ item.value }}"
-      data-option="{{ item }}"
-      class="{{ utils.bem('dropdown-item__option', { active: item.value === value } ) }}"
-      clickable
-      icon="{{ item.icon }}"
-      bind:tap="onOptionTap"
-    >
-      <view
-        slot="title"
-        class="van-dropdown-item__title"
-        style="{{ item.value === value  ? 'color:' + activeColor : '' }}"
-      >
-        {{ item.text }}
-      </view>
-      <van-icon
-        wx:if="{{ item.value === value }}"
-        name="success"
-        class="van-dropdown-item__icon"
-        color="{{ activeColor }}"
-      />
-    </van-cell>
-
-    <slot />
-  </van-popup>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  wx:if="{{ showWrapper }}"
+  class="{{ utils.bem('dropdown-item', direction) }}"
+  style="{{ wrapperStyle }}"
+>
+  <van-popup
+    show="{{ showPopup }}"
+    custom-style="position: absolute;"
+    overlay-style="position: absolute;"
+    overlay="{{ overlay }}"
+    position="{{ direction === 'down' ? 'top' : 'bottom' }}"
+    duration="{{ transition ? duration : 0 }}"
+    close-on-click-overlay="{{ closeOnClickOverlay }}"
+    bind:close="onClickOverlay"
+  >
+    <van-cell
+      wx:for="{{ options }}"
+      wx:key="{{ item.value }}"
+      data-option="{{ item }}"
+      class="{{ utils.bem('dropdown-item__option', { active: item.value === value } ) }}"
+      clickable
+      icon="{{ item.icon }}"
+      bind:tap="onOptionTap"
+    >
+      <view
+        slot="title"
+        class="van-dropdown-item__title"
+        style="{{ item.value === value  ? 'color:' + activeColor : '' }}"
+      >
+        {{ item.text }}
+      </view>
+      <van-icon
+        wx:if="{{ item.value === value }}"
+        name="success"
+        class="van-dropdown-item__icon"
+        color="{{ activeColor }}"
+      />
+    </van-cell>
+
+    <slot />
+  </van-popup>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/dropdown-menu/index.d.ts b/litemall-wx/lib/vant-weapp/dropdown-menu/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/dropdown-menu/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/dropdown-menu/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/dropdown-menu/index.js b/litemall-wx/lib/vant-weapp/dropdown-menu/index.js
index 889387be..9b1ddabb 100644
--- a/litemall-wx/lib/vant-weapp/dropdown-menu/index.js
+++ b/litemall-wx/lib/vant-weapp/dropdown-menu/index.js
@@ -1,121 +1,121 @@
-import { VantComponent } from '../common/component';
-import { addUnit } from '../common/utils';
-let ARRAY = [];
-VantComponent({
-    field: true,
-    relation: {
-        name: 'dropdown-item',
-        type: 'descendant',
-        linked(target) {
-            this.children.push(target);
-            this.updateItemListData();
-        },
-        unlinked(target) {
-            this.children = this.children.filter((child) => child !== target);
-            this.updateItemListData();
-        }
-    },
-    props: {
-        activeColor: {
-            type: String,
-            observer: 'updateChildrenData'
-        },
-        overlay: {
-            type: Boolean,
-            value: true,
-            observer: 'updateChildrenData'
-        },
-        zIndex: {
-            type: Number,
-            value: 10
-        },
-        duration: {
-            type: Number,
-            value: 200,
-            observer: 'updateChildrenData'
-        },
-        direction: {
-            type: String,
-            value: 'down',
-            observer: 'updateChildrenData'
-        },
-        closeOnClickOverlay: {
-            type: Boolean,
-            value: true,
-            observer: 'updateChildrenData'
-        },
-        closeOnClickOutside: {
-            type: Boolean,
-            value: true
-        }
-    },
-    data: {
-        itemListData: []
-    },
-    beforeCreate() {
-        const { windowHeight } = wx.getSystemInfoSync();
-        this.windowHeight = windowHeight;
-        this.children = [];
-        ARRAY.push(this);
-    },
-    destroyed() {
-        ARRAY = ARRAY.filter(item => item !== this);
-    },
-    methods: {
-        updateItemListData() {
-            this.setData({
-                itemListData: this.children.map((child) => child.data)
-            });
-        },
-        updateChildrenData() {
-            this.children.forEach((child) => {
-                child.updateDataFromParent();
-            });
-        },
-        toggleItem(active) {
-            this.children.forEach((item, index) => {
-                const { showPopup } = item.data;
-                if (index === active) {
-                    item.toggle();
-                }
-                else if (showPopup) {
-                    item.toggle(false, { immediate: true });
-                }
-            });
-        },
-        close() {
-            this.children.forEach((child) => {
-                child.toggle(false, { immediate: true });
-            });
-        },
-        getChildWrapperStyle() {
-            const { zIndex, direction } = this.data;
-            return this.getRect('.van-dropdown-menu').then((rect) => {
-                const { top = 0, bottom = 0 } = rect;
-                const offset = direction === 'down' ? bottom : this.windowHeight - top;
-                let wrapperStyle = `z-index: ${zIndex};`;
-                if (direction === 'down') {
-                    wrapperStyle += `top: ${addUnit(offset)};`;
-                }
-                else {
-                    wrapperStyle += `bottom: ${addUnit(offset)};`;
-                }
-                return wrapperStyle;
-            });
-        },
-        onTitleTap(event) {
-            const { index } = event.currentTarget.dataset;
-            const child = this.children[index];
-            if (!child.data.disabled) {
-                ARRAY.forEach(menuItem => {
-                    if (menuItem &&
-                        menuItem.data.closeOnClickOutside &&
-                        menuItem !== this) {
-                        menuItem.close();
-                    }
-                });
-                this.toggleItem(index);
-            }
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { addUnit } from '../common/utils';
+let ARRAY = [];
+VantComponent({
+    field: true,
+    relation: {
+        name: 'dropdown-item',
+        type: 'descendant',
+        linked(target) {
+            this.children.push(target);
+            this.updateItemListData();
+        },
+        unlinked(target) {
+            this.children = this.children.filter((child) => child !== target);
+            this.updateItemListData();
+        }
+    },
+    props: {
+        activeColor: {
+            type: String,
+            observer: 'updateChildrenData'
+        },
+        overlay: {
+            type: Boolean,
+            value: true,
+            observer: 'updateChildrenData'
+        },
+        zIndex: {
+            type: Number,
+            value: 10
+        },
+        duration: {
+            type: Number,
+            value: 200,
+            observer: 'updateChildrenData'
+        },
+        direction: {
+            type: String,
+            value: 'down',
+            observer: 'updateChildrenData'
+        },
+        closeOnClickOverlay: {
+            type: Boolean,
+            value: true,
+            observer: 'updateChildrenData'
+        },
+        closeOnClickOutside: {
+            type: Boolean,
+            value: true
+        }
+    },
+    data: {
+        itemListData: []
+    },
+    beforeCreate() {
+        const { windowHeight } = wx.getSystemInfoSync();
+        this.windowHeight = windowHeight;
+        this.children = [];
+        ARRAY.push(this);
+    },
+    destroyed() {
+        ARRAY = ARRAY.filter(item => item !== this);
+    },
+    methods: {
+        updateItemListData() {
+            this.setData({
+                itemListData: this.children.map((child) => child.data)
+            });
+        },
+        updateChildrenData() {
+            this.children.forEach((child) => {
+                child.updateDataFromParent();
+            });
+        },
+        toggleItem(active) {
+            this.children.forEach((item, index) => {
+                const { showPopup } = item.data;
+                if (index === active) {
+                    item.toggle();
+                }
+                else if (showPopup) {
+                    item.toggle(false, { immediate: true });
+                }
+            });
+        },
+        close() {
+            this.children.forEach((child) => {
+                child.toggle(false, { immediate: true });
+            });
+        },
+        getChildWrapperStyle() {
+            const { zIndex, direction } = this.data;
+            return this.getRect('.van-dropdown-menu').then((rect) => {
+                const { top = 0, bottom = 0 } = rect;
+                const offset = direction === 'down' ? bottom : this.windowHeight - top;
+                let wrapperStyle = `z-index: ${zIndex};`;
+                if (direction === 'down') {
+                    wrapperStyle += `top: ${addUnit(offset)};`;
+                }
+                else {
+                    wrapperStyle += `bottom: ${addUnit(offset)};`;
+                }
+                return wrapperStyle;
+            });
+        },
+        onTitleTap(event) {
+            const { index } = event.currentTarget.dataset;
+            const child = this.children[index];
+            if (!child.data.disabled) {
+                ARRAY.forEach(menuItem => {
+                    if (menuItem &&
+                        menuItem.data.closeOnClickOutside &&
+                        menuItem !== this) {
+                        menuItem.close();
+                    }
+                });
+                this.toggleItem(index);
+            }
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/dropdown-menu/index.json b/litemall-wx/lib/vant-weapp/dropdown-menu/index.json
index 32640e0d..1edff938 100644
--- a/litemall-wx/lib/vant-weapp/dropdown-menu/index.json
+++ b/litemall-wx/lib/vant-weapp/dropdown-menu/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
+{
+  "component": true
 }
\ No newline at end of file
diff --git a/litemall-wx/lib/vant-weapp/dropdown-menu/index.wxml b/litemall-wx/lib/vant-weapp/dropdown-menu/index.wxml
index 037ac3b6..2d3451fc 100644
--- a/litemall-wx/lib/vant-weapp/dropdown-menu/index.wxml
+++ b/litemall-wx/lib/vant-weapp/dropdown-menu/index.wxml
@@ -1,23 +1,23 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-<wxs src="./index.wxs" module="computed" />
-
-<view class="van-dropdown-menu van-dropdown-menu--top-bottom">
-  <view
-    wx:for="{{ itemListData }}"
-    wx:key="index"
-    data-index="{{ index }}"
-    class="{{ utils.bem('dropdown-menu__item', { disabled: item.disabled }) }}"
-    bind:tap="onTitleTap"
-  >
-    <view
-      class="{{ item.titleClass }} {{ utils.bem('dropdown-menu__title', { active: item.showPopup, down: item.showPopup === (direction === 'down') }) }}"
-      style="{{ item.showPopup ? 'color:' + activeColor : '' }}"
-    >
-      <view class="van-ellipsis">
-        {{ computed.displayTitle(item) }}
-      </view>
-    </view>
-  </view>
-
-  <slot />
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="computed" />
+
+<view class="van-dropdown-menu van-dropdown-menu--top-bottom">
+  <view
+    wx:for="{{ itemListData }}"
+    wx:key="index"
+    data-index="{{ index }}"
+    class="{{ utils.bem('dropdown-menu__item', { disabled: item.disabled }) }}"
+    bind:tap="onTitleTap"
+  >
+    <view
+      class="{{ item.titleClass }} {{ utils.bem('dropdown-menu__title', { active: item.showPopup, down: item.showPopup === (direction === 'down') }) }}"
+      style="{{ item.showPopup ? 'color:' + activeColor : '' }}"
+    >
+      <view class="van-ellipsis">
+        {{ computed.displayTitle(item) }}
+      </view>
+    </view>
+  </view>
+
+  <slot />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/dropdown-menu/index.wxs b/litemall-wx/lib/vant-weapp/dropdown-menu/index.wxs
index 65388549..ffa262f1 100644
--- a/litemall-wx/lib/vant-weapp/dropdown-menu/index.wxs
+++ b/litemall-wx/lib/vant-weapp/dropdown-menu/index.wxs
@@ -1,16 +1,16 @@
-/* eslint-disable */
-function displayTitle(item) {
-  if (item.title) {
-    return item.title;
-  }
-
-  var match = item.options.filter(function(option) {
-    return option.value === item.value;
-  });
-  var displayTitle = match.length ? match[0].text : '';
-  return displayTitle;
-}
-
-module.exports = {
-  displayTitle: displayTitle
-};
+/* eslint-disable */
+function displayTitle(item) {
+  if (item.title) {
+    return item.title;
+  }
+
+  var match = item.options.filter(function(option) {
+    return option.value === item.value;
+  });
+  var displayTitle = match.length ? match[0].text : '';
+  return displayTitle;
+}
+
+module.exports = {
+  displayTitle: displayTitle
+};
diff --git a/litemall-wx/lib/vant-weapp/field/index.d.ts b/litemall-wx/lib/vant-weapp/field/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/field/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/field/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/field/index.js b/litemall-wx/lib/vant-weapp/field/index.js
index 35dc34c3..8fb3c6e8 100644
--- a/litemall-wx/lib/vant-weapp/field/index.js
+++ b/litemall-wx/lib/vant-weapp/field/index.js
@@ -1,108 +1,108 @@
-import { VantComponent } from '../common/component';
-import { getSystemInfoSync } from '../common/utils';
-VantComponent({
-    field: true,
-    classes: ['input-class', 'right-icon-class'],
-    props: {
-        size: String,
-        icon: String,
-        label: String,
-        error: Boolean,
-        fixed: Boolean,
-        focus: Boolean,
-        center: Boolean,
-        isLink: Boolean,
-        leftIcon: String,
-        rightIcon: String,
-        disabled: Boolean,
-        autosize: Boolean,
-        readonly: Boolean,
-        required: Boolean,
-        password: Boolean,
-        iconClass: String,
-        clearable: Boolean,
-        clickable: Boolean,
-        inputAlign: String,
-        placeholder: String,
-        customStyle: String,
-        confirmType: String,
-        confirmHold: Boolean,
-        holdKeyboard: Boolean,
-        errorMessage: String,
-        arrowDirection: String,
-        placeholderStyle: String,
-        errorMessageAlign: String,
-        selectionEnd: {
-            type: Number,
-            value: -1
-        },
-        selectionStart: {
-            type: Number,
-            value: -1
-        },
-        showConfirmBar: {
-            type: Boolean,
-            value: true
-        },
-        adjustPosition: {
-            type: Boolean,
-            value: true
-        },
-        cursorSpacing: {
-            type: Number,
-            value: 50
-        },
-        maxlength: {
-            type: Number,
-            value: -1
-        },
-        type: {
-            type: String,
-            value: 'text'
-        },
-        border: {
-            type: Boolean,
-            value: true
-        },
-        titleWidth: {
-            type: String,
-            value: '90px'
-        }
-    },
-    data: {
-        focused: false,
-        system: getSystemInfoSync().system.split(' ').shift().toLowerCase()
-    },
-    methods: {
-        onInput(event) {
-            const { value = '' } = event.detail || {};
-            this.setData({ value }, () => {
-                this.emitChange(value);
-            });
-        },
-        onFocus(event) {
-            this.setData({ focused: true });
-            this.$emit('focus', event.detail);
-        },
-        onBlur(event) {
-            this.setData({ focused: false });
-            this.$emit('blur', event.detail);
-        },
-        onClickIcon() {
-            this.$emit('click-icon');
-        },
-        onClear() {
-            this.setData({ value: '' }, () => {
-                this.emitChange('');
-                this.$emit('clear', '');
-            });
-        },
-        onConfirm() {
-            this.$emit('confirm', this.data.value);
-        },
-        emitChange(value) {
-            this.$emit('input', value);
-            this.$emit('change', value);
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { getSystemInfoSync } from '../common/utils';
+VantComponent({
+    field: true,
+    classes: ['input-class', 'right-icon-class'],
+    props: {
+        size: String,
+        icon: String,
+        label: String,
+        error: Boolean,
+        fixed: Boolean,
+        focus: Boolean,
+        center: Boolean,
+        isLink: Boolean,
+        leftIcon: String,
+        rightIcon: String,
+        disabled: Boolean,
+        autosize: Boolean,
+        readonly: Boolean,
+        required: Boolean,
+        password: Boolean,
+        iconClass: String,
+        clearable: Boolean,
+        clickable: Boolean,
+        inputAlign: String,
+        placeholder: String,
+        customStyle: String,
+        confirmType: String,
+        confirmHold: Boolean,
+        holdKeyboard: Boolean,
+        errorMessage: String,
+        arrowDirection: String,
+        placeholderStyle: String,
+        errorMessageAlign: String,
+        selectionEnd: {
+            type: Number,
+            value: -1
+        },
+        selectionStart: {
+            type: Number,
+            value: -1
+        },
+        showConfirmBar: {
+            type: Boolean,
+            value: true
+        },
+        adjustPosition: {
+            type: Boolean,
+            value: true
+        },
+        cursorSpacing: {
+            type: Number,
+            value: 50
+        },
+        maxlength: {
+            type: Number,
+            value: -1
+        },
+        type: {
+            type: String,
+            value: 'text'
+        },
+        border: {
+            type: Boolean,
+            value: true
+        },
+        titleWidth: {
+            type: String,
+            value: '90px'
+        }
+    },
+    data: {
+        focused: false,
+        system: getSystemInfoSync().system.split(' ').shift().toLowerCase()
+    },
+    methods: {
+        onInput(event) {
+            const { value = '' } = event.detail || {};
+            this.setData({ value }, () => {
+                this.emitChange(value);
+            });
+        },
+        onFocus(event) {
+            this.setData({ focused: true });
+            this.$emit('focus', event.detail);
+        },
+        onBlur(event) {
+            this.setData({ focused: false });
+            this.$emit('blur', event.detail);
+        },
+        onClickIcon() {
+            this.$emit('click-icon');
+        },
+        onClear() {
+            this.setData({ value: '' }, () => {
+                this.emitChange('');
+                this.$emit('clear', '');
+            });
+        },
+        onConfirm() {
+            this.$emit('confirm', this.data.value);
+        },
+        emitChange(value) {
+            this.$emit('input', value);
+            this.$emit('change', value);
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/field/index.json b/litemall-wx/lib/vant-weapp/field/index.json
index 8809c46b..6de6ddca 100644
--- a/litemall-wx/lib/vant-weapp/field/index.json
+++ b/litemall-wx/lib/vant-weapp/field/index.json
@@ -1,7 +1,7 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-cell": "../cell/index",
-    "van-icon": "../icon/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "van-cell": "../cell/index",
+    "van-icon": "../icon/index"
+  }
 }
\ No newline at end of file
diff --git a/litemall-wx/lib/vant-weapp/field/index.wxml b/litemall-wx/lib/vant-weapp/field/index.wxml
index 64901781..d8a80cfc 100644
--- a/litemall-wx/lib/vant-weapp/field/index.wxml
+++ b/litemall-wx/lib/vant-weapp/field/index.wxml
@@ -1,93 +1,93 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<van-cell
-  size="{{ size }}"
-  icon="{{ leftIcon }}"
-  title="{{ label }}"
-  center="{{ center }}"
-  border="{{ border }}"
-  is-link="{{ isLink }}"
-  required="{{ required }}"
-  clickable="{{ clickable }}"
-  title-width="{{ titleWidth }}"
-  custom-style="{{ customStyle }}"
-  arrow-direction="{{ arrowDirection }}"
-  custom-class="van-field"
->
-  <slot name="left-icon" slot="icon" />
-  <slot name="label" slot="title" />
-  <view class="{{ utils.bem('field__body', [type, system]) }}">
-    <textarea
-      wx:if="{{ type === 'textarea' }}"
-      class="input-class {{ utils.bem('field__input', [inputAlign, type, { disabled, error }]) }}"
-      fixed="{{ fixed }}"
-      focus="{{ focus }}"
-      value="{{ value }}"
-      disabled="{{ disabled || readonly }}"
-      maxlength="{{ maxlength }}"
-      placeholder="{{ placeholder }}"
-      placeholder-style="{{ placeholderStyle }}"
-      placeholder-class="{{ utils.bem('field__placeholder', { error }) }}"
-      auto-height="{{ autosize }}"
-      cursor-spacing="{{ cursorSpacing }}"
-      adjust-position="{{ adjustPosition }}"
-      show-confirm-bar="{{ showConfirmBar }}"
-      hold-keyboard="{{ holdKeyboard }}"
-      selection-end="{{ selectionEnd }}"
-      selection-start="{{ selectionStart }}"
-      bindinput="onInput"
-      bind:blur="onBlur"
-      bind:focus="onFocus"
-      bind:confirm="onConfirm"
-    >
-    </textarea>
-    <input
-      wx:else
-      class="input-class {{ utils.bem('field__input', [inputAlign, { disabled, error }]) }}"
-      type="{{ type }}"
-      focus="{{ focus }}"
-      value="{{ value }}"
-      disabled="{{ disabled || readonly }}"
-      maxlength="{{ maxlength }}"
-      placeholder="{{ placeholder }}"
-      placeholder-style="{{ placeholderStyle }}"
-      placeholder-class="{{ utils.bem('field__placeholder', { error }) }}"
-      confirm-type="{{ confirmType }}"
-      confirm-hold="{{ confirmHold }}"
-      hold-keyboard="{{ holdKeyboard }}"
-      cursor-spacing="{{ cursorSpacing }}"
-      adjust-position="{{ adjustPosition }}"
-      selection-end="{{ selectionEnd }}"
-      selection-start="{{ selectionStart }}"
-      password="{{ password || type === 'password' }}"
-      bindinput="onInput"
-      bind:blur="onBlur"
-      bind:focus="onFocus"
-      bind:confirm="onConfirm"
-    />
-    <van-icon
-      wx:if="{{ clearable && focused && value && !readonly }}"
-      size="16px"
-      name="clear"
-      class="van-field__clear-root van-field__icon-root"
-      bindtouchstart="onClear"
-    />
-    <view class="van-field__icon-container" bind:tap="onClickIcon">
-      <van-icon
-        wx:if="{{ rightIcon || icon }}"
-        size="16px"
-        name="{{ rightIcon || icon }}"
-        class="van-field__icon-root {{ iconClass }}"
-        custom-class="right-icon-class"
-      />
-      <slot name="right-icon" />
-      <slot name="icon" />
-    </view>
-    <view class="van-field__button">
-      <slot name="button" />
-    </view>
-  </view>
-  <view wx:if="{{ errorMessage }}" class="van-field__error-message {{ utils.bem('field__error', [errorMessageAlign, { disabled, error }]) }}">
-    {{ errorMessage }}
-  </view>
-</van-cell>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<van-cell
+  size="{{ size }}"
+  icon="{{ leftIcon }}"
+  title="{{ label }}"
+  center="{{ center }}"
+  border="{{ border }}"
+  is-link="{{ isLink }}"
+  required="{{ required }}"
+  clickable="{{ clickable }}"
+  title-width="{{ titleWidth }}"
+  custom-style="{{ customStyle }}"
+  arrow-direction="{{ arrowDirection }}"
+  custom-class="van-field"
+>
+  <slot name="left-icon" slot="icon" />
+  <slot name="label" slot="title" />
+  <view class="{{ utils.bem('field__body', [type, system]) }}">
+    <textarea
+      wx:if="{{ type === 'textarea' }}"
+      class="input-class {{ utils.bem('field__input', [inputAlign, type, { disabled, error }]) }}"
+      fixed="{{ fixed }}"
+      focus="{{ focus }}"
+      value="{{ value }}"
+      disabled="{{ disabled || readonly }}"
+      maxlength="{{ maxlength }}"
+      placeholder="{{ placeholder }}"
+      placeholder-style="{{ placeholderStyle }}"
+      placeholder-class="{{ utils.bem('field__placeholder', { error }) }}"
+      auto-height="{{ autosize }}"
+      cursor-spacing="{{ cursorSpacing }}"
+      adjust-position="{{ adjustPosition }}"
+      show-confirm-bar="{{ showConfirmBar }}"
+      hold-keyboard="{{ holdKeyboard }}"
+      selection-end="{{ selectionEnd }}"
+      selection-start="{{ selectionStart }}"
+      bindinput="onInput"
+      bind:blur="onBlur"
+      bind:focus="onFocus"
+      bind:confirm="onConfirm"
+    >
+    </textarea>
+    <input
+      wx:else
+      class="input-class {{ utils.bem('field__input', [inputAlign, { disabled, error }]) }}"
+      type="{{ type }}"
+      focus="{{ focus }}"
+      value="{{ value }}"
+      disabled="{{ disabled || readonly }}"
+      maxlength="{{ maxlength }}"
+      placeholder="{{ placeholder }}"
+      placeholder-style="{{ placeholderStyle }}"
+      placeholder-class="{{ utils.bem('field__placeholder', { error }) }}"
+      confirm-type="{{ confirmType }}"
+      confirm-hold="{{ confirmHold }}"
+      hold-keyboard="{{ holdKeyboard }}"
+      cursor-spacing="{{ cursorSpacing }}"
+      adjust-position="{{ adjustPosition }}"
+      selection-end="{{ selectionEnd }}"
+      selection-start="{{ selectionStart }}"
+      password="{{ password || type === 'password' }}"
+      bindinput="onInput"
+      bind:blur="onBlur"
+      bind:focus="onFocus"
+      bind:confirm="onConfirm"
+    />
+    <van-icon
+      wx:if="{{ clearable && focused && value && !readonly }}"
+      size="16px"
+      name="clear"
+      class="van-field__clear-root van-field__icon-root"
+      bindtouchstart="onClear"
+    />
+    <view class="van-field__icon-container" bind:tap="onClickIcon">
+      <van-icon
+        wx:if="{{ rightIcon || icon }}"
+        size="16px"
+        name="{{ rightIcon || icon }}"
+        class="van-field__icon-root {{ iconClass }}"
+        custom-class="right-icon-class"
+      />
+      <slot name="right-icon" />
+      <slot name="icon" />
+    </view>
+    <view class="van-field__button">
+      <slot name="button" />
+    </view>
+  </view>
+  <view wx:if="{{ errorMessage }}" class="van-field__error-message {{ utils.bem('field__error', [errorMessageAlign, { disabled, error }]) }}">
+    {{ errorMessage }}
+  </view>
+</van-cell>
diff --git a/litemall-wx/lib/vant-weapp/goods-action-button/index.d.ts b/litemall-wx/lib/vant-weapp/goods-action-button/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/goods-action-button/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/goods-action-button/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/goods-action-button/index.js b/litemall-wx/lib/vant-weapp/goods-action-button/index.js
index 8eed4a3c..dc24af97 100644
--- a/litemall-wx/lib/vant-weapp/goods-action-button/index.js
+++ b/litemall-wx/lib/vant-weapp/goods-action-button/index.js
@@ -1,41 +1,41 @@
-import { VantComponent } from '../common/component';
-import { link } from '../mixins/link';
-import { button } from '../mixins/button';
-import { openType } from '../mixins/open-type';
-VantComponent({
-    mixins: [link, button, openType],
-    relation: {
-        type: 'ancestor',
-        name: 'goods-action',
-        linked(parent) {
-            this.parent = parent;
-        }
-    },
-    props: {
-        text: String,
-        color: String,
-        loading: Boolean,
-        disabled: Boolean,
-        type: {
-            type: String,
-            value: 'danger'
-        }
-    },
-    mounted() {
-        this.updateStyle();
-    },
-    methods: {
-        onClick(event) {
-            this.$emit('click', event.detail);
-            this.jumpLink();
-        },
-        updateStyle() {
-            const { children = [] } = this.parent;
-            const index = children.indexOf(this);
-            this.setData({
-                isFirst: index === 0,
-                isLast: index === children.length - 1
-            });
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { link } from '../mixins/link';
+import { button } from '../mixins/button';
+import { openType } from '../mixins/open-type';
+VantComponent({
+    mixins: [link, button, openType],
+    relation: {
+        type: 'ancestor',
+        name: 'goods-action',
+        linked(parent) {
+            this.parent = parent;
+        }
+    },
+    props: {
+        text: String,
+        color: String,
+        loading: Boolean,
+        disabled: Boolean,
+        type: {
+            type: String,
+            value: 'danger'
+        }
+    },
+    mounted() {
+        this.updateStyle();
+    },
+    methods: {
+        onClick(event) {
+            this.$emit('click', event.detail);
+            this.jumpLink();
+        },
+        updateStyle() {
+            const { children = [] } = this.parent;
+            const index = children.indexOf(this);
+            this.setData({
+                isFirst: index === 0,
+                isLast: index === children.length - 1
+            });
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/goods-action-button/index.json b/litemall-wx/lib/vant-weapp/goods-action-button/index.json
index b5676868..79baa710 100644
--- a/litemall-wx/lib/vant-weapp/goods-action-button/index.json
+++ b/litemall-wx/lib/vant-weapp/goods-action-button/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-button": "../button/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-button": "../button/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/goods-action-button/index.wxml b/litemall-wx/lib/vant-weapp/goods-action-button/index.wxml
index d6d2daab..6adea8f3 100644
--- a/litemall-wx/lib/vant-weapp/goods-action-button/index.wxml
+++ b/litemall-wx/lib/vant-weapp/goods-action-button/index.wxml
@@ -1,28 +1,28 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-<van-button
-  square
-  id="{{ id }}"
-  lang="{{ lang }}"
-  type="{{ type }}"
-  color="{{ color }}"
-  loading="{{ loading }}"
-  disabled="{{ disabled }}"
-  open-type="{{ openType }}"
-  custom-class="{{ utils.bem('goods-action-button', [type, { first: isFirst, last: isLast }]) }}"
-  business-id="{{ businessId }}"
-  session-from="{{ sessionFrom }}"
-  app-parameter="{{ appParameter }}"
-  send-message-img="{{ sendMessageImg }}"
-  send-message-path="{{ sendMessagePath }}"
-  show-message-card="{{ showMessageCard }}"
-  send-message-title="{{ sendMessageTitle }}"
-  bind:click="onClick"
-  binderror="bindError"
-  bindcontact="bindContact"
-  bindopensetting="bindOpenSetting"
-  bindgetuserinfo="bindGetUserInfo"
-  bindgetphonenumber="bindGetPhoneNumber"
-  bindlaunchapp="bindLaunchApp"
->
-  {{ text }}
-</van-button>
+<wxs src="../wxs/utils.wxs" module="utils" />
+<van-button
+  square
+  id="{{ id }}"
+  lang="{{ lang }}"
+  type="{{ type }}"
+  color="{{ color }}"
+  loading="{{ loading }}"
+  disabled="{{ disabled }}"
+  open-type="{{ openType }}"
+  custom-class="{{ utils.bem('goods-action-button', [type, { first: isFirst, last: isLast }]) }}"
+  business-id="{{ businessId }}"
+  session-from="{{ sessionFrom }}"
+  app-parameter="{{ appParameter }}"
+  send-message-img="{{ sendMessageImg }}"
+  send-message-path="{{ sendMessagePath }}"
+  show-message-card="{{ showMessageCard }}"
+  send-message-title="{{ sendMessageTitle }}"
+  bind:click="onClick"
+  binderror="bindError"
+  bindcontact="bindContact"
+  bindopensetting="bindOpenSetting"
+  bindgetuserinfo="bindGetUserInfo"
+  bindgetphonenumber="bindGetPhoneNumber"
+  bindlaunchapp="bindLaunchApp"
+>
+  {{ text }}
+</van-button>
diff --git a/litemall-wx/lib/vant-weapp/goods-action-icon/index.d.ts b/litemall-wx/lib/vant-weapp/goods-action-icon/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/goods-action-icon/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/goods-action-icon/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/goods-action-icon/index.js b/litemall-wx/lib/vant-weapp/goods-action-icon/index.js
index 5a32e70f..267dbef7 100644
--- a/litemall-wx/lib/vant-weapp/goods-action-icon/index.js
+++ b/litemall-wx/lib/vant-weapp/goods-action-icon/index.js
@@ -1,22 +1,22 @@
-import { VantComponent } from '../common/component';
-import { link } from '../mixins/link';
-import { button } from '../mixins/button';
-import { openType } from '../mixins/open-type';
-VantComponent({
-    classes: ['icon-class', 'text-class'],
-    mixins: [link, button, openType],
-    props: {
-        text: String,
-        dot: Boolean,
-        info: String,
-        icon: String,
-        disabled: Boolean,
-        loading: Boolean
-    },
-    methods: {
-        onClick(event) {
-            this.$emit('click', event.detail);
-            this.jumpLink();
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { link } from '../mixins/link';
+import { button } from '../mixins/button';
+import { openType } from '../mixins/open-type';
+VantComponent({
+    classes: ['icon-class', 'text-class'],
+    mixins: [link, button, openType],
+    props: {
+        text: String,
+        dot: Boolean,
+        info: String,
+        icon: String,
+        disabled: Boolean,
+        loading: Boolean
+    },
+    methods: {
+        onClick(event) {
+            this.$emit('click', event.detail);
+            this.jumpLink();
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/goods-action-icon/index.json b/litemall-wx/lib/vant-weapp/goods-action-icon/index.json
index 93bfe8ab..0d8373d7 100644
--- a/litemall-wx/lib/vant-weapp/goods-action-icon/index.json
+++ b/litemall-wx/lib/vant-weapp/goods-action-icon/index.json
@@ -1,7 +1,7 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index",
-    "van-button": "../button/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-button": "../button/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/goods-action-icon/index.wxml b/litemall-wx/lib/vant-weapp/goods-action-icon/index.wxml
index f3f00522..85933db1 100644
--- a/litemall-wx/lib/vant-weapp/goods-action-icon/index.wxml
+++ b/litemall-wx/lib/vant-weapp/goods-action-icon/index.wxml
@@ -1,38 +1,38 @@
-<van-button
-  square
-  id="{{ id }}"
-  size="large"
-  lang="{{ lang }}"
-  loading="{{ loading }}"
-  disabled="{{ disabled }}"
-  open-type="{{ openType }}"
-  business-id="{{ businessId }}"
-  custom-class="van-goods-action-icon"
-  session-from="{{ sessionFrom }}"
-  app-parameter="{{ appParameter }}"
-  send-message-img="{{ sendMessageImg }}"
-  send-message-path="{{ sendMessagePath }}"
-  show-message-card="{{ showMessageCard }}"
-  send-message-title="{{ sendMessageTitle }}"
-  bind:click="onClick"
-  binderror="bindError"
-  bindcontact="bindContact"
-  bindopensetting="bindOpenSetting"
-  bindgetuserinfo="bindGetUserInfo"
-  bindgetphonenumber="bindGetPhoneNumber"
-  bindlaunchapp="bindLaunchApp"
->
-  <view class="van-goods-action-icon__content">
-    <van-icon
-      wx:if="{{ icon }}"
-      size="20px"
-      name="{{ icon }}"
-      dot="{{ dot }}"
-      info="{{ info }}"
-      class="van-goods-action-icon__icon"
-      custom-class="icon-class"
-    />
-    <slot name="icon" />
-    <text class="text-class">{{ text }}</text>
-  </view>
-</van-button>
+<van-button
+  square
+  id="{{ id }}"
+  size="large"
+  lang="{{ lang }}"
+  loading="{{ loading }}"
+  disabled="{{ disabled }}"
+  open-type="{{ openType }}"
+  business-id="{{ businessId }}"
+  custom-class="van-goods-action-icon"
+  session-from="{{ sessionFrom }}"
+  app-parameter="{{ appParameter }}"
+  send-message-img="{{ sendMessageImg }}"
+  send-message-path="{{ sendMessagePath }}"
+  show-message-card="{{ showMessageCard }}"
+  send-message-title="{{ sendMessageTitle }}"
+  bind:click="onClick"
+  binderror="bindError"
+  bindcontact="bindContact"
+  bindopensetting="bindOpenSetting"
+  bindgetuserinfo="bindGetUserInfo"
+  bindgetphonenumber="bindGetPhoneNumber"
+  bindlaunchapp="bindLaunchApp"
+>
+  <view class="van-goods-action-icon__content">
+    <van-icon
+      wx:if="{{ icon }}"
+      size="20px"
+      name="{{ icon }}"
+      dot="{{ dot }}"
+      info="{{ info }}"
+      class="van-goods-action-icon__icon"
+      custom-class="icon-class"
+    />
+    <slot name="icon" />
+    <text class="text-class">{{ text }}</text>
+  </view>
+</van-button>
diff --git a/litemall-wx/lib/vant-weapp/goods-action/index.d.ts b/litemall-wx/lib/vant-weapp/goods-action/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/goods-action/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/goods-action/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/goods-action/index.js b/litemall-wx/lib/vant-weapp/goods-action/index.js
index 4a07ba81..11cb0332 100644
--- a/litemall-wx/lib/vant-weapp/goods-action/index.js
+++ b/litemall-wx/lib/vant-weapp/goods-action/index.js
@@ -1,22 +1,22 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    relation: {
-        type: 'descendant',
-        name: 'goods-action-button',
-        linked(child) {
-            this.children.push(child);
-        },
-        unlinked(child) {
-            this.children = this.children.filter((item) => item !== child);
-        }
-    },
-    beforeCreate() {
-        this.children = [];
-    },
-    props: {
-        safeAreaInsetBottom: {
-            type: Boolean,
-            value: true
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    relation: {
+        type: 'descendant',
+        name: 'goods-action-button',
+        linked(child) {
+            this.children.push(child);
+        },
+        unlinked(child) {
+            this.children = this.children.filter((item) => item !== child);
+        }
+    },
+    beforeCreate() {
+        this.children = [];
+    },
+    props: {
+        safeAreaInsetBottom: {
+            type: Boolean,
+            value: true
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/goods-action/index.json b/litemall-wx/lib/vant-weapp/goods-action/index.json
index 467ce294..efdc3c82 100644
--- a/litemall-wx/lib/vant-weapp/goods-action/index.json
+++ b/litemall-wx/lib/vant-weapp/goods-action/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
-}
+{
+  "component": true
+}
diff --git a/litemall-wx/lib/vant-weapp/goods-action/index.wxml b/litemall-wx/lib/vant-weapp/goods-action/index.wxml
index 569450c7..c9bc8c72 100644
--- a/litemall-wx/lib/vant-weapp/goods-action/index.wxml
+++ b/litemall-wx/lib/vant-weapp/goods-action/index.wxml
@@ -1,5 +1,5 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view class="custom-class {{ utils.bem('goods-action', { safe: safeAreaInsetBottom }) }}">
-  <slot />
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="custom-class {{ utils.bem('goods-action', { safe: safeAreaInsetBottom }) }}">
+  <slot />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/grid-item/index.d.ts b/litemall-wx/lib/vant-weapp/grid-item/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/grid-item/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/grid-item/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/grid-item/index.js b/litemall-wx/lib/vant-weapp/grid-item/index.js
index 756996cb..2c6910af 100644
--- a/litemall-wx/lib/vant-weapp/grid-item/index.js
+++ b/litemall-wx/lib/vant-weapp/grid-item/index.js
@@ -1,68 +1,68 @@
-import { link } from '../mixins/link';
-import { VantComponent } from '../common/component';
-import { addUnit } from '../common/utils';
-VantComponent({
-    relation: {
-        name: 'grid',
-        type: 'ancestor',
-        linked(parent) {
-            this.parent = parent;
-        }
-    },
-    mixins: [link],
-    props: {
-        icon: String,
-        dot: Boolean,
-        info: null,
-        text: String,
-        useSlot: Boolean
-    },
-    mounted() {
-        this.updateStyle();
-    },
-    methods: {
-        updateStyle() {
-            if (!this.parent) {
-                return;
-            }
-            const { data, children } = this.parent;
-            const { columnNum, border, square, gutter, clickable, center } = data;
-            const width = `${100 / columnNum}%`;
-            const styleWrapper = [];
-            styleWrapper.push(`width: ${width}`);
-            if (square) {
-                styleWrapper.push(`padding-top: ${width}`);
-            }
-            if (gutter) {
-                const gutterValue = addUnit(gutter);
-                styleWrapper.push(`padding-right: ${gutterValue}`);
-                const index = children.indexOf(this);
-                if (index >= columnNum) {
-                    styleWrapper.push(`margin-top: ${gutterValue}`);
-                }
-            }
-            let contentStyle = '';
-            if (square && gutter) {
-                const gutterValue = addUnit(gutter);
-                contentStyle = `
-          right: ${gutterValue};
-          bottom: ${gutterValue};
-          height: auto;
-        `;
-            }
-            this.setData({
-                style: styleWrapper.join('; '),
-                contentStyle,
-                center,
-                border,
-                square,
-                gutter,
-                clickable
-            });
-        },
-        onClick() {
-            this.$emit('click');
-            this.jumpLink();
-        }
-    }
-});
+import { link } from '../mixins/link';
+import { VantComponent } from '../common/component';
+import { addUnit } from '../common/utils';
+VantComponent({
+    relation: {
+        name: 'grid',
+        type: 'ancestor',
+        linked(parent) {
+            this.parent = parent;
+        }
+    },
+    mixins: [link],
+    props: {
+        icon: String,
+        dot: Boolean,
+        info: null,
+        text: String,
+        useSlot: Boolean
+    },
+    mounted() {
+        this.updateStyle();
+    },
+    methods: {
+        updateStyle() {
+            if (!this.parent) {
+                return;
+            }
+            const { data, children } = this.parent;
+            const { columnNum, border, square, gutter, clickable, center } = data;
+            const width = `${100 / columnNum}%`;
+            const styleWrapper = [];
+            styleWrapper.push(`width: ${width}`);
+            if (square) {
+                styleWrapper.push(`padding-top: ${width}`);
+            }
+            if (gutter) {
+                const gutterValue = addUnit(gutter);
+                styleWrapper.push(`padding-right: ${gutterValue}`);
+                const index = children.indexOf(this);
+                if (index >= columnNum) {
+                    styleWrapper.push(`margin-top: ${gutterValue}`);
+                }
+            }
+            let contentStyle = '';
+            if (square && gutter) {
+                const gutterValue = addUnit(gutter);
+                contentStyle = `
+          right: ${gutterValue};
+          bottom: ${gutterValue};
+          height: auto;
+        `;
+            }
+            this.setData({
+                style: styleWrapper.join('; '),
+                contentStyle,
+                center,
+                border,
+                square,
+                gutter,
+                clickable
+            });
+        },
+        onClick() {
+            this.$emit('click');
+            this.jumpLink();
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/grid-item/index.json b/litemall-wx/lib/vant-weapp/grid-item/index.json
index 0a336c08..8abfe203 100644
--- a/litemall-wx/lib/vant-weapp/grid-item/index.json
+++ b/litemall-wx/lib/vant-weapp/grid-item/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/grid-item/index.wxml b/litemall-wx/lib/vant-weapp/grid-item/index.wxml
index 2fb189b8..a86fa295 100644
--- a/litemall-wx/lib/vant-weapp/grid-item/index.wxml
+++ b/litemall-wx/lib/vant-weapp/grid-item/index.wxml
@@ -1,22 +1,22 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view class="{{ utils.bem('grid-item', { square }) }}" style="{{ style }}" bindtap="onClick">
-  <view
-    class="{{ utils.bem('grid-item__content', { center, square, clickable, surround: border && gutter }) }} {{ border ? 'van-hairline--surround' : '' }}"
-    style="{{ contentStyle }}"
-  >
-    <block wx:if="{{ useSlot }}">
-      <slot />
-    </block>
-    <block wx:else>
-      <view class="van-grid-item__icon">
-        <van-icon wx:if="{{ icon }}" name="{{ icon }}" dot="{{ dot }}" info="{{ info }}" />
-        <slot wx:else name="icon"></slot>
-      </view>
-      <view class="van-grid-item__text">
-        <text wx:if="{{ text }}">{{ text }}</text>
-        <slot wx:else name="text"></slot>
-      </view>
-    </block>
-  </view>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="{{ utils.bem('grid-item', { square }) }}" style="{{ style }}" bindtap="onClick">
+  <view
+    class="{{ utils.bem('grid-item__content', { center, square, clickable, surround: border && gutter }) }} {{ border ? 'van-hairline--surround' : '' }}"
+    style="{{ contentStyle }}"
+  >
+    <block wx:if="{{ useSlot }}">
+      <slot />
+    </block>
+    <block wx:else>
+      <view class="van-grid-item__icon">
+        <van-icon wx:if="{{ icon }}" name="{{ icon }}" dot="{{ dot }}" info="{{ info }}" />
+        <slot wx:else name="icon"></slot>
+      </view>
+      <view class="van-grid-item__text">
+        <text wx:if="{{ text }}">{{ text }}</text>
+        <slot wx:else name="text"></slot>
+      </view>
+    </block>
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/grid/index.d.ts b/litemall-wx/lib/vant-weapp/grid/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/grid/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/grid/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/grid/index.js b/litemall-wx/lib/vant-weapp/grid/index.js
index 97f3eb08..1c780dda 100644
--- a/litemall-wx/lib/vant-weapp/grid/index.js
+++ b/litemall-wx/lib/vant-weapp/grid/index.js
@@ -1,62 +1,62 @@
-import { VantComponent } from '../common/component';
-import { addUnit } from '../common/utils';
-VantComponent({
-    relation: {
-        name: 'grid-item',
-        type: 'descendant',
-        linked(child) {
-            this.children.push(child);
-        },
-        unlinked(child) {
-            this.children = this.children.filter((item) => item !== child);
-        }
-    },
-    props: {
-        square: {
-            type: Boolean,
-            observer: 'updateChildren'
-        },
-        gutter: {
-            type: [Number, String],
-            value: 0,
-            observer: 'updateChildren'
-        },
-        clickable: {
-            type: Boolean,
-            observer: 'updateChildren'
-        },
-        columnNum: {
-            type: Number,
-            value: 4,
-            observer: 'updateChildren'
-        },
-        center: {
-            type: Boolean,
-            value: true,
-            observer: 'updateChildren'
-        },
-        border: {
-            type: Boolean,
-            value: true,
-            observer: 'updateChildren'
-        }
-    },
-    beforeCreate() {
-        this.children = [];
-    },
-    created() {
-        const { gutter } = this.data;
-        if (gutter) {
-            this.setData({
-                style: `padding-left: ${addUnit(gutter)}`
-            });
-        }
-    },
-    methods: {
-        updateChildren() {
-            this.children.forEach((child) => {
-                child.updateStyle();
-            });
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { addUnit } from '../common/utils';
+VantComponent({
+    relation: {
+        name: 'grid-item',
+        type: 'descendant',
+        linked(child) {
+            this.children.push(child);
+        },
+        unlinked(child) {
+            this.children = this.children.filter((item) => item !== child);
+        }
+    },
+    props: {
+        square: {
+            type: Boolean,
+            observer: 'updateChildren'
+        },
+        gutter: {
+            type: [Number, String],
+            value: 0,
+            observer: 'updateChildren'
+        },
+        clickable: {
+            type: Boolean,
+            observer: 'updateChildren'
+        },
+        columnNum: {
+            type: Number,
+            value: 4,
+            observer: 'updateChildren'
+        },
+        center: {
+            type: Boolean,
+            value: true,
+            observer: 'updateChildren'
+        },
+        border: {
+            type: Boolean,
+            value: true,
+            observer: 'updateChildren'
+        }
+    },
+    beforeCreate() {
+        this.children = [];
+    },
+    created() {
+        const { gutter } = this.data;
+        if (gutter) {
+            this.setData({
+                style: `padding-left: ${addUnit(gutter)}`
+            });
+        }
+    },
+    methods: {
+        updateChildren() {
+            this.children.forEach((child) => {
+                child.updateStyle();
+            });
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/grid/index.json b/litemall-wx/lib/vant-weapp/grid/index.json
index 467ce294..efdc3c82 100644
--- a/litemall-wx/lib/vant-weapp/grid/index.json
+++ b/litemall-wx/lib/vant-weapp/grid/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
-}
+{
+  "component": true
+}
diff --git a/litemall-wx/lib/vant-weapp/grid/index.wxml b/litemall-wx/lib/vant-weapp/grid/index.wxml
index fc76cc30..dc8a3647 100644
--- a/litemall-wx/lib/vant-weapp/grid/index.wxml
+++ b/litemall-wx/lib/vant-weapp/grid/index.wxml
@@ -1,3 +1,3 @@
-<view class="van-grid {{ border && !gutter ? 'van-hairline--top' : '' }}" style="{{ style }}">
-  <slot />
-</view>
+<view class="van-grid {{ border && !gutter ? 'van-hairline--top' : '' }}" style="{{ style }}">
+  <slot />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/icon/index.d.ts b/litemall-wx/lib/vant-weapp/icon/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/icon/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/icon/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/icon/index.js b/litemall-wx/lib/vant-weapp/icon/index.js
index 8d83ff19..587ace95 100644
--- a/litemall-wx/lib/vant-weapp/icon/index.js
+++ b/litemall-wx/lib/vant-weapp/icon/index.js
@@ -1,39 +1,39 @@
-import { VantComponent } from '../common/component';
-import { addUnit } from '../common/utils';
-VantComponent({
-    props: {
-        dot: Boolean,
-        info: null,
-        size: {
-            type: null,
-            observer: 'setSizeWithUnit'
-        },
-        color: String,
-        customStyle: String,
-        classPrefix: {
-            type: String,
-            value: 'van-icon'
-        },
-        name: {
-            type: String,
-            observer(val) {
-                this.setData({
-                    isImageName: val.indexOf('/') !== -1
-                });
-            }
-        }
-    },
-    data: {
-        sizeWithUnit: null,
-    },
-    methods: {
-        onClick() {
-            this.$emit('click');
-        },
-        setSizeWithUnit(size) {
-            this.setData({
-                sizeWithUnit: addUnit(size)
-            });
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { addUnit } from '../common/utils';
+VantComponent({
+    props: {
+        dot: Boolean,
+        info: null,
+        size: {
+            type: null,
+            observer: 'setSizeWithUnit'
+        },
+        color: String,
+        customStyle: String,
+        classPrefix: {
+            type: String,
+            value: 'van-icon'
+        },
+        name: {
+            type: String,
+            observer(val) {
+                this.setData({
+                    isImageName: val.indexOf('/') !== -1
+                });
+            }
+        }
+    },
+    data: {
+        sizeWithUnit: null,
+    },
+    methods: {
+        onClick() {
+            this.$emit('click');
+        },
+        setSizeWithUnit(size) {
+            this.setData({
+                sizeWithUnit: addUnit(size)
+            });
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/icon/index.json b/litemall-wx/lib/vant-weapp/icon/index.json
index bf0ebe00..82369bf2 100644
--- a/litemall-wx/lib/vant-weapp/icon/index.json
+++ b/litemall-wx/lib/vant-weapp/icon/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-info": "../info/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-info": "../info/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/icon/index.wxml b/litemall-wx/lib/vant-weapp/icon/index.wxml
index c568b58e..6b4c609b 100644
--- a/litemall-wx/lib/vant-weapp/icon/index.wxml
+++ b/litemall-wx/lib/vant-weapp/icon/index.wxml
@@ -1,18 +1,18 @@
-<view
-  class="custom-class {{ classPrefix }} {{ isImageName ? 'van-icon--image' : classPrefix + '-' + name }}"
-  style="{{ color ? 'color: ' + color + ';' : '' }}{{ size ? 'font-size: ' + sizeWithUnit + ';' : '' }}{{ customStyle }}"
-  bind:tap="onClick"
->
-  <van-info
-    wx:if="{{ info !== null || dot }}"
-    dot="{{ dot }}"
-    info="{{ info }}"
-    custom-class="van-icon__info"
-  />
-  <image
-    wx:if="{{ isImageName }}"
-    src="{{ name }}"
-    mode="aspectFit"
-    class="van-icon__image"
-  />
-</view>
+<view
+  class="custom-class {{ classPrefix }} {{ isImageName ? 'van-icon--image' : classPrefix + '-' + name }}"
+  style="{{ color ? 'color: ' + color + ';' : '' }}{{ size ? 'font-size: ' + sizeWithUnit + ';' : '' }}{{ customStyle }}"
+  bind:tap="onClick"
+>
+  <van-info
+    wx:if="{{ info !== null || dot }}"
+    dot="{{ dot }}"
+    info="{{ info }}"
+    custom-class="van-icon__info"
+  />
+  <image
+    wx:if="{{ isImageName }}"
+    src="{{ name }}"
+    mode="aspectFit"
+    class="van-icon__image"
+  />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/image/index.d.ts b/litemall-wx/lib/vant-weapp/image/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/image/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/image/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/image/index.js b/litemall-wx/lib/vant-weapp/image/index.js
index 95650f71..b13a566e 100644
--- a/litemall-wx/lib/vant-weapp/image/index.js
+++ b/litemall-wx/lib/vant-weapp/image/index.js
@@ -1,98 +1,98 @@
-import { addUnit, isDef } from '../common/utils';
-import { VantComponent } from '../common/component';
-import { button } from '../mixins/button';
-import { openType } from '../mixins/open-type';
-const FIT_MODE_MAP = {
-    none: 'center',
-    fill: 'scaleToFill',
-    cover: 'aspectFill',
-    contain: 'aspectFit'
-};
-VantComponent({
-    mixins: [button, openType],
-    classes: ['custom-class', 'loading-class', 'error-class', 'image-class'],
-    props: {
-        src: String,
-        round: Boolean,
-        width: {
-            type: null,
-            observer: 'setStyle'
-        },
-        height: {
-            type: null,
-            observer: 'setStyle'
-        },
-        radius: null,
-        lazyLoad: Boolean,
-        useErrorSlot: Boolean,
-        useLoadingSlot: Boolean,
-        showMenuByLongpress: Boolean,
-        fit: {
-            type: String,
-            value: 'fill',
-            observer: 'setMode'
-        },
-        showError: {
-            type: Boolean,
-            value: true
-        },
-        showLoading: {
-            type: Boolean,
-            value: true
-        }
-    },
-    data: {
-        error: false,
-        loading: true
-    },
-    watch: {
-        src() {
-            this.setData({
-                error: false,
-                loading: true
-            });
-        }
-    },
-    mounted() {
-        this.setMode();
-        this.setStyle();
-    },
-    methods: {
-        setMode() {
-            this.setData({
-                mode: FIT_MODE_MAP[this.data.fit],
-            });
-        },
-        setStyle() {
-            const { width, height, radius } = this.data;
-            let style = '';
-            if (isDef(width)) {
-                style += `width: ${addUnit(width)};`;
-            }
-            if (isDef(height)) {
-                style += `height: ${addUnit(height)};`;
-            }
-            if (isDef(radius)) {
-                style += 'overflow: hidden;';
-                style += `border-radius: ${addUnit(radius)};`;
-            }
-            this.setData({ style });
-        },
-        onLoad(event) {
-            this.setData({
-                loading: false
-            });
-            this.$emit('load', event.detail);
-        },
-        onError(event) {
-            this.setData({
-                loading: false,
-                error: true
-            });
-            this.$emit('error', event.detail);
-        },
-        onClick(event) {
-            this.$emit('click', event.detail);
-        }
-    }
-});
+import { addUnit, isDef } from '../common/utils';
+import { VantComponent } from '../common/component';
+import { button } from '../mixins/button';
+import { openType } from '../mixins/open-type';
+const FIT_MODE_MAP = {
+    none: 'center',
+    fill: 'scaleToFill',
+    cover: 'aspectFill',
+    contain: 'aspectFit'
+};
+VantComponent({
+    mixins: [button, openType],
+    classes: ['custom-class', 'loading-class', 'error-class', 'image-class'],
+    props: {
+        src: String,
+        round: Boolean,
+        width: {
+            type: null,
+            observer: 'setStyle'
+        },
+        height: {
+            type: null,
+            observer: 'setStyle'
+        },
+        radius: null,
+        lazyLoad: Boolean,
+        useErrorSlot: Boolean,
+        useLoadingSlot: Boolean,
+        showMenuByLongpress: Boolean,
+        fit: {
+            type: String,
+            value: 'fill',
+            observer: 'setMode'
+        },
+        showError: {
+            type: Boolean,
+            value: true
+        },
+        showLoading: {
+            type: Boolean,
+            value: true
+        }
+    },
+    data: {
+        error: false,
+        loading: true
+    },
+    watch: {
+        src() {
+            this.setData({
+                error: false,
+                loading: true
+            });
+        }
+    },
+    mounted() {
+        this.setMode();
+        this.setStyle();
+    },
+    methods: {
+        setMode() {
+            this.setData({
+                mode: FIT_MODE_MAP[this.data.fit],
+            });
+        },
+        setStyle() {
+            const { width, height, radius } = this.data;
+            let style = '';
+            if (isDef(width)) {
+                style += `width: ${addUnit(width)};`;
+            }
+            if (isDef(height)) {
+                style += `height: ${addUnit(height)};`;
+            }
+            if (isDef(radius)) {
+                style += 'overflow: hidden;';
+                style += `border-radius: ${addUnit(radius)};`;
+            }
+            this.setData({ style });
+        },
+        onLoad(event) {
+            this.setData({
+                loading: false
+            });
+            this.$emit('load', event.detail);
+        },
+        onError(event) {
+            this.setData({
+                loading: false,
+                error: true
+            });
+            this.$emit('error', event.detail);
+        },
+        onClick(event) {
+            this.$emit('click', event.detail);
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/image/index.json b/litemall-wx/lib/vant-weapp/image/index.json
index e00a5887..8e23ad65 100644
--- a/litemall-wx/lib/vant-weapp/image/index.json
+++ b/litemall-wx/lib/vant-weapp/image/index.json
@@ -1,7 +1,7 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index",
-    "van-loading": "../loading/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-loading": "../loading/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/image/index.wxml b/litemall-wx/lib/vant-weapp/image/index.wxml
index 4724ca22..f6cef6e0 100644
--- a/litemall-wx/lib/vant-weapp/image/index.wxml
+++ b/litemall-wx/lib/vant-weapp/image/index.wxml
@@ -1,33 +1,33 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view
-  style="{{ style }}"
-  class="custom-class {{ utils.bem('image', { round })}}"
-  bind:tap="onClick"
->
-  <image
-    wx:if="{{ !error }}"
-    src="{{ src }}"
-    mode="{{ mode }}"
-    lazy-load="{{ lazyLoad }}"
-    class="image-class van-image__img"
-    show-menu-by-longpress="{{ showMenuByLongpress }}"
-    bind:load="onLoad"
-    bind:error="onError"
-  />
-
-  <view
-    wx:if="{{ loading && showLoading }}"
-    class="loading-class van-image__loading"
-  >
-    <slot wx:if="{{ useLoadingSlot }}" name="loading" />
-    <van-icon wx:else name="photo-o" size="22" />
-  </view>
-  <view
-    wx:if="{{ error && showError }}"
-    class="error-class van-image__error"
-  >
-    <slot wx:if="{{ useErrorSlot }}" name="error" />
-    <van-icon wx:else name="warning-o" size="22" />
-  </view>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  style="{{ style }}"
+  class="custom-class {{ utils.bem('image', { round })}}"
+  bind:tap="onClick"
+>
+  <image
+    wx:if="{{ !error }}"
+    src="{{ src }}"
+    mode="{{ mode }}"
+    lazy-load="{{ lazyLoad }}"
+    class="image-class van-image__img"
+    show-menu-by-longpress="{{ showMenuByLongpress }}"
+    bind:load="onLoad"
+    bind:error="onError"
+  />
+
+  <view
+    wx:if="{{ loading && showLoading }}"
+    class="loading-class van-image__loading"
+  >
+    <slot wx:if="{{ useLoadingSlot }}" name="loading" />
+    <van-icon wx:else name="photo-o" size="22" />
+  </view>
+  <view
+    wx:if="{{ error && showError }}"
+    class="error-class van-image__error"
+  >
+    <slot wx:if="{{ useErrorSlot }}" name="error" />
+    <van-icon wx:else name="warning-o" size="22" />
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/index-anchor/index.d.ts b/litemall-wx/lib/vant-weapp/index-anchor/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/index-anchor/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/index-anchor/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/index-anchor/index.js b/litemall-wx/lib/vant-weapp/index-anchor/index.js
index caaf1911..c8473646 100644
--- a/litemall-wx/lib/vant-weapp/index-anchor/index.js
+++ b/litemall-wx/lib/vant-weapp/index-anchor/index.js
@@ -1,22 +1,22 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    relation: {
-        name: 'index-bar',
-        type: 'ancestor',
-        linked(target) {
-            this.parent = target;
-        },
-        unlinked() {
-            this.parent = null;
-        }
-    },
-    props: {
-        useSlot: Boolean,
-        index: null
-    },
-    data: {
-        active: false,
-        wrapperStyle: '',
-        anchorStyle: ''
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    relation: {
+        name: 'index-bar',
+        type: 'ancestor',
+        linked(target) {
+            this.parent = target;
+        },
+        unlinked() {
+            this.parent = null;
+        }
+    },
+    props: {
+        useSlot: Boolean,
+        index: null
+    },
+    data: {
+        active: false,
+        wrapperStyle: '',
+        anchorStyle: ''
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/index-anchor/index.json b/litemall-wx/lib/vant-weapp/index-anchor/index.json
index 467ce294..efdc3c82 100644
--- a/litemall-wx/lib/vant-weapp/index-anchor/index.json
+++ b/litemall-wx/lib/vant-weapp/index-anchor/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
-}
+{
+  "component": true
+}
diff --git a/litemall-wx/lib/vant-weapp/index-anchor/index.wxml b/litemall-wx/lib/vant-weapp/index-anchor/index.wxml
index 49affa7c..6304f1fb 100644
--- a/litemall-wx/lib/vant-weapp/index-anchor/index.wxml
+++ b/litemall-wx/lib/vant-weapp/index-anchor/index.wxml
@@ -1,14 +1,14 @@
-<view
-  class="van-index-anchor-wrapper"
-  style="{{ wrapperStyle }}"
->
-  <view
-    class="van-index-anchor {{ active ? 'van-index-anchor--active van-hairline--bottom' : '' }}"
-    style="{{ anchorStyle }}"
-  >
-    <slot wx:if="{{ useSlot }}"/>
-    <block wx:else>
-      <text>{{ index }}</text>
-    </block>
-  </view>
-</view>
+<view
+  class="van-index-anchor-wrapper"
+  style="{{ wrapperStyle }}"
+>
+  <view
+    class="van-index-anchor {{ active ? 'van-index-anchor--active van-hairline--bottom' : '' }}"
+    style="{{ anchorStyle }}"
+  >
+    <slot wx:if="{{ useSlot }}"/>
+    <block wx:else>
+      <text>{{ index }}</text>
+    </block>
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/index-bar/index.d.ts b/litemall-wx/lib/vant-weapp/index-bar/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/index-bar/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/index-bar/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/index-bar/index.js b/litemall-wx/lib/vant-weapp/index-bar/index.js
index ec8e8e73..637ddc12 100644
--- a/litemall-wx/lib/vant-weapp/index-bar/index.js
+++ b/litemall-wx/lib/vant-weapp/index-bar/index.js
@@ -1,240 +1,240 @@
-import { VantComponent } from '../common/component';
-import { GREEN } from '../common/color';
-const indexList = () => {
-    const indexList = [];
-    const charCodeOfA = 'A'.charCodeAt(0);
-    for (let i = 0; i < 26; i++) {
-        indexList.push(String.fromCharCode(charCodeOfA + i));
-    }
-    return indexList;
-};
-VantComponent({
-    relation: {
-        name: 'index-anchor',
-        type: 'descendant',
-        linked() {
-            this.updateData();
-        },
-        linkChanged() {
-            this.updateData();
-        },
-        unlinked() {
-            this.updateData();
-        }
-    },
-    props: {
-        sticky: {
-            type: Boolean,
-            value: true
-        },
-        zIndex: {
-            type: Number,
-            value: 1
-        },
-        highlightColor: {
-            type: String,
-            value: GREEN
-        },
-        scrollTop: {
-            type: Number,
-            value: 0,
-            observer: 'onScroll'
-        },
-        stickyOffsetTop: {
-            type: Number,
-            value: 0
-        },
-        indexList: {
-            type: Array,
-            value: indexList()
-        }
-    },
-    data: {
-        activeAnchorIndex: null,
-        showSidebar: false
-    },
-    methods: {
-        updateData() {
-            this.timer && clearTimeout(this.timer);
-            this.timer = setTimeout(() => {
-                this.children = this.getRelationNodes('../index-anchor/index');
-                this.setData({
-                    showSidebar: !!this.children.length
-                });
-                this.setRect().then(() => {
-                    this.onScroll();
-                });
-            }, 0);
-        },
-        setRect() {
-            return Promise.all([
-                this.setAnchorsRect(),
-                this.setListRect(),
-                this.setSiderbarRect()
-            ]);
-        },
-        setAnchorsRect() {
-            return Promise.all(this.children.map(anchor => (anchor.getRect('.van-index-anchor-wrapper').then((rect) => {
-                Object.assign(anchor, {
-                    height: rect.height,
-                    top: rect.top + this.data.scrollTop
-                });
-            }))));
-        },
-        setListRect() {
-            return this.getRect('.van-index-bar').then((rect) => {
-                Object.assign(this, {
-                    height: rect.height,
-                    top: rect.top + this.data.scrollTop
-                });
-            });
-        },
-        setSiderbarRect() {
-            return this.getRect('.van-index-bar__sidebar').then(res => {
-                this.sidebar = {
-                    height: res.height,
-                    top: res.top
-                };
-            });
-        },
-        setDiffData({ target, data }) {
-            const diffData = {};
-            Object.keys(data).forEach(key => {
-                if (target.data[key] !== data[key]) {
-                    diffData[key] = data[key];
-                }
-            });
-            if (Object.keys(diffData).length) {
-                target.setData(diffData);
-            }
-        },
-        getAnchorRect(anchor) {
-            return anchor.getRect('.van-index-anchor-wrapper').then((rect) => ({
-                height: rect.height,
-                top: rect.top
-            }));
-        },
-        getActiveAnchorIndex() {
-            const { children } = this;
-            const { sticky, scrollTop, stickyOffsetTop } = this.data;
-            for (let i = this.children.length - 1; i >= 0; i--) {
-                const preAnchorHeight = i > 0 ? children[i - 1].height : 0;
-                const reachTop = sticky ? preAnchorHeight + stickyOffsetTop : 0;
-                if (reachTop + scrollTop >= children[i].top) {
-                    return i;
-                }
-            }
-            return -1;
-        },
-        onScroll() {
-            const { children = [] } = this;
-            if (!children.length) {
-                return;
-            }
-            const { sticky, stickyOffsetTop, zIndex, highlightColor, scrollTop } = this.data;
-            const active = this.getActiveAnchorIndex();
-            this.setDiffData({
-                target: this,
-                data: {
-                    activeAnchorIndex: active
-                }
-            });
-            if (sticky) {
-                let isActiveAnchorSticky = false;
-                if (active !== -1) {
-                    isActiveAnchorSticky = children[active].top <= stickyOffsetTop + scrollTop;
-                }
-                children.forEach((item, index) => {
-                    if (index === active) {
-                        let wrapperStyle = '';
-                        let anchorStyle = `
-              color: ${highlightColor};
-            `;
-                        if (isActiveAnchorSticky) {
-                            wrapperStyle = `
-                height: ${children[index].height}px;
-              `;
-                            anchorStyle = `
-                position: fixed;
-                top: ${stickyOffsetTop}px;
-                z-index: ${zIndex};
-                color: ${highlightColor};
-              `;
-                        }
-                        this.setDiffData({
-                            target: item,
-                            data: {
-                                active: true,
-                                anchorStyle,
-                                wrapperStyle
-                            }
-                        });
-                    }
-                    else if (index === active - 1) {
-                        const currentAnchor = children[index];
-                        const currentOffsetTop = currentAnchor.top;
-                        const targetOffsetTop = index === children.length - 1
-                            ? this.top
-                            : children[index + 1].top;
-                        const parentOffsetHeight = targetOffsetTop - currentOffsetTop;
-                        const translateY = parentOffsetHeight - currentAnchor.height;
-                        const anchorStyle = `
-              position: relative;
-              transform: translate3d(0, ${translateY}px, 0);
-              z-index: ${zIndex};
-              color: ${highlightColor};
-            `;
-                        this.setDiffData({
-                            target: item,
-                            data: {
-                                active: true,
-                                anchorStyle
-                            }
-                        });
-                    }
-                    else {
-                        this.setDiffData({
-                            target: item,
-                            data: {
-                                active: false,
-                                anchorStyle: '',
-                                wrapperStyle: '',
-                            }
-                        });
-                    }
-                });
-            }
-        },
-        onClick(event) {
-            this.scrollToAnchor(event.target.dataset.index);
-        },
-        onTouchMove(event) {
-            const sidebarLength = this.children.length;
-            const touch = event.touches[0];
-            const itemHeight = this.sidebar.height / sidebarLength;
-            let index = Math.floor((touch.clientY - this.sidebar.top) / itemHeight);
-            if (index < 0) {
-                index = 0;
-            }
-            else if (index > sidebarLength - 1) {
-                index = sidebarLength - 1;
-            }
-            this.scrollToAnchor(index);
-        },
-        onTouchStop() {
-            this.scrollToAnchorIndex = null;
-        },
-        scrollToAnchor(index) {
-            if (typeof index !== 'number' || this.scrollToAnchorIndex === index) {
-                return;
-            }
-            this.scrollToAnchorIndex = index;
-            const anchor = this.children.filter(item => item.data.index === this.data.indexList[index])[0];
-            this.$emit('select', anchor.data.index);
-            anchor && wx.pageScrollTo({
-                duration: 0,
-                scrollTop: anchor.top
-            });
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { GREEN } from '../common/color';
+const indexList = () => {
+    const indexList = [];
+    const charCodeOfA = 'A'.charCodeAt(0);
+    for (let i = 0; i < 26; i++) {
+        indexList.push(String.fromCharCode(charCodeOfA + i));
+    }
+    return indexList;
+};
+VantComponent({
+    relation: {
+        name: 'index-anchor',
+        type: 'descendant',
+        linked() {
+            this.updateData();
+        },
+        linkChanged() {
+            this.updateData();
+        },
+        unlinked() {
+            this.updateData();
+        }
+    },
+    props: {
+        sticky: {
+            type: Boolean,
+            value: true
+        },
+        zIndex: {
+            type: Number,
+            value: 1
+        },
+        highlightColor: {
+            type: String,
+            value: GREEN
+        },
+        scrollTop: {
+            type: Number,
+            value: 0,
+            observer: 'onScroll'
+        },
+        stickyOffsetTop: {
+            type: Number,
+            value: 0
+        },
+        indexList: {
+            type: Array,
+            value: indexList()
+        }
+    },
+    data: {
+        activeAnchorIndex: null,
+        showSidebar: false
+    },
+    methods: {
+        updateData() {
+            this.timer && clearTimeout(this.timer);
+            this.timer = setTimeout(() => {
+                this.children = this.getRelationNodes('../index-anchor/index');
+                this.setData({
+                    showSidebar: !!this.children.length
+                });
+                this.setRect().then(() => {
+                    this.onScroll();
+                });
+            }, 0);
+        },
+        setRect() {
+            return Promise.all([
+                this.setAnchorsRect(),
+                this.setListRect(),
+                this.setSiderbarRect()
+            ]);
+        },
+        setAnchorsRect() {
+            return Promise.all(this.children.map(anchor => (anchor.getRect('.van-index-anchor-wrapper').then((rect) => {
+                Object.assign(anchor, {
+                    height: rect.height,
+                    top: rect.top + this.data.scrollTop
+                });
+            }))));
+        },
+        setListRect() {
+            return this.getRect('.van-index-bar').then((rect) => {
+                Object.assign(this, {
+                    height: rect.height,
+                    top: rect.top + this.data.scrollTop
+                });
+            });
+        },
+        setSiderbarRect() {
+            return this.getRect('.van-index-bar__sidebar').then(res => {
+                this.sidebar = {
+                    height: res.height,
+                    top: res.top
+                };
+            });
+        },
+        setDiffData({ target, data }) {
+            const diffData = {};
+            Object.keys(data).forEach(key => {
+                if (target.data[key] !== data[key]) {
+                    diffData[key] = data[key];
+                }
+            });
+            if (Object.keys(diffData).length) {
+                target.setData(diffData);
+            }
+        },
+        getAnchorRect(anchor) {
+            return anchor.getRect('.van-index-anchor-wrapper').then((rect) => ({
+                height: rect.height,
+                top: rect.top
+            }));
+        },
+        getActiveAnchorIndex() {
+            const { children } = this;
+            const { sticky, scrollTop, stickyOffsetTop } = this.data;
+            for (let i = this.children.length - 1; i >= 0; i--) {
+                const preAnchorHeight = i > 0 ? children[i - 1].height : 0;
+                const reachTop = sticky ? preAnchorHeight + stickyOffsetTop : 0;
+                if (reachTop + scrollTop >= children[i].top) {
+                    return i;
+                }
+            }
+            return -1;
+        },
+        onScroll() {
+            const { children = [] } = this;
+            if (!children.length) {
+                return;
+            }
+            const { sticky, stickyOffsetTop, zIndex, highlightColor, scrollTop } = this.data;
+            const active = this.getActiveAnchorIndex();
+            this.setDiffData({
+                target: this,
+                data: {
+                    activeAnchorIndex: active
+                }
+            });
+            if (sticky) {
+                let isActiveAnchorSticky = false;
+                if (active !== -1) {
+                    isActiveAnchorSticky = children[active].top <= stickyOffsetTop + scrollTop;
+                }
+                children.forEach((item, index) => {
+                    if (index === active) {
+                        let wrapperStyle = '';
+                        let anchorStyle = `
+              color: ${highlightColor};
+            `;
+                        if (isActiveAnchorSticky) {
+                            wrapperStyle = `
+                height: ${children[index].height}px;
+              `;
+                            anchorStyle = `
+                position: fixed;
+                top: ${stickyOffsetTop}px;
+                z-index: ${zIndex};
+                color: ${highlightColor};
+              `;
+                        }
+                        this.setDiffData({
+                            target: item,
+                            data: {
+                                active: true,
+                                anchorStyle,
+                                wrapperStyle
+                            }
+                        });
+                    }
+                    else if (index === active - 1) {
+                        const currentAnchor = children[index];
+                        const currentOffsetTop = currentAnchor.top;
+                        const targetOffsetTop = index === children.length - 1
+                            ? this.top
+                            : children[index + 1].top;
+                        const parentOffsetHeight = targetOffsetTop - currentOffsetTop;
+                        const translateY = parentOffsetHeight - currentAnchor.height;
+                        const anchorStyle = `
+              position: relative;
+              transform: translate3d(0, ${translateY}px, 0);
+              z-index: ${zIndex};
+              color: ${highlightColor};
+            `;
+                        this.setDiffData({
+                            target: item,
+                            data: {
+                                active: true,
+                                anchorStyle
+                            }
+                        });
+                    }
+                    else {
+                        this.setDiffData({
+                            target: item,
+                            data: {
+                                active: false,
+                                anchorStyle: '',
+                                wrapperStyle: '',
+                            }
+                        });
+                    }
+                });
+            }
+        },
+        onClick(event) {
+            this.scrollToAnchor(event.target.dataset.index);
+        },
+        onTouchMove(event) {
+            const sidebarLength = this.children.length;
+            const touch = event.touches[0];
+            const itemHeight = this.sidebar.height / sidebarLength;
+            let index = Math.floor((touch.clientY - this.sidebar.top) / itemHeight);
+            if (index < 0) {
+                index = 0;
+            }
+            else if (index > sidebarLength - 1) {
+                index = sidebarLength - 1;
+            }
+            this.scrollToAnchor(index);
+        },
+        onTouchStop() {
+            this.scrollToAnchorIndex = null;
+        },
+        scrollToAnchor(index) {
+            if (typeof index !== 'number' || this.scrollToAnchorIndex === index) {
+                return;
+            }
+            this.scrollToAnchorIndex = index;
+            const anchor = this.children.filter(item => item.data.index === this.data.indexList[index])[0];
+            this.$emit('select', anchor.data.index);
+            anchor && wx.pageScrollTo({
+                duration: 0,
+                scrollTop: anchor.top
+            });
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/index-bar/index.json b/litemall-wx/lib/vant-weapp/index-bar/index.json
index 467ce294..efdc3c82 100644
--- a/litemall-wx/lib/vant-weapp/index-bar/index.json
+++ b/litemall-wx/lib/vant-weapp/index-bar/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
-}
+{
+  "component": true
+}
diff --git a/litemall-wx/lib/vant-weapp/index-bar/index.wxml b/litemall-wx/lib/vant-weapp/index-bar/index.wxml
index 19a59cf9..019e256b 100644
--- a/litemall-wx/lib/vant-weapp/index-bar/index.wxml
+++ b/litemall-wx/lib/vant-weapp/index-bar/index.wxml
@@ -1,22 +1,22 @@
-<view class="van-index-bar">
-  <slot />
-
-  <view
-    wx:if="{{ showSidebar }}"
-    class="van-index-bar__sidebar"
-    catch:tap="onClick"
-    catch:touchmove="onTouchMove"
-    catch:touchend="onTouchStop"
-    catch:touchcancel="onTouchStop"
-  >
-    <view
-      wx:for="{{ indexList }}"
-      wx:key="index"
-      class="van-index-bar__index"
-      style="z-index: {{ zIndex + 1 }}; color: {{ activeAnchorIndex === index ? highlightColor : '' }}"
-      data-index="{{ index }}"
-    >
-      {{ item }}
-    </view>
-  </view>
-</view>
+<view class="van-index-bar">
+  <slot />
+
+  <view
+    wx:if="{{ showSidebar }}"
+    class="van-index-bar__sidebar"
+    catch:tap="onClick"
+    catch:touchmove="onTouchMove"
+    catch:touchend="onTouchStop"
+    catch:touchcancel="onTouchStop"
+  >
+    <view
+      wx:for="{{ indexList }}"
+      wx:key="index"
+      class="van-index-bar__index"
+      style="z-index: {{ zIndex + 1 }}; color: {{ activeAnchorIndex === index ? highlightColor : '' }}"
+      data-index="{{ index }}"
+    >
+      {{ item }}
+    </view>
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/info/index.d.ts b/litemall-wx/lib/vant-weapp/info/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/info/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/info/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/info/index.js b/litemall-wx/lib/vant-weapp/info/index.js
index 8e34c0f7..7c91e721 100644
--- a/litemall-wx/lib/vant-weapp/info/index.js
+++ b/litemall-wx/lib/vant-weapp/info/index.js
@@ -1,8 +1,8 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    props: {
-        dot: Boolean,
-        info: null,
-        customStyle: String
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    props: {
+        dot: Boolean,
+        info: null,
+        customStyle: String
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/info/index.json b/litemall-wx/lib/vant-weapp/info/index.json
index 467ce294..efdc3c82 100644
--- a/litemall-wx/lib/vant-weapp/info/index.json
+++ b/litemall-wx/lib/vant-weapp/info/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
-}
+{
+  "component": true
+}
diff --git a/litemall-wx/lib/vant-weapp/info/index.wxml b/litemall-wx/lib/vant-weapp/info/index.wxml
index 3112dfc9..ea2d23b1 100644
--- a/litemall-wx/lib/vant-weapp/info/index.wxml
+++ b/litemall-wx/lib/vant-weapp/info/index.wxml
@@ -1,7 +1,7 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view
-  wx:if="{{ info !== null && info !== '' || dot }}"
-  class="custom-class van-info {{ utils.bem('info', { dot }) }}"
-  style="{{ customStyle }}"
->{{ dot ? '' : info }}</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  wx:if="{{ info !== null && info !== '' || dot }}"
+  class="custom-class van-info {{ utils.bem('info', { dot }) }}"
+  style="{{ customStyle }}"
+>{{ dot ? '' : info }}</view>
diff --git a/litemall-wx/lib/vant-weapp/loading/index.d.ts b/litemall-wx/lib/vant-weapp/loading/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/loading/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/loading/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/loading/index.js b/litemall-wx/lib/vant-weapp/loading/index.js
index af510c87..e4ff431b 100644
--- a/litemall-wx/lib/vant-weapp/loading/index.js
+++ b/litemall-wx/lib/vant-weapp/loading/index.js
@@ -1,32 +1,32 @@
-import { VantComponent } from '../common/component';
-import { addUnit } from '../common/utils';
-VantComponent({
-    props: {
-        color: String,
-        vertical: Boolean,
-        type: {
-            type: String,
-            value: 'circular'
-        },
-        size: {
-            type: String,
-            observer: 'setSizeWithUnit'
-        },
-        textSize: {
-            type: String,
-            observer: 'setTextSizeWithUnit'
-        }
-    },
-    methods: {
-        setSizeWithUnit(size) {
-            this.setData({
-                sizeWithUnit: addUnit(size)
-            });
-        },
-        setTextSizeWithUnit(size) {
-            this.set({
-                textSizeWithUnit: addUnit(size)
-            });
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { addUnit } from '../common/utils';
+VantComponent({
+    props: {
+        color: String,
+        vertical: Boolean,
+        type: {
+            type: String,
+            value: 'circular'
+        },
+        size: {
+            type: String,
+            observer: 'setSizeWithUnit'
+        },
+        textSize: {
+            type: String,
+            observer: 'setTextSizeWithUnit'
+        }
+    },
+    methods: {
+        setSizeWithUnit(size) {
+            this.setData({
+                sizeWithUnit: addUnit(size)
+            });
+        },
+        setTextSizeWithUnit(size) {
+            this.set({
+                textSizeWithUnit: addUnit(size)
+            });
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/loading/index.json b/litemall-wx/lib/vant-weapp/loading/index.json
index 32640e0d..1edff938 100644
--- a/litemall-wx/lib/vant-weapp/loading/index.json
+++ b/litemall-wx/lib/vant-weapp/loading/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
+{
+  "component": true
 }
\ No newline at end of file
diff --git a/litemall-wx/lib/vant-weapp/loading/index.wxml b/litemall-wx/lib/vant-weapp/loading/index.wxml
index 5229d043..6fac4075 100644
--- a/litemall-wx/lib/vant-weapp/loading/index.wxml
+++ b/litemall-wx/lib/vant-weapp/loading/index.wxml
@@ -1,16 +1,16 @@
-<view class="custom-class van-loading {{ vertical ? 'van-loading--vertical' : '' }}">
-  <view
-    class="van-loading__spinner van-loading__spinner--{{ type }}"
-    style="color: {{ color }}; width: {{ sizeWithUnit }}; height: {{ sizeWithUnit }}"
-  >
-    <view
-      wx:if="{{ type === 'spinner' }}"
-      wx:for="item in 12"
-      wx:key="index"
-      class="van-loading__dot"
-    />
-  </view>
-  <view class="van-loading__text" style="font-size: {{ textSizeWithUnit }};">
-    <slot />
-  </view>
-</view>
+<view class="custom-class van-loading {{ vertical ? 'van-loading--vertical' : '' }}">
+  <view
+    class="van-loading__spinner van-loading__spinner--{{ type }}"
+    style="color: {{ color }}; width: {{ sizeWithUnit }}; height: {{ sizeWithUnit }}"
+  >
+    <view
+      wx:if="{{ type === 'spinner' }}"
+      wx:for="item in 12"
+      wx:key="index"
+      class="van-loading__dot"
+    />
+  </view>
+  <view class="van-loading__text" style="font-size: {{ textSizeWithUnit }};">
+    <slot />
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/mixins/basic.d.ts b/litemall-wx/lib/vant-weapp/mixins/basic.d.ts
index b2733690..7fd6a7f1 100644
--- a/litemall-wx/lib/vant-weapp/mixins/basic.d.ts
+++ b/litemall-wx/lib/vant-weapp/mixins/basic.d.ts
@@ -1 +1 @@
-export declare const basic: string;
+export declare const basic: string;
diff --git a/litemall-wx/lib/vant-weapp/mixins/basic.js b/litemall-wx/lib/vant-weapp/mixins/basic.js
index 2fdd634f..aa5ab96d 100644
--- a/litemall-wx/lib/vant-weapp/mixins/basic.js
+++ b/litemall-wx/lib/vant-weapp/mixins/basic.js
@@ -1,22 +1,22 @@
-export const basic = Behavior({
-    methods: {
-        $emit(...args) {
-            this.triggerEvent(...args);
-        },
-        getRect(selector, all) {
-            return new Promise(resolve => {
-                wx.createSelectorQuery()
-                    .in(this)[all ? 'selectAll' : 'select'](selector)
-                    .boundingClientRect(rect => {
-                    if (all && Array.isArray(rect) && rect.length) {
-                        resolve(rect);
-                    }
-                    if (!all && rect) {
-                        resolve(rect);
-                    }
-                })
-                    .exec();
-            });
-        }
-    }
-});
+export const basic = Behavior({
+    methods: {
+        $emit(...args) {
+            this.triggerEvent(...args);
+        },
+        getRect(selector, all) {
+            return new Promise(resolve => {
+                wx.createSelectorQuery()
+                    .in(this)[all ? 'selectAll' : 'select'](selector)
+                    .boundingClientRect(rect => {
+                    if (all && Array.isArray(rect) && rect.length) {
+                        resolve(rect);
+                    }
+                    if (!all && rect) {
+                        resolve(rect);
+                    }
+                })
+                    .exec();
+            });
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/mixins/button.d.ts b/litemall-wx/lib/vant-weapp/mixins/button.d.ts
index b51db875..d25c0191 100644
--- a/litemall-wx/lib/vant-weapp/mixins/button.d.ts
+++ b/litemall-wx/lib/vant-weapp/mixins/button.d.ts
@@ -1 +1 @@
-export declare const button: string;
+export declare const button: string;
diff --git a/litemall-wx/lib/vant-weapp/mixins/button.js b/litemall-wx/lib/vant-weapp/mixins/button.js
index 5d3b4dc4..94d177e1 100644
--- a/litemall-wx/lib/vant-weapp/mixins/button.js
+++ b/litemall-wx/lib/vant-weapp/mixins/button.js
@@ -1,18 +1,18 @@
-export const button = Behavior({
-    externalClasses: ['hover-class'],
-    properties: {
-        id: String,
-        lang: {
-            type: String,
-            value: 'en'
-        },
-        businessId: Number,
-        sessionFrom: String,
-        sendMessageTitle: String,
-        sendMessagePath: String,
-        sendMessageImg: String,
-        showMessageCard: Boolean,
-        appParameter: String,
-        ariaLabel: String
-    }
-});
+export const button = Behavior({
+    externalClasses: ['hover-class'],
+    properties: {
+        id: String,
+        lang: {
+            type: String,
+            value: 'en'
+        },
+        businessId: Number,
+        sessionFrom: String,
+        sendMessageTitle: String,
+        sendMessagePath: String,
+        sendMessageImg: String,
+        showMessageCard: Boolean,
+        appParameter: String,
+        ariaLabel: String
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/mixins/link.d.ts b/litemall-wx/lib/vant-weapp/mixins/link.d.ts
index d58043bc..9c35f7b2 100644
--- a/litemall-wx/lib/vant-weapp/mixins/link.d.ts
+++ b/litemall-wx/lib/vant-weapp/mixins/link.d.ts
@@ -1 +1 @@
-export declare const link: string;
+export declare const link: string;
diff --git a/litemall-wx/lib/vant-weapp/mixins/link.js b/litemall-wx/lib/vant-weapp/mixins/link.js
index d7aed0c9..bcf0f190 100644
--- a/litemall-wx/lib/vant-weapp/mixins/link.js
+++ b/litemall-wx/lib/vant-weapp/mixins/link.js
@@ -1,17 +1,17 @@
-export const link = Behavior({
-    properties: {
-        url: String,
-        linkType: {
-            type: String,
-            value: 'navigateTo'
-        }
-    },
-    methods: {
-        jumpLink(urlKey = 'url') {
-            const url = this.data[urlKey];
-            if (url) {
-                wx[this.data.linkType]({ url });
-            }
-        }
-    }
-});
+export const link = Behavior({
+    properties: {
+        url: String,
+        linkType: {
+            type: String,
+            value: 'navigateTo'
+        }
+    },
+    methods: {
+        jumpLink(urlKey = 'url') {
+            const url = this.data[urlKey];
+            if (url) {
+                wx[this.data.linkType]({ url });
+            }
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/mixins/observer/behavior.d.ts b/litemall-wx/lib/vant-weapp/mixins/observer/behavior.d.ts
index 3da2a645..97430103 100644
--- a/litemall-wx/lib/vant-weapp/mixins/observer/behavior.d.ts
+++ b/litemall-wx/lib/vant-weapp/mixins/observer/behavior.d.ts
@@ -1 +1 @@
-export declare const behavior: string;
+export declare const behavior: string;
diff --git a/litemall-wx/lib/vant-weapp/mixins/observer/behavior.js b/litemall-wx/lib/vant-weapp/mixins/observer/behavior.js
index 948f446b..e60ff4f9 100644
--- a/litemall-wx/lib/vant-weapp/mixins/observer/behavior.js
+++ b/litemall-wx/lib/vant-weapp/mixins/observer/behavior.js
@@ -1,14 +1,14 @@
-export const behavior = Behavior({
-    methods: {
-        set(data, callback) {
-            return new Promise(resolve => {
-                this.setData(data, () => {
-                    if (callback && typeof callback === 'function') {
-                        callback.call(this);
-                    }
-                    resolve();
-                });
-            });
-        }
-    }
-});
+export const behavior = Behavior({
+    methods: {
+        set(data, callback) {
+            return new Promise(resolve => {
+                this.setData(data, () => {
+                    if (callback && typeof callback === 'function') {
+                        callback.call(this);
+                    }
+                    resolve();
+                });
+            });
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/mixins/observer/index.d.ts b/litemall-wx/lib/vant-weapp/mixins/observer/index.d.ts
index 4e54b2e5..355210ae 100644
--- a/litemall-wx/lib/vant-weapp/mixins/observer/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/mixins/observer/index.d.ts
@@ -1 +1 @@
-export declare function observe(vantOptions: any, options: any): void;
+export declare function observe(vantOptions: any, options: any): void;
diff --git a/litemall-wx/lib/vant-weapp/mixins/observer/index.js b/litemall-wx/lib/vant-weapp/mixins/observer/index.js
index d6f608d1..f4ab3f01 100644
--- a/litemall-wx/lib/vant-weapp/mixins/observer/index.js
+++ b/litemall-wx/lib/vant-weapp/mixins/observer/index.js
@@ -1,19 +1,19 @@
-import { behavior } from './behavior';
-export function observe(vantOptions, options) {
-    const { watch } = vantOptions;
-    options.behaviors.push(behavior);
-    if (watch) {
-        const props = options.properties || {};
-        Object.keys(watch).forEach(key => {
-            if (key in props) {
-                let prop = props[key];
-                if (prop === null || !('type' in prop)) {
-                    prop = { type: prop };
-                }
-                prop.observer = watch[key];
-                props[key] = prop;
-            }
-        });
-        options.properties = props;
-    }
-}
+import { behavior } from './behavior';
+export function observe(vantOptions, options) {
+    const { watch } = vantOptions;
+    options.behaviors.push(behavior);
+    if (watch) {
+        const props = options.properties || {};
+        Object.keys(watch).forEach(key => {
+            if (key in props) {
+                let prop = props[key];
+                if (prop === null || !('type' in prop)) {
+                    prop = { type: prop };
+                }
+                prop.observer = watch[key];
+                props[key] = prop;
+            }
+        });
+        options.properties = props;
+    }
+}
diff --git a/litemall-wx/lib/vant-weapp/mixins/open-type.d.ts b/litemall-wx/lib/vant-weapp/mixins/open-type.d.ts
index 64b023d7..4165fd44 100644
--- a/litemall-wx/lib/vant-weapp/mixins/open-type.d.ts
+++ b/litemall-wx/lib/vant-weapp/mixins/open-type.d.ts
@@ -1 +1 @@
-export declare const openType: string;
+export declare const openType: string;
diff --git a/litemall-wx/lib/vant-weapp/mixins/open-type.js b/litemall-wx/lib/vant-weapp/mixins/open-type.js
index 514517e0..a1ee8260 100644
--- a/litemall-wx/lib/vant-weapp/mixins/open-type.js
+++ b/litemall-wx/lib/vant-weapp/mixins/open-type.js
@@ -1,25 +1,25 @@
-export const openType = Behavior({
-    properties: {
-        openType: String
-    },
-    methods: {
-        bindGetUserInfo(event) {
-            this.$emit('getuserinfo', event.detail);
-        },
-        bindContact(event) {
-            this.$emit('contact', event.detail);
-        },
-        bindGetPhoneNumber(event) {
-            this.$emit('getphonenumber', event.detail);
-        },
-        bindError(event) {
-            this.$emit('error', event.detail);
-        },
-        bindLaunchApp(event) {
-            this.$emit('launchapp', event.detail);
-        },
-        bindOpenSetting(event) {
-            this.$emit('opensetting', event.detail);
-        },
-    }
-});
+export const openType = Behavior({
+    properties: {
+        openType: String
+    },
+    methods: {
+        bindGetUserInfo(event) {
+            this.$emit('getuserinfo', event.detail);
+        },
+        bindContact(event) {
+            this.$emit('contact', event.detail);
+        },
+        bindGetPhoneNumber(event) {
+            this.$emit('getphonenumber', event.detail);
+        },
+        bindError(event) {
+            this.$emit('error', event.detail);
+        },
+        bindLaunchApp(event) {
+            this.$emit('launchapp', event.detail);
+        },
+        bindOpenSetting(event) {
+            this.$emit('opensetting', event.detail);
+        },
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/mixins/touch.d.ts b/litemall-wx/lib/vant-weapp/mixins/touch.d.ts
index 35ee831d..8b50d299 100644
--- a/litemall-wx/lib/vant-weapp/mixins/touch.d.ts
+++ b/litemall-wx/lib/vant-weapp/mixins/touch.d.ts
@@ -1 +1 @@
-export declare const touch: string;
+export declare const touch: string;
diff --git a/litemall-wx/lib/vant-weapp/mixins/touch.js b/litemall-wx/lib/vant-weapp/mixins/touch.js
index 2a794267..bedb23af 100644
--- a/litemall-wx/lib/vant-weapp/mixins/touch.js
+++ b/litemall-wx/lib/vant-weapp/mixins/touch.js
@@ -1,35 +1,35 @@
-const MIN_DISTANCE = 10;
-function getDirection(x, y) {
-    if (x > y && x > MIN_DISTANCE) {
-        return 'horizontal';
-    }
-    if (y > x && y > MIN_DISTANCE) {
-        return 'vertical';
-    }
-    return '';
-}
-export const touch = Behavior({
-    methods: {
-        resetTouchStatus() {
-            this.direction = '';
-            this.deltaX = 0;
-            this.deltaY = 0;
-            this.offsetX = 0;
-            this.offsetY = 0;
-        },
-        touchStart(event) {
-            this.resetTouchStatus();
-            const touch = event.touches[0];
-            this.startX = touch.clientX;
-            this.startY = touch.clientY;
-        },
-        touchMove(event) {
-            const touch = event.touches[0];
-            this.deltaX = touch.clientX - this.startX;
-            this.deltaY = touch.clientY - this.startY;
-            this.offsetX = Math.abs(this.deltaX);
-            this.offsetY = Math.abs(this.deltaY);
-            this.direction = this.direction || getDirection(this.offsetX, this.offsetY);
-        }
-    }
-});
+const MIN_DISTANCE = 10;
+function getDirection(x, y) {
+    if (x > y && x > MIN_DISTANCE) {
+        return 'horizontal';
+    }
+    if (y > x && y > MIN_DISTANCE) {
+        return 'vertical';
+    }
+    return '';
+}
+export const touch = Behavior({
+    methods: {
+        resetTouchStatus() {
+            this.direction = '';
+            this.deltaX = 0;
+            this.deltaY = 0;
+            this.offsetX = 0;
+            this.offsetY = 0;
+        },
+        touchStart(event) {
+            this.resetTouchStatus();
+            const touch = event.touches[0];
+            this.startX = touch.clientX;
+            this.startY = touch.clientY;
+        },
+        touchMove(event) {
+            const touch = event.touches[0];
+            this.deltaX = touch.clientX - this.startX;
+            this.deltaY = touch.clientY - this.startY;
+            this.offsetX = Math.abs(this.deltaX);
+            this.offsetY = Math.abs(this.deltaY);
+            this.direction = this.direction || getDirection(this.offsetX, this.offsetY);
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/mixins/transition.d.ts b/litemall-wx/lib/vant-weapp/mixins/transition.d.ts
index ee7b6ca8..9306f3ed 100644
--- a/litemall-wx/lib/vant-weapp/mixins/transition.d.ts
+++ b/litemall-wx/lib/vant-weapp/mixins/transition.d.ts
@@ -1 +1 @@
-export declare const transition: (showDefaultValue: boolean) => any;
+export declare const transition: (showDefaultValue: boolean) => any;
diff --git a/litemall-wx/lib/vant-weapp/mixins/transition.js b/litemall-wx/lib/vant-weapp/mixins/transition.js
index a64df6ab..7be0b5a8 100644
--- a/litemall-wx/lib/vant-weapp/mixins/transition.js
+++ b/litemall-wx/lib/vant-weapp/mixins/transition.js
@@ -1,120 +1,120 @@
-import { isObj } from '../common/utils';
-const getClassNames = (name) => ({
-    enter: `van-${name}-enter van-${name}-enter-active enter-class enter-active-class`,
-    'enter-to': `van-${name}-enter-to van-${name}-enter-active enter-to-class enter-active-class`,
-    leave: `van-${name}-leave van-${name}-leave-active leave-class leave-active-class`,
-    'leave-to': `van-${name}-leave-to van-${name}-leave-active leave-to-class leave-active-class`
-});
-const nextTick = () => new Promise(resolve => setTimeout(resolve, 1000 / 30));
-export const transition = function (showDefaultValue) {
-    return Behavior({
-        properties: {
-            customStyle: String,
-            // @ts-ignore
-            show: {
-                type: Boolean,
-                value: showDefaultValue,
-                observer: 'observeShow'
-            },
-            // @ts-ignore
-            duration: {
-                type: null,
-                value: 300,
-                observer: 'observeDuration'
-            },
-            name: {
-                type: String,
-                value: 'fade'
-            }
-        },
-        data: {
-            type: '',
-            inited: false,
-            display: false
-        },
-        attached() {
-            if (this.data.show) {
-                this.enter();
-            }
-        },
-        methods: {
-            observeShow(value) {
-                value ? this.enter() : this.leave();
-            },
-            enter() {
-                const { duration, name } = this.data;
-                const classNames = getClassNames(name);
-                const currentDuration = isObj(duration) ? duration.enter : duration;
-                this.status = 'enter';
-                this.$emit('before-enter');
-                Promise.resolve()
-                    .then(nextTick)
-                    .then(() => {
-                    this.checkStatus('enter');
-                    this.$emit('enter');
-                    this.setData({
-                        inited: true,
-                        display: true,
-                        classes: classNames.enter,
-                        currentDuration
-                    });
-                })
-                    .then(nextTick)
-                    .then(() => {
-                    this.checkStatus('enter');
-                    this.transitionEnded = false;
-                    this.setData({
-                        classes: classNames['enter-to']
-                    });
-                })
-                    .catch(() => { });
-            },
-            leave() {
-                if (!this.data.display) {
-                    return;
-                }
-                const { duration, name } = this.data;
-                const classNames = getClassNames(name);
-                const currentDuration = isObj(duration) ? duration.leave : duration;
-                this.status = 'leave';
-                this.$emit('before-leave');
-                Promise.resolve()
-                    .then(nextTick)
-                    .then(() => {
-                    this.checkStatus('leave');
-                    this.$emit('leave');
-                    this.setData({
-                        classes: classNames.leave,
-                        currentDuration
-                    });
-                })
-                    .then(nextTick)
-                    .then(() => {
-                    this.checkStatus('leave');
-                    this.transitionEnded = false;
-                    setTimeout(() => this.onTransitionEnd(), currentDuration);
-                    this.setData({
-                        classes: classNames['leave-to']
-                    });
-                })
-                    .catch(() => { });
-            },
-            checkStatus(status) {
-                if (status !== this.status) {
-                    throw new Error(`incongruent status: ${status}`);
-                }
-            },
-            onTransitionEnd() {
-                if (this.transitionEnded) {
-                    return;
-                }
-                this.transitionEnded = true;
-                this.$emit(`after-${this.status}`);
-                const { show, display } = this.data;
-                if (!show && display) {
-                    this.setData({ display: false });
-                }
-            }
-        }
-    });
-};
+import { isObj } from '../common/utils';
+const getClassNames = (name) => ({
+    enter: `van-${name}-enter van-${name}-enter-active enter-class enter-active-class`,
+    'enter-to': `van-${name}-enter-to van-${name}-enter-active enter-to-class enter-active-class`,
+    leave: `van-${name}-leave van-${name}-leave-active leave-class leave-active-class`,
+    'leave-to': `van-${name}-leave-to van-${name}-leave-active leave-to-class leave-active-class`
+});
+const nextTick = () => new Promise(resolve => setTimeout(resolve, 1000 / 30));
+export const transition = function (showDefaultValue) {
+    return Behavior({
+        properties: {
+            customStyle: String,
+            // @ts-ignore
+            show: {
+                type: Boolean,
+                value: showDefaultValue,
+                observer: 'observeShow'
+            },
+            // @ts-ignore
+            duration: {
+                type: null,
+                value: 300,
+                observer: 'observeDuration'
+            },
+            name: {
+                type: String,
+                value: 'fade'
+            }
+        },
+        data: {
+            type: '',
+            inited: false,
+            display: false
+        },
+        attached() {
+            if (this.data.show) {
+                this.enter();
+            }
+        },
+        methods: {
+            observeShow(value) {
+                value ? this.enter() : this.leave();
+            },
+            enter() {
+                const { duration, name } = this.data;
+                const classNames = getClassNames(name);
+                const currentDuration = isObj(duration) ? duration.enter : duration;
+                this.status = 'enter';
+                this.$emit('before-enter');
+                Promise.resolve()
+                    .then(nextTick)
+                    .then(() => {
+                    this.checkStatus('enter');
+                    this.$emit('enter');
+                    this.setData({
+                        inited: true,
+                        display: true,
+                        classes: classNames.enter,
+                        currentDuration
+                    });
+                })
+                    .then(nextTick)
+                    .then(() => {
+                    this.checkStatus('enter');
+                    this.transitionEnded = false;
+                    this.setData({
+                        classes: classNames['enter-to']
+                    });
+                })
+                    .catch(() => { });
+            },
+            leave() {
+                if (!this.data.display) {
+                    return;
+                }
+                const { duration, name } = this.data;
+                const classNames = getClassNames(name);
+                const currentDuration = isObj(duration) ? duration.leave : duration;
+                this.status = 'leave';
+                this.$emit('before-leave');
+                Promise.resolve()
+                    .then(nextTick)
+                    .then(() => {
+                    this.checkStatus('leave');
+                    this.$emit('leave');
+                    this.setData({
+                        classes: classNames.leave,
+                        currentDuration
+                    });
+                })
+                    .then(nextTick)
+                    .then(() => {
+                    this.checkStatus('leave');
+                    this.transitionEnded = false;
+                    setTimeout(() => this.onTransitionEnd(), currentDuration);
+                    this.setData({
+                        classes: classNames['leave-to']
+                    });
+                })
+                    .catch(() => { });
+            },
+            checkStatus(status) {
+                if (status !== this.status) {
+                    throw new Error(`incongruent status: ${status}`);
+                }
+            },
+            onTransitionEnd() {
+                if (this.transitionEnded) {
+                    return;
+                }
+                this.transitionEnded = true;
+                this.$emit(`after-${this.status}`);
+                const { show, display } = this.data;
+                if (!show && display) {
+                    this.setData({ display: false });
+                }
+            }
+        }
+    });
+};
diff --git a/litemall-wx/lib/vant-weapp/nav-bar/index.d.ts b/litemall-wx/lib/vant-weapp/nav-bar/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/nav-bar/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/nav-bar/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/nav-bar/index.js b/litemall-wx/lib/vant-weapp/nav-bar/index.js
index 3acf41a8..b4709207 100644
--- a/litemall-wx/lib/vant-weapp/nav-bar/index.js
+++ b/litemall-wx/lib/vant-weapp/nav-bar/index.js
@@ -1,38 +1,38 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    classes: ['title-class'],
-    props: {
-        title: String,
-        fixed: Boolean,
-        leftText: String,
-        rightText: String,
-        leftArrow: Boolean,
-        border: {
-            type: Boolean,
-            value: true
-        },
-        zIndex: {
-            type: Number,
-            value: 1
-        },
-        safeAreaInsetTop: {
-            type: Boolean,
-            value: true
-        },
-    },
-    data: {
-        statusBarHeight: 0
-    },
-    created() {
-        const { statusBarHeight } = wx.getSystemInfoSync();
-        this.setData({ statusBarHeight });
-    },
-    methods: {
-        onClickLeft() {
-            this.$emit('click-left');
-        },
-        onClickRight() {
-            this.$emit('click-right');
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    classes: ['title-class'],
+    props: {
+        title: String,
+        fixed: Boolean,
+        leftText: String,
+        rightText: String,
+        leftArrow: Boolean,
+        border: {
+            type: Boolean,
+            value: true
+        },
+        zIndex: {
+            type: Number,
+            value: 1
+        },
+        safeAreaInsetTop: {
+            type: Boolean,
+            value: true
+        },
+    },
+    data: {
+        statusBarHeight: 0
+    },
+    created() {
+        const { statusBarHeight } = wx.getSystemInfoSync();
+        this.setData({ statusBarHeight });
+    },
+    methods: {
+        onClickLeft() {
+            this.$emit('click-left');
+        },
+        onClickRight() {
+            this.$emit('click-right');
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/nav-bar/index.json b/litemall-wx/lib/vant-weapp/nav-bar/index.json
index 0a336c08..8abfe203 100644
--- a/litemall-wx/lib/vant-weapp/nav-bar/index.json
+++ b/litemall-wx/lib/vant-weapp/nav-bar/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/nav-bar/index.wxml b/litemall-wx/lib/vant-weapp/nav-bar/index.wxml
index 9ed4446f..b90cde8b 100644
--- a/litemall-wx/lib/vant-weapp/nav-bar/index.wxml
+++ b/litemall-wx/lib/vant-weapp/nav-bar/index.wxml
@@ -1,37 +1,37 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view
-  class="{{ utils.bem('nav-bar', { fixed }) }} custom-class {{ border ? 'van-hairline--bottom' : '' }}"
-  style="z-index: {{ zIndex }}; padding-top: {{ safeAreaInsetTop ? statusBarHeight : 0 }}px;"
->
-  <view class="van-nav-bar__left" bind:tap="onClickLeft">
-    <block wx:if="{{ leftArrow || leftText }}">
-      <van-icon
-        wx:if="{{ leftArrow }}"
-        size="16px"
-        name="arrow-left"
-        custom-class="van-nav-bar__arrow"
-      />
-      <view
-        wx:if="{{ leftText }}"
-        class="van-nav-bar__text"
-        hover-class="van-nav-bar__text--hover"
-        hover-stay-time="70"
-      >{{ leftText }}</view>
-    </block>
-    <slot wx:else name="left" />
-  </view>
-  <view class="van-nav-bar__title title-class van-ellipsis">
-    <block wx:if="{{ title }}">{{ title }}</block>
-    <slot wx:else name="title" />
-  </view>
-  <view class="van-nav-bar__right" bind:tap="onClickRight">
-    <view
-      wx:if="{{ rightText }}"
-      class="van-nav-bar__text"
-      hover-class="van-nav-bar__text--hover"
-      hover-stay-time="70"
-    >{{ rightText }}</view>
-    <slot wx:else name="right" />
-  </view>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="{{ utils.bem('nav-bar', { fixed }) }} custom-class {{ border ? 'van-hairline--bottom' : '' }}"
+  style="z-index: {{ zIndex }}; padding-top: {{ safeAreaInsetTop ? statusBarHeight : 0 }}px;"
+>
+  <view class="van-nav-bar__left" bind:tap="onClickLeft">
+    <block wx:if="{{ leftArrow || leftText }}">
+      <van-icon
+        wx:if="{{ leftArrow }}"
+        size="16px"
+        name="arrow-left"
+        custom-class="van-nav-bar__arrow"
+      />
+      <view
+        wx:if="{{ leftText }}"
+        class="van-nav-bar__text"
+        hover-class="van-nav-bar__text--hover"
+        hover-stay-time="70"
+      >{{ leftText }}</view>
+    </block>
+    <slot wx:else name="left" />
+  </view>
+  <view class="van-nav-bar__title title-class van-ellipsis">
+    <block wx:if="{{ title }}">{{ title }}</block>
+    <slot wx:else name="title" />
+  </view>
+  <view class="van-nav-bar__right" bind:tap="onClickRight">
+    <view
+      wx:if="{{ rightText }}"
+      class="van-nav-bar__text"
+      hover-class="van-nav-bar__text--hover"
+      hover-stay-time="70"
+    >{{ rightText }}</view>
+    <slot wx:else name="right" />
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/notice-bar/index.d.ts b/litemall-wx/lib/vant-weapp/notice-bar/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/notice-bar/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/notice-bar/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/notice-bar/index.js b/litemall-wx/lib/vant-weapp/notice-bar/index.js
index faf35677..82fa172f 100644
--- a/litemall-wx/lib/vant-weapp/notice-bar/index.js
+++ b/litemall-wx/lib/vant-weapp/notice-bar/index.js
@@ -1,123 +1,123 @@
-import { VantComponent } from '../common/component';
-const FONT_COLOR = '#ed6a0c';
-const BG_COLOR = '#fffbe8';
-VantComponent({
-    props: {
-        text: {
-            type: String,
-            value: ''
-        },
-        mode: {
-            type: String,
-            value: ''
-        },
-        url: {
-            type: String,
-            value: ''
-        },
-        openType: {
-            type: String,
-            value: 'navigate'
-        },
-        delay: {
-            type: Number,
-            value: 1
-        },
-        speed: {
-            type: Number,
-            value: 50
-        },
-        scrollable: {
-            type: Boolean,
-            value: true
-        },
-        leftIcon: {
-            type: String,
-            value: ''
-        },
-        color: {
-            type: String,
-            value: FONT_COLOR
-        },
-        backgroundColor: {
-            type: String,
-            value: BG_COLOR
-        },
-        wrapable: Boolean
-    },
-    data: {
-        show: true
-    },
-    watch: {
-        text() {
-            this.setData({}, this.init);
-        }
-    },
-    created() {
-        this.resetAnimation = wx.createAnimation({
-            duration: 0,
-            timingFunction: 'linear'
-        });
-    },
-    destroyed() {
-        this.timer && clearTimeout(this.timer);
-    },
-    methods: {
-        init() {
-            Promise.all([
-                this.getRect('.van-notice-bar__content'),
-                this.getRect('.van-notice-bar__wrap')
-            ]).then((rects) => {
-                const [contentRect, wrapRect] = rects;
-                if (contentRect == null ||
-                    wrapRect == null ||
-                    !contentRect.width ||
-                    !wrapRect.width) {
-                    return;
-                }
-                const { speed, scrollable, delay } = this.data;
-                if (scrollable && wrapRect.width < contentRect.width) {
-                    const duration = (contentRect.width / speed) * 1000;
-                    this.wrapWidth = wrapRect.width;
-                    this.contentWidth = contentRect.width;
-                    this.duration = duration;
-                    this.animation = wx.createAnimation({
-                        duration,
-                        timingFunction: 'linear',
-                        delay
-                    });
-                    this.scroll();
-                }
-            });
-        },
-        scroll() {
-            this.timer && clearTimeout(this.timer);
-            this.timer = null;
-            this.setData({
-                animationData: this.resetAnimation
-                    .translateX(this.wrapWidth)
-                    .step()
-                    .export()
-            });
-            setTimeout(() => {
-                this.setData({
-                    animationData: this.animation
-                        .translateX(-this.contentWidth)
-                        .step()
-                        .export()
-                });
-            }, 20);
-            this.timer = setTimeout(() => {
-                this.scroll();
-            }, this.duration);
-        },
-        onClickIcon() {
-            this.timer && clearTimeout(this.timer);
-            this.timer = null;
-            this.setData({ show: false });
-        },
-        onClick(event) {
-            this.$emit('click', event);
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+const FONT_COLOR = '#ed6a0c';
+const BG_COLOR = '#fffbe8';
+VantComponent({
+    props: {
+        text: {
+            type: String,
+            value: ''
+        },
+        mode: {
+            type: String,
+            value: ''
+        },
+        url: {
+            type: String,
+            value: ''
+        },
+        openType: {
+            type: String,
+            value: 'navigate'
+        },
+        delay: {
+            type: Number,
+            value: 1
+        },
+        speed: {
+            type: Number,
+            value: 50
+        },
+        scrollable: {
+            type: Boolean,
+            value: true
+        },
+        leftIcon: {
+            type: String,
+            value: ''
+        },
+        color: {
+            type: String,
+            value: FONT_COLOR
+        },
+        backgroundColor: {
+            type: String,
+            value: BG_COLOR
+        },
+        wrapable: Boolean
+    },
+    data: {
+        show: true
+    },
+    watch: {
+        text() {
+            this.setData({}, this.init);
+        }
+    },
+    created() {
+        this.resetAnimation = wx.createAnimation({
+            duration: 0,
+            timingFunction: 'linear'
+        });
+    },
+    destroyed() {
+        this.timer && clearTimeout(this.timer);
+    },
+    methods: {
+        init() {
+            Promise.all([
+                this.getRect('.van-notice-bar__content'),
+                this.getRect('.van-notice-bar__wrap')
+            ]).then((rects) => {
+                const [contentRect, wrapRect] = rects;
+                if (contentRect == null ||
+                    wrapRect == null ||
+                    !contentRect.width ||
+                    !wrapRect.width) {
+                    return;
+                }
+                const { speed, scrollable, delay } = this.data;
+                if (scrollable && wrapRect.width < contentRect.width) {
+                    const duration = (contentRect.width / speed) * 1000;
+                    this.wrapWidth = wrapRect.width;
+                    this.contentWidth = contentRect.width;
+                    this.duration = duration;
+                    this.animation = wx.createAnimation({
+                        duration,
+                        timingFunction: 'linear',
+                        delay
+                    });
+                    this.scroll();
+                }
+            });
+        },
+        scroll() {
+            this.timer && clearTimeout(this.timer);
+            this.timer = null;
+            this.setData({
+                animationData: this.resetAnimation
+                    .translateX(this.wrapWidth)
+                    .step()
+                    .export()
+            });
+            setTimeout(() => {
+                this.setData({
+                    animationData: this.animation
+                        .translateX(-this.contentWidth)
+                        .step()
+                        .export()
+                });
+            }, 20);
+            this.timer = setTimeout(() => {
+                this.scroll();
+            }, this.duration);
+        },
+        onClickIcon() {
+            this.timer && clearTimeout(this.timer);
+            this.timer = null;
+            this.setData({ show: false });
+        },
+        onClick(event) {
+            this.$emit('click', event);
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/notice-bar/index.json b/litemall-wx/lib/vant-weapp/notice-bar/index.json
index a9ab393a..d3b324fb 100644
--- a/litemall-wx/lib/vant-weapp/notice-bar/index.json
+++ b/litemall-wx/lib/vant-weapp/notice-bar/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
 }
\ No newline at end of file
diff --git a/litemall-wx/lib/vant-weapp/notice-bar/index.wxml b/litemall-wx/lib/vant-weapp/notice-bar/index.wxml
index eb0851c3..b1a1e89d 100644
--- a/litemall-wx/lib/vant-weapp/notice-bar/index.wxml
+++ b/litemall-wx/lib/vant-weapp/notice-bar/index.wxml
@@ -1,37 +1,37 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view
-  wx:if="{{ show }}"
-  class="custom-class {{ utils.bem('notice-bar', { withicon: mode, wrapable }) }}"
-  style="color: {{ color }}; background-color: {{ backgroundColor }};"
-  bind:tap="onClick"
->
-  <van-icon
-    wx:if="{{ leftIcon }}"
-    size="16px"
-    name="{{ leftIcon }}"
-    class="van-notice-bar__left-icon"
-  />
-  <slot wx:else name="left-icon" />
-
-  <view class="van-notice-bar__wrap">
-    <view class="van-notice-bar__content {{ !scrollable && !wrapable ? 'van-ellipsis' : '' }}" animation="{{ animationData }}">
-      {{ text }}
-    </view>
-  </view>
-
-  <van-icon
-    wx:if="{{ mode === 'closeable' }}"
-    class="van-notice-bar__right-icon"
-    name="cross"
-    catch:tap="onClickIcon"
-  />
-  <navigator
-    wx:elif="{{ mode === 'link' }}"
-    url="{{ url }}"
-    open-type="{{ openType }}"
-  >
-    <van-icon class="van-notice-bar__right-icon" name="arrow" />
-  </navigator>
-  <slot wx:else name="right-icon" />
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  wx:if="{{ show }}"
+  class="custom-class {{ utils.bem('notice-bar', { withicon: mode, wrapable }) }}"
+  style="color: {{ color }}; background-color: {{ backgroundColor }};"
+  bind:tap="onClick"
+>
+  <van-icon
+    wx:if="{{ leftIcon }}"
+    size="16px"
+    name="{{ leftIcon }}"
+    class="van-notice-bar__left-icon"
+  />
+  <slot wx:else name="left-icon" />
+
+  <view class="van-notice-bar__wrap">
+    <view class="van-notice-bar__content {{ !scrollable && !wrapable ? 'van-ellipsis' : '' }}" animation="{{ animationData }}">
+      {{ text }}
+    </view>
+  </view>
+
+  <van-icon
+    wx:if="{{ mode === 'closeable' }}"
+    class="van-notice-bar__right-icon"
+    name="cross"
+    catch:tap="onClickIcon"
+  />
+  <navigator
+    wx:elif="{{ mode === 'link' }}"
+    url="{{ url }}"
+    open-type="{{ openType }}"
+  >
+    <van-icon class="van-notice-bar__right-icon" name="arrow" />
+  </navigator>
+  <slot wx:else name="right-icon" />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/notify/index.d.ts b/litemall-wx/lib/vant-weapp/notify/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/notify/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/notify/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/notify/index.js b/litemall-wx/lib/vant-weapp/notify/index.js
index db9ba762..39580e25 100644
--- a/litemall-wx/lib/vant-weapp/notify/index.js
+++ b/litemall-wx/lib/vant-weapp/notify/index.js
@@ -1,59 +1,59 @@
-import { VantComponent } from '../common/component';
-import { WHITE } from '../common/color';
-VantComponent({
-    props: {
-        message: String,
-        background: String,
-        type: {
-            type: String,
-            value: 'danger'
-        },
-        color: {
-            type: String,
-            value: WHITE
-        },
-        duration: {
-            type: Number,
-            value: 3000
-        },
-        zIndex: {
-            type: Number,
-            value: 110
-        },
-        safeAreaInsetTop: {
-            type: Boolean,
-            value: false
-        }
-    },
-    created() {
-        const { statusBarHeight } = wx.getSystemInfoSync();
-        this.setData({ statusBarHeight });
-    },
-    methods: {
-        show() {
-            const { duration, onOpened } = this.data;
-            clearTimeout(this.timer);
-            this.setData({
-                show: true
-            }, onOpened);
-            if (duration > 0 && duration !== Infinity) {
-                this.timer = setTimeout(() => {
-                    this.hide();
-                }, duration);
-            }
-        },
-        hide() {
-            const { onClose } = this.data;
-            clearTimeout(this.timer);
-            this.setData({
-                show: false
-            }, onClose);
-        },
-        onTap(event) {
-            const { onClick } = this.data;
-            if (onClick) {
-                onClick(event.detail);
-            }
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { WHITE } from '../common/color';
+VantComponent({
+    props: {
+        message: String,
+        background: String,
+        type: {
+            type: String,
+            value: 'danger'
+        },
+        color: {
+            type: String,
+            value: WHITE
+        },
+        duration: {
+            type: Number,
+            value: 3000
+        },
+        zIndex: {
+            type: Number,
+            value: 110
+        },
+        safeAreaInsetTop: {
+            type: Boolean,
+            value: false
+        }
+    },
+    created() {
+        const { statusBarHeight } = wx.getSystemInfoSync();
+        this.setData({ statusBarHeight });
+    },
+    methods: {
+        show() {
+            const { duration, onOpened } = this.data;
+            clearTimeout(this.timer);
+            this.setData({
+                show: true
+            }, onOpened);
+            if (duration > 0 && duration !== Infinity) {
+                this.timer = setTimeout(() => {
+                    this.hide();
+                }, duration);
+            }
+        },
+        hide() {
+            const { onClose } = this.data;
+            clearTimeout(this.timer);
+            this.setData({
+                show: false
+            }, onClose);
+        },
+        onTap(event) {
+            const { onClick } = this.data;
+            if (onClick) {
+                onClick(event.detail);
+            }
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/notify/index.json b/litemall-wx/lib/vant-weapp/notify/index.json
index c14a65f6..eaad93ef 100644
--- a/litemall-wx/lib/vant-weapp/notify/index.json
+++ b/litemall-wx/lib/vant-weapp/notify/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-transition": "../transition/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-transition": "../transition/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/notify/index.wxml b/litemall-wx/lib/vant-weapp/notify/index.wxml
index 552b8e36..2c50caa1 100644
--- a/litemall-wx/lib/vant-weapp/notify/index.wxml
+++ b/litemall-wx/lib/vant-weapp/notify/index.wxml
@@ -1,15 +1,15 @@
-<van-transition
-  name="slide-down"
-  show="{{ show }}"
-  custom-class="van-notify__container"
-  custom-style="z-index: {{ zIndex }};"
-  bind:tap="onTap"
->
-  <view
-    class="van-notify van-notify--{{ type }}"
-    style="background:{{ background }};color:{{ color }};"
-  >
-    <view wx:if="{{ safeAreaInsetTop }}" class="van-notify__safe-area"></view>
-    <text>{{ message }}</text>
-  </view>
-</van-transition>
+<van-transition
+  name="slide-down"
+  show="{{ show }}"
+  custom-class="van-notify__container"
+  custom-style="z-index: {{ zIndex }};"
+  bind:tap="onTap"
+>
+  <view
+    class="van-notify van-notify--{{ type }}"
+    style="background:{{ background }};color:{{ color }};"
+  >
+    <view wx:if="{{ safeAreaInsetTop }}" class="van-notify__safe-area"></view>
+    <text>{{ message }}</text>
+  </view>
+</van-transition>
diff --git a/litemall-wx/lib/vant-weapp/notify/notify.d.ts b/litemall-wx/lib/vant-weapp/notify/notify.d.ts
index 671195a5..64f6c2ae 100644
--- a/litemall-wx/lib/vant-weapp/notify/notify.d.ts
+++ b/litemall-wx/lib/vant-weapp/notify/notify.d.ts
@@ -1,19 +1,19 @@
-interface NotifyOptions {
-    type?: 'primary' | 'success' | 'danger' | 'warning';
-    color?: string;
-    zIndex?: number;
-    message: string;
-    context?: any;
-    duration?: number;
-    selector?: string;
-    background?: string;
-    safeAreaInsetTop?: boolean;
-    onClick?: () => void;
-    onOpened?: () => void;
-    onClose?: () => void;
-}
-declare function Notify(options: NotifyOptions | string): any;
-declare namespace Notify {
-    var clear: (options?: NotifyOptions) => void;
-}
-export default Notify;
+interface NotifyOptions {
+    type?: 'primary' | 'success' | 'danger' | 'warning';
+    color?: string;
+    zIndex?: number;
+    message: string;
+    context?: any;
+    duration?: number;
+    selector?: string;
+    background?: string;
+    safeAreaInsetTop?: boolean;
+    onClick?: () => void;
+    onOpened?: () => void;
+    onClose?: () => void;
+}
+declare function Notify(options: NotifyOptions | string): any;
+declare namespace Notify {
+    var clear: (options?: NotifyOptions) => void;
+}
+export default Notify;
diff --git a/litemall-wx/lib/vant-weapp/notify/notify.js b/litemall-wx/lib/vant-weapp/notify/notify.js
index 140690b6..4d2ec73e 100644
--- a/litemall-wx/lib/vant-weapp/notify/notify.js
+++ b/litemall-wx/lib/vant-weapp/notify/notify.js
@@ -1,41 +1,41 @@
-import { WHITE } from '../common/color';
-const defaultOptions = {
-    selector: '#van-notify',
-    type: 'danger',
-    message: '',
-    background: '',
-    duration: 3000,
-    zIndex: 110,
-    color: WHITE,
-    onClick: () => { },
-    onOpened: () => { },
-    onClose: () => { }
-};
-function parseOptions(message) {
-    return typeof message === 'string' ? { message } : message;
-}
-function getContext() {
-    const pages = getCurrentPages();
-    return pages[pages.length - 1];
-}
-export default function Notify(options) {
-    options = Object.assign({}, defaultOptions, parseOptions(options));
-    const context = options.context || getContext();
-    const notify = context.selectComponent(options.selector);
-    delete options.context;
-    delete options.selector;
-    if (notify) {
-        notify.set(options);
-        notify.show();
-        return notify;
-    }
-    console.warn('未找到 van-notify 节点，请确认 selector 及 context 是否正确');
-}
-Notify.clear = function (options) {
-    options = Object.assign({}, defaultOptions, parseOptions(options));
-    const context = options.context || getContext();
-    const notify = context.selectComponent(options.selector);
-    if (notify) {
-        notify.hide();
-    }
-};
+import { WHITE } from '../common/color';
+const defaultOptions = {
+    selector: '#van-notify',
+    type: 'danger',
+    message: '',
+    background: '',
+    duration: 3000,
+    zIndex: 110,
+    color: WHITE,
+    onClick: () => { },
+    onOpened: () => { },
+    onClose: () => { }
+};
+function parseOptions(message) {
+    return typeof message === 'string' ? { message } : message;
+}
+function getContext() {
+    const pages = getCurrentPages();
+    return pages[pages.length - 1];
+}
+export default function Notify(options) {
+    options = Object.assign({}, defaultOptions, parseOptions(options));
+    const context = options.context || getContext();
+    const notify = context.selectComponent(options.selector);
+    delete options.context;
+    delete options.selector;
+    if (notify) {
+        notify.set(options);
+        notify.show();
+        return notify;
+    }
+    console.warn('未找到 van-notify 节点，请确认 selector 及 context 是否正确');
+}
+Notify.clear = function (options) {
+    options = Object.assign({}, defaultOptions, parseOptions(options));
+    const context = options.context || getContext();
+    const notify = context.selectComponent(options.selector);
+    if (notify) {
+        notify.hide();
+    }
+};
diff --git a/litemall-wx/lib/vant-weapp/overlay/index.d.ts b/litemall-wx/lib/vant-weapp/overlay/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/overlay/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/overlay/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/overlay/index.js b/litemall-wx/lib/vant-weapp/overlay/index.js
index f5791130..666a8b85 100644
--- a/litemall-wx/lib/vant-weapp/overlay/index.js
+++ b/litemall-wx/lib/vant-weapp/overlay/index.js
@@ -1,22 +1,22 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    props: {
-        show: Boolean,
-        customStyle: String,
-        duration: {
-            type: null,
-            value: 300
-        },
-        zIndex: {
-            type: Number,
-            value: 1
-        }
-    },
-    methods: {
-        onClick() {
-            this.$emit('click');
-        },
-        // for prevent touchmove
-        noop() { }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    props: {
+        show: Boolean,
+        customStyle: String,
+        duration: {
+            type: null,
+            value: 300
+        },
+        zIndex: {
+            type: Number,
+            value: 1
+        }
+    },
+    methods: {
+        onClick() {
+            this.$emit('click');
+        },
+        // for prevent touchmove
+        noop() { }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/overlay/index.json b/litemall-wx/lib/vant-weapp/overlay/index.json
index c14a65f6..eaad93ef 100644
--- a/litemall-wx/lib/vant-weapp/overlay/index.json
+++ b/litemall-wx/lib/vant-weapp/overlay/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-transition": "../transition/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-transition": "../transition/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/overlay/index.wxml b/litemall-wx/lib/vant-weapp/overlay/index.wxml
index 9212348b..a65de2b9 100644
--- a/litemall-wx/lib/vant-weapp/overlay/index.wxml
+++ b/litemall-wx/lib/vant-weapp/overlay/index.wxml
@@ -1,10 +1,10 @@
-<van-transition
-  show="{{ show }}"
-  custom-class="van-overlay"
-  custom-style="z-index: {{ zIndex }}; {{ customStyle }}"
-  duration="{{ duration }}"
-  bind:tap="onClick"
-  catch:touchmove="noop"
->
-  <slot></slot>
-</van-transition>
+<van-transition
+  show="{{ show }}"
+  custom-class="van-overlay"
+  custom-style="z-index: {{ zIndex }}; {{ customStyle }}"
+  duration="{{ duration }}"
+  bind:tap="onClick"
+  catch:touchmove="noop"
+>
+  <slot></slot>
+</van-transition>
diff --git a/litemall-wx/lib/vant-weapp/panel/index.d.ts b/litemall-wx/lib/vant-weapp/panel/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/panel/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/panel/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/panel/index.js b/litemall-wx/lib/vant-weapp/panel/index.js
index e624d5eb..25e9c407 100644
--- a/litemall-wx/lib/vant-weapp/panel/index.js
+++ b/litemall-wx/lib/vant-weapp/panel/index.js
@@ -1,10 +1,10 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    classes: ['header-class', 'footer-class'],
-    props: {
-        desc: String,
-        title: String,
-        status: String,
-        useFooterSlot: Boolean
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    classes: ['header-class', 'footer-class'],
+    props: {
+        desc: String,
+        title: String,
+        status: String,
+        useFooterSlot: Boolean
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/panel/index.json b/litemall-wx/lib/vant-weapp/panel/index.json
index 0e5425cd..7069216d 100644
--- a/litemall-wx/lib/vant-weapp/panel/index.json
+++ b/litemall-wx/lib/vant-weapp/panel/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-cell": "../cell/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-cell": "../cell/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/panel/index.wxml b/litemall-wx/lib/vant-weapp/panel/index.wxml
index 3f135d23..e277c9d5 100644
--- a/litemall-wx/lib/vant-weapp/panel/index.wxml
+++ b/litemall-wx/lib/vant-weapp/panel/index.wxml
@@ -1,19 +1,19 @@
-<view class="van-panel van-hairline--top-bottom custom-class">
-  <van-cell 
-    wx:if="{{ title || desc || status }}"
-    title="{{ title }}"
-    label="{{ desc }}"
-    value="{{ status }}"
-    custom-class="header-class"
-    value-class="van-panel__header-value"
-  />
-  <slot wx:else name="header" />
-
-  <view class="van-panel__content">
-    <slot />
-  </view>
-
-  <view wx:if="{{ useFooterSlot }}" class="van-panel__footer van-hairline--top footer-class">
-    <slot name="footer" />
-  </view>
-</view>
+<view class="van-panel van-hairline--top-bottom custom-class">
+  <van-cell 
+    wx:if="{{ title || desc || status }}"
+    title="{{ title }}"
+    label="{{ desc }}"
+    value="{{ status }}"
+    custom-class="header-class"
+    value-class="van-panel__header-value"
+  />
+  <slot wx:else name="header" />
+
+  <view class="van-panel__content">
+    <slot />
+  </view>
+
+  <view wx:if="{{ useFooterSlot }}" class="van-panel__footer van-hairline--top footer-class">
+    <slot name="footer" />
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/picker-column/index.d.ts b/litemall-wx/lib/vant-weapp/picker-column/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/picker-column/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/picker-column/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/picker-column/index.js b/litemall-wx/lib/vant-weapp/picker-column/index.js
index 4a782993..6e8db443 100644
--- a/litemall-wx/lib/vant-weapp/picker-column/index.js
+++ b/litemall-wx/lib/vant-weapp/picker-column/index.js
@@ -1,119 +1,119 @@
-import { VantComponent } from '../common/component';
-import { isObj, range } from '../common/utils';
-const DEFAULT_DURATION = 200;
-VantComponent({
-    classes: ['active-class'],
-    props: {
-        valueKey: String,
-        className: String,
-        itemHeight: Number,
-        visibleItemCount: Number,
-        initialOptions: {
-            type: Array,
-            value: []
-        },
-        defaultIndex: {
-            type: Number,
-            value: 0
-        }
-    },
-    data: {
-        startY: 0,
-        offset: 0,
-        duration: 0,
-        startOffset: 0,
-        options: [],
-        currentIndex: 0
-    },
-    created() {
-        const { defaultIndex, initialOptions } = this.data;
-        this.set({
-            currentIndex: defaultIndex,
-            options: initialOptions
-        }).then(() => {
-            this.setIndex(defaultIndex);
-        });
-    },
-    watch: {
-        defaultIndex(value) {
-            this.setIndex(value);
-        }
-    },
-    methods: {
-        getCount() {
-            return this.data.options.length;
-        },
-        onTouchStart(event) {
-            this.setData({
-                startY: event.touches[0].clientY,
-                startOffset: this.data.offset,
-                duration: 0
-            });
-        },
-        onTouchMove(event) {
-            const { data } = this;
-            const deltaY = event.touches[0].clientY - data.startY;
-            this.setData({
-                offset: range(data.startOffset + deltaY, -(this.getCount() * data.itemHeight), data.itemHeight)
-            });
-        },
-        onTouchEnd() {
-            const { data } = this;
-            if (data.offset !== data.startOffset) {
-                this.setData({ duration: DEFAULT_DURATION });
-                const index = range(Math.round(-data.offset / data.itemHeight), 0, this.getCount() - 1);
-                this.setIndex(index, true);
-            }
-        },
-        onClickItem(event) {
-            const { index } = event.currentTarget.dataset;
-            this.setIndex(index, true);
-        },
-        adjustIndex(index) {
-            const { data } = this;
-            const count = this.getCount();
-            index = range(index, 0, count);
-            for (let i = index; i < count; i++) {
-                if (!this.isDisabled(data.options[i]))
-                    return i;
-            }
-            for (let i = index - 1; i >= 0; i--) {
-                if (!this.isDisabled(data.options[i]))
-                    return i;
-            }
-        },
-        isDisabled(option) {
-            return isObj(option) && option.disabled;
-        },
-        getOptionText(option) {
-            const { data } = this;
-            return isObj(option) && data.valueKey in option
-                ? option[data.valueKey]
-                : option;
-        },
-        setIndex(index, userAction) {
-            const { data } = this;
-            index = this.adjustIndex(index) || 0;
-            const offset = -index * data.itemHeight;
-            if (index !== data.currentIndex) {
-                return this.set({ offset, currentIndex: index }).then(() => {
-                    userAction && this.$emit('change', index);
-                });
-            }
-            return this.set({ offset });
-        },
-        setValue(value) {
-            const { options } = this.data;
-            for (let i = 0; i < options.length; i++) {
-                if (this.getOptionText(options[i]) === value) {
-                    return this.setIndex(i);
-                }
-            }
-            return Promise.resolve();
-        },
-        getValue() {
-            const { data } = this;
-            return data.options[data.currentIndex];
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { isObj, range } from '../common/utils';
+const DEFAULT_DURATION = 200;
+VantComponent({
+    classes: ['active-class'],
+    props: {
+        valueKey: String,
+        className: String,
+        itemHeight: Number,
+        visibleItemCount: Number,
+        initialOptions: {
+            type: Array,
+            value: []
+        },
+        defaultIndex: {
+            type: Number,
+            value: 0
+        }
+    },
+    data: {
+        startY: 0,
+        offset: 0,
+        duration: 0,
+        startOffset: 0,
+        options: [],
+        currentIndex: 0
+    },
+    created() {
+        const { defaultIndex, initialOptions } = this.data;
+        this.set({
+            currentIndex: defaultIndex,
+            options: initialOptions
+        }).then(() => {
+            this.setIndex(defaultIndex);
+        });
+    },
+    watch: {
+        defaultIndex(value) {
+            this.setIndex(value);
+        }
+    },
+    methods: {
+        getCount() {
+            return this.data.options.length;
+        },
+        onTouchStart(event) {
+            this.setData({
+                startY: event.touches[0].clientY,
+                startOffset: this.data.offset,
+                duration: 0
+            });
+        },
+        onTouchMove(event) {
+            const { data } = this;
+            const deltaY = event.touches[0].clientY - data.startY;
+            this.setData({
+                offset: range(data.startOffset + deltaY, -(this.getCount() * data.itemHeight), data.itemHeight)
+            });
+        },
+        onTouchEnd() {
+            const { data } = this;
+            if (data.offset !== data.startOffset) {
+                this.setData({ duration: DEFAULT_DURATION });
+                const index = range(Math.round(-data.offset / data.itemHeight), 0, this.getCount() - 1);
+                this.setIndex(index, true);
+            }
+        },
+        onClickItem(event) {
+            const { index } = event.currentTarget.dataset;
+            this.setIndex(index, true);
+        },
+        adjustIndex(index) {
+            const { data } = this;
+            const count = this.getCount();
+            index = range(index, 0, count);
+            for (let i = index; i < count; i++) {
+                if (!this.isDisabled(data.options[i]))
+                    return i;
+            }
+            for (let i = index - 1; i >= 0; i--) {
+                if (!this.isDisabled(data.options[i]))
+                    return i;
+            }
+        },
+        isDisabled(option) {
+            return isObj(option) && option.disabled;
+        },
+        getOptionText(option) {
+            const { data } = this;
+            return isObj(option) && data.valueKey in option
+                ? option[data.valueKey]
+                : option;
+        },
+        setIndex(index, userAction) {
+            const { data } = this;
+            index = this.adjustIndex(index) || 0;
+            const offset = -index * data.itemHeight;
+            if (index !== data.currentIndex) {
+                return this.set({ offset, currentIndex: index }).then(() => {
+                    userAction && this.$emit('change', index);
+                });
+            }
+            return this.set({ offset });
+        },
+        setValue(value) {
+            const { options } = this.data;
+            for (let i = 0; i < options.length; i++) {
+                if (this.getOptionText(options[i]) === value) {
+                    return this.setIndex(i);
+                }
+            }
+            return Promise.resolve();
+        },
+        getValue() {
+            const { data } = this;
+            return data.options[data.currentIndex];
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/picker-column/index.json b/litemall-wx/lib/vant-weapp/picker-column/index.json
index 32640e0d..1edff938 100644
--- a/litemall-wx/lib/vant-weapp/picker-column/index.json
+++ b/litemall-wx/lib/vant-weapp/picker-column/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
+{
+  "component": true
 }
\ No newline at end of file
diff --git a/litemall-wx/lib/vant-weapp/picker-column/index.wxml b/litemall-wx/lib/vant-weapp/picker-column/index.wxml
index f052ed99..d867118e 100644
--- a/litemall-wx/lib/vant-weapp/picker-column/index.wxml
+++ b/litemall-wx/lib/vant-weapp/picker-column/index.wxml
@@ -1,22 +1,22 @@
-<wxs src="./index.wxs" module="getOptionText" />
-
-<view
-  class="van-picker-column custom-class"
-  style="height: {{ itemHeight * visibleItemCount }}px"
-  bind:touchstart="onTouchStart"
-  catch:touchmove="onTouchMove"
-  bind:touchend="onTouchEnd"
-  bind:touchcancel="onTouchEnd"
->
-  <view style="transition: transform {{ duration }}ms; line-height: {{ itemHeight }}px; transform: translate3d(0, {{ offset + (itemHeight * (visibleItemCount - 1)) / 2 }}px, 0)">
-    <view
-      wx:for="{{ options }}"
-      wx:for-item="option"
-      wx:key="index"
-      data-index="{{ index }}"
-      style="height: {{ itemHeight }}px"
-      class="van-ellipsis van-picker-column__item {{ option && option.disabled ? 'van-picker-column__item--disabled' : '' }} {{ index === currentIndex ? 'van-picker-column__item--selected active-class' : '' }}"
-      bindtap="onClickItem"
-    >{{ getOptionText(option, valueKey) }}</view>
-  </view>
-</view>
+<wxs src="./index.wxs" module="getOptionText" />
+
+<view
+  class="van-picker-column custom-class"
+  style="height: {{ itemHeight * visibleItemCount }}px"
+  bind:touchstart="onTouchStart"
+  catch:touchmove="onTouchMove"
+  bind:touchend="onTouchEnd"
+  bind:touchcancel="onTouchEnd"
+>
+  <view style="transition: transform {{ duration }}ms; line-height: {{ itemHeight }}px; transform: translate3d(0, {{ offset + (itemHeight * (visibleItemCount - 1)) / 2 }}px, 0)">
+    <view
+      wx:for="{{ options }}"
+      wx:for-item="option"
+      wx:key="index"
+      data-index="{{ index }}"
+      style="height: {{ itemHeight }}px"
+      class="van-ellipsis van-picker-column__item {{ option && option.disabled ? 'van-picker-column__item--disabled' : '' }} {{ index === currentIndex ? 'van-picker-column__item--selected active-class' : '' }}"
+      bindtap="onClickItem"
+    >{{ getOptionText(option, valueKey) }}</view>
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/picker-column/index.wxs b/litemall-wx/lib/vant-weapp/picker-column/index.wxs
index 3c8fc681..366b240c 100644
--- a/litemall-wx/lib/vant-weapp/picker-column/index.wxs
+++ b/litemall-wx/lib/vant-weapp/picker-column/index.wxs
@@ -1,8 +1,8 @@
-function isObj(x) {
-  var type = typeof x;
-  return x !== null && (type === 'object' || type === 'function');
-}
-
-module.exports = function (option, valueKey) {
-  return isObj(option) && option[valueKey] != null ? option[valueKey] : option;
-}
+function isObj(x) {
+  var type = typeof x;
+  return x !== null && (type === 'object' || type === 'function');
+}
+
+module.exports = function (option, valueKey) {
+  return isObj(option) && option[valueKey] != null ? option[valueKey] : option;
+}
diff --git a/litemall-wx/lib/vant-weapp/picker/index.d.ts b/litemall-wx/lib/vant-weapp/picker/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/picker/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/picker/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/picker/index.js b/litemall-wx/lib/vant-weapp/picker/index.js
index 8e78e664..8df02112 100644
--- a/litemall-wx/lib/vant-weapp/picker/index.js
+++ b/litemall-wx/lib/vant-weapp/picker/index.js
@@ -1,135 +1,135 @@
-import { VantComponent } from '../common/component';
-import { pickerProps } from './shared';
-VantComponent({
-    classes: ['active-class', 'toolbar-class', 'column-class'],
-    props: Object.assign(Object.assign({}, pickerProps), { valueKey: {
-            type: String,
-            value: 'text'
-        }, toolbarPosition: {
-            type: String,
-            value: 'top'
-        }, defaultIndex: {
-            type: Number,
-            value: 0
-        }, columns: {
-            type: Array,
-            value: [],
-            observer(columns = []) {
-                this.simple = columns.length && !columns[0].values;
-                this.children = this.selectAllComponents('.van-picker__column');
-                if (Array.isArray(this.children) && this.children.length) {
-                    this.setColumns().catch(() => { });
-                }
-            }
-        } }),
-    beforeCreate() {
-        this.children = [];
-    },
-    methods: {
-        noop() { },
-        setColumns() {
-            const { data } = this;
-            const columns = this.simple ? [{ values: data.columns }] : data.columns;
-            const stack = columns.map((column, index) => this.setColumnValues(index, column.values));
-            return Promise.all(stack);
-        },
-        emit(event) {
-            const { type } = event.currentTarget.dataset;
-            if (this.simple) {
-                this.$emit(type, {
-                    value: this.getColumnValue(0),
-                    index: this.getColumnIndex(0)
-                });
-            }
-            else {
-                this.$emit(type, {
-                    value: this.getValues(),
-                    index: this.getIndexes()
-                });
-            }
-        },
-        onChange(event) {
-            if (this.simple) {
-                this.$emit('change', {
-                    picker: this,
-                    value: this.getColumnValue(0),
-                    index: this.getColumnIndex(0)
-                });
-            }
-            else {
-                this.$emit('change', {
-                    picker: this,
-                    value: this.getValues(),
-                    index: event.currentTarget.dataset.index
-                });
-            }
-        },
-        // get column instance by index
-        getColumn(index) {
-            return this.children[index];
-        },
-        // get column value by index
-        getColumnValue(index) {
-            const column = this.getColumn(index);
-            return column && column.getValue();
-        },
-        // set column value by index
-        setColumnValue(index, value) {
-            const column = this.getColumn(index);
-            if (column == null) {
-                return Promise.reject(new Error('setColumnValue: 对应列不存在'));
-            }
-            return column.setValue(value);
-        },
-        // get column option index by column index
-        getColumnIndex(columnIndex) {
-            return (this.getColumn(columnIndex) || {}).data.currentIndex;
-        },
-        // set column option index by column index
-        setColumnIndex(columnIndex, optionIndex) {
-            const column = this.getColumn(columnIndex);
-            if (column == null) {
-                return Promise.reject(new Error('setColumnIndex: 对应列不存在'));
-            }
-            return column.setIndex(optionIndex);
-        },
-        // get options of column by index
-        getColumnValues(index) {
-            return (this.children[index] || {}).data.options;
-        },
-        // set options of column by index
-        setColumnValues(index, options, needReset = true) {
-            const column = this.children[index];
-            if (column == null) {
-                return Promise.reject(new Error('setColumnValues: 对应列不存在'));
-            }
-            const isSame = JSON.stringify(column.data.options) === JSON.stringify(options);
-            if (isSame) {
-                return Promise.resolve();
-            }
-            return column.set({ options }).then(() => {
-                if (needReset) {
-                    column.setIndex(0);
-                }
-            });
-        },
-        // get values of all columns
-        getValues() {
-            return this.children.map((child) => child.getValue());
-        },
-        // set values of all columns
-        setValues(values) {
-            const stack = values.map((value, index) => this.setColumnValue(index, value));
-            return Promise.all(stack);
-        },
-        // get indexes of all columns
-        getIndexes() {
-            return this.children.map((child) => child.data.currentIndex);
-        },
-        // set indexes of all columns
-        setIndexes(indexes) {
-            const stack = indexes.map((optionIndex, columnIndex) => this.setColumnIndex(columnIndex, optionIndex));
-            return Promise.all(stack);
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { pickerProps } from './shared';
+VantComponent({
+    classes: ['active-class', 'toolbar-class', 'column-class'],
+    props: Object.assign(Object.assign({}, pickerProps), { valueKey: {
+            type: String,
+            value: 'text'
+        }, toolbarPosition: {
+            type: String,
+            value: 'top'
+        }, defaultIndex: {
+            type: Number,
+            value: 0
+        }, columns: {
+            type: Array,
+            value: [],
+            observer(columns = []) {
+                this.simple = columns.length && !columns[0].values;
+                this.children = this.selectAllComponents('.van-picker__column');
+                if (Array.isArray(this.children) && this.children.length) {
+                    this.setColumns().catch(() => { });
+                }
+            }
+        } }),
+    beforeCreate() {
+        this.children = [];
+    },
+    methods: {
+        noop() { },
+        setColumns() {
+            const { data } = this;
+            const columns = this.simple ? [{ values: data.columns }] : data.columns;
+            const stack = columns.map((column, index) => this.setColumnValues(index, column.values));
+            return Promise.all(stack);
+        },
+        emit(event) {
+            const { type } = event.currentTarget.dataset;
+            if (this.simple) {
+                this.$emit(type, {
+                    value: this.getColumnValue(0),
+                    index: this.getColumnIndex(0)
+                });
+            }
+            else {
+                this.$emit(type, {
+                    value: this.getValues(),
+                    index: this.getIndexes()
+                });
+            }
+        },
+        onChange(event) {
+            if (this.simple) {
+                this.$emit('change', {
+                    picker: this,
+                    value: this.getColumnValue(0),
+                    index: this.getColumnIndex(0)
+                });
+            }
+            else {
+                this.$emit('change', {
+                    picker: this,
+                    value: this.getValues(),
+                    index: event.currentTarget.dataset.index
+                });
+            }
+        },
+        // get column instance by index
+        getColumn(index) {
+            return this.children[index];
+        },
+        // get column value by index
+        getColumnValue(index) {
+            const column = this.getColumn(index);
+            return column && column.getValue();
+        },
+        // set column value by index
+        setColumnValue(index, value) {
+            const column = this.getColumn(index);
+            if (column == null) {
+                return Promise.reject(new Error('setColumnValue: 对应列不存在'));
+            }
+            return column.setValue(value);
+        },
+        // get column option index by column index
+        getColumnIndex(columnIndex) {
+            return (this.getColumn(columnIndex) || {}).data.currentIndex;
+        },
+        // set column option index by column index
+        setColumnIndex(columnIndex, optionIndex) {
+            const column = this.getColumn(columnIndex);
+            if (column == null) {
+                return Promise.reject(new Error('setColumnIndex: 对应列不存在'));
+            }
+            return column.setIndex(optionIndex);
+        },
+        // get options of column by index
+        getColumnValues(index) {
+            return (this.children[index] || {}).data.options;
+        },
+        // set options of column by index
+        setColumnValues(index, options, needReset = true) {
+            const column = this.children[index];
+            if (column == null) {
+                return Promise.reject(new Error('setColumnValues: 对应列不存在'));
+            }
+            const isSame = JSON.stringify(column.data.options) === JSON.stringify(options);
+            if (isSame) {
+                return Promise.resolve();
+            }
+            return column.set({ options }).then(() => {
+                if (needReset) {
+                    column.setIndex(0);
+                }
+            });
+        },
+        // get values of all columns
+        getValues() {
+            return this.children.map((child) => child.getValue());
+        },
+        // set values of all columns
+        setValues(values) {
+            const stack = values.map((value, index) => this.setColumnValue(index, value));
+            return Promise.all(stack);
+        },
+        // get indexes of all columns
+        getIndexes() {
+            return this.children.map((child) => child.data.currentIndex);
+        },
+        // set indexes of all columns
+        setIndexes(indexes) {
+            const stack = indexes.map((optionIndex, columnIndex) => this.setColumnIndex(columnIndex, optionIndex));
+            return Promise.all(stack);
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/picker/index.json b/litemall-wx/lib/vant-weapp/picker/index.json
index 2fcec899..bbeaf0ad 100644
--- a/litemall-wx/lib/vant-weapp/picker/index.json
+++ b/litemall-wx/lib/vant-weapp/picker/index.json
@@ -1,7 +1,7 @@
-{
-  "component": true,
-  "usingComponents": {
-    "picker-column": "../picker-column/index",
-    "loading": "../loading/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "picker-column": "../picker-column/index",
+    "loading": "../loading/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/picker/index.wxml b/litemall-wx/lib/vant-weapp/picker/index.wxml
index 6631a736..1328b418 100644
--- a/litemall-wx/lib/vant-weapp/picker/index.wxml
+++ b/litemall-wx/lib/vant-weapp/picker/index.wxml
@@ -1,65 +1,65 @@
-<template name="toolbar">
-  <view
-    wx:if="{{ showToolbar }}"
-    class="van-picker__toolbar van-hairline--top-bottom toolbar-class"
-  >
-    <view
-      class="van-picker__cancel"
-      hover-class="van-picker__cancel--hover"
-      hover-stay-time="70"
-      data-type="cancel"
-      bindtap="emit"
-    >
-      {{ cancelButtonText }}
-    </view>
-    <view wx:if="{{ title }}" class="van-picker__title van-ellipsis">{{ title }}</view>
-    <view
-      class="van-picker__confirm"
-      hover-class="van-picker__confirm--hover"
-      hover-stay-time="70"
-      data-type="confirm"
-      bindtap="emit"
-    >
-      {{ confirmButtonText }}
-    </view>
-  </view>
-</template>
-
-<view class="van-picker custom-class">
-  <template is="toolbar" wx:if="{{ toolbarPosition === 'top' }}" data="{{ showToolbar, cancelButtonText, title, confirmButtonText }}"></template>
-  <view wx:if="{{ loading }}" class="van-picker__loading">
-    <loading color="#1989fa"/>
-  </view>
-  <view
-    class="van-picker__columns"
-    style="height: {{ itemHeight * visibleItemCount }}px"
-    catch:touchmove="noop"
-  >
-    <picker-column
-      class="van-picker__column"
-      wx:for="{{ isSimple(columns) ? [columns] : columns }}"
-      wx:key="index"
-      data-index="{{ index }}"
-      custom-class="column-class"
-      value-key="{{ valueKey }}"
-      initial-options="{{ isSimple(columns) ? item : item.values }}"
-      default-index="{{ item.defaultIndex || defaultIndex }}"
-      item-height="{{ itemHeight }}"
-      visible-item-count="{{ visibleItemCount }}"
-      active-class="active-class"
-      bind:change="onChange"
-    />
-    <view
-      class="van-picker__frame van-hairline--top-bottom"
-      style="height: {{ itemHeight }}px"
-    />
-  </view>
-  <template is="toolbar" wx:if="{{ toolbarPosition === 'bottom' }}" data="{{ showToolbar, cancelButtonText, title, confirmButtonText }}"></template>
-</view>
-
-<wxs module="isSimple">
-  function isSimple(columns) {
-    return columns.length && !columns[0].values;
-  }
-  module.exports = isSimple;
-</wxs>
+<template name="toolbar">
+  <view
+    wx:if="{{ showToolbar }}"
+    class="van-picker__toolbar van-hairline--top-bottom toolbar-class"
+  >
+    <view
+      class="van-picker__cancel"
+      hover-class="van-picker__cancel--hover"
+      hover-stay-time="70"
+      data-type="cancel"
+      bindtap="emit"
+    >
+      {{ cancelButtonText }}
+    </view>
+    <view wx:if="{{ title }}" class="van-picker__title van-ellipsis">{{ title }}</view>
+    <view
+      class="van-picker__confirm"
+      hover-class="van-picker__confirm--hover"
+      hover-stay-time="70"
+      data-type="confirm"
+      bindtap="emit"
+    >
+      {{ confirmButtonText }}
+    </view>
+  </view>
+</template>
+
+<view class="van-picker custom-class">
+  <template is="toolbar" wx:if="{{ toolbarPosition === 'top' }}" data="{{ showToolbar, cancelButtonText, title, confirmButtonText }}"></template>
+  <view wx:if="{{ loading }}" class="van-picker__loading">
+    <loading color="#1989fa"/>
+  </view>
+  <view
+    class="van-picker__columns"
+    style="height: {{ itemHeight * visibleItemCount }}px"
+    catch:touchmove="noop"
+  >
+    <picker-column
+      class="van-picker__column"
+      wx:for="{{ isSimple(columns) ? [columns] : columns }}"
+      wx:key="index"
+      data-index="{{ index }}"
+      custom-class="column-class"
+      value-key="{{ valueKey }}"
+      initial-options="{{ isSimple(columns) ? item : item.values }}"
+      default-index="{{ item.defaultIndex || defaultIndex }}"
+      item-height="{{ itemHeight }}"
+      visible-item-count="{{ visibleItemCount }}"
+      active-class="active-class"
+      bind:change="onChange"
+    />
+    <view
+      class="van-picker__frame van-hairline--top-bottom"
+      style="height: {{ itemHeight }}px"
+    />
+  </view>
+  <template is="toolbar" wx:if="{{ toolbarPosition === 'bottom' }}" data="{{ showToolbar, cancelButtonText, title, confirmButtonText }}"></template>
+</view>
+
+<wxs module="isSimple">
+  function isSimple(columns) {
+    return columns.length && !columns[0].values;
+  }
+  module.exports = isSimple;
+</wxs>
diff --git a/litemall-wx/lib/vant-weapp/picker/shared.d.ts b/litemall-wx/lib/vant-weapp/picker/shared.d.ts
index c5480459..cf3b13ef 100644
--- a/litemall-wx/lib/vant-weapp/picker/shared.d.ts
+++ b/litemall-wx/lib/vant-weapp/picker/shared.d.ts
@@ -1,21 +1,21 @@
-export declare const pickerProps: {
-    title: StringConstructor;
-    loading: BooleanConstructor;
-    showToolbar: BooleanConstructor;
-    cancelButtonText: {
-        type: StringConstructor;
-        value: string;
-    };
-    confirmButtonText: {
-        type: StringConstructor;
-        value: string;
-    };
-    visibleItemCount: {
-        type: NumberConstructor;
-        value: number;
-    };
-    itemHeight: {
-        type: NumberConstructor;
-        value: number;
-    };
-};
+export declare const pickerProps: {
+    title: StringConstructor;
+    loading: BooleanConstructor;
+    showToolbar: BooleanConstructor;
+    cancelButtonText: {
+        type: StringConstructor;
+        value: string;
+    };
+    confirmButtonText: {
+        type: StringConstructor;
+        value: string;
+    };
+    visibleItemCount: {
+        type: NumberConstructor;
+        value: number;
+    };
+    itemHeight: {
+        type: NumberConstructor;
+        value: number;
+    };
+};
diff --git a/litemall-wx/lib/vant-weapp/picker/shared.js b/litemall-wx/lib/vant-weapp/picker/shared.js
index cf57d1d4..8e8aec57 100644
--- a/litemall-wx/lib/vant-weapp/picker/shared.js
+++ b/litemall-wx/lib/vant-weapp/picker/shared.js
@@ -1,21 +1,21 @@
-export const pickerProps = {
-    title: String,
-    loading: Boolean,
-    showToolbar: Boolean,
-    cancelButtonText: {
-        type: String,
-        value: '取消'
-    },
-    confirmButtonText: {
-        type: String,
-        value: '确认'
-    },
-    visibleItemCount: {
-        type: Number,
-        value: 5
-    },
-    itemHeight: {
-        type: Number,
-        value: 44
-    }
-};
+export const pickerProps = {
+    title: String,
+    loading: Boolean,
+    showToolbar: Boolean,
+    cancelButtonText: {
+        type: String,
+        value: '取消'
+    },
+    confirmButtonText: {
+        type: String,
+        value: '确认'
+    },
+    visibleItemCount: {
+        type: Number,
+        value: 5
+    },
+    itemHeight: {
+        type: Number,
+        value: 44
+    }
+};
diff --git a/litemall-wx/lib/vant-weapp/popup/index.d.ts b/litemall-wx/lib/vant-weapp/popup/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/popup/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/popup/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/popup/index.js b/litemall-wx/lib/vant-weapp/popup/index.js
index 4a2e7af3..02cc0692 100644
--- a/litemall-wx/lib/vant-weapp/popup/index.js
+++ b/litemall-wx/lib/vant-weapp/popup/index.js
@@ -1,80 +1,80 @@
-import { VantComponent } from '../common/component';
-import { transition } from '../mixins/transition';
-VantComponent({
-    classes: [
-        'enter-class',
-        'enter-active-class',
-        'enter-to-class',
-        'leave-class',
-        'leave-active-class',
-        'leave-to-class'
-    ],
-    mixins: [transition(false)],
-    props: {
-        round: Boolean,
-        closeable: Boolean,
-        customStyle: String,
-        overlayStyle: String,
-        transition: {
-            type: String,
-            observer: 'observeClass'
-        },
-        zIndex: {
-            type: Number,
-            value: 100
-        },
-        overlay: {
-            type: Boolean,
-            value: true
-        },
-        closeIcon: {
-            type: String,
-            value: 'cross'
-        },
-        closeIconPosition: {
-            type: String,
-            value: 'top-right'
-        },
-        closeOnClickOverlay: {
-            type: Boolean,
-            value: true
-        },
-        position: {
-            type: String,
-            value: 'center',
-            observer: 'observeClass'
-        },
-        safeAreaInsetBottom: {
-            type: Boolean,
-            value: true
-        },
-        safeAreaInsetTop: {
-            type: Boolean,
-            value: false
-        }
-    },
-    created() {
-        this.observeClass();
-    },
-    methods: {
-        onClickCloseIcon() {
-            this.$emit('close');
-        },
-        onClickOverlay() {
-            this.$emit('click-overlay');
-            if (this.data.closeOnClickOverlay) {
-                this.$emit('close');
-            }
-        },
-        observeClass() {
-            const { transition, position } = this.data;
-            const updateData = {
-                name: transition || position
-            };
-            if (transition === 'none') {
-                updateData.duration = 0;
-            }
-            this.setData(updateData);
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { transition } from '../mixins/transition';
+VantComponent({
+    classes: [
+        'enter-class',
+        'enter-active-class',
+        'enter-to-class',
+        'leave-class',
+        'leave-active-class',
+        'leave-to-class'
+    ],
+    mixins: [transition(false)],
+    props: {
+        round: Boolean,
+        closeable: Boolean,
+        customStyle: String,
+        overlayStyle: String,
+        transition: {
+            type: String,
+            observer: 'observeClass'
+        },
+        zIndex: {
+            type: Number,
+            value: 100
+        },
+        overlay: {
+            type: Boolean,
+            value: true
+        },
+        closeIcon: {
+            type: String,
+            value: 'cross'
+        },
+        closeIconPosition: {
+            type: String,
+            value: 'top-right'
+        },
+        closeOnClickOverlay: {
+            type: Boolean,
+            value: true
+        },
+        position: {
+            type: String,
+            value: 'center',
+            observer: 'observeClass'
+        },
+        safeAreaInsetBottom: {
+            type: Boolean,
+            value: true
+        },
+        safeAreaInsetTop: {
+            type: Boolean,
+            value: false
+        }
+    },
+    created() {
+        this.observeClass();
+    },
+    methods: {
+        onClickCloseIcon() {
+            this.$emit('close');
+        },
+        onClickOverlay() {
+            this.$emit('click-overlay');
+            if (this.data.closeOnClickOverlay) {
+                this.$emit('close');
+            }
+        },
+        observeClass() {
+            const { transition, position } = this.data;
+            const updateData = {
+                name: transition || position
+            };
+            if (transition === 'none') {
+                updateData.duration = 0;
+            }
+            this.setData(updateData);
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/popup/index.json b/litemall-wx/lib/vant-weapp/popup/index.json
index 88a6eab2..deabcd8e 100644
--- a/litemall-wx/lib/vant-weapp/popup/index.json
+++ b/litemall-wx/lib/vant-weapp/popup/index.json
@@ -1,7 +1,7 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index",
-    "van-overlay": "../overlay/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-overlay": "../overlay/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/popup/index.wxml b/litemall-wx/lib/vant-weapp/popup/index.wxml
index a3846862..a2bed2cf 100644
--- a/litemall-wx/lib/vant-weapp/popup/index.wxml
+++ b/litemall-wx/lib/vant-weapp/popup/index.wxml
@@ -1,24 +1,24 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<van-overlay
-  wx:if="{{ overlay }}"
-  show="{{ show }}"
-  z-index="{{ zIndex }}"
-  custom-style="{{ overlayStyle }}"
-  duration="{{ duration }}"
-  bind:click="onClickOverlay"
-/>
-<view
-  wx:if="{{ inited }}"
-  class="custom-class {{ classes }} {{ utils.bem('popup', [position, { round, safe: safeAreaInsetBottom, safeTop: safeAreaInsetTop }]) }}"
-  style="z-index: {{ zIndex }}; -webkit-transition-duration:{{ currentDuration }}ms; transition-duration:{{ currentDuration }}ms; {{ display ? '' : 'display: none;' }};{{ customStyle }}"
-  bind:transitionend="onTransitionEnd"
->
-  <slot />
-  <van-icon
-    wx:if="{{ closeable }}"
-    name="{{ closeIcon }}"
-    class="van-popup__close-icon van-popup__close-icon--{{ closeIconPosition }}"
-    bind:tap="onClickCloseIcon"
-  />
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<van-overlay
+  wx:if="{{ overlay }}"
+  show="{{ show }}"
+  z-index="{{ zIndex }}"
+  custom-style="{{ overlayStyle }}"
+  duration="{{ duration }}"
+  bind:click="onClickOverlay"
+/>
+<view
+  wx:if="{{ inited }}"
+  class="custom-class {{ classes }} {{ utils.bem('popup', [position, { round, safe: safeAreaInsetBottom, safeTop: safeAreaInsetTop }]) }}"
+  style="z-index: {{ zIndex }}; -webkit-transition-duration:{{ currentDuration }}ms; transition-duration:{{ currentDuration }}ms; {{ display ? '' : 'display: none;' }};{{ customStyle }}"
+  bind:transitionend="onTransitionEnd"
+>
+  <slot />
+  <van-icon
+    wx:if="{{ closeable }}"
+    name="{{ closeIcon }}"
+    class="van-popup__close-icon van-popup__close-icon--{{ closeIconPosition }}"
+    bind:tap="onClickCloseIcon"
+  />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/progress/index.d.ts b/litemall-wx/lib/vant-weapp/progress/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/progress/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/progress/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/progress/index.js b/litemall-wx/lib/vant-weapp/progress/index.js
index 6ca67bd5..f053accd 100644
--- a/litemall-wx/lib/vant-weapp/progress/index.js
+++ b/litemall-wx/lib/vant-weapp/progress/index.js
@@ -1,38 +1,38 @@
-import { VantComponent } from '../common/component';
-import { BLUE } from '../common/color';
-import { addUnit } from '../common/utils';
-VantComponent({
-    props: {
-        inactive: Boolean,
-        percentage: Number,
-        pivotText: String,
-        pivotColor: String,
-        trackColor: String,
-        showPivot: {
-            type: Boolean,
-            value: true
-        },
-        color: {
-            type: String,
-            value: BLUE
-        },
-        textColor: {
-            type: String,
-            value: '#fff'
-        },
-        strokeWidth: {
-            type: null,
-            observer: 'setStrokeWidthUnit'
-        }
-    },
-    data: {
-        strokeWidthUnit: '4px'
-    },
-    methods: {
-        setStrokeWidthUnit(val) {
-            this.setData({
-                strokeWidthUnit: addUnit(val)
-            });
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { BLUE } from '../common/color';
+import { addUnit } from '../common/utils';
+VantComponent({
+    props: {
+        inactive: Boolean,
+        percentage: Number,
+        pivotText: String,
+        pivotColor: String,
+        trackColor: String,
+        showPivot: {
+            type: Boolean,
+            value: true
+        },
+        color: {
+            type: String,
+            value: BLUE
+        },
+        textColor: {
+            type: String,
+            value: '#fff'
+        },
+        strokeWidth: {
+            type: null,
+            observer: 'setStrokeWidthUnit'
+        }
+    },
+    data: {
+        strokeWidthUnit: '4px'
+    },
+    methods: {
+        setStrokeWidthUnit(val) {
+            this.setData({
+                strokeWidthUnit: addUnit(val)
+            });
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/progress/index.json b/litemall-wx/lib/vant-weapp/progress/index.json
index 467ce294..efdc3c82 100644
--- a/litemall-wx/lib/vant-weapp/progress/index.json
+++ b/litemall-wx/lib/vant-weapp/progress/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
-}
+{
+  "component": true
+}
diff --git a/litemall-wx/lib/vant-weapp/progress/index.wxml b/litemall-wx/lib/vant-weapp/progress/index.wxml
index 5d27517d..b740a874 100644
--- a/litemall-wx/lib/vant-weapp/progress/index.wxml
+++ b/litemall-wx/lib/vant-weapp/progress/index.wxml
@@ -1,19 +1,19 @@
-<wxs src="./index.wxs" module="getters" />
-
-<view
-  class="van-progress custom-class"
-  style="height: {{ strokeWidthUnit }}; {{ trackColor ? 'background: ' + trackColor : '' }}"
->
-  <view
-    class="van-progress__portion"
-    style="width: {{ percentage }}%; background: {{ inactive ? '#cacaca' : color }}"
-  >
-    <view
-      wx:if="{{ showPivot && getters.text(pivotText, percentage) }}"
-      style="color: {{ textColor }}; background: {{ pivotColor ? pivotColor : inactive ? '#cacaca' : color }}"
-      class="van-progress__pivot"
-    >
-      {{ getters.text(pivotText, percentage) }}
-    </view>
-  </view>
-</view>
+<wxs src="./index.wxs" module="getters" />
+
+<view
+  class="van-progress custom-class"
+  style="height: {{ strokeWidthUnit }}; {{ trackColor ? 'background: ' + trackColor : '' }}"
+>
+  <view
+    class="van-progress__portion"
+    style="width: {{ percentage }}%; background: {{ inactive ? '#cacaca' : color }}"
+  >
+    <view
+      wx:if="{{ showPivot && getters.text(pivotText, percentage) }}"
+      style="color: {{ textColor }}; background: {{ pivotColor ? pivotColor : inactive ? '#cacaca' : color }}"
+      class="van-progress__pivot"
+    >
+      {{ getters.text(pivotText, percentage) }}
+    </view>
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/progress/index.wxs b/litemall-wx/lib/vant-weapp/progress/index.wxs
index d6853452..a0735b11 100644
--- a/litemall-wx/lib/vant-weapp/progress/index.wxs
+++ b/litemall-wx/lib/vant-weapp/progress/index.wxs
@@ -1,5 +1,5 @@
-module.exports = {
-  text: function(pivotText, percentage) {
-    return pivotText || percentage + '%';
-  }
-};
+module.exports = {
+  text: function(pivotText, percentage) {
+    return pivotText || percentage + '%';
+  }
+};
diff --git a/litemall-wx/lib/vant-weapp/radio-group/index.d.ts b/litemall-wx/lib/vant-weapp/radio-group/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/radio-group/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/radio-group/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/radio-group/index.js b/litemall-wx/lib/vant-weapp/radio-group/index.js
index e4c69e3c..0b639336 100644
--- a/litemall-wx/lib/vant-weapp/radio-group/index.js
+++ b/litemall-wx/lib/vant-weapp/radio-group/index.js
@@ -1,38 +1,38 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    field: true,
-    relation: {
-        name: 'radio',
-        type: 'descendant',
-        linked(target) {
-            this.children = this.children || [];
-            this.children.push(target);
-            this.updateChild(target);
-        },
-        unlinked(target) {
-            this.children = this.children.filter((child) => child !== target);
-        }
-    },
-    props: {
-        value: {
-            type: null,
-            observer: 'updateChildren'
-        },
-        disabled: {
-            type: Boolean,
-            observer: 'updateChildren'
-        }
-    },
-    methods: {
-        updateChildren() {
-            (this.children || []).forEach((child) => this.updateChild(child));
-        },
-        updateChild(child) {
-            const { value, disabled } = this.data;
-            child.setData({
-                value,
-                disabled: disabled || child.data.disabled
-            });
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    field: true,
+    relation: {
+        name: 'radio',
+        type: 'descendant',
+        linked(target) {
+            this.children = this.children || [];
+            this.children.push(target);
+            this.updateChild(target);
+        },
+        unlinked(target) {
+            this.children = this.children.filter((child) => child !== target);
+        }
+    },
+    props: {
+        value: {
+            type: null,
+            observer: 'updateChildren'
+        },
+        disabled: {
+            type: Boolean,
+            observer: 'updateChildren'
+        }
+    },
+    methods: {
+        updateChildren() {
+            (this.children || []).forEach((child) => this.updateChild(child));
+        },
+        updateChild(child) {
+            const { value, disabled } = this.data;
+            child.setData({
+                value,
+                disabled: disabled || child.data.disabled
+            });
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/radio-group/index.json b/litemall-wx/lib/vant-weapp/radio-group/index.json
index 467ce294..efdc3c82 100644
--- a/litemall-wx/lib/vant-weapp/radio-group/index.json
+++ b/litemall-wx/lib/vant-weapp/radio-group/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
-}
+{
+  "component": true
+}
diff --git a/litemall-wx/lib/vant-weapp/radio-group/index.wxml b/litemall-wx/lib/vant-weapp/radio-group/index.wxml
index 4fa864ce..a8f3249c 100644
--- a/litemall-wx/lib/vant-weapp/radio-group/index.wxml
+++ b/litemall-wx/lib/vant-weapp/radio-group/index.wxml
@@ -1 +1 @@
-<slot />
+<slot />
diff --git a/litemall-wx/lib/vant-weapp/radio/index.d.ts b/litemall-wx/lib/vant-weapp/radio/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/radio/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/radio/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/radio/index.js b/litemall-wx/lib/vant-weapp/radio/index.js
index c3b5165f..7417dbf0 100644
--- a/litemall-wx/lib/vant-weapp/radio/index.js
+++ b/litemall-wx/lib/vant-weapp/radio/index.js
@@ -1,60 +1,60 @@
-import { VantComponent } from '../common/component';
-import { addUnit } from '../common/utils';
-VantComponent({
-    field: true,
-    relation: {
-        name: 'radio-group',
-        type: 'ancestor',
-        linked(target) {
-            this.parent = target;
-        },
-        unlinked() {
-            this.parent = null;
-        }
-    },
-    classes: ['icon-class', 'label-class'],
-    props: {
-        value: null,
-        disabled: Boolean,
-        useIconSlot: Boolean,
-        checkedColor: String,
-        labelPosition: {
-            type: String,
-            value: 'right'
-        },
-        labelDisabled: Boolean,
-        shape: {
-            type: String,
-            value: 'round'
-        },
-        iconSize: {
-            type: null,
-            observer: 'setIconSizeUnit'
-        }
-    },
-    data: {
-        iconSizeWithUnit: '20px'
-    },
-    methods: {
-        setIconSizeUnit(val) {
-            this.setData({
-                iconSizeWithUnit: addUnit(val)
-            });
-        },
-        emitChange(value) {
-            const instance = this.parent || this;
-            instance.$emit('input', value);
-            instance.$emit('change', value);
-        },
-        onChange(event) {
-            console.log(event);
-            this.emitChange(this.data.name);
-        },
-        onClickLabel() {
-            const { disabled, labelDisabled, name } = this.data;
-            if (!disabled && !labelDisabled) {
-                this.emitChange(name);
-            }
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { addUnit } from '../common/utils';
+VantComponent({
+    field: true,
+    relation: {
+        name: 'radio-group',
+        type: 'ancestor',
+        linked(target) {
+            this.parent = target;
+        },
+        unlinked() {
+            this.parent = null;
+        }
+    },
+    classes: ['icon-class', 'label-class'],
+    props: {
+        value: null,
+        disabled: Boolean,
+        useIconSlot: Boolean,
+        checkedColor: String,
+        labelPosition: {
+            type: String,
+            value: 'right'
+        },
+        labelDisabled: Boolean,
+        shape: {
+            type: String,
+            value: 'round'
+        },
+        iconSize: {
+            type: null,
+            observer: 'setIconSizeUnit'
+        }
+    },
+    data: {
+        iconSizeWithUnit: '20px'
+    },
+    methods: {
+        setIconSizeUnit(val) {
+            this.setData({
+                iconSizeWithUnit: addUnit(val)
+            });
+        },
+        emitChange(value) {
+            const instance = this.parent || this;
+            instance.$emit('input', value);
+            instance.$emit('change', value);
+        },
+        onChange(event) {
+            console.log(event);
+            this.emitChange(this.data.name);
+        },
+        onClickLabel() {
+            const { disabled, labelDisabled, name } = this.data;
+            if (!disabled && !labelDisabled) {
+                this.emitChange(name);
+            }
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/radio/index.json b/litemall-wx/lib/vant-weapp/radio/index.json
index 0a336c08..8abfe203 100644
--- a/litemall-wx/lib/vant-weapp/radio/index.json
+++ b/litemall-wx/lib/vant-weapp/radio/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/radio/index.wxml b/litemall-wx/lib/vant-weapp/radio/index.wxml
index 3b64f3f1..2dd0e58d 100644
--- a/litemall-wx/lib/vant-weapp/radio/index.wxml
+++ b/litemall-wx/lib/vant-weapp/radio/index.wxml
@@ -1,29 +1,29 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view class="van-radio custom-class">
-  <view
-    wx:if="{{ labelPosition === 'left' }}"
-    class="label-class {{ utils.bem('radio__label', [labelPosition, { disabled }]) }}"
-    bindtap="onClickLabel"
-  >
-    <slot />
-  </view>
-  <view class="van-radio__icon-wrap" style="font-size: {{ iconSizeWithUnit }};" bindtap="onChange">
-    <slot wx:if="{{ useIconSlot }}" name="icon" />
-    <van-icon
-      wx:else
-      name="success"
-      class="{{ utils.bem('radio__icon', [shape, { disabled, checked: value === name }]) }}"
-      style="{{ checkedColor && !disabled && value === name ? 'border-color:' + checkedColor + '; background-color:' + checkedColor + ';' : '' }}"
-      custom-class="icon-class"
-      custom-style="line-height: {{ iconSizeWithUnit }};font-size: .8em;display: block;"
-    />
-  </view>
-  <view
-    wx:if="{{ labelPosition === 'right' }}"
-    class="label-class {{ utils.bem('radio__label', [labelPosition, { disabled }]) }}"
-    bindtap="onClickLabel"
-  >
-    <slot />
-  </view>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="van-radio custom-class">
+  <view
+    wx:if="{{ labelPosition === 'left' }}"
+    class="label-class {{ utils.bem('radio__label', [labelPosition, { disabled }]) }}"
+    bindtap="onClickLabel"
+  >
+    <slot />
+  </view>
+  <view class="van-radio__icon-wrap" style="font-size: {{ iconSizeWithUnit }};" bindtap="onChange">
+    <slot wx:if="{{ useIconSlot }}" name="icon" />
+    <van-icon
+      wx:else
+      name="success"
+      class="{{ utils.bem('radio__icon', [shape, { disabled, checked: value === name }]) }}"
+      style="{{ checkedColor && !disabled && value === name ? 'border-color:' + checkedColor + '; background-color:' + checkedColor + ';' : '' }}"
+      custom-class="icon-class"
+      custom-style="line-height: {{ iconSizeWithUnit }};font-size: .8em;display: block;"
+    />
+  </view>
+  <view
+    wx:if="{{ labelPosition === 'right' }}"
+    class="label-class {{ utils.bem('radio__label', [labelPosition, { disabled }]) }}"
+    bindtap="onClickLabel"
+  >
+    <slot />
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/rate/index.d.ts b/litemall-wx/lib/vant-weapp/rate/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/rate/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/rate/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/rate/index.js b/litemall-wx/lib/vant-weapp/rate/index.js
index 288ec716..f884b97d 100644
--- a/litemall-wx/lib/vant-weapp/rate/index.js
+++ b/litemall-wx/lib/vant-weapp/rate/index.js
@@ -1,95 +1,95 @@
-import { VantComponent } from '../common/component';
-import { addUnit } from '../common/utils';
-VantComponent({
-    field: true,
-    classes: ['icon-class'],
-    props: {
-        value: Number,
-        readonly: Boolean,
-        disabled: Boolean,
-        allowHalf: Boolean,
-        size: {
-            type: null,
-            observer: 'setSizeWithUnit'
-        },
-        icon: {
-            type: String,
-            value: 'star'
-        },
-        voidIcon: {
-            type: String,
-            value: 'star-o'
-        },
-        color: {
-            type: String,
-            value: '#ffd21e'
-        },
-        voidColor: {
-            type: String,
-            value: '#c7c7c7'
-        },
-        disabledColor: {
-            type: String,
-            value: '#bdbdbd'
-        },
-        count: {
-            type: Number,
-            value: 5
-        },
-        gutter: {
-            type: null,
-            observer: 'setGutterWithUnit'
-        },
-        touchable: {
-            type: Boolean,
-            value: true
-        }
-    },
-    data: {
-        innerValue: 0,
-        gutterWithUnit: undefined,
-        sizeWithUnit: null
-    },
-    watch: {
-        value(value) {
-            if (value !== this.data.innerValue) {
-                this.setData({ innerValue: value });
-            }
-        }
-    },
-    methods: {
-        setGutterWithUnit(val) {
-            this.setData({
-                gutterWithUnit: addUnit(val)
-            });
-        },
-        setSizeWithUnit(size) {
-            this.setData({
-                sizeWithUnit: addUnit(size)
-            });
-        },
-        onSelect(event) {
-            const { data } = this;
-            const { score } = event.currentTarget.dataset;
-            if (!data.disabled && !data.readonly) {
-                this.setData({ innerValue: score + 1 });
-                this.$emit('input', score + 1);
-                this.$emit('change', score + 1);
-            }
-        },
-        onTouchMove(event) {
-            const { touchable } = this.data;
-            if (!touchable)
-                return;
-            const { clientX } = event.touches[0];
-            this.getRect('.van-rate__icon', true).then((list) => {
-                const target = list
-                    .sort(item => item.right - item.left)
-                    .find(item => clientX >= item.left && clientX <= item.right);
-                if (target != null) {
-                    this.onSelect(Object.assign(Object.assign({}, event), { currentTarget: target }));
-                }
-            });
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { addUnit } from '../common/utils';
+VantComponent({
+    field: true,
+    classes: ['icon-class'],
+    props: {
+        value: Number,
+        readonly: Boolean,
+        disabled: Boolean,
+        allowHalf: Boolean,
+        size: {
+            type: null,
+            observer: 'setSizeWithUnit'
+        },
+        icon: {
+            type: String,
+            value: 'star'
+        },
+        voidIcon: {
+            type: String,
+            value: 'star-o'
+        },
+        color: {
+            type: String,
+            value: '#ffd21e'
+        },
+        voidColor: {
+            type: String,
+            value: '#c7c7c7'
+        },
+        disabledColor: {
+            type: String,
+            value: '#bdbdbd'
+        },
+        count: {
+            type: Number,
+            value: 5
+        },
+        gutter: {
+            type: null,
+            observer: 'setGutterWithUnit'
+        },
+        touchable: {
+            type: Boolean,
+            value: true
+        }
+    },
+    data: {
+        innerValue: 0,
+        gutterWithUnit: undefined,
+        sizeWithUnit: null
+    },
+    watch: {
+        value(value) {
+            if (value !== this.data.innerValue) {
+                this.setData({ innerValue: value });
+            }
+        }
+    },
+    methods: {
+        setGutterWithUnit(val) {
+            this.setData({
+                gutterWithUnit: addUnit(val)
+            });
+        },
+        setSizeWithUnit(size) {
+            this.setData({
+                sizeWithUnit: addUnit(size)
+            });
+        },
+        onSelect(event) {
+            const { data } = this;
+            const { score } = event.currentTarget.dataset;
+            if (!data.disabled && !data.readonly) {
+                this.setData({ innerValue: score + 1 });
+                this.$emit('input', score + 1);
+                this.$emit('change', score + 1);
+            }
+        },
+        onTouchMove(event) {
+            const { touchable } = this.data;
+            if (!touchable)
+                return;
+            const { clientX } = event.touches[0];
+            this.getRect('.van-rate__icon', true).then((list) => {
+                const target = list
+                    .sort(item => item.right - item.left)
+                    .find(item => clientX >= item.left && clientX <= item.right);
+                if (target != null) {
+                    this.onSelect(Object.assign(Object.assign({}, event), { currentTarget: target }));
+                }
+            });
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/rate/index.json b/litemall-wx/lib/vant-weapp/rate/index.json
index 0a336c08..8abfe203 100644
--- a/litemall-wx/lib/vant-weapp/rate/index.json
+++ b/litemall-wx/lib/vant-weapp/rate/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/rate/index.wxml b/litemall-wx/lib/vant-weapp/rate/index.wxml
index 72defd6b..2cf9c5ff 100644
--- a/litemall-wx/lib/vant-weapp/rate/index.wxml
+++ b/litemall-wx/lib/vant-weapp/rate/index.wxml
@@ -1,34 +1,34 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view
-  class="van-rate custom-class"
-  bind:touchmove="onTouchMove"
->
-  <view
-    class="van-rate__item"
-    wx:for="{{ count }}"
-    wx:key="index"
-    style="padding-right: {{ index !== count - 1 ? gutterWithUnit : '' }}"
-  >
-    <van-icon
-      name="{{ index + 1 <= innerValue ? icon : voidIcon }}"
-      class="van-rate__icon"
-      style="font-size :{{ size? sizeWithUnit : ''}}"
-      custom-class="icon-class"
-      data-score="{{ index }}"
-      color="{{ disabled ? disabledColor : index + 1 <= innerValue ? color : voidColor }}"
-      bind:click="onSelect"
-    />
-
-    <van-icon
-      wx:if="{{ allowHalf }}"
-      name="{{ index + 0.5 <= innerValue ? icon : voidIcon }}"
-      class="{{ utils.bem('rate__icon', ['half']) }}"
-      style="font-size :{{ size? sizeWithUnit : ''}}"
-      custom-class="icon-class"
-      data-score="{{ index - 0.5 }}"
-      color="{{ disabled ? disabledColor : index + 0.5 <= innerValue ? color : voidColor }}"
-      bind:click="onSelect"
-    />
-  </view>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="van-rate custom-class"
+  bind:touchmove="onTouchMove"
+>
+  <view
+    class="van-rate__item"
+    wx:for="{{ count }}"
+    wx:key="index"
+    style="padding-right: {{ index !== count - 1 ? gutterWithUnit : '' }}"
+  >
+    <van-icon
+      name="{{ index + 1 <= innerValue ? icon : voidIcon }}"
+      class="van-rate__icon"
+      style="font-size :{{ size? sizeWithUnit : ''}}"
+      custom-class="icon-class"
+      data-score="{{ index }}"
+      color="{{ disabled ? disabledColor : index + 1 <= innerValue ? color : voidColor }}"
+      bind:click="onSelect"
+    />
+
+    <van-icon
+      wx:if="{{ allowHalf }}"
+      name="{{ index + 0.5 <= innerValue ? icon : voidIcon }}"
+      class="{{ utils.bem('rate__icon', ['half']) }}"
+      style="font-size :{{ size? sizeWithUnit : ''}}"
+      custom-class="icon-class"
+      data-score="{{ index - 0.5 }}"
+      color="{{ disabled ? disabledColor : index + 0.5 <= innerValue ? color : voidColor }}"
+      bind:click="onSelect"
+    />
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/row/index.d.ts b/litemall-wx/lib/vant-weapp/row/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/row/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/row/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/row/index.js b/litemall-wx/lib/vant-weapp/row/index.js
index d7c8ba46..534a660b 100644
--- a/litemall-wx/lib/vant-weapp/row/index.js
+++ b/litemall-wx/lib/vant-weapp/row/index.js
@@ -1,36 +1,36 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    relation: {
-        name: 'col',
-        type: 'descendant',
-        linked(target) {
-            if (this.data.gutter) {
-                target.setGutter(this.data.gutter);
-            }
-        }
-    },
-    props: {
-        gutter: Number
-    },
-    watch: {
-        gutter: 'setGutter'
-    },
-    mounted() {
-        if (this.data.gutter) {
-            this.setGutter();
-        }
-    },
-    methods: {
-        setGutter() {
-            const { gutter } = this.data;
-            const margin = `-${Number(gutter) / 2}px`;
-            const style = gutter
-                ? `margin-right: ${margin}; margin-left: ${margin};`
-                : '';
-            this.setData({ style });
-            this.getRelationNodes('../col/index').forEach(col => {
-                col.setGutter(this.data.gutter);
-            });
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    relation: {
+        name: 'col',
+        type: 'descendant',
+        linked(target) {
+            if (this.data.gutter) {
+                target.setGutter(this.data.gutter);
+            }
+        }
+    },
+    props: {
+        gutter: Number
+    },
+    watch: {
+        gutter: 'setGutter'
+    },
+    mounted() {
+        if (this.data.gutter) {
+            this.setGutter();
+        }
+    },
+    methods: {
+        setGutter() {
+            const { gutter } = this.data;
+            const margin = `-${Number(gutter) / 2}px`;
+            const style = gutter
+                ? `margin-right: ${margin}; margin-left: ${margin};`
+                : '';
+            this.setData({ style });
+            this.getRelationNodes('../col/index').forEach(col => {
+                col.setGutter(this.data.gutter);
+            });
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/row/index.json b/litemall-wx/lib/vant-weapp/row/index.json
index 467ce294..efdc3c82 100644
--- a/litemall-wx/lib/vant-weapp/row/index.json
+++ b/litemall-wx/lib/vant-weapp/row/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
-}
+{
+  "component": true
+}
diff --git a/litemall-wx/lib/vant-weapp/row/index.wxml b/litemall-wx/lib/vant-weapp/row/index.wxml
index 20c53661..d160562c 100644
--- a/litemall-wx/lib/vant-weapp/row/index.wxml
+++ b/litemall-wx/lib/vant-weapp/row/index.wxml
@@ -1,3 +1,3 @@
-<view class="custom-class van-row" style="{{ style }}">
-  <slot />
-</view>
+<view class="custom-class van-row" style="{{ style }}">
+  <slot />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/search/index.d.ts b/litemall-wx/lib/vant-weapp/search/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/search/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/search/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/search/index.js b/litemall-wx/lib/vant-weapp/search/index.js
index 931dd6c1..bb9f2148 100644
--- a/litemall-wx/lib/vant-weapp/search/index.js
+++ b/litemall-wx/lib/vant-weapp/search/index.js
@@ -1,73 +1,73 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    field: true,
-    classes: ['field-class', 'input-class', 'cancel-class'],
-    props: {
-        label: String,
-        focus: Boolean,
-        error: Boolean,
-        disabled: Boolean,
-        readonly: Boolean,
-        inputAlign: String,
-        showAction: Boolean,
-        useActionSlot: Boolean,
-        useLeftIconSlot: Boolean,
-        useRightIconSlot: Boolean,
-        leftIcon: {
-            type: String,
-            value: 'search'
-        },
-        rightIcon: String,
-        placeholder: String,
-        placeholderStyle: String,
-        actionText: {
-            type: String,
-            value: '取消'
-        },
-        background: {
-            type: String,
-            value: '#ffffff'
-        },
-        maxlength: {
-            type: Number,
-            value: -1
-        },
-        shape: {
-            type: String,
-            value: 'square'
-        },
-        clearable: {
-            type: Boolean,
-            value: true
-        }
-    },
-    methods: {
-        onChange(event) {
-            this.setData({ value: event.detail });
-            this.$emit('change', event.detail);
-        },
-        onCancel() {
-            /**
-             * 修复修改输入框值时，输入框失焦和赋值同时触发，赋值失效
-             * https://github.com/youzan/@vant/weapp/issues/1768
-             */
-            setTimeout(() => {
-                this.setData({ value: '' });
-                this.$emit('cancel');
-                this.$emit('change', '');
-            }, 200);
-        },
-        onSearch() {
-            this.$emit('search', this.data.value);
-        },
-        onFocus() {
-            this.$emit('focus');
-        },
-        onBlur() {
-            this.$emit('blur');
-        },
-        onClear() {
-            this.$emit('clear');
-        },
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    field: true,
+    classes: ['field-class', 'input-class', 'cancel-class'],
+    props: {
+        label: String,
+        focus: Boolean,
+        error: Boolean,
+        disabled: Boolean,
+        readonly: Boolean,
+        inputAlign: String,
+        showAction: Boolean,
+        useActionSlot: Boolean,
+        useLeftIconSlot: Boolean,
+        useRightIconSlot: Boolean,
+        leftIcon: {
+            type: String,
+            value: 'search'
+        },
+        rightIcon: String,
+        placeholder: String,
+        placeholderStyle: String,
+        actionText: {
+            type: String,
+            value: '取消'
+        },
+        background: {
+            type: String,
+            value: '#ffffff'
+        },
+        maxlength: {
+            type: Number,
+            value: -1
+        },
+        shape: {
+            type: String,
+            value: 'square'
+        },
+        clearable: {
+            type: Boolean,
+            value: true
+        }
+    },
+    methods: {
+        onChange(event) {
+            this.setData({ value: event.detail });
+            this.$emit('change', event.detail);
+        },
+        onCancel() {
+            /**
+             * 修复修改输入框值时，输入框失焦和赋值同时触发，赋值失效
+             * https://github.com/youzan/@vant/weapp/issues/1768
+             */
+            setTimeout(() => {
+                this.setData({ value: '' });
+                this.$emit('cancel');
+                this.$emit('change', '');
+            }, 200);
+        },
+        onSearch() {
+            this.$emit('search', this.data.value);
+        },
+        onFocus() {
+            this.$emit('focus');
+        },
+        onBlur() {
+            this.$emit('blur');
+        },
+        onClear() {
+            this.$emit('clear');
+        },
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/search/index.json b/litemall-wx/lib/vant-weapp/search/index.json
index b4cfe918..8c052fe1 100644
--- a/litemall-wx/lib/vant-weapp/search/index.json
+++ b/litemall-wx/lib/vant-weapp/search/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-field": "../field/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-field": "../field/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/search/index.wxml b/litemall-wx/lib/vant-weapp/search/index.wxml
index 1d0e6f1f..9967ef46 100644
--- a/litemall-wx/lib/vant-weapp/search/index.wxml
+++ b/litemall-wx/lib/vant-weapp/search/index.wxml
@@ -1,50 +1,50 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view
-  class="{{ utils.bem('search', { withaction: showAction || useActionSlot }) }} custom-class"
-  style="background: {{ background }}"
->
-  <view class="{{ utils.bem('search__content', [shape]) }}">
-    <view class="van-search__label" wx:if="{{ label }}">{{ label }}</view>
-    <slot wx:else name="label" />
-
-    <van-field
-      type="search"
-      left-icon="{{ !useLeftIconSlot ? leftIcon : '' }}"
-      right-icon="{{ !useRightIconSlot ? rightIcon : '' }}"
-      focus="{{ focus }}"
-      error="{{ error }}"
-      border="{{ false }}"
-      confirm-type="search"
-      class="van-search__field field-class"
-      value="{{ value }}"
-      disabled="{{ disabled }}"
-      readonly="{{ readonly }}"
-      clearable="{{ clearable }}"
-      maxlength="{{ maxlength }}"
-      input-align="{{ inputAlign }}"
-      input-class="input-class"
-      placeholder="{{ placeholder }}"
-      placeholder-style="{{ placeholderStyle }}"
-      custom-style="padding: 5px 10px 5px 0; background-color: transparent;"
-      bind:blur="onBlur"
-      bind:focus="onFocus"
-      bind:change="onChange"
-      bind:confirm="onSearch"
-      bind:clear="onClear"
-    >
-      <slot wx:if="{{ useLeftIconSlot }}" name="left-icon" slot="left-icon" />
-      <slot wx:if="{{ useRightIconSlot }}" name="right-icon" slot="right-icon" />
-    </van-field>
-  </view>
-
-  <view
-    wx:if="{{ showAction || useActionSlot }}"
-    class="van-search__action"
-    hover-class="van-search__action--hover"
-    hover-stay-time="70"
-  >
-    <slot wx:if="{{ useActionSlot }}" name="action" />
-    <view wx:else bind:tap="onCancel" class="cancel-class">{{ actionText }}</view>
-  </view>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="{{ utils.bem('search', { withaction: showAction || useActionSlot }) }} custom-class"
+  style="background: {{ background }}"
+>
+  <view class="{{ utils.bem('search__content', [shape]) }}">
+    <view class="van-search__label" wx:if="{{ label }}">{{ label }}</view>
+    <slot wx:else name="label" />
+
+    <van-field
+      type="search"
+      left-icon="{{ !useLeftIconSlot ? leftIcon : '' }}"
+      right-icon="{{ !useRightIconSlot ? rightIcon : '' }}"
+      focus="{{ focus }}"
+      error="{{ error }}"
+      border="{{ false }}"
+      confirm-type="search"
+      class="van-search__field field-class"
+      value="{{ value }}"
+      disabled="{{ disabled }}"
+      readonly="{{ readonly }}"
+      clearable="{{ clearable }}"
+      maxlength="{{ maxlength }}"
+      input-align="{{ inputAlign }}"
+      input-class="input-class"
+      placeholder="{{ placeholder }}"
+      placeholder-style="{{ placeholderStyle }}"
+      custom-style="padding: 5px 10px 5px 0; background-color: transparent;"
+      bind:blur="onBlur"
+      bind:focus="onFocus"
+      bind:change="onChange"
+      bind:confirm="onSearch"
+      bind:clear="onClear"
+    >
+      <slot wx:if="{{ useLeftIconSlot }}" name="left-icon" slot="left-icon" />
+      <slot wx:if="{{ useRightIconSlot }}" name="right-icon" slot="right-icon" />
+    </van-field>
+  </view>
+
+  <view
+    wx:if="{{ showAction || useActionSlot }}"
+    class="van-search__action"
+    hover-class="van-search__action--hover"
+    hover-stay-time="70"
+  >
+    <slot wx:if="{{ useActionSlot }}" name="action" />
+    <view wx:else bind:tap="onCancel" class="cancel-class">{{ actionText }}</view>
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/sidebar-item/index.d.ts b/litemall-wx/lib/vant-weapp/sidebar-item/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/sidebar-item/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/sidebar-item/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/sidebar-item/index.js b/litemall-wx/lib/vant-weapp/sidebar-item/index.js
index ecdaa08b..9c5f91a9 100644
--- a/litemall-wx/lib/vant-weapp/sidebar-item/index.js
+++ b/litemall-wx/lib/vant-weapp/sidebar-item/index.js
@@ -1,36 +1,36 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    classes: [
-        'active-class',
-        'disabled-class',
-    ],
-    relation: {
-        type: 'ancestor',
-        name: 'sidebar',
-        linked(target) {
-            this.parent = target;
-        }
-    },
-    props: {
-        dot: Boolean,
-        info: null,
-        title: String,
-        disabled: Boolean
-    },
-    methods: {
-        onClick() {
-            const { parent } = this;
-            if (!parent || this.data.disabled) {
-                return;
-            }
-            const index = parent.children.indexOf(this);
-            parent.setActive(index).then(() => {
-                this.$emit('click', index);
-                parent.$emit('change', index);
-            });
-        },
-        setActive(selected) {
-            return this.setData({ selected });
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    classes: [
+        'active-class',
+        'disabled-class',
+    ],
+    relation: {
+        type: 'ancestor',
+        name: 'sidebar',
+        linked(target) {
+            this.parent = target;
+        }
+    },
+    props: {
+        dot: Boolean,
+        info: null,
+        title: String,
+        disabled: Boolean
+    },
+    methods: {
+        onClick() {
+            const { parent } = this;
+            if (!parent || this.data.disabled) {
+                return;
+            }
+            const index = parent.children.indexOf(this);
+            parent.setActive(index).then(() => {
+                this.$emit('click', index);
+                parent.$emit('change', index);
+            });
+        },
+        setActive(selected) {
+            return this.setData({ selected });
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/sidebar-item/index.json b/litemall-wx/lib/vant-weapp/sidebar-item/index.json
index bf0ebe00..82369bf2 100644
--- a/litemall-wx/lib/vant-weapp/sidebar-item/index.json
+++ b/litemall-wx/lib/vant-weapp/sidebar-item/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-info": "../info/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-info": "../info/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/sidebar-item/index.wxml b/litemall-wx/lib/vant-weapp/sidebar-item/index.wxml
index f68e8644..573773bf 100644
--- a/litemall-wx/lib/vant-weapp/sidebar-item/index.wxml
+++ b/litemall-wx/lib/vant-weapp/sidebar-item/index.wxml
@@ -1,18 +1,18 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view
-  class="{{ utils.bem('sidebar-item', { selected, disabled }) }} {{ selected ? 'active-class' : '' }} {{ disabled ? 'disabled-class' : '' }} custom-class"
-  hover-class="van-sidebar-item--hover"
-  hover-stay-time="70"
-  bind:tap="onClick"
->
-  <view class="van-sidebar-item__text">
-    <van-info
-      wx:if="{{ info !== null || dot }}"
-      dot="{{ dot }}"
-      info="{{ info }}"
-      custom-style="right: 4px"
-    />
-    {{ title }}
-  </view>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="{{ utils.bem('sidebar-item', { selected, disabled }) }} {{ selected ? 'active-class' : '' }} {{ disabled ? 'disabled-class' : '' }} custom-class"
+  hover-class="van-sidebar-item--hover"
+  hover-stay-time="70"
+  bind:tap="onClick"
+>
+  <view class="van-sidebar-item__text">
+    <van-info
+      wx:if="{{ info !== null || dot }}"
+      dot="{{ dot }}"
+      info="{{ info }}"
+      custom-style="right: 4px"
+    />
+    {{ title }}
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/sidebar/index.d.ts b/litemall-wx/lib/vant-weapp/sidebar/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/sidebar/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/sidebar/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/sidebar/index.js b/litemall-wx/lib/vant-weapp/sidebar/index.js
index 326faf5c..3fa3b828 100644
--- a/litemall-wx/lib/vant-weapp/sidebar/index.js
+++ b/litemall-wx/lib/vant-weapp/sidebar/index.js
@@ -1,43 +1,43 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    relation: {
-        name: 'sidebar-item',
-        type: 'descendant',
-        linked(target) {
-            this.children.push(target);
-            this.setActive(this.data.activeKey);
-        },
-        unlinked(target) {
-            this.children = this.children.filter((item) => item !== target);
-            this.setActive(this.data.activeKey);
-        }
-    },
-    props: {
-        activeKey: {
-            type: Number,
-            value: 0,
-            observer: 'setActive'
-        }
-    },
-    beforeCreate() {
-        this.children = [];
-        this.currentActive = -1;
-    },
-    methods: {
-        setActive(activeKey) {
-            const { children, currentActive } = this;
-            if (!children.length) {
-                return Promise.resolve();
-            }
-            this.currentActive = activeKey;
-            const stack = [];
-            if (currentActive !== activeKey && children[currentActive]) {
-                stack.push(children[currentActive].setActive(false));
-            }
-            if (children[activeKey]) {
-                stack.push(children[activeKey].setActive(true));
-            }
-            return Promise.all(stack);
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    relation: {
+        name: 'sidebar-item',
+        type: 'descendant',
+        linked(target) {
+            this.children.push(target);
+            this.setActive(this.data.activeKey);
+        },
+        unlinked(target) {
+            this.children = this.children.filter((item) => item !== target);
+            this.setActive(this.data.activeKey);
+        }
+    },
+    props: {
+        activeKey: {
+            type: Number,
+            value: 0,
+            observer: 'setActive'
+        }
+    },
+    beforeCreate() {
+        this.children = [];
+        this.currentActive = -1;
+    },
+    methods: {
+        setActive(activeKey) {
+            const { children, currentActive } = this;
+            if (!children.length) {
+                return Promise.resolve();
+            }
+            this.currentActive = activeKey;
+            const stack = [];
+            if (currentActive !== activeKey && children[currentActive]) {
+                stack.push(children[currentActive].setActive(false));
+            }
+            if (children[activeKey]) {
+                stack.push(children[activeKey].setActive(true));
+            }
+            return Promise.all(stack);
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/sidebar/index.json b/litemall-wx/lib/vant-weapp/sidebar/index.json
index 467ce294..efdc3c82 100644
--- a/litemall-wx/lib/vant-weapp/sidebar/index.json
+++ b/litemall-wx/lib/vant-weapp/sidebar/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
-}
+{
+  "component": true
+}
diff --git a/litemall-wx/lib/vant-weapp/sidebar/index.wxml b/litemall-wx/lib/vant-weapp/sidebar/index.wxml
index e64c19c2..860aaa18 100644
--- a/litemall-wx/lib/vant-weapp/sidebar/index.wxml
+++ b/litemall-wx/lib/vant-weapp/sidebar/index.wxml
@@ -1,3 +1,3 @@
-<view class="van-sidebar van-hairline--top-bottom custom-class">
-  <slot />
-</view>
+<view class="van-sidebar van-hairline--top-bottom custom-class">
+  <slot />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/skeleton/index.d.ts b/litemall-wx/lib/vant-weapp/skeleton/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/skeleton/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/skeleton/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/skeleton/index.js b/litemall-wx/lib/vant-weapp/skeleton/index.js
index 4092bbd9..0125afc6 100644
--- a/litemall-wx/lib/vant-weapp/skeleton/index.js
+++ b/litemall-wx/lib/vant-weapp/skeleton/index.js
@@ -1,41 +1,41 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    props: {
-        row: {
-            type: Number,
-            value: 0
-        },
-        title: Boolean,
-        avatar: Boolean,
-        loading: {
-            type: Boolean,
-            value: true
-        },
-        animate: {
-            type: Boolean,
-            value: true
-        },
-        avatarSize: {
-            type: String,
-            value: '32px'
-        },
-        avatarShape: {
-            type: String,
-            value: 'round'
-        },
-        titleWidth: {
-            type: String,
-            value: '40%'
-        },
-        rowWidth: {
-            type: null,
-            value: '100%',
-            observer(val) {
-                this.setData({ isArray: val instanceof Array });
-            }
-        }
-    },
-    data: {
-        isArray: false
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    props: {
+        row: {
+            type: Number,
+            value: 0
+        },
+        title: Boolean,
+        avatar: Boolean,
+        loading: {
+            type: Boolean,
+            value: true
+        },
+        animate: {
+            type: Boolean,
+            value: true
+        },
+        avatarSize: {
+            type: String,
+            value: '32px'
+        },
+        avatarShape: {
+            type: String,
+            value: 'round'
+        },
+        titleWidth: {
+            type: String,
+            value: '40%'
+        },
+        rowWidth: {
+            type: null,
+            value: '100%',
+            observer(val) {
+                this.setData({ isArray: val instanceof Array });
+            }
+        }
+    },
+    data: {
+        isArray: false
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/skeleton/index.json b/litemall-wx/lib/vant-weapp/skeleton/index.json
index e8cfaaf8..011372eb 100644
--- a/litemall-wx/lib/vant-weapp/skeleton/index.json
+++ b/litemall-wx/lib/vant-weapp/skeleton/index.json
@@ -1,4 +1,4 @@
-{
-  "component": true,
-  "usingComponents": {}
+{
+  "component": true,
+  "usingComponents": {}
 }
\ No newline at end of file
diff --git a/litemall-wx/lib/vant-weapp/skeleton/index.wxml b/litemall-wx/lib/vant-weapp/skeleton/index.wxml
index 11773701..32d58d45 100644
--- a/litemall-wx/lib/vant-weapp/skeleton/index.wxml
+++ b/litemall-wx/lib/vant-weapp/skeleton/index.wxml
@@ -1,29 +1,29 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view
-  wx:if="{{ loading }}"
-  class="custom-class {{ utils.bem('skeleton', [{animate}]) }}"
->
-  <view
-    wx:if="{{ avatar }}"
-    class="{{ utils.bem('skeleton__avatar', [avatarShape])}}"
-    style="{{ 'width:' + avatarSize + ';height:' + avatarSize }}"
-  />
-  <view class="{{ utils.bem('skeleton__content')}}">
-    <view
-      wx:if="{{ title }}"
-      class="{{ utils.bem('skeleton__title') }}"
-      style="{{ 'width:' + titleWidth }}"
-    />
-    <view
-      wx:for="{{ row }}"
-      wx:key="index"
-      wx:for-index="index"
-      class="{{ utils.bem('skeleton__row') }}"
-      style="{{ 'width:' + (isArray ? rowWidth[index] : rowWidth) }}"
-    />
-  </view>
-</view>
-<view wx:else class="{{ utils.bem('skeleton__content')}}">
-  <slot />
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  wx:if="{{ loading }}"
+  class="custom-class {{ utils.bem('skeleton', [{animate}]) }}"
+>
+  <view
+    wx:if="{{ avatar }}"
+    class="{{ utils.bem('skeleton__avatar', [avatarShape])}}"
+    style="{{ 'width:' + avatarSize + ';height:' + avatarSize }}"
+  />
+  <view class="{{ utils.bem('skeleton__content')}}">
+    <view
+      wx:if="{{ title }}"
+      class="{{ utils.bem('skeleton__title') }}"
+      style="{{ 'width:' + titleWidth }}"
+    />
+    <view
+      wx:for="{{ row }}"
+      wx:key="index"
+      wx:for-index="index"
+      class="{{ utils.bem('skeleton__row') }}"
+      style="{{ 'width:' + (isArray ? rowWidth[index] : rowWidth) }}"
+    />
+  </view>
+</view>
+<view wx:else class="{{ utils.bem('skeleton__content')}}">
+  <slot />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/slider/index.d.ts b/litemall-wx/lib/vant-weapp/slider/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/slider/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/slider/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/slider/index.js b/litemall-wx/lib/vant-weapp/slider/index.js
index 971e15e0..34466000 100644
--- a/litemall-wx/lib/vant-weapp/slider/index.js
+++ b/litemall-wx/lib/vant-weapp/slider/index.js
@@ -1,107 +1,107 @@
-import { VantComponent } from '../common/component';
-import { touch } from '../mixins/touch';
-import { addUnit } from '../common/utils';
-VantComponent({
-    mixins: [touch],
-    props: {
-        disabled: Boolean,
-        useButtonSlot: Boolean,
-        activeColor: String,
-        inactiveColor: String,
-        max: {
-            type: Number,
-            value: 100
-        },
-        min: {
-            type: Number,
-            value: 0
-        },
-        step: {
-            type: Number,
-            value: 1
-        },
-        value: {
-            type: Number,
-            value: 0
-        },
-        barHeight: {
-            type: null,
-            value: '2px'
-        }
-    },
-    watch: {
-        value(value) {
-            this.updateValue(value, false);
-        }
-    },
-    created() {
-        this.updateValue(this.data.value);
-    },
-    methods: {
-        onTouchStart(event) {
-            if (this.data.disabled)
-                return;
-            this.touchStart(event);
-            this.startValue = this.format(this.data.value);
-            this.dragStatus = 'start';
-        },
-        onTouchMove(event) {
-            if (this.data.disabled)
-                return;
-            if (this.dragStatus === 'start') {
-                this.$emit('drag-start');
-            }
-            this.touchMove(event);
-            this.dragStatus = 'draging';
-            this.getRect('.van-slider').then((rect) => {
-                const diff = this.deltaX / rect.width * 100;
-                this.newValue = this.startValue + diff;
-                this.updateValue(this.newValue, false, true);
-            });
-        },
-        onTouchEnd() {
-            if (this.data.disabled)
-                return;
-            if (this.dragStatus === 'draging') {
-                this.updateValue(this.newValue, true);
-                this.$emit('drag-end');
-            }
-        },
-        onClick(event) {
-            if (this.data.disabled)
-                return;
-            const { min } = this.data;
-            this.getRect('.van-slider').then((rect) => {
-                const value = (event.detail.x - rect.left) / rect.width * this.getRange() + min;
-                this.updateValue(value, true);
-            });
-        },
-        updateValue(value, end, drag) {
-            value = this.format(value);
-            const { barHeight, min } = this.data;
-            const width = `${((value - min) * 100) / this.getRange()}%`;
-            this.setData({
-                value,
-                barStyle: `
-          width: ${width};
-          height: ${addUnit(barHeight)};
-          ${drag ? 'transition: none;' : ''}
-        `,
-            });
-            if (drag) {
-                this.$emit('drag', { value });
-            }
-            if (end) {
-                this.$emit('change', value);
-            }
-        },
-        getRange() {
-            const { max, min } = this.data;
-            return max - min;
-        },
-        format(value) {
-            const { max, min, step } = this.data;
-            return Math.round(Math.max(min, Math.min(value, max)) / step) * step;
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { touch } from '../mixins/touch';
+import { addUnit } from '../common/utils';
+VantComponent({
+    mixins: [touch],
+    props: {
+        disabled: Boolean,
+        useButtonSlot: Boolean,
+        activeColor: String,
+        inactiveColor: String,
+        max: {
+            type: Number,
+            value: 100
+        },
+        min: {
+            type: Number,
+            value: 0
+        },
+        step: {
+            type: Number,
+            value: 1
+        },
+        value: {
+            type: Number,
+            value: 0
+        },
+        barHeight: {
+            type: null,
+            value: '2px'
+        }
+    },
+    watch: {
+        value(value) {
+            this.updateValue(value, false);
+        }
+    },
+    created() {
+        this.updateValue(this.data.value);
+    },
+    methods: {
+        onTouchStart(event) {
+            if (this.data.disabled)
+                return;
+            this.touchStart(event);
+            this.startValue = this.format(this.data.value);
+            this.dragStatus = 'start';
+        },
+        onTouchMove(event) {
+            if (this.data.disabled)
+                return;
+            if (this.dragStatus === 'start') {
+                this.$emit('drag-start');
+            }
+            this.touchMove(event);
+            this.dragStatus = 'draging';
+            this.getRect('.van-slider').then((rect) => {
+                const diff = this.deltaX / rect.width * 100;
+                this.newValue = this.startValue + diff;
+                this.updateValue(this.newValue, false, true);
+            });
+        },
+        onTouchEnd() {
+            if (this.data.disabled)
+                return;
+            if (this.dragStatus === 'draging') {
+                this.updateValue(this.newValue, true);
+                this.$emit('drag-end');
+            }
+        },
+        onClick(event) {
+            if (this.data.disabled)
+                return;
+            const { min } = this.data;
+            this.getRect('.van-slider').then((rect) => {
+                const value = (event.detail.x - rect.left) / rect.width * this.getRange() + min;
+                this.updateValue(value, true);
+            });
+        },
+        updateValue(value, end, drag) {
+            value = this.format(value);
+            const { barHeight, min } = this.data;
+            const width = `${((value - min) * 100) / this.getRange()}%`;
+            this.setData({
+                value,
+                barStyle: `
+          width: ${width};
+          height: ${addUnit(barHeight)};
+          ${drag ? 'transition: none;' : ''}
+        `,
+            });
+            if (drag) {
+                this.$emit('drag', { value });
+            }
+            if (end) {
+                this.$emit('change', value);
+            }
+        },
+        getRange() {
+            const { max, min } = this.data;
+            return max - min;
+        },
+        format(value) {
+            const { max, min, step } = this.data;
+            return Math.round(Math.max(min, Math.min(value, max)) / step) * step;
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/slider/index.json b/litemall-wx/lib/vant-weapp/slider/index.json
index 467ce294..efdc3c82 100644
--- a/litemall-wx/lib/vant-weapp/slider/index.json
+++ b/litemall-wx/lib/vant-weapp/slider/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
-}
+{
+  "component": true
+}
diff --git a/litemall-wx/lib/vant-weapp/slider/index.wxml b/litemall-wx/lib/vant-weapp/slider/index.wxml
index d30d078b..ad886633 100644
--- a/litemall-wx/lib/vant-weapp/slider/index.wxml
+++ b/litemall-wx/lib/vant-weapp/slider/index.wxml
@@ -1,29 +1,29 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view
-  class="custom-class {{ utils.bem('slider', { disabled }) }}"
-  style="{{ inactiveColor ? 'background:' + inactiveColor : '' }}"
-  bind:tap="onClick"
->
-  <view
-    class="van-slider__bar"
-    style="{{ barStyle }}; {{ activeColor ? 'background:' + activeColor : '' }}"
-  >
-    <view
-      class="van-slider__button-wrapper"
-      bind:touchstart="onTouchStart"
-      catch:touchmove="onTouchMove"
-      bind:touchend="onTouchEnd"
-      bind:touchcancel="onTouchEnd"
-    >
-      <slot
-        wx:if="{{ useButtonSlot }}"
-        name="button"
-      />
-      <view
-        wx:else
-        class="van-slider__button"
-      />
-    </view>
-  </view>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="custom-class {{ utils.bem('slider', { disabled }) }}"
+  style="{{ inactiveColor ? 'background:' + inactiveColor : '' }}"
+  bind:tap="onClick"
+>
+  <view
+    class="van-slider__bar"
+    style="{{ barStyle }}; {{ activeColor ? 'background:' + activeColor : '' }}"
+  >
+    <view
+      class="van-slider__button-wrapper"
+      bind:touchstart="onTouchStart"
+      catch:touchmove="onTouchMove"
+      bind:touchend="onTouchEnd"
+      bind:touchcancel="onTouchEnd"
+    >
+      <slot
+        wx:if="{{ useButtonSlot }}"
+        name="button"
+      />
+      <view
+        wx:else
+        class="van-slider__button"
+      />
+    </view>
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/stepper/index.d.ts b/litemall-wx/lib/vant-weapp/stepper/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/stepper/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/stepper/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/stepper/index.js b/litemall-wx/lib/vant-weapp/stepper/index.js
index c2425889..cbabecc4 100644
--- a/litemall-wx/lib/vant-weapp/stepper/index.js
+++ b/litemall-wx/lib/vant-weapp/stepper/index.js
@@ -1,172 +1,172 @@
-import { VantComponent } from '../common/component';
-import { addUnit, isDef } from '../common/utils';
-const LONG_PRESS_START_TIME = 600;
-const LONG_PRESS_INTERVAL = 200;
-// add num and avoid float number
-function add(num1, num2) {
-    const cardinal = Math.pow(10, 10);
-    return Math.round((num1 + num2) * cardinal) / cardinal;
-}
-VantComponent({
-    field: true,
-    classes: ['input-class', 'plus-class', 'minus-class'],
-    props: {
-        value: null,
-        integer: Boolean,
-        disabled: Boolean,
-        inputWidth: null,
-        buttonSize: null,
-        asyncChange: Boolean,
-        disableInput: Boolean,
-        decimalLength: {
-            type: Number,
-            value: null
-        },
-        min: {
-            type: null,
-            value: 1
-        },
-        max: {
-            type: null,
-            value: Number.MAX_SAFE_INTEGER
-        },
-        step: {
-            type: null,
-            value: 1
-        },
-        showPlus: {
-            type: Boolean,
-            value: true
-        },
-        showMinus: {
-            type: Boolean,
-            value: true
-        },
-        disablePlus: Boolean,
-        disableMinus: Boolean
-    },
-    watch: {
-        value(value) {
-            if (value === '') {
-                return;
-            }
-            const newValue = this.range(value);
-            if (typeof newValue === 'number' && +this.data.value !== newValue) {
-                this.setData({ value: newValue });
-            }
-        },
-        inputWidth() {
-            this.set({
-                inputStyle: this.computeInputStyle()
-            });
-        },
-        buttonSize() {
-            this.set({
-                inputStyle: this.computeInputStyle(),
-                buttonStyle: this.computeButtonStyle()
-            });
-        }
-    },
-    data: {
-        focus: false,
-        inputStyle: '',
-        buttonStyle: ''
-    },
-    created() {
-        this.setData({
-            value: this.range(this.data.value)
-        });
-    },
-    methods: {
-        isDisabled(type) {
-            if (type === 'plus') {
-                return this.data.disabled || this.data.disablePlus || this.data.value >= this.data.max;
-            }
-            return this.data.disabled || this.data.disableMinus || this.data.value <= this.data.min;
-        },
-        onFocus(event) {
-            this.$emit('focus', event.detail);
-        },
-        onBlur(event) {
-            const value = this.range(this.data.value);
-            this.triggerInput(value);
-            this.$emit('blur', event.detail);
-        },
-        // limit value range
-        range(value) {
-            value = String(value).replace(/[^0-9.-]/g, '');
-            // format range
-            value = value === '' ? 0 : +value;
-            value = Math.max(Math.min(this.data.max, value), this.data.min);
-            // format decimal
-            if (isDef(this.data.decimalLength)) {
-                value = value.toFixed(this.data.decimalLength);
-            }
-            return value;
-        },
-        onInput(event) {
-            const { value = '' } = event.detail || {};
-            this.triggerInput(value);
-        },
-        onChange() {
-            const { type } = this;
-            if (this.isDisabled(type)) {
-                this.$emit('overlimit', type);
-                return;
-            }
-            const diff = type === 'minus' ? -this.data.step : +this.data.step;
-            const value = add(+this.data.value, diff);
-            this.triggerInput(this.range(value));
-            this.$emit(type);
-        },
-        longPressStep() {
-            this.longPressTimer = setTimeout(() => {
-                this.onChange();
-                this.longPressStep();
-            }, LONG_PRESS_INTERVAL);
-        },
-        onTap(event) {
-            const { type } = event.currentTarget.dataset;
-            this.type = type;
-            this.onChange();
-        },
-        onTouchStart(event) {
-            clearTimeout(this.longPressTimer);
-            const { type } = event.currentTarget.dataset;
-            this.type = type;
-            this.isLongPress = false;
-            this.longPressTimer = setTimeout(() => {
-                this.isLongPress = true;
-                this.onChange();
-                this.longPressStep();
-            }, LONG_PRESS_START_TIME);
-        },
-        onTouchEnd() {
-            clearTimeout(this.longPressTimer);
-        },
-        triggerInput(value) {
-            this.setData({
-                value: this.data.asyncChange ? this.data.value : value
-            });
-            this.$emit('change', value);
-        },
-        computeInputStyle() {
-            let style = '';
-            if (this.data.inputWidth) {
-                style = `width: ${addUnit(this.data.inputWidth)};`;
-            }
-            if (this.data.buttonSize) {
-                style += `height: ${addUnit(this.data.buttonSize)};`;
-            }
-            return style;
-        },
-        computeButtonStyle() {
-            let style = '';
-            const size = addUnit(this.data.buttonSize);
-            if (this.data.buttonSize) {
-                style = `width: ${size};height: ${size};`;
-            }
-            return style;
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { addUnit, isDef } from '../common/utils';
+const LONG_PRESS_START_TIME = 600;
+const LONG_PRESS_INTERVAL = 200;
+// add num and avoid float number
+function add(num1, num2) {
+    const cardinal = Math.pow(10, 10);
+    return Math.round((num1 + num2) * cardinal) / cardinal;
+}
+VantComponent({
+    field: true,
+    classes: ['input-class', 'plus-class', 'minus-class'],
+    props: {
+        value: null,
+        integer: Boolean,
+        disabled: Boolean,
+        inputWidth: null,
+        buttonSize: null,
+        asyncChange: Boolean,
+        disableInput: Boolean,
+        decimalLength: {
+            type: Number,
+            value: null
+        },
+        min: {
+            type: null,
+            value: 1
+        },
+        max: {
+            type: null,
+            value: Number.MAX_SAFE_INTEGER
+        },
+        step: {
+            type: null,
+            value: 1
+        },
+        showPlus: {
+            type: Boolean,
+            value: true
+        },
+        showMinus: {
+            type: Boolean,
+            value: true
+        },
+        disablePlus: Boolean,
+        disableMinus: Boolean
+    },
+    watch: {
+        value(value) {
+            if (value === '') {
+                return;
+            }
+            const newValue = this.range(value);
+            if (typeof newValue === 'number' && +this.data.value !== newValue) {
+                this.setData({ value: newValue });
+            }
+        },
+        inputWidth() {
+            this.set({
+                inputStyle: this.computeInputStyle()
+            });
+        },
+        buttonSize() {
+            this.set({
+                inputStyle: this.computeInputStyle(),
+                buttonStyle: this.computeButtonStyle()
+            });
+        }
+    },
+    data: {
+        focus: false,
+        inputStyle: '',
+        buttonStyle: ''
+    },
+    created() {
+        this.setData({
+            value: this.range(this.data.value)
+        });
+    },
+    methods: {
+        isDisabled(type) {
+            if (type === 'plus') {
+                return this.data.disabled || this.data.disablePlus || this.data.value >= this.data.max;
+            }
+            return this.data.disabled || this.data.disableMinus || this.data.value <= this.data.min;
+        },
+        onFocus(event) {
+            this.$emit('focus', event.detail);
+        },
+        onBlur(event) {
+            const value = this.range(this.data.value);
+            this.triggerInput(value);
+            this.$emit('blur', event.detail);
+        },
+        // limit value range
+        range(value) {
+            value = String(value).replace(/[^0-9.-]/g, '');
+            // format range
+            value = value === '' ? 0 : +value;
+            value = Math.max(Math.min(this.data.max, value), this.data.min);
+            // format decimal
+            if (isDef(this.data.decimalLength)) {
+                value = value.toFixed(this.data.decimalLength);
+            }
+            return value;
+        },
+        onInput(event) {
+            const { value = '' } = event.detail || {};
+            this.triggerInput(value);
+        },
+        onChange() {
+            const { type } = this;
+            if (this.isDisabled(type)) {
+                this.$emit('overlimit', type);
+                return;
+            }
+            const diff = type === 'minus' ? -this.data.step : +this.data.step;
+            const value = add(+this.data.value, diff);
+            this.triggerInput(this.range(value));
+            this.$emit(type);
+        },
+        longPressStep() {
+            this.longPressTimer = setTimeout(() => {
+                this.onChange();
+                this.longPressStep();
+            }, LONG_PRESS_INTERVAL);
+        },
+        onTap(event) {
+            const { type } = event.currentTarget.dataset;
+            this.type = type;
+            this.onChange();
+        },
+        onTouchStart(event) {
+            clearTimeout(this.longPressTimer);
+            const { type } = event.currentTarget.dataset;
+            this.type = type;
+            this.isLongPress = false;
+            this.longPressTimer = setTimeout(() => {
+                this.isLongPress = true;
+                this.onChange();
+                this.longPressStep();
+            }, LONG_PRESS_START_TIME);
+        },
+        onTouchEnd() {
+            clearTimeout(this.longPressTimer);
+        },
+        triggerInput(value) {
+            this.setData({
+                value: this.data.asyncChange ? this.data.value : value
+            });
+            this.$emit('change', value);
+        },
+        computeInputStyle() {
+            let style = '';
+            if (this.data.inputWidth) {
+                style = `width: ${addUnit(this.data.inputWidth)};`;
+            }
+            if (this.data.buttonSize) {
+                style += `height: ${addUnit(this.data.buttonSize)};`;
+            }
+            return style;
+        },
+        computeButtonStyle() {
+            let style = '';
+            const size = addUnit(this.data.buttonSize);
+            if (this.data.buttonSize) {
+                style = `width: ${size};height: ${size};`;
+            }
+            return style;
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/stepper/index.json b/litemall-wx/lib/vant-weapp/stepper/index.json
index 32640e0d..1edff938 100644
--- a/litemall-wx/lib/vant-weapp/stepper/index.json
+++ b/litemall-wx/lib/vant-weapp/stepper/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
+{
+  "component": true
 }
\ No newline at end of file
diff --git a/litemall-wx/lib/vant-weapp/stepper/index.wxml b/litemall-wx/lib/vant-weapp/stepper/index.wxml
index 456ccced..830e99a7 100644
--- a/litemall-wx/lib/vant-weapp/stepper/index.wxml
+++ b/litemall-wx/lib/vant-weapp/stepper/index.wxml
@@ -1,37 +1,37 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view class="van-stepper custom-class">
-  <view
-    wx:if="{{ showMinus }}"
-    data-type="minus"
-    style="{{ buttonStyle }}"
-    class="minus-class {{ utils.bem('stepper__minus', { disabled: disabled || disableMinus || value <= min }) }}"
-    hover-class="van-stepper__minus--hover"
-    hover-stay-time="70"
-    bind:tap="onTap"
-    bind:touchstart="onTouchStart"
-    bind:touchend="onTouchEnd"
-  />
-  <input
-    type="{{ integer ? 'number' : 'digit' }}"
-    class="input-class {{ utils.bem('stepper__input', { disabled: disabled || disableInput }) }}"
-    style="{{ inputStyle }}"
-    value="{{ value }}"
-    focus="{{ focus }}"
-    disabled="{{ disabled || disableInput }}"
-    bindinput="onInput"
-    bind:focus="onFocus"
-    bind:blur="onBlur"
-  />
-  <view
-    wx:if="{{ showPlus }}"
-    data-type="plus"
-    style="{{ buttonStyle }}"
-    class="plus-class {{ utils.bem('stepper__plus', { disabled: disabled || disablePlus || value >= max }) }}"
-    hover-class="van-stepper__plus--hover"
-    hover-stay-time="70"
-    bind:tap="onTap"
-    bind:touchstart="onTouchStart"
-    bind:touchend="onTouchEnd"
-  />
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="van-stepper custom-class">
+  <view
+    wx:if="{{ showMinus }}"
+    data-type="minus"
+    style="{{ buttonStyle }}"
+    class="minus-class {{ utils.bem('stepper__minus', { disabled: disabled || disableMinus || value <= min }) }}"
+    hover-class="van-stepper__minus--hover"
+    hover-stay-time="70"
+    bind:tap="onTap"
+    bind:touchstart="onTouchStart"
+    bind:touchend="onTouchEnd"
+  />
+  <input
+    type="{{ integer ? 'number' : 'digit' }}"
+    class="input-class {{ utils.bem('stepper__input', { disabled: disabled || disableInput }) }}"
+    style="{{ inputStyle }}"
+    value="{{ value }}"
+    focus="{{ focus }}"
+    disabled="{{ disabled || disableInput }}"
+    bindinput="onInput"
+    bind:focus="onFocus"
+    bind:blur="onBlur"
+  />
+  <view
+    wx:if="{{ showPlus }}"
+    data-type="plus"
+    style="{{ buttonStyle }}"
+    class="plus-class {{ utils.bem('stepper__plus', { disabled: disabled || disablePlus || value >= max }) }}"
+    hover-class="van-stepper__plus--hover"
+    hover-stay-time="70"
+    bind:tap="onTap"
+    bind:touchstart="onTouchStart"
+    bind:touchend="onTouchEnd"
+  />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/steps/index.d.ts b/litemall-wx/lib/vant-weapp/steps/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/steps/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/steps/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/steps/index.js b/litemall-wx/lib/vant-weapp/steps/index.js
index 14b5f30b..96479e1b 100644
--- a/litemall-wx/lib/vant-weapp/steps/index.js
+++ b/litemall-wx/lib/vant-weapp/steps/index.js
@@ -1,22 +1,22 @@
-import { VantComponent } from '../common/component';
-import { GREEN } from '../common/color';
-VantComponent({
-    props: {
-        icon: String,
-        steps: Array,
-        active: Number,
-        direction: {
-            type: String,
-            value: 'horizontal'
-        },
-        activeColor: {
-            type: String,
-            value: GREEN
-        },
-        activeIcon: {
-            type: String,
-            value: 'checked'
-        },
-        inactiveIcon: String
-    }
-});
+import { VantComponent } from '../common/component';
+import { GREEN } from '../common/color';
+VantComponent({
+    props: {
+        icon: String,
+        steps: Array,
+        active: Number,
+        direction: {
+            type: String,
+            value: 'horizontal'
+        },
+        activeColor: {
+            type: String,
+            value: GREEN
+        },
+        activeIcon: {
+            type: String,
+            value: 'checked'
+        },
+        inactiveIcon: String
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/steps/index.json b/litemall-wx/lib/vant-weapp/steps/index.json
index 0a336c08..8abfe203 100644
--- a/litemall-wx/lib/vant-weapp/steps/index.json
+++ b/litemall-wx/lib/vant-weapp/steps/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/steps/index.wxml b/litemall-wx/lib/vant-weapp/steps/index.wxml
index 9e280d87..4abca82e 100644
--- a/litemall-wx/lib/vant-weapp/steps/index.wxml
+++ b/litemall-wx/lib/vant-weapp/steps/index.wxml
@@ -1,51 +1,51 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view class="custom-class {{ utils.bem('steps', [direction]) }}">
-  <view class="van-step__wrapper">
-    <view
-      wx:for="{{ steps }}"
-      wx:key="index"
-      class="{{ utils.bem('step', [direction, status(index, active)]) }} van-hairline"
-    >
-      <view class="van-step__title" style="{{ index === active ? 'color: ' + activeColor : '' }}">
-        <view>{{ item.text }}</view>
-        <view>{{ item.desc }}</view>
-      </view>
-      <view class="van-step__circle-container">
-        <block wx:if="{{ index !== active }}">
-          <van-icon
-            wx:if="{{ inactiveIcon }}"
-            color="#969799"
-            name="{{ inactiveIcon }}"
-            custom-class="van-step__icon"
-          />
-          <view
-            wx:else
-            class="van-step__circle"
-            style="{{ index < active ? 'background-color: ' + activeColor : '' }}"
-          />
-        </block>
-
-        <van-icon wx:else name="{{ activeIcon }}" color="{{ activeColor }}" custom-class="van-step__icon" />
-      </view>
-      <view
-        wx:if="{{ index !== steps.length - 1 }}"
-        class="van-step__line" style="{{ index < active ? 'background-color: ' + activeColor : '' }}"
-      />
-    </view>
-  </view>
-</view>
-
-<wxs module="status">
-function get(index, active) {
-  if (index < active) {
-    return 'finish';
-  } else if (index === active) {
-    return 'process';
-  }
-
-  return '';
-}
-
-module.exports = get;
-</wxs>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="custom-class {{ utils.bem('steps', [direction]) }}">
+  <view class="van-step__wrapper">
+    <view
+      wx:for="{{ steps }}"
+      wx:key="index"
+      class="{{ utils.bem('step', [direction, status(index, active)]) }} van-hairline"
+    >
+      <view class="van-step__title" style="{{ index === active ? 'color: ' + activeColor : '' }}">
+        <view>{{ item.text }}</view>
+        <view>{{ item.desc }}</view>
+      </view>
+      <view class="van-step__circle-container">
+        <block wx:if="{{ index !== active }}">
+          <van-icon
+            wx:if="{{ inactiveIcon }}"
+            color="#969799"
+            name="{{ inactiveIcon }}"
+            custom-class="van-step__icon"
+          />
+          <view
+            wx:else
+            class="van-step__circle"
+            style="{{ index < active ? 'background-color: ' + activeColor : '' }}"
+          />
+        </block>
+
+        <van-icon wx:else name="{{ activeIcon }}" color="{{ activeColor }}" custom-class="van-step__icon" />
+      </view>
+      <view
+        wx:if="{{ index !== steps.length - 1 }}"
+        class="van-step__line" style="{{ index < active ? 'background-color: ' + activeColor : '' }}"
+      />
+    </view>
+  </view>
+</view>
+
+<wxs module="status">
+function get(index, active) {
+  if (index < active) {
+    return 'finish';
+  } else if (index === active) {
+    return 'process';
+  }
+
+  return '';
+}
+
+module.exports = get;
+</wxs>
diff --git a/litemall-wx/lib/vant-weapp/sticky/index.d.ts b/litemall-wx/lib/vant-weapp/sticky/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/sticky/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/sticky/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/sticky/index.js b/litemall-wx/lib/vant-weapp/sticky/index.js
index 6b904a9f..4c73a504 100644
--- a/litemall-wx/lib/vant-weapp/sticky/index.js
+++ b/litemall-wx/lib/vant-weapp/sticky/index.js
@@ -1,140 +1,140 @@
-import { VantComponent } from '../common/component';
-const ROOT_ELEMENT = '.van-sticky';
-VantComponent({
-    props: {
-        zIndex: {
-            type: Number,
-            value: 99
-        },
-        offsetTop: {
-            type: Number,
-            value: 0,
-            observer: 'observeContent'
-        },
-        disabled: {
-            type: Boolean,
-            observer(value) {
-                if (!this.mounted) {
-                    return;
-                }
-                value ? this.disconnectObserver() : this.initObserver();
-            }
-        },
-        container: {
-            type: null,
-            observer(target) {
-                if (typeof target !== 'function' || !this.data.height) {
-                    return;
-                }
-                this.observeContainer();
-            }
-        }
-    },
-    data: {
-        wrapStyle: '',
-        containerStyle: ''
-    },
-    methods: {
-        setStyle() {
-            const { offsetTop, height, fixed, zIndex } = this.data;
-            if (fixed) {
-                this.setData({
-                    wrapStyle: `top: ${offsetTop}px;`,
-                    containerStyle: `height: ${height}px; z-index: ${zIndex};`
-                });
-            }
-            else {
-                this.setData({
-                    wrapStyle: '',
-                    containerStyle: ''
-                });
-            }
-        },
-        getContainerRect() {
-            const nodesRef = this.data.container();
-            return new Promise(resolve => nodesRef.boundingClientRect(resolve).exec());
-        },
-        initObserver() {
-            this.disconnectObserver();
-            this.getRect(ROOT_ELEMENT).then((rect) => {
-                this.setData({ height: rect.height });
-                wx.nextTick(() => {
-                    this.observeContent();
-                    this.observeContainer();
-                });
-            });
-        },
-        disconnectObserver(observerName) {
-            if (observerName) {
-                const observer = this[observerName];
-                observer && observer.disconnect();
-            }
-            else {
-                this.contentObserver && this.contentObserver.disconnect();
-                this.containerObserver && this.containerObserver.disconnect();
-            }
-        },
-        observeContent() {
-            const { offsetTop } = this.data;
-            this.disconnectObserver('contentObserver');
-            const contentObserver = this.createIntersectionObserver({
-                thresholds: [0, 1]
-            });
-            this.contentObserver = contentObserver;
-            contentObserver.relativeToViewport({ top: -offsetTop });
-            contentObserver.observe(ROOT_ELEMENT, res => {
-                if (this.data.disabled) {
-                    return;
-                }
-                this.setFixed(res.boundingClientRect.top);
-            });
-        },
-        observeContainer() {
-            if (typeof this.data.container !== 'function') {
-                return;
-            }
-            const { height } = this.data;
-            this.getContainerRect().then((rect) => {
-                this.containerHeight = rect.height;
-                this.disconnectObserver('containerObserver');
-                const containerObserver = this.createIntersectionObserver({
-                    thresholds: [0, 1]
-                });
-                this.containerObserver = containerObserver;
-                containerObserver.relativeToViewport({
-                    top: this.containerHeight - height
-                });
-                containerObserver.observe(ROOT_ELEMENT, res => {
-                    if (this.data.disabled) {
-                        return;
-                    }
-                    this.setFixed(res.boundingClientRect.top);
-                });
-            });
-        },
-        setFixed(top) {
-            const { offsetTop, height } = this.data;
-            const { containerHeight } = this;
-            const fixed = containerHeight && height
-                ? top > height - containerHeight && top < offsetTop
-                : top < offsetTop;
-            this.$emit('scroll', {
-                scrollTop: top,
-                isFixed: fixed
-            });
-            this.setData({ fixed });
-            wx.nextTick(() => {
-                this.setStyle();
-            });
-        }
-    },
-    mounted() {
-        this.mounted = true;
-        if (!this.data.disabled) {
-            this.initObserver();
-        }
-    },
-    destroyed() {
-        this.disconnectObserver();
-    }
-});
+import { VantComponent } from '../common/component';
+const ROOT_ELEMENT = '.van-sticky';
+VantComponent({
+    props: {
+        zIndex: {
+            type: Number,
+            value: 99
+        },
+        offsetTop: {
+            type: Number,
+            value: 0,
+            observer: 'observeContent'
+        },
+        disabled: {
+            type: Boolean,
+            observer(value) {
+                if (!this.mounted) {
+                    return;
+                }
+                value ? this.disconnectObserver() : this.initObserver();
+            }
+        },
+        container: {
+            type: null,
+            observer(target) {
+                if (typeof target !== 'function' || !this.data.height) {
+                    return;
+                }
+                this.observeContainer();
+            }
+        }
+    },
+    data: {
+        wrapStyle: '',
+        containerStyle: ''
+    },
+    methods: {
+        setStyle() {
+            const { offsetTop, height, fixed, zIndex } = this.data;
+            if (fixed) {
+                this.setData({
+                    wrapStyle: `top: ${offsetTop}px;`,
+                    containerStyle: `height: ${height}px; z-index: ${zIndex};`
+                });
+            }
+            else {
+                this.setData({
+                    wrapStyle: '',
+                    containerStyle: ''
+                });
+            }
+        },
+        getContainerRect() {
+            const nodesRef = this.data.container();
+            return new Promise(resolve => nodesRef.boundingClientRect(resolve).exec());
+        },
+        initObserver() {
+            this.disconnectObserver();
+            this.getRect(ROOT_ELEMENT).then((rect) => {
+                this.setData({ height: rect.height });
+                wx.nextTick(() => {
+                    this.observeContent();
+                    this.observeContainer();
+                });
+            });
+        },
+        disconnectObserver(observerName) {
+            if (observerName) {
+                const observer = this[observerName];
+                observer && observer.disconnect();
+            }
+            else {
+                this.contentObserver && this.contentObserver.disconnect();
+                this.containerObserver && this.containerObserver.disconnect();
+            }
+        },
+        observeContent() {
+            const { offsetTop } = this.data;
+            this.disconnectObserver('contentObserver');
+            const contentObserver = this.createIntersectionObserver({
+                thresholds: [0, 1]
+            });
+            this.contentObserver = contentObserver;
+            contentObserver.relativeToViewport({ top: -offsetTop });
+            contentObserver.observe(ROOT_ELEMENT, res => {
+                if (this.data.disabled) {
+                    return;
+                }
+                this.setFixed(res.boundingClientRect.top);
+            });
+        },
+        observeContainer() {
+            if (typeof this.data.container !== 'function') {
+                return;
+            }
+            const { height } = this.data;
+            this.getContainerRect().then((rect) => {
+                this.containerHeight = rect.height;
+                this.disconnectObserver('containerObserver');
+                const containerObserver = this.createIntersectionObserver({
+                    thresholds: [0, 1]
+                });
+                this.containerObserver = containerObserver;
+                containerObserver.relativeToViewport({
+                    top: this.containerHeight - height
+                });
+                containerObserver.observe(ROOT_ELEMENT, res => {
+                    if (this.data.disabled) {
+                        return;
+                    }
+                    this.setFixed(res.boundingClientRect.top);
+                });
+            });
+        },
+        setFixed(top) {
+            const { offsetTop, height } = this.data;
+            const { containerHeight } = this;
+            const fixed = containerHeight && height
+                ? top > height - containerHeight && top < offsetTop
+                : top < offsetTop;
+            this.$emit('scroll', {
+                scrollTop: top,
+                isFixed: fixed
+            });
+            this.setData({ fixed });
+            wx.nextTick(() => {
+                this.setStyle();
+            });
+        }
+    },
+    mounted() {
+        this.mounted = true;
+        if (!this.data.disabled) {
+            this.initObserver();
+        }
+    },
+    destroyed() {
+        this.disconnectObserver();
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/sticky/index.json b/litemall-wx/lib/vant-weapp/sticky/index.json
index 467ce294..efdc3c82 100644
--- a/litemall-wx/lib/vant-weapp/sticky/index.json
+++ b/litemall-wx/lib/vant-weapp/sticky/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
-}
+{
+  "component": true
+}
diff --git a/litemall-wx/lib/vant-weapp/sticky/index.wxml b/litemall-wx/lib/vant-weapp/sticky/index.wxml
index 2f95359a..739929c3 100644
--- a/litemall-wx/lib/vant-weapp/sticky/index.wxml
+++ b/litemall-wx/lib/vant-weapp/sticky/index.wxml
@@ -1,7 +1,7 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view class="custom-class van-sticky" style="{{ containerStyle }}">
-  <view class="{{ utils.bem('sticky-wrap', { fixed }) }}" style="{{ wrapStyle }}">
-    <slot />
-  </view>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="custom-class van-sticky" style="{{ containerStyle }}">
+  <view class="{{ utils.bem('sticky-wrap', { fixed }) }}" style="{{ wrapStyle }}">
+    <slot />
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/submit-bar/index.d.ts b/litemall-wx/lib/vant-weapp/submit-bar/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/submit-bar/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/submit-bar/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/submit-bar/index.js b/litemall-wx/lib/vant-weapp/submit-bar/index.js
index 23a34dae..1fe261b3 100644
--- a/litemall-wx/lib/vant-weapp/submit-bar/index.js
+++ b/litemall-wx/lib/vant-weapp/submit-bar/index.js
@@ -1,57 +1,57 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    classes: [
-        'bar-class',
-        'price-class',
-        'button-class'
-    ],
-    props: {
-        tip: {
-            type: null,
-            observer: 'updateTip'
-        },
-        tipIcon: String,
-        type: Number,
-        price: {
-            type: null,
-            observer: 'updatePrice'
-        },
-        label: String,
-        loading: Boolean,
-        disabled: Boolean,
-        buttonText: String,
-        currency: {
-            type: String,
-            value: '¥'
-        },
-        buttonType: {
-            type: String,
-            value: 'danger'
-        },
-        decimalLength: {
-            type: Number,
-            value: 2,
-            observer: 'updatePrice'
-        },
-        suffixLabel: String,
-        safeAreaInsetBottom: {
-            type: Boolean,
-            value: true
-        }
-    },
-    methods: {
-        updatePrice() {
-            const { price, decimalLength } = this.data;
-            this.setData({
-                hasPrice: typeof price === 'number',
-                priceStr: (price / 100).toFixed(decimalLength)
-            });
-        },
-        updateTip() {
-            this.setData({ hasTip: typeof this.data.tip === 'string' });
-        },
-        onSubmit(event) {
-            this.$emit('submit', event.detail);
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    classes: [
+        'bar-class',
+        'price-class',
+        'button-class'
+    ],
+    props: {
+        tip: {
+            type: null,
+            observer: 'updateTip'
+        },
+        tipIcon: String,
+        type: Number,
+        price: {
+            type: null,
+            observer: 'updatePrice'
+        },
+        label: String,
+        loading: Boolean,
+        disabled: Boolean,
+        buttonText: String,
+        currency: {
+            type: String,
+            value: '¥'
+        },
+        buttonType: {
+            type: String,
+            value: 'danger'
+        },
+        decimalLength: {
+            type: Number,
+            value: 2,
+            observer: 'updatePrice'
+        },
+        suffixLabel: String,
+        safeAreaInsetBottom: {
+            type: Boolean,
+            value: true
+        }
+    },
+    methods: {
+        updatePrice() {
+            const { price, decimalLength } = this.data;
+            this.setData({
+                hasPrice: typeof price === 'number',
+                priceStr: (price / 100).toFixed(decimalLength)
+            });
+        },
+        updateTip() {
+            this.setData({ hasTip: typeof this.data.tip === 'string' });
+        },
+        onSubmit(event) {
+            this.$emit('submit', event.detail);
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/submit-bar/index.json b/litemall-wx/lib/vant-weapp/submit-bar/index.json
index bda9b8d3..61add225 100644
--- a/litemall-wx/lib/vant-weapp/submit-bar/index.json
+++ b/litemall-wx/lib/vant-weapp/submit-bar/index.json
@@ -1,7 +1,7 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-button": "../button/index",
-    "van-icon": "../icon/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-button": "../button/index",
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/submit-bar/index.wxml b/litemall-wx/lib/vant-weapp/submit-bar/index.wxml
index 4cdbd18d..dfded143 100644
--- a/litemall-wx/lib/vant-weapp/submit-bar/index.wxml
+++ b/litemall-wx/lib/vant-weapp/submit-bar/index.wxml
@@ -1,42 +1,42 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view class="van-submit-bar custom-class">
-  <slot name="top" />
-
-  <view class="van-submit-bar__tip">
-    <van-icon
-      wx:if="{{ tipIcon }}"
-      size="12px"
-      name="{{ tipIcon }}"
-      custom-class="van-submit-bar__tip-icon"
-    />
-    <view wx:if="{{ hasTip }}" class="van-submit-bar__tip-text">
-      {{ tip }}
-    </view>
-    <slot name="tip" />
-  </view>
-
-  <view class="bar-class {{ utils.bem('submit-bar__bar', { safe: safeAreaInsetBottom }) }}">
-    <slot />
-    <view wx:if="{{ hasPrice }}" class="van-submit-bar__text">
-      <text>{{ label || '合计：' }}</text>
-      <text class="van-submit-bar__price price-class">
-        <text class="van-submit-bar__currency">{{ currency }} </text>
-        <text>{{ priceStr }}</text>
-      </text>
-      <text class="van-submit-bar__suffix-label">{{ suffixLabel }}</text>
-    </view>
-    <van-button
-      square
-      size="large"
-      type="{{ buttonType }}"
-      loading="{{ loading }}"
-      disabled="{{ disabled }}"
-      class="van-submit-bar__button"
-      custom-class="button-class"
-      bind:click="onSubmit"
-    >
-      {{ loading ? '' : buttonText }}
-    </van-button>
-  </view>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="van-submit-bar custom-class">
+  <slot name="top" />
+
+  <view class="van-submit-bar__tip">
+    <van-icon
+      wx:if="{{ tipIcon }}"
+      size="12px"
+      name="{{ tipIcon }}"
+      custom-class="van-submit-bar__tip-icon"
+    />
+    <view wx:if="{{ hasTip }}" class="van-submit-bar__tip-text">
+      {{ tip }}
+    </view>
+    <slot name="tip" />
+  </view>
+
+  <view class="bar-class {{ utils.bem('submit-bar__bar', { safe: safeAreaInsetBottom }) }}">
+    <slot />
+    <view wx:if="{{ hasPrice }}" class="van-submit-bar__text">
+      <text>{{ label || '合计：' }}</text>
+      <text class="van-submit-bar__price price-class">
+        <text class="van-submit-bar__currency">{{ currency }} </text>
+        <text>{{ priceStr }}</text>
+      </text>
+      <text class="van-submit-bar__suffix-label">{{ suffixLabel }}</text>
+    </view>
+    <van-button
+      square
+      size="large"
+      type="{{ buttonType }}"
+      loading="{{ loading }}"
+      disabled="{{ disabled }}"
+      class="van-submit-bar__button"
+      custom-class="button-class"
+      bind:click="onSubmit"
+    >
+      {{ loading ? '' : buttonText }}
+    </van-button>
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/swipe-cell/index.d.ts b/litemall-wx/lib/vant-weapp/swipe-cell/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/swipe-cell/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/swipe-cell/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/swipe-cell/index.js b/litemall-wx/lib/vant-weapp/swipe-cell/index.js
index fa2e3498..c6f49961 100644
--- a/litemall-wx/lib/vant-weapp/swipe-cell/index.js
+++ b/litemall-wx/lib/vant-weapp/swipe-cell/index.js
@@ -1,122 +1,122 @@
-import { VantComponent } from '../common/component';
-import { touch } from '../mixins/touch';
-import { range } from '../common/utils';
-const THRESHOLD = 0.3;
-let ARRAY = [];
-VantComponent({
-    props: {
-        disabled: Boolean,
-        leftWidth: {
-            type: Number,
-            value: 0
-        },
-        rightWidth: {
-            type: Number,
-            value: 0
-        },
-        asyncClose: Boolean,
-        name: {
-            type: [Number, String],
-            value: ''
-        }
-    },
-    mixins: [touch],
-    data: {
-        catchMove: false
-    },
-    created() {
-        this.offset = 0;
-        ARRAY.push(this);
-    },
-    destroyed() {
-        ARRAY = ARRAY.filter(item => item !== this);
-    },
-    methods: {
-        open(position) {
-            const { leftWidth, rightWidth } = this.data;
-            const offset = position === 'left' ? leftWidth : -rightWidth;
-            this.swipeMove(offset);
-            this.$emit('open', {
-                position,
-                name: this.data.name
-            });
-        },
-        close() {
-            this.swipeMove(0);
-        },
-        swipeMove(offset = 0) {
-            this.offset = range(offset, -this.data.rightWidth, this.data.leftWidth);
-            const transform = `translate3d(${this.offset}px, 0, 0)`;
-            const transition = this.dragging
-                ? 'none'
-                : 'transform .6s cubic-bezier(0.18, 0.89, 0.32, 1)';
-            this.setData({
-                wrapperStyle: `
-        -webkit-transform: ${transform};
-        -webkit-transition: ${transition};
-        transform: ${transform};
-        transition: ${transition};
-      `
-            });
-        },
-        swipeLeaveTransition() {
-            const { leftWidth, rightWidth } = this.data;
-            const { offset } = this;
-            if (rightWidth > 0 && -offset > rightWidth * THRESHOLD) {
-                this.open('right');
-            }
-            else if (leftWidth > 0 && offset > leftWidth * THRESHOLD) {
-                this.open('left');
-            }
-            else {
-                this.swipeMove(0);
-            }
-            this.setData({ catchMove: false });
-        },
-        startDrag(event) {
-            if (this.data.disabled) {
-                return;
-            }
-            this.startOffset = this.offset;
-            this.touchStart(event);
-        },
-        noop() { },
-        onDrag(event) {
-            if (this.data.disabled) {
-                return;
-            }
-            this.touchMove(event);
-            if (this.direction !== 'horizontal') {
-                return;
-            }
-            this.dragging = true;
-            ARRAY.filter(item => item !== this).forEach(item => item.close());
-            this.setData({ catchMove: true });
-            this.swipeMove(this.startOffset + this.deltaX);
-        },
-        endDrag() {
-            if (this.data.disabled) {
-                return;
-            }
-            this.dragging = false;
-            this.swipeLeaveTransition();
-        },
-        onClick(event) {
-            const { key: position = 'outside' } = event.currentTarget.dataset;
-            this.$emit('click', position);
-            if (!this.offset) {
-                return;
-            }
-            if (this.data.asyncClose) {
-                this.$emit('close', {
-                    position,
-                    instance: this,
-                    name: this.data.name
-                });
-            }
-            else {
-                this.swipeMove(0);
-            }
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { touch } from '../mixins/touch';
+import { range } from '../common/utils';
+const THRESHOLD = 0.3;
+let ARRAY = [];
+VantComponent({
+    props: {
+        disabled: Boolean,
+        leftWidth: {
+            type: Number,
+            value: 0
+        },
+        rightWidth: {
+            type: Number,
+            value: 0
+        },
+        asyncClose: Boolean,
+        name: {
+            type: [Number, String],
+            value: ''
+        }
+    },
+    mixins: [touch],
+    data: {
+        catchMove: false
+    },
+    created() {
+        this.offset = 0;
+        ARRAY.push(this);
+    },
+    destroyed() {
+        ARRAY = ARRAY.filter(item => item !== this);
+    },
+    methods: {
+        open(position) {
+            const { leftWidth, rightWidth } = this.data;
+            const offset = position === 'left' ? leftWidth : -rightWidth;
+            this.swipeMove(offset);
+            this.$emit('open', {
+                position,
+                name: this.data.name
+            });
+        },
+        close() {
+            this.swipeMove(0);
+        },
+        swipeMove(offset = 0) {
+            this.offset = range(offset, -this.data.rightWidth, this.data.leftWidth);
+            const transform = `translate3d(${this.offset}px, 0, 0)`;
+            const transition = this.dragging
+                ? 'none'
+                : 'transform .6s cubic-bezier(0.18, 0.89, 0.32, 1)';
+            this.setData({
+                wrapperStyle: `
+        -webkit-transform: ${transform};
+        -webkit-transition: ${transition};
+        transform: ${transform};
+        transition: ${transition};
+      `
+            });
+        },
+        swipeLeaveTransition() {
+            const { leftWidth, rightWidth } = this.data;
+            const { offset } = this;
+            if (rightWidth > 0 && -offset > rightWidth * THRESHOLD) {
+                this.open('right');
+            }
+            else if (leftWidth > 0 && offset > leftWidth * THRESHOLD) {
+                this.open('left');
+            }
+            else {
+                this.swipeMove(0);
+            }
+            this.setData({ catchMove: false });
+        },
+        startDrag(event) {
+            if (this.data.disabled) {
+                return;
+            }
+            this.startOffset = this.offset;
+            this.touchStart(event);
+        },
+        noop() { },
+        onDrag(event) {
+            if (this.data.disabled) {
+                return;
+            }
+            this.touchMove(event);
+            if (this.direction !== 'horizontal') {
+                return;
+            }
+            this.dragging = true;
+            ARRAY.filter(item => item !== this).forEach(item => item.close());
+            this.setData({ catchMove: true });
+            this.swipeMove(this.startOffset + this.deltaX);
+        },
+        endDrag() {
+            if (this.data.disabled) {
+                return;
+            }
+            this.dragging = false;
+            this.swipeLeaveTransition();
+        },
+        onClick(event) {
+            const { key: position = 'outside' } = event.currentTarget.dataset;
+            this.$emit('click', position);
+            if (!this.offset) {
+                return;
+            }
+            if (this.data.asyncClose) {
+                this.$emit('close', {
+                    position,
+                    instance: this,
+                    name: this.data.name
+                });
+            }
+            else {
+                this.swipeMove(0);
+            }
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/swipe-cell/index.json b/litemall-wx/lib/vant-weapp/swipe-cell/index.json
index 467ce294..efdc3c82 100644
--- a/litemall-wx/lib/vant-weapp/swipe-cell/index.json
+++ b/litemall-wx/lib/vant-weapp/swipe-cell/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
-}
+{
+  "component": true
+}
diff --git a/litemall-wx/lib/vant-weapp/swipe-cell/index.wxml b/litemall-wx/lib/vant-weapp/swipe-cell/index.wxml
index 72936199..f710e411 100644
--- a/litemall-wx/lib/vant-weapp/swipe-cell/index.wxml
+++ b/litemall-wx/lib/vant-weapp/swipe-cell/index.wxml
@@ -1,20 +1,20 @@
-<view
-  class="van-swipe-cell"
-  data-key="cell"
-  catchtap="onClick"
-  bindtouchstart="startDrag"
-  catchtouchmove="{{ catchMove ? 'noop' : '' }}"
-  capture-bind:touchmove="onDrag"
-  bindtouchend="endDrag"
-  bindtouchcancel="endDrag"
->
-  <view style="{{ wrapperStyle }}">
-    <view wx:if="{{ leftWidth }}" class="van-swipe-cell__left" data-key="left" catch:tap="onClick">
-      <slot name="left" />
-    </view>
-    <slot />
-    <view wx:if="{{ rightWidth }}" class="van-swipe-cell__right" data-key="right" catch:tap="onClick">
-      <slot name="right" />
-    </view>
-  </view>
-</view>
+<view
+  class="van-swipe-cell"
+  data-key="cell"
+  catchtap="onClick"
+  bindtouchstart="startDrag"
+  catchtouchmove="{{ catchMove ? 'noop' : '' }}"
+  capture-bind:touchmove="onDrag"
+  bindtouchend="endDrag"
+  bindtouchcancel="endDrag"
+>
+  <view style="{{ wrapperStyle }}">
+    <view wx:if="{{ leftWidth }}" class="van-swipe-cell__left" data-key="left" catch:tap="onClick">
+      <slot name="left" />
+    </view>
+    <slot />
+    <view wx:if="{{ rightWidth }}" class="van-swipe-cell__right" data-key="right" catch:tap="onClick">
+      <slot name="right" />
+    </view>
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/switch/index.d.ts b/litemall-wx/lib/vant-weapp/switch/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/switch/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/switch/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/switch/index.js b/litemall-wx/lib/vant-weapp/switch/index.js
index 40098177..6b9ea2f1 100644
--- a/litemall-wx/lib/vant-weapp/switch/index.js
+++ b/litemall-wx/lib/vant-weapp/switch/index.js
@@ -1,51 +1,51 @@
-import { VantComponent } from '../common/component';
-import { BLUE, GRAY_DARK } from '../common/color';
-VantComponent({
-    field: true,
-    classes: ['node-class'],
-    props: {
-        checked: null,
-        loading: Boolean,
-        disabled: Boolean,
-        activeColor: String,
-        inactiveColor: String,
-        size: {
-            type: String,
-            value: '30px'
-        },
-        activeValue: {
-            type: null,
-            value: true
-        },
-        inactiveValue: {
-            type: null,
-            value: false
-        }
-    },
-    watch: {
-        checked(value) {
-            const loadingColor = this.getLoadingColor(value);
-            this.setData({ value, loadingColor });
-        }
-    },
-    created() {
-        const { checked: value } = this.data;
-        const loadingColor = this.getLoadingColor(value);
-        this.setData({ value, loadingColor });
-    },
-    methods: {
-        getLoadingColor(checked) {
-            const { activeColor, inactiveColor } = this.data;
-            return checked ? activeColor || BLUE : inactiveColor || GRAY_DARK;
-        },
-        onClick() {
-            const { activeValue, inactiveValue } = this.data;
-            if (!this.data.disabled && !this.data.loading) {
-                const checked = this.data.checked === activeValue;
-                const value = checked ? inactiveValue : activeValue;
-                this.$emit('input', value);
-                this.$emit('change', value);
-            }
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { BLUE, GRAY_DARK } from '../common/color';
+VantComponent({
+    field: true,
+    classes: ['node-class'],
+    props: {
+        checked: null,
+        loading: Boolean,
+        disabled: Boolean,
+        activeColor: String,
+        inactiveColor: String,
+        size: {
+            type: String,
+            value: '30px'
+        },
+        activeValue: {
+            type: null,
+            value: true
+        },
+        inactiveValue: {
+            type: null,
+            value: false
+        }
+    },
+    watch: {
+        checked(value) {
+            const loadingColor = this.getLoadingColor(value);
+            this.setData({ value, loadingColor });
+        }
+    },
+    created() {
+        const { checked: value } = this.data;
+        const loadingColor = this.getLoadingColor(value);
+        this.setData({ value, loadingColor });
+    },
+    methods: {
+        getLoadingColor(checked) {
+            const { activeColor, inactiveColor } = this.data;
+            return checked ? activeColor || BLUE : inactiveColor || GRAY_DARK;
+        },
+        onClick() {
+            const { activeValue, inactiveValue } = this.data;
+            if (!this.data.disabled && !this.data.loading) {
+                const checked = this.data.checked === activeValue;
+                const value = checked ? inactiveValue : activeValue;
+                this.$emit('input', value);
+                this.$emit('change', value);
+            }
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/switch/index.json b/litemall-wx/lib/vant-weapp/switch/index.json
index 01077f5d..71a25150 100644
--- a/litemall-wx/lib/vant-weapp/switch/index.json
+++ b/litemall-wx/lib/vant-weapp/switch/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-loading": "../loading/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-loading": "../loading/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/switch/index.wxml b/litemall-wx/lib/vant-weapp/switch/index.wxml
index 31a104df..4dc457e7 100644
--- a/litemall-wx/lib/vant-weapp/switch/index.wxml
+++ b/litemall-wx/lib/vant-weapp/switch/index.wxml
@@ -1,11 +1,11 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view
-  class="custom-class {{ utils.bem('switch', { on: value === activeValue, disabled }) }}"
-  style="font-size: {{ size }}; {{ (checked ? activeColor : inactiveColor) ? 'background-color: ' + (checked ? activeColor : inactiveColor ) : '' }}"
-  bind:tap="onClick"
->
-  <view class="van-switch__node node-class">
-    <van-loading wx:if="{{ loading }}" color="{{ loadingColor }}" custom-class="van-switch__loading" />
-  </view>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="custom-class {{ utils.bem('switch', { on: value === activeValue, disabled }) }}"
+  style="font-size: {{ size }}; {{ (checked ? activeColor : inactiveColor) ? 'background-color: ' + (checked ? activeColor : inactiveColor ) : '' }}"
+  bind:tap="onClick"
+>
+  <view class="van-switch__node node-class">
+    <van-loading wx:if="{{ loading }}" color="{{ loadingColor }}" custom-class="van-switch__loading" />
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/tab/index.d.ts b/litemall-wx/lib/vant-weapp/tab/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/tab/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/tab/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/tab/index.js b/litemall-wx/lib/vant-weapp/tab/index.js
index 555086be..498dd73e 100644
--- a/litemall-wx/lib/vant-weapp/tab/index.js
+++ b/litemall-wx/lib/vant-weapp/tab/index.js
@@ -1,56 +1,56 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    relation: {
-        name: 'tabs',
-        type: 'ancestor',
-        linked(target) {
-            this.parent = target;
-        },
-        unlinked() {
-            this.parent = null;
-        }
-    },
-    props: {
-        dot: Boolean,
-        info: null,
-        title: String,
-        disabled: Boolean,
-        titleStyle: String,
-        name: {
-            type: [Number, String],
-            value: '',
-        }
-    },
-    data: {
-        active: false
-    },
-    watch: {
-        title: 'update',
-        disabled: 'update',
-        dot: 'update',
-        info: 'update',
-        titleStyle: 'update'
-    },
-    methods: {
-        getComputedName() {
-            if (this.data.name !== '') {
-                return this.data.name;
-            }
-            return this.index;
-        },
-        updateRender(active, parent) {
-            const { data: parentData } = parent;
-            this.inited = this.inited || active;
-            this.setData({
-                active,
-                shouldRender: this.inited || !parentData.lazyRender,
-                shouldShow: active || parentData.animated
-            });
-        },
-        update() {
-            if (this.parent) {
-                this.parent.updateTabs();
-            }
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    relation: {
+        name: 'tabs',
+        type: 'ancestor',
+        linked(target) {
+            this.parent = target;
+        },
+        unlinked() {
+            this.parent = null;
+        }
+    },
+    props: {
+        dot: Boolean,
+        info: null,
+        title: String,
+        disabled: Boolean,
+        titleStyle: String,
+        name: {
+            type: [Number, String],
+            value: '',
+        }
+    },
+    data: {
+        active: false
+    },
+    watch: {
+        title: 'update',
+        disabled: 'update',
+        dot: 'update',
+        info: 'update',
+        titleStyle: 'update'
+    },
+    methods: {
+        getComputedName() {
+            if (this.data.name !== '') {
+                return this.data.name;
+            }
+            return this.index;
+        },
+        updateRender(active, parent) {
+            const { data: parentData } = parent;
+            this.inited = this.inited || active;
+            this.setData({
+                active,
+                shouldRender: this.inited || !parentData.lazyRender,
+                shouldShow: active || parentData.animated
+            });
+        },
+        update() {
+            if (this.parent) {
+                this.parent.updateTabs();
+            }
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/tab/index.json b/litemall-wx/lib/vant-weapp/tab/index.json
index 32640e0d..1edff938 100644
--- a/litemall-wx/lib/vant-weapp/tab/index.json
+++ b/litemall-wx/lib/vant-weapp/tab/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
+{
+  "component": true
 }
\ No newline at end of file
diff --git a/litemall-wx/lib/vant-weapp/tab/index.wxml b/litemall-wx/lib/vant-weapp/tab/index.wxml
index f5e99f21..6acf5aeb 100644
--- a/litemall-wx/lib/vant-weapp/tab/index.wxml
+++ b/litemall-wx/lib/vant-weapp/tab/index.wxml
@@ -1,8 +1,8 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view
-  class="custom-class {{ utils.bem('tab__pane', { active, inactive: !active }) }}"
-  style="{{ shouldShow ? '' : 'display: none;' }}"
->
-  <slot wx:if="{{ shouldRender }}" />
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="custom-class {{ utils.bem('tab__pane', { active, inactive: !active }) }}"
+  style="{{ shouldShow ? '' : 'display: none;' }}"
+>
+  <slot wx:if="{{ shouldRender }}" />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/tabbar-item/index.d.ts b/litemall-wx/lib/vant-weapp/tabbar-item/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/tabbar-item/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/tabbar-item/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/tabbar-item/index.js b/litemall-wx/lib/vant-weapp/tabbar-item/index.js
index bd5fccfb..3f4aba3f 100644
--- a/litemall-wx/lib/vant-weapp/tabbar-item/index.js
+++ b/litemall-wx/lib/vant-weapp/tabbar-item/index.js
@@ -1,47 +1,47 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    props: {
-        info: null,
-        name: null,
-        icon: String,
-        dot: Boolean
-    },
-    relation: {
-        name: 'tabbar',
-        type: 'ancestor'
-    },
-    data: {
-        active: false
-    },
-    methods: {
-        onClick() {
-            if (this.parent) {
-                this.parent.onChange(this);
-            }
-            this.$emit('click');
-        },
-        updateFromParent() {
-            const { parent } = this;
-            if (!parent) {
-                return;
-            }
-            const index = parent.children.indexOf(this);
-            const parentData = parent.data;
-            const { data } = this;
-            const active = (data.name || index) === parentData.active;
-            const patch = {};
-            if (active !== data.active) {
-                patch.active = active;
-            }
-            if (parentData.activeColor !== data.activeColor) {
-                patch.activeColor = parentData.activeColor;
-            }
-            if (parentData.inactiveColor !== data.inactiveColor) {
-                patch.inactiveColor = parentData.inactiveColor;
-            }
-            return Object.keys(patch).length > 0
-                ? this.set(patch)
-                : Promise.resolve();
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    props: {
+        info: null,
+        name: null,
+        icon: String,
+        dot: Boolean
+    },
+    relation: {
+        name: 'tabbar',
+        type: 'ancestor'
+    },
+    data: {
+        active: false
+    },
+    methods: {
+        onClick() {
+            if (this.parent) {
+                this.parent.onChange(this);
+            }
+            this.$emit('click');
+        },
+        updateFromParent() {
+            const { parent } = this;
+            if (!parent) {
+                return;
+            }
+            const index = parent.children.indexOf(this);
+            const parentData = parent.data;
+            const { data } = this;
+            const active = (data.name || index) === parentData.active;
+            const patch = {};
+            if (active !== data.active) {
+                patch.active = active;
+            }
+            if (parentData.activeColor !== data.activeColor) {
+                patch.activeColor = parentData.activeColor;
+            }
+            if (parentData.inactiveColor !== data.inactiveColor) {
+                patch.inactiveColor = parentData.inactiveColor;
+            }
+            return Object.keys(patch).length > 0
+                ? this.set(patch)
+                : Promise.resolve();
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/tabbar-item/index.json b/litemall-wx/lib/vant-weapp/tabbar-item/index.json
index 16f174c5..8ed8bcd9 100644
--- a/litemall-wx/lib/vant-weapp/tabbar-item/index.json
+++ b/litemall-wx/lib/vant-weapp/tabbar-item/index.json
@@ -1,7 +1,7 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index",
-    "van-info": "../info/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-info": "../info/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/tabbar-item/index.wxml b/litemall-wx/lib/vant-weapp/tabbar-item/index.wxml
index d83b061f..a72253b7 100644
--- a/litemall-wx/lib/vant-weapp/tabbar-item/index.wxml
+++ b/litemall-wx/lib/vant-weapp/tabbar-item/index.wxml
@@ -1,30 +1,30 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view
-  class="{{ utils.bem('tabbar-item', { active }) }} custom-class"
-  style="color: {{ active ? activeColor : inactiveColor }}"
-  bind:tap="onClick"
->
-  <view class="van-tabbar-item__icon">
-    <van-icon
-      wx:if="{{ icon }}"
-      name="{{ icon }}"
-      custom-class="van-tabbar-item__icon__inner"
-    />
-    <block wx:else>
-      <slot
-        wx:if="{{ active }}"
-        name="icon-active"
-      />
-      <slot wx:else name="icon" />
-    </block>
-    <van-info
-      dot="{{ dot }}"
-      info="{{ info }}"
-      custom-class="van-tabbar-item__info"
-    />
-  </view>
-  <view class="van-tabbar-item__text">
-    <slot />
-  </view>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="{{ utils.bem('tabbar-item', { active }) }} custom-class"
+  style="color: {{ active ? activeColor : inactiveColor }}"
+  bind:tap="onClick"
+>
+  <view class="van-tabbar-item__icon">
+    <van-icon
+      wx:if="{{ icon }}"
+      name="{{ icon }}"
+      custom-class="van-tabbar-item__icon__inner"
+    />
+    <block wx:else>
+      <slot
+        wx:if="{{ active }}"
+        name="icon-active"
+      />
+      <slot wx:else name="icon" />
+    </block>
+    <van-info
+      dot="{{ dot }}"
+      info="{{ info }}"
+      custom-class="van-tabbar-item__info"
+    />
+  </view>
+  <view class="van-tabbar-item__text">
+    <slot />
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/tabbar/index.d.ts b/litemall-wx/lib/vant-weapp/tabbar/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/tabbar/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/tabbar/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/tabbar/index.js b/litemall-wx/lib/vant-weapp/tabbar/index.js
index b2276444..e9a91ba7 100644
--- a/litemall-wx/lib/vant-weapp/tabbar/index.js
+++ b/litemall-wx/lib/vant-weapp/tabbar/index.js
@@ -1,65 +1,65 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    relation: {
-        name: 'tabbar-item',
-        type: 'descendant',
-        linked(target) {
-            this.children.push(target);
-            target.parent = this;
-            target.updateFromParent();
-        },
-        unlinked(target) {
-            this.children = this.children.filter((item) => item !== target);
-            this.updateChildren();
-        }
-    },
-    props: {
-        active: {
-            type: null,
-            observer: 'updateChildren'
-        },
-        activeColor: {
-            type: String,
-            observer: 'updateChildren'
-        },
-        inactiveColor: {
-            type: String,
-            observer: 'updateChildren'
-        },
-        fixed: {
-            type: Boolean,
-            value: true
-        },
-        border: {
-            type: Boolean,
-            value: true
-        },
-        zIndex: {
-            type: Number,
-            value: 1
-        },
-        safeAreaInsetBottom: {
-            type: Boolean,
-            value: true
-        }
-    },
-    beforeCreate() {
-        this.children = [];
-    },
-    methods: {
-        updateChildren() {
-            const { children } = this;
-            if (!Array.isArray(children) || !children.length) {
-                return Promise.resolve();
-            }
-            return Promise.all(children.map((child) => child.updateFromParent()));
-        },
-        onChange(child) {
-            const index = this.children.indexOf(child);
-            const active = child.data.name || index;
-            if (active !== this.data.active) {
-                this.$emit('change', active);
-            }
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    relation: {
+        name: 'tabbar-item',
+        type: 'descendant',
+        linked(target) {
+            this.children.push(target);
+            target.parent = this;
+            target.updateFromParent();
+        },
+        unlinked(target) {
+            this.children = this.children.filter((item) => item !== target);
+            this.updateChildren();
+        }
+    },
+    props: {
+        active: {
+            type: null,
+            observer: 'updateChildren'
+        },
+        activeColor: {
+            type: String,
+            observer: 'updateChildren'
+        },
+        inactiveColor: {
+            type: String,
+            observer: 'updateChildren'
+        },
+        fixed: {
+            type: Boolean,
+            value: true
+        },
+        border: {
+            type: Boolean,
+            value: true
+        },
+        zIndex: {
+            type: Number,
+            value: 1
+        },
+        safeAreaInsetBottom: {
+            type: Boolean,
+            value: true
+        }
+    },
+    beforeCreate() {
+        this.children = [];
+    },
+    methods: {
+        updateChildren() {
+            const { children } = this;
+            if (!Array.isArray(children) || !children.length) {
+                return Promise.resolve();
+            }
+            return Promise.all(children.map((child) => child.updateFromParent()));
+        },
+        onChange(child) {
+            const index = this.children.indexOf(child);
+            const active = child.data.name || index;
+            if (active !== this.data.active) {
+                this.$emit('change', active);
+            }
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/tabbar/index.json b/litemall-wx/lib/vant-weapp/tabbar/index.json
index 467ce294..efdc3c82 100644
--- a/litemall-wx/lib/vant-weapp/tabbar/index.json
+++ b/litemall-wx/lib/vant-weapp/tabbar/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
-}
+{
+  "component": true
+}
diff --git a/litemall-wx/lib/vant-weapp/tabbar/index.wxml b/litemall-wx/lib/vant-weapp/tabbar/index.wxml
index c49b9d98..b7b06e8e 100644
--- a/litemall-wx/lib/vant-weapp/tabbar/index.wxml
+++ b/litemall-wx/lib/vant-weapp/tabbar/index.wxml
@@ -1,8 +1,8 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view
-  class="custom-class {{ border ? 'van-hairline--top-bottom' : '' }} {{ utils.bem('tabbar', { fixed, safe: safeAreaInsetBottom }) }}"
-  style="{{ zIndex ? 'z-index: ' + zIndex : '' }}"
->
-  <slot />
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="custom-class {{ border ? 'van-hairline--top-bottom' : '' }} {{ utils.bem('tabbar', { fixed, safe: safeAreaInsetBottom }) }}"
+  style="{{ zIndex ? 'z-index: ' + zIndex : '' }}"
+>
+  <slot />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/tabs/index.d.ts b/litemall-wx/lib/vant-weapp/tabs/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/tabs/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/tabs/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/tabs/index.js b/litemall-wx/lib/vant-weapp/tabs/index.js
index 8ba4002e..5a92e09d 100644
--- a/litemall-wx/lib/vant-weapp/tabs/index.js
+++ b/litemall-wx/lib/vant-weapp/tabs/index.js
@@ -1,289 +1,289 @@
-import { VantComponent } from '../common/component';
-import { touch } from '../mixins/touch';
-import { isDef, addUnit } from '../common/utils';
-VantComponent({
-    mixins: [touch],
-    classes: ['nav-class', 'tab-class', 'tab-active-class', 'line-class'],
-    relation: {
-        name: 'tab',
-        type: 'descendant',
-        linked(target) {
-            target.index = this.children.length;
-            this.children.push(target);
-            this.updateTabs();
-        },
-        unlinked(target) {
-            this.children = this.children
-                .filter((child) => child !== target)
-                .map((child, index) => {
-                child.index = index;
-                return child;
-            });
-            this.updateTabs();
-        }
-    },
-    props: {
-        color: {
-            type: String,
-            observer: 'setLine'
-        },
-        sticky: Boolean,
-        animated: {
-            type: Boolean,
-            observer() {
-                this.setTrack();
-                this.children.forEach((child) => child.updateRender());
-            }
-        },
-        swipeable: Boolean,
-        lineWidth: {
-            type: [String, Number],
-            value: -1,
-            observer: 'setLine'
-        },
-        lineHeight: {
-            type: [String, Number],
-            value: -1,
-            observer: 'setLine'
-        },
-        titleActiveColor: String,
-        titleInactiveColor: String,
-        active: {
-            type: [String, Number],
-            value: 0,
-            observer(name) {
-                if (name !== this.getCurrentName()) {
-                    this.setCurrentIndexByName(name);
-                }
-            }
-        },
-        type: {
-            type: String,
-            value: 'line'
-        },
-        border: {
-            type: Boolean,
-            value: true
-        },
-        ellipsis: {
-            type: Boolean,
-            value: true
-        },
-        duration: {
-            type: Number,
-            value: 0.3
-        },
-        zIndex: {
-            type: Number,
-            value: 1
-        },
-        swipeThreshold: {
-            type: Number,
-            value: 4,
-            observer(value) {
-                this.setData({
-                    scrollable: this.children.length > value || !this.data.ellipsis
-                });
-            }
-        },
-        offsetTop: {
-            type: Number,
-            value: 0
-        },
-        lazyRender: {
-            type: Boolean,
-            value: true
-        },
-    },
-    data: {
-        tabs: [],
-        lineStyle: '',
-        scrollLeft: 0,
-        scrollable: false,
-        trackStyle: '',
-        currentIndex: null,
-        container: null
-    },
-    beforeCreate() {
-        this.children = [];
-    },
-    mounted() {
-        this.setData({
-            container: () => this.createSelectorQuery().select('.van-tabs')
-        });
-        this.setLine(true);
-        this.setTrack();
-        this.scrollIntoView();
-    },
-    methods: {
-        updateTabs() {
-            const { children = [], data } = this;
-            this.setData({
-                tabs: children.map((child) => child.data),
-                scrollable: this.children.length > data.swipeThreshold || !data.ellipsis
-            });
-            this.setCurrentIndexByName(this.getCurrentName() || data.active);
-        },
-        trigger(eventName) {
-            const { currentIndex } = this.data;
-            const child = this.children[currentIndex];
-            if (!isDef(child)) {
-                return;
-            }
-            this.$emit(eventName, {
-                index: currentIndex,
-                name: child.getComputedName(),
-                title: child.data.title
-            });
-        },
-        onTap(event) {
-            const { index } = event.currentTarget.dataset;
-            const child = this.children[index];
-            if (child.data.disabled) {
-                this.trigger('disabled');
-            }
-            else {
-                this.setCurrentIndex(index);
-                wx.nextTick(() => {
-                    this.trigger('click');
-                });
-            }
-        },
-        // correct the index of active tab
-        setCurrentIndexByName(name) {
-            const { children = [] } = this;
-            const matched = children.filter((child) => child.getComputedName() === name);
-            if (matched.length) {
-                this.setCurrentIndex(matched[0].index);
-            }
-        },
-        setCurrentIndex(currentIndex) {
-            const { data, children = [] } = this;
-            if (!isDef(currentIndex) ||
-                currentIndex >= children.length ||
-                currentIndex < 0) {
-                return;
-            }
-            children.forEach((item, index) => {
-                const active = index === currentIndex;
-                if (active !== item.data.active || !item.inited) {
-                    item.updateRender(active, this);
-                }
-            });
-            if (currentIndex === data.currentIndex) {
-                return;
-            }
-            const shouldEmitChange = data.currentIndex !== null;
-            this.setData({ currentIndex });
-            wx.nextTick(() => {
-                this.setLine();
-                this.setTrack();
-                this.scrollIntoView();
-                this.trigger('input');
-                if (shouldEmitChange) {
-                    this.trigger('change');
-                }
-            });
-        },
-        getCurrentName() {
-            const activeTab = this.children[this.data.currentIndex];
-            if (activeTab) {
-                return activeTab.getComputedName();
-            }
-        },
-        setLine(skipTransition) {
-            if (this.data.type !== 'line') {
-                return;
-            }
-            const { color, duration, currentIndex, lineWidth, lineHeight } = this.data;
-            this.getRect('.van-tab', true).then((rects = []) => {
-                const rect = rects[currentIndex];
-                if (rect == null) {
-                    return;
-                }
-                const width = lineWidth !== -1 ? lineWidth : rect.width / 2;
-                const height = lineHeight !== -1
-                    ? `height: ${addUnit(lineHeight)}; border-radius: ${addUnit(lineHeight)};`
-                    : '';
-                let left = rects
-                    .slice(0, currentIndex)
-                    .reduce((prev, curr) => prev + curr.width, 0);
-                left += (rect.width - width) / 2;
-                const transition = skipTransition
-                    ? ''
-                    : `transition-duration: ${duration}s; -webkit-transition-duration: ${duration}s;`;
-                this.setData({
-                    lineStyle: `
-            ${height}
-            width: ${addUnit(width)};
-            background-color: ${color};
-            -webkit-transform: translateX(${left}px);
-            transform: translateX(${left}px);
-            ${transition}
-          `
-                });
-            });
-        },
-        setTrack() {
-            const { animated, duration, currentIndex } = this.data;
-            if (!animated) {
-                return;
-            }
-            this.setData({
-                trackStyle: `
-          transform: translate3d(${-100 * currentIndex}%, 0, 0);
-          -webkit-transition-duration: ${duration}s;
-          transition-duration: ${duration}s;
-        `
-            });
-        },
-        // scroll active tab into view
-        scrollIntoView() {
-            const { currentIndex, scrollable } = this.data;
-            if (!scrollable) {
-                return;
-            }
-            Promise.all([
-                this.getRect('.van-tab', true),
-                this.getRect('.van-tabs__nav')
-            ]).then(([tabRects, navRect]) => {
-                const tabRect = tabRects[currentIndex];
-                const offsetLeft = tabRects
-                    .slice(0, currentIndex)
-                    .reduce((prev, curr) => prev + curr.width, 0);
-                this.setData({
-                    scrollLeft: offsetLeft - (navRect.width - tabRect.width) / 2
-                });
-            });
-        },
-        onTouchScroll(event) {
-            this.$emit('scroll', event.detail);
-        },
-        onTouchStart(event) {
-            if (!this.data.swipeable)
-                return;
-            this.touchStart(event);
-        },
-        onTouchMove(event) {
-            if (!this.data.swipeable)
-                return;
-            this.touchMove(event);
-        },
-        // watch swipe touch end
-        onTouchEnd() {
-            if (!this.data.swipeable)
-                return;
-            const { tabs, currentIndex } = this.data;
-            const { direction, deltaX, offsetX } = this;
-            const minSwipeDistance = 50;
-            if (direction === 'horizontal' && offsetX >= minSwipeDistance) {
-                if (deltaX > 0 && currentIndex !== 0) {
-                    this.setCurrentIndex(currentIndex - 1);
-                }
-                else if (deltaX < 0 && currentIndex !== tabs.length - 1) {
-                    this.setCurrentIndex(currentIndex + 1);
-                }
-            }
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { touch } from '../mixins/touch';
+import { isDef, addUnit } from '../common/utils';
+VantComponent({
+    mixins: [touch],
+    classes: ['nav-class', 'tab-class', 'tab-active-class', 'line-class'],
+    relation: {
+        name: 'tab',
+        type: 'descendant',
+        linked(target) {
+            target.index = this.children.length;
+            this.children.push(target);
+            this.updateTabs();
+        },
+        unlinked(target) {
+            this.children = this.children
+                .filter((child) => child !== target)
+                .map((child, index) => {
+                child.index = index;
+                return child;
+            });
+            this.updateTabs();
+        }
+    },
+    props: {
+        color: {
+            type: String,
+            observer: 'setLine'
+        },
+        sticky: Boolean,
+        animated: {
+            type: Boolean,
+            observer() {
+                this.setTrack();
+                this.children.forEach((child) => child.updateRender());
+            }
+        },
+        swipeable: Boolean,
+        lineWidth: {
+            type: [String, Number],
+            value: -1,
+            observer: 'setLine'
+        },
+        lineHeight: {
+            type: [String, Number],
+            value: -1,
+            observer: 'setLine'
+        },
+        titleActiveColor: String,
+        titleInactiveColor: String,
+        active: {
+            type: [String, Number],
+            value: 0,
+            observer(name) {
+                if (name !== this.getCurrentName()) {
+                    this.setCurrentIndexByName(name);
+                }
+            }
+        },
+        type: {
+            type: String,
+            value: 'line'
+        },
+        border: {
+            type: Boolean,
+            value: true
+        },
+        ellipsis: {
+            type: Boolean,
+            value: true
+        },
+        duration: {
+            type: Number,
+            value: 0.3
+        },
+        zIndex: {
+            type: Number,
+            value: 1
+        },
+        swipeThreshold: {
+            type: Number,
+            value: 4,
+            observer(value) {
+                this.setData({
+                    scrollable: this.children.length > value || !this.data.ellipsis
+                });
+            }
+        },
+        offsetTop: {
+            type: Number,
+            value: 0
+        },
+        lazyRender: {
+            type: Boolean,
+            value: true
+        },
+    },
+    data: {
+        tabs: [],
+        lineStyle: '',
+        scrollLeft: 0,
+        scrollable: false,
+        trackStyle: '',
+        currentIndex: null,
+        container: null
+    },
+    beforeCreate() {
+        this.children = [];
+    },
+    mounted() {
+        this.setData({
+            container: () => this.createSelectorQuery().select('.van-tabs')
+        });
+        this.setLine(true);
+        this.setTrack();
+        this.scrollIntoView();
+    },
+    methods: {
+        updateTabs() {
+            const { children = [], data } = this;
+            this.setData({
+                tabs: children.map((child) => child.data),
+                scrollable: this.children.length > data.swipeThreshold || !data.ellipsis
+            });
+            this.setCurrentIndexByName(this.getCurrentName() || data.active);
+        },
+        trigger(eventName) {
+            const { currentIndex } = this.data;
+            const child = this.children[currentIndex];
+            if (!isDef(child)) {
+                return;
+            }
+            this.$emit(eventName, {
+                index: currentIndex,
+                name: child.getComputedName(),
+                title: child.data.title
+            });
+        },
+        onTap(event) {
+            const { index } = event.currentTarget.dataset;
+            const child = this.children[index];
+            if (child.data.disabled) {
+                this.trigger('disabled');
+            }
+            else {
+                this.setCurrentIndex(index);
+                wx.nextTick(() => {
+                    this.trigger('click');
+                });
+            }
+        },
+        // correct the index of active tab
+        setCurrentIndexByName(name) {
+            const { children = [] } = this;
+            const matched = children.filter((child) => child.getComputedName() === name);
+            if (matched.length) {
+                this.setCurrentIndex(matched[0].index);
+            }
+        },
+        setCurrentIndex(currentIndex) {
+            const { data, children = [] } = this;
+            if (!isDef(currentIndex) ||
+                currentIndex >= children.length ||
+                currentIndex < 0) {
+                return;
+            }
+            children.forEach((item, index) => {
+                const active = index === currentIndex;
+                if (active !== item.data.active || !item.inited) {
+                    item.updateRender(active, this);
+                }
+            });
+            if (currentIndex === data.currentIndex) {
+                return;
+            }
+            const shouldEmitChange = data.currentIndex !== null;
+            this.setData({ currentIndex });
+            wx.nextTick(() => {
+                this.setLine();
+                this.setTrack();
+                this.scrollIntoView();
+                this.trigger('input');
+                if (shouldEmitChange) {
+                    this.trigger('change');
+                }
+            });
+        },
+        getCurrentName() {
+            const activeTab = this.children[this.data.currentIndex];
+            if (activeTab) {
+                return activeTab.getComputedName();
+            }
+        },
+        setLine(skipTransition) {
+            if (this.data.type !== 'line') {
+                return;
+            }
+            const { color, duration, currentIndex, lineWidth, lineHeight } = this.data;
+            this.getRect('.van-tab', true).then((rects = []) => {
+                const rect = rects[currentIndex];
+                if (rect == null) {
+                    return;
+                }
+                const width = lineWidth !== -1 ? lineWidth : rect.width / 2;
+                const height = lineHeight !== -1
+                    ? `height: ${addUnit(lineHeight)}; border-radius: ${addUnit(lineHeight)};`
+                    : '';
+                let left = rects
+                    .slice(0, currentIndex)
+                    .reduce((prev, curr) => prev + curr.width, 0);
+                left += (rect.width - width) / 2;
+                const transition = skipTransition
+                    ? ''
+                    : `transition-duration: ${duration}s; -webkit-transition-duration: ${duration}s;`;
+                this.setData({
+                    lineStyle: `
+            ${height}
+            width: ${addUnit(width)};
+            background-color: ${color};
+            -webkit-transform: translateX(${left}px);
+            transform: translateX(${left}px);
+            ${transition}
+          `
+                });
+            });
+        },
+        setTrack() {
+            const { animated, duration, currentIndex } = this.data;
+            if (!animated) {
+                return;
+            }
+            this.setData({
+                trackStyle: `
+          transform: translate3d(${-100 * currentIndex}%, 0, 0);
+          -webkit-transition-duration: ${duration}s;
+          transition-duration: ${duration}s;
+        `
+            });
+        },
+        // scroll active tab into view
+        scrollIntoView() {
+            const { currentIndex, scrollable } = this.data;
+            if (!scrollable) {
+                return;
+            }
+            Promise.all([
+                this.getRect('.van-tab', true),
+                this.getRect('.van-tabs__nav')
+            ]).then(([tabRects, navRect]) => {
+                const tabRect = tabRects[currentIndex];
+                const offsetLeft = tabRects
+                    .slice(0, currentIndex)
+                    .reduce((prev, curr) => prev + curr.width, 0);
+                this.setData({
+                    scrollLeft: offsetLeft - (navRect.width - tabRect.width) / 2
+                });
+            });
+        },
+        onTouchScroll(event) {
+            this.$emit('scroll', event.detail);
+        },
+        onTouchStart(event) {
+            if (!this.data.swipeable)
+                return;
+            this.touchStart(event);
+        },
+        onTouchMove(event) {
+            if (!this.data.swipeable)
+                return;
+            this.touchMove(event);
+        },
+        // watch swipe touch end
+        onTouchEnd() {
+            if (!this.data.swipeable)
+                return;
+            const { tabs, currentIndex } = this.data;
+            const { direction, deltaX, offsetX } = this;
+            const minSwipeDistance = 50;
+            if (direction === 'horizontal' && offsetX >= minSwipeDistance) {
+                if (deltaX > 0 && currentIndex !== 0) {
+                    this.setCurrentIndex(currentIndex - 1);
+                }
+                else if (deltaX < 0 && currentIndex !== tabs.length - 1) {
+                    this.setCurrentIndex(currentIndex + 1);
+                }
+            }
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/tabs/index.json b/litemall-wx/lib/vant-weapp/tabs/index.json
index 19c0bc3a..7bf32aac 100644
--- a/litemall-wx/lib/vant-weapp/tabs/index.json
+++ b/litemall-wx/lib/vant-weapp/tabs/index.json
@@ -1,7 +1,7 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-info": "../info/index",
-    "van-sticky": "../sticky/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-info": "../info/index",
+    "van-sticky": "../sticky/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/tabs/index.wxml b/litemall-wx/lib/vant-weapp/tabs/index.wxml
index ed8f0d9c..8ce78f32 100644
--- a/litemall-wx/lib/vant-weapp/tabs/index.wxml
+++ b/litemall-wx/lib/vant-weapp/tabs/index.wxml
@@ -1,60 +1,60 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-<wxs src="./index.wxs" module="getters" />
-
-<view class="custom-class {{ utils.bem('tabs', [type]) }}">
-  <van-sticky
-    disabled="{{ !sticky }}"
-    z-index="{{ zIndex }}"
-    offset-top="{{ offsetTop }}"
-    container="{{ container }}"
-    bind:scroll="onTouchScroll"
-  >
-    <view class="{{ utils.bem('tabs__wrap', { scrollable }) }} {{ type === 'line' && border ? 'van-hairline--top-bottom' : '' }}">
-      <slot name="nav-left" />
-
-      <scroll-view
-        scroll-x="{{ scrollable }}"
-        scroll-with-animation
-        scroll-left="{{ scrollLeft }}"
-        class="{{ utils.bem('tabs__scroll', [type]) }}"
-        style="{{ color ? 'border-color: ' + color : '' }}"
-      >
-        <view class="{{ utils.bem('tabs__nav', [type]) }} nav-class">
-          <view wx:if="{{ type === 'line' }}" class="van-tabs__line" style="{{ lineStyle }}" />
-          <view
-            wx:for="{{ tabs }}"
-            wx:key="index"
-            data-index="{{ index }}"
-            class="{{ getters.tabClass(index === currentIndex, ellipsis) }} {{ utils.bem('tab', { active: index === currentIndex, disabled: item.disabled, complete: !ellipsis }) }}"
-            style="{{ getters.tabStyle(index === currentIndex, ellipsis, color, type, item.disabled, titleActiveColor, titleInactiveColor, swipeThreshold, scrollable) }}"
-            bind:tap="onTap"
-          >
-            <view class="{{ ellipsis ? 'van-ellipsis' : '' }}" style="{{ item.titleStyle }}">
-              {{ item.title }}
-              <van-info
-                wx:if="{{ item.info !== null || item.dot }}"
-                info="{{ item.info }}"
-                dot="{{ item.dot }}"
-                custom-class="van-tab__title__info"
-              />
-            </view>
-          </view>
-        </view>
-      </scroll-view>
-
-      <slot name="nav-right" />
-    </view>
-  </van-sticky>
-
-  <view
-    class="van-tabs__content"
-    bind:touchstart="onTouchStart"
-    bind:touchmove="onTouchMove"
-    bind:touchend="onTouchEnd"
-    bind:touchcancel="onTouchEnd"
-  >
-    <view class="{{ utils.bem('tabs__track', [{ animated }]) }} van-tabs__track" style="{{ trackStyle }}">
-      <slot />
-    </view>
-  </view>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="getters" />
+
+<view class="custom-class {{ utils.bem('tabs', [type]) }}">
+  <van-sticky
+    disabled="{{ !sticky }}"
+    z-index="{{ zIndex }}"
+    offset-top="{{ offsetTop }}"
+    container="{{ container }}"
+    bind:scroll="onTouchScroll"
+  >
+    <view class="{{ utils.bem('tabs__wrap', { scrollable }) }} {{ type === 'line' && border ? 'van-hairline--top-bottom' : '' }}">
+      <slot name="nav-left" />
+
+      <scroll-view
+        scroll-x="{{ scrollable }}"
+        scroll-with-animation
+        scroll-left="{{ scrollLeft }}"
+        class="{{ utils.bem('tabs__scroll', [type]) }}"
+        style="{{ color ? 'border-color: ' + color : '' }}"
+      >
+        <view class="{{ utils.bem('tabs__nav', [type]) }} nav-class">
+          <view wx:if="{{ type === 'line' }}" class="van-tabs__line" style="{{ lineStyle }}" />
+          <view
+            wx:for="{{ tabs }}"
+            wx:key="index"
+            data-index="{{ index }}"
+            class="{{ getters.tabClass(index === currentIndex, ellipsis) }} {{ utils.bem('tab', { active: index === currentIndex, disabled: item.disabled, complete: !ellipsis }) }}"
+            style="{{ getters.tabStyle(index === currentIndex, ellipsis, color, type, item.disabled, titleActiveColor, titleInactiveColor, swipeThreshold, scrollable) }}"
+            bind:tap="onTap"
+          >
+            <view class="{{ ellipsis ? 'van-ellipsis' : '' }}" style="{{ item.titleStyle }}">
+              {{ item.title }}
+              <van-info
+                wx:if="{{ item.info !== null || item.dot }}"
+                info="{{ item.info }}"
+                dot="{{ item.dot }}"
+                custom-class="van-tab__title__info"
+              />
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+
+      <slot name="nav-right" />
+    </view>
+  </van-sticky>
+
+  <view
+    class="van-tabs__content"
+    bind:touchstart="onTouchStart"
+    bind:touchmove="onTouchMove"
+    bind:touchend="onTouchEnd"
+    bind:touchcancel="onTouchEnd"
+  >
+    <view class="{{ utils.bem('tabs__track', [{ animated }]) }} van-tabs__track" style="{{ trackStyle }}">
+      <slot />
+    </view>
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/tabs/index.wxs b/litemall-wx/lib/vant-weapp/tabs/index.wxs
index aa117ce7..aeb12e9b 100644
--- a/litemall-wx/lib/vant-weapp/tabs/index.wxs
+++ b/litemall-wx/lib/vant-weapp/tabs/index.wxs
@@ -1,55 +1,55 @@
-/* eslint-disable */
-function tabClass(active, ellipsis) {
-  var classes = ['tab-class'];
-
-  if (active) {
-    classes.push('tab-active-class');
-  }
-
-  if (ellipsis) {
-    classes.push('van-ellipsis');
-  }
-
-  return classes.join(' ');
-}
-
-function tabStyle(
-  active,
-  ellipsis,
-  color,
-  type,
-  disabled,
-  activeColor,
-  inactiveColor,
-  swipeThreshold,
-  scrollable
-) {
-  var styles = [];
-  var isCard = type === 'card';
-  // card theme color
-  if (color && isCard) {
-    styles.push('border-color:' + color);
-
-    if (!disabled) {
-      if (active) {
-        styles.push('background-color:' + color);
-      } else {
-        styles.push('color:' + color);
-      }
-    }
-  }
-
-  var titleColor = active ? activeColor : inactiveColor;
-  if (titleColor) {
-    styles.push('color:' + titleColor);
-  }
-
-  if (scrollable && ellipsis) {
-    styles.push('flex-basis:' + 88 / swipeThreshold + '%');
-  }
-
-  return styles.join(';');
-}
-
-module.exports.tabClass = tabClass;
-module.exports.tabStyle = tabStyle;
+/* eslint-disable */
+function tabClass(active, ellipsis) {
+  var classes = ['tab-class'];
+
+  if (active) {
+    classes.push('tab-active-class');
+  }
+
+  if (ellipsis) {
+    classes.push('van-ellipsis');
+  }
+
+  return classes.join(' ');
+}
+
+function tabStyle(
+  active,
+  ellipsis,
+  color,
+  type,
+  disabled,
+  activeColor,
+  inactiveColor,
+  swipeThreshold,
+  scrollable
+) {
+  var styles = [];
+  var isCard = type === 'card';
+  // card theme color
+  if (color && isCard) {
+    styles.push('border-color:' + color);
+
+    if (!disabled) {
+      if (active) {
+        styles.push('background-color:' + color);
+      } else {
+        styles.push('color:' + color);
+      }
+    }
+  }
+
+  var titleColor = active ? activeColor : inactiveColor;
+  if (titleColor) {
+    styles.push('color:' + titleColor);
+  }
+
+  if (scrollable && ellipsis) {
+    styles.push('flex-basis:' + 88 / swipeThreshold + '%');
+  }
+
+  return styles.join(';');
+}
+
+module.exports.tabClass = tabClass;
+module.exports.tabStyle = tabStyle;
diff --git a/litemall-wx/lib/vant-weapp/tag/index.d.ts b/litemall-wx/lib/vant-weapp/tag/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/tag/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/tag/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/tag/index.js b/litemall-wx/lib/vant-weapp/tag/index.js
index 093acb56..1295e4e2 100644
--- a/litemall-wx/lib/vant-weapp/tag/index.js
+++ b/litemall-wx/lib/vant-weapp/tag/index.js
@@ -1,21 +1,21 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    props: {
-        size: String,
-        mark: Boolean,
-        color: String,
-        plain: Boolean,
-        round: Boolean,
-        textColor: String,
-        type: {
-            type: String,
-            value: 'default'
-        },
-        closeable: Boolean
-    },
-    methods: {
-        onClose() {
-            this.$emit('close');
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    props: {
+        size: String,
+        mark: Boolean,
+        color: String,
+        plain: Boolean,
+        round: Boolean,
+        textColor: String,
+        type: {
+            type: String,
+            value: 'default'
+        },
+        closeable: Boolean
+    },
+    methods: {
+        onClose() {
+            this.$emit('close');
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/tag/index.json b/litemall-wx/lib/vant-weapp/tag/index.json
index 32640e0d..1edff938 100644
--- a/litemall-wx/lib/vant-weapp/tag/index.json
+++ b/litemall-wx/lib/vant-weapp/tag/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
+{
+  "component": true
 }
\ No newline at end of file
diff --git a/litemall-wx/lib/vant-weapp/tag/index.wxml b/litemall-wx/lib/vant-weapp/tag/index.wxml
index 8c786865..a7de30e9 100644
--- a/litemall-wx/lib/vant-weapp/tag/index.wxml
+++ b/litemall-wx/lib/vant-weapp/tag/index.wxml
@@ -1,14 +1,14 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view
-  class="custom-class {{ utils.bem('tag', [type, size, { mark, plain, round }]) }} {{ plain ? 'van-hairline--surround' : '' }}"
-  style="{{ color && !plain ? 'background-color: ' + color + ';' : '' }}{{ textColor || (color && plain) ? 'color: ' + (textColor || color) : '' }}"
->
-  <slot />
-  <van-icon
-    wx:if="{{ closeable }}"
-    name="cross"
-    custom-class="van-tag__close"
-    bind:click="onClose"
-  />
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="custom-class {{ utils.bem('tag', [type, size, { mark, plain, round }]) }} {{ plain ? 'van-hairline--surround' : '' }}"
+  style="{{ color && !plain ? 'background-color: ' + color + ';' : '' }}{{ textColor || (color && plain) ? 'color: ' + (textColor || color) : '' }}"
+>
+  <slot />
+  <van-icon
+    wx:if="{{ closeable }}"
+    name="cross"
+    custom-class="van-tag__close"
+    bind:click="onClose"
+  />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/toast/index.d.ts b/litemall-wx/lib/vant-weapp/toast/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/toast/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/toast/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/toast/index.js b/litemall-wx/lib/vant-weapp/toast/index.js
index a9fe1629..203cc557 100644
--- a/litemall-wx/lib/vant-weapp/toast/index.js
+++ b/litemall-wx/lib/vant-weapp/toast/index.js
@@ -1,29 +1,29 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-    props: {
-        show: Boolean,
-        mask: Boolean,
-        message: String,
-        forbidClick: Boolean,
-        zIndex: {
-            type: Number,
-            value: 1000
-        },
-        type: {
-            type: String,
-            value: 'text'
-        },
-        loadingType: {
-            type: String,
-            value: 'circular'
-        },
-        position: {
-            type: String,
-            value: 'middle'
-        }
-    },
-    methods: {
-        // for prevent touchmove
-        noop() { }
-    }
-});
+import { VantComponent } from '../common/component';
+VantComponent({
+    props: {
+        show: Boolean,
+        mask: Boolean,
+        message: String,
+        forbidClick: Boolean,
+        zIndex: {
+            type: Number,
+            value: 1000
+        },
+        type: {
+            type: String,
+            value: 'text'
+        },
+        loadingType: {
+            type: String,
+            value: 'circular'
+        },
+        position: {
+            type: String,
+            value: 'middle'
+        }
+    },
+    methods: {
+        // for prevent touchmove
+        noop() { }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/toast/index.json b/litemall-wx/lib/vant-weapp/toast/index.json
index 9b1b78c4..5971bb1a 100644
--- a/litemall-wx/lib/vant-weapp/toast/index.json
+++ b/litemall-wx/lib/vant-weapp/toast/index.json
@@ -1,9 +1,9 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index",
-    "van-loading": "../loading/index",
-    "van-overlay": "../overlay/index",
-    "van-transition": "../transition/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-loading": "../loading/index",
+    "van-overlay": "../overlay/index",
+    "van-transition": "../transition/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/toast/index.wxml b/litemall-wx/lib/vant-weapp/toast/index.wxml
index 635e7d61..6a53bda8 100644
--- a/litemall-wx/lib/vant-weapp/toast/index.wxml
+++ b/litemall-wx/lib/vant-weapp/toast/index.wxml
@@ -1,33 +1,33 @@
-<van-overlay
-  wx:if="{{ mask || forbidClick }}"
-  show="{{ show }}"
-  z-index="{{ zIndex }}"
-  custom-style="{{ mask ? '' : 'background-color: transparent;' }}"
-/>
-<van-transition
-  show="{{ show }}"
-  custom-style="z-index: {{ zIndex }}"
-  custom-class="van-toast__container"
->
-  <view
-    class="van-toast van-toast--{{ type === 'text' ? 'text' : 'icon' }} van-toast--{{ position }}"
-    catch:touchmove="noop"
-  >
-    <!-- text only -->
-    <text wx:if="{{ type === 'text' }}">{{ message }}</text>
-
-    <!-- with icon -->
-    <block wx:else>
-      <van-loading
-        wx:if="{{ type === 'loading' }}"
-        color="white"
-        type="{{ loadingType }}"
-        custom-class="van-toast__loading"
-      />
-      <van-icon wx:else class="van-toast__icon" name="{{ type }}" />
-      <text wx:if="{{ message }}" class="van-toast__text">{{ message }}</text>
-    </block>
-
-    <slot />
-  </view>
-</van-transition>
+<van-overlay
+  wx:if="{{ mask || forbidClick }}"
+  show="{{ show }}"
+  z-index="{{ zIndex }}"
+  custom-style="{{ mask ? '' : 'background-color: transparent;' }}"
+/>
+<van-transition
+  show="{{ show }}"
+  custom-style="z-index: {{ zIndex }}"
+  custom-class="van-toast__container"
+>
+  <view
+    class="van-toast van-toast--{{ type === 'text' ? 'text' : 'icon' }} van-toast--{{ position }}"
+    catch:touchmove="noop"
+  >
+    <!-- text only -->
+    <text wx:if="{{ type === 'text' }}">{{ message }}</text>
+
+    <!-- with icon -->
+    <block wx:else>
+      <van-loading
+        wx:if="{{ type === 'loading' }}"
+        color="white"
+        type="{{ loadingType }}"
+        custom-class="van-toast__loading"
+      />
+      <van-icon wx:else class="van-toast__icon" name="{{ type }}" />
+      <text wx:if="{{ message }}" class="van-toast__text">{{ message }}</text>
+    </block>
+
+    <slot />
+  </view>
+</van-transition>
diff --git a/litemall-wx/lib/vant-weapp/toast/toast.d.ts b/litemall-wx/lib/vant-weapp/toast/toast.d.ts
index f7148a03..2d21ed3a 100644
--- a/litemall-wx/lib/vant-weapp/toast/toast.d.ts
+++ b/litemall-wx/lib/vant-weapp/toast/toast.d.ts
@@ -1,26 +1,26 @@
-/// <reference types="miniprogram-api-typings" />
-declare type ToastMessage = string | number;
-interface ToastOptions {
-    show?: boolean;
-    type?: string;
-    mask?: boolean;
-    zIndex?: number;
-    context?: WechatMiniprogram.Component.TrivialInstance | WechatMiniprogram.Page.TrivialInstance;
-    position?: string;
-    duration?: number;
-    selector?: string;
-    forbidClick?: boolean;
-    loadingType?: string;
-    message?: ToastMessage;
-    onClose?: () => void;
-}
-declare function Toast(toastOptions: ToastOptions | ToastMessage): WechatMiniprogram.Component.TrivialInstance;
-declare namespace Toast {
-    var loading: (options: string | number | ToastOptions) => WechatMiniprogram.Component.Instance<Record<string, any>, Record<string, any>, Record<string, any>>;
-    var success: (options: string | number | ToastOptions) => WechatMiniprogram.Component.Instance<Record<string, any>, Record<string, any>, Record<string, any>>;
-    var fail: (options: string | number | ToastOptions) => WechatMiniprogram.Component.Instance<Record<string, any>, Record<string, any>, Record<string, any>>;
-    var clear: () => void;
-    var setDefaultOptions: (options: ToastOptions) => void;
-    var resetDefaultOptions: () => void;
-}
-export default Toast;
+/// <reference types="miniprogram-api-typings" />
+declare type ToastMessage = string | number;
+interface ToastOptions {
+    show?: boolean;
+    type?: string;
+    mask?: boolean;
+    zIndex?: number;
+    context?: WechatMiniprogram.Component.TrivialInstance | WechatMiniprogram.Page.TrivialInstance;
+    position?: string;
+    duration?: number;
+    selector?: string;
+    forbidClick?: boolean;
+    loadingType?: string;
+    message?: ToastMessage;
+    onClose?: () => void;
+}
+declare function Toast(toastOptions: ToastOptions | ToastMessage): WechatMiniprogram.Component.TrivialInstance;
+declare namespace Toast {
+    var loading: (options: string | number | ToastOptions) => WechatMiniprogram.Component.Instance<Record<string, any>, Record<string, any>, Record<string, any>>;
+    var success: (options: string | number | ToastOptions) => WechatMiniprogram.Component.Instance<Record<string, any>, Record<string, any>, Record<string, any>>;
+    var fail: (options: string | number | ToastOptions) => WechatMiniprogram.Component.Instance<Record<string, any>, Record<string, any>, Record<string, any>>;
+    var clear: () => void;
+    var setDefaultOptions: (options: ToastOptions) => void;
+    var resetDefaultOptions: () => void;
+}
+export default Toast;
diff --git a/litemall-wx/lib/vant-weapp/toast/toast.js b/litemall-wx/lib/vant-weapp/toast/toast.js
index ed5a8943..400154fe 100644
--- a/litemall-wx/lib/vant-weapp/toast/toast.js
+++ b/litemall-wx/lib/vant-weapp/toast/toast.js
@@ -1,66 +1,66 @@
-import { isObj } from '../common/utils';
-const defaultOptions = {
-    type: 'text',
-    mask: false,
-    message: '',
-    show: true,
-    zIndex: 1000,
-    duration: 2000,
-    position: 'middle',
-    forbidClick: false,
-    loadingType: 'circular',
-    selector: '#van-toast'
-};
-let queue = [];
-let currentOptions = Object.assign({}, defaultOptions);
-function parseOptions(message) {
-    return isObj(message) ? message : { message };
-}
-function getContext() {
-    const pages = getCurrentPages();
-    return pages[pages.length - 1];
-}
-function Toast(toastOptions) {
-    const options = Object.assign(Object.assign({}, currentOptions), parseOptions(toastOptions));
-    const context = options.context || getContext();
-    const toast = context.selectComponent(options.selector);
-    if (!toast) {
-        console.warn('未找到 van-toast 节点，请确认 selector 及 context 是否正确');
-        return;
-    }
-    delete options.context;
-    delete options.selector;
-    toast.clear = () => {
-        toast.setData({ show: false });
-        if (options.onClose) {
-            options.onClose();
-        }
-    };
-    queue.push(toast);
-    toast.setData(options);
-    clearTimeout(toast.timer);
-    if (options.duration > 0) {
-        toast.timer = setTimeout(() => {
-            toast.clear();
-            queue = queue.filter(item => item !== toast);
-        }, options.duration);
-    }
-    return toast;
-}
-const createMethod = (type) => (options) => Toast(Object.assign({ type }, parseOptions(options)));
-Toast.loading = createMethod('loading');
-Toast.success = createMethod('success');
-Toast.fail = createMethod('fail');
-Toast.clear = () => {
-    queue.forEach(toast => {
-        toast.clear();
-    });
-    queue = [];
-};
-Toast.setDefaultOptions = (options) => {
-    Object.assign(currentOptions, options);
-};
-Toast.resetDefaultOptions = () => {
-    currentOptions = Object.assign({}, defaultOptions);
-};
-export default Toast;
+import { isObj } from '../common/utils';
+const defaultOptions = {
+    type: 'text',
+    mask: false,
+    message: '',
+    show: true,
+    zIndex: 1000,
+    duration: 2000,
+    position: 'middle',
+    forbidClick: false,
+    loadingType: 'circular',
+    selector: '#van-toast'
+};
+let queue = [];
+let currentOptions = Object.assign({}, defaultOptions);
+function parseOptions(message) {
+    return isObj(message) ? message : { message };
+}
+function getContext() {
+    const pages = getCurrentPages();
+    return pages[pages.length - 1];
+}
+function Toast(toastOptions) {
+    const options = Object.assign(Object.assign({}, currentOptions), parseOptions(toastOptions));
+    const context = options.context || getContext();
+    const toast = context.selectComponent(options.selector);
+    if (!toast) {
+        console.warn('未找到 van-toast 节点，请确认 selector 及 context 是否正确');
+        return;
+    }
+    delete options.context;
+    delete options.selector;
+    toast.clear = () => {
+        toast.setData({ show: false });
+        if (options.onClose) {
+            options.onClose();
+        }
+    };
+    queue.push(toast);
+    toast.setData(options);
+    clearTimeout(toast.timer);
+    if (options.duration > 0) {
+        toast.timer = setTimeout(() => {
+            toast.clear();
+            queue = queue.filter(item => item !== toast);
+        }, options.duration);
+    }
+    return toast;
+}
+const createMethod = (type) => (options) => Toast(Object.assign({ type }, parseOptions(options)));
+Toast.loading = createMethod('loading');
+Toast.success = createMethod('success');
+Toast.fail = createMethod('fail');
+Toast.clear = () => {
+    queue.forEach(toast => {
+        toast.clear();
+    });
+    queue = [];
+};
+Toast.setDefaultOptions = (options) => {
+    Object.assign(currentOptions, options);
+};
+Toast.resetDefaultOptions = () => {
+    currentOptions = Object.assign({}, defaultOptions);
+};
+export default Toast;
diff --git a/litemall-wx/lib/vant-weapp/transition/index.d.ts b/litemall-wx/lib/vant-weapp/transition/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/transition/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/transition/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/transition/index.js b/litemall-wx/lib/vant-weapp/transition/index.js
index a920f1f2..58d186d7 100644
--- a/litemall-wx/lib/vant-weapp/transition/index.js
+++ b/litemall-wx/lib/vant-weapp/transition/index.js
@@ -1,13 +1,13 @@
-import { VantComponent } from '../common/component';
-import { transition } from '../mixins/transition';
-VantComponent({
-    classes: [
-        'enter-class',
-        'enter-active-class',
-        'enter-to-class',
-        'leave-class',
-        'leave-active-class',
-        'leave-to-class'
-    ],
-    mixins: [transition(true)]
-});
+import { VantComponent } from '../common/component';
+import { transition } from '../mixins/transition';
+VantComponent({
+    classes: [
+        'enter-class',
+        'enter-active-class',
+        'enter-to-class',
+        'leave-class',
+        'leave-active-class',
+        'leave-to-class'
+    ],
+    mixins: [transition(true)]
+});
diff --git a/litemall-wx/lib/vant-weapp/transition/index.json b/litemall-wx/lib/vant-weapp/transition/index.json
index 32640e0d..1edff938 100644
--- a/litemall-wx/lib/vant-weapp/transition/index.json
+++ b/litemall-wx/lib/vant-weapp/transition/index.json
@@ -1,3 +1,3 @@
-{
-  "component": true
+{
+  "component": true
 }
\ No newline at end of file
diff --git a/litemall-wx/lib/vant-weapp/transition/index.wxml b/litemall-wx/lib/vant-weapp/transition/index.wxml
index 412e8afc..c8e6ca8e 100644
--- a/litemall-wx/lib/vant-weapp/transition/index.wxml
+++ b/litemall-wx/lib/vant-weapp/transition/index.wxml
@@ -1,8 +1,8 @@
-<view
-  wx:if="{{ inited }}"
-  class="van-transition custom-class {{ classes }}"
-  style="-webkit-transition-duration:{{ currentDuration }}ms; transition-duration:{{ currentDuration }}ms; {{ display ? '' : 'display: none;' }} {{ customStyle }}"
-  bind:transitionend="onTransitionEnd"
->
-  <slot />
-</view>
+<view
+  wx:if="{{ inited }}"
+  class="van-transition custom-class {{ classes }}"
+  style="-webkit-transition-duration:{{ currentDuration }}ms; transition-duration:{{ currentDuration }}ms; {{ display ? '' : 'display: none;' }} {{ customStyle }}"
+  bind:transitionend="onTransitionEnd"
+>
+  <slot />
+</view>
diff --git a/litemall-wx/lib/vant-weapp/tree-select/index.d.ts b/litemall-wx/lib/vant-weapp/tree-select/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/tree-select/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/tree-select/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/tree-select/index.js b/litemall-wx/lib/vant-weapp/tree-select/index.js
index bf824107..79de9ce2 100644
--- a/litemall-wx/lib/vant-weapp/tree-select/index.js
+++ b/litemall-wx/lib/vant-weapp/tree-select/index.js
@@ -1,74 +1,74 @@
-import { VantComponent } from '../common/component';
-import { addUnit } from '../common/utils';
-VantComponent({
-    classes: [
-        'main-item-class',
-        'content-item-class',
-        'main-active-class',
-        'content-active-class',
-        'main-disabled-class',
-        'content-disabled-class'
-    ],
-    props: {
-        items: {
-            type: Array,
-            observer: 'updateSubItems'
-        },
-        activeId: null,
-        mainActiveIndex: {
-            type: Number,
-            value: 0,
-            observer: 'updateSubItems'
-        },
-        height: {
-            type: [Number, String],
-            value: 300,
-            observer: 'updateHeight'
-        },
-        max: {
-            type: Number,
-            value: Infinity
-        }
-    },
-    data: {
-        subItems: []
-    },
-    created() {
-        this.updateHeight();
-    },
-    methods: {
-        // 当一个子项被选择时
-        onSelectItem(event) {
-            const { item } = event.currentTarget.dataset;
-            const isArray = Array.isArray(this.data.activeId);
-            // 判断有没有超出右侧选择的最大数
-            const isOverMax = isArray && this.data.activeId.length >= this.data.max;
-            // 判断该项有没有被选中, 如果有被选中，则忽视是否超出的条件
-            const isSelected = isArray
-                ? this.data.activeId.indexOf(item.id) > -1
-                : this.data.activeId === item.id;
-            if (!item.disabled && (!isOverMax || isSelected)) {
-                this.$emit('click-item', item);
-            }
-        },
-        // 当一个导航被点击时
-        onClickNav(event) {
-            const index = event.detail;
-            const item = this.data.items[index];
-            if (!item.disabled) {
-                this.$emit('click-nav', { index });
-            }
-        },
-        // 更新子项列表
-        updateSubItems() {
-            const { items, mainActiveIndex } = this.data;
-            const { children = [] } = items[mainActiveIndex] || {};
-            return this.set({ subItems: children });
-        },
-        updateHeight() {
-            this.setData({
-                innerHeight: addUnit(this.data.height)
-            });
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { addUnit } from '../common/utils';
+VantComponent({
+    classes: [
+        'main-item-class',
+        'content-item-class',
+        'main-active-class',
+        'content-active-class',
+        'main-disabled-class',
+        'content-disabled-class'
+    ],
+    props: {
+        items: {
+            type: Array,
+            observer: 'updateSubItems'
+        },
+        activeId: null,
+        mainActiveIndex: {
+            type: Number,
+            value: 0,
+            observer: 'updateSubItems'
+        },
+        height: {
+            type: [Number, String],
+            value: 300,
+            observer: 'updateHeight'
+        },
+        max: {
+            type: Number,
+            value: Infinity
+        }
+    },
+    data: {
+        subItems: []
+    },
+    created() {
+        this.updateHeight();
+    },
+    methods: {
+        // 当一个子项被选择时
+        onSelectItem(event) {
+            const { item } = event.currentTarget.dataset;
+            const isArray = Array.isArray(this.data.activeId);
+            // 判断有没有超出右侧选择的最大数
+            const isOverMax = isArray && this.data.activeId.length >= this.data.max;
+            // 判断该项有没有被选中, 如果有被选中，则忽视是否超出的条件
+            const isSelected = isArray
+                ? this.data.activeId.indexOf(item.id) > -1
+                : this.data.activeId === item.id;
+            if (!item.disabled && (!isOverMax || isSelected)) {
+                this.$emit('click-item', item);
+            }
+        },
+        // 当一个导航被点击时
+        onClickNav(event) {
+            const index = event.detail;
+            const item = this.data.items[index];
+            if (!item.disabled) {
+                this.$emit('click-nav', { index });
+            }
+        },
+        // 更新子项列表
+        updateSubItems() {
+            const { items, mainActiveIndex } = this.data;
+            const { children = [] } = items[mainActiveIndex] || {};
+            return this.set({ subItems: children });
+        },
+        updateHeight() {
+            this.setData({
+                innerHeight: addUnit(this.data.height)
+            });
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/tree-select/index.json b/litemall-wx/lib/vant-weapp/tree-select/index.json
index 42991a2a..467cd25c 100644
--- a/litemall-wx/lib/vant-weapp/tree-select/index.json
+++ b/litemall-wx/lib/vant-weapp/tree-select/index.json
@@ -1,8 +1,8 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index",
-    "van-sidebar": "../sidebar/index",
-    "van-sidebar-item": "../sidebar-item/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-sidebar": "../sidebar/index",
+    "van-sidebar-item": "../sidebar-item/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/tree-select/index.wxml b/litemall-wx/lib/vant-weapp/tree-select/index.wxml
index d6f95a8a..c5ba6f6a 100644
--- a/litemall-wx/lib/vant-weapp/tree-select/index.wxml
+++ b/litemall-wx/lib/vant-weapp/tree-select/index.wxml
@@ -1,39 +1,39 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-<wxs src="./index.wxs" module="wxs" />
-
-<view
-  class="van-tree-select"
-  style="height: {{ innerHeight }}"
->
-  <scroll-view scroll-y class="van-tree-select__nav">
-    <van-sidebar active-key="{{ mainActiveIndex }}" bind:change="onClickNav" custom-class="van-tree-select__nav__inner">
-      <van-sidebar-item
-        wx:for="{{ items }}"
-        wx:key="index"
-        custom-class="main-item-class"
-        active-class="main-active-class"
-        disabled-class="main-disabled-class"
-        title="{{ item.text }}"
-        disabled="{{ item.disabled }}"
-      />
-    </van-sidebar>
-  </scroll-view>
-  <scroll-view scroll-y class="van-tree-select__content">
-    <slot name="content" />
-    <view
-      wx:for="{{ subItems }}"
-      wx:key="id"
-      class="van-ellipsis content-item-class {{ utils.bem('tree-select__item', { active: wxs.isActive(activeId, item.id), disabled: item.disabled }) }} {{ wxs.isActive(activeId, item.id) ? 'content-active-class' : '' }} {{ item.disabled ? 'content-disabled-class' : '' }}"
-      data-item="{{ item }}"
-      bind:tap="onSelectItem"
-    >
-      {{ item.text }}
-      <van-icon
-        wx:if="{{ wxs.isActive(activeId, item.id) }}"
-        name="checked"
-        size="16px"
-        class="van-tree-select__selected"
-      />
-    </view>
-  </scroll-view>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="wxs" />
+
+<view
+  class="van-tree-select"
+  style="height: {{ innerHeight }}"
+>
+  <scroll-view scroll-y class="van-tree-select__nav">
+    <van-sidebar active-key="{{ mainActiveIndex }}" bind:change="onClickNav" custom-class="van-tree-select__nav__inner">
+      <van-sidebar-item
+        wx:for="{{ items }}"
+        wx:key="index"
+        custom-class="main-item-class"
+        active-class="main-active-class"
+        disabled-class="main-disabled-class"
+        title="{{ item.text }}"
+        disabled="{{ item.disabled }}"
+      />
+    </van-sidebar>
+  </scroll-view>
+  <scroll-view scroll-y class="van-tree-select__content">
+    <slot name="content" />
+    <view
+      wx:for="{{ subItems }}"
+      wx:key="id"
+      class="van-ellipsis content-item-class {{ utils.bem('tree-select__item', { active: wxs.isActive(activeId, item.id), disabled: item.disabled }) }} {{ wxs.isActive(activeId, item.id) ? 'content-active-class' : '' }} {{ item.disabled ? 'content-disabled-class' : '' }}"
+      data-item="{{ item }}"
+      bind:tap="onSelectItem"
+    >
+      {{ item.text }}
+      <van-icon
+        wx:if="{{ wxs.isActive(activeId, item.id) }}"
+        name="checked"
+        size="16px"
+        class="van-tree-select__selected"
+      />
+    </view>
+  </scroll-view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/tree-select/index.wxs b/litemall-wx/lib/vant-weapp/tree-select/index.wxs
index b1cbb39b..45add819 100644
--- a/litemall-wx/lib/vant-weapp/tree-select/index.wxs
+++ b/litemall-wx/lib/vant-weapp/tree-select/index.wxs
@@ -1,12 +1,12 @@
-/* eslint-disable */
-var array = require('../wxs/array.wxs');
-
-function isActive (activeList, itemId) {
-  if (array.isArray(activeList)) {
-    return activeList.indexOf(itemId) > -1;
-  }
-
-  return activeList === itemId;
-}
-
-module.exports.isActive = isActive;
+/* eslint-disable */
+var array = require('../wxs/array.wxs');
+
+function isActive (activeList, itemId) {
+  if (array.isArray(activeList)) {
+    return activeList.indexOf(itemId) > -1;
+  }
+
+  return activeList === itemId;
+}
+
+module.exports.isActive = isActive;
diff --git a/litemall-wx/lib/vant-weapp/uploader/index.d.ts b/litemall-wx/lib/vant-weapp/uploader/index.d.ts
index cb0ff5c3..509db186 100644
--- a/litemall-wx/lib/vant-weapp/uploader/index.d.ts
+++ b/litemall-wx/lib/vant-weapp/uploader/index.d.ts
@@ -1 +1 @@
-export {};
+export {};
diff --git a/litemall-wx/lib/vant-weapp/uploader/index.js b/litemall-wx/lib/vant-weapp/uploader/index.js
index 9cc5def1..93adf2c6 100644
--- a/litemall-wx/lib/vant-weapp/uploader/index.js
+++ b/litemall-wx/lib/vant-weapp/uploader/index.js
@@ -1,151 +1,151 @@
-import { VantComponent } from '../common/component';
-import { isImageFile } from './utils';
-import { addUnit } from '../common/utils';
-VantComponent({
-    props: {
-        disabled: Boolean,
-        multiple: Boolean,
-        uploadText: String,
-        useSlot: Boolean,
-        useBeforeRead: Boolean,
-        previewSize: {
-            type: null,
-            value: 90,
-            observer: 'setComputedPreviewSize'
-        },
-        name: {
-            type: [Number, String],
-            value: ''
-        },
-        accept: {
-            type: String,
-            value: 'image'
-        },
-        fileList: {
-            type: Array,
-            value: [],
-            observer: 'formatFileList'
-        },
-        maxSize: {
-            type: Number,
-            value: Number.MAX_VALUE
-        },
-        maxCount: {
-            type: Number,
-            value: 100
-        },
-        deletable: {
-            type: Boolean,
-            value: true
-        },
-        previewImage: {
-            type: Boolean,
-            value: true
-        },
-        previewFullImage: {
-            type: Boolean,
-            value: true
-        },
-        imageFit: {
-            type: String,
-            value: 'scaleToFill'
-        }
-    },
-    data: {
-        lists: [],
-        computedPreviewSize: '',
-        isInCount: true
-    },
-    methods: {
-        formatFileList() {
-            const { fileList = [], maxCount } = this.data;
-            const lists = fileList.map(item => (Object.assign(Object.assign({}, item), { isImage: typeof item.isImage === 'undefined' ? isImageFile(item) : item.isImage })));
-            this.setData({ lists, isInCount: lists.length < maxCount });
-        },
-        setComputedPreviewSize(val) {
-            this.setData({
-                computedPreviewSize: addUnit(val)
-            });
-        },
-        startUpload() {
-            if (this.data.disabled)
-                return;
-            const { name = '', capture = ['album', 'camera'], maxCount = 100, multiple = false, maxSize, accept, lists, useBeforeRead = false // 是否定义了 beforeRead
-             } = this.data;
-            let chooseFile = null;
-            const newMaxCount = maxCount - lists.length;
-            // 设置为只选择图片的时候使用 chooseImage 来实现
-            if (accept === 'image') {
-                chooseFile = new Promise((resolve, reject) => {
-                    wx.chooseImage({
-                        count: multiple ? (newMaxCount > 9 ? 9 : newMaxCount) : 1,
-                        sourceType: capture,
-                        success: resolve,
-                        fail: reject
-                    });
-                });
-            }
-            else {
-                chooseFile = new Promise((resolve, reject) => {
-                    wx.chooseMessageFile({
-                        count: multiple ? newMaxCount : 1,
-                        type: 'file',
-                        success: resolve,
-                        fail: reject
-                    });
-                });
-            }
-            chooseFile.then((res) => {
-                const file = multiple ? res.tempFiles : res.tempFiles[0];
-                // 检查文件大小
-                if (file instanceof Array) {
-                    const sizeEnable = file.every(item => item.size <= maxSize);
-                    if (!sizeEnable) {
-                        this.$emit('oversize', { name });
-                        return;
-                    }
-                }
-                else if (file.size > maxSize) {
-                    this.$emit('oversize', { name });
-                    return;
-                }
-                // 触发上传之前的钩子函数
-                if (useBeforeRead) {
-                    this.$emit('before-read', {
-                        file,
-                        name,
-                        callback: (result) => {
-                            if (result) {
-                                // 开始上传
-                                this.$emit('after-read', { file, name });
-                            }
-                        }
-                    });
-                }
-                else {
-                    this.$emit('after-read', { file, name });
-                }
-            });
-        },
-        deleteItem(event) {
-            const { index } = event.currentTarget.dataset;
-            this.$emit('delete', { index, name: this.data.name });
-        },
-        doPreviewImage(event) {
-            if (!this.data.previewFullImage)
-                return;
-            const curUrl = event.currentTarget.dataset.url;
-            const images = this.data.lists
-                .filter(item => item.isImage)
-                .map(item => item.url || item.path);
-            this.$emit('click-preview', { url: curUrl, name: this.data.name });
-            wx.previewImage({
-                urls: images,
-                current: curUrl,
-                fail() {
-                    wx.showToast({ title: '预览图片失败', icon: 'none' });
-                }
-            });
-        }
-    }
-});
+import { VantComponent } from '../common/component';
+import { isImageFile } from './utils';
+import { addUnit } from '../common/utils';
+VantComponent({
+    props: {
+        disabled: Boolean,
+        multiple: Boolean,
+        uploadText: String,
+        useSlot: Boolean,
+        useBeforeRead: Boolean,
+        previewSize: {
+            type: null,
+            value: 90,
+            observer: 'setComputedPreviewSize'
+        },
+        name: {
+            type: [Number, String],
+            value: ''
+        },
+        accept: {
+            type: String,
+            value: 'image'
+        },
+        fileList: {
+            type: Array,
+            value: [],
+            observer: 'formatFileList'
+        },
+        maxSize: {
+            type: Number,
+            value: Number.MAX_VALUE
+        },
+        maxCount: {
+            type: Number,
+            value: 100
+        },
+        deletable: {
+            type: Boolean,
+            value: true
+        },
+        previewImage: {
+            type: Boolean,
+            value: true
+        },
+        previewFullImage: {
+            type: Boolean,
+            value: true
+        },
+        imageFit: {
+            type: String,
+            value: 'scaleToFill'
+        }
+    },
+    data: {
+        lists: [],
+        computedPreviewSize: '',
+        isInCount: true
+    },
+    methods: {
+        formatFileList() {
+            const { fileList = [], maxCount } = this.data;
+            const lists = fileList.map(item => (Object.assign(Object.assign({}, item), { isImage: typeof item.isImage === 'undefined' ? isImageFile(item) : item.isImage })));
+            this.setData({ lists, isInCount: lists.length < maxCount });
+        },
+        setComputedPreviewSize(val) {
+            this.setData({
+                computedPreviewSize: addUnit(val)
+            });
+        },
+        startUpload() {
+            if (this.data.disabled)
+                return;
+            const { name = '', capture = ['album', 'camera'], maxCount = 100, multiple = false, maxSize, accept, lists, useBeforeRead = false // 是否定义了 beforeRead
+             } = this.data;
+            let chooseFile = null;
+            const newMaxCount = maxCount - lists.length;
+            // 设置为只选择图片的时候使用 chooseImage 来实现
+            if (accept === 'image') {
+                chooseFile = new Promise((resolve, reject) => {
+                    wx.chooseImage({
+                        count: multiple ? (newMaxCount > 9 ? 9 : newMaxCount) : 1,
+                        sourceType: capture,
+                        success: resolve,
+                        fail: reject
+                    });
+                });
+            }
+            else {
+                chooseFile = new Promise((resolve, reject) => {
+                    wx.chooseMessageFile({
+                        count: multiple ? newMaxCount : 1,
+                        type: 'file',
+                        success: resolve,
+                        fail: reject
+                    });
+                });
+            }
+            chooseFile.then((res) => {
+                const file = multiple ? res.tempFiles : res.tempFiles[0];
+                // 检查文件大小
+                if (file instanceof Array) {
+                    const sizeEnable = file.every(item => item.size <= maxSize);
+                    if (!sizeEnable) {
+                        this.$emit('oversize', { name });
+                        return;
+                    }
+                }
+                else if (file.size > maxSize) {
+                    this.$emit('oversize', { name });
+                    return;
+                }
+                // 触发上传之前的钩子函数
+                if (useBeforeRead) {
+                    this.$emit('before-read', {
+                        file,
+                        name,
+                        callback: (result) => {
+                            if (result) {
+                                // 开始上传
+                                this.$emit('after-read', { file, name });
+                            }
+                        }
+                    });
+                }
+                else {
+                    this.$emit('after-read', { file, name });
+                }
+            });
+        },
+        deleteItem(event) {
+            const { index } = event.currentTarget.dataset;
+            this.$emit('delete', { index, name: this.data.name });
+        },
+        doPreviewImage(event) {
+            if (!this.data.previewFullImage)
+                return;
+            const curUrl = event.currentTarget.dataset.url;
+            const images = this.data.lists
+                .filter(item => item.isImage)
+                .map(item => item.url || item.path);
+            this.$emit('click-preview', { url: curUrl, name: this.data.name });
+            wx.previewImage({
+                urls: images,
+                current: curUrl,
+                fail() {
+                    wx.showToast({ title: '预览图片失败', icon: 'none' });
+                }
+            });
+        }
+    }
+});
diff --git a/litemall-wx/lib/vant-weapp/uploader/index.json b/litemall-wx/lib/vant-weapp/uploader/index.json
index 0a336c08..8abfe203 100644
--- a/litemall-wx/lib/vant-weapp/uploader/index.json
+++ b/litemall-wx/lib/vant-weapp/uploader/index.json
@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/litemall-wx/lib/vant-weapp/uploader/index.wxml b/litemall-wx/lib/vant-weapp/uploader/index.wxml
index 02546aa9..acb14c67 100644
--- a/litemall-wx/lib/vant-weapp/uploader/index.wxml
+++ b/litemall-wx/lib/vant-weapp/uploader/index.wxml
@@ -1,57 +1,57 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view class="van-uploader">
-  <view class="van-uploader__wrapper">
-    <!-- 预览样式 -->
-    <view
-      wx:if="{{ previewImage }}"
-      wx:for="{{ lists  }}"
-      wx:key="index"
-      class="van-uploader__preview"
-    >
-      <image
-        wx:if="{{ item.isImage }}"
-        mode="{{ imageFit }}"
-        src="{{ item.url || item.path }}"
-        alt="{{ item.name || ('图片' + index) }}"
-        class="van-uploader__preview-image"
-        style="width: {{ computedPreviewSize }}; height: {{ computedPreviewSize }};"
-        data-url="{{ item.url || item.path }}"
-        bind:tap="doPreviewImage"
-      />
-      <view
-        wx:else
-        class="van-uploader__file"
-        style="width: {{ computedPreviewSize }}; height: {{ computedPreviewSize }};"
-      >
-        <van-icon name="description" class="van-uploader__file-icon" />
-        <view class="van-uploader__file-name van-ellipsis">{{ item.name || item.url || item.path }}</view>
-      </view>
-      <van-icon
-        wx:if="{{ deletable }}"
-        name="clear"
-        class="van-uploader__preview-delete"
-        data-index="{{ index }}"
-        bind:tap="deleteItem"
-      />
-    </view>
-
-    <!-- 上传样式 -->
-    <block wx:if="{{ isInCount }}">
-      <view wx:if="{{ useSlot }}" class="van-uploader__slot" bind:tap="startUpload">
-        <slot />
-      </view>
-
-      <!-- 默认上传样式 -->
-      <view
-        wx:else
-        class="van-uploader__upload"
-        style="width: {{ computedPreviewSize }}; height: {{ computedPreviewSize }};"
-        bind:tap="startUpload"
-      >
-        <van-icon name="plus" class="van-uploader__upload-icon" />
-        <text wx:if="{{ uploadText }}" class="van-uploader__upload-text">{{ uploadText }}</text>
-      </view>
-    </block>
-  </view>
-</view>
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="van-uploader">
+  <view class="van-uploader__wrapper">
+    <!-- 预览样式 -->
+    <view
+      wx:if="{{ previewImage }}"
+      wx:for="{{ lists  }}"
+      wx:key="index"
+      class="van-uploader__preview"
+    >
+      <image
+        wx:if="{{ item.isImage }}"
+        mode="{{ imageFit }}"
+        src="{{ item.url || item.path }}"
+        alt="{{ item.name || ('图片' + index) }}"
+        class="van-uploader__preview-image"
+        style="width: {{ computedPreviewSize }}; height: {{ computedPreviewSize }};"
+        data-url="{{ item.url || item.path }}"
+        bind:tap="doPreviewImage"
+      />
+      <view
+        wx:else
+        class="van-uploader__file"
+        style="width: {{ computedPreviewSize }}; height: {{ computedPreviewSize }};"
+      >
+        <van-icon name="description" class="van-uploader__file-icon" />
+        <view class="van-uploader__file-name van-ellipsis">{{ item.name || item.url || item.path }}</view>
+      </view>
+      <van-icon
+        wx:if="{{ deletable }}"
+        name="clear"
+        class="van-uploader__preview-delete"
+        data-index="{{ index }}"
+        bind:tap="deleteItem"
+      />
+    </view>
+
+    <!-- 上传样式 -->
+    <block wx:if="{{ isInCount }}">
+      <view wx:if="{{ useSlot }}" class="van-uploader__slot" bind:tap="startUpload">
+        <slot />
+      </view>
+
+      <!-- 默认上传样式 -->
+      <view
+        wx:else
+        class="van-uploader__upload"
+        style="width: {{ computedPreviewSize }}; height: {{ computedPreviewSize }};"
+        bind:tap="startUpload"
+      >
+        <van-icon name="plus" class="van-uploader__upload-icon" />
+        <text wx:if="{{ uploadText }}" class="van-uploader__upload-text">{{ uploadText }}</text>
+      </view>
+    </block>
+  </view>
+</view>
diff --git a/litemall-wx/lib/vant-weapp/uploader/utils.d.ts b/litemall-wx/lib/vant-weapp/uploader/utils.d.ts
index d3bb3b5b..9c0178db 100644
--- a/litemall-wx/lib/vant-weapp/uploader/utils.d.ts
+++ b/litemall-wx/lib/vant-weapp/uploader/utils.d.ts
@@ -1,12 +1,12 @@
-interface File {
-    path: string;
-    url: string;
-    size: number;
-    name: string;
-    type: string;
-    time: number;
-    image: boolean;
-}
-export declare function isImageUrl(url: string): boolean;
-export declare function isImageFile(item: File): boolean;
-export {};
+interface File {
+    path: string;
+    url: string;
+    size: number;
+    name: string;
+    type: string;
+    time: number;
+    image: boolean;
+}
+export declare function isImageUrl(url: string): boolean;
+export declare function isImageFile(item: File): boolean;
+export {};
diff --git a/litemall-wx/lib/vant-weapp/uploader/utils.js b/litemall-wx/lib/vant-weapp/uploader/utils.js
index aa59dc1d..3186db25 100644
--- a/litemall-wx/lib/vant-weapp/uploader/utils.js
+++ b/litemall-wx/lib/vant-weapp/uploader/utils.js
@@ -1,16 +1,16 @@
-const IMAGE_EXT = ['jpeg', 'jpg', 'gif', 'png', 'svg'];
-export function isImageUrl(url) {
-    return IMAGE_EXT.some(ext => url.indexOf(`.${ext}`) !== -1);
-}
-export function isImageFile(item) {
-    if (item.type) {
-        return item.type.indexOf('image') === 0;
-    }
-    if (item.path) {
-        return isImageUrl(item.path);
-    }
-    if (item.url) {
-        return isImageUrl(item.url);
-    }
-    return false;
-}
+const IMAGE_EXT = ['jpeg', 'jpg', 'gif', 'png', 'svg'];
+export function isImageUrl(url) {
+    return IMAGE_EXT.some(ext => url.indexOf(`.${ext}`) !== -1);
+}
+export function isImageFile(item) {
+    if (item.type) {
+        return item.type.indexOf('image') === 0;
+    }
+    if (item.path) {
+        return isImageUrl(item.path);
+    }
+    if (item.url) {
+        return isImageUrl(item.url);
+    }
+    return false;
+}
diff --git a/litemall-wx/lib/vant-weapp/wxs/array.wxs b/litemall-wx/lib/vant-weapp/wxs/array.wxs
index 610089cd..46810325 100644
--- a/litemall-wx/lib/vant-weapp/wxs/array.wxs
+++ b/litemall-wx/lib/vant-weapp/wxs/array.wxs
@@ -1,5 +1,5 @@
-function isArray(array) {
-  return array && array.constructor === 'Array';
-}
-
-module.exports.isArray = isArray;
+function isArray(array) {
+  return array && array.constructor === 'Array';
+}
+
+module.exports.isArray = isArray;
diff --git a/litemall-wx/lib/vant-weapp/wxs/bem.wxs b/litemall-wx/lib/vant-weapp/wxs/bem.wxs
index 93b2777b..870ab248 100644
--- a/litemall-wx/lib/vant-weapp/wxs/bem.wxs
+++ b/litemall-wx/lib/vant-weapp/wxs/bem.wxs
@@ -1,38 +1,38 @@
-var array = require('./array.wxs');
-var object = require('./object.wxs');
-var PREFIX = 'van-';
-
-function join(name, mods) {
-  name = PREFIX + name;
-  mods = mods.map(function(mod) {
-    return name + '--' + mod;
-  });
-  mods.unshift(name);
-  return mods.join(' ');
-}
-
-function traversing(mods, conf) {
-  if (!conf) {
-    return;
-  }
-
-  if (typeof conf === 'string' || typeof conf === 'number') {
-    mods.push(conf);
-  } else if (array.isArray(conf)) {
-    conf.forEach(function(item) {
-      traversing(mods, item);
-    });
-  } else if (typeof conf === 'object') {
-    object.keys(conf).forEach(function(key) {
-      conf[key] && mods.push(key);
-    });
-  }
-}
-
-function bem(name, conf) {
-  var mods = [];
-  traversing(mods, conf);
-  return join(name, mods);
-}
-
-module.exports.bem = bem;
+var array = require('./array.wxs');
+var object = require('./object.wxs');
+var PREFIX = 'van-';
+
+function join(name, mods) {
+  name = PREFIX + name;
+  mods = mods.map(function(mod) {
+    return name + '--' + mod;
+  });
+  mods.unshift(name);
+  return mods.join(' ');
+}
+
+function traversing(mods, conf) {
+  if (!conf) {
+    return;
+  }
+
+  if (typeof conf === 'string' || typeof conf === 'number') {
+    mods.push(conf);
+  } else if (array.isArray(conf)) {
+    conf.forEach(function(item) {
+      traversing(mods, item);
+    });
+  } else if (typeof conf === 'object') {
+    object.keys(conf).forEach(function(key) {
+      conf[key] && mods.push(key);
+    });
+  }
+}
+
+function bem(name, conf) {
+  var mods = [];
+  traversing(mods, conf);
+  return join(name, mods);
+}
+
+module.exports.bem = bem;
diff --git a/litemall-wx/lib/vant-weapp/wxs/memoize.wxs b/litemall-wx/lib/vant-weapp/wxs/memoize.wxs
index 261ae67d..7e119d95 100644
--- a/litemall-wx/lib/vant-weapp/wxs/memoize.wxs
+++ b/litemall-wx/lib/vant-weapp/wxs/memoize.wxs
@@ -1,54 +1,54 @@
-/**
- * Simple memoize
- * wxs doesn't support fn.apply, so this memoize only support up to 2 args
- */
-
-function isPrimitive(value) {
-  var type = typeof value;
-  return (
-    type === 'boolean' ||
-    type === 'number' ||
-    type === 'string' ||
-    type === 'undefined' ||
-    value === null
-  );
-}
-
-// mock simple fn.call in wxs
-function call(fn, args) {
-  if (args.length === 2) {
-    return fn(args[0], args[1]);
-  }
-
-  if (args.length === 1) {
-    return fn(args[0]);
-  }
-
-  return fn();
-}
-
-function serializer(args) {
-  if (args.length === 1 && isPrimitive(args[0])) {
-    return args[0];
-  }
-  var obj = {};
-  for (var i = 0; i < args.length; i++) {
-    obj['key' + i] = args[i];
-  }
-  return JSON.stringify(obj);
-}
-
-function memoize(fn) {
-  var cache = {};
-
-  return function() {
-    var key = serializer(arguments);
-    if (cache[key] === undefined) {
-      cache[key] = call(fn, arguments);
-    }
-
-    return cache[key];
-  };
-}
-
-module.exports.memoize = memoize;
+/**
+ * Simple memoize
+ * wxs doesn't support fn.apply, so this memoize only support up to 2 args
+ */
+
+function isPrimitive(value) {
+  var type = typeof value;
+  return (
+    type === 'boolean' ||
+    type === 'number' ||
+    type === 'string' ||
+    type === 'undefined' ||
+    value === null
+  );
+}
+
+// mock simple fn.call in wxs
+function call(fn, args) {
+  if (args.length === 2) {
+    return fn(args[0], args[1]);
+  }
+
+  if (args.length === 1) {
+    return fn(args[0]);
+  }
+
+  return fn();
+}
+
+function serializer(args) {
+  if (args.length === 1 && isPrimitive(args[0])) {
+    return args[0];
+  }
+  var obj = {};
+  for (var i = 0; i < args.length; i++) {
+    obj['key' + i] = args[i];
+  }
+  return JSON.stringify(obj);
+}
+
+function memoize(fn) {
+  var cache = {};
+
+  return function() {
+    var key = serializer(arguments);
+    if (cache[key] === undefined) {
+      cache[key] = call(fn, arguments);
+    }
+
+    return cache[key];
+  };
+}
+
+module.exports.memoize = memoize;
diff --git a/litemall-wx/lib/vant-weapp/wxs/object.wxs b/litemall-wx/lib/vant-weapp/wxs/object.wxs
index e0771077..69f16eaf 100644
--- a/litemall-wx/lib/vant-weapp/wxs/object.wxs
+++ b/litemall-wx/lib/vant-weapp/wxs/object.wxs
@@ -1,13 +1,13 @@
-/* eslint-disable */
-var REGEXP = getRegExp('{|}|"', 'g');
-
-function keys(obj) {
-  return JSON.stringify(obj)
-    .replace(REGEXP, '')
-    .split(',')
-    .map(function(item) {
-      return item.split(':')[0];
-    });
-}
-
-module.exports.keys = keys;
+/* eslint-disable */
+var REGEXP = getRegExp('{|}|"', 'g');
+
+function keys(obj) {
+  return JSON.stringify(obj)
+    .replace(REGEXP, '')
+    .split(',')
+    .map(function(item) {
+      return item.split(':')[0];
+    });
+}
+
+module.exports.keys = keys;
diff --git a/litemall-wx/lib/vant-weapp/wxs/utils.wxs b/litemall-wx/lib/vant-weapp/wxs/utils.wxs
index a18662df..a0df7ee9 100644
--- a/litemall-wx/lib/vant-weapp/wxs/utils.wxs
+++ b/litemall-wx/lib/vant-weapp/wxs/utils.wxs
@@ -1,7 +1,7 @@
-var bem = require('./bem.wxs').bem;
-var memoize = require('./memoize.wxs').memoize;
-
-module.exports = {
-  bem: memoize(bem),
-  memoize: memoize
-};
+var bem = require('./bem.wxs').bem;
+var memoize = require('./memoize.wxs').memoize;
+
+module.exports = {
+  bem: memoize(bem),
+  memoize: memoize
+};
diff --git a/litemall-wx/lib/weui.wxss b/litemall-wx/lib/weui.wxss
new file mode 100644
index 00000000..4cb7da85
--- /dev/null
+++ b/litemall-wx/lib/weui.wxss
@@ -0,0 +1,1042 @@
+/*!
+ * weui.js v1.1.0 (https://github.com/weui/weui-wxss)
+ * Copyright 2016, wechat ui team
+ * MIT license
+ */
+page {
+  line-height: 1.6;
+  font-family: -apple-system-font, "Helvetica Neue", sans-serif;
+}
+icon {
+  vertical-align: middle;
+}
+.weui-cells {
+  position: relative;
+  margin-top: 1.17647059em;
+  background-color: #FFFFFF;
+  line-height: 1.41176471;
+  font-size: 17px;
+}
+.weui-cells:before {
+  content: " ";
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  height: 1px;
+  border-top: 1rpx solid #D9D9D9;
+  color: #D9D9D9;
+}
+.weui-cells:after {
+  content: " ";
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  height: 1px;
+  border-bottom: 1rpx solid #D9D9D9;
+  color: #D9D9D9;
+}
+.weui-cells__title {
+  margin-top: .77em;
+  margin-bottom: .3em;
+  padding-left: 15px;
+  padding-right: 15px;
+  color: #999999;
+  font-size: 14px;
+}
+.weui-cells_after-title {
+  margin-top: 0;
+}
+.weui-cells__tips {
+  margin-top: .3em;
+  color: #999999;
+  padding-left: 15px;
+  padding-right: 15px;
+  font-size: 14px;
+}
+.weui-cell {
+  padding: 10px 15px;
+  position: relative;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
+}
+.weui-cell:before {
+  content: " ";
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  height: 1px;
+  border-top: 1rpx solid #D9D9D9;
+  color: #D9D9D9;
+  left: 15px;
+}
+.weui-cell:first-child:before {
+  display: none;
+}
+.weui-cell_active {
+  background-color: #ECECEC;
+}
+.weui-cell_primary {
+  -webkit-box-align: start;
+  -webkit-align-items: flex-start;
+          align-items: flex-start;
+}
+.weui-cell__bd {
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
+}
+.weui-cell__ft {
+  text-align: right;
+  color: #999999;
+}
+.weui-cell_access {
+  color: inherit;
+}
+.weui-cell__ft_in-access {
+  padding-right: 13px;
+  position: relative;
+}
+.weui-cell__ft_in-access:after {
+  content: " ";
+  display: inline-block;
+  height: 6px;
+  width: 6px;
+  border-width: 2px 2px 0 0;
+  border-color: #C8C8CD;
+  border-style: solid;
+  -webkit-transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+          transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+  position: relative;
+  top: -2px;
+  position: absolute;
+  top: 50%;
+  margin-top: -4px;
+  right: 2px;
+}
+.weui-cell_link {
+  color: #586C94;
+  font-size: 14px;
+}
+.weui-cell_link:active {
+  background-color: #ECECEC;
+}
+.weui-cell_link:first-child:before {
+  display: block;
+}
+.weui-icon-radio {
+  margin-left: 3.2px;
+  margin-right: 3.2px;
+}
+.weui-icon-checkbox_circle,
+.weui-icon-checkbox_success {
+  margin-left: 4.6px;
+  margin-right: 4.6px;
+}
+.weui-check__label:active {
+  background-color: #ECECEC;
+}
+.weui-check {
+  position: absolute;
+  left: -9999px;
+}
+.weui-check__hd_in-checkbox {
+  padding-right: 0.35em;
+}
+.weui-cell__ft_in-radio {
+  padding-left: 0.35em;
+}
+.weui-cell_input {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+.weui-label {
+  width: 105px;
+  word-wrap: break-word;
+  word-break: break-all;
+}
+.weui-input {
+  height: 2.58823529em;
+  min-height: 2.58823529em;
+  line-height: 2.58823529em;
+}
+.weui-toptips {
+  position: fixed;
+  -webkit-transform: translateZ(0);
+          transform: translateZ(0);
+  top: 0;
+  left: 0;
+  right: 0;
+  padding: 5px;
+  font-size: 14px;
+  text-align: center;
+  color: #FFFFFF;
+  z-index: 5000;
+  word-wrap: break-word;
+  word-break: break-all;
+}
+.weui-toptips_warn {
+  background-color: #E64340;
+}
+.weui-textarea {
+  display: block;
+  width: 100%;
+}
+.weui-textarea-counter {
+  color: #B2B2B2;
+  text-align: right;
+}
+.weui-textarea-counter_warn {
+  color: #E64340;
+}
+.weui-cell_warn {
+  color: #E64340;
+}
+.weui-form-preview {
+  position: relative;
+  background-color: #FFFFFF;
+}
+.weui-form-preview:before {
+  content: " ";
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  height: 1px;
+  border-top: 1rpx solid #D9D9D9;
+  color: #D9D9D9;
+}
+.weui-form-preview:after {
+  content: " ";
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  height: 1px;
+  border-bottom: 1rpx solid #D9D9D9;
+  color: #D9D9D9;
+}
+.weui-form-preview__value {
+  font-size: 14px;
+}
+.weui-form-preview__value_in-hd {
+  font-size: 26px;
+}
+.weui-form-preview__hd {
+  position: relative;
+  padding: 10px 15px;
+  text-align: right;
+  line-height: 2.5em;
+}
+.weui-form-preview__hd:after {
+  content: " ";
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  height: 1px;
+  border-bottom: 1rpx solid #D9D9D9;
+  color: #D9D9D9;
+  left: 15px;
+}
+.weui-form-preview__bd {
+  padding: 10px 15px;
+  font-size: .9em;
+  text-align: right;
+  color: #999999;
+  line-height: 2;
+}
+.weui-form-preview__ft {
+  position: relative;
+  line-height: 50px;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+}
+.weui-form-preview__ft:after {
+  content: " ";
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  height: 1px;
+  border-top: 1rpx solid #D5D5D6;
+  color: #D5D5D6;
+}
+.weui-form-preview__item {
+  overflow: hidden;
+}
+.weui-form-preview__label {
+  float: left;
+  margin-right: 1em;
+  min-width: 4em;
+  color: #999999;
+  text-align: justify;
+  text-align-last: justify;
+}
+.weui-form-preview__value {
+  display: block;
+  overflow: hidden;
+  word-break: normal;
+  word-wrap: break-word;
+}
+.weui-form-preview__btn {
+  position: relative;
+  display: block;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
+  color: #3CC51F;
+  text-align: center;
+}
+.weui-form-preview__btn:after {
+  content: " ";
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 1px;
+  bottom: 0;
+  border-left: 1rpx solid #D5D5D6;
+  color: #D5D5D6;
+}
+.weui-form-preview__btn:first-child:after {
+  display: none;
+}
+.weui-form-preview__btn_active {
+  background-color: #EEEEEE;
+}
+.weui-form-preview__btn_default {
+  color: #999999;
+}
+.weui-form-preview__btn_primary {
+  color: #0BB20C;
+}
+.weui-cell_select {
+  padding: 0;
+}
+.weui-select {
+  position: relative;
+  padding-left: 15px;
+  padding-right: 30px;
+  height: 2.58823529em;
+  min-height: 2.58823529em;
+  line-height: 2.58823529em;
+  border-right: 1rpx solid #D9D9D9;
+}
+.weui-select:before {
+  content: " ";
+  display: inline-block;
+  height: 6px;
+  width: 6px;
+  border-width: 2px 2px 0 0;
+  border-color: #C8C8CD;
+  border-style: solid;
+  -webkit-transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+          transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+  position: relative;
+  top: -2px;
+  position: absolute;
+  top: 50%;
+  right: 15px;
+  margin-top: -4px;
+}
+.weui-select_in-select-after {
+  padding-left: 0;
+}
+.weui-cell__hd_in-select-after,
+.weui-cell__bd_in-select-before {
+  padding-left: 15px;
+}
+.weui-cell_vcode {
+  padding-right: 0;
+}
+.weui-vcode-img {
+  margin-left: 5px;
+  height: 2.58823529em;
+  vertical-align: middle;
+}
+.weui-vcode-btn {
+  display: inline-block;
+  height: 2.58823529em;
+  margin-left: 5px;
+  padding: 0 0.6em 0 0.7em;
+  border-left: 1px solid #E5E5E5;
+  line-height: 2.58823529em;
+  vertical-align: middle;
+  font-size: 17px;
+  color: #3CC51F;
+  white-space: nowrap;
+}
+.weui-vcode-btn:active {
+  color: #52a341;
+}
+.weui-cell_switch {
+  padding-top: 6px;
+  padding-bottom: 6px;
+}
+.weui-uploader__hd {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  padding-bottom: 10px;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
+}
+.weui-uploader__title {
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
+}
+.weui-uploader__info {
+  color: #B2B2B2;
+}
+.weui-uploader__bd {
+  margin-bottom: -4px;
+  margin-right: -9px;
+  overflow: hidden;
+}
+.weui-uploader__file {
+  float: left;
+  margin-right: 9px;
+  margin-bottom: 9px;
+}
+.weui-uploader__img {
+  display: block;
+  width: 79px;
+  height: 79px;
+}
+.weui-uploader__file_status {
+  position: relative;
+}
+.weui-uploader__file_status:before {
+  content: " ";
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+.weui-uploader__file-content {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  -webkit-transform: translate(-50%, -50%);
+          transform: translate(-50%, -50%);
+  color: #FFFFFF;
+}
+.weui-uploader__input-box {
+  float: left;
+  position: relative;
+  margin-right: 9px;
+  margin-bottom: 9px;
+  width: 77px;
+  height: 77px;
+  border: 1px solid #D9D9D9;
+}
+.weui-uploader__input-box:before,
+.weui-uploader__input-box:after {
+  content: " ";
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  -webkit-transform: translate(-50%, -50%);
+          transform: translate(-50%, -50%);
+  background-color: #D9D9D9;
+}
+.weui-uploader__input-box:before {
+  width: 2px;
+  height: 39.5px;
+}
+.weui-uploader__input-box:after {
+  width: 39.5px;
+  height: 2px;
+}
+.weui-uploader__input-box:active {
+  border-color: #999999;
+}
+.weui-uploader__input-box:active:before,
+.weui-uploader__input-box:active:after {
+  background-color: #999999;
+}
+.weui-uploader__input {
+  position: absolute;
+  z-index: 1;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  opacity: 0;
+}
+.weui-article {
+  padding: 20px 15px;
+  font-size: 15px;
+}
+.weui-article__section {
+  margin-bottom: 1.5em;
+}
+.weui-article__h1 {
+  font-size: 18px;
+  font-weight: 400;
+  margin-bottom: .9em;
+}
+.weui-article__h2 {
+  font-size: 16px;
+  font-weight: 400;
+  margin-bottom: .34em;
+}
+.weui-article__h3 {
+  font-weight: 400;
+  font-size: 15px;
+  margin-bottom: .34em;
+}
+.weui-article__p {
+  margin: 0 0 .8em;
+}
+.weui-msg {
+  padding-top: 36px;
+  text-align: center;
+}
+.weui-msg__link {
+  display: inline;
+  color: #586C94;
+}
+.weui-msg__icon-area {
+  margin-bottom: 30px;
+}
+.weui-msg__text-area {
+  margin-bottom: 25px;
+  padding: 0 20px;
+}
+.weui-msg__title {
+  margin-bottom: 5px;
+  font-weight: 400;
+  font-size: 20px;
+}
+.weui-msg__desc {
+  font-size: 14px;
+  color: #999999;
+}
+.weui-msg__opr-area {
+  margin-bottom: 25px;
+}
+.weui-msg__extra-area {
+  margin-bottom: 15px;
+  font-size: 14px;
+  color: #999999;
+}
+@media screen and (min-height: 438px) {
+  .weui-msg__extra-area {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    text-align: center;
+  }
+}
+.weui-flex {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+}
+.weui-flex__item {
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
+}
+.weui-btn {
+  margin-top: 15px;
+}
+.weui-btn:first-child {
+  margin-top: 0;
+}
+.weui-btn-area {
+  margin: 1.17647059em 15px 0.3em;
+}
+.weui-agree {
+  display: block;
+  padding: .5em 15px;
+  font-size: 13px;
+}
+.weui-agree__text {
+  color: #999999;
+}
+.weui-agree__link {
+  display: inline;
+  color: #586C94;
+}
+.weui-agree__checkbox {
+  position: absolute;
+  left: -9999px;
+}
+.weui-agree__checkbox-icon {
+  position: relative;
+  top: 2px;
+  display: inline-block;
+  border: 1px solid #D1D1D1;
+  background-color: #FFFFFF;
+  border-radius: 3px;
+  width: 11px;
+  height: 11px;
+}
+.weui-agree__checkbox-icon-check {
+  position: absolute;
+  top: 1px;
+  left: 1px;
+}
+.weui-footer {
+  color: #999999;
+  font-size: 14px;
+  text-align: center;
+}
+.weui-footer_fixed-bottom {
+  position: fixed;
+  bottom: .52em;
+  left: 0;
+  right: 0;
+}
+.weui-footer__links {
+  font-size: 0;
+}
+.weui-footer__link {
+  display: inline-block;
+  vertical-align: top;
+  margin: 0 .62em;
+  position: relative;
+  font-size: 14px;
+  color: #586C94;
+}
+.weui-footer__link:before {
+  content: " ";
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 1px;
+  bottom: 0;
+  border-left: 1rpx solid #C7C7C7;
+  color: #C7C7C7;
+  left: -0.65em;
+  top: .36em;
+  bottom: .36em;
+}
+.weui-footer__link:first-child:before {
+  display: none;
+}
+.weui-footer__text {
+  padding: 0 .34em;
+  font-size: 12px;
+}
+.weui-grids {
+  border-top: 1rpx solid #D9D9D9;
+  border-left: 1rpx solid #D9D9D9;
+  overflow: hidden;
+}
+.weui-grid {
+  position: relative;
+  float: left;
+  padding: 20px 10px;
+  width: 33.33333333%;
+  box-sizing: border-box;
+  border-right: 1rpx solid #D9D9D9;
+  border-bottom: 1rpx solid #D9D9D9;
+}
+.weui-grid_active {
+  background-color: #ECECEC;
+}
+.weui-grid__icon {
+  display: block;
+  width: 28px;
+  height: 28px;
+  margin: 0 auto;
+}
+.weui-grid__label {
+  margin-top: 5px;
+  display: block;
+  text-align: center;
+  color: #000000;
+  font-size: 14px;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+.weui-loading {
+  margin: 0 5px;
+  width: 20px;
+  height: 20px;
+  display: inline-block;
+  vertical-align: middle;
+  -webkit-animation: weuiLoading 1s steps(12, end) infinite;
+          animation: weuiLoading 1s steps(12, end) infinite;
+  background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
+  background-size: 100%;
+}
+@-webkit-keyframes weuiLoading {
+  0% {
+    -webkit-transform: rotate3d(0, 0, 1, 0deg);
+            transform: rotate3d(0, 0, 1, 0deg);
+  }
+  100% {
+    -webkit-transform: rotate3d(0, 0, 1, 360deg);
+            transform: rotate3d(0, 0, 1, 360deg);
+  }
+}
+@keyframes weuiLoading {
+  0% {
+    -webkit-transform: rotate3d(0, 0, 1, 0deg);
+            transform: rotate3d(0, 0, 1, 0deg);
+  }
+  100% {
+    -webkit-transform: rotate3d(0, 0, 1, 360deg);
+            transform: rotate3d(0, 0, 1, 360deg);
+  }
+}
+.weui-badge {
+  display: inline-block;
+  padding: .15em .4em;
+  min-width: 8px;
+  border-radius: 18px;
+  background-color: #F43530;
+  color: #FFFFFF;
+  line-height: 1.2;
+  text-align: center;
+  font-size: 12px;
+  vertical-align: middle;
+}
+.weui-badge_dot {
+  padding: .4em;
+  min-width: 0;
+}
+.weui-loadmore {
+  width: 65%;
+  margin: 1.5em auto;
+  line-height: 1.6em;
+  font-size: 14px;
+  text-align: center;
+}
+.weui-loadmore__tips {
+  display: inline-block;
+  vertical-align: middle;
+}
+.weui-loadmore_line {
+  border-top: 1px solid #E5E5E5;
+  margin-top: 2.4em;
+}
+.weui-loadmore__tips_in-line {
+  position: relative;
+  top: -0.9em;
+  padding: 0 .55em;
+  background-color: #FFFFFF;
+  color: #999999;
+}
+.weui-loadmore__tips_in-dot {
+  position: relative;
+  padding: 0 .16em;
+  width: 4px;
+  height: 1.6em;
+}
+.weui-loadmore__tips_in-dot:before {
+  content: " ";
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  margin-top: -1px;
+  margin-left: -2px;
+  width: 4px;
+  height: 4px;
+  border-radius: 50%;
+  background-color: #E5E5E5;
+}
+.weui-panel {
+  background-color: #FFFFFF;
+  margin-top: 10px;
+  position: relative;
+  overflow: hidden;
+}
+.weui-panel:first-child {
+  margin-top: 0;
+}
+.weui-panel:before {
+  content: " ";
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  height: 1px;
+  border-top: 1rpx solid #E5E5E5;
+  color: #E5E5E5;
+}
+.weui-panel:after {
+  content: " ";
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  height: 1px;
+  border-bottom: 1rpx solid #E5E5E5;
+  color: #E5E5E5;
+}
+.weui-panel__hd {
+  padding: 14px 15px 10px;
+  color: #999999;
+  font-size: 13px;
+  position: relative;
+}
+.weui-panel__hd:after {
+  content: " ";
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  height: 1px;
+  border-bottom: 1rpx solid #E5E5E5;
+  color: #E5E5E5;
+  left: 15px;
+}
+.weui-media-box {
+  padding: 15px;
+  position: relative;
+}
+.weui-media-box:before {
+  content: " ";
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  height: 1px;
+  border-top: 1rpx solid #E5E5E5;
+  color: #E5E5E5;
+  left: 15px;
+}
+.weui-media-box:first-child:before {
+  display: none;
+}
+.weui-media-box__title {
+  font-weight: 400;
+  font-size: 17px;
+  width: auto;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  word-wrap: normal;
+  word-wrap: break-word;
+  word-break: break-all;
+}
+.weui-media-box__desc {
+  color: #999999;
+  font-size: 13px;
+  line-height: 1.2;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+}
+.weui-media-box__info {
+  margin-top: 15px;
+  padding-bottom: 5px;
+  font-size: 13px;
+  color: #CECECE;
+  line-height: 1em;
+  list-style: none;
+  overflow: hidden;
+}
+.weui-media-box__info__meta {
+  float: left;
+  padding-right: 1em;
+}
+.weui-media-box__info__meta_extra {
+  padding-left: 1em;
+  border-left: 1px solid #CECECE;
+}
+.weui-media-box__title_in-text {
+  margin-bottom: 8px;
+}
+.weui-media-box_appmsg {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
+}
+.weui-media-box__thumb {
+  width: 100%;
+  height: 100%;
+  vertical-align: top;
+}
+.weui-media-box__hd_in-appmsg {
+  margin-right: .8em;
+  width: 60px;
+  height: 60px;
+  line-height: 60px;
+  text-align: center;
+}
+.weui-media-box__bd_in-appmsg {
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
+  min-width: 0;
+}
+.weui-media-box_small-appmsg {
+  padding: 0;
+}
+.weui-cells_in-small-appmsg {
+  margin-top: 0;
+}
+.weui-cells_in-small-appmsg:before {
+  display: none;
+}
+.weui-progress {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
+}
+.weui-progress__bar {
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
+}
+.weui-progress__opr {
+  margin-left: 15px;
+  font-size: 0;
+}
+.weui-navbar {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  position: absolute;
+  z-index: 500;
+  top: 0;
+  width: 100%;
+  border-bottom: 1rpx solid #CCCCCC;
+}
+.weui-navbar__item {
+  position: relative;
+  display: block;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
+  padding: 13px 0;
+  text-align: center;
+  font-size: 0;
+}
+.weui-navbar__item.weui-bar__item_on {
+  color: #1AAD19;
+}
+.weui-navbar__slider {
+  position: absolute;
+  content: " ";
+  left: 0;
+  bottom: 0;
+  width: 6em;
+  height: 3px;
+  background-color: #1AAD19;
+  -webkit-transition: -webkit-transform .3s;
+  transition: -webkit-transform .3s;
+  transition: transform .3s;
+  transition: transform .3s, -webkit-transform .3s;
+}
+.weui-navbar__title {
+  display: inline-block;
+  font-size: 15px;
+  max-width: 8em;
+  width: auto;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  word-wrap: normal;
+}
+.weui-tab {
+  position: relative;
+  height: 100%;
+}
+.weui-tab__panel {
+  box-sizing: border-box;
+  height: 100%;
+  padding-top: 50px;
+  overflow: auto;
+  -webkit-overflow-scrolling: touch;
+}
+.weui-search-bar {
+  position: relative;
+  padding: 8px 10px;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  box-sizing: border-box;
+  background-color: #EFEFF4;
+  border-top: 1rpx solid #D7D6DC;
+  border-bottom: 1rpx solid #D7D6DC;
+}
+.weui-icon-search {
+  margin-right: 8px;
+  font-size: inherit;
+}
+.weui-icon-search_in-box {
+  position: absolute;
+  left: 10px;
+  top: 7px;
+}
+.weui-search-bar__text {
+  display: inline-block;
+  font-size: 14px;
+  vertical-align: middle;
+}
+.weui-search-bar__form {
+  position: relative;
+  -webkit-box-flex: 1;
+  -webkit-flex: auto;
+          flex: auto;
+  border-radius: 5px;
+  background: #FFFFFF;
+  border: 1rpx solid #E6E6EA;
+}
+.weui-search-bar__box {
+  position: relative;
+  padding-left: 30px;
+  padding-right: 30px;
+  width: 100%;
+  box-sizing: border-box;
+  z-index: 1;
+}
+.weui-search-bar__input {
+  height: 28px;
+  line-height: 28px;
+  font-size: 14px;
+}
+.weui-icon-clear {
+  position: absolute;
+  top: 0;
+  right: 0;
+  padding: 7px 8px;
+  font-size: 0;
+}
+.weui-search-bar__label {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 2;
+  border-radius: 3px;
+  text-align: center;
+  color: #9B9B9B;
+  background: #FFFFFF;
+  line-height: 28px;
+}
+.weui-search-bar__cancel-btn {
+  margin-left: 10px;
+  line-height: 28px;
+  color: #09BB07;
+  white-space: nowrap;
+}
diff --git a/litemall-wx/lib/wxParse/html2json.js b/litemall-wx/lib/wxParse/html2json.js
index e0df8892..27f537d5 100644
--- a/litemall-wx/lib/wxParse/html2json.js
+++ b/litemall-wx/lib/wxParse/html2json.js
@@ -1,242 +1,242 @@
-/**
- * author: Di (微信小程序开发工程师)
- * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
- *               垂直微信小程序开发交流社区
- * 
- * github地址: https://github.com/icindy/wxParse
- * 
- * for: 微信小程序富文本解析
- * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
- */
-
-var __placeImgeUrlHttps = "https";
-var __emojisReg = '';
-var __emojisBaseSrc = '';
-var __emojis = {};
-var wxDiscode = require('wxDiscode.js');
-var HTMLParser = require('htmlparser.js');
-// Empty Elements - HTML 5
-var empty = makeMap("area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr");
-// Block Elements - HTML 5
-var block = makeMap("br,a,code,address,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video");
-
-// Inline Elements - HTML 5
-var inline = makeMap("abbr,acronym,applet,b,basefont,bdo,big,button,cite,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var");
-
-// Elements that you can, intentionally, leave open
-// (and which close themselves)
-var closeSelf = makeMap("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");
-
-// Attributes that have their values filled in disabled="disabled"
-var fillAttrs = makeMap("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected");
-
-// Special Elements (can contain anything)
-var special = makeMap("wxxxcode-style,script,style,view,scroll-view,block");
-function makeMap(str) {
-    var obj = {}, items = str.split(",");
-    for (var i = 0; i < items.length; i++)
-        obj[items[i]] = true;
-    return obj;
-}
-
-function q(v) {
-    return '"' + v + '"';
-}
-
-function removeDOCTYPE(html) {
-    return html
-        .replace(/<\?xml.*\?>\n/, '')
-        .replace(/<!doctype.*\>\n/, '')
-        .replace(/<!DOCTYPE.*\>\n/, '');
-}
-
-
-function html2json(html, bindName) {
-    //处理字符串
-    html = removeDOCTYPE(html);
-    html = wxDiscode.strDiscode(html);
-    //生成node节点
-    var bufArray = [];
-    var results = {
-        node: bindName,
-        nodes: [],
-        images:[],
-        imageUrls:[]
-    };
-    HTMLParser(html, {
-        start: function (tag, attrs, unary) {
-            //debug(tag, attrs, unary);
-            // node for this element
-            var node = {
-                node: 'element',
-                tag: tag,
-            };
-
-            if (block[tag]) {
-                node.tagType = "block";
-            } else if (inline[tag]) {
-                node.tagType = "inline";
-            } else if (closeSelf[tag]) {
-                node.tagType = "closeSelf";
-            }
-
-            if (attrs.length !== 0) {
-                node.attr = attrs.reduce(function (pre, attr) {
-                    var name = attr.name;
-                    var value = attr.value;
-                    if (name == 'class') {
-                        // console.dir(value);
-                        //  value = value.join("")
-                        node.classStr = value;
-                    }
-                    // has multi attibutes
-                    // make it array of attribute
-                    if (name == 'style') {
-                        // console.dir(value);
-                        //  value = value.join("")
-                        node.styleStr = value;
-                    }
-                    if (value.match(/ /)) {
-                        value = value.split(' ');
-                    }
-                    
-
-                    // if attr already exists
-                    // merge it
-                    if (pre[name]) {
-                        if (Array.isArray(pre[name])) {
-                            // already array, push to last
-                            pre[name].push(value);
-                        } else {
-                            // single value, make it array
-                            pre[name] = [pre[name], value];
-                        }
-                    } else {
-                        // not exist, put it
-                        pre[name] = value;
-                    }
-
-                    return pre;
-                }, {});
-            }
-
-            //对img添加额外数据
-            if (node.tag === 'img') {
-                node.imgIndex = results.images.length;
-                var imgUrl = node.attr.src;
-                imgUrl = wxDiscode.urlToHttpUrl(imgUrl, __placeImgeUrlHttps);
-                node.attr.src = imgUrl;
-                node.from = bindName;
-                results.images.push(node);
-                results.imageUrls.push(imgUrl);
-            }
-
-            if (unary) {
-                // if this tag dosen't have end tag
-                // like <img src="hoge.png"/>
-                // add to parents
-                var parent = bufArray[0] || results;
-                if (parent.nodes === undefined) {
-                    parent.nodes = [];
-                }
-                parent.nodes.push(node);
-            } else {
-                bufArray.unshift(node);
-            }
-        },
-        end: function (tag) {
-            //debug(tag);
-            // merge into parent tag
-            var node = bufArray.shift();
-            if (node.tag !== tag) console.error('invalid state: mismatch end tag');
-
-            if (bufArray.length === 0) {
-                results.nodes.push(node);
-            } else {
-                var parent = bufArray[0];
-                if (parent.nodes === undefined) {
-                    parent.nodes = [];
-                }
-                parent.nodes.push(node);
-            }
-        },
-        chars: function (text) {
-            //debug(text);
-            var node = {
-                node: 'text',
-                text: text,
-                textArray:transEmojiStr(text)
-            };
-            
-            if (bufArray.length === 0) {
-                results.nodes.push(node);
-            } else {
-                var parent = bufArray[0];
-                if (parent.nodes === undefined) {
-                    parent.nodes = [];
-                }
-                parent.nodes.push(node);
-            }
-        },
-        comment: function (text) {
-            //debug(text);
-            var node = {
-                node: 'comment',
-                text: text,
-            };
-            var parent = bufArray[0];
-            if (parent.nodes === undefined) {
-                parent.nodes = [];
-            }
-            parent.nodes.push(node);
-        },
-    });
-    return results;
-};
-
-function transEmojiStr(str){
-  // var eReg = new RegExp("["+__reg+' '+"]");
-//   str = str.replace(/\[([^\[\]]+)\]/g,':$1:')
-  
-  var emojiObjs = [];
-  //如果正则表达式为空
-  if(__emojisReg.length == 0 || !__emojis){
-      var emojiObj = {}
-      emojiObj.node = "text";
-      emojiObj.text = str;
-      array = [emojiObj];
-      return array;
-  }
-  //这个地方需要调整
-  str = str.replace(/\[([^\[\]]+)\]/g,':$1:')
-  var eReg = new RegExp("[:]");
-  var array = str.split(eReg);
-  for(var i = 0; i < array.length; i++){
-    var ele = array[i];
-    var emojiObj = {};
-    if(__emojis[ele]){
-      emojiObj.node = "element";
-      emojiObj.tag = "emoji";
-      emojiObj.text = __emojis[ele];
-      emojiObj.baseSrc= __emojisBaseSrc;
-    }else{
-      emojiObj.node = "text";
-      emojiObj.text = ele;
-    }
-    emojiObjs.push(emojiObj);
-  }
-  
-  return emojiObjs;
-}
-
-function emojisInit(reg='',baseSrc="/wxParse/emojis/",emojis){
-    __emojisReg = reg;
-    __emojisBaseSrc=baseSrc;
-    __emojis=emojis;
-}
-
-module.exports = {
-    html2json: html2json,
-    emojisInit:emojisInit
-};
-
+/**
+ * author: Di (微信小程序开发工程师)
+ * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
+ *               垂直微信小程序开发交流社区
+ * 
+ * github地址: https://github.com/icindy/wxParse
+ * 
+ * for: 微信小程序富文本解析
+ * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
+ */
+
+var __placeImgeUrlHttps = "https";
+var __emojisReg = '';
+var __emojisBaseSrc = '';
+var __emojis = {};
+var wxDiscode = require('wxDiscode.js');
+var HTMLParser = require('htmlparser.js');
+// Empty Elements - HTML 5
+var empty = makeMap("area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr");
+// Block Elements - HTML 5
+var block = makeMap("br,a,code,address,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video");
+
+// Inline Elements - HTML 5
+var inline = makeMap("abbr,acronym,applet,b,basefont,bdo,big,button,cite,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var");
+
+// Elements that you can, intentionally, leave open
+// (and which close themselves)
+var closeSelf = makeMap("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");
+
+// Attributes that have their values filled in disabled="disabled"
+var fillAttrs = makeMap("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected");
+
+// Special Elements (can contain anything)
+var special = makeMap("wxxxcode-style,script,style,view,scroll-view,block");
+function makeMap(str) {
+    var obj = {}, items = str.split(",");
+    for (var i = 0; i < items.length; i++)
+        obj[items[i]] = true;
+    return obj;
+}
+
+function q(v) {
+    return '"' + v + '"';
+}
+
+function removeDOCTYPE(html) {
+    return html
+        .replace(/<\?xml.*\?>\n/, '')
+        .replace(/<!doctype.*\>\n/, '')
+        .replace(/<!DOCTYPE.*\>\n/, '');
+}
+
+
+function html2json(html, bindName) {
+    //处理字符串
+    html = removeDOCTYPE(html);
+    html = wxDiscode.strDiscode(html);
+    //生成node节点
+    var bufArray = [];
+    var results = {
+        node: bindName,
+        nodes: [],
+        images:[],
+        imageUrls:[]
+    };
+    HTMLParser(html, {
+        start: function (tag, attrs, unary) {
+            //debug(tag, attrs, unary);
+            // node for this element
+            var node = {
+                node: 'element',
+                tag: tag,
+            };
+
+            if (block[tag]) {
+                node.tagType = "block";
+            } else if (inline[tag]) {
+                node.tagType = "inline";
+            } else if (closeSelf[tag]) {
+                node.tagType = "closeSelf";
+            }
+
+            if (attrs.length !== 0) {
+                node.attr = attrs.reduce(function (pre, attr) {
+                    var name = attr.name;
+                    var value = attr.value;
+                    if (name == 'class') {
+                        // console.dir(value);
+                        //  value = value.join("")
+                        node.classStr = value;
+                    }
+                    // has multi attibutes
+                    // make it array of attribute
+                    if (name == 'style') {
+                        // console.dir(value);
+                        //  value = value.join("")
+                        node.styleStr = value;
+                    }
+                    if (value.match(/ /)) {
+                        value = value.split(' ');
+                    }
+                    
+
+                    // if attr already exists
+                    // merge it
+                    if (pre[name]) {
+                        if (Array.isArray(pre[name])) {
+                            // already array, push to last
+                            pre[name].push(value);
+                        } else {
+                            // single value, make it array
+                            pre[name] = [pre[name], value];
+                        }
+                    } else {
+                        // not exist, put it
+                        pre[name] = value;
+                    }
+
+                    return pre;
+                }, {});
+            }
+
+            //对img添加额外数据
+            if (node.tag === 'img') {
+                node.imgIndex = results.images.length;
+                var imgUrl = node.attr.src;
+                imgUrl = wxDiscode.urlToHttpUrl(imgUrl, __placeImgeUrlHttps);
+                node.attr.src = imgUrl;
+                node.from = bindName;
+                results.images.push(node);
+                results.imageUrls.push(imgUrl);
+            }
+
+            if (unary) {
+                // if this tag dosen't have end tag
+                // like <img src="hoge.png"/>
+                // add to parents
+                var parent = bufArray[0] || results;
+                if (parent.nodes === undefined) {
+                    parent.nodes = [];
+                }
+                parent.nodes.push(node);
+            } else {
+                bufArray.unshift(node);
+            }
+        },
+        end: function (tag) {
+            //debug(tag);
+            // merge into parent tag
+            var node = bufArray.shift();
+            if (node.tag !== tag) console.error('invalid state: mismatch end tag');
+
+            if (bufArray.length === 0) {
+                results.nodes.push(node);
+            } else {
+                var parent = bufArray[0];
+                if (parent.nodes === undefined) {
+                    parent.nodes = [];
+                }
+                parent.nodes.push(node);
+            }
+        },
+        chars: function (text) {
+            //debug(text);
+            var node = {
+                node: 'text',
+                text: text,
+                textArray:transEmojiStr(text)
+            };
+            
+            if (bufArray.length === 0) {
+                results.nodes.push(node);
+            } else {
+                var parent = bufArray[0];
+                if (parent.nodes === undefined) {
+                    parent.nodes = [];
+                }
+                parent.nodes.push(node);
+            }
+        },
+        comment: function (text) {
+            //debug(text);
+            var node = {
+                node: 'comment',
+                text: text,
+            };
+            var parent = bufArray[0];
+            if (parent.nodes === undefined) {
+                parent.nodes = [];
+            }
+            parent.nodes.push(node);
+        },
+    });
+    return results;
+};
+
+function transEmojiStr(str){
+  // var eReg = new RegExp("["+__reg+' '+"]");
+//   str = str.replace(/\[([^\[\]]+)\]/g,':$1:')
+  
+  var emojiObjs = [];
+  //如果正则表达式为空
+  if(__emojisReg.length == 0 || !__emojis){
+      var emojiObj = {}
+      emojiObj.node = "text";
+      emojiObj.text = str;
+      array = [emojiObj];
+      return array;
+  }
+  //这个地方需要调整
+  str = str.replace(/\[([^\[\]]+)\]/g,':$1:')
+  var eReg = new RegExp("[:]");
+  var array = str.split(eReg);
+  for(var i = 0; i < array.length; i++){
+    var ele = array[i];
+    var emojiObj = {};
+    if(__emojis[ele]){
+      emojiObj.node = "element";
+      emojiObj.tag = "emoji";
+      emojiObj.text = __emojis[ele];
+      emojiObj.baseSrc= __emojisBaseSrc;
+    }else{
+      emojiObj.node = "text";
+      emojiObj.text = ele;
+    }
+    emojiObjs.push(emojiObj);
+  }
+  
+  return emojiObjs;
+}
+
+function emojisInit(reg='',baseSrc="/wxParse/emojis/",emojis){
+    __emojisReg = reg;
+    __emojisBaseSrc=baseSrc;
+    __emojis=emojis;
+}
+
+module.exports = {
+    html2json: html2json,
+    emojisInit:emojisInit
+};
+
diff --git a/litemall-wx/lib/wxParse/htmlparser.js b/litemall-wx/lib/wxParse/htmlparser.js
index 7406b45e..1efa4379 100644
--- a/litemall-wx/lib/wxParse/htmlparser.js
+++ b/litemall-wx/lib/wxParse/htmlparser.js
@@ -1,182 +1,182 @@
-/**
- * author: Di (微信小程序开发工程师)
- * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
- *               垂直微信小程序开发交流社区
- * 
- * github地址: https://github.com/icindy/wxParse
- * 
- * for: 微信小程序富文本解析
- * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
- */
-// Regular Expressions for parsing tags and attributes
-var startTag = /^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/,
-	endTag = /^<\/([-A-Za-z0-9_]+)[^>]*>/,
-	attr = /([a-zA-Z_:][-a-zA-Z0-9_:.]*)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;
-
-// Empty Elements - HTML 5
-var empty = makeMap("area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr");
-
-// Block Elements - HTML 5
-var block = makeMap("a,address,code,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video");
-
-// Inline Elements - HTML 5
-var inline = makeMap("abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var");
-
-// Elements that you can, intentionally, leave open
-// (and which close themselves)
-var closeSelf = makeMap("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");
-
-// Attributes that have their values filled in disabled="disabled"
-var fillAttrs = makeMap("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected");
-
-// Special Elements (can contain anything)
-var special = makeMap("wxxxcode-style,script,style,view,scroll-view,block");
-
-function HTMLParser(html, handler) {
-	var index, chars, match, stack = [], last = html;
-	stack.last = function () {
-		return this[this.length - 1];
-	};
-
-	while (html) {
-		chars = true;
-
-		// Make sure we're not in a script or style element
-		if (!stack.last() || !special[stack.last()]) {
-
-			// Comment
-			if (html.indexOf("<!--") == 0) {
-				index = html.indexOf("-->");
-
-				if (index >= 0) {
-					if (handler.comment)
-						handler.comment(html.substring(4, index));
-					html = html.substring(index + 3);
-					chars = false;
-				}
-
-				// end tag
-			} else if (html.indexOf("</") == 0) {
-				match = html.match(endTag);
-
-				if (match) {
-					html = html.substring(match[0].length);
-					match[0].replace(endTag, parseEndTag);
-					chars = false;
-				}
-
-				// start tag
-			} else if (html.indexOf("<") == 0) {
-				match = html.match(startTag);
-
-				if (match) {
-					html = html.substring(match[0].length);
-					match[0].replace(startTag, parseStartTag);
-					chars = false;
-				}
-			}
-
-			if (chars) {
-				index = html.indexOf("<");
-
-				var text = index < 0 ? html : html.substring(0, index);
-				html = index < 0 ? "" : html.substring(index);
-
-				if (handler.chars)
-					handler.chars(text);
-			}
-
-		} else {
-
-			html = html.replace(new RegExp("([\\s\\S]*?)<\/" + stack.last() + "[^>]*>"), function (all, text) {
-				text = text.replace(/<!--([\s\S]*?)-->|<!\[CDATA\[([\s\S]*?)]]>/g, "$1$2");
-				if (handler.chars)
-					handler.chars(text);
-
-				return "";
-			});
-
-
-			parseEndTag("", stack.last());
-		}
-
-		if (html == last)
-			throw "Parse Error: " + html;
-		last = html;
-	}
-
-	// Clean up any remaining tags
-	parseEndTag();
-
-	function parseStartTag(tag, tagName, rest, unary) {
-		tagName = tagName.toLowerCase();
-
-		if (block[tagName]) {
-			while (stack.last() && inline[stack.last()]) {
-				parseEndTag("", stack.last());
-			}
-		}
-
-		if (closeSelf[tagName] && stack.last() == tagName) {
-			parseEndTag("", tagName);
-		}
-
-		unary = empty[tagName] || !!unary;
-
-		if (!unary)
-			stack.push(tagName);
-
-		if (handler.start) {
-			var attrs = [];
-
-			rest.replace(attr, function (match, name) {
-				var value = arguments[2] ? arguments[2] :
-					arguments[3] ? arguments[3] :
-						arguments[4] ? arguments[4] :
-							fillAttrs[name] ? name : "";
-
-				attrs.push({
-					name: name,
-					value: value,
-					escaped: value.replace(/(^|[^\\])"/g, '$1\\\"') //"
-				});
-			});
-
-			if (handler.start) {
-				handler.start(tagName, attrs, unary);
-			}
-
-		}
-	}
-
-	function parseEndTag(tag, tagName) {
-		// If no tag name is provided, clean shop
-		if (!tagName)
-			var pos = 0;
-
-		// Find the closest opened tag of the same type
-		else
-			for (var pos = stack.length - 1; pos >= 0; pos--)
-				if (stack[pos] == tagName)
-					break;
-
-		if (pos >= 0) {
-			// Close all the open elements, up the stack
-			for (var i = stack.length - 1; i >= pos; i--)
-				if (handler.end)
-					handler.end(stack[i]);
-
-			// Remove the open elements from the stack
-			stack.length = pos;
-		}
-	}
-};
-
-function makeMap(str) {
-	var obj = {}, items = str.split(",");
-	for (var i = 0; i < items.length; i++)
-		obj[items[i]] = true;
-	return obj;
-}
-
-module.exports = HTMLParser;
+/**
+ * author: Di (微信小程序开发工程师)
+ * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
+ *               垂直微信小程序开发交流社区
+ * 
+ * github地址: https://github.com/icindy/wxParse
+ * 
+ * for: 微信小程序富文本解析
+ * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
+ */
+// Regular Expressions for parsing tags and attributes
+var startTag = /^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/,
+	endTag = /^<\/([-A-Za-z0-9_]+)[^>]*>/,
+	attr = /([a-zA-Z_:][-a-zA-Z0-9_:.]*)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;
+
+// Empty Elements - HTML 5
+var empty = makeMap("area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr");
+
+// Block Elements - HTML 5
+var block = makeMap("a,address,code,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video");
+
+// Inline Elements - HTML 5
+var inline = makeMap("abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var");
+
+// Elements that you can, intentionally, leave open
+// (and which close themselves)
+var closeSelf = makeMap("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");
+
+// Attributes that have their values filled in disabled="disabled"
+var fillAttrs = makeMap("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected");
+
+// Special Elements (can contain anything)
+var special = makeMap("wxxxcode-style,script,style,view,scroll-view,block");
+
+function HTMLParser(html, handler) {
+	var index, chars, match, stack = [], last = html;
+	stack.last = function () {
+		return this[this.length - 1];
+	};
+
+	while (html) {
+		chars = true;
+
+		// Make sure we're not in a script or style element
+		if (!stack.last() || !special[stack.last()]) {
+
+			// Comment
+			if (html.indexOf("<!--") == 0) {
+				index = html.indexOf("-->");
+
+				if (index >= 0) {
+					if (handler.comment)
+						handler.comment(html.substring(4, index));
+					html = html.substring(index + 3);
+					chars = false;
+				}
+
+				// end tag
+			} else if (html.indexOf("</") == 0) {
+				match = html.match(endTag);
+
+				if (match) {
+					html = html.substring(match[0].length);
+					match[0].replace(endTag, parseEndTag);
+					chars = false;
+				}
+
+				// start tag
+			} else if (html.indexOf("<") == 0) {
+				match = html.match(startTag);
+
+				if (match) {
+					html = html.substring(match[0].length);
+					match[0].replace(startTag, parseStartTag);
+					chars = false;
+				}
+			}
+
+			if (chars) {
+				index = html.indexOf("<");
+
+				var text = index < 0 ? html : html.substring(0, index);
+				html = index < 0 ? "" : html.substring(index);
+
+				if (handler.chars)
+					handler.chars(text);
+			}
+
+		} else {
+
+			html = html.replace(new RegExp("([\\s\\S]*?)<\/" + stack.last() + "[^>]*>"), function (all, text) {
+				text = text.replace(/<!--([\s\S]*?)-->|<!\[CDATA\[([\s\S]*?)]]>/g, "$1$2");
+				if (handler.chars)
+					handler.chars(text);
+
+				return "";
+			});
+
+
+			parseEndTag("", stack.last());
+		}
+
+		if (html == last)
+			throw "Parse Error: " + html;
+		last = html;
+	}
+
+	// Clean up any remaining tags
+	parseEndTag();
+
+	function parseStartTag(tag, tagName, rest, unary) {
+		tagName = tagName.toLowerCase();
+
+		if (block[tagName]) {
+			while (stack.last() && inline[stack.last()]) {
+				parseEndTag("", stack.last());
+			}
+		}
+
+		if (closeSelf[tagName] && stack.last() == tagName) {
+			parseEndTag("", tagName);
+		}
+
+		unary = empty[tagName] || !!unary;
+
+		if (!unary)
+			stack.push(tagName);
+
+		if (handler.start) {
+			var attrs = [];
+
+			rest.replace(attr, function (match, name) {
+				var value = arguments[2] ? arguments[2] :
+					arguments[3] ? arguments[3] :
+						arguments[4] ? arguments[4] :
+							fillAttrs[name] ? name : "";
+
+				attrs.push({
+					name: name,
+					value: value,
+					escaped: value.replace(/(^|[^\\])"/g, '$1\\\"') //"
+				});
+			});
+
+			if (handler.start) {
+				handler.start(tagName, attrs, unary);
+			}
+
+		}
+	}
+
+	function parseEndTag(tag, tagName) {
+		// If no tag name is provided, clean shop
+		if (!tagName)
+			var pos = 0;
+
+		// Find the closest opened tag of the same type
+		else
+			for (var pos = stack.length - 1; pos >= 0; pos--)
+				if (stack[pos] == tagName)
+					break;
+
+		if (pos >= 0) {
+			// Close all the open elements, up the stack
+			for (var i = stack.length - 1; i >= pos; i--)
+				if (handler.end)
+					handler.end(stack[i]);
+
+			// Remove the open elements from the stack
+			stack.length = pos;
+		}
+	}
+};
+
+function makeMap(str) {
+	var obj = {}, items = str.split(",");
+	for (var i = 0; i < items.length; i++)
+		obj[items[i]] = true;
+	return obj;
+}
+
+module.exports = HTMLParser;
diff --git a/litemall-wx/lib/wxParse/showdown.js b/litemall-wx/lib/wxParse/showdown.js
index a1f830fb..8d7c4f79 100644
--- a/litemall-wx/lib/wxParse/showdown.js
+++ b/litemall-wx/lib/wxParse/showdown.js
@@ -1,2529 +1,2529 @@
-/**
- * author: Di (微信小程序开发工程师)
- * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
- *               垂直微信小程序开发交流社区
- * 
- * github地址: https://github.com/icindy/wxParse
- * 
- * for: 微信小程序富文本解析
- * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
- */
-
-function getDefaultOpts(simple) {
-  'use strict';
-
-  var defaultOptions = {
-    omitExtraWLInCodeBlocks: {
-      defaultValue: false,
-      describe: 'Omit the default extra whiteline added to code blocks',
-      type: 'boolean'
-    },
-    noHeaderId: {
-      defaultValue: false,
-      describe: 'Turn on/off generated header id',
-      type: 'boolean'
-    },
-    prefixHeaderId: {
-      defaultValue: false,
-      describe: 'Specify a prefix to generated header ids',
-      type: 'string'
-    },
-    headerLevelStart: {
-      defaultValue: false,
-      describe: 'The header blocks level start',
-      type: 'integer'
-    },
-    parseImgDimensions: {
-      defaultValue: false,
-      describe: 'Turn on/off image dimension parsing',
-      type: 'boolean'
-    },
-    simplifiedAutoLink: {
-      defaultValue: false,
-      describe: 'Turn on/off GFM autolink style',
-      type: 'boolean'
-    },
-    literalMidWordUnderscores: {
-      defaultValue: false,
-      describe: 'Parse midword underscores as literal underscores',
-      type: 'boolean'
-    },
-    strikethrough: {
-      defaultValue: false,
-      describe: 'Turn on/off strikethrough support',
-      type: 'boolean'
-    },
-    tables: {
-      defaultValue: false,
-      describe: 'Turn on/off tables support',
-      type: 'boolean'
-    },
-    tablesHeaderId: {
-      defaultValue: false,
-      describe: 'Add an id to table headers',
-      type: 'boolean'
-    },
-    ghCodeBlocks: {
-      defaultValue: true,
-      describe: 'Turn on/off GFM fenced code blocks support',
-      type: 'boolean'
-    },
-    tasklists: {
-      defaultValue: false,
-      describe: 'Turn on/off GFM tasklist support',
-      type: 'boolean'
-    },
-    smoothLivePreview: {
-      defaultValue: false,
-      describe: 'Prevents weird effects in live previews due to incomplete input',
-      type: 'boolean'
-    },
-    smartIndentationFix: {
-      defaultValue: false,
-      description: 'Tries to smartly fix identation in es6 strings',
-      type: 'boolean'
-    }
-  };
-  if (simple === false) {
-    return JSON.parse(JSON.stringify(defaultOptions));
-  }
-  var ret = {};
-  for (var opt in defaultOptions) {
-    if (defaultOptions.hasOwnProperty(opt)) {
-      ret[opt] = defaultOptions[opt].defaultValue;
-    }
-  }
-  return ret;
-}
-
-/**
- * Created by Tivie on 06-01-2015.
- */
-
-// Private properties
-var showdown = {},
-    parsers = {},
-    extensions = {},
-    globalOptions = getDefaultOpts(true),
-    flavor = {
-      github: {
-        omitExtraWLInCodeBlocks:   true,
-        prefixHeaderId:            'user-content-',
-        simplifiedAutoLink:        true,
-        literalMidWordUnderscores: true,
-        strikethrough:             true,
-        tables:                    true,
-        tablesHeaderId:            true,
-        ghCodeBlocks:              true,
-        tasklists:                 true
-      },
-      vanilla: getDefaultOpts(true)
-    };
-
-/**
- * helper namespace
- * @type {{}}
- */
-showdown.helper = {};
-
-/**
- * TODO LEGACY SUPPORT CODE
- * @type {{}}
- */
-showdown.extensions = {};
-
-/**
- * Set a global option
- * @static
- * @param {string} key
- * @param {*} value
- * @returns {showdown}
- */
-showdown.setOption = function (key, value) {
-  'use strict';
-  globalOptions[key] = value;
-  return this;
-};
-
-/**
- * Get a global option
- * @static
- * @param {string} key
- * @returns {*}
- */
-showdown.getOption = function (key) {
-  'use strict';
-  return globalOptions[key];
-};
-
-/**
- * Get the global options
- * @static
- * @returns {{}}
- */
-showdown.getOptions = function () {
-  'use strict';
-  return globalOptions;
-};
-
-/**
- * Reset global options to the default values
- * @static
- */
-showdown.resetOptions = function () {
-  'use strict';
-  globalOptions = getDefaultOpts(true);
-};
-
-/**
- * Set the flavor showdown should use as default
- * @param {string} name
- */
-showdown.setFlavor = function (name) {
-  'use strict';
-  if (flavor.hasOwnProperty(name)) {
-    var preset = flavor[name];
-    for (var option in preset) {
-      if (preset.hasOwnProperty(option)) {
-        globalOptions[option] = preset[option];
-      }
-    }
-  }
-};
-
-/**
- * Get the default options
- * @static
- * @param {boolean} [simple=true]
- * @returns {{}}
- */
-showdown.getDefaultOptions = function (simple) {
-  'use strict';
-  return getDefaultOpts(simple);
-};
-
-/**
- * Get or set a subParser
- *
- * subParser(name)       - Get a registered subParser
- * subParser(name, func) - Register a subParser
- * @static
- * @param {string} name
- * @param {function} [func]
- * @returns {*}
- */
-showdown.subParser = function (name, func) {
-  'use strict';
-  if (showdown.helper.isString(name)) {
-    if (typeof func !== 'undefined') {
-      parsers[name] = func;
-    } else {
-      if (parsers.hasOwnProperty(name)) {
-        return parsers[name];
-      } else {
-        throw Error('SubParser named ' + name + ' not registered!');
-      }
-    }
-  }
-};
-
-/**
- * Gets or registers an extension
- * @static
- * @param {string} name
- * @param {object|function=} ext
- * @returns {*}
- */
-showdown.extension = function (name, ext) {
-  'use strict';
-
-  if (!showdown.helper.isString(name)) {
-    throw Error('Extension \'name\' must be a string');
-  }
-
-  name = showdown.helper.stdExtName(name);
-
-  // Getter
-  if (showdown.helper.isUndefined(ext)) {
-    if (!extensions.hasOwnProperty(name)) {
-      throw Error('Extension named ' + name + ' is not registered!');
-    }
-    return extensions[name];
-
-    // Setter
-  } else {
-    // Expand extension if it's wrapped in a function
-    if (typeof ext === 'function') {
-      ext = ext();
-    }
-
-    // Ensure extension is an array
-    if (!showdown.helper.isArray(ext)) {
-      ext = [ext];
-    }
-
-    var validExtension = validate(ext, name);
-
-    if (validExtension.valid) {
-      extensions[name] = ext;
-    } else {
-      throw Error(validExtension.error);
-    }
-  }
-};
-
-/**
- * Gets all extensions registered
- * @returns {{}}
- */
-showdown.getAllExtensions = function () {
-  'use strict';
-  return extensions;
-};
-
-/**
- * Remove an extension
- * @param {string} name
- */
-showdown.removeExtension = function (name) {
-  'use strict';
-  delete extensions[name];
-};
-
-/**
- * Removes all extensions
- */
-showdown.resetExtensions = function () {
-  'use strict';
-  extensions = {};
-};
-
-/**
- * Validate extension
- * @param {array} extension
- * @param {string} name
- * @returns {{valid: boolean, error: string}}
- */
-function validate(extension, name) {
-  'use strict';
-
-  var errMsg = (name) ? 'Error in ' + name + ' extension->' : 'Error in unnamed extension',
-    ret = {
-      valid: true,
-      error: ''
-    };
-
-  if (!showdown.helper.isArray(extension)) {
-    extension = [extension];
-  }
-
-  for (var i = 0; i < extension.length; ++i) {
-    var baseMsg = errMsg + ' sub-extension ' + i + ': ',
-        ext = extension[i];
-    if (typeof ext !== 'object') {
-      ret.valid = false;
-      ret.error = baseMsg + 'must be an object, but ' + typeof ext + ' given';
-      return ret;
-    }
-
-    if (!showdown.helper.isString(ext.type)) {
-      ret.valid = false;
-      ret.error = baseMsg + 'property "type" must be a string, but ' + typeof ext.type + ' given';
-      return ret;
-    }
-
-    var type = ext.type = ext.type.toLowerCase();
-
-    // normalize extension type
-    if (type === 'language') {
-      type = ext.type = 'lang';
-    }
-
-    if (type === 'html') {
-      type = ext.type = 'output';
-    }
-
-    if (type !== 'lang' && type !== 'output' && type !== 'listener') {
-      ret.valid = false;
-      ret.error = baseMsg + 'type ' + type + ' is not recognized. Valid values: "lang/language", "output/html" or "listener"';
-      return ret;
-    }
-
-    if (type === 'listener') {
-      if (showdown.helper.isUndefined(ext.listeners)) {
-        ret.valid = false;
-        ret.error = baseMsg + '. Extensions of type "listener" must have a property called "listeners"';
-        return ret;
-      }
-    } else {
-      if (showdown.helper.isUndefined(ext.filter) && showdown.helper.isUndefined(ext.regex)) {
-        ret.valid = false;
-        ret.error = baseMsg + type + ' extensions must define either a "regex" property or a "filter" method';
-        return ret;
-      }
-    }
-
-    if (ext.listeners) {
-      if (typeof ext.listeners !== 'object') {
-        ret.valid = false;
-        ret.error = baseMsg + '"listeners" property must be an object but ' + typeof ext.listeners + ' given';
-        return ret;
-      }
-      for (var ln in ext.listeners) {
-        if (ext.listeners.hasOwnProperty(ln)) {
-          if (typeof ext.listeners[ln] !== 'function') {
-            ret.valid = false;
-            ret.error = baseMsg + '"listeners" property must be an hash of [event name]: [callback]. listeners.' + ln +
-              ' must be a function but ' + typeof ext.listeners[ln] + ' given';
-            return ret;
-          }
-        }
-      }
-    }
-
-    if (ext.filter) {
-      if (typeof ext.filter !== 'function') {
-        ret.valid = false;
-        ret.error = baseMsg + '"filter" must be a function, but ' + typeof ext.filter + ' given';
-        return ret;
-      }
-    } else if (ext.regex) {
-      if (showdown.helper.isString(ext.regex)) {
-        ext.regex = new RegExp(ext.regex, 'g');
-      }
-      if (!ext.regex instanceof RegExp) {
-        ret.valid = false;
-        ret.error = baseMsg + '"regex" property must either be a string or a RegExp object, but ' + typeof ext.regex + ' given';
-        return ret;
-      }
-      if (showdown.helper.isUndefined(ext.replace)) {
-        ret.valid = false;
-        ret.error = baseMsg + '"regex" extensions must implement a replace string or function';
-        return ret;
-      }
-    }
-  }
-  return ret;
-}
-
-/**
- * Validate extension
- * @param {object} ext
- * @returns {boolean}
- */
-showdown.validateExtension = function (ext) {
-  'use strict';
-
-  var validateExtension = validate(ext, null);
-  if (!validateExtension.valid) {
-    console.warn(validateExtension.error);
-    return false;
-  }
-  return true;
-};
-
-/**
- * showdownjs helper functions
- */
-
-if (!showdown.hasOwnProperty('helper')) {
-  showdown.helper = {};
-}
-
-/**
- * Check if var is string
- * @static
- * @param {string} a
- * @returns {boolean}
- */
-showdown.helper.isString = function isString(a) {
-  'use strict';
-  return (typeof a === 'string' || a instanceof String);
-};
-
-/**
- * Check if var is a function
- * @static
- * @param {string} a
- * @returns {boolean}
- */
-showdown.helper.isFunction = function isFunction(a) {
-  'use strict';
-  var getType = {};
-  return a && getType.toString.call(a) === '[object Function]';
-};
-
-/**
- * ForEach helper function
- * @static
- * @param {*} obj
- * @param {function} callback
- */
-showdown.helper.forEach = function forEach(obj, callback) {
-  'use strict';
-  if (typeof obj.forEach === 'function') {
-    obj.forEach(callback);
-  } else {
-    for (var i = 0; i < obj.length; i++) {
-      callback(obj[i], i, obj);
-    }
-  }
-};
-
-/**
- * isArray helper function
- * @static
- * @param {*} a
- * @returns {boolean}
- */
-showdown.helper.isArray = function isArray(a) {
-  'use strict';
-  return a.constructor === Array;
-};
-
-/**
- * Check if value is undefined
- * @static
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is `undefined`, else `false`.
- */
-showdown.helper.isUndefined = function isUndefined(value) {
-  'use strict';
-  return typeof value === 'undefined';
-};
-
-/**
- * Standardidize extension name
- * @static
- * @param {string} s extension name
- * @returns {string}
- */
-showdown.helper.stdExtName = function (s) {
-  'use strict';
-  return s.replace(/[_-]||\s/g, '').toLowerCase();
-};
-
-function escapeCharactersCallback(wholeMatch, m1) {
-  'use strict';
-  var charCodeToEscape = m1.charCodeAt(0);
-  return '~E' + charCodeToEscape + 'E';
-}
-
-/**
- * Callback used to escape characters when passing through String.replace
- * @static
- * @param {string} wholeMatch
- * @param {string} m1
- * @returns {string}
- */
-showdown.helper.escapeCharactersCallback = escapeCharactersCallback;
-
-/**
- * Escape characters in a string
- * @static
- * @param {string} text
- * @param {string} charsToEscape
- * @param {boolean} afterBackslash
- * @returns {XML|string|void|*}
- */
-showdown.helper.escapeCharacters = function escapeCharacters(text, charsToEscape, afterBackslash) {
-  'use strict';
-  // First we have to escape the escape characters so that
-  // we can build a character class out of them
-  var regexString = '([' + charsToEscape.replace(/([\[\]\\])/g, '\\$1') + '])';
-
-  if (afterBackslash) {
-    regexString = '\\\\' + regexString;
-  }
-
-  var regex = new RegExp(regexString, 'g');
-  text = text.replace(regex, escapeCharactersCallback);
-
-  return text;
-};
-
-var rgxFindMatchPos = function (str, left, right, flags) {
-  'use strict';
-  var f = flags || '',
-    g = f.indexOf('g') > -1,
-    x = new RegExp(left + '|' + right, 'g' + f.replace(/g/g, '')),
-    l = new RegExp(left, f.replace(/g/g, '')),
-    pos = [],
-    t, s, m, start, end;
-
-  do {
-    t = 0;
-    while ((m = x.exec(str))) {
-      if (l.test(m[0])) {
-        if (!(t++)) {
-          s = x.lastIndex;
-          start = s - m[0].length;
-        }
-      } else if (t) {
-        if (!--t) {
-          end = m.index + m[0].length;
-          var obj = {
-            left: {start: start, end: s},
-            match: {start: s, end: m.index},
-            right: {start: m.index, end: end},
-            wholeMatch: {start: start, end: end}
-          };
-          pos.push(obj);
-          if (!g) {
-            return pos;
-          }
-        }
-      }
-    }
-  } while (t && (x.lastIndex = s));
-
-  return pos;
-};
-
-/**
- * matchRecursiveRegExp
- *
- * (c) 2007 Steven Levithan <stevenlevithan.com>
- * MIT License
- *
- * Accepts a string to search, a left and right format delimiter
- * as regex patterns, and optional regex flags. Returns an array
- * of matches, allowing nested instances of left/right delimiters.
- * Use the "g" flag to return all matches, otherwise only the
- * first is returned. Be careful to ensure that the left and
- * right format delimiters produce mutually exclusive matches.
- * Backreferences are not supported within the right delimiter
- * due to how it is internally combined with the left delimiter.
- * When matching strings whose format delimiters are unbalanced
- * to the left or right, the output is intentionally as a
- * conventional regex library with recursion support would
- * produce, e.g. "<<x>" and "<x>>" both produce ["x"] when using
- * "<" and ">" as the delimiters (both strings contain a single,
- * balanced instance of "<x>").
- *
- * examples:
- * matchRecursiveRegExp("test", "\\(", "\\)")
- * returns: []
- * matchRecursiveRegExp("<t<<e>><s>>t<>", "<", ">", "g")
- * returns: ["t<<e>><s>", ""]
- * matchRecursiveRegExp("<div id=\"x\">test</div>", "<div\\b[^>]*>", "</div>", "gi")
- * returns: ["test"]
- */
-showdown.helper.matchRecursiveRegExp = function (str, left, right, flags) {
-  'use strict';
-
-  var matchPos = rgxFindMatchPos (str, left, right, flags),
-    results = [];
-
-  for (var i = 0; i < matchPos.length; ++i) {
-    results.push([
-      str.slice(matchPos[i].wholeMatch.start, matchPos[i].wholeMatch.end),
-      str.slice(matchPos[i].match.start, matchPos[i].match.end),
-      str.slice(matchPos[i].left.start, matchPos[i].left.end),
-      str.slice(matchPos[i].right.start, matchPos[i].right.end)
-    ]);
-  }
-  return results;
-};
-
-/**
- *
- * @param {string} str
- * @param {string|function} replacement
- * @param {string} left
- * @param {string} right
- * @param {string} flags
- * @returns {string}
- */
-showdown.helper.replaceRecursiveRegExp = function (str, replacement, left, right, flags) {
-  'use strict';
-
-  if (!showdown.helper.isFunction(replacement)) {
-    var repStr = replacement;
-    replacement = function () {
-      return repStr;
-    };
-  }
-
-  var matchPos = rgxFindMatchPos(str, left, right, flags),
-      finalStr = str,
-      lng = matchPos.length;
-
-  if (lng > 0) {
-    var bits = [];
-    if (matchPos[0].wholeMatch.start !== 0) {
-      bits.push(str.slice(0, matchPos[0].wholeMatch.start));
-    }
-    for (var i = 0; i < lng; ++i) {
-      bits.push(
-        replacement(
-          str.slice(matchPos[i].wholeMatch.start, matchPos[i].wholeMatch.end),
-          str.slice(matchPos[i].match.start, matchPos[i].match.end),
-          str.slice(matchPos[i].left.start, matchPos[i].left.end),
-          str.slice(matchPos[i].right.start, matchPos[i].right.end)
-        )
-      );
-      if (i < lng - 1) {
-        bits.push(str.slice(matchPos[i].wholeMatch.end, matchPos[i + 1].wholeMatch.start));
-      }
-    }
-    if (matchPos[lng - 1].wholeMatch.end < str.length) {
-      bits.push(str.slice(matchPos[lng - 1].wholeMatch.end));
-    }
-    finalStr = bits.join('');
-  }
-  return finalStr;
-};
-
-/**
- * POLYFILLS
- */
-if (showdown.helper.isUndefined(console)) {
-  console = {
-    warn: function (msg) {
-      'use strict';
-      alert(msg);
-    },
-    log: function (msg) {
-      'use strict';
-      alert(msg);
-    },
-    error: function (msg) {
-      'use strict';
-      throw msg;
-    }
-  };
-}
-
-/**
- * Created by Estevao on 31-05-2015.
- */
-
-/**
- * Showdown Converter class
- * @class
- * @param {object} [converterOptions]
- * @returns {Converter}
- */
-showdown.Converter = function (converterOptions) {
-  'use strict';
-
-  var
-      /**
-       * Options used by this converter
-       * @private
-       * @type {{}}
-       */
-      options = {},
-
-      /**
-       * Language extensions used by this converter
-       * @private
-       * @type {Array}
-       */
-      langExtensions = [],
-
-      /**
-       * Output modifiers extensions used by this converter
-       * @private
-       * @type {Array}
-       */
-      outputModifiers = [],
-
-      /**
-       * Event listeners
-       * @private
-       * @type {{}}
-       */
-      listeners = {};
-
-  _constructor();
-
-  /**
-   * Converter constructor
-   * @private
-   */
-  function _constructor() {
-    converterOptions = converterOptions || {};
-
-    for (var gOpt in globalOptions) {
-      if (globalOptions.hasOwnProperty(gOpt)) {
-        options[gOpt] = globalOptions[gOpt];
-      }
-    }
-
-    // Merge options
-    if (typeof converterOptions === 'object') {
-      for (var opt in converterOptions) {
-        if (converterOptions.hasOwnProperty(opt)) {
-          options[opt] = converterOptions[opt];
-        }
-      }
-    } else {
-      throw Error('Converter expects the passed parameter to be an object, but ' + typeof converterOptions +
-      ' was passed instead.');
-    }
-
-    if (options.extensions) {
-      showdown.helper.forEach(options.extensions, _parseExtension);
-    }
-  }
-
-  /**
-   * Parse extension
-   * @param {*} ext
-   * @param {string} [name='']
-   * @private
-   */
-  function _parseExtension(ext, name) {
-
-    name = name || null;
-    // If it's a string, the extension was previously loaded
-    if (showdown.helper.isString(ext)) {
-      ext = showdown.helper.stdExtName(ext);
-      name = ext;
-
-      // LEGACY_SUPPORT CODE
-      if (showdown.extensions[ext]) {
-        console.warn('DEPRECATION WARNING: ' + ext + ' is an old extension that uses a deprecated loading method.' +
-          'Please inform the developer that the extension should be updated!');
-        legacyExtensionLoading(showdown.extensions[ext], ext);
-        return;
-      // END LEGACY SUPPORT CODE
-
-      } else if (!showdown.helper.isUndefined(extensions[ext])) {
-        ext = extensions[ext];
-
-      } else {
-        throw Error('Extension "' + ext + '" could not be loaded. It was either not found or is not a valid extension.');
-      }
-    }
-
-    if (typeof ext === 'function') {
-      ext = ext();
-    }
-
-    if (!showdown.helper.isArray(ext)) {
-      ext = [ext];
-    }
-
-    var validExt = validate(ext, name);
-    if (!validExt.valid) {
-      throw Error(validExt.error);
-    }
-
-    for (var i = 0; i < ext.length; ++i) {
-      switch (ext[i].type) {
-
-        case 'lang':
-          langExtensions.push(ext[i]);
-          break;
-
-        case 'output':
-          outputModifiers.push(ext[i]);
-          break;
-      }
-      if (ext[i].hasOwnProperty(listeners)) {
-        for (var ln in ext[i].listeners) {
-          if (ext[i].listeners.hasOwnProperty(ln)) {
-            listen(ln, ext[i].listeners[ln]);
-          }
-        }
-      }
-    }
-
-  }
-
-  /**
-   * LEGACY_SUPPORT
-   * @param {*} ext
-   * @param {string} name
-   */
-  function legacyExtensionLoading(ext, name) {
-    if (typeof ext === 'function') {
-      ext = ext(new showdown.Converter());
-    }
-    if (!showdown.helper.isArray(ext)) {
-      ext = [ext];
-    }
-    var valid = validate(ext, name);
-
-    if (!valid.valid) {
-      throw Error(valid.error);
-    }
-
-    for (var i = 0; i < ext.length; ++i) {
-      switch (ext[i].type) {
-        case 'lang':
-          langExtensions.push(ext[i]);
-          break;
-        case 'output':
-          outputModifiers.push(ext[i]);
-          break;
-        default:// should never reach here
-          throw Error('Extension loader error: Type unrecognized!!!');
-      }
-    }
-  }
-
-  /**
-   * Listen to an event
-   * @param {string} name
-   * @param {function} callback
-   */
-  function listen(name, callback) {
-    if (!showdown.helper.isString(name)) {
-      throw Error('Invalid argument in converter.listen() method: name must be a string, but ' + typeof name + ' given');
-    }
-
-    if (typeof callback !== 'function') {
-      throw Error('Invalid argument in converter.listen() method: callback must be a function, but ' + typeof callback + ' given');
-    }
-
-    if (!listeners.hasOwnProperty(name)) {
-      listeners[name] = [];
-    }
-    listeners[name].push(callback);
-  }
-
-  function rTrimInputText(text) {
-    var rsp = text.match(/^\s*/)[0].length,
-        rgx = new RegExp('^\\s{0,' + rsp + '}', 'gm');
-    return text.replace(rgx, '');
-  }
-
-  /**
-   * Dispatch an event
-   * @private
-   * @param {string} evtName Event name
-   * @param {string} text Text
-   * @param {{}} options Converter Options
-   * @param {{}} globals
-   * @returns {string}
-   */
-  this._dispatch = function dispatch (evtName, text, options, globals) {
-    if (listeners.hasOwnProperty(evtName)) {
-      for (var ei = 0; ei < listeners[evtName].length; ++ei) {
-        var nText = listeners[evtName][ei](evtName, text, this, options, globals);
-        if (nText && typeof nText !== 'undefined') {
-          text = nText;
-        }
-      }
-    }
-    return text;
-  };
-
-  /**
-   * Listen to an event
-   * @param {string} name
-   * @param {function} callback
-   * @returns {showdown.Converter}
-   */
-  this.listen = function (name, callback) {
-    listen(name, callback);
-    return this;
-  };
-
-  /**
-   * Converts a markdown string into HTML
-   * @param {string} text
-   * @returns {*}
-   */
-  this.makeHtml = function (text) {
-    //check if text is not falsy
-    if (!text) {
-      return text;
-    }
-
-    var globals = {
-      gHtmlBlocks:     [],
-      gHtmlMdBlocks:   [],
-      gHtmlSpans:      [],
-      gUrls:           {},
-      gTitles:         {},
-      gDimensions:     {},
-      gListLevel:      0,
-      hashLinkCounts:  {},
-      langExtensions:  langExtensions,
-      outputModifiers: outputModifiers,
-      converter:       this,
-      ghCodeBlocks:    []
-    };
-
-    // attacklab: Replace ~ with ~T
-    // This lets us use tilde as an escape char to avoid md5 hashes
-    // The choice of character is arbitrary; anything that isn't
-    // magic in Markdown will work.
-    text = text.replace(/~/g, '~T');
-
-    // attacklab: Replace $ with ~D
-    // RegExp interprets $ as a special character
-    // when it's in a replacement string
-    text = text.replace(/\$/g, '~D');
-
-    // Standardize line endings
-    text = text.replace(/\r\n/g, '\n'); // DOS to Unix
-    text = text.replace(/\r/g, '\n'); // Mac to Unix
-
-    if (options.smartIndentationFix) {
-      text = rTrimInputText(text);
-    }
-
-    // Make sure text begins and ends with a couple of newlines:
-    //text = '\n\n' + text + '\n\n';
-    text = text;
-    // detab
-    text = showdown.subParser('detab')(text, options, globals);
-
-    // stripBlankLines
-    text = showdown.subParser('stripBlankLines')(text, options, globals);
-
-    //run languageExtensions
-    showdown.helper.forEach(langExtensions, function (ext) {
-      text = showdown.subParser('runExtension')(ext, text, options, globals);
-    });
-
-    // run the sub parsers
-    text = showdown.subParser('hashPreCodeTags')(text, options, globals);
-    text = showdown.subParser('githubCodeBlocks')(text, options, globals);
-    text = showdown.subParser('hashHTMLBlocks')(text, options, globals);
-    text = showdown.subParser('hashHTMLSpans')(text, options, globals);
-    text = showdown.subParser('stripLinkDefinitions')(text, options, globals);
-    text = showdown.subParser('blockGamut')(text, options, globals);
-    text = showdown.subParser('unhashHTMLSpans')(text, options, globals);
-    text = showdown.subParser('unescapeSpecialChars')(text, options, globals);
-
-    // attacklab: Restore dollar signs
-    text = text.replace(/~D/g, '$$');
-
-    // attacklab: Restore tildes
-    text = text.replace(/~T/g, '~');
-
-    // Run output modifiers
-    showdown.helper.forEach(outputModifiers, function (ext) {
-      text = showdown.subParser('runExtension')(ext, text, options, globals);
-    });
-    return text;
-  };
-
-  /**
-   * Set an option of this Converter instance
-   * @param {string} key
-   * @param {*} value
-   */
-  this.setOption = function (key, value) {
-    options[key] = value;
-  };
-
-  /**
-   * Get the option of this Converter instance
-   * @param {string} key
-   * @returns {*}
-   */
-  this.getOption = function (key) {
-    return options[key];
-  };
-
-  /**
-   * Get the options of this Converter instance
-   * @returns {{}}
-   */
-  this.getOptions = function () {
-    return options;
-  };
-
-  /**
-   * Add extension to THIS converter
-   * @param {{}} extension
-   * @param {string} [name=null]
-   */
-  this.addExtension = function (extension, name) {
-    name = name || null;
-    _parseExtension(extension, name);
-  };
-
-  /**
-   * Use a global registered extension with THIS converter
-   * @param {string} extensionName Name of the previously registered extension
-   */
-  this.useExtension = function (extensionName) {
-    _parseExtension(extensionName);
-  };
-
-  /**
-   * Set the flavor THIS converter should use
-   * @param {string} name
-   */
-  this.setFlavor = function (name) {
-    if (flavor.hasOwnProperty(name)) {
-      var preset = flavor[name];
-      for (var option in preset) {
-        if (preset.hasOwnProperty(option)) {
-          options[option] = preset[option];
-        }
-      }
-    }
-  };
-
-  /**
-   * Remove an extension from THIS converter.
-   * Note: This is a costly operation. It's better to initialize a new converter
-   * and specify the extensions you wish to use
-   * @param {Array} extension
-   */
-  this.removeExtension = function (extension) {
-    if (!showdown.helper.isArray(extension)) {
-      extension = [extension];
-    }
-    for (var a = 0; a < extension.length; ++a) {
-      var ext = extension[a];
-      for (var i = 0; i < langExtensions.length; ++i) {
-        if (langExtensions[i] === ext) {
-          langExtensions[i].splice(i, 1);
-        }
-      }
-      for (var ii = 0; ii < outputModifiers.length; ++i) {
-        if (outputModifiers[ii] === ext) {
-          outputModifiers[ii].splice(i, 1);
-        }
-      }
-    }
-  };
-
-  /**
-   * Get all extension of THIS converter
-   * @returns {{language: Array, output: Array}}
-   */
-  this.getAllExtensions = function () {
-    return {
-      language: langExtensions,
-      output: outputModifiers
-    };
-  };
-};
-
-/**
- * Turn Markdown link shortcuts into XHTML <a> tags.
- */
-showdown.subParser('anchors', function (text, options, globals) {
-  'use strict';
-
-  text = globals.converter._dispatch('anchors.before', text, options, globals);
-
-  var writeAnchorTag = function (wholeMatch, m1, m2, m3, m4, m5, m6, m7) {
-    if (showdown.helper.isUndefined(m7)) {
-      m7 = '';
-    }
-    wholeMatch = m1;
-    var linkText = m2,
-        linkId = m3.toLowerCase(),
-        url = m4,
-        title = m7;
-
-    if (!url) {
-      if (!linkId) {
-        // lower-case and turn embedded newlines into spaces
-        linkId = linkText.toLowerCase().replace(/ ?\n/g, ' ');
-      }
-      url = '#' + linkId;
-
-      if (!showdown.helper.isUndefined(globals.gUrls[linkId])) {
-        url = globals.gUrls[linkId];
-        if (!showdown.helper.isUndefined(globals.gTitles[linkId])) {
-          title = globals.gTitles[linkId];
-        }
-      } else {
-        if (wholeMatch.search(/\(\s*\)$/m) > -1) {
-          // Special case for explicit empty url
-          url = '';
-        } else {
-          return wholeMatch;
-        }
-      }
-    }
-
-    url = showdown.helper.escapeCharacters(url, '*_', false);
-    var result = '<a href="' + url + '"';
-
-    if (title !== '' && title !== null) {
-      title = title.replace(/"/g, '&quot;');
-      title = showdown.helper.escapeCharacters(title, '*_', false);
-      result += ' title="' + title + '"';
-    }
-
-    result += '>' + linkText + '</a>';
-
-    return result;
-  };
-
-  // First, handle reference-style links: [link text] [id]
-  /*
-   text = text.replace(/
-   (							// wrap whole match in $1
-   \[
-   (
-   (?:
-   \[[^\]]*\]		// allow brackets nested one level
-   |
-   [^\[]			// or anything else
-   )*
-   )
-   \]
-
-   [ ]?					// one optional space
-   (?:\n[ ]*)?				// one optional newline followed by spaces
-
-   \[
-   (.*?)					// id = $3
-   \]
-   )()()()()					// pad remaining backreferences
-   /g,_DoAnchors_callback);
-   */
-  text = text.replace(/(\[((?:\[[^\]]*]|[^\[\]])*)][ ]?(?:\n[ ]*)?\[(.*?)])()()()()/g, writeAnchorTag);
-
-  //
-  // Next, inline-style links: [link text](url "optional title")
-  //
-
-  /*
-   text = text.replace(/
-   (						// wrap whole match in $1
-   \[
-   (
-   (?:
-   \[[^\]]*\]	// allow brackets nested one level
-   |
-   [^\[\]]			// or anything else
-   )
-   )
-   \]
-   \(						// literal paren
-   [ \t]*
-   ()						// no id, so leave $3 empty
-   <?(.*?)>?				// href = $4
-   [ \t]*
-   (						// $5
-   (['"])				// quote char = $6
-   (.*?)				// Title = $7
-   \6					// matching quote
-   [ \t]*				// ignore any spaces/tabs between closing quote and )
-   )?						// title is optional
-   \)
-   )
-   /g,writeAnchorTag);
-   */
-  text = text.replace(/(\[((?:\[[^\]]*]|[^\[\]])*)]\([ \t]*()<?(.*?(?:\(.*?\).*?)?)>?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g,
-                      writeAnchorTag);
-
-  //
-  // Last, handle reference-style shortcuts: [link text]
-  // These must come last in case you've also got [link test][1]
-  // or [link test](/foo)
-  //
-
-  /*
-   text = text.replace(/
-   (                // wrap whole match in $1
-   \[
-   ([^\[\]]+)       // link text = $2; can't contain '[' or ']'
-   \]
-   )()()()()()      // pad rest of backreferences
-   /g, writeAnchorTag);
-   */
-  text = text.replace(/(\[([^\[\]]+)])()()()()()/g, writeAnchorTag);
-
-  text = globals.converter._dispatch('anchors.after', text, options, globals);
-  return text;
-});
-
-showdown.subParser('autoLinks', function (text, options, globals) {
-  'use strict';
-
-  text = globals.converter._dispatch('autoLinks.before', text, options, globals);
-
-  var simpleURLRegex  = /\b(((https?|ftp|dict):\/\/|www\.)[^'">\s]+\.[^'">\s]+)(?=\s|$)(?!["<>])/gi,
-      delimUrlRegex   = /<(((https?|ftp|dict):\/\/|www\.)[^'">\s]+)>/gi,
-      simpleMailRegex = /(?:^|[ \n\t])([A-Za-z0-9!#$%&'*+-/=?^_`\{|}~\.]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)(?:$|[ \n\t])/gi,
-      delimMailRegex  = /<(?:mailto:)?([-.\w]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)>/gi;
-
-  text = text.replace(delimUrlRegex, replaceLink);
-  text = text.replace(delimMailRegex, replaceMail);
-  // simpleURLRegex  = /\b(((https?|ftp|dict):\/\/|www\.)[-.+~:?#@!$&'()*,;=[\]\w]+)\b/gi,
-  // Email addresses: <address@domain.foo>
-
-  if (options.simplifiedAutoLink) {
-    text = text.replace(simpleURLRegex, replaceLink);
-    text = text.replace(simpleMailRegex, replaceMail);
-  }
-
-  function replaceLink(wm, link) {
-    var lnkTxt = link;
-    if (/^www\./i.test(link)) {
-      link = link.replace(/^www\./i, 'http://www.');
-    }
-    return '<a href="' + link + '">' + lnkTxt + '</a>';
-  }
-
-  function replaceMail(wholeMatch, m1) {
-    var unescapedStr = showdown.subParser('unescapeSpecialChars')(m1);
-    return showdown.subParser('encodeEmailAddress')(unescapedStr);
-  }
-
-  text = globals.converter._dispatch('autoLinks.after', text, options, globals);
-
-  return text;
-});
-
-/**
- * These are all the transformations that form block-level
- * tags like paragraphs, headers, and list items.
- */
-showdown.subParser('blockGamut', function (text, options, globals) {
-  'use strict';
-
-  text = globals.converter._dispatch('blockGamut.before', text, options, globals);
-
-  // we parse blockquotes first so that we can have headings and hrs
-  // inside blockquotes
-  text = showdown.subParser('blockQuotes')(text, options, globals);
-  text = showdown.subParser('headers')(text, options, globals);
-
-  // Do Horizontal Rules:
-  var key = showdown.subParser('hashBlock')('<hr />', options, globals);
-  text = text.replace(/^[ ]{0,2}([ ]?\*[ ]?){3,}[ \t]*$/gm, key);
-  text = text.replace(/^[ ]{0,2}([ ]?\-[ ]?){3,}[ \t]*$/gm, key);
-  text = text.replace(/^[ ]{0,2}([ ]?_[ ]?){3,}[ \t]*$/gm, key);
-
-  text = showdown.subParser('lists')(text, options, globals);
-  text = showdown.subParser('codeBlocks')(text, options, globals);
-  text = showdown.subParser('tables')(text, options, globals);
-
-  // We already ran _HashHTMLBlocks() before, in Markdown(), but that
-  // was to escape raw HTML in the original Markdown source. This time,
-  // we're escaping the markup we've just created, so that we don't wrap
-  // <p> tags around block-level tags.
-  text = showdown.subParser('hashHTMLBlocks')(text, options, globals);
-  text = showdown.subParser('paragraphs')(text, options, globals);
-
-  text = globals.converter._dispatch('blockGamut.after', text, options, globals);
-
-  return text;
-});
-
-showdown.subParser('blockQuotes', function (text, options, globals) {
-  'use strict';
-
-  text = globals.converter._dispatch('blockQuotes.before', text, options, globals);
-  /*
-   text = text.replace(/
-   (								// Wrap whole match in $1
-   (
-   ^[ \t]*>[ \t]?			// '>' at the start of a line
-   .+\n					// rest of the first line
-   (.+\n)*					// subsequent consecutive lines
-   \n*						// blanks
-   )+
-   )
-   /gm, function(){...});
-   */
-
-  text = text.replace(/((^[ \t]{0,3}>[ \t]?.+\n(.+\n)*\n*)+)/gm, function (wholeMatch, m1) {
-    var bq = m1;
-
-    // attacklab: hack around Konqueror 3.5.4 bug:
-    // "----------bug".replace(/^-/g,"") == "bug"
-    bq = bq.replace(/^[ \t]*>[ \t]?/gm, '~0'); // trim one level of quoting
-
-    // attacklab: clean up hack
-    bq = bq.replace(/~0/g, '');
-
-    bq = bq.replace(/^[ \t]+$/gm, ''); // trim whitespace-only lines
-    bq = showdown.subParser('githubCodeBlocks')(bq, options, globals);
-    bq = showdown.subParser('blockGamut')(bq, options, globals); // recurse
-
-    bq = bq.replace(/(^|\n)/g, '$1  ');
-    // These leading spaces screw with <pre> content, so we need to fix that:
-    bq = bq.replace(/(\s*<pre>[^\r]+?<\/pre>)/gm, function (wholeMatch, m1) {
-      var pre = m1;
-      // attacklab: hack around Konqueror 3.5.4 bug:
-      pre = pre.replace(/^  /mg, '~0');
-      pre = pre.replace(/~0/g, '');
-      return pre;
-    });
-
-    return showdown.subParser('hashBlock')('<blockquote>\n' + bq + '\n</blockquote>', options, globals);
-  });
-
-  text = globals.converter._dispatch('blockQuotes.after', text, options, globals);
-  return text;
-});
-
-/**
- * Process Markdown `<pre><code>` blocks.
- */
-showdown.subParser('codeBlocks', function (text, options, globals) {
-  'use strict';
-
-  text = globals.converter._dispatch('codeBlocks.before', text, options, globals);
-  /*
-   text = text.replace(text,
-   /(?:\n\n|^)
-   (								// $1 = the code block -- one or more lines, starting with a space/tab
-   (?:
-   (?:[ ]{4}|\t)			// Lines must start with a tab or a tab-width of spaces - attacklab: g_tab_width
-   .*\n+
-   )+
-   )
-   (\n*[ ]{0,3}[^ \t\n]|(?=~0))	// attacklab: g_tab_width
-   /g,function(){...});
-   */
-
-  // attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
-  text += '~0';
-
-  var pattern = /(?:\n\n|^)((?:(?:[ ]{4}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=~0))/g;
-  text = text.replace(pattern, function (wholeMatch, m1, m2) {
-    var codeblock = m1,
-        nextChar = m2,
-        end = '\n';
-
-    codeblock = showdown.subParser('outdent')(codeblock);
-    codeblock = showdown.subParser('encodeCode')(codeblock);
-    codeblock = showdown.subParser('detab')(codeblock);
-    codeblock = codeblock.replace(/^\n+/g, ''); // trim leading newlines
-    codeblock = codeblock.replace(/\n+$/g, ''); // trim trailing newlines
-
-    if (options.omitExtraWLInCodeBlocks) {
-      end = '';
-    }
-
-    codeblock = '<pre><code>' + codeblock + end + '</code></pre>';
-
-    return showdown.subParser('hashBlock')(codeblock, options, globals) + nextChar;
-  });
-
-  // attacklab: strip sentinel
-  text = text.replace(/~0/, '');
-
-  text = globals.converter._dispatch('codeBlocks.after', text, options, globals);
-  return text;
-});
-
-/**
- *
- *   *  Backtick quotes are used for <code></code> spans.
- *
- *   *  You can use multiple backticks as the delimiters if you want to
- *     include literal backticks in the code span. So, this input:
- *
- *         Just type ``foo `bar` baz`` at the prompt.
- *
- *       Will translate to:
- *
- *         <p>Just type <code>foo `bar` baz</code> at the prompt.</p>
- *
- *    There's no arbitrary limit to the number of backticks you
- *    can use as delimters. If you need three consecutive backticks
- *    in your code, use four for delimiters, etc.
- *
- *  *  You can use spaces to get literal backticks at the edges:
- *
- *         ... type `` `bar` `` ...
- *
- *       Turns to:
- *
- *         ... type <code>`bar`</code> ...
- */
-showdown.subParser('codeSpans', function (text, options, globals) {
-  'use strict';
-
-  text = globals.converter._dispatch('codeSpans.before', text, options, globals);
-
-  /*
-   text = text.replace(/
-   (^|[^\\])					// Character before opening ` can't be a backslash
-   (`+)						// $2 = Opening run of `
-   (							// $3 = The code block
-   [^\r]*?
-   [^`]					// attacklab: work around lack of lookbehind
-   )
-   \2							// Matching closer
-   (?!`)
-   /gm, function(){...});
-   */
-
-  if (typeof(text) === 'undefined') {
-    text = '';
-  }
-  text = text.replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm,
-    function (wholeMatch, m1, m2, m3) {
-      var c = m3;
-      c = c.replace(/^([ \t]*)/g, '');	// leading whitespace
-      c = c.replace(/[ \t]*$/g, '');	// trailing whitespace
-      c = showdown.subParser('encodeCode')(c);
-      return m1 + '<code>' + c + '</code>';
-    }
-  );
-
-  text = globals.converter._dispatch('codeSpans.after', text, options, globals);
-  return text;
-});
-
-/**
- * Convert all tabs to spaces
- */
-showdown.subParser('detab', function (text) {
-  'use strict';
-
-  // expand first n-1 tabs
-  text = text.replace(/\t(?=\t)/g, '    '); // g_tab_width
-
-  // replace the nth with two sentinels
-  text = text.replace(/\t/g, '~A~B');
-
-  // use the sentinel to anchor our regex so it doesn't explode
-  text = text.replace(/~B(.+?)~A/g, function (wholeMatch, m1) {
-    var leadingText = m1,
-        numSpaces = 4 - leadingText.length % 4;  // g_tab_width
-
-    // there *must* be a better way to do this:
-    for (var i = 0; i < numSpaces; i++) {
-      leadingText += ' ';
-    }
-
-    return leadingText;
-  });
-
-  // clean up sentinels
-  text = text.replace(/~A/g, '    ');  // g_tab_width
-  text = text.replace(/~B/g, '');
-
-  return text;
-
-});
-
-/**
- * Smart processing for ampersands and angle brackets that need to be encoded.
- */
-showdown.subParser('encodeAmpsAndAngles', function (text) {
-  'use strict';
-  // Ampersand-encoding based entirely on Nat Irons's Amputator MT plugin:
-  // http://bumppo.net/projects/amputator/
-  text = text.replace(/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/g, '&amp;');
-
-  // Encode naked <'s
-  text = text.replace(/<(?![a-z\/?\$!])/gi, '&lt;');
-
-  return text;
-});
-
-/**
- * Returns the string, with after processing the following backslash escape sequences.
- *
- * attacklab: The polite way to do this is with the new escapeCharacters() function:
- *
- *    text = escapeCharacters(text,"\\",true);
- *    text = escapeCharacters(text,"`*_{}[]()>#+-.!",true);
- *
- * ...but we're sidestepping its use of the (slow) RegExp constructor
- * as an optimization for Firefox.  This function gets called a LOT.
- */
-showdown.subParser('encodeBackslashEscapes', function (text) {
-  'use strict';
-  text = text.replace(/\\(\\)/g, showdown.helper.escapeCharactersCallback);
-  text = text.replace(/\\([`*_{}\[\]()>#+-.!])/g, showdown.helper.escapeCharactersCallback);
-  return text;
-});
-
-/**
- * Encode/escape certain characters inside Markdown code runs.
- * The point is that in code, these characters are literals,
- * and lose their special Markdown meanings.
- */
-showdown.subParser('encodeCode', function (text) {
-  'use strict';
-
-  // Encode all ampersands; HTML entities are not
-  // entities within a Markdown code span.
-  text = text.replace(/&/g, '&amp;');
-
-  // Do the angle bracket song and dance:
-  text = text.replace(/</g, '&lt;');
-  text = text.replace(/>/g, '&gt;');
-
-  // Now, escape characters that are magic in Markdown:
-  text = showdown.helper.escapeCharacters(text, '*_{}[]\\', false);
-
-  // jj the line above breaks this:
-  //---
-  //* Item
-  //   1. Subitem
-  //            special char: *
-  // ---
-
-  return text;
-});
-
-/**
- *  Input: an email address, e.g. "foo@example.com"
- *
- *  Output: the email address as a mailto link, with each character
- *    of the address encoded as either a decimal or hex entity, in
- *    the hopes of foiling most address harvesting spam bots. E.g.:
- *
- *    <a href="&#x6D;&#97;&#105;&#108;&#x74;&#111;:&#102;&#111;&#111;&#64;&#101;
- *       x&#x61;&#109;&#x70;&#108;&#x65;&#x2E;&#99;&#111;&#109;">&#102;&#111;&#111;
- *       &#64;&#101;x&#x61;&#109;&#x70;&#108;&#x65;&#x2E;&#99;&#111;&#109;</a>
- *
- *  Based on a filter by Matthew Wickline, posted to the BBEdit-Talk
- *  mailing list: <http://tinyurl.com/yu7ue>
- *
- */
-showdown.subParser('encodeEmailAddress', function (addr) {
-  'use strict';
-
-  var encode = [
-    function (ch) {
-      return '&#' + ch.charCodeAt(0) + ';';
-    },
-    function (ch) {
-      return '&#x' + ch.charCodeAt(0).toString(16) + ';';
-    },
-    function (ch) {
-      return ch;
-    }
-  ];
-
-  addr = 'mailto:' + addr;
-
-  addr = addr.replace(/./g, function (ch) {
-    if (ch === '@') {
-      // this *must* be encoded. I insist.
-      ch = encode[Math.floor(Math.random() * 2)](ch);
-    } else if (ch !== ':') {
-      // leave ':' alone (to spot mailto: later)
-      var r = Math.random();
-      // roughly 10% raw, 45% hex, 45% dec
-      ch = (
-        r > 0.9 ? encode[2](ch) : r > 0.45 ? encode[1](ch) : encode[0](ch)
-      );
-    }
-    return ch;
-  });
-
-  addr = '<a href="' + addr + '">' + addr + '</a>';
-  addr = addr.replace(/">.+:/g, '">'); // strip the mailto: from the visible part
-
-  return addr;
-});
-
-/**
- * Within tags -- meaning between < and > -- encode [\ ` * _] so they
- * don't conflict with their use in Markdown for code, italics and strong.
- */
-showdown.subParser('escapeSpecialCharsWithinTagAttributes', function (text) {
-  'use strict';
-
-  // Build a regex to find HTML tags and comments.  See Friedl's
-  // "Mastering Regular Expressions", 2nd Ed., pp. 200-201.
-  var regex = /(<[a-z\/!$]("[^"]*"|'[^']*'|[^'">])*>|<!(--.*?--\s*)+>)/gi;
-
-  text = text.replace(regex, function (wholeMatch) {
-    var tag = wholeMatch.replace(/(.)<\/?code>(?=.)/g, '$1`');
-    tag = showdown.helper.escapeCharacters(tag, '\\`*_', false);
-    return tag;
-  });
-
-  return text;
-});
-
-/**
- * Handle github codeblocks prior to running HashHTML so that
- * HTML contained within the codeblock gets escaped properly
- * Example:
- * ```ruby
- *     def hello_world(x)
- *       puts "Hello, #{x}"
- *     end
- * ```
- */
-showdown.subParser('githubCodeBlocks', function (text, options, globals) {
-  'use strict';
-
-  // early exit if option is not enabled
-  if (!options.ghCodeBlocks) {
-    return text;
-  }
-
-  text = globals.converter._dispatch('githubCodeBlocks.before', text, options, globals);
-
-  text += '~0';
-
-  text = text.replace(/(?:^|\n)```(.*)\n([\s\S]*?)\n```/g, function (wholeMatch, language, codeblock) {
-    var end = (options.omitExtraWLInCodeBlocks) ? '' : '\n';
-
-    // First parse the github code block
-    codeblock = showdown.subParser('encodeCode')(codeblock);
-    codeblock = showdown.subParser('detab')(codeblock);
-    codeblock = codeblock.replace(/^\n+/g, ''); // trim leading newlines
-    codeblock = codeblock.replace(/\n+$/g, ''); // trim trailing whitespace
-
-    codeblock = '<pre><code' + (language ? ' class="' + language + ' language-' + language + '"' : '') + '>' + codeblock + end + '</code></pre>';
-
-    codeblock = showdown.subParser('hashBlock')(codeblock, options, globals);
-
-    // Since GHCodeblocks can be false positives, we need to
-    // store the primitive text and the parsed text in a global var,
-    // and then return a token
-    return '\n\n~G' + (globals.ghCodeBlocks.push({text: wholeMatch, codeblock: codeblock}) - 1) + 'G\n\n';
-  });
-
-  // attacklab: strip sentinel
-  text = text.replace(/~0/, '');
-
-  return globals.converter._dispatch('githubCodeBlocks.after', text, options, globals);
-});
-
-showdown.subParser('hashBlock', function (text, options, globals) {
-  'use strict';
-  text = text.replace(/(^\n+|\n+$)/g, '');
-  return '\n\n~K' + (globals.gHtmlBlocks.push(text) - 1) + 'K\n\n';
-});
-
-showdown.subParser('hashElement', function (text, options, globals) {
-  'use strict';
-
-  return function (wholeMatch, m1) {
-    var blockText = m1;
-
-    // Undo double lines
-    blockText = blockText.replace(/\n\n/g, '\n');
-    blockText = blockText.replace(/^\n/, '');
-
-    // strip trailing blank lines
-    blockText = blockText.replace(/\n+$/g, '');
-
-    // Replace the element text with a marker ("~KxK" where x is its key)
-    blockText = '\n\n~K' + (globals.gHtmlBlocks.push(blockText) - 1) + 'K\n\n';
-
-    return blockText;
-  };
-});
-
-showdown.subParser('hashHTMLBlocks', function (text, options, globals) {
-  'use strict';
-
-  var blockTags = [
-      'pre',
-      'div',
-      'h1',
-      'h2',
-      'h3',
-      'h4',
-      'h5',
-      'h6',
-      'blockquote',
-      'table',
-      'dl',
-      'ol',
-      'ul',
-      'script',
-      'noscript',
-      'form',
-      'fieldset',
-      'iframe',
-      'math',
-      'style',
-      'section',
-      'header',
-      'footer',
-      'nav',
-      'article',
-      'aside',
-      'address',
-      'audio',
-      'canvas',
-      'figure',
-      'hgroup',
-      'output',
-      'video',
-      'p'
-    ],
-    repFunc = function (wholeMatch, match, left, right) {
-      var txt = wholeMatch;
-      // check if this html element is marked as markdown
-      // if so, it's contents should be parsed as markdown
-      if (left.search(/\bmarkdown\b/) !== -1) {
-        txt = left + globals.converter.makeHtml(match) + right;
-      }
-      return '\n\n~K' + (globals.gHtmlBlocks.push(txt) - 1) + 'K\n\n';
-    };
-
-  for (var i = 0; i < blockTags.length; ++i) {
-    text = showdown.helper.replaceRecursiveRegExp(text, repFunc, '^(?: |\\t){0,3}<' + blockTags[i] + '\\b[^>]*>', '</' + blockTags[i] + '>', 'gim');
-  }
-
-  // HR SPECIAL CASE
-  text = text.replace(/(\n[ ]{0,3}(<(hr)\b([^<>])*?\/?>)[ \t]*(?=\n{2,}))/g,
-    showdown.subParser('hashElement')(text, options, globals));
-
-  // Special case for standalone HTML comments:
-  text = text.replace(/(<!--[\s\S]*?-->)/g,
-    showdown.subParser('hashElement')(text, options, globals));
-
-  // PHP and ASP-style processor instructions (<?...?> and <%...%>)
-  text = text.replace(/(?:\n\n)([ ]{0,3}(?:<([?%])[^\r]*?\2>)[ \t]*(?=\n{2,}))/g,
-    showdown.subParser('hashElement')(text, options, globals));
-  return text;
-});
-
-/**
- * Hash span elements that should not be parsed as markdown
- */
-showdown.subParser('hashHTMLSpans', function (text, config, globals) {
-  'use strict';
-
-  var matches = showdown.helper.matchRecursiveRegExp(text, '<code\\b[^>]*>', '</code>', 'gi');
-
-  for (var i = 0; i < matches.length; ++i) {
-    text = text.replace(matches[i][0], '~L' + (globals.gHtmlSpans.push(matches[i][0]) - 1) + 'L');
-  }
-  return text;
-});
-
-/**
- * Unhash HTML spans
- */
-showdown.subParser('unhashHTMLSpans', function (text, config, globals) {
-  'use strict';
-
-  for (var i = 0; i < globals.gHtmlSpans.length; ++i) {
-    text = text.replace('~L' + i + 'L', globals.gHtmlSpans[i]);
-  }
-
-  return text;
-});
-
-/**
- * Hash span elements that should not be parsed as markdown
- */
-showdown.subParser('hashPreCodeTags', function (text, config, globals) {
-  'use strict';
-
-  var repFunc = function (wholeMatch, match, left, right) {
-    // encode html entities
-    var codeblock = left + showdown.subParser('encodeCode')(match) + right;
-    return '\n\n~G' + (globals.ghCodeBlocks.push({text: wholeMatch, codeblock: codeblock}) - 1) + 'G\n\n';
-  };
-
-  text = showdown.helper.replaceRecursiveRegExp(text, repFunc, '^(?: |\\t){0,3}<pre\\b[^>]*>\\s*<code\\b[^>]*>', '^(?: |\\t){0,3}</code>\\s*</pre>', 'gim');
-  return text;
-});
-
-showdown.subParser('headers', function (text, options, globals) {
-  'use strict';
-
-  text = globals.converter._dispatch('headers.before', text, options, globals);
-
-  var prefixHeader = options.prefixHeaderId,
-      headerLevelStart = (isNaN(parseInt(options.headerLevelStart))) ? 1 : parseInt(options.headerLevelStart),
-
-  // Set text-style headers:
-  //	Header 1
-  //	========
-  //
-  //	Header 2
-  //	--------
-  //
-      setextRegexH1 = (options.smoothLivePreview) ? /^(.+)[ \t]*\n={2,}[ \t]*\n+/gm : /^(.+)[ \t]*\n=+[ \t]*\n+/gm,
-      setextRegexH2 = (options.smoothLivePreview) ? /^(.+)[ \t]*\n-{2,}[ \t]*\n+/gm : /^(.+)[ \t]*\n-+[ \t]*\n+/gm;
-
-  text = text.replace(setextRegexH1, function (wholeMatch, m1) {
-
-    var spanGamut = showdown.subParser('spanGamut')(m1, options, globals),
-        hID = (options.noHeaderId) ? '' : ' id="' + headerId(m1) + '"',
-        hLevel = headerLevelStart,
-        hashBlock = '<h' + hLevel + hID + '>' + spanGamut + '</h' + hLevel + '>';
-    return showdown.subParser('hashBlock')(hashBlock, options, globals);
-  });
-
-  text = text.replace(setextRegexH2, function (matchFound, m1) {
-    var spanGamut = showdown.subParser('spanGamut')(m1, options, globals),
-        hID = (options.noHeaderId) ? '' : ' id="' + headerId(m1) + '"',
-        hLevel = headerLevelStart + 1,
-      hashBlock = '<h' + hLevel + hID + '>' + spanGamut + '</h' + hLevel + '>';
-    return showdown.subParser('hashBlock')(hashBlock, options, globals);
-  });
-
-  // atx-style headers:
-  //  # Header 1
-  //  ## Header 2
-  //  ## Header 2 with closing hashes ##
-  //  ...
-  //  ###### Header 6
-  //
-  text = text.replace(/^(#{1,6})[ \t]*(.+?)[ \t]*#*\n+/gm, function (wholeMatch, m1, m2) {
-    var span = showdown.subParser('spanGamut')(m2, options, globals),
-        hID = (options.noHeaderId) ? '' : ' id="' + headerId(m2) + '"',
-        hLevel = headerLevelStart - 1 + m1.length,
-        header = '<h' + hLevel + hID + '>' + span + '</h' + hLevel + '>';
-
-    return showdown.subParser('hashBlock')(header, options, globals);
-  });
-
-  function headerId(m) {
-    var title, escapedId = m.replace(/[^\w]/g, '').toLowerCase();
-
-    if (globals.hashLinkCounts[escapedId]) {
-      title = escapedId + '-' + (globals.hashLinkCounts[escapedId]++);
-    } else {
-      title = escapedId;
-      globals.hashLinkCounts[escapedId] = 1;
-    }
-
-    // Prefix id to prevent causing inadvertent pre-existing style matches.
-    if (prefixHeader === true) {
-      prefixHeader = 'section';
-    }
-
-    if (showdown.helper.isString(prefixHeader)) {
-      return prefixHeader + title;
-    }
-    return title;
-  }
-
-  text = globals.converter._dispatch('headers.after', text, options, globals);
-  return text;
-});
-
-/**
- * Turn Markdown image shortcuts into <img> tags.
- */
-showdown.subParser('images', function (text, options, globals) {
-  'use strict';
-
-  text = globals.converter._dispatch('images.before', text, options, globals);
-
-  var inlineRegExp    = /!\[(.*?)]\s?\([ \t]*()<?(\S+?)>?(?: =([*\d]+[A-Za-z%]{0,4})x([*\d]+[A-Za-z%]{0,4}))?[ \t]*(?:(['"])(.*?)\6[ \t]*)?\)/g,
-      referenceRegExp = /!\[([^\]]*?)] ?(?:\n *)?\[(.*?)]()()()()()/g;
-
-  function writeImageTag (wholeMatch, altText, linkId, url, width, height, m5, title) {
-
-    var gUrls   = globals.gUrls,
-        gTitles = globals.gTitles,
-        gDims   = globals.gDimensions;
-
-    linkId = linkId.toLowerCase();
-
-    if (!title) {
-      title = '';
-    }
-
-    if (url === '' || url === null) {
-      if (linkId === '' || linkId === null) {
-        // lower-case and turn embedded newlines into spaces
-        linkId = altText.toLowerCase().replace(/ ?\n/g, ' ');
-      }
-      url = '#' + linkId;
-
-      if (!showdown.helper.isUndefined(gUrls[linkId])) {
-        url = gUrls[linkId];
-        if (!showdown.helper.isUndefined(gTitles[linkId])) {
-          title = gTitles[linkId];
-        }
-        if (!showdown.helper.isUndefined(gDims[linkId])) {
-          width = gDims[linkId].width;
-          height = gDims[linkId].height;
-        }
-      } else {
-        return wholeMatch;
-      }
-    }
-
-    altText = altText.replace(/"/g, '&quot;');
-    altText = showdown.helper.escapeCharacters(altText, '*_', false);
-    url = showdown.helper.escapeCharacters(url, '*_', false);
-    var result = '<img src="' + url + '" alt="' + altText + '"';
-
-    if (title) {
-      title = title.replace(/"/g, '&quot;');
-      title = showdown.helper.escapeCharacters(title, '*_', false);
-      result += ' title="' + title + '"';
-    }
-
-    if (width && height) {
-      width  = (width === '*') ? 'auto' : width;
-      height = (height === '*') ? 'auto' : height;
-
-      result += ' width="' + width + '"';
-      result += ' height="' + height + '"';
-    }
-
-    result += ' />';
-    return result;
-  }
-
-  // First, handle reference-style labeled images: ![alt text][id]
-  text = text.replace(referenceRegExp, writeImageTag);
-
-  // Next, handle inline images:  ![alt text](url =<width>x<height> "optional title")
-  text = text.replace(inlineRegExp, writeImageTag);
-
-  text = globals.converter._dispatch('images.after', text, options, globals);
-  return text;
-});
-
-showdown.subParser('italicsAndBold', function (text, options, globals) {
-  'use strict';
-
-  text = globals.converter._dispatch('italicsAndBold.before', text, options, globals);
-
-  if (options.literalMidWordUnderscores) {
-    //underscores
-    // Since we are consuming a \s character, we need to add it
-    text = text.replace(/(^|\s|>|\b)__(?=\S)([\s\S]+?)__(?=\b|<|\s|$)/gm, '$1<strong>$2</strong>');
-    text = text.replace(/(^|\s|>|\b)_(?=\S)([\s\S]+?)_(?=\b|<|\s|$)/gm, '$1<em>$2</em>');
-    //asterisks
-    text = text.replace(/(\*\*)(?=\S)([^\r]*?\S[*]*)\1/g, '<strong>$2</strong>');
-    text = text.replace(/(\*)(?=\S)([^\r]*?\S)\1/g, '<em>$2</em>');
-
-  } else {
-    // <strong> must go first:
-    text = text.replace(/(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g, '<strong>$2</strong>');
-    text = text.replace(/(\*|_)(?=\S)([^\r]*?\S)\1/g, '<em>$2</em>');
-  }
-
-  text = globals.converter._dispatch('italicsAndBold.after', text, options, globals);
-  return text;
-});
-
-/**
- * Form HTML ordered (numbered) and unordered (bulleted) lists.
- */
-showdown.subParser('lists', function (text, options, globals) {
-  'use strict';
-
-  text = globals.converter._dispatch('lists.before', text, options, globals);
-  /**
-   * Process the contents of a single ordered or unordered list, splitting it
-   * into individual list items.
-   * @param {string} listStr
-   * @param {boolean} trimTrailing
-   * @returns {string}
-   */
-  function processListItems (listStr, trimTrailing) {
-    // The $g_list_level global keeps track of when we're inside a list.
-    // Each time we enter a list, we increment it; when we leave a list,
-    // we decrement. If it's zero, we're not in a list anymore.
-    //
-    // We do this because when we're not inside a list, we want to treat
-    // something like this:
-    //
-    //    I recommend upgrading to version
-    //    8. Oops, now this line is treated
-    //    as a sub-list.
-    //
-    // As a single paragraph, despite the fact that the second line starts
-    // with a digit-period-space sequence.
-    //
-    // Whereas when we're inside a list (or sub-list), that line will be
-    // treated as the start of a sub-list. What a kludge, huh? This is
-    // an aspect of Markdown's syntax that's hard to parse perfectly
-    // without resorting to mind-reading. Perhaps the solution is to
-    // change the syntax rules such that sub-lists must start with a
-    // starting cardinal number; e.g. "1." or "a.".
-    globals.gListLevel++;
-
-    // trim trailing blank lines:
-    listStr = listStr.replace(/\n{2,}$/, '\n');
-
-    // attacklab: add sentinel to emulate \z
-    listStr += '~0';
-
-    var rgx = /(\n)?(^[ \t]*)([*+-]|\d+[.])[ \t]+((\[(x|X| )?])?[ \t]*[^\r]+?(\n{1,2}))(?=\n*(~0|\2([*+-]|\d+[.])[ \t]+))/gm,
-        isParagraphed = (/\n[ \t]*\n(?!~0)/.test(listStr));
-
-    listStr = listStr.replace(rgx, function (wholeMatch, m1, m2, m3, m4, taskbtn, checked) {
-      checked = (checked && checked.trim() !== '');
-      var item = showdown.subParser('outdent')(m4, options, globals),
-          bulletStyle = '';
-
-      // Support for github tasklists
-      if (taskbtn && options.tasklists) {
-        bulletStyle = ' class="task-list-item" style="list-style-type: none;"';
-        item = item.replace(/^[ \t]*\[(x|X| )?]/m, function () {
-          var otp = '<input type="checkbox" disabled style="margin: 0px 0.35em 0.25em -1.6em; vertical-align: middle;"';
-          if (checked) {
-            otp += ' checked';
-          }
-          otp += '>';
-          return otp;
-        });
-      }
-      // m1 - Leading line or
-      // Has a double return (multi paragraph) or
-      // Has sublist
-      if (m1 || (item.search(/\n{2,}/) > -1)) {
-        item = showdown.subParser('githubCodeBlocks')(item, options, globals);
-        item = showdown.subParser('blockGamut')(item, options, globals);
-      } else {
-        // Recursion for sub-lists:
-        item = showdown.subParser('lists')(item, options, globals);
-        item = item.replace(/\n$/, ''); // chomp(item)
-        if (isParagraphed) {
-          item = showdown.subParser('paragraphs')(item, options, globals);
-        } else {
-          item = showdown.subParser('spanGamut')(item, options, globals);
-        }
-      }
-      item =  '\n<li' + bulletStyle + '>' + item + '</li>\n';
-      return item;
-    });
-
-    // attacklab: strip sentinel
-    listStr = listStr.replace(/~0/g, '');
-
-    globals.gListLevel--;
-
-    if (trimTrailing) {
-      listStr = listStr.replace(/\s+$/, '');
-    }
-
-    return listStr;
-  }
-
-  /**
-   * Check and parse consecutive lists (better fix for issue #142)
-   * @param {string} list
-   * @param {string} listType
-   * @param {boolean} trimTrailing
-   * @returns {string}
-   */
-  function parseConsecutiveLists(list, listType, trimTrailing) {
-    // check if we caught 2 or more consecutive lists by mistake
-    // we use the counterRgx, meaning if listType is UL we look for UL and vice versa
-    var counterRxg = (listType === 'ul') ? /^ {0,2}\d+\.[ \t]/gm : /^ {0,2}[*+-][ \t]/gm,
-      subLists = [],
-      result = '';
-
-    if (list.search(counterRxg) !== -1) {
-      (function parseCL(txt) {
-        var pos = txt.search(counterRxg);
-        if (pos !== -1) {
-          // slice
-          result += '\n\n<' + listType + '>' + processListItems(txt.slice(0, pos), !!trimTrailing) + '</' + listType + '>\n\n';
-
-          // invert counterType and listType
-          listType = (listType === 'ul') ? 'ol' : 'ul';
-          counterRxg = (listType === 'ul') ? /^ {0,2}\d+\.[ \t]/gm : /^ {0,2}[*+-][ \t]/gm;
-
-          //recurse
-          parseCL(txt.slice(pos));
-        } else {
-          result += '\n\n<' + listType + '>' + processListItems(txt, !!trimTrailing) + '</' + listType + '>\n\n';
-        }
-      })(list);
-      for (var i = 0; i < subLists.length; ++i) {
-
-      }
-    } else {
-      result = '\n\n<' + listType + '>' + processListItems(list, !!trimTrailing) + '</' + listType + '>\n\n';
-    }
-
-    return result;
-  }
-
-  // attacklab: add sentinel to hack around khtml/safari bug:
-  // http://bugs.webkit.org/show_bug.cgi?id=11231
-  text += '~0';
-
-  // Re-usable pattern to match any entire ul or ol list:
-  var wholeList = /^(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/gm;
-
-  if (globals.gListLevel) {
-    text = text.replace(wholeList, function (wholeMatch, list, m2) {
-      var listType = (m2.search(/[*+-]/g) > -1) ? 'ul' : 'ol';
-      return parseConsecutiveLists(list, listType, true);
-    });
-  } else {
-    wholeList = /(\n\n|^\n?)(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/gm;
-    //wholeList = /(\n\n|^\n?)( {0,3}([*+-]|\d+\.)[ \t]+[\s\S]+?)(?=(~0)|(\n\n(?!\t| {2,}| {0,3}([*+-]|\d+\.)[ \t])))/g;
-    text = text.replace(wholeList, function (wholeMatch, m1, list, m3) {
-
-      var listType = (m3.search(/[*+-]/g) > -1) ? 'ul' : 'ol';
-      return parseConsecutiveLists(list, listType);
-    });
-  }
-
-  // attacklab: strip sentinel
-  text = text.replace(/~0/, '');
-
-  text = globals.converter._dispatch('lists.after', text, options, globals);
-  return text;
-});
-
-/**
- * Remove one level of line-leading tabs or spaces
- */
-showdown.subParser('outdent', function (text) {
-  'use strict';
-
-  // attacklab: hack around Konqueror 3.5.4 bug:
-  // "----------bug".replace(/^-/g,"") == "bug"
-  text = text.replace(/^(\t|[ ]{1,4})/gm, '~0'); // attacklab: g_tab_width
-
-  // attacklab: clean up hack
-  text = text.replace(/~0/g, '');
-
-  return text;
-});
-
-/**
- *
- */
-showdown.subParser('paragraphs', function (text, options, globals) {
-  'use strict';
-
-  text = globals.converter._dispatch('paragraphs.before', text, options, globals);
-  // Strip leading and trailing lines:
-  text = text.replace(/^\n+/g, '');
-  text = text.replace(/\n+$/g, '');
-
-  var grafs = text.split(/\n{2,}/g),
-      grafsOut = [],
-      end = grafs.length; // Wrap <p> tags
-
-  for (var i = 0; i < end; i++) {
-    var str = grafs[i];
-    // if this is an HTML marker, copy it
-    if (str.search(/~(K|G)(\d+)\1/g) >= 0) {
-      grafsOut.push(str);
-    } else {
-      str = showdown.subParser('spanGamut')(str, options, globals);
-      str = str.replace(/^([ \t]*)/g, '<p>');
-      str += '</p>';
-      grafsOut.push(str);
-    }
-  }
-
-  /** Unhashify HTML blocks */
-  end = grafsOut.length;
-  for (i = 0; i < end; i++) {
-    var blockText = '',
-        grafsOutIt = grafsOut[i],
-        codeFlag = false;
-    // if this is a marker for an html block...
-    while (grafsOutIt.search(/~(K|G)(\d+)\1/) >= 0) {
-      var delim = RegExp.$1,
-          num   = RegExp.$2;
-
-      if (delim === 'K') {
-        blockText = globals.gHtmlBlocks[num];
-      } else {
-        // we need to check if ghBlock is a false positive
-        if (codeFlag) {
-          // use encoded version of all text
-          blockText = showdown.subParser('encodeCode')(globals.ghCodeBlocks[num].text);
-        } else {
-          blockText = globals.ghCodeBlocks[num].codeblock;
-        }
-      }
-      blockText = blockText.replace(/\$/g, '$$$$'); // Escape any dollar signs
-
-      grafsOutIt = grafsOutIt.replace(/(\n\n)?~(K|G)\d+\2(\n\n)?/, blockText);
-      // Check if grafsOutIt is a pre->code
-      if (/^<pre\b[^>]*>\s*<code\b[^>]*>/.test(grafsOutIt)) {
-        codeFlag = true;
-      }
-    }
-    grafsOut[i] = grafsOutIt;
-  }
-  text = grafsOut.join('\n\n');
-  // Strip leading and trailing lines:
-  text = text.replace(/^\n+/g, '');
-  text = text.replace(/\n+$/g, '');
-  return globals.converter._dispatch('paragraphs.after', text, options, globals);
-});
-
-/**
- * Run extension
- */
-showdown.subParser('runExtension', function (ext, text, options, globals) {
-  'use strict';
-
-  if (ext.filter) {
-    text = ext.filter(text, globals.converter, options);
-
-  } else if (ext.regex) {
-    // TODO remove this when old extension loading mechanism is deprecated
-    var re = ext.regex;
-    if (!re instanceof RegExp) {
-      re = new RegExp(re, 'g');
-    }
-    text = text.replace(re, ext.replace);
-  }
-
-  return text;
-});
-
-/**
- * These are all the transformations that occur *within* block-level
- * tags like paragraphs, headers, and list items.
- */
-showdown.subParser('spanGamut', function (text, options, globals) {
-  'use strict';
-
-  text = globals.converter._dispatch('spanGamut.before', text, options, globals);
-  text = showdown.subParser('codeSpans')(text, options, globals);
-  text = showdown.subParser('escapeSpecialCharsWithinTagAttributes')(text, options, globals);
-  text = showdown.subParser('encodeBackslashEscapes')(text, options, globals);
-
-  // Process anchor and image tags. Images must come first,
-  // because ![foo][f] looks like an anchor.
-  text = showdown.subParser('images')(text, options, globals);
-  text = showdown.subParser('anchors')(text, options, globals);
-
-  // Make links out of things like `<http://example.com/>`
-  // Must come after _DoAnchors(), because you can use < and >
-  // delimiters in inline links like [this](<url>).
-  text = showdown.subParser('autoLinks')(text, options, globals);
-  text = showdown.subParser('encodeAmpsAndAngles')(text, options, globals);
-  text = showdown.subParser('italicsAndBold')(text, options, globals);
-  text = showdown.subParser('strikethrough')(text, options, globals);
-
-  // Do hard breaks:
-  text = text.replace(/  +\n/g, ' <br />\n');
-
-  text = globals.converter._dispatch('spanGamut.after', text, options, globals);
-  return text;
-});
-
-showdown.subParser('strikethrough', function (text, options, globals) {
-  'use strict';
-
-  if (options.strikethrough) {
-    text = globals.converter._dispatch('strikethrough.before', text, options, globals);
-    text = text.replace(/(?:~T){2}([\s\S]+?)(?:~T){2}/g, '<del>$1</del>');
-    text = globals.converter._dispatch('strikethrough.after', text, options, globals);
-  }
-
-  return text;
-});
-
-/**
- * Strip any lines consisting only of spaces and tabs.
- * This makes subsequent regexs easier to write, because we can
- * match consecutive blank lines with /\n+/ instead of something
- * contorted like /[ \t]*\n+/
- */
-showdown.subParser('stripBlankLines', function (text) {
-  'use strict';
-  return text.replace(/^[ \t]+$/mg, '');
-});
-
-/**
- * Strips link definitions from text, stores the URLs and titles in
- * hash references.
- * Link defs are in the form: ^[id]: url "optional title"
- *
- * ^[ ]{0,3}\[(.+)\]: // id = $1  attacklab: g_tab_width - 1
- * [ \t]*
- * \n?                  // maybe *one* newline
- * [ \t]*
- * <?(\S+?)>?          // url = $2
- * [ \t]*
- * \n?                // maybe one newline
- * [ \t]*
- * (?:
- * (\n*)              // any lines skipped = $3 attacklab: lookbehind removed
- * ["(]
- * (.+?)              // title = $4
- * [")]
- * [ \t]*
- * )?                 // title is optional
- * (?:\n+|$)
- * /gm,
- * function(){...});
- *
- */
-showdown.subParser('stripLinkDefinitions', function (text, options, globals) {
-  'use strict';
-
-  var regex = /^ {0,3}\[(.+)]:[ \t]*\n?[ \t]*<?(\S+?)>?(?: =([*\d]+[A-Za-z%]{0,4})x([*\d]+[A-Za-z%]{0,4}))?[ \t]*\n?[ \t]*(?:(\n*)["|'(](.+?)["|')][ \t]*)?(?:\n+|(?=~0))/gm;
-
-  // attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
-  text += '~0';
-
-  text = text.replace(regex, function (wholeMatch, linkId, url, width, height, blankLines, title) {
-    linkId = linkId.toLowerCase();
-    globals.gUrls[linkId] = showdown.subParser('encodeAmpsAndAngles')(url);  // Link IDs are case-insensitive
-
-    if (blankLines) {
-      // Oops, found blank lines, so it's not a title.
-      // Put back the parenthetical statement we stole.
-      return blankLines + title;
-
-    } else {
-      if (title) {
-        globals.gTitles[linkId] = title.replace(/"|'/g, '&quot;');
-      }
-      if (options.parseImgDimensions && width && height) {
-        globals.gDimensions[linkId] = {
-          width:  width,
-          height: height
-        };
-      }
-    }
-    // Completely remove the definition from the text
-    return '';
-  });
-
-  // attacklab: strip sentinel
-  text = text.replace(/~0/, '');
-
-  return text;
-});
-
-showdown.subParser('tables', function (text, options, globals) {
-  'use strict';
-
-  if (!options.tables) {
-    return text;
-  }
-
-  var tableRgx = /^[ \t]{0,3}\|?.+\|.+\n[ \t]{0,3}\|?[ \t]*:?[ \t]*(?:-|=){2,}[ \t]*:?[ \t]*\|[ \t]*:?[ \t]*(?:-|=){2,}[\s\S]+?(?:\n\n|~0)/gm;
-
-  function parseStyles(sLine) {
-    if (/^:[ \t]*--*$/.test(sLine)) {
-      return ' style="text-align:left;"';
-    } else if (/^--*[ \t]*:[ \t]*$/.test(sLine)) {
-      return ' style="text-align:right;"';
-    } else if (/^:[ \t]*--*[ \t]*:$/.test(sLine)) {
-      return ' style="text-align:center;"';
-    } else {
-      return '';
-    }
-  }
-
-  function parseHeaders(header, style) {
-    var id = '';
-    header = header.trim();
-    if (options.tableHeaderId) {
-      id = ' id="' + header.replace(/ /g, '_').toLowerCase() + '"';
-    }
-    header = showdown.subParser('spanGamut')(header, options, globals);
-
-    return '<th' + id + style + '>' + header + '</th>\n';
-  }
-
-  function parseCells(cell, style) {
-    var subText = showdown.subParser('spanGamut')(cell, options, globals);
-    return '<td' + style + '>' + subText + '</td>\n';
-  }
-
-  function buildTable(headers, cells) {
-    var tb = '<table>\n<thead>\n<tr>\n',
-        tblLgn = headers.length;
-
-    for (var i = 0; i < tblLgn; ++i) {
-      tb += headers[i];
-    }
-    tb += '</tr>\n</thead>\n<tbody>\n';
-
-    for (i = 0; i < cells.length; ++i) {
-      tb += '<tr>\n';
-      for (var ii = 0; ii < tblLgn; ++ii) {
-        tb += cells[i][ii];
-      }
-      tb += '</tr>\n';
-    }
-    tb += '</tbody>\n</table>\n';
-    return tb;
-  }
-
-  text = globals.converter._dispatch('tables.before', text, options, globals);
-
-  text = text.replace(tableRgx, function (rawTable) {
-
-    var i, tableLines = rawTable.split('\n');
-
-    // strip wrong first and last column if wrapped tables are used
-    for (i = 0; i < tableLines.length; ++i) {
-      if (/^[ \t]{0,3}\|/.test(tableLines[i])) {
-        tableLines[i] = tableLines[i].replace(/^[ \t]{0,3}\|/, '');
-      }
-      if (/\|[ \t]*$/.test(tableLines[i])) {
-        tableLines[i] = tableLines[i].replace(/\|[ \t]*$/, '');
-      }
-    }
-
-    var rawHeaders = tableLines[0].split('|').map(function (s) { return s.trim();}),
-        rawStyles = tableLines[1].split('|').map(function (s) { return s.trim();}),
-        rawCells = [],
-        headers = [],
-        styles = [],
-        cells = [];
-
-    tableLines.shift();
-    tableLines.shift();
-
-    for (i = 0; i < tableLines.length; ++i) {
-      if (tableLines[i].trim() === '') {
-        continue;
-      }
-      rawCells.push(
-        tableLines[i]
-          .split('|')
-          .map(function (s) {
-            return s.trim();
-          })
-      );
-    }
-
-    if (rawHeaders.length < rawStyles.length) {
-      return rawTable;
-    }
-
-    for (i = 0; i < rawStyles.length; ++i) {
-      styles.push(parseStyles(rawStyles[i]));
-    }
-
-    for (i = 0; i < rawHeaders.length; ++i) {
-      if (showdown.helper.isUndefined(styles[i])) {
-        styles[i] = '';
-      }
-      headers.push(parseHeaders(rawHeaders[i], styles[i]));
-    }
-
-    for (i = 0; i < rawCells.length; ++i) {
-      var row = [];
-      for (var ii = 0; ii < headers.length; ++ii) {
-        if (showdown.helper.isUndefined(rawCells[i][ii])) {
-
-        }
-        row.push(parseCells(rawCells[i][ii], styles[ii]));
-      }
-      cells.push(row);
-    }
-
-    return buildTable(headers, cells);
-  });
-
-  text = globals.converter._dispatch('tables.after', text, options, globals);
-
-  return text;
-});
-
-/**
- * Swap back in all the special characters we've hidden.
- */
-showdown.subParser('unescapeSpecialChars', function (text) {
-  'use strict';
-
-  text = text.replace(/~E(\d+)E/g, function (wholeMatch, m1) {
-    var charCodeToReplace = parseInt(m1);
-    return String.fromCharCode(charCodeToReplace);
-  });
-  return text;
-});
-module.exports = showdown;
+/**
+ * author: Di (微信小程序开发工程师)
+ * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
+ *               垂直微信小程序开发交流社区
+ * 
+ * github地址: https://github.com/icindy/wxParse
+ * 
+ * for: 微信小程序富文本解析
+ * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
+ */
+
+function getDefaultOpts(simple) {
+  'use strict';
+
+  var defaultOptions = {
+    omitExtraWLInCodeBlocks: {
+      defaultValue: false,
+      describe: 'Omit the default extra whiteline added to code blocks',
+      type: 'boolean'
+    },
+    noHeaderId: {
+      defaultValue: false,
+      describe: 'Turn on/off generated header id',
+      type: 'boolean'
+    },
+    prefixHeaderId: {
+      defaultValue: false,
+      describe: 'Specify a prefix to generated header ids',
+      type: 'string'
+    },
+    headerLevelStart: {
+      defaultValue: false,
+      describe: 'The header blocks level start',
+      type: 'integer'
+    },
+    parseImgDimensions: {
+      defaultValue: false,
+      describe: 'Turn on/off image dimension parsing',
+      type: 'boolean'
+    },
+    simplifiedAutoLink: {
+      defaultValue: false,
+      describe: 'Turn on/off GFM autolink style',
+      type: 'boolean'
+    },
+    literalMidWordUnderscores: {
+      defaultValue: false,
+      describe: 'Parse midword underscores as literal underscores',
+      type: 'boolean'
+    },
+    strikethrough: {
+      defaultValue: false,
+      describe: 'Turn on/off strikethrough support',
+      type: 'boolean'
+    },
+    tables: {
+      defaultValue: false,
+      describe: 'Turn on/off tables support',
+      type: 'boolean'
+    },
+    tablesHeaderId: {
+      defaultValue: false,
+      describe: 'Add an id to table headers',
+      type: 'boolean'
+    },
+    ghCodeBlocks: {
+      defaultValue: true,
+      describe: 'Turn on/off GFM fenced code blocks support',
+      type: 'boolean'
+    },
+    tasklists: {
+      defaultValue: false,
+      describe: 'Turn on/off GFM tasklist support',
+      type: 'boolean'
+    },
+    smoothLivePreview: {
+      defaultValue: false,
+      describe: 'Prevents weird effects in live previews due to incomplete input',
+      type: 'boolean'
+    },
+    smartIndentationFix: {
+      defaultValue: false,
+      description: 'Tries to smartly fix identation in es6 strings',
+      type: 'boolean'
+    }
+  };
+  if (simple === false) {
+    return JSON.parse(JSON.stringify(defaultOptions));
+  }
+  var ret = {};
+  for (var opt in defaultOptions) {
+    if (defaultOptions.hasOwnProperty(opt)) {
+      ret[opt] = defaultOptions[opt].defaultValue;
+    }
+  }
+  return ret;
+}
+
+/**
+ * Created by Tivie on 06-01-2015.
+ */
+
+// Private properties
+var showdown = {},
+    parsers = {},
+    extensions = {},
+    globalOptions = getDefaultOpts(true),
+    flavor = {
+      github: {
+        omitExtraWLInCodeBlocks:   true,
+        prefixHeaderId:            'user-content-',
+        simplifiedAutoLink:        true,
+        literalMidWordUnderscores: true,
+        strikethrough:             true,
+        tables:                    true,
+        tablesHeaderId:            true,
+        ghCodeBlocks:              true,
+        tasklists:                 true
+      },
+      vanilla: getDefaultOpts(true)
+    };
+
+/**
+ * helper namespace
+ * @type {{}}
+ */
+showdown.helper = {};
+
+/**
+ * TODO LEGACY SUPPORT CODE
+ * @type {{}}
+ */
+showdown.extensions = {};
+
+/**
+ * Set a global option
+ * @static
+ * @param {string} key
+ * @param {*} value
+ * @returns {showdown}
+ */
+showdown.setOption = function (key, value) {
+  'use strict';
+  globalOptions[key] = value;
+  return this;
+};
+
+/**
+ * Get a global option
+ * @static
+ * @param {string} key
+ * @returns {*}
+ */
+showdown.getOption = function (key) {
+  'use strict';
+  return globalOptions[key];
+};
+
+/**
+ * Get the global options
+ * @static
+ * @returns {{}}
+ */
+showdown.getOptions = function () {
+  'use strict';
+  return globalOptions;
+};
+
+/**
+ * Reset global options to the default values
+ * @static
+ */
+showdown.resetOptions = function () {
+  'use strict';
+  globalOptions = getDefaultOpts(true);
+};
+
+/**
+ * Set the flavor showdown should use as default
+ * @param {string} name
+ */
+showdown.setFlavor = function (name) {
+  'use strict';
+  if (flavor.hasOwnProperty(name)) {
+    var preset = flavor[name];
+    for (var option in preset) {
+      if (preset.hasOwnProperty(option)) {
+        globalOptions[option] = preset[option];
+      }
+    }
+  }
+};
+
+/**
+ * Get the default options
+ * @static
+ * @param {boolean} [simple=true]
+ * @returns {{}}
+ */
+showdown.getDefaultOptions = function (simple) {
+  'use strict';
+  return getDefaultOpts(simple);
+};
+
+/**
+ * Get or set a subParser
+ *
+ * subParser(name)       - Get a registered subParser
+ * subParser(name, func) - Register a subParser
+ * @static
+ * @param {string} name
+ * @param {function} [func]
+ * @returns {*}
+ */
+showdown.subParser = function (name, func) {
+  'use strict';
+  if (showdown.helper.isString(name)) {
+    if (typeof func !== 'undefined') {
+      parsers[name] = func;
+    } else {
+      if (parsers.hasOwnProperty(name)) {
+        return parsers[name];
+      } else {
+        throw Error('SubParser named ' + name + ' not registered!');
+      }
+    }
+  }
+};
+
+/**
+ * Gets or registers an extension
+ * @static
+ * @param {string} name
+ * @param {object|function=} ext
+ * @returns {*}
+ */
+showdown.extension = function (name, ext) {
+  'use strict';
+
+  if (!showdown.helper.isString(name)) {
+    throw Error('Extension \'name\' must be a string');
+  }
+
+  name = showdown.helper.stdExtName(name);
+
+  // Getter
+  if (showdown.helper.isUndefined(ext)) {
+    if (!extensions.hasOwnProperty(name)) {
+      throw Error('Extension named ' + name + ' is not registered!');
+    }
+    return extensions[name];
+
+    // Setter
+  } else {
+    // Expand extension if it's wrapped in a function
+    if (typeof ext === 'function') {
+      ext = ext();
+    }
+
+    // Ensure extension is an array
+    if (!showdown.helper.isArray(ext)) {
+      ext = [ext];
+    }
+
+    var validExtension = validate(ext, name);
+
+    if (validExtension.valid) {
+      extensions[name] = ext;
+    } else {
+      throw Error(validExtension.error);
+    }
+  }
+};
+
+/**
+ * Gets all extensions registered
+ * @returns {{}}
+ */
+showdown.getAllExtensions = function () {
+  'use strict';
+  return extensions;
+};
+
+/**
+ * Remove an extension
+ * @param {string} name
+ */
+showdown.removeExtension = function (name) {
+  'use strict';
+  delete extensions[name];
+};
+
+/**
+ * Removes all extensions
+ */
+showdown.resetExtensions = function () {
+  'use strict';
+  extensions = {};
+};
+
+/**
+ * Validate extension
+ * @param {array} extension
+ * @param {string} name
+ * @returns {{valid: boolean, error: string}}
+ */
+function validate(extension, name) {
+  'use strict';
+
+  var errMsg = (name) ? 'Error in ' + name + ' extension->' : 'Error in unnamed extension',
+    ret = {
+      valid: true,
+      error: ''
+    };
+
+  if (!showdown.helper.isArray(extension)) {
+    extension = [extension];
+  }
+
+  for (var i = 0; i < extension.length; ++i) {
+    var baseMsg = errMsg + ' sub-extension ' + i + ': ',
+        ext = extension[i];
+    if (typeof ext !== 'object') {
+      ret.valid = false;
+      ret.error = baseMsg + 'must be an object, but ' + typeof ext + ' given';
+      return ret;
+    }
+
+    if (!showdown.helper.isString(ext.type)) {
+      ret.valid = false;
+      ret.error = baseMsg + 'property "type" must be a string, but ' + typeof ext.type + ' given';
+      return ret;
+    }
+
+    var type = ext.type = ext.type.toLowerCase();
+
+    // normalize extension type
+    if (type === 'language') {
+      type = ext.type = 'lang';
+    }
+
+    if (type === 'html') {
+      type = ext.type = 'output';
+    }
+
+    if (type !== 'lang' && type !== 'output' && type !== 'listener') {
+      ret.valid = false;
+      ret.error = baseMsg + 'type ' + type + ' is not recognized. Valid values: "lang/language", "output/html" or "listener"';
+      return ret;
+    }
+
+    if (type === 'listener') {
+      if (showdown.helper.isUndefined(ext.listeners)) {
+        ret.valid = false;
+        ret.error = baseMsg + '. Extensions of type "listener" must have a property called "listeners"';
+        return ret;
+      }
+    } else {
+      if (showdown.helper.isUndefined(ext.filter) && showdown.helper.isUndefined(ext.regex)) {
+        ret.valid = false;
+        ret.error = baseMsg + type + ' extensions must define either a "regex" property or a "filter" method';
+        return ret;
+      }
+    }
+
+    if (ext.listeners) {
+      if (typeof ext.listeners !== 'object') {
+        ret.valid = false;
+        ret.error = baseMsg + '"listeners" property must be an object but ' + typeof ext.listeners + ' given';
+        return ret;
+      }
+      for (var ln in ext.listeners) {
+        if (ext.listeners.hasOwnProperty(ln)) {
+          if (typeof ext.listeners[ln] !== 'function') {
+            ret.valid = false;
+            ret.error = baseMsg + '"listeners" property must be an hash of [event name]: [callback]. listeners.' + ln +
+              ' must be a function but ' + typeof ext.listeners[ln] + ' given';
+            return ret;
+          }
+        }
+      }
+    }
+
+    if (ext.filter) {
+      if (typeof ext.filter !== 'function') {
+        ret.valid = false;
+        ret.error = baseMsg + '"filter" must be a function, but ' + typeof ext.filter + ' given';
+        return ret;
+      }
+    } else if (ext.regex) {
+      if (showdown.helper.isString(ext.regex)) {
+        ext.regex = new RegExp(ext.regex, 'g');
+      }
+      if (!ext.regex instanceof RegExp) {
+        ret.valid = false;
+        ret.error = baseMsg + '"regex" property must either be a string or a RegExp object, but ' + typeof ext.regex + ' given';
+        return ret;
+      }
+      if (showdown.helper.isUndefined(ext.replace)) {
+        ret.valid = false;
+        ret.error = baseMsg + '"regex" extensions must implement a replace string or function';
+        return ret;
+      }
+    }
+  }
+  return ret;
+}
+
+/**
+ * Validate extension
+ * @param {object} ext
+ * @returns {boolean}
+ */
+showdown.validateExtension = function (ext) {
+  'use strict';
+
+  var validateExtension = validate(ext, null);
+  if (!validateExtension.valid) {
+    console.warn(validateExtension.error);
+    return false;
+  }
+  return true;
+};
+
+/**
+ * showdownjs helper functions
+ */
+
+if (!showdown.hasOwnProperty('helper')) {
+  showdown.helper = {};
+}
+
+/**
+ * Check if var is string
+ * @static
+ * @param {string} a
+ * @returns {boolean}
+ */
+showdown.helper.isString = function isString(a) {
+  'use strict';
+  return (typeof a === 'string' || a instanceof String);
+};
+
+/**
+ * Check if var is a function
+ * @static
+ * @param {string} a
+ * @returns {boolean}
+ */
+showdown.helper.isFunction = function isFunction(a) {
+  'use strict';
+  var getType = {};
+  return a && getType.toString.call(a) === '[object Function]';
+};
+
+/**
+ * ForEach helper function
+ * @static
+ * @param {*} obj
+ * @param {function} callback
+ */
+showdown.helper.forEach = function forEach(obj, callback) {
+  'use strict';
+  if (typeof obj.forEach === 'function') {
+    obj.forEach(callback);
+  } else {
+    for (var i = 0; i < obj.length; i++) {
+      callback(obj[i], i, obj);
+    }
+  }
+};
+
+/**
+ * isArray helper function
+ * @static
+ * @param {*} a
+ * @returns {boolean}
+ */
+showdown.helper.isArray = function isArray(a) {
+  'use strict';
+  return a.constructor === Array;
+};
+
+/**
+ * Check if value is undefined
+ * @static
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is `undefined`, else `false`.
+ */
+showdown.helper.isUndefined = function isUndefined(value) {
+  'use strict';
+  return typeof value === 'undefined';
+};
+
+/**
+ * Standardidize extension name
+ * @static
+ * @param {string} s extension name
+ * @returns {string}
+ */
+showdown.helper.stdExtName = function (s) {
+  'use strict';
+  return s.replace(/[_-]||\s/g, '').toLowerCase();
+};
+
+function escapeCharactersCallback(wholeMatch, m1) {
+  'use strict';
+  var charCodeToEscape = m1.charCodeAt(0);
+  return '~E' + charCodeToEscape + 'E';
+}
+
+/**
+ * Callback used to escape characters when passing through String.replace
+ * @static
+ * @param {string} wholeMatch
+ * @param {string} m1
+ * @returns {string}
+ */
+showdown.helper.escapeCharactersCallback = escapeCharactersCallback;
+
+/**
+ * Escape characters in a string
+ * @static
+ * @param {string} text
+ * @param {string} charsToEscape
+ * @param {boolean} afterBackslash
+ * @returns {XML|string|void|*}
+ */
+showdown.helper.escapeCharacters = function escapeCharacters(text, charsToEscape, afterBackslash) {
+  'use strict';
+  // First we have to escape the escape characters so that
+  // we can build a character class out of them
+  var regexString = '([' + charsToEscape.replace(/([\[\]\\])/g, '\\$1') + '])';
+
+  if (afterBackslash) {
+    regexString = '\\\\' + regexString;
+  }
+
+  var regex = new RegExp(regexString, 'g');
+  text = text.replace(regex, escapeCharactersCallback);
+
+  return text;
+};
+
+var rgxFindMatchPos = function (str, left, right, flags) {
+  'use strict';
+  var f = flags || '',
+    g = f.indexOf('g') > -1,
+    x = new RegExp(left + '|' + right, 'g' + f.replace(/g/g, '')),
+    l = new RegExp(left, f.replace(/g/g, '')),
+    pos = [],
+    t, s, m, start, end;
+
+  do {
+    t = 0;
+    while ((m = x.exec(str))) {
+      if (l.test(m[0])) {
+        if (!(t++)) {
+          s = x.lastIndex;
+          start = s - m[0].length;
+        }
+      } else if (t) {
+        if (!--t) {
+          end = m.index + m[0].length;
+          var obj = {
+            left: {start: start, end: s},
+            match: {start: s, end: m.index},
+            right: {start: m.index, end: end},
+            wholeMatch: {start: start, end: end}
+          };
+          pos.push(obj);
+          if (!g) {
+            return pos;
+          }
+        }
+      }
+    }
+  } while (t && (x.lastIndex = s));
+
+  return pos;
+};
+
+/**
+ * matchRecursiveRegExp
+ *
+ * (c) 2007 Steven Levithan <stevenlevithan.com>
+ * MIT License
+ *
+ * Accepts a string to search, a left and right format delimiter
+ * as regex patterns, and optional regex flags. Returns an array
+ * of matches, allowing nested instances of left/right delimiters.
+ * Use the "g" flag to return all matches, otherwise only the
+ * first is returned. Be careful to ensure that the left and
+ * right format delimiters produce mutually exclusive matches.
+ * Backreferences are not supported within the right delimiter
+ * due to how it is internally combined with the left delimiter.
+ * When matching strings whose format delimiters are unbalanced
+ * to the left or right, the output is intentionally as a
+ * conventional regex library with recursion support would
+ * produce, e.g. "<<x>" and "<x>>" both produce ["x"] when using
+ * "<" and ">" as the delimiters (both strings contain a single,
+ * balanced instance of "<x>").
+ *
+ * examples:
+ * matchRecursiveRegExp("test", "\\(", "\\)")
+ * returns: []
+ * matchRecursiveRegExp("<t<<e>><s>>t<>", "<", ">", "g")
+ * returns: ["t<<e>><s>", ""]
+ * matchRecursiveRegExp("<div id=\"x\">test</div>", "<div\\b[^>]*>", "</div>", "gi")
+ * returns: ["test"]
+ */
+showdown.helper.matchRecursiveRegExp = function (str, left, right, flags) {
+  'use strict';
+
+  var matchPos = rgxFindMatchPos (str, left, right, flags),
+    results = [];
+
+  for (var i = 0; i < matchPos.length; ++i) {
+    results.push([
+      str.slice(matchPos[i].wholeMatch.start, matchPos[i].wholeMatch.end),
+      str.slice(matchPos[i].match.start, matchPos[i].match.end),
+      str.slice(matchPos[i].left.start, matchPos[i].left.end),
+      str.slice(matchPos[i].right.start, matchPos[i].right.end)
+    ]);
+  }
+  return results;
+};
+
+/**
+ *
+ * @param {string} str
+ * @param {string|function} replacement
+ * @param {string} left
+ * @param {string} right
+ * @param {string} flags
+ * @returns {string}
+ */
+showdown.helper.replaceRecursiveRegExp = function (str, replacement, left, right, flags) {
+  'use strict';
+
+  if (!showdown.helper.isFunction(replacement)) {
+    var repStr = replacement;
+    replacement = function () {
+      return repStr;
+    };
+  }
+
+  var matchPos = rgxFindMatchPos(str, left, right, flags),
+      finalStr = str,
+      lng = matchPos.length;
+
+  if (lng > 0) {
+    var bits = [];
+    if (matchPos[0].wholeMatch.start !== 0) {
+      bits.push(str.slice(0, matchPos[0].wholeMatch.start));
+    }
+    for (var i = 0; i < lng; ++i) {
+      bits.push(
+        replacement(
+          str.slice(matchPos[i].wholeMatch.start, matchPos[i].wholeMatch.end),
+          str.slice(matchPos[i].match.start, matchPos[i].match.end),
+          str.slice(matchPos[i].left.start, matchPos[i].left.end),
+          str.slice(matchPos[i].right.start, matchPos[i].right.end)
+        )
+      );
+      if (i < lng - 1) {
+        bits.push(str.slice(matchPos[i].wholeMatch.end, matchPos[i + 1].wholeMatch.start));
+      }
+    }
+    if (matchPos[lng - 1].wholeMatch.end < str.length) {
+      bits.push(str.slice(matchPos[lng - 1].wholeMatch.end));
+    }
+    finalStr = bits.join('');
+  }
+  return finalStr;
+};
+
+/**
+ * POLYFILLS
+ */
+if (showdown.helper.isUndefined(console)) {
+  console = {
+    warn: function (msg) {
+      'use strict';
+      alert(msg);
+    },
+    log: function (msg) {
+      'use strict';
+      alert(msg);
+    },
+    error: function (msg) {
+      'use strict';
+      throw msg;
+    }
+  };
+}
+
+/**
+ * Created by Estevao on 31-05-2015.
+ */
+
+/**
+ * Showdown Converter class
+ * @class
+ * @param {object} [converterOptions]
+ * @returns {Converter}
+ */
+showdown.Converter = function (converterOptions) {
+  'use strict';
+
+  var
+      /**
+       * Options used by this converter
+       * @private
+       * @type {{}}
+       */
+      options = {},
+
+      /**
+       * Language extensions used by this converter
+       * @private
+       * @type {Array}
+       */
+      langExtensions = [],
+
+      /**
+       * Output modifiers extensions used by this converter
+       * @private
+       * @type {Array}
+       */
+      outputModifiers = [],
+
+      /**
+       * Event listeners
+       * @private
+       * @type {{}}
+       */
+      listeners = {};
+
+  _constructor();
+
+  /**
+   * Converter constructor
+   * @private
+   */
+  function _constructor() {
+    converterOptions = converterOptions || {};
+
+    for (var gOpt in globalOptions) {
+      if (globalOptions.hasOwnProperty(gOpt)) {
+        options[gOpt] = globalOptions[gOpt];
+      }
+    }
+
+    // Merge options
+    if (typeof converterOptions === 'object') {
+      for (var opt in converterOptions) {
+        if (converterOptions.hasOwnProperty(opt)) {
+          options[opt] = converterOptions[opt];
+        }
+      }
+    } else {
+      throw Error('Converter expects the passed parameter to be an object, but ' + typeof converterOptions +
+      ' was passed instead.');
+    }
+
+    if (options.extensions) {
+      showdown.helper.forEach(options.extensions, _parseExtension);
+    }
+  }
+
+  /**
+   * Parse extension
+   * @param {*} ext
+   * @param {string} [name='']
+   * @private
+   */
+  function _parseExtension(ext, name) {
+
+    name = name || null;
+    // If it's a string, the extension was previously loaded
+    if (showdown.helper.isString(ext)) {
+      ext = showdown.helper.stdExtName(ext);
+      name = ext;
+
+      // LEGACY_SUPPORT CODE
+      if (showdown.extensions[ext]) {
+        console.warn('DEPRECATION WARNING: ' + ext + ' is an old extension that uses a deprecated loading method.' +
+          'Please inform the developer that the extension should be updated!');
+        legacyExtensionLoading(showdown.extensions[ext], ext);
+        return;
+      // END LEGACY SUPPORT CODE
+
+      } else if (!showdown.helper.isUndefined(extensions[ext])) {
+        ext = extensions[ext];
+
+      } else {
+        throw Error('Extension "' + ext + '" could not be loaded. It was either not found or is not a valid extension.');
+      }
+    }
+
+    if (typeof ext === 'function') {
+      ext = ext();
+    }
+
+    if (!showdown.helper.isArray(ext)) {
+      ext = [ext];
+    }
+
+    var validExt = validate(ext, name);
+    if (!validExt.valid) {
+      throw Error(validExt.error);
+    }
+
+    for (var i = 0; i < ext.length; ++i) {
+      switch (ext[i].type) {
+
+        case 'lang':
+          langExtensions.push(ext[i]);
+          break;
+
+        case 'output':
+          outputModifiers.push(ext[i]);
+          break;
+      }
+      if (ext[i].hasOwnProperty(listeners)) {
+        for (var ln in ext[i].listeners) {
+          if (ext[i].listeners.hasOwnProperty(ln)) {
+            listen(ln, ext[i].listeners[ln]);
+          }
+        }
+      }
+    }
+
+  }
+
+  /**
+   * LEGACY_SUPPORT
+   * @param {*} ext
+   * @param {string} name
+   */
+  function legacyExtensionLoading(ext, name) {
+    if (typeof ext === 'function') {
+      ext = ext(new showdown.Converter());
+    }
+    if (!showdown.helper.isArray(ext)) {
+      ext = [ext];
+    }
+    var valid = validate(ext, name);
+
+    if (!valid.valid) {
+      throw Error(valid.error);
+    }
+
+    for (var i = 0; i < ext.length; ++i) {
+      switch (ext[i].type) {
+        case 'lang':
+          langExtensions.push(ext[i]);
+          break;
+        case 'output':
+          outputModifiers.push(ext[i]);
+          break;
+        default:// should never reach here
+          throw Error('Extension loader error: Type unrecognized!!!');
+      }
+    }
+  }
+
+  /**
+   * Listen to an event
+   * @param {string} name
+   * @param {function} callback
+   */
+  function listen(name, callback) {
+    if (!showdown.helper.isString(name)) {
+      throw Error('Invalid argument in converter.listen() method: name must be a string, but ' + typeof name + ' given');
+    }
+
+    if (typeof callback !== 'function') {
+      throw Error('Invalid argument in converter.listen() method: callback must be a function, but ' + typeof callback + ' given');
+    }
+
+    if (!listeners.hasOwnProperty(name)) {
+      listeners[name] = [];
+    }
+    listeners[name].push(callback);
+  }
+
+  function rTrimInputText(text) {
+    var rsp = text.match(/^\s*/)[0].length,
+        rgx = new RegExp('^\\s{0,' + rsp + '}', 'gm');
+    return text.replace(rgx, '');
+  }
+
+  /**
+   * Dispatch an event
+   * @private
+   * @param {string} evtName Event name
+   * @param {string} text Text
+   * @param {{}} options Converter Options
+   * @param {{}} globals
+   * @returns {string}
+   */
+  this._dispatch = function dispatch (evtName, text, options, globals) {
+    if (listeners.hasOwnProperty(evtName)) {
+      for (var ei = 0; ei < listeners[evtName].length; ++ei) {
+        var nText = listeners[evtName][ei](evtName, text, this, options, globals);
+        if (nText && typeof nText !== 'undefined') {
+          text = nText;
+        }
+      }
+    }
+    return text;
+  };
+
+  /**
+   * Listen to an event
+   * @param {string} name
+   * @param {function} callback
+   * @returns {showdown.Converter}
+   */
+  this.listen = function (name, callback) {
+    listen(name, callback);
+    return this;
+  };
+
+  /**
+   * Converts a markdown string into HTML
+   * @param {string} text
+   * @returns {*}
+   */
+  this.makeHtml = function (text) {
+    //check if text is not falsy
+    if (!text) {
+      return text;
+    }
+
+    var globals = {
+      gHtmlBlocks:     [],
+      gHtmlMdBlocks:   [],
+      gHtmlSpans:      [],
+      gUrls:           {},
+      gTitles:         {},
+      gDimensions:     {},
+      gListLevel:      0,
+      hashLinkCounts:  {},
+      langExtensions:  langExtensions,
+      outputModifiers: outputModifiers,
+      converter:       this,
+      ghCodeBlocks:    []
+    };
+
+    // attacklab: Replace ~ with ~T
+    // This lets us use tilde as an escape char to avoid md5 hashes
+    // The choice of character is arbitrary; anything that isn't
+    // magic in Markdown will work.
+    text = text.replace(/~/g, '~T');
+
+    // attacklab: Replace $ with ~D
+    // RegExp interprets $ as a special character
+    // when it's in a replacement string
+    text = text.replace(/\$/g, '~D');
+
+    // Standardize line endings
+    text = text.replace(/\r\n/g, '\n'); // DOS to Unix
+    text = text.replace(/\r/g, '\n'); // Mac to Unix
+
+    if (options.smartIndentationFix) {
+      text = rTrimInputText(text);
+    }
+
+    // Make sure text begins and ends with a couple of newlines:
+    //text = '\n\n' + text + '\n\n';
+    text = text;
+    // detab
+    text = showdown.subParser('detab')(text, options, globals);
+
+    // stripBlankLines
+    text = showdown.subParser('stripBlankLines')(text, options, globals);
+
+    //run languageExtensions
+    showdown.helper.forEach(langExtensions, function (ext) {
+      text = showdown.subParser('runExtension')(ext, text, options, globals);
+    });
+
+    // run the sub parsers
+    text = showdown.subParser('hashPreCodeTags')(text, options, globals);
+    text = showdown.subParser('githubCodeBlocks')(text, options, globals);
+    text = showdown.subParser('hashHTMLBlocks')(text, options, globals);
+    text = showdown.subParser('hashHTMLSpans')(text, options, globals);
+    text = showdown.subParser('stripLinkDefinitions')(text, options, globals);
+    text = showdown.subParser('blockGamut')(text, options, globals);
+    text = showdown.subParser('unhashHTMLSpans')(text, options, globals);
+    text = showdown.subParser('unescapeSpecialChars')(text, options, globals);
+
+    // attacklab: Restore dollar signs
+    text = text.replace(/~D/g, '$$');
+
+    // attacklab: Restore tildes
+    text = text.replace(/~T/g, '~');
+
+    // Run output modifiers
+    showdown.helper.forEach(outputModifiers, function (ext) {
+      text = showdown.subParser('runExtension')(ext, text, options, globals);
+    });
+    return text;
+  };
+
+  /**
+   * Set an option of this Converter instance
+   * @param {string} key
+   * @param {*} value
+   */
+  this.setOption = function (key, value) {
+    options[key] = value;
+  };
+
+  /**
+   * Get the option of this Converter instance
+   * @param {string} key
+   * @returns {*}
+   */
+  this.getOption = function (key) {
+    return options[key];
+  };
+
+  /**
+   * Get the options of this Converter instance
+   * @returns {{}}
+   */
+  this.getOptions = function () {
+    return options;
+  };
+
+  /**
+   * Add extension to THIS converter
+   * @param {{}} extension
+   * @param {string} [name=null]
+   */
+  this.addExtension = function (extension, name) {
+    name = name || null;
+    _parseExtension(extension, name);
+  };
+
+  /**
+   * Use a global registered extension with THIS converter
+   * @param {string} extensionName Name of the previously registered extension
+   */
+  this.useExtension = function (extensionName) {
+    _parseExtension(extensionName);
+  };
+
+  /**
+   * Set the flavor THIS converter should use
+   * @param {string} name
+   */
+  this.setFlavor = function (name) {
+    if (flavor.hasOwnProperty(name)) {
+      var preset = flavor[name];
+      for (var option in preset) {
+        if (preset.hasOwnProperty(option)) {
+          options[option] = preset[option];
+        }
+      }
+    }
+  };
+
+  /**
+   * Remove an extension from THIS converter.
+   * Note: This is a costly operation. It's better to initialize a new converter
+   * and specify the extensions you wish to use
+   * @param {Array} extension
+   */
+  this.removeExtension = function (extension) {
+    if (!showdown.helper.isArray(extension)) {
+      extension = [extension];
+    }
+    for (var a = 0; a < extension.length; ++a) {
+      var ext = extension[a];
+      for (var i = 0; i < langExtensions.length; ++i) {
+        if (langExtensions[i] === ext) {
+          langExtensions[i].splice(i, 1);
+        }
+      }
+      for (var ii = 0; ii < outputModifiers.length; ++i) {
+        if (outputModifiers[ii] === ext) {
+          outputModifiers[ii].splice(i, 1);
+        }
+      }
+    }
+  };
+
+  /**
+   * Get all extension of THIS converter
+   * @returns {{language: Array, output: Array}}
+   */
+  this.getAllExtensions = function () {
+    return {
+      language: langExtensions,
+      output: outputModifiers
+    };
+  };
+};
+
+/**
+ * Turn Markdown link shortcuts into XHTML <a> tags.
+ */
+showdown.subParser('anchors', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('anchors.before', text, options, globals);
+
+  var writeAnchorTag = function (wholeMatch, m1, m2, m3, m4, m5, m6, m7) {
+    if (showdown.helper.isUndefined(m7)) {
+      m7 = '';
+    }
+    wholeMatch = m1;
+    var linkText = m2,
+        linkId = m3.toLowerCase(),
+        url = m4,
+        title = m7;
+
+    if (!url) {
+      if (!linkId) {
+        // lower-case and turn embedded newlines into spaces
+        linkId = linkText.toLowerCase().replace(/ ?\n/g, ' ');
+      }
+      url = '#' + linkId;
+
+      if (!showdown.helper.isUndefined(globals.gUrls[linkId])) {
+        url = globals.gUrls[linkId];
+        if (!showdown.helper.isUndefined(globals.gTitles[linkId])) {
+          title = globals.gTitles[linkId];
+        }
+      } else {
+        if (wholeMatch.search(/\(\s*\)$/m) > -1) {
+          // Special case for explicit empty url
+          url = '';
+        } else {
+          return wholeMatch;
+        }
+      }
+    }
+
+    url = showdown.helper.escapeCharacters(url, '*_', false);
+    var result = '<a href="' + url + '"';
+
+    if (title !== '' && title !== null) {
+      title = title.replace(/"/g, '&quot;');
+      title = showdown.helper.escapeCharacters(title, '*_', false);
+      result += ' title="' + title + '"';
+    }
+
+    result += '>' + linkText + '</a>';
+
+    return result;
+  };
+
+  // First, handle reference-style links: [link text] [id]
+  /*
+   text = text.replace(/
+   (							// wrap whole match in $1
+   \[
+   (
+   (?:
+   \[[^\]]*\]		// allow brackets nested one level
+   |
+   [^\[]			// or anything else
+   )*
+   )
+   \]
+
+   [ ]?					// one optional space
+   (?:\n[ ]*)?				// one optional newline followed by spaces
+
+   \[
+   (.*?)					// id = $3
+   \]
+   )()()()()					// pad remaining backreferences
+   /g,_DoAnchors_callback);
+   */
+  text = text.replace(/(\[((?:\[[^\]]*]|[^\[\]])*)][ ]?(?:\n[ ]*)?\[(.*?)])()()()()/g, writeAnchorTag);
+
+  //
+  // Next, inline-style links: [link text](url "optional title")
+  //
+
+  /*
+   text = text.replace(/
+   (						// wrap whole match in $1
+   \[
+   (
+   (?:
+   \[[^\]]*\]	// allow brackets nested one level
+   |
+   [^\[\]]			// or anything else
+   )
+   )
+   \]
+   \(						// literal paren
+   [ \t]*
+   ()						// no id, so leave $3 empty
+   <?(.*?)>?				// href = $4
+   [ \t]*
+   (						// $5
+   (['"])				// quote char = $6
+   (.*?)				// Title = $7
+   \6					// matching quote
+   [ \t]*				// ignore any spaces/tabs between closing quote and )
+   )?						// title is optional
+   \)
+   )
+   /g,writeAnchorTag);
+   */
+  text = text.replace(/(\[((?:\[[^\]]*]|[^\[\]])*)]\([ \t]*()<?(.*?(?:\(.*?\).*?)?)>?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g,
+                      writeAnchorTag);
+
+  //
+  // Last, handle reference-style shortcuts: [link text]
+  // These must come last in case you've also got [link test][1]
+  // or [link test](/foo)
+  //
+
+  /*
+   text = text.replace(/
+   (                // wrap whole match in $1
+   \[
+   ([^\[\]]+)       // link text = $2; can't contain '[' or ']'
+   \]
+   )()()()()()      // pad rest of backreferences
+   /g, writeAnchorTag);
+   */
+  text = text.replace(/(\[([^\[\]]+)])()()()()()/g, writeAnchorTag);
+
+  text = globals.converter._dispatch('anchors.after', text, options, globals);
+  return text;
+});
+
+showdown.subParser('autoLinks', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('autoLinks.before', text, options, globals);
+
+  var simpleURLRegex  = /\b(((https?|ftp|dict):\/\/|www\.)[^'">\s]+\.[^'">\s]+)(?=\s|$)(?!["<>])/gi,
+      delimUrlRegex   = /<(((https?|ftp|dict):\/\/|www\.)[^'">\s]+)>/gi,
+      simpleMailRegex = /(?:^|[ \n\t])([A-Za-z0-9!#$%&'*+-/=?^_`\{|}~\.]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)(?:$|[ \n\t])/gi,
+      delimMailRegex  = /<(?:mailto:)?([-.\w]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)>/gi;
+
+  text = text.replace(delimUrlRegex, replaceLink);
+  text = text.replace(delimMailRegex, replaceMail);
+  // simpleURLRegex  = /\b(((https?|ftp|dict):\/\/|www\.)[-.+~:?#@!$&'()*,;=[\]\w]+)\b/gi,
+  // Email addresses: <address@domain.foo>
+
+  if (options.simplifiedAutoLink) {
+    text = text.replace(simpleURLRegex, replaceLink);
+    text = text.replace(simpleMailRegex, replaceMail);
+  }
+
+  function replaceLink(wm, link) {
+    var lnkTxt = link;
+    if (/^www\./i.test(link)) {
+      link = link.replace(/^www\./i, 'http://www.');
+    }
+    return '<a href="' + link + '">' + lnkTxt + '</a>';
+  }
+
+  function replaceMail(wholeMatch, m1) {
+    var unescapedStr = showdown.subParser('unescapeSpecialChars')(m1);
+    return showdown.subParser('encodeEmailAddress')(unescapedStr);
+  }
+
+  text = globals.converter._dispatch('autoLinks.after', text, options, globals);
+
+  return text;
+});
+
+/**
+ * These are all the transformations that form block-level
+ * tags like paragraphs, headers, and list items.
+ */
+showdown.subParser('blockGamut', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('blockGamut.before', text, options, globals);
+
+  // we parse blockquotes first so that we can have headings and hrs
+  // inside blockquotes
+  text = showdown.subParser('blockQuotes')(text, options, globals);
+  text = showdown.subParser('headers')(text, options, globals);
+
+  // Do Horizontal Rules:
+  var key = showdown.subParser('hashBlock')('<hr />', options, globals);
+  text = text.replace(/^[ ]{0,2}([ ]?\*[ ]?){3,}[ \t]*$/gm, key);
+  text = text.replace(/^[ ]{0,2}([ ]?\-[ ]?){3,}[ \t]*$/gm, key);
+  text = text.replace(/^[ ]{0,2}([ ]?_[ ]?){3,}[ \t]*$/gm, key);
+
+  text = showdown.subParser('lists')(text, options, globals);
+  text = showdown.subParser('codeBlocks')(text, options, globals);
+  text = showdown.subParser('tables')(text, options, globals);
+
+  // We already ran _HashHTMLBlocks() before, in Markdown(), but that
+  // was to escape raw HTML in the original Markdown source. This time,
+  // we're escaping the markup we've just created, so that we don't wrap
+  // <p> tags around block-level tags.
+  text = showdown.subParser('hashHTMLBlocks')(text, options, globals);
+  text = showdown.subParser('paragraphs')(text, options, globals);
+
+  text = globals.converter._dispatch('blockGamut.after', text, options, globals);
+
+  return text;
+});
+
+showdown.subParser('blockQuotes', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('blockQuotes.before', text, options, globals);
+  /*
+   text = text.replace(/
+   (								// Wrap whole match in $1
+   (
+   ^[ \t]*>[ \t]?			// '>' at the start of a line
+   .+\n					// rest of the first line
+   (.+\n)*					// subsequent consecutive lines
+   \n*						// blanks
+   )+
+   )
+   /gm, function(){...});
+   */
+
+  text = text.replace(/((^[ \t]{0,3}>[ \t]?.+\n(.+\n)*\n*)+)/gm, function (wholeMatch, m1) {
+    var bq = m1;
+
+    // attacklab: hack around Konqueror 3.5.4 bug:
+    // "----------bug".replace(/^-/g,"") == "bug"
+    bq = bq.replace(/^[ \t]*>[ \t]?/gm, '~0'); // trim one level of quoting
+
+    // attacklab: clean up hack
+    bq = bq.replace(/~0/g, '');
+
+    bq = bq.replace(/^[ \t]+$/gm, ''); // trim whitespace-only lines
+    bq = showdown.subParser('githubCodeBlocks')(bq, options, globals);
+    bq = showdown.subParser('blockGamut')(bq, options, globals); // recurse
+
+    bq = bq.replace(/(^|\n)/g, '$1  ');
+    // These leading spaces screw with <pre> content, so we need to fix that:
+    bq = bq.replace(/(\s*<pre>[^\r]+?<\/pre>)/gm, function (wholeMatch, m1) {
+      var pre = m1;
+      // attacklab: hack around Konqueror 3.5.4 bug:
+      pre = pre.replace(/^  /mg, '~0');
+      pre = pre.replace(/~0/g, '');
+      return pre;
+    });
+
+    return showdown.subParser('hashBlock')('<blockquote>\n' + bq + '\n</blockquote>', options, globals);
+  });
+
+  text = globals.converter._dispatch('blockQuotes.after', text, options, globals);
+  return text;
+});
+
+/**
+ * Process Markdown `<pre><code>` blocks.
+ */
+showdown.subParser('codeBlocks', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('codeBlocks.before', text, options, globals);
+  /*
+   text = text.replace(text,
+   /(?:\n\n|^)
+   (								// $1 = the code block -- one or more lines, starting with a space/tab
+   (?:
+   (?:[ ]{4}|\t)			// Lines must start with a tab or a tab-width of spaces - attacklab: g_tab_width
+   .*\n+
+   )+
+   )
+   (\n*[ ]{0,3}[^ \t\n]|(?=~0))	// attacklab: g_tab_width
+   /g,function(){...});
+   */
+
+  // attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
+  text += '~0';
+
+  var pattern = /(?:\n\n|^)((?:(?:[ ]{4}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=~0))/g;
+  text = text.replace(pattern, function (wholeMatch, m1, m2) {
+    var codeblock = m1,
+        nextChar = m2,
+        end = '\n';
+
+    codeblock = showdown.subParser('outdent')(codeblock);
+    codeblock = showdown.subParser('encodeCode')(codeblock);
+    codeblock = showdown.subParser('detab')(codeblock);
+    codeblock = codeblock.replace(/^\n+/g, ''); // trim leading newlines
+    codeblock = codeblock.replace(/\n+$/g, ''); // trim trailing newlines
+
+    if (options.omitExtraWLInCodeBlocks) {
+      end = '';
+    }
+
+    codeblock = '<pre><code>' + codeblock + end + '</code></pre>';
+
+    return showdown.subParser('hashBlock')(codeblock, options, globals) + nextChar;
+  });
+
+  // attacklab: strip sentinel
+  text = text.replace(/~0/, '');
+
+  text = globals.converter._dispatch('codeBlocks.after', text, options, globals);
+  return text;
+});
+
+/**
+ *
+ *   *  Backtick quotes are used for <code></code> spans.
+ *
+ *   *  You can use multiple backticks as the delimiters if you want to
+ *     include literal backticks in the code span. So, this input:
+ *
+ *         Just type ``foo `bar` baz`` at the prompt.
+ *
+ *       Will translate to:
+ *
+ *         <p>Just type <code>foo `bar` baz</code> at the prompt.</p>
+ *
+ *    There's no arbitrary limit to the number of backticks you
+ *    can use as delimters. If you need three consecutive backticks
+ *    in your code, use four for delimiters, etc.
+ *
+ *  *  You can use spaces to get literal backticks at the edges:
+ *
+ *         ... type `` `bar` `` ...
+ *
+ *       Turns to:
+ *
+ *         ... type <code>`bar`</code> ...
+ */
+showdown.subParser('codeSpans', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('codeSpans.before', text, options, globals);
+
+  /*
+   text = text.replace(/
+   (^|[^\\])					// Character before opening ` can't be a backslash
+   (`+)						// $2 = Opening run of `
+   (							// $3 = The code block
+   [^\r]*?
+   [^`]					// attacklab: work around lack of lookbehind
+   )
+   \2							// Matching closer
+   (?!`)
+   /gm, function(){...});
+   */
+
+  if (typeof(text) === 'undefined') {
+    text = '';
+  }
+  text = text.replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm,
+    function (wholeMatch, m1, m2, m3) {
+      var c = m3;
+      c = c.replace(/^([ \t]*)/g, '');	// leading whitespace
+      c = c.replace(/[ \t]*$/g, '');	// trailing whitespace
+      c = showdown.subParser('encodeCode')(c);
+      return m1 + '<code>' + c + '</code>';
+    }
+  );
+
+  text = globals.converter._dispatch('codeSpans.after', text, options, globals);
+  return text;
+});
+
+/**
+ * Convert all tabs to spaces
+ */
+showdown.subParser('detab', function (text) {
+  'use strict';
+
+  // expand first n-1 tabs
+  text = text.replace(/\t(?=\t)/g, '    '); // g_tab_width
+
+  // replace the nth with two sentinels
+  text = text.replace(/\t/g, '~A~B');
+
+  // use the sentinel to anchor our regex so it doesn't explode
+  text = text.replace(/~B(.+?)~A/g, function (wholeMatch, m1) {
+    var leadingText = m1,
+        numSpaces = 4 - leadingText.length % 4;  // g_tab_width
+
+    // there *must* be a better way to do this:
+    for (var i = 0; i < numSpaces; i++) {
+      leadingText += ' ';
+    }
+
+    return leadingText;
+  });
+
+  // clean up sentinels
+  text = text.replace(/~A/g, '    ');  // g_tab_width
+  text = text.replace(/~B/g, '');
+
+  return text;
+
+});
+
+/**
+ * Smart processing for ampersands and angle brackets that need to be encoded.
+ */
+showdown.subParser('encodeAmpsAndAngles', function (text) {
+  'use strict';
+  // Ampersand-encoding based entirely on Nat Irons's Amputator MT plugin:
+  // http://bumppo.net/projects/amputator/
+  text = text.replace(/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/g, '&amp;');
+
+  // Encode naked <'s
+  text = text.replace(/<(?![a-z\/?\$!])/gi, '&lt;');
+
+  return text;
+});
+
+/**
+ * Returns the string, with after processing the following backslash escape sequences.
+ *
+ * attacklab: The polite way to do this is with the new escapeCharacters() function:
+ *
+ *    text = escapeCharacters(text,"\\",true);
+ *    text = escapeCharacters(text,"`*_{}[]()>#+-.!",true);
+ *
+ * ...but we're sidestepping its use of the (slow) RegExp constructor
+ * as an optimization for Firefox.  This function gets called a LOT.
+ */
+showdown.subParser('encodeBackslashEscapes', function (text) {
+  'use strict';
+  text = text.replace(/\\(\\)/g, showdown.helper.escapeCharactersCallback);
+  text = text.replace(/\\([`*_{}\[\]()>#+-.!])/g, showdown.helper.escapeCharactersCallback);
+  return text;
+});
+
+/**
+ * Encode/escape certain characters inside Markdown code runs.
+ * The point is that in code, these characters are literals,
+ * and lose their special Markdown meanings.
+ */
+showdown.subParser('encodeCode', function (text) {
+  'use strict';
+
+  // Encode all ampersands; HTML entities are not
+  // entities within a Markdown code span.
+  text = text.replace(/&/g, '&amp;');
+
+  // Do the angle bracket song and dance:
+  text = text.replace(/</g, '&lt;');
+  text = text.replace(/>/g, '&gt;');
+
+  // Now, escape characters that are magic in Markdown:
+  text = showdown.helper.escapeCharacters(text, '*_{}[]\\', false);
+
+  // jj the line above breaks this:
+  //---
+  //* Item
+  //   1. Subitem
+  //            special char: *
+  // ---
+
+  return text;
+});
+
+/**
+ *  Input: an email address, e.g. "foo@example.com"
+ *
+ *  Output: the email address as a mailto link, with each character
+ *    of the address encoded as either a decimal or hex entity, in
+ *    the hopes of foiling most address harvesting spam bots. E.g.:
+ *
+ *    <a href="&#x6D;&#97;&#105;&#108;&#x74;&#111;:&#102;&#111;&#111;&#64;&#101;
+ *       x&#x61;&#109;&#x70;&#108;&#x65;&#x2E;&#99;&#111;&#109;">&#102;&#111;&#111;
+ *       &#64;&#101;x&#x61;&#109;&#x70;&#108;&#x65;&#x2E;&#99;&#111;&#109;</a>
+ *
+ *  Based on a filter by Matthew Wickline, posted to the BBEdit-Talk
+ *  mailing list: <http://tinyurl.com/yu7ue>
+ *
+ */
+showdown.subParser('encodeEmailAddress', function (addr) {
+  'use strict';
+
+  var encode = [
+    function (ch) {
+      return '&#' + ch.charCodeAt(0) + ';';
+    },
+    function (ch) {
+      return '&#x' + ch.charCodeAt(0).toString(16) + ';';
+    },
+    function (ch) {
+      return ch;
+    }
+  ];
+
+  addr = 'mailto:' + addr;
+
+  addr = addr.replace(/./g, function (ch) {
+    if (ch === '@') {
+      // this *must* be encoded. I insist.
+      ch = encode[Math.floor(Math.random() * 2)](ch);
+    } else if (ch !== ':') {
+      // leave ':' alone (to spot mailto: later)
+      var r = Math.random();
+      // roughly 10% raw, 45% hex, 45% dec
+      ch = (
+        r > 0.9 ? encode[2](ch) : r > 0.45 ? encode[1](ch) : encode[0](ch)
+      );
+    }
+    return ch;
+  });
+
+  addr = '<a href="' + addr + '">' + addr + '</a>';
+  addr = addr.replace(/">.+:/g, '">'); // strip the mailto: from the visible part
+
+  return addr;
+});
+
+/**
+ * Within tags -- meaning between < and > -- encode [\ ` * _] so they
+ * don't conflict with their use in Markdown for code, italics and strong.
+ */
+showdown.subParser('escapeSpecialCharsWithinTagAttributes', function (text) {
+  'use strict';
+
+  // Build a regex to find HTML tags and comments.  See Friedl's
+  // "Mastering Regular Expressions", 2nd Ed., pp. 200-201.
+  var regex = /(<[a-z\/!$]("[^"]*"|'[^']*'|[^'">])*>|<!(--.*?--\s*)+>)/gi;
+
+  text = text.replace(regex, function (wholeMatch) {
+    var tag = wholeMatch.replace(/(.)<\/?code>(?=.)/g, '$1`');
+    tag = showdown.helper.escapeCharacters(tag, '\\`*_', false);
+    return tag;
+  });
+
+  return text;
+});
+
+/**
+ * Handle github codeblocks prior to running HashHTML so that
+ * HTML contained within the codeblock gets escaped properly
+ * Example:
+ * ```ruby
+ *     def hello_world(x)
+ *       puts "Hello, #{x}"
+ *     end
+ * ```
+ */
+showdown.subParser('githubCodeBlocks', function (text, options, globals) {
+  'use strict';
+
+  // early exit if option is not enabled
+  if (!options.ghCodeBlocks) {
+    return text;
+  }
+
+  text = globals.converter._dispatch('githubCodeBlocks.before', text, options, globals);
+
+  text += '~0';
+
+  text = text.replace(/(?:^|\n)```(.*)\n([\s\S]*?)\n```/g, function (wholeMatch, language, codeblock) {
+    var end = (options.omitExtraWLInCodeBlocks) ? '' : '\n';
+
+    // First parse the github code block
+    codeblock = showdown.subParser('encodeCode')(codeblock);
+    codeblock = showdown.subParser('detab')(codeblock);
+    codeblock = codeblock.replace(/^\n+/g, ''); // trim leading newlines
+    codeblock = codeblock.replace(/\n+$/g, ''); // trim trailing whitespace
+
+    codeblock = '<pre><code' + (language ? ' class="' + language + ' language-' + language + '"' : '') + '>' + codeblock + end + '</code></pre>';
+
+    codeblock = showdown.subParser('hashBlock')(codeblock, options, globals);
+
+    // Since GHCodeblocks can be false positives, we need to
+    // store the primitive text and the parsed text in a global var,
+    // and then return a token
+    return '\n\n~G' + (globals.ghCodeBlocks.push({text: wholeMatch, codeblock: codeblock}) - 1) + 'G\n\n';
+  });
+
+  // attacklab: strip sentinel
+  text = text.replace(/~0/, '');
+
+  return globals.converter._dispatch('githubCodeBlocks.after', text, options, globals);
+});
+
+showdown.subParser('hashBlock', function (text, options, globals) {
+  'use strict';
+  text = text.replace(/(^\n+|\n+$)/g, '');
+  return '\n\n~K' + (globals.gHtmlBlocks.push(text) - 1) + 'K\n\n';
+});
+
+showdown.subParser('hashElement', function (text, options, globals) {
+  'use strict';
+
+  return function (wholeMatch, m1) {
+    var blockText = m1;
+
+    // Undo double lines
+    blockText = blockText.replace(/\n\n/g, '\n');
+    blockText = blockText.replace(/^\n/, '');
+
+    // strip trailing blank lines
+    blockText = blockText.replace(/\n+$/g, '');
+
+    // Replace the element text with a marker ("~KxK" where x is its key)
+    blockText = '\n\n~K' + (globals.gHtmlBlocks.push(blockText) - 1) + 'K\n\n';
+
+    return blockText;
+  };
+});
+
+showdown.subParser('hashHTMLBlocks', function (text, options, globals) {
+  'use strict';
+
+  var blockTags = [
+      'pre',
+      'div',
+      'h1',
+      'h2',
+      'h3',
+      'h4',
+      'h5',
+      'h6',
+      'blockquote',
+      'table',
+      'dl',
+      'ol',
+      'ul',
+      'script',
+      'noscript',
+      'form',
+      'fieldset',
+      'iframe',
+      'math',
+      'style',
+      'section',
+      'header',
+      'footer',
+      'nav',
+      'article',
+      'aside',
+      'address',
+      'audio',
+      'canvas',
+      'figure',
+      'hgroup',
+      'output',
+      'video',
+      'p'
+    ],
+    repFunc = function (wholeMatch, match, left, right) {
+      var txt = wholeMatch;
+      // check if this html element is marked as markdown
+      // if so, it's contents should be parsed as markdown
+      if (left.search(/\bmarkdown\b/) !== -1) {
+        txt = left + globals.converter.makeHtml(match) + right;
+      }
+      return '\n\n~K' + (globals.gHtmlBlocks.push(txt) - 1) + 'K\n\n';
+    };
+
+  for (var i = 0; i < blockTags.length; ++i) {
+    text = showdown.helper.replaceRecursiveRegExp(text, repFunc, '^(?: |\\t){0,3}<' + blockTags[i] + '\\b[^>]*>', '</' + blockTags[i] + '>', 'gim');
+  }
+
+  // HR SPECIAL CASE
+  text = text.replace(/(\n[ ]{0,3}(<(hr)\b([^<>])*?\/?>)[ \t]*(?=\n{2,}))/g,
+    showdown.subParser('hashElement')(text, options, globals));
+
+  // Special case for standalone HTML comments:
+  text = text.replace(/(<!--[\s\S]*?-->)/g,
+    showdown.subParser('hashElement')(text, options, globals));
+
+  // PHP and ASP-style processor instructions (<?...?> and <%...%>)
+  text = text.replace(/(?:\n\n)([ ]{0,3}(?:<([?%])[^\r]*?\2>)[ \t]*(?=\n{2,}))/g,
+    showdown.subParser('hashElement')(text, options, globals));
+  return text;
+});
+
+/**
+ * Hash span elements that should not be parsed as markdown
+ */
+showdown.subParser('hashHTMLSpans', function (text, config, globals) {
+  'use strict';
+
+  var matches = showdown.helper.matchRecursiveRegExp(text, '<code\\b[^>]*>', '</code>', 'gi');
+
+  for (var i = 0; i < matches.length; ++i) {
+    text = text.replace(matches[i][0], '~L' + (globals.gHtmlSpans.push(matches[i][0]) - 1) + 'L');
+  }
+  return text;
+});
+
+/**
+ * Unhash HTML spans
+ */
+showdown.subParser('unhashHTMLSpans', function (text, config, globals) {
+  'use strict';
+
+  for (var i = 0; i < globals.gHtmlSpans.length; ++i) {
+    text = text.replace('~L' + i + 'L', globals.gHtmlSpans[i]);
+  }
+
+  return text;
+});
+
+/**
+ * Hash span elements that should not be parsed as markdown
+ */
+showdown.subParser('hashPreCodeTags', function (text, config, globals) {
+  'use strict';
+
+  var repFunc = function (wholeMatch, match, left, right) {
+    // encode html entities
+    var codeblock = left + showdown.subParser('encodeCode')(match) + right;
+    return '\n\n~G' + (globals.ghCodeBlocks.push({text: wholeMatch, codeblock: codeblock}) - 1) + 'G\n\n';
+  };
+
+  text = showdown.helper.replaceRecursiveRegExp(text, repFunc, '^(?: |\\t){0,3}<pre\\b[^>]*>\\s*<code\\b[^>]*>', '^(?: |\\t){0,3}</code>\\s*</pre>', 'gim');
+  return text;
+});
+
+showdown.subParser('headers', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('headers.before', text, options, globals);
+
+  var prefixHeader = options.prefixHeaderId,
+      headerLevelStart = (isNaN(parseInt(options.headerLevelStart))) ? 1 : parseInt(options.headerLevelStart),
+
+  // Set text-style headers:
+  //	Header 1
+  //	========
+  //
+  //	Header 2
+  //	--------
+  //
+      setextRegexH1 = (options.smoothLivePreview) ? /^(.+)[ \t]*\n={2,}[ \t]*\n+/gm : /^(.+)[ \t]*\n=+[ \t]*\n+/gm,
+      setextRegexH2 = (options.smoothLivePreview) ? /^(.+)[ \t]*\n-{2,}[ \t]*\n+/gm : /^(.+)[ \t]*\n-+[ \t]*\n+/gm;
+
+  text = text.replace(setextRegexH1, function (wholeMatch, m1) {
+
+    var spanGamut = showdown.subParser('spanGamut')(m1, options, globals),
+        hID = (options.noHeaderId) ? '' : ' id="' + headerId(m1) + '"',
+        hLevel = headerLevelStart,
+        hashBlock = '<h' + hLevel + hID + '>' + spanGamut + '</h' + hLevel + '>';
+    return showdown.subParser('hashBlock')(hashBlock, options, globals);
+  });
+
+  text = text.replace(setextRegexH2, function (matchFound, m1) {
+    var spanGamut = showdown.subParser('spanGamut')(m1, options, globals),
+        hID = (options.noHeaderId) ? '' : ' id="' + headerId(m1) + '"',
+        hLevel = headerLevelStart + 1,
+      hashBlock = '<h' + hLevel + hID + '>' + spanGamut + '</h' + hLevel + '>';
+    return showdown.subParser('hashBlock')(hashBlock, options, globals);
+  });
+
+  // atx-style headers:
+  //  # Header 1
+  //  ## Header 2
+  //  ## Header 2 with closing hashes ##
+  //  ...
+  //  ###### Header 6
+  //
+  text = text.replace(/^(#{1,6})[ \t]*(.+?)[ \t]*#*\n+/gm, function (wholeMatch, m1, m2) {
+    var span = showdown.subParser('spanGamut')(m2, options, globals),
+        hID = (options.noHeaderId) ? '' : ' id="' + headerId(m2) + '"',
+        hLevel = headerLevelStart - 1 + m1.length,
+        header = '<h' + hLevel + hID + '>' + span + '</h' + hLevel + '>';
+
+    return showdown.subParser('hashBlock')(header, options, globals);
+  });
+
+  function headerId(m) {
+    var title, escapedId = m.replace(/[^\w]/g, '').toLowerCase();
+
+    if (globals.hashLinkCounts[escapedId]) {
+      title = escapedId + '-' + (globals.hashLinkCounts[escapedId]++);
+    } else {
+      title = escapedId;
+      globals.hashLinkCounts[escapedId] = 1;
+    }
+
+    // Prefix id to prevent causing inadvertent pre-existing style matches.
+    if (prefixHeader === true) {
+      prefixHeader = 'section';
+    }
+
+    if (showdown.helper.isString(prefixHeader)) {
+      return prefixHeader + title;
+    }
+    return title;
+  }
+
+  text = globals.converter._dispatch('headers.after', text, options, globals);
+  return text;
+});
+
+/**
+ * Turn Markdown image shortcuts into <img> tags.
+ */
+showdown.subParser('images', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('images.before', text, options, globals);
+
+  var inlineRegExp    = /!\[(.*?)]\s?\([ \t]*()<?(\S+?)>?(?: =([*\d]+[A-Za-z%]{0,4})x([*\d]+[A-Za-z%]{0,4}))?[ \t]*(?:(['"])(.*?)\6[ \t]*)?\)/g,
+      referenceRegExp = /!\[([^\]]*?)] ?(?:\n *)?\[(.*?)]()()()()()/g;
+
+  function writeImageTag (wholeMatch, altText, linkId, url, width, height, m5, title) {
+
+    var gUrls   = globals.gUrls,
+        gTitles = globals.gTitles,
+        gDims   = globals.gDimensions;
+
+    linkId = linkId.toLowerCase();
+
+    if (!title) {
+      title = '';
+    }
+
+    if (url === '' || url === null) {
+      if (linkId === '' || linkId === null) {
+        // lower-case and turn embedded newlines into spaces
+        linkId = altText.toLowerCase().replace(/ ?\n/g, ' ');
+      }
+      url = '#' + linkId;
+
+      if (!showdown.helper.isUndefined(gUrls[linkId])) {
+        url = gUrls[linkId];
+        if (!showdown.helper.isUndefined(gTitles[linkId])) {
+          title = gTitles[linkId];
+        }
+        if (!showdown.helper.isUndefined(gDims[linkId])) {
+          width = gDims[linkId].width;
+          height = gDims[linkId].height;
+        }
+      } else {
+        return wholeMatch;
+      }
+    }
+
+    altText = altText.replace(/"/g, '&quot;');
+    altText = showdown.helper.escapeCharacters(altText, '*_', false);
+    url = showdown.helper.escapeCharacters(url, '*_', false);
+    var result = '<img src="' + url + '" alt="' + altText + '"';
+
+    if (title) {
+      title = title.replace(/"/g, '&quot;');
+      title = showdown.helper.escapeCharacters(title, '*_', false);
+      result += ' title="' + title + '"';
+    }
+
+    if (width && height) {
+      width  = (width === '*') ? 'auto' : width;
+      height = (height === '*') ? 'auto' : height;
+
+      result += ' width="' + width + '"';
+      result += ' height="' + height + '"';
+    }
+
+    result += ' />';
+    return result;
+  }
+
+  // First, handle reference-style labeled images: ![alt text][id]
+  text = text.replace(referenceRegExp, writeImageTag);
+
+  // Next, handle inline images:  ![alt text](url =<width>x<height> "optional title")
+  text = text.replace(inlineRegExp, writeImageTag);
+
+  text = globals.converter._dispatch('images.after', text, options, globals);
+  return text;
+});
+
+showdown.subParser('italicsAndBold', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('italicsAndBold.before', text, options, globals);
+
+  if (options.literalMidWordUnderscores) {
+    //underscores
+    // Since we are consuming a \s character, we need to add it
+    text = text.replace(/(^|\s|>|\b)__(?=\S)([\s\S]+?)__(?=\b|<|\s|$)/gm, '$1<strong>$2</strong>');
+    text = text.replace(/(^|\s|>|\b)_(?=\S)([\s\S]+?)_(?=\b|<|\s|$)/gm, '$1<em>$2</em>');
+    //asterisks
+    text = text.replace(/(\*\*)(?=\S)([^\r]*?\S[*]*)\1/g, '<strong>$2</strong>');
+    text = text.replace(/(\*)(?=\S)([^\r]*?\S)\1/g, '<em>$2</em>');
+
+  } else {
+    // <strong> must go first:
+    text = text.replace(/(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g, '<strong>$2</strong>');
+    text = text.replace(/(\*|_)(?=\S)([^\r]*?\S)\1/g, '<em>$2</em>');
+  }
+
+  text = globals.converter._dispatch('italicsAndBold.after', text, options, globals);
+  return text;
+});
+
+/**
+ * Form HTML ordered (numbered) and unordered (bulleted) lists.
+ */
+showdown.subParser('lists', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('lists.before', text, options, globals);
+  /**
+   * Process the contents of a single ordered or unordered list, splitting it
+   * into individual list items.
+   * @param {string} listStr
+   * @param {boolean} trimTrailing
+   * @returns {string}
+   */
+  function processListItems (listStr, trimTrailing) {
+    // The $g_list_level global keeps track of when we're inside a list.
+    // Each time we enter a list, we increment it; when we leave a list,
+    // we decrement. If it's zero, we're not in a list anymore.
+    //
+    // We do this because when we're not inside a list, we want to treat
+    // something like this:
+    //
+    //    I recommend upgrading to version
+    //    8. Oops, now this line is treated
+    //    as a sub-list.
+    //
+    // As a single paragraph, despite the fact that the second line starts
+    // with a digit-period-space sequence.
+    //
+    // Whereas when we're inside a list (or sub-list), that line will be
+    // treated as the start of a sub-list. What a kludge, huh? This is
+    // an aspect of Markdown's syntax that's hard to parse perfectly
+    // without resorting to mind-reading. Perhaps the solution is to
+    // change the syntax rules such that sub-lists must start with a
+    // starting cardinal number; e.g. "1." or "a.".
+    globals.gListLevel++;
+
+    // trim trailing blank lines:
+    listStr = listStr.replace(/\n{2,}$/, '\n');
+
+    // attacklab: add sentinel to emulate \z
+    listStr += '~0';
+
+    var rgx = /(\n)?(^[ \t]*)([*+-]|\d+[.])[ \t]+((\[(x|X| )?])?[ \t]*[^\r]+?(\n{1,2}))(?=\n*(~0|\2([*+-]|\d+[.])[ \t]+))/gm,
+        isParagraphed = (/\n[ \t]*\n(?!~0)/.test(listStr));
+
+    listStr = listStr.replace(rgx, function (wholeMatch, m1, m2, m3, m4, taskbtn, checked) {
+      checked = (checked && checked.trim() !== '');
+      var item = showdown.subParser('outdent')(m4, options, globals),
+          bulletStyle = '';
+
+      // Support for github tasklists
+      if (taskbtn && options.tasklists) {
+        bulletStyle = ' class="task-list-item" style="list-style-type: none;"';
+        item = item.replace(/^[ \t]*\[(x|X| )?]/m, function () {
+          var otp = '<input type="checkbox" disabled style="margin: 0px 0.35em 0.25em -1.6em; vertical-align: middle;"';
+          if (checked) {
+            otp += ' checked';
+          }
+          otp += '>';
+          return otp;
+        });
+      }
+      // m1 - Leading line or
+      // Has a double return (multi paragraph) or
+      // Has sublist
+      if (m1 || (item.search(/\n{2,}/) > -1)) {
+        item = showdown.subParser('githubCodeBlocks')(item, options, globals);
+        item = showdown.subParser('blockGamut')(item, options, globals);
+      } else {
+        // Recursion for sub-lists:
+        item = showdown.subParser('lists')(item, options, globals);
+        item = item.replace(/\n$/, ''); // chomp(item)
+        if (isParagraphed) {
+          item = showdown.subParser('paragraphs')(item, options, globals);
+        } else {
+          item = showdown.subParser('spanGamut')(item, options, globals);
+        }
+      }
+      item =  '\n<li' + bulletStyle + '>' + item + '</li>\n';
+      return item;
+    });
+
+    // attacklab: strip sentinel
+    listStr = listStr.replace(/~0/g, '');
+
+    globals.gListLevel--;
+
+    if (trimTrailing) {
+      listStr = listStr.replace(/\s+$/, '');
+    }
+
+    return listStr;
+  }
+
+  /**
+   * Check and parse consecutive lists (better fix for issue #142)
+   * @param {string} list
+   * @param {string} listType
+   * @param {boolean} trimTrailing
+   * @returns {string}
+   */
+  function parseConsecutiveLists(list, listType, trimTrailing) {
+    // check if we caught 2 or more consecutive lists by mistake
+    // we use the counterRgx, meaning if listType is UL we look for UL and vice versa
+    var counterRxg = (listType === 'ul') ? /^ {0,2}\d+\.[ \t]/gm : /^ {0,2}[*+-][ \t]/gm,
+      subLists = [],
+      result = '';
+
+    if (list.search(counterRxg) !== -1) {
+      (function parseCL(txt) {
+        var pos = txt.search(counterRxg);
+        if (pos !== -1) {
+          // slice
+          result += '\n\n<' + listType + '>' + processListItems(txt.slice(0, pos), !!trimTrailing) + '</' + listType + '>\n\n';
+
+          // invert counterType and listType
+          listType = (listType === 'ul') ? 'ol' : 'ul';
+          counterRxg = (listType === 'ul') ? /^ {0,2}\d+\.[ \t]/gm : /^ {0,2}[*+-][ \t]/gm;
+
+          //recurse
+          parseCL(txt.slice(pos));
+        } else {
+          result += '\n\n<' + listType + '>' + processListItems(txt, !!trimTrailing) + '</' + listType + '>\n\n';
+        }
+      })(list);
+      for (var i = 0; i < subLists.length; ++i) {
+
+      }
+    } else {
+      result = '\n\n<' + listType + '>' + processListItems(list, !!trimTrailing) + '</' + listType + '>\n\n';
+    }
+
+    return result;
+  }
+
+  // attacklab: add sentinel to hack around khtml/safari bug:
+  // http://bugs.webkit.org/show_bug.cgi?id=11231
+  text += '~0';
+
+  // Re-usable pattern to match any entire ul or ol list:
+  var wholeList = /^(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/gm;
+
+  if (globals.gListLevel) {
+    text = text.replace(wholeList, function (wholeMatch, list, m2) {
+      var listType = (m2.search(/[*+-]/g) > -1) ? 'ul' : 'ol';
+      return parseConsecutiveLists(list, listType, true);
+    });
+  } else {
+    wholeList = /(\n\n|^\n?)(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/gm;
+    //wholeList = /(\n\n|^\n?)( {0,3}([*+-]|\d+\.)[ \t]+[\s\S]+?)(?=(~0)|(\n\n(?!\t| {2,}| {0,3}([*+-]|\d+\.)[ \t])))/g;
+    text = text.replace(wholeList, function (wholeMatch, m1, list, m3) {
+
+      var listType = (m3.search(/[*+-]/g) > -1) ? 'ul' : 'ol';
+      return parseConsecutiveLists(list, listType);
+    });
+  }
+
+  // attacklab: strip sentinel
+  text = text.replace(/~0/, '');
+
+  text = globals.converter._dispatch('lists.after', text, options, globals);
+  return text;
+});
+
+/**
+ * Remove one level of line-leading tabs or spaces
+ */
+showdown.subParser('outdent', function (text) {
+  'use strict';
+
+  // attacklab: hack around Konqueror 3.5.4 bug:
+  // "----------bug".replace(/^-/g,"") == "bug"
+  text = text.replace(/^(\t|[ ]{1,4})/gm, '~0'); // attacklab: g_tab_width
+
+  // attacklab: clean up hack
+  text = text.replace(/~0/g, '');
+
+  return text;
+});
+
+/**
+ *
+ */
+showdown.subParser('paragraphs', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('paragraphs.before', text, options, globals);
+  // Strip leading and trailing lines:
+  text = text.replace(/^\n+/g, '');
+  text = text.replace(/\n+$/g, '');
+
+  var grafs = text.split(/\n{2,}/g),
+      grafsOut = [],
+      end = grafs.length; // Wrap <p> tags
+
+  for (var i = 0; i < end; i++) {
+    var str = grafs[i];
+    // if this is an HTML marker, copy it
+    if (str.search(/~(K|G)(\d+)\1/g) >= 0) {
+      grafsOut.push(str);
+    } else {
+      str = showdown.subParser('spanGamut')(str, options, globals);
+      str = str.replace(/^([ \t]*)/g, '<p>');
+      str += '</p>';
+      grafsOut.push(str);
+    }
+  }
+
+  /** Unhashify HTML blocks */
+  end = grafsOut.length;
+  for (i = 0; i < end; i++) {
+    var blockText = '',
+        grafsOutIt = grafsOut[i],
+        codeFlag = false;
+    // if this is a marker for an html block...
+    while (grafsOutIt.search(/~(K|G)(\d+)\1/) >= 0) {
+      var delim = RegExp.$1,
+          num   = RegExp.$2;
+
+      if (delim === 'K') {
+        blockText = globals.gHtmlBlocks[num];
+      } else {
+        // we need to check if ghBlock is a false positive
+        if (codeFlag) {
+          // use encoded version of all text
+          blockText = showdown.subParser('encodeCode')(globals.ghCodeBlocks[num].text);
+        } else {
+          blockText = globals.ghCodeBlocks[num].codeblock;
+        }
+      }
+      blockText = blockText.replace(/\$/g, '$$$$'); // Escape any dollar signs
+
+      grafsOutIt = grafsOutIt.replace(/(\n\n)?~(K|G)\d+\2(\n\n)?/, blockText);
+      // Check if grafsOutIt is a pre->code
+      if (/^<pre\b[^>]*>\s*<code\b[^>]*>/.test(grafsOutIt)) {
+        codeFlag = true;
+      }
+    }
+    grafsOut[i] = grafsOutIt;
+  }
+  text = grafsOut.join('\n\n');
+  // Strip leading and trailing lines:
+  text = text.replace(/^\n+/g, '');
+  text = text.replace(/\n+$/g, '');
+  return globals.converter._dispatch('paragraphs.after', text, options, globals);
+});
+
+/**
+ * Run extension
+ */
+showdown.subParser('runExtension', function (ext, text, options, globals) {
+  'use strict';
+
+  if (ext.filter) {
+    text = ext.filter(text, globals.converter, options);
+
+  } else if (ext.regex) {
+    // TODO remove this when old extension loading mechanism is deprecated
+    var re = ext.regex;
+    if (!re instanceof RegExp) {
+      re = new RegExp(re, 'g');
+    }
+    text = text.replace(re, ext.replace);
+  }
+
+  return text;
+});
+
+/**
+ * These are all the transformations that occur *within* block-level
+ * tags like paragraphs, headers, and list items.
+ */
+showdown.subParser('spanGamut', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('spanGamut.before', text, options, globals);
+  text = showdown.subParser('codeSpans')(text, options, globals);
+  text = showdown.subParser('escapeSpecialCharsWithinTagAttributes')(text, options, globals);
+  text = showdown.subParser('encodeBackslashEscapes')(text, options, globals);
+
+  // Process anchor and image tags. Images must come first,
+  // because ![foo][f] looks like an anchor.
+  text = showdown.subParser('images')(text, options, globals);
+  text = showdown.subParser('anchors')(text, options, globals);
+
+  // Make links out of things like `<http://example.com/>`
+  // Must come after _DoAnchors(), because you can use < and >
+  // delimiters in inline links like [this](<url>).
+  text = showdown.subParser('autoLinks')(text, options, globals);
+  text = showdown.subParser('encodeAmpsAndAngles')(text, options, globals);
+  text = showdown.subParser('italicsAndBold')(text, options, globals);
+  text = showdown.subParser('strikethrough')(text, options, globals);
+
+  // Do hard breaks:
+  text = text.replace(/  +\n/g, ' <br />\n');
+
+  text = globals.converter._dispatch('spanGamut.after', text, options, globals);
+  return text;
+});
+
+showdown.subParser('strikethrough', function (text, options, globals) {
+  'use strict';
+
+  if (options.strikethrough) {
+    text = globals.converter._dispatch('strikethrough.before', text, options, globals);
+    text = text.replace(/(?:~T){2}([\s\S]+?)(?:~T){2}/g, '<del>$1</del>');
+    text = globals.converter._dispatch('strikethrough.after', text, options, globals);
+  }
+
+  return text;
+});
+
+/**
+ * Strip any lines consisting only of spaces and tabs.
+ * This makes subsequent regexs easier to write, because we can
+ * match consecutive blank lines with /\n+/ instead of something
+ * contorted like /[ \t]*\n+/
+ */
+showdown.subParser('stripBlankLines', function (text) {
+  'use strict';
+  return text.replace(/^[ \t]+$/mg, '');
+});
+
+/**
+ * Strips link definitions from text, stores the URLs and titles in
+ * hash references.
+ * Link defs are in the form: ^[id]: url "optional title"
+ *
+ * ^[ ]{0,3}\[(.+)\]: // id = $1  attacklab: g_tab_width - 1
+ * [ \t]*
+ * \n?                  // maybe *one* newline
+ * [ \t]*
+ * <?(\S+?)>?          // url = $2
+ * [ \t]*
+ * \n?                // maybe one newline
+ * [ \t]*
+ * (?:
+ * (\n*)              // any lines skipped = $3 attacklab: lookbehind removed
+ * ["(]
+ * (.+?)              // title = $4
+ * [")]
+ * [ \t]*
+ * )?                 // title is optional
+ * (?:\n+|$)
+ * /gm,
+ * function(){...});
+ *
+ */
+showdown.subParser('stripLinkDefinitions', function (text, options, globals) {
+  'use strict';
+
+  var regex = /^ {0,3}\[(.+)]:[ \t]*\n?[ \t]*<?(\S+?)>?(?: =([*\d]+[A-Za-z%]{0,4})x([*\d]+[A-Za-z%]{0,4}))?[ \t]*\n?[ \t]*(?:(\n*)["|'(](.+?)["|')][ \t]*)?(?:\n+|(?=~0))/gm;
+
+  // attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
+  text += '~0';
+
+  text = text.replace(regex, function (wholeMatch, linkId, url, width, height, blankLines, title) {
+    linkId = linkId.toLowerCase();
+    globals.gUrls[linkId] = showdown.subParser('encodeAmpsAndAngles')(url);  // Link IDs are case-insensitive
+
+    if (blankLines) {
+      // Oops, found blank lines, so it's not a title.
+      // Put back the parenthetical statement we stole.
+      return blankLines + title;
+
+    } else {
+      if (title) {
+        globals.gTitles[linkId] = title.replace(/"|'/g, '&quot;');
+      }
+      if (options.parseImgDimensions && width && height) {
+        globals.gDimensions[linkId] = {
+          width:  width,
+          height: height
+        };
+      }
+    }
+    // Completely remove the definition from the text
+    return '';
+  });
+
+  // attacklab: strip sentinel
+  text = text.replace(/~0/, '');
+
+  return text;
+});
+
+showdown.subParser('tables', function (text, options, globals) {
+  'use strict';
+
+  if (!options.tables) {
+    return text;
+  }
+
+  var tableRgx = /^[ \t]{0,3}\|?.+\|.+\n[ \t]{0,3}\|?[ \t]*:?[ \t]*(?:-|=){2,}[ \t]*:?[ \t]*\|[ \t]*:?[ \t]*(?:-|=){2,}[\s\S]+?(?:\n\n|~0)/gm;
+
+  function parseStyles(sLine) {
+    if (/^:[ \t]*--*$/.test(sLine)) {
+      return ' style="text-align:left;"';
+    } else if (/^--*[ \t]*:[ \t]*$/.test(sLine)) {
+      return ' style="text-align:right;"';
+    } else if (/^:[ \t]*--*[ \t]*:$/.test(sLine)) {
+      return ' style="text-align:center;"';
+    } else {
+      return '';
+    }
+  }
+
+  function parseHeaders(header, style) {
+    var id = '';
+    header = header.trim();
+    if (options.tableHeaderId) {
+      id = ' id="' + header.replace(/ /g, '_').toLowerCase() + '"';
+    }
+    header = showdown.subParser('spanGamut')(header, options, globals);
+
+    return '<th' + id + style + '>' + header + '</th>\n';
+  }
+
+  function parseCells(cell, style) {
+    var subText = showdown.subParser('spanGamut')(cell, options, globals);
+    return '<td' + style + '>' + subText + '</td>\n';
+  }
+
+  function buildTable(headers, cells) {
+    var tb = '<table>\n<thead>\n<tr>\n',
+        tblLgn = headers.length;
+
+    for (var i = 0; i < tblLgn; ++i) {
+      tb += headers[i];
+    }
+    tb += '</tr>\n</thead>\n<tbody>\n';
+
+    for (i = 0; i < cells.length; ++i) {
+      tb += '<tr>\n';
+      for (var ii = 0; ii < tblLgn; ++ii) {
+        tb += cells[i][ii];
+      }
+      tb += '</tr>\n';
+    }
+    tb += '</tbody>\n</table>\n';
+    return tb;
+  }
+
+  text = globals.converter._dispatch('tables.before', text, options, globals);
+
+  text = text.replace(tableRgx, function (rawTable) {
+
+    var i, tableLines = rawTable.split('\n');
+
+    // strip wrong first and last column if wrapped tables are used
+    for (i = 0; i < tableLines.length; ++i) {
+      if (/^[ \t]{0,3}\|/.test(tableLines[i])) {
+        tableLines[i] = tableLines[i].replace(/^[ \t]{0,3}\|/, '');
+      }
+      if (/\|[ \t]*$/.test(tableLines[i])) {
+        tableLines[i] = tableLines[i].replace(/\|[ \t]*$/, '');
+      }
+    }
+
+    var rawHeaders = tableLines[0].split('|').map(function (s) { return s.trim();}),
+        rawStyles = tableLines[1].split('|').map(function (s) { return s.trim();}),
+        rawCells = [],
+        headers = [],
+        styles = [],
+        cells = [];
+
+    tableLines.shift();
+    tableLines.shift();
+
+    for (i = 0; i < tableLines.length; ++i) {
+      if (tableLines[i].trim() === '') {
+        continue;
+      }
+      rawCells.push(
+        tableLines[i]
+          .split('|')
+          .map(function (s) {
+            return s.trim();
+          })
+      );
+    }
+
+    if (rawHeaders.length < rawStyles.length) {
+      return rawTable;
+    }
+
+    for (i = 0; i < rawStyles.length; ++i) {
+      styles.push(parseStyles(rawStyles[i]));
+    }
+
+    for (i = 0; i < rawHeaders.length; ++i) {
+      if (showdown.helper.isUndefined(styles[i])) {
+        styles[i] = '';
+      }
+      headers.push(parseHeaders(rawHeaders[i], styles[i]));
+    }
+
+    for (i = 0; i < rawCells.length; ++i) {
+      var row = [];
+      for (var ii = 0; ii < headers.length; ++ii) {
+        if (showdown.helper.isUndefined(rawCells[i][ii])) {
+
+        }
+        row.push(parseCells(rawCells[i][ii], styles[ii]));
+      }
+      cells.push(row);
+    }
+
+    return buildTable(headers, cells);
+  });
+
+  text = globals.converter._dispatch('tables.after', text, options, globals);
+
+  return text;
+});
+
+/**
+ * Swap back in all the special characters we've hidden.
+ */
+showdown.subParser('unescapeSpecialChars', function (text) {
+  'use strict';
+
+  text = text.replace(/~E(\d+)E/g, function (wholeMatch, m1) {
+    var charCodeToReplace = parseInt(m1);
+    return String.fromCharCode(charCodeToReplace);
+  });
+  return text;
+});
+module.exports = showdown;
diff --git a/litemall-wx/lib/wxParse/wxDiscode.js b/litemall-wx/lib/wxParse/wxDiscode.js
index e339f7a2..8dd63f74 100644
--- a/litemall-wx/lib/wxParse/wxDiscode.js
+++ b/litemall-wx/lib/wxParse/wxDiscode.js
@@ -1,206 +1,206 @@
-// HTML 支持的数学符号
-function strNumDiscode(str){
-    str = str.replace(/&forall;/g, '∀');
-    str = str.replace(/&part;/g, '∂');
-    str = str.replace(/&exists;/g, '∃');
-    str = str.replace(/&empty;/g, '∅');
-    str = str.replace(/&nabla;/g, '∇');
-    str = str.replace(/&isin;/g, '∈');
-    str = str.replace(/&notin;/g, '∉');
-    str = str.replace(/&ni;/g, '∋');
-    str = str.replace(/&prod;/g, '∏');
-    str = str.replace(/&sum;/g, '∑');
-    str = str.replace(/&minus;/g, '−');
-    str = str.replace(/&lowast;/g, '∗');
-    str = str.replace(/&radic;/g, '√');
-    str = str.replace(/&prop;/g, '∝');
-    str = str.replace(/&infin;/g, '∞');
-    str = str.replace(/&ang;/g, '∠');
-    str = str.replace(/&and;/g, '∧');
-    str = str.replace(/&or;/g, '∨');
-    str = str.replace(/&cap;/g, '∩');
-    str = str.replace(/&cap;/g, '∪');
-    str = str.replace(/&int;/g, '∫');
-    str = str.replace(/&there4;/g, '∴');
-    str = str.replace(/&sim;/g, '∼');
-    str = str.replace(/&cong;/g, '≅');
-    str = str.replace(/&asymp;/g, '≈');
-    str = str.replace(/&ne;/g, '≠');
-    str = str.replace(/&le;/g, '≤');
-    str = str.replace(/&ge;/g, '≥');
-    str = str.replace(/&sub;/g, '⊂');
-    str = str.replace(/&sup;/g, '⊃');
-    str = str.replace(/&nsub;/g, '⊄');
-    str = str.replace(/&sube;/g, '⊆');
-    str = str.replace(/&supe;/g, '⊇');
-    str = str.replace(/&oplus;/g, '⊕');
-    str = str.replace(/&otimes;/g, '⊗');
-    str = str.replace(/&perp;/g, '⊥');
-    str = str.replace(/&sdot;/g, '⋅');
-    return str;
-}
-
-//HTML 支持的希腊字母
-function strGreeceDiscode(str){
-    str = str.replace(/&Alpha;/g, 'Α');
-    str = str.replace(/&Beta;/g, 'Β');
-    str = str.replace(/&Gamma;/g, 'Γ');
-    str = str.replace(/&Delta;/g, 'Δ');
-    str = str.replace(/&Epsilon;/g, 'Ε');
-    str = str.replace(/&Zeta;/g, 'Ζ');
-    str = str.replace(/&Eta;/g, 'Η');
-    str = str.replace(/&Theta;/g, 'Θ');
-    str = str.replace(/&Iota;/g, 'Ι');
-    str = str.replace(/&Kappa;/g, 'Κ');
-    str = str.replace(/&Lambda;/g, 'Λ');
-    str = str.replace(/&Mu;/g, 'Μ');
-    str = str.replace(/&Nu;/g, 'Ν');
-    str = str.replace(/&Xi;/g, 'Ν');
-    str = str.replace(/&Omicron;/g, 'Ο');
-    str = str.replace(/&Pi;/g, 'Π');
-    str = str.replace(/&Rho;/g, 'Ρ');
-    str = str.replace(/&Sigma;/g, 'Σ');
-    str = str.replace(/&Tau;/g, 'Τ');
-    str = str.replace(/&Upsilon;/g, 'Υ');
-    str = str.replace(/&Phi;/g, 'Φ');
-    str = str.replace(/&Chi;/g, 'Χ');
-    str = str.replace(/&Psi;/g, 'Ψ');
-    str = str.replace(/&Omega;/g, 'Ω');
-
-    str = str.replace(/&alpha;/g, 'α');
-    str = str.replace(/&beta;/g, 'β');
-    str = str.replace(/&gamma;/g, 'γ');
-    str = str.replace(/&delta;/g, 'δ');
-    str = str.replace(/&epsilon;/g, 'ε');
-    str = str.replace(/&zeta;/g, 'ζ');
-    str = str.replace(/&eta;/g, 'η');
-    str = str.replace(/&theta;/g, 'θ');
-    str = str.replace(/&iota;/g, 'ι');
-    str = str.replace(/&kappa;/g, 'κ');
-    str = str.replace(/&lambda;/g, 'λ');
-    str = str.replace(/&mu;/g, 'μ');
-    str = str.replace(/&nu;/g, 'ν');
-    str = str.replace(/&xi;/g, 'ξ');
-    str = str.replace(/&omicron;/g, 'ο');
-    str = str.replace(/&pi;/g, 'π');
-    str = str.replace(/&rho;/g, 'ρ');
-    str = str.replace(/&sigmaf;/g, 'ς');
-    str = str.replace(/&sigma;/g, 'σ');
-    str = str.replace(/&tau;/g, 'τ');
-    str = str.replace(/&upsilon;/g, 'υ');
-    str = str.replace(/&phi;/g, 'φ');
-    str = str.replace(/&chi;/g, 'χ');
-    str = str.replace(/&psi;/g, 'ψ');
-    str = str.replace(/&omega;/g, 'ω');
-    str = str.replace(/&thetasym;/g, 'ϑ');
-    str = str.replace(/&upsih;/g, 'ϒ');
-    str = str.replace(/&piv;/g, 'ϖ');
-    str = str.replace(/&middot;/g, '·');
-    return str;
-}
-
-// 
-
-function strcharacterDiscode(str){
-    // 加入常用解析
-    str = str.replace(/&nbsp;/g, ' ');
-    str = str.replace(/&quot;/g, '"');
-    str = str.replace(/&amp;/g, '&');
-    // str = str.replace(/&lt;/g, '‹');
-    // str = str.replace(/&gt;/g, '›');
-
-    str = str.replace(/&lt;/g, '<');
-    str = str.replace(/&gt;/g, '>');
-
-    return str;
-}
-
-// HTML 支持的其他实体
-function strOtherDiscode(str){
-    str = str.replace(/&OElig;/g, 'Œ');
-    str = str.replace(/&oelig;/g, 'œ');
-    str = str.replace(/&Scaron;/g, 'Š');
-    str = str.replace(/&scaron;/g, 'š');
-    str = str.replace(/&Yuml;/g, 'Ÿ');
-    str = str.replace(/&fnof;/g, 'ƒ');
-    str = str.replace(/&circ;/g, 'ˆ');
-    str = str.replace(/&tilde;/g, '˜');
-    str = str.replace(/&ensp;/g, '');
-    str = str.replace(/&emsp;/g, '');
-    str = str.replace(/&thinsp;/g, '');
-    str = str.replace(/&zwnj;/g, '');
-    str = str.replace(/&zwj;/g, '');
-    str = str.replace(/&lrm;/g, '');
-    str = str.replace(/&rlm;/g, '');
-    str = str.replace(/&ndash;/g, '–');
-    str = str.replace(/&mdash;/g, '—');
-    str = str.replace(/&lsquo;/g, '‘');
-    str = str.replace(/&rsquo;/g, '’');
-    str = str.replace(/&sbquo;/g, '‚');
-    str = str.replace(/&ldquo;/g, '“');
-    str = str.replace(/&rdquo;/g, '”');
-    str = str.replace(/&bdquo;/g, '„');
-    str = str.replace(/&dagger;/g, '†');
-    str = str.replace(/&Dagger;/g, '‡');
-    str = str.replace(/&bull;/g, '•');
-    str = str.replace(/&hellip;/g, '…');
-    str = str.replace(/&permil;/g, '‰');
-    str = str.replace(/&prime;/g, '′');
-    str = str.replace(/&Prime;/g, '″');
-    str = str.replace(/&lsaquo;/g, '‹');
-    str = str.replace(/&rsaquo;/g, '›');
-    str = str.replace(/&oline;/g, '‾');
-    str = str.replace(/&euro;/g, '€');
-    str = str.replace(/&trade;/g, '™');
-
-    str = str.replace(/&larr;/g, '←');
-    str = str.replace(/&uarr;/g, '↑');
-    str = str.replace(/&rarr;/g, '→');
-    str = str.replace(/&darr;/g, '↓');
-    str = str.replace(/&harr;/g, '↔');
-    str = str.replace(/&crarr;/g, '↵');
-    str = str.replace(/&lceil;/g, '⌈');
-    str = str.replace(/&rceil;/g, '⌉');
-
-    str = str.replace(/&lfloor;/g, '⌊');
-    str = str.replace(/&rfloor;/g, '⌋');
-    str = str.replace(/&loz;/g, '◊');
-    str = str.replace(/&spades;/g, '♠');
-    str = str.replace(/&clubs;/g, '♣');
-    str = str.replace(/&hearts;/g, '♥');
-
-    str = str.replace(/&diams;/g, '♦');
-
-    return str;
-}
-
-function strMoreDiscode(str){
-    str = str.replace(/\r\n/g,"");  
-    str = str.replace(/\n/g,"");
-
-    str = str.replace(/code/g,"wxxxcode-style");
-    return str;
-}
-
-function strDiscode(str){
-    str = strNumDiscode(str);
-    str = strGreeceDiscode(str);
-    str = strcharacterDiscode(str);
-    str = strOtherDiscode(str);
-    str = strMoreDiscode(str);
-    return str;
-}
-function urlToHttpUrl(url,rep){
-    
-    var patt1 = new RegExp("^//");
-    var result = patt1.test(url);
-    if(result){
-        url = rep+":"+url;
-    }
-    return  url;
-}
-
-module.exports = {
-    strDiscode:strDiscode,
-    urlToHttpUrl:urlToHttpUrl
+// HTML 支持的数学符号
+function strNumDiscode(str){
+    str = str.replace(/&forall;/g, '∀');
+    str = str.replace(/&part;/g, '∂');
+    str = str.replace(/&exists;/g, '∃');
+    str = str.replace(/&empty;/g, '∅');
+    str = str.replace(/&nabla;/g, '∇');
+    str = str.replace(/&isin;/g, '∈');
+    str = str.replace(/&notin;/g, '∉');
+    str = str.replace(/&ni;/g, '∋');
+    str = str.replace(/&prod;/g, '∏');
+    str = str.replace(/&sum;/g, '∑');
+    str = str.replace(/&minus;/g, '−');
+    str = str.replace(/&lowast;/g, '∗');
+    str = str.replace(/&radic;/g, '√');
+    str = str.replace(/&prop;/g, '∝');
+    str = str.replace(/&infin;/g, '∞');
+    str = str.replace(/&ang;/g, '∠');
+    str = str.replace(/&and;/g, '∧');
+    str = str.replace(/&or;/g, '∨');
+    str = str.replace(/&cap;/g, '∩');
+    str = str.replace(/&cap;/g, '∪');
+    str = str.replace(/&int;/g, '∫');
+    str = str.replace(/&there4;/g, '∴');
+    str = str.replace(/&sim;/g, '∼');
+    str = str.replace(/&cong;/g, '≅');
+    str = str.replace(/&asymp;/g, '≈');
+    str = str.replace(/&ne;/g, '≠');
+    str = str.replace(/&le;/g, '≤');
+    str = str.replace(/&ge;/g, '≥');
+    str = str.replace(/&sub;/g, '⊂');
+    str = str.replace(/&sup;/g, '⊃');
+    str = str.replace(/&nsub;/g, '⊄');
+    str = str.replace(/&sube;/g, '⊆');
+    str = str.replace(/&supe;/g, '⊇');
+    str = str.replace(/&oplus;/g, '⊕');
+    str = str.replace(/&otimes;/g, '⊗');
+    str = str.replace(/&perp;/g, '⊥');
+    str = str.replace(/&sdot;/g, '⋅');
+    return str;
+}
+
+//HTML 支持的希腊字母
+function strGreeceDiscode(str){
+    str = str.replace(/&Alpha;/g, 'Α');
+    str = str.replace(/&Beta;/g, 'Β');
+    str = str.replace(/&Gamma;/g, 'Γ');
+    str = str.replace(/&Delta;/g, 'Δ');
+    str = str.replace(/&Epsilon;/g, 'Ε');
+    str = str.replace(/&Zeta;/g, 'Ζ');
+    str = str.replace(/&Eta;/g, 'Η');
+    str = str.replace(/&Theta;/g, 'Θ');
+    str = str.replace(/&Iota;/g, 'Ι');
+    str = str.replace(/&Kappa;/g, 'Κ');
+    str = str.replace(/&Lambda;/g, 'Λ');
+    str = str.replace(/&Mu;/g, 'Μ');
+    str = str.replace(/&Nu;/g, 'Ν');
+    str = str.replace(/&Xi;/g, 'Ν');
+    str = str.replace(/&Omicron;/g, 'Ο');
+    str = str.replace(/&Pi;/g, 'Π');
+    str = str.replace(/&Rho;/g, 'Ρ');
+    str = str.replace(/&Sigma;/g, 'Σ');
+    str = str.replace(/&Tau;/g, 'Τ');
+    str = str.replace(/&Upsilon;/g, 'Υ');
+    str = str.replace(/&Phi;/g, 'Φ');
+    str = str.replace(/&Chi;/g, 'Χ');
+    str = str.replace(/&Psi;/g, 'Ψ');
+    str = str.replace(/&Omega;/g, 'Ω');
+
+    str = str.replace(/&alpha;/g, 'α');
+    str = str.replace(/&beta;/g, 'β');
+    str = str.replace(/&gamma;/g, 'γ');
+    str = str.replace(/&delta;/g, 'δ');
+    str = str.replace(/&epsilon;/g, 'ε');
+    str = str.replace(/&zeta;/g, 'ζ');
+    str = str.replace(/&eta;/g, 'η');
+    str = str.replace(/&theta;/g, 'θ');
+    str = str.replace(/&iota;/g, 'ι');
+    str = str.replace(/&kappa;/g, 'κ');
+    str = str.replace(/&lambda;/g, 'λ');
+    str = str.replace(/&mu;/g, 'μ');
+    str = str.replace(/&nu;/g, 'ν');
+    str = str.replace(/&xi;/g, 'ξ');
+    str = str.replace(/&omicron;/g, 'ο');
+    str = str.replace(/&pi;/g, 'π');
+    str = str.replace(/&rho;/g, 'ρ');
+    str = str.replace(/&sigmaf;/g, 'ς');
+    str = str.replace(/&sigma;/g, 'σ');
+    str = str.replace(/&tau;/g, 'τ');
+    str = str.replace(/&upsilon;/g, 'υ');
+    str = str.replace(/&phi;/g, 'φ');
+    str = str.replace(/&chi;/g, 'χ');
+    str = str.replace(/&psi;/g, 'ψ');
+    str = str.replace(/&omega;/g, 'ω');
+    str = str.replace(/&thetasym;/g, 'ϑ');
+    str = str.replace(/&upsih;/g, 'ϒ');
+    str = str.replace(/&piv;/g, 'ϖ');
+    str = str.replace(/&middot;/g, '·');
+    return str;
+}
+
+// 
+
+function strcharacterDiscode(str){
+    // 加入常用解析
+    str = str.replace(/&nbsp;/g, ' ');
+    str = str.replace(/&quot;/g, '"');
+    str = str.replace(/&amp;/g, '&');
+    // str = str.replace(/&lt;/g, '‹');
+    // str = str.replace(/&gt;/g, '›');
+
+    str = str.replace(/&lt;/g, '<');
+    str = str.replace(/&gt;/g, '>');
+
+    return str;
+}
+
+// HTML 支持的其他实体
+function strOtherDiscode(str){
+    str = str.replace(/&OElig;/g, 'Œ');
+    str = str.replace(/&oelig;/g, 'œ');
+    str = str.replace(/&Scaron;/g, 'Š');
+    str = str.replace(/&scaron;/g, 'š');
+    str = str.replace(/&Yuml;/g, 'Ÿ');
+    str = str.replace(/&fnof;/g, 'ƒ');
+    str = str.replace(/&circ;/g, 'ˆ');
+    str = str.replace(/&tilde;/g, '˜');
+    str = str.replace(/&ensp;/g, '');
+    str = str.replace(/&emsp;/g, '');
+    str = str.replace(/&thinsp;/g, '');
+    str = str.replace(/&zwnj;/g, '');
+    str = str.replace(/&zwj;/g, '');
+    str = str.replace(/&lrm;/g, '');
+    str = str.replace(/&rlm;/g, '');
+    str = str.replace(/&ndash;/g, '–');
+    str = str.replace(/&mdash;/g, '—');
+    str = str.replace(/&lsquo;/g, '‘');
+    str = str.replace(/&rsquo;/g, '’');
+    str = str.replace(/&sbquo;/g, '‚');
+    str = str.replace(/&ldquo;/g, '“');
+    str = str.replace(/&rdquo;/g, '”');
+    str = str.replace(/&bdquo;/g, '„');
+    str = str.replace(/&dagger;/g, '†');
+    str = str.replace(/&Dagger;/g, '‡');
+    str = str.replace(/&bull;/g, '•');
+    str = str.replace(/&hellip;/g, '…');
+    str = str.replace(/&permil;/g, '‰');
+    str = str.replace(/&prime;/g, '′');
+    str = str.replace(/&Prime;/g, '″');
+    str = str.replace(/&lsaquo;/g, '‹');
+    str = str.replace(/&rsaquo;/g, '›');
+    str = str.replace(/&oline;/g, '‾');
+    str = str.replace(/&euro;/g, '€');
+    str = str.replace(/&trade;/g, '™');
+
+    str = str.replace(/&larr;/g, '←');
+    str = str.replace(/&uarr;/g, '↑');
+    str = str.replace(/&rarr;/g, '→');
+    str = str.replace(/&darr;/g, '↓');
+    str = str.replace(/&harr;/g, '↔');
+    str = str.replace(/&crarr;/g, '↵');
+    str = str.replace(/&lceil;/g, '⌈');
+    str = str.replace(/&rceil;/g, '⌉');
+
+    str = str.replace(/&lfloor;/g, '⌊');
+    str = str.replace(/&rfloor;/g, '⌋');
+    str = str.replace(/&loz;/g, '◊');
+    str = str.replace(/&spades;/g, '♠');
+    str = str.replace(/&clubs;/g, '♣');
+    str = str.replace(/&hearts;/g, '♥');
+
+    str = str.replace(/&diams;/g, '♦');
+
+    return str;
+}
+
+function strMoreDiscode(str){
+    str = str.replace(/\r\n/g,"");  
+    str = str.replace(/\n/g,"");
+
+    str = str.replace(/code/g,"wxxxcode-style");
+    return str;
+}
+
+function strDiscode(str){
+    str = strNumDiscode(str);
+    str = strGreeceDiscode(str);
+    str = strcharacterDiscode(str);
+    str = strOtherDiscode(str);
+    str = strMoreDiscode(str);
+    return str;
+}
+function urlToHttpUrl(url,rep){
+    
+    var patt1 = new RegExp("^//");
+    var result = patt1.test(url);
+    if(result){
+        url = rep+":"+url;
+    }
+    return  url;
+}
+
+module.exports = {
+    strDiscode:strDiscode,
+    urlToHttpUrl:urlToHttpUrl
 }
\ No newline at end of file
diff --git a/litemall-wx/lib/wxParse/wxParse.js b/litemall-wx/lib/wxParse/wxParse.js
index 8adab502..a5e59ee7 100644
--- a/litemall-wx/lib/wxParse/wxParse.js
+++ b/litemall-wx/lib/wxParse/wxParse.js
@@ -1,146 +1,146 @@
-/**
- * author: Di (微信小程序开发工程师)
- * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
- *               垂直微信小程序开发交流社区
- * 
- * github地址: https://github.com/icindy/wxParse
- * 
- * for: 微信小程序富文本解析
- * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
- */
-
-/**
- * utils函数引入
- **/
-import showdown from 'showdown.js';
-import HtmlToJson from 'html2json.js';
-/**
- * 配置及公有属性
- **/
-/**
- * 主函数入口区
- **/
-function wxParse(bindName = 'wxParseData', type='html', data='<div class="color:red;">数据不能为空</div>', target,imagePadding) {
-  var that = target;
-  var transData = {};//存放转化后的数据
-  if (type == 'html') {
-    transData = HtmlToJson.html2json(data, bindName);
-    // console.log(JSON.stringify(transData, ' ', ' '));
-  } else if (type == 'md' || type == 'markdown') {
-    var converter = new showdown.Converter();
-    var html = converter.makeHtml(data);
-    transData = HtmlToJson.html2json(html, bindName);
-    // console.log(JSON.stringify(transData, ' ', ' '));
-  }
-  transData.view = {};
-  transData.view.imagePadding = 0;
-  if(typeof(imagePadding) != 'undefined'){
-    transData.view.imagePadding = imagePadding
-  }
-  var bindData = {};
-  bindData[bindName] = transData;
-  that.setData(bindData)
-  that.wxParseImgLoad = wxParseImgLoad;
-  that.wxParseImgTap = wxParseImgTap;
-}
-// 图片点击事件
-function wxParseImgTap(e) {
-  var that = this;
-  var nowImgUrl = e.target.dataset.src;
-  var tagFrom = e.target.dataset.from;
-  if (typeof (tagFrom) != 'undefined' && tagFrom.length > 0) {
-    wx.previewImage({
-      current: nowImgUrl, // 当前显示图片的http链接
-      urls: that.data[tagFrom].imageUrls // 需要预览的图片http链接列表
-    })
-  }
-}
-
-/**
- * 图片视觉宽高计算函数区 
- **/
-function wxParseImgLoad(e) {
-  var that = this;
-  var tagFrom = e.target.dataset.from;
-  var idx = e.target.dataset.idx;
-  if (typeof (tagFrom) != 'undefined' && tagFrom.length > 0) {
-    calMoreImageInfo(e, idx, that, tagFrom)
-  } 
-}
-// 假循环获取计算图片视觉最佳宽高
-function calMoreImageInfo(e, idx, that, bindName) {
-  var temData = that.data[bindName];
-  if (temData.images.length == 0) {
-    return;
-  }
-  var temImages = temData.images;
-  //因为无法获取view宽度 需要自定义padding进行计算，稍后处理
-  var recal = wxAutoImageCal(e.detail.width, e.detail.height,that,bindName); 
-  temImages[idx].width = recal.imageWidth;
-  temImages[idx].height = recal.imageheight; 
-  temData.images = temImages;
-  var bindData = {};
-  bindData[bindName] = temData;
-  that.setData(bindData);
-}
-
-// 计算视觉优先的图片宽高
-function wxAutoImageCal(originalWidth, originalHeight,that,bindName) {
-  //获取图片的原始长宽
-  var windowWidth = 0, windowHeight = 0;
-  var autoWidth = 0, autoHeight = 0;
-  var results = {};
-  wx.getSystemInfo({
-    success: function (res) {
-      var padding = that.data[bindName].view.imagePadding;
-      windowWidth = res.windowWidth-2*padding;
-      windowHeight = res.windowHeight;
-      //判断按照那种方式进行缩放
-      // console.log("windowWidth" + windowWidth);
-      if (originalWidth > windowWidth) {//在图片width大于手机屏幕width时候
-        autoWidth = windowWidth;
-        // console.log("autoWidth" + autoWidth);
-        autoHeight = (autoWidth * originalHeight) / originalWidth;
-        // console.log("autoHeight" + autoHeight);
-        results.imageWidth = autoWidth;
-        results.imageheight = autoHeight;
-      } else {//否则展示原来的数据
-        results.imageWidth = originalWidth;
-        results.imageheight = originalHeight;
-      }
-    }
-  })
-  return results;
-}
-
-function wxParseTemArray(temArrayName,bindNameReg,total,that){
-  var array = [];
-  var temData = that.data;
-  var obj = null;
-  for(var i = 0; i < total; i++){
-    var simArr = temData[bindNameReg+i].nodes;
-    array.push(simArr);
-  }
-
-  temArrayName = temArrayName || 'wxParseTemArray';
-  obj = JSON.parse('{"'+ temArrayName +'":""}');
-  obj[temArrayName] = array;
-  that.setData(obj);
-}
-
-/**
- * 配置emojis
- * 
- */
-
-function emojisInit(reg='',baseSrc="/wxParse/emojis/",emojis){
-   HtmlToJson.emojisInit(reg,baseSrc,emojis);
-}
-
-module.exports = {
-  wxParse: wxParse,
-  wxParseTemArray:wxParseTemArray,
-  emojisInit:emojisInit
-}
-
-
+/**
+ * author: Di (微信小程序开发工程师)
+ * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
+ *               垂直微信小程序开发交流社区
+ * 
+ * github地址: https://github.com/icindy/wxParse
+ * 
+ * for: 微信小程序富文本解析
+ * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
+ */
+
+/**
+ * utils函数引入
+ **/
+import showdown from 'showdown.js';
+import HtmlToJson from 'html2json.js';
+/**
+ * 配置及公有属性
+ **/
+/**
+ * 主函数入口区
+ **/
+function wxParse(bindName = 'wxParseData', type='html', data='<div class="color:red;">数据不能为空</div>', target,imagePadding) {
+  var that = target;
+  var transData = {};//存放转化后的数据
+  if (type == 'html') {
+    transData = HtmlToJson.html2json(data, bindName);
+    // console.log(JSON.stringify(transData, ' ', ' '));
+  } else if (type == 'md' || type == 'markdown') {
+    var converter = new showdown.Converter();
+    var html = converter.makeHtml(data);
+    transData = HtmlToJson.html2json(html, bindName);
+    // console.log(JSON.stringify(transData, ' ', ' '));
+  }
+  transData.view = {};
+  transData.view.imagePadding = 0;
+  if(typeof(imagePadding) != 'undefined'){
+    transData.view.imagePadding = imagePadding
+  }
+  var bindData = {};
+  bindData[bindName] = transData;
+  that.setData(bindData)
+  that.wxParseImgLoad = wxParseImgLoad;
+  that.wxParseImgTap = wxParseImgTap;
+}
+// 图片点击事件
+function wxParseImgTap(e) {
+  var that = this;
+  var nowImgUrl = e.target.dataset.src;
+  var tagFrom = e.target.dataset.from;
+  if (typeof (tagFrom) != 'undefined' && tagFrom.length > 0) {
+    wx.previewImage({
+      current: nowImgUrl, // 当前显示图片的http链接
+      urls: that.data[tagFrom].imageUrls // 需要预览的图片http链接列表
+    })
+  }
+}
+
+/**
+ * 图片视觉宽高计算函数区 
+ **/
+function wxParseImgLoad(e) {
+  var that = this;
+  var tagFrom = e.target.dataset.from;
+  var idx = e.target.dataset.idx;
+  if (typeof (tagFrom) != 'undefined' && tagFrom.length > 0) {
+    calMoreImageInfo(e, idx, that, tagFrom)
+  } 
+}
+// 假循环获取计算图片视觉最佳宽高
+function calMoreImageInfo(e, idx, that, bindName) {
+  var temData = that.data[bindName];
+  if (temData.images.length == 0) {
+    return;
+  }
+  var temImages = temData.images;
+  //因为无法获取view宽度 需要自定义padding进行计算，稍后处理
+  var recal = wxAutoImageCal(e.detail.width, e.detail.height,that,bindName); 
+  temImages[idx].width = recal.imageWidth;
+  temImages[idx].height = recal.imageheight; 
+  temData.images = temImages;
+  var bindData = {};
+  bindData[bindName] = temData;
+  that.setData(bindData);
+}
+
+// 计算视觉优先的图片宽高
+function wxAutoImageCal(originalWidth, originalHeight,that,bindName) {
+  //获取图片的原始长宽
+  var windowWidth = 0, windowHeight = 0;
+  var autoWidth = 0, autoHeight = 0;
+  var results = {};
+  wx.getSystemInfo({
+    success: function (res) {
+      var padding = that.data[bindName].view.imagePadding;
+      windowWidth = res.windowWidth-2*padding;
+      windowHeight = res.windowHeight;
+      //判断按照那种方式进行缩放
+      // console.log("windowWidth" + windowWidth);
+      if (originalWidth > windowWidth) {//在图片width大于手机屏幕width时候
+        autoWidth = windowWidth;
+        // console.log("autoWidth" + autoWidth);
+        autoHeight = (autoWidth * originalHeight) / originalWidth;
+        // console.log("autoHeight" + autoHeight);
+        results.imageWidth = autoWidth;
+        results.imageheight = autoHeight;
+      } else {//否则展示原来的数据
+        results.imageWidth = originalWidth;
+        results.imageheight = originalHeight;
+      }
+    }
+  })
+  return results;
+}
+
+function wxParseTemArray(temArrayName,bindNameReg,total,that){
+  var array = [];
+  var temData = that.data;
+  var obj = null;
+  for(var i = 0; i < total; i++){
+    var simArr = temData[bindNameReg+i].nodes;
+    array.push(simArr);
+  }
+
+  temArrayName = temArrayName || 'wxParseTemArray';
+  obj = JSON.parse('{"'+ temArrayName +'":""}');
+  obj[temArrayName] = array;
+  that.setData(obj);
+}
+
+/**
+ * 配置emojis
+ * 
+ */
+
+function emojisInit(reg='',baseSrc="/wxParse/emojis/",emojis){
+   HtmlToJson.emojisInit(reg,baseSrc,emojis);
+}
+
+module.exports = {
+  wxParse: wxParse,
+  wxParseTemArray:wxParseTemArray,
+  emojisInit:emojisInit
+}
+
+
diff --git a/litemall-wx/lib/wxParse/wxParse.wxml b/litemall-wx/lib/wxParse/wxParse.wxml
index 33055d04..bf787d9b 100644
--- a/litemall-wx/lib/wxParse/wxParse.wxml
+++ b/litemall-wx/lib/wxParse/wxParse.wxml
@@ -1,928 +1,928 @@
-
-<!--**
- * author: Di (微信小程序开发工程师)
- * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
- *               垂直微信小程序开发交流社区
- * 
- * github地址: https://github.com/icindy/wxParse
- * 
- * for: 微信小程序富文本解析
- * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
- */-->
-
- <!--基础元素-->
-<template name="wxParseVideo">
-    <!--增加video标签支持，并循环添加-->
-    <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
-        <video class="{{item.classStr}} wxParse-{{item.tag}}-video" src="{{item.attr.src}}"></video>
-    </view>
-</template>
-
-<template name="wxParseImg">
-    <image class="{{item.classStr}} wxParse-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}"  data-idx="{{item.imgIndex}}"  src="{{item.attr.src}}" mode="aspectFit" bindload="wxParseImgLoad" bindtap="wxParseImgTap" style="width:{{item.width}}px;height:{{item.height}}px;{{item.attr.style}}"   />
-</template>
-
-<template name="WxEmojiView">
-  <view class="WxEmojiView wxParse-inline" style="{{item.styleStr}}">
-    <block wx:for="{{item.textArray}}" wx:key="key">
-      <block class="{{item.text == '\\n' ? 'wxParse-hide':''}}" wx:if="{{item.node == 'text'}}">{{item.text}}</block>
-      <block wx:elif="{{item.node == 'element'}}">
-        <image class="wxEmoji" src="{{item.baseSrc}}{{item.text}}" />
-      </block>
-    </block>
-  </view>
-</template>
-
-<!--入口模版-->
-
-<template name="wxParse">
-    <block wx:for="{{wxParseData}}" wx:key="key">
-        <template is="wxParse0" data="{{item}}"/>
-    </block>
-</template>
-
-
-<!--循环模版-->
-<template name="wxParse0">
-    <!--<template is="wxParse1" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse1" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--li类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="{{item.classStr}} wxParse-li">
-                <view class="{{item.classStr}} wxParse-li-inner">
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <view class="{{item.classStr}} wxParse-li-circle"></view>
-                    </view>
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                            <template is="wxParse1" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
-
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
-            <template is="wxParseVideo" data="{{item}}"/>  
-        </block>
-
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <template is="wxParseImg" data="{{item}}"/>
-        </block>
-
-        <!--a类型-->
-        <block wx:elif="{{item.tag == 'a'}}">
-            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-c="{{item.attr.href}}"  style="{{item.styleStr}}">
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse1" data="{{item}}"/>
-                </block>
-            </view>
-        </block>
-        <block wx:elif="{{item.tag == 'table'}}">
-            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
-                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                    <template is="wxParse1" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
-
-        <!--其他块级标签-->
-        <block wx:elif="{{item.tagType == 'block'}}">
-            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
-                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                    <template is="wxParse1" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
-
-        <!--内联标签-->
-        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
-            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                <template is="wxParse1" data="{{item}}"/>                 
-            </block>
-        </view>
-
-    </block>
-
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <template is="WxEmojiView" data="{{item}}"/>
-    </block>
-
-</template>
-
-
-
-<!--循环模版-->
-<template name="wxParse1">
-    <!--<template is="wxParse2" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse2" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--li类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="{{item.classStr}} wxParse-li">
-                <view class="{{item.classStr}} wxParse-li-inner">
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <view class="{{item.classStr}} wxParse-li-circle"></view>
-                    </view>
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                            <template is="wxParse2" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
-
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
-            <template is="wxParseVideo" data="{{item}}"/>  
-        </block>
-
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <template is="wxParseImg" data="{{item}}"/>
-        </block>
-
-        <!--a类型-->
-        <block wx:elif="{{item.tag == 'a'}}">
-            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse2" data="{{item}}"/>
-                </block>
-            </view>
-        </block>
-        
-        <!--其他块级标签-->
-        <block wx:elif="{{item.tagType == 'block'}}">
-            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
-                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                    <template is="wxParse2" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
-
-        <!--内联标签-->
-        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
-            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                <template is="wxParse2" data="{{item}}"/>                 
-            </block>
-        </view>
-
-    </block>
-
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <template is="WxEmojiView" data="{{item}}"/>
-    </block>
-
-</template>
-
-
-<!--循环模版-->
-<template name="wxParse2">
-    <!--<template is="wxParse3" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse3" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--li类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="{{item.classStr}} wxParse-li">
-                <view class="{{item.classStr}} wxParse-li-inner">
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <view class="{{item.classStr}} wxParse-li-circle"></view>
-                    </view>
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                            <template is="wxParse3" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
-
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
-            <template is="wxParseVideo" data="{{item}}"/>  
-        </block>
-
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <template is="wxParseImg" data="{{item}}"/>
-        </block>
-
-        <!--a类型-->
-        <block wx:elif="{{item.tag == 'a'}}">
-            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse3" data="{{item}}"/>
-                </block>
-            </view>
-        </block>
-        
-        <!--其他块级标签-->
-        <block wx:elif="{{item.tagType == 'block'}}">
-            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
-                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                    <template is="wxParse3" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
-
-        <!--内联标签-->
-        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
-            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                <template is="wxParse3" data="{{item}}"/>                 
-            </block>
-        </view>
-
-    </block>
-
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <template is="WxEmojiView" data="{{item}}"/>
-    </block>
-
-</template>
-
-<!--循环模版-->
-<template name="wxParse3">
-    <!--<template is="wxParse4" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse4" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--li类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="{{item.classStr}} wxParse-li">
-                <view class="{{item.classStr}} wxParse-li-inner">
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <view class="{{item.classStr}} wxParse-li-circle"></view>
-                    </view>
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                            <template is="wxParse4" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
-
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
-            <template is="wxParseVideo" data="{{item}}"/>  
-        </block>
-
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <template is="wxParseImg" data="{{item}}"/>
-        </block>
-
-        <!--a类型-->
-        <block wx:elif="{{item.tag == 'a'}}">
-            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse4" data="{{item}}"/>
-                </block>
-            </view>
-        </block>
-        
-        <!--其他块级标签-->
-        <block wx:elif="{{item.tagType == 'block'}}">
-            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
-                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                    <template is="wxParse4" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
-
-        <!--内联标签-->
-        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
-            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                <template is="wxParse4" data="{{item}}"/>                 
-            </block>
-        </view>
-
-    </block>
-
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <template is="WxEmojiView" data="{{item}}"/>
-    </block>
-
-</template>
-
-<!--循环模版-->
-<template name="wxParse4">
-    <!--<template is="wxParse5" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse5" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--li类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="{{item.classStr}} wxParse-li">
-                <view class="{{item.classStr}} wxParse-li-inner">
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <view class="{{item.classStr}} wxParse-li-circle"></view>
-                    </view>
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                            <template is="wxParse5" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
-
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
-            <template is="wxParseVideo" data="{{item}}"/>  
-        </block>
-
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <template is="wxParseImg" data="{{item}}"/>
-        </block>
-
-        <!--a类型-->
-        <block wx:elif="{{item.tag == 'a'}}">
-            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse5" data="{{item}}"/>
-                </block>
-            </view>
-        </block>
-        
-        <!--其他块级标签-->
-        <block wx:elif="{{item.tagType == 'block'}}">
-            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
-                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                    <template is="wxParse5" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
-
-        <!--内联标签-->
-        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
-            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                <template is="wxParse5" data="{{item}}"/>                 
-            </block>
-        </view>
-
-    </block>
-
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <template is="WxEmojiView" data="{{item}}"/>
-    </block>
-
-</template>
-
-<!--循环模版-->
-<template name="wxParse5">
-    <!--<template is="wxParse6" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse6" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--li类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="{{item.classStr}} wxParse-li">
-                <view class="{{item.classStr}} wxParse-li-inner">
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <view class="{{item.classStr}} wxParse-li-circle"></view>
-                    </view>
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                            <template is="wxParse6" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
-
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
-            <template is="wxParseVideo" data="{{item}}"/>  
-        </block>
-
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <template is="wxParseImg" data="{{item}}"/>
-        </block>
-
-        <!--a类型-->
-        <block wx:elif="{{item.tag == 'a'}}">
-            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse6" data="{{item}}"/>
-                </block>
-            </view>
-        </block>
-        
-        <!--其他块级标签-->
-        <block wx:elif="{{item.tagType == 'block'}}">
-            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
-                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                    <template is="wxParse6" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
-
-        <!--内联标签-->
-        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
-            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                <template is="wxParse6" data="{{item}}"/>                 
-            </block>
-        </view>
-
-    </block>
-
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <template is="WxEmojiView" data="{{item}}"/>
-    </block>
-
-</template>
-
-<!--循环模版-->
-<template name="wxParse6">
-    <!--<template is="wxParse7" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse7" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--li类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="{{item.classStr}} wxParse-li">
-                <view class="{{item.classStr}} wxParse-li-inner">
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <view class="{{item.classStr}} wxParse-li-circle"></view>
-                    </view>
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                            <template is="wxParse7" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
-
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
-            <template is="wxParseVideo" data="{{item}}"/>  
-        </block>
-
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <template is="wxParseImg" data="{{item}}"/>
-        </block>
-
-        <!--a类型-->
-        <block wx:elif="{{item.tag == 'a'}}">
-            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse7" data="{{item}}"/>
-                </block>
-            </view>
-        </block>
-        
-        <!--其他块级标签-->
-        <block wx:elif="{{item.tagType == 'block'}}">
-            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
-                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                    <template is="wxParse7" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
-
-        <!--内联标签-->
-        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
-            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                <template is="wxParse7" data="{{item}}"/>                 
-            </block>
-        </view>
-
-    </block>
-
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <template is="WxEmojiView" data="{{item}}"/>
-    </block>
-
-</template>
-<!--循环模版-->
-<template name="wxParse7">
-    <!--<template is="wxParse8" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse8" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--li类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="{{item.classStr}} wxParse-li">
-                <view class="{{item.classStr}} wxParse-li-inner">
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <view class="{{item.classStr}} wxParse-li-circle"></view>
-                    </view>
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                            <template is="wxParse8" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
-
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
-            <template is="wxParseVideo" data="{{item}}"/>  
-        </block>
-
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <template is="wxParseImg" data="{{item}}"/>
-        </block>
-
-        <!--a类型-->
-        <block wx:elif="{{item.tag == 'a'}}">
-            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse8" data="{{item}}"/>
-                </block>
-            </view>
-        </block>
-        
-        <!--其他块级标签-->
-        <block wx:elif="{{item.tagType == 'block'}}">
-            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
-                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                    <template is="wxParse8" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
-
-        <!--内联标签-->
-        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
-            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                <template is="wxParse8" data="{{item}}"/>                 
-            </block>
-        </view>
-
-    </block>
-
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <template is="WxEmojiView" data="{{item}}"/>
-    </block>
-
-</template>
-
-<!--循环模版-->
-<template name="wxParse8">
-    <!--<template is="wxParse9" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse9" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--li类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="{{item.classStr}} wxParse-li">
-                <view class="{{item.classStr}} wxParse-li-inner">
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <view class="{{item.classStr}} wxParse-li-circle"></view>
-                    </view>
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                            <template is="wxParse9" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
-
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
-            <template is="wxParseVideo" data="{{item}}"/>  
-        </block>
-
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <template is="wxParseImg" data="{{item}}"/>
-        </block>
-
-        <!--a类型-->
-        <block wx:elif="{{item.tag == 'a'}}">
-            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse9" data="{{item}}"/>
-                </block>
-            </view>
-        </block>
-        
-        <!--其他块级标签-->
-        <block wx:elif="{{item.tagType == 'block'}}">
-            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
-                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                    <template is="wxParse9" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
-
-        <!--内联标签-->
-        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
-            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                <template is="wxParse9" data="{{item}}"/>                 
-            </block>
-        </view>
-
-    </block>
-
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <template is="WxEmojiView" data="{{item}}"/>
-    </block>
-
-</template>
-
-<!--循环模版-->
-<template name="wxParse9">
-    <!--<template is="wxParse10" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse10" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--li类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="{{item.classStr}} wxParse-li">
-                <view class="{{item.classStr}} wxParse-li-inner">
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <view class="{{item.classStr}} wxParse-li-circle"></view>
-                    </view>
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                            <template is="wxParse10" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
-
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
-            <template is="wxParseVideo" data="{{item}}"/>  
-        </block>
-
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <template is="wxParseImg" data="{{item}}"/>
-        </block>
-
-        <!--a类型-->
-        <block wx:elif="{{item.tag == 'a'}}">
-            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse10" data="{{item}}"/>
-                </block>
-            </view>
-        </block>
-        
-        <!--其他块级标签-->
-        <block wx:elif="{{item.tagType == 'block'}}">
-            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
-                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                    <template is="wxParse10" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
-
-        <!--内联标签-->
-        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
-            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                <template is="wxParse10" data="{{item}}"/>                 
-            </block>
-        </view>
-
-    </block>
-
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <template is="WxEmojiView" data="{{item}}"/>
-    </block>
-
-</template>
-
-<!--循环模版-->
-<template name="wxParse10">
-    <!--<template is="wxParse11" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse11" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--li类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="{{item.classStr}} wxParse-li">
-                <view class="{{item.classStr}} wxParse-li-inner">
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <view class="{{item.classStr}} wxParse-li-circle"></view>
-                    </view>
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                            <template is="wxParse11" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
-
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
-            <template is="wxParseVideo" data="{{item}}"/>  
-        </block>
-
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <template is="wxParseImg" data="{{item}}"/>
-        </block>
-
-        <!--a类型-->
-        <block wx:elif="{{item.tag == 'a'}}">
-            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse11" data="{{item}}"/>
-                </block>
-            </view>
-        </block>
-        
-        <!--其他块级标签-->
-        <block wx:elif="{{item.tagType == 'block'}}">
-            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
-                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                    <template is="wxParse11" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
-
-        <!--内联标签-->
-        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
-            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                <template is="wxParse11" data="{{item}}"/>                 
-            </block>
-        </view>
-
-    </block>
-
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <template is="WxEmojiView" data="{{item}}"/>
-    </block>
-
-</template>
-
-<!--循环模版-->
-<template name="wxParse11">
-    <!--<template is="wxParse12" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse12" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--li类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="{{item.classStr}} wxParse-li">
-                <view class="{{item.classStr}} wxParse-li-inner">
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <view class="{{item.classStr}} wxParse-li-circle"></view>
-                    </view>
-                    <view class="{{item.classStr}} wxParse-li-text">
-                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                            <template is="wxParse12" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
-
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
-            <template is="wxParseVideo" data="{{item}}"/>  
-        </block>
-
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <template is="wxParseImg" data="{{item}}"/>
-        </block>
-
-        <!--a类型-->
-        <block wx:elif="{{item.tag == 'a'}}">
-            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
-                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
-                    <template is="wxParse12" data="{{item}}"/>
-                </block>
-            </view>
-        </block>
-        
-        <!--其他块级标签-->
-        <block wx:elif="{{item.tagType == 'block'}}">
-            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
-                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                    <template is="wxParse12" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
-
-        <!--内联标签-->
-        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
-            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
-                <template is="wxParse12" data="{{item}}"/>                 
-            </block>
-        </view>
-
-    </block>
-
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <template is="WxEmojiView" data="{{item}}"/>
-    </block>
-
+
+<!--**
+ * author: Di (微信小程序开发工程师)
+ * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
+ *               垂直微信小程序开发交流社区
+ * 
+ * github地址: https://github.com/icindy/wxParse
+ * 
+ * for: 微信小程序富文本解析
+ * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
+ */-->
+
+ <!--基础元素-->
+<template name="wxParseVideo">
+    <!--增加video标签支持，并循环添加-->
+    <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <video class="{{item.classStr}} wxParse-{{item.tag}}-video" src="{{item.attr.src}}"></video>
+    </view>
+</template>
+
+<template name="wxParseImg">
+    <image class="{{item.classStr}} wxParse-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}"  data-idx="{{item.imgIndex}}"  src="{{item.attr.src}}" mode="aspectFit" bindload="wxParseImgLoad" bindtap="wxParseImgTap" style="width:{{item.width}}px;height:{{item.height}}px;{{item.attr.style}}"   />
+</template>
+
+<template name="WxEmojiView">
+  <view class="WxEmojiView wxParse-inline" style="{{item.styleStr}}">
+    <block wx:for="{{item.textArray}}" wx:key="key">
+      <block class="{{item.text == '\\n' ? 'wxParse-hide':''}}" wx:if="{{item.node == 'text'}}">{{item.text}}</block>
+      <block wx:elif="{{item.node == 'element'}}">
+        <image class="wxEmoji" src="{{item.baseSrc}}{{item.text}}" />
+      </block>
+    </block>
+  </view>
+</template>
+
+<!--入口模版-->
+
+<template name="wxParse">
+    <block wx:for="{{wxParseData}}" wx:key="key">
+        <template is="wxParse0" data="{{item}}"/>
+    </block>
+</template>
+
+
+<!--循环模版-->
+<template name="wxParse0">
+    <!--<template is="wxParse1" data="{{item}}" />-->
+    <!--判断是否是标签节点-->
+    <block wx:if="{{item.node == 'element'}}">
+        <block wx:if="{{item.tag == 'button'}}">
+            <button type="default" size="mini" >
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse1" data="{{item}}"/>
+                </block>
+             </button>
+        </block>
+        <!--li类型-->
+        <block wx:elif="{{item.tag == 'li'}}">
+            <view class="{{item.classStr}} wxParse-li">
+                <view class="{{item.classStr}} wxParse-li-inner">
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <view class="{{item.classStr}} wxParse-li-circle"></view>
+                    </view>
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                            <template is="wxParse1" data="{{item}}"/>
+                        </block>
+                    </view>
+                </view>
+            </view>
+        </block>
+
+        <!--video类型-->
+        <block wx:elif="{{item.tag == 'video'}}">
+            <template is="wxParseVideo" data="{{item}}"/>  
+        </block>
+
+        <!--img类型-->
+        <block wx:elif="{{item.tag == 'img'}}">
+            <template is="wxParseImg" data="{{item}}"/>
+        </block>
+
+        <!--a类型-->
+        <block wx:elif="{{item.tag == 'a'}}">
+            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-c="{{item.attr.href}}"  style="{{item.styleStr}}">
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse1" data="{{item}}"/>
+                </block>
+            </view>
+        </block>
+        <block wx:elif="{{item.tag == 'table'}}">
+            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                    <template is="wxParse1" data="{{item}}"/>                 
+                </block>
+            </view>
+        </block>
+
+        <!--其他块级标签-->
+        <block wx:elif="{{item.tagType == 'block'}}">
+            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                    <template is="wxParse1" data="{{item}}"/>                 
+                </block>
+            </view>
+        </block>
+
+        <!--内联标签-->
+        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                <template is="wxParse1" data="{{item}}"/>                 
+            </block>
+        </view>
+
+    </block>
+
+    <!--判断是否是文本节点-->
+    <block wx:elif="{{item.node == 'text'}}">
+        <!--如果是，直接进行-->
+        <template is="WxEmojiView" data="{{item}}"/>
+    </block>
+
+</template>
+
+
+
+<!--循环模版-->
+<template name="wxParse1">
+    <!--<template is="wxParse2" data="{{item}}" />-->
+    <!--判断是否是标签节点-->
+    <block wx:if="{{item.node == 'element'}}">
+        <block wx:if="{{item.tag == 'button'}}">
+            <button type="default" size="mini" >
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse2" data="{{item}}"/>
+                </block>
+             </button>
+        </block>
+        <!--li类型-->
+        <block wx:elif="{{item.tag == 'li'}}">
+            <view class="{{item.classStr}} wxParse-li">
+                <view class="{{item.classStr}} wxParse-li-inner">
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <view class="{{item.classStr}} wxParse-li-circle"></view>
+                    </view>
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                            <template is="wxParse2" data="{{item}}"/>
+                        </block>
+                    </view>
+                </view>
+            </view>
+        </block>
+
+        <!--video类型-->
+        <block wx:elif="{{item.tag == 'video'}}">
+            <template is="wxParseVideo" data="{{item}}"/>  
+        </block>
+
+        <!--img类型-->
+        <block wx:elif="{{item.tag == 'img'}}">
+            <template is="wxParseImg" data="{{item}}"/>
+        </block>
+
+        <!--a类型-->
+        <block wx:elif="{{item.tag == 'a'}}">
+            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse2" data="{{item}}"/>
+                </block>
+            </view>
+        </block>
+        
+        <!--其他块级标签-->
+        <block wx:elif="{{item.tagType == 'block'}}">
+            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                    <template is="wxParse2" data="{{item}}"/>                 
+                </block>
+            </view>
+        </block>
+
+        <!--内联标签-->
+        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                <template is="wxParse2" data="{{item}}"/>                 
+            </block>
+        </view>
+
+    </block>
+
+    <!--判断是否是文本节点-->
+    <block wx:elif="{{item.node == 'text'}}">
+        <!--如果是，直接进行-->
+        <template is="WxEmojiView" data="{{item}}"/>
+    </block>
+
+</template>
+
+
+<!--循环模版-->
+<template name="wxParse2">
+    <!--<template is="wxParse3" data="{{item}}" />-->
+    <!--判断是否是标签节点-->
+    <block wx:if="{{item.node == 'element'}}">
+        <block wx:if="{{item.tag == 'button'}}">
+            <button type="default" size="mini" >
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse3" data="{{item}}"/>
+                </block>
+             </button>
+        </block>
+        <!--li类型-->
+        <block wx:elif="{{item.tag == 'li'}}">
+            <view class="{{item.classStr}} wxParse-li">
+                <view class="{{item.classStr}} wxParse-li-inner">
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <view class="{{item.classStr}} wxParse-li-circle"></view>
+                    </view>
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                            <template is="wxParse3" data="{{item}}"/>
+                        </block>
+                    </view>
+                </view>
+            </view>
+        </block>
+
+        <!--video类型-->
+        <block wx:elif="{{item.tag == 'video'}}">
+            <template is="wxParseVideo" data="{{item}}"/>  
+        </block>
+
+        <!--img类型-->
+        <block wx:elif="{{item.tag == 'img'}}">
+            <template is="wxParseImg" data="{{item}}"/>
+        </block>
+
+        <!--a类型-->
+        <block wx:elif="{{item.tag == 'a'}}">
+            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse3" data="{{item}}"/>
+                </block>
+            </view>
+        </block>
+        
+        <!--其他块级标签-->
+        <block wx:elif="{{item.tagType == 'block'}}">
+            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                    <template is="wxParse3" data="{{item}}"/>                 
+                </block>
+            </view>
+        </block>
+
+        <!--内联标签-->
+        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                <template is="wxParse3" data="{{item}}"/>                 
+            </block>
+        </view>
+
+    </block>
+
+    <!--判断是否是文本节点-->
+    <block wx:elif="{{item.node == 'text'}}">
+        <!--如果是，直接进行-->
+        <template is="WxEmojiView" data="{{item}}"/>
+    </block>
+
+</template>
+
+<!--循环模版-->
+<template name="wxParse3">
+    <!--<template is="wxParse4" data="{{item}}" />-->
+    <!--判断是否是标签节点-->
+    <block wx:if="{{item.node == 'element'}}">
+        <block wx:if="{{item.tag == 'button'}}">
+            <button type="default" size="mini" >
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse4" data="{{item}}"/>
+                </block>
+             </button>
+        </block>
+        <!--li类型-->
+        <block wx:elif="{{item.tag == 'li'}}">
+            <view class="{{item.classStr}} wxParse-li">
+                <view class="{{item.classStr}} wxParse-li-inner">
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <view class="{{item.classStr}} wxParse-li-circle"></view>
+                    </view>
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                            <template is="wxParse4" data="{{item}}"/>
+                        </block>
+                    </view>
+                </view>
+            </view>
+        </block>
+
+        <!--video类型-->
+        <block wx:elif="{{item.tag == 'video'}}">
+            <template is="wxParseVideo" data="{{item}}"/>  
+        </block>
+
+        <!--img类型-->
+        <block wx:elif="{{item.tag == 'img'}}">
+            <template is="wxParseImg" data="{{item}}"/>
+        </block>
+
+        <!--a类型-->
+        <block wx:elif="{{item.tag == 'a'}}">
+            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse4" data="{{item}}"/>
+                </block>
+            </view>
+        </block>
+        
+        <!--其他块级标签-->
+        <block wx:elif="{{item.tagType == 'block'}}">
+            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                    <template is="wxParse4" data="{{item}}"/>                 
+                </block>
+            </view>
+        </block>
+
+        <!--内联标签-->
+        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                <template is="wxParse4" data="{{item}}"/>                 
+            </block>
+        </view>
+
+    </block>
+
+    <!--判断是否是文本节点-->
+    <block wx:elif="{{item.node == 'text'}}">
+        <!--如果是，直接进行-->
+        <template is="WxEmojiView" data="{{item}}"/>
+    </block>
+
+</template>
+
+<!--循环模版-->
+<template name="wxParse4">
+    <!--<template is="wxParse5" data="{{item}}" />-->
+    <!--判断是否是标签节点-->
+    <block wx:if="{{item.node == 'element'}}">
+        <block wx:if="{{item.tag == 'button'}}">
+            <button type="default" size="mini" >
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse5" data="{{item}}"/>
+                </block>
+             </button>
+        </block>
+        <!--li类型-->
+        <block wx:elif="{{item.tag == 'li'}}">
+            <view class="{{item.classStr}} wxParse-li">
+                <view class="{{item.classStr}} wxParse-li-inner">
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <view class="{{item.classStr}} wxParse-li-circle"></view>
+                    </view>
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                            <template is="wxParse5" data="{{item}}"/>
+                        </block>
+                    </view>
+                </view>
+            </view>
+        </block>
+
+        <!--video类型-->
+        <block wx:elif="{{item.tag == 'video'}}">
+            <template is="wxParseVideo" data="{{item}}"/>  
+        </block>
+
+        <!--img类型-->
+        <block wx:elif="{{item.tag == 'img'}}">
+            <template is="wxParseImg" data="{{item}}"/>
+        </block>
+
+        <!--a类型-->
+        <block wx:elif="{{item.tag == 'a'}}">
+            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse5" data="{{item}}"/>
+                </block>
+            </view>
+        </block>
+        
+        <!--其他块级标签-->
+        <block wx:elif="{{item.tagType == 'block'}}">
+            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                    <template is="wxParse5" data="{{item}}"/>                 
+                </block>
+            </view>
+        </block>
+
+        <!--内联标签-->
+        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                <template is="wxParse5" data="{{item}}"/>                 
+            </block>
+        </view>
+
+    </block>
+
+    <!--判断是否是文本节点-->
+    <block wx:elif="{{item.node == 'text'}}">
+        <!--如果是，直接进行-->
+        <template is="WxEmojiView" data="{{item}}"/>
+    </block>
+
+</template>
+
+<!--循环模版-->
+<template name="wxParse5">
+    <!--<template is="wxParse6" data="{{item}}" />-->
+    <!--判断是否是标签节点-->
+    <block wx:if="{{item.node == 'element'}}">
+        <block wx:if="{{item.tag == 'button'}}">
+            <button type="default" size="mini" >
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse6" data="{{item}}"/>
+                </block>
+             </button>
+        </block>
+        <!--li类型-->
+        <block wx:elif="{{item.tag == 'li'}}">
+            <view class="{{item.classStr}} wxParse-li">
+                <view class="{{item.classStr}} wxParse-li-inner">
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <view class="{{item.classStr}} wxParse-li-circle"></view>
+                    </view>
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                            <template is="wxParse6" data="{{item}}"/>
+                        </block>
+                    </view>
+                </view>
+            </view>
+        </block>
+
+        <!--video类型-->
+        <block wx:elif="{{item.tag == 'video'}}">
+            <template is="wxParseVideo" data="{{item}}"/>  
+        </block>
+
+        <!--img类型-->
+        <block wx:elif="{{item.tag == 'img'}}">
+            <template is="wxParseImg" data="{{item}}"/>
+        </block>
+
+        <!--a类型-->
+        <block wx:elif="{{item.tag == 'a'}}">
+            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse6" data="{{item}}"/>
+                </block>
+            </view>
+        </block>
+        
+        <!--其他块级标签-->
+        <block wx:elif="{{item.tagType == 'block'}}">
+            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                    <template is="wxParse6" data="{{item}}"/>                 
+                </block>
+            </view>
+        </block>
+
+        <!--内联标签-->
+        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                <template is="wxParse6" data="{{item}}"/>                 
+            </block>
+        </view>
+
+    </block>
+
+    <!--判断是否是文本节点-->
+    <block wx:elif="{{item.node == 'text'}}">
+        <!--如果是，直接进行-->
+        <template is="WxEmojiView" data="{{item}}"/>
+    </block>
+
+</template>
+
+<!--循环模版-->
+<template name="wxParse6">
+    <!--<template is="wxParse7" data="{{item}}" />-->
+    <!--判断是否是标签节点-->
+    <block wx:if="{{item.node == 'element'}}">
+        <block wx:if="{{item.tag == 'button'}}">
+            <button type="default" size="mini" >
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse7" data="{{item}}"/>
+                </block>
+             </button>
+        </block>
+        <!--li类型-->
+        <block wx:elif="{{item.tag == 'li'}}">
+            <view class="{{item.classStr}} wxParse-li">
+                <view class="{{item.classStr}} wxParse-li-inner">
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <view class="{{item.classStr}} wxParse-li-circle"></view>
+                    </view>
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                            <template is="wxParse7" data="{{item}}"/>
+                        </block>
+                    </view>
+                </view>
+            </view>
+        </block>
+
+        <!--video类型-->
+        <block wx:elif="{{item.tag == 'video'}}">
+            <template is="wxParseVideo" data="{{item}}"/>  
+        </block>
+
+        <!--img类型-->
+        <block wx:elif="{{item.tag == 'img'}}">
+            <template is="wxParseImg" data="{{item}}"/>
+        </block>
+
+        <!--a类型-->
+        <block wx:elif="{{item.tag == 'a'}}">
+            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse7" data="{{item}}"/>
+                </block>
+            </view>
+        </block>
+        
+        <!--其他块级标签-->
+        <block wx:elif="{{item.tagType == 'block'}}">
+            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                    <template is="wxParse7" data="{{item}}"/>                 
+                </block>
+            </view>
+        </block>
+
+        <!--内联标签-->
+        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                <template is="wxParse7" data="{{item}}"/>                 
+            </block>
+        </view>
+
+    </block>
+
+    <!--判断是否是文本节点-->
+    <block wx:elif="{{item.node == 'text'}}">
+        <!--如果是，直接进行-->
+        <template is="WxEmojiView" data="{{item}}"/>
+    </block>
+
+</template>
+<!--循环模版-->
+<template name="wxParse7">
+    <!--<template is="wxParse8" data="{{item}}" />-->
+    <!--判断是否是标签节点-->
+    <block wx:if="{{item.node == 'element'}}">
+        <block wx:if="{{item.tag == 'button'}}">
+            <button type="default" size="mini" >
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse8" data="{{item}}"/>
+                </block>
+             </button>
+        </block>
+        <!--li类型-->
+        <block wx:elif="{{item.tag == 'li'}}">
+            <view class="{{item.classStr}} wxParse-li">
+                <view class="{{item.classStr}} wxParse-li-inner">
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <view class="{{item.classStr}} wxParse-li-circle"></view>
+                    </view>
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                            <template is="wxParse8" data="{{item}}"/>
+                        </block>
+                    </view>
+                </view>
+            </view>
+        </block>
+
+        <!--video类型-->
+        <block wx:elif="{{item.tag == 'video'}}">
+            <template is="wxParseVideo" data="{{item}}"/>  
+        </block>
+
+        <!--img类型-->
+        <block wx:elif="{{item.tag == 'img'}}">
+            <template is="wxParseImg" data="{{item}}"/>
+        </block>
+
+        <!--a类型-->
+        <block wx:elif="{{item.tag == 'a'}}">
+            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse8" data="{{item}}"/>
+                </block>
+            </view>
+        </block>
+        
+        <!--其他块级标签-->
+        <block wx:elif="{{item.tagType == 'block'}}">
+            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                    <template is="wxParse8" data="{{item}}"/>                 
+                </block>
+            </view>
+        </block>
+
+        <!--内联标签-->
+        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                <template is="wxParse8" data="{{item}}"/>                 
+            </block>
+        </view>
+
+    </block>
+
+    <!--判断是否是文本节点-->
+    <block wx:elif="{{item.node == 'text'}}">
+        <!--如果是，直接进行-->
+        <template is="WxEmojiView" data="{{item}}"/>
+    </block>
+
+</template>
+
+<!--循环模版-->
+<template name="wxParse8">
+    <!--<template is="wxParse9" data="{{item}}" />-->
+    <!--判断是否是标签节点-->
+    <block wx:if="{{item.node == 'element'}}">
+        <block wx:if="{{item.tag == 'button'}}">
+            <button type="default" size="mini" >
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse9" data="{{item}}"/>
+                </block>
+             </button>
+        </block>
+        <!--li类型-->
+        <block wx:elif="{{item.tag == 'li'}}">
+            <view class="{{item.classStr}} wxParse-li">
+                <view class="{{item.classStr}} wxParse-li-inner">
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <view class="{{item.classStr}} wxParse-li-circle"></view>
+                    </view>
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                            <template is="wxParse9" data="{{item}}"/>
+                        </block>
+                    </view>
+                </view>
+            </view>
+        </block>
+
+        <!--video类型-->
+        <block wx:elif="{{item.tag == 'video'}}">
+            <template is="wxParseVideo" data="{{item}}"/>  
+        </block>
+
+        <!--img类型-->
+        <block wx:elif="{{item.tag == 'img'}}">
+            <template is="wxParseImg" data="{{item}}"/>
+        </block>
+
+        <!--a类型-->
+        <block wx:elif="{{item.tag == 'a'}}">
+            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse9" data="{{item}}"/>
+                </block>
+            </view>
+        </block>
+        
+        <!--其他块级标签-->
+        <block wx:elif="{{item.tagType == 'block'}}">
+            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                    <template is="wxParse9" data="{{item}}"/>                 
+                </block>
+            </view>
+        </block>
+
+        <!--内联标签-->
+        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                <template is="wxParse9" data="{{item}}"/>                 
+            </block>
+        </view>
+
+    </block>
+
+    <!--判断是否是文本节点-->
+    <block wx:elif="{{item.node == 'text'}}">
+        <!--如果是，直接进行-->
+        <template is="WxEmojiView" data="{{item}}"/>
+    </block>
+
+</template>
+
+<!--循环模版-->
+<template name="wxParse9">
+    <!--<template is="wxParse10" data="{{item}}" />-->
+    <!--判断是否是标签节点-->
+    <block wx:if="{{item.node == 'element'}}">
+        <block wx:if="{{item.tag == 'button'}}">
+            <button type="default" size="mini" >
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse10" data="{{item}}"/>
+                </block>
+             </button>
+        </block>
+        <!--li类型-->
+        <block wx:elif="{{item.tag == 'li'}}">
+            <view class="{{item.classStr}} wxParse-li">
+                <view class="{{item.classStr}} wxParse-li-inner">
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <view class="{{item.classStr}} wxParse-li-circle"></view>
+                    </view>
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                            <template is="wxParse10" data="{{item}}"/>
+                        </block>
+                    </view>
+                </view>
+            </view>
+        </block>
+
+        <!--video类型-->
+        <block wx:elif="{{item.tag == 'video'}}">
+            <template is="wxParseVideo" data="{{item}}"/>  
+        </block>
+
+        <!--img类型-->
+        <block wx:elif="{{item.tag == 'img'}}">
+            <template is="wxParseImg" data="{{item}}"/>
+        </block>
+
+        <!--a类型-->
+        <block wx:elif="{{item.tag == 'a'}}">
+            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse10" data="{{item}}"/>
+                </block>
+            </view>
+        </block>
+        
+        <!--其他块级标签-->
+        <block wx:elif="{{item.tagType == 'block'}}">
+            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                    <template is="wxParse10" data="{{item}}"/>                 
+                </block>
+            </view>
+        </block>
+
+        <!--内联标签-->
+        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                <template is="wxParse10" data="{{item}}"/>                 
+            </block>
+        </view>
+
+    </block>
+
+    <!--判断是否是文本节点-->
+    <block wx:elif="{{item.node == 'text'}}">
+        <!--如果是，直接进行-->
+        <template is="WxEmojiView" data="{{item}}"/>
+    </block>
+
+</template>
+
+<!--循环模版-->
+<template name="wxParse10">
+    <!--<template is="wxParse11" data="{{item}}" />-->
+    <!--判断是否是标签节点-->
+    <block wx:if="{{item.node == 'element'}}">
+        <block wx:if="{{item.tag == 'button'}}">
+            <button type="default" size="mini" >
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse11" data="{{item}}"/>
+                </block>
+             </button>
+        </block>
+        <!--li类型-->
+        <block wx:elif="{{item.tag == 'li'}}">
+            <view class="{{item.classStr}} wxParse-li">
+                <view class="{{item.classStr}} wxParse-li-inner">
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <view class="{{item.classStr}} wxParse-li-circle"></view>
+                    </view>
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                            <template is="wxParse11" data="{{item}}"/>
+                        </block>
+                    </view>
+                </view>
+            </view>
+        </block>
+
+        <!--video类型-->
+        <block wx:elif="{{item.tag == 'video'}}">
+            <template is="wxParseVideo" data="{{item}}"/>  
+        </block>
+
+        <!--img类型-->
+        <block wx:elif="{{item.tag == 'img'}}">
+            <template is="wxParseImg" data="{{item}}"/>
+        </block>
+
+        <!--a类型-->
+        <block wx:elif="{{item.tag == 'a'}}">
+            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse11" data="{{item}}"/>
+                </block>
+            </view>
+        </block>
+        
+        <!--其他块级标签-->
+        <block wx:elif="{{item.tagType == 'block'}}">
+            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                    <template is="wxParse11" data="{{item}}"/>                 
+                </block>
+            </view>
+        </block>
+
+        <!--内联标签-->
+        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                <template is="wxParse11" data="{{item}}"/>                 
+            </block>
+        </view>
+
+    </block>
+
+    <!--判断是否是文本节点-->
+    <block wx:elif="{{item.node == 'text'}}">
+        <!--如果是，直接进行-->
+        <template is="WxEmojiView" data="{{item}}"/>
+    </block>
+
+</template>
+
+<!--循环模版-->
+<template name="wxParse11">
+    <!--<template is="wxParse12" data="{{item}}" />-->
+    <!--判断是否是标签节点-->
+    <block wx:if="{{item.node == 'element'}}">
+        <block wx:if="{{item.tag == 'button'}}">
+            <button type="default" size="mini" >
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse12" data="{{item}}"/>
+                </block>
+             </button>
+        </block>
+        <!--li类型-->
+        <block wx:elif="{{item.tag == 'li'}}">
+            <view class="{{item.classStr}} wxParse-li">
+                <view class="{{item.classStr}} wxParse-li-inner">
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <view class="{{item.classStr}} wxParse-li-circle"></view>
+                    </view>
+                    <view class="{{item.classStr}} wxParse-li-text">
+                        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                            <template is="wxParse12" data="{{item}}"/>
+                        </block>
+                    </view>
+                </view>
+            </view>
+        </block>
+
+        <!--video类型-->
+        <block wx:elif="{{item.tag == 'video'}}">
+            <template is="wxParseVideo" data="{{item}}"/>  
+        </block>
+
+        <!--img类型-->
+        <block wx:elif="{{item.tag == 'img'}}">
+            <template is="wxParseImg" data="{{item}}"/>
+        </block>
+
+        <!--a类型-->
+        <block wx:elif="{{item.tag == 'a'}}">
+            <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}"  style="{{item.styleStr}}">
+                <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">
+                    <template is="wxParse12" data="{{item}}"/>
+                </block>
+            </view>
+        </block>
+        
+        <!--其他块级标签-->
+        <block wx:elif="{{item.tagType == 'block'}}">
+            <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+                <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                    <template is="wxParse12" data="{{item}}"/>                 
+                </block>
+            </view>
+        </block>
+
+        <!--内联标签-->
+        <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+            <block  wx:for="{{item.nodes}}" wx:for-item="item" wx:key="key">       
+                <template is="wxParse12" data="{{item}}"/>                 
+            </block>
+        </view>
+
+    </block>
+
+    <!--判断是否是文本节点-->
+    <block wx:elif="{{item.node == 'text'}}">
+        <!--如果是，直接进行-->
+        <template is="WxEmojiView" data="{{item}}"/>
+    </block>
+
 </template>
\ No newline at end of file
diff --git a/litemall-wx/lib/wxParse/wxParse.wxss b/litemall-wx/lib/wxParse/wxParse.wxss
index a21e5c9e..299ccab7 100644
--- a/litemall-wx/lib/wxParse/wxParse.wxss
+++ b/litemall-wx/lib/wxParse/wxParse.wxss
@@ -1,202 +1,202 @@
-
-/**
- * author: Di (微信小程序开发工程师)
- * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
- *               垂直微信小程序开发交流社区
- * 
- * github地址: https://github.com/icindy/wxParse
- * 
- * for: 微信小程序富文本解析
- * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
- */
-
-.wxParse{
-    margin: 0 5px;
-    font-family: Helvetica,sans-serif;
-    font-size: 28rpx;
-    color: #666;
-    line-height: 1.8;
-}
-view{
-    word-break:break-all; overflow:auto;
-}
-.wxParse-inline{
-    display: inline;
-    margin: 0;
-    padding: 0;
-}
-/*//标题 */
-.wxParse-div{margin: 0;padding: 0;}
-.wxParse-h1{ font-size:2em; margin: .67em 0 }
-.wxParse-h2{ font-size:1.5em; margin: .75em 0 }
-.wxParse-h3{ font-size:1.17em; margin: .83em 0 }
-.wxParse-h4{ margin: 1.12em 0}
-.wxParse-h5 { font-size:.83em; margin: 1.5em 0 }
-.wxParse-h6{ font-size:.75em; margin: 1.67em 0 }
-
-.wxParse-h1 {
-  font-size: 18px;
-  font-weight: 400;
-  margin-bottom: .9em;
-}
-.wxParse-h2 {
-  font-size: 16px;
-  font-weight: 400;
-  margin-bottom: .34em;
-}
-.wxParse-h3 {
-  font-weight: 400;
-  font-size: 15px;
-  margin-bottom: .34em;
-}
-.wxParse-h4 {
-  font-weight: 400;
-  font-size: 14px;
-  margin-bottom: .24em;
-}
-.wxParse-h5 {
-  font-weight: 400;
-  font-size: 13px;
-  margin-bottom: .14em;
-}
-.wxParse-h6 {
-  font-weight: 400;
-  font-size: 12px;
-  margin-bottom: .04em;
-}
-
-.wxParse-h1, .wxParse-h2, .wxParse-h3, .wxParse-h4, .wxParse-h5, .wxParse-h6, .wxParse-b, .wxParse-strong  { font-weight: bolder }
-
-.wxParse-i,.wxParse-cite,.wxParse-em,.wxParse-var,.wxParse-address{font-style:italic}
-.wxParse-pre,.wxParse-tt,.wxParse-code,.wxParse-kbd,.wxParse-samp{font-family:monospace}
-.wxParse-pre{white-space:pre}
-.wxParse-big{font-size:1.17em}
-.wxParse-small,.wxParse-sub,.wxParse-sup{font-size:.83em}
-.wxParse-sub{vertical-align:sub}
-.wxParse-sup{vertical-align:super}
-.wxParse-s,.wxParse-strike,.wxParse-del{text-decoration:line-through}
-/*wxparse-自定义个性化的css样式*/
-/*增加video的css样式*/
-.wxParse-strong,wxParse-s{display: inline}
-.wxParse-a{
-    color: deepskyblue;
-    word-break:break-all;
-    overflow:auto;
-}
-
-.wxParse-video{
-    text-align: center;
-    margin: 10px 0;
-}
-
-.wxParse-video-video{
-    width:100%;
-}
-
-.wxParse-img{
-    background-color: #efefef;
-    overflow: hidden;
-    width:40px;
-    height: 40px;
-}
-
-.wxParse-blockquote {
-    margin: 0;
-    padding:10px 0 10px 5px;
-    font-family:Courier, Calibri,"宋体";
-    background:#f5f5f5;
-    border-left: 3px solid #dbdbdb;
-}
-
-.wxParse-code,.wxParse-wxxxcode-style{
-    display: inline;
-    background:#f5f5f5;
-}
-.wxParse-ul{
-    margin: 20rpx 10rpx;
-}
-
-.wxParse-li,.wxParse-li-inner{
-    display: flex;
-    align-items: baseline;
-    margin: 10rpx 0;
-}
-.wxParse-li-text{
-    
-    align-items: center;
-    line-height: 20px;
-}
-
-.wxParse-li-circle{
-    display: inline-flex;
-    width: 5px;
-    height: 5px;
-    background-color: #333;
-    margin-right: 5px;
-}
-
-.wxParse-li-square{
-    display: inline-flex;
-    width: 10rpx;
-    height: 10rpx;
-    background-color: #333;
-    margin-right: 5px;
-}
-.wxParse-li-ring{
-    display: inline-flex;
-    width: 10rpx;
-    height: 10rpx;
-    border: 2rpx solid #333;
-    border-radius: 50%;
-    background-color: #fff;
-    margin-right: 5px;
-}
-
-/*.wxParse-table{
-    width: 100%;
-    height: 400px;
-}
-.wxParse-thead,.wxParse-tfoot,.wxParse-tr{
-    display: flex;
-    flex-direction: row;
-}
-.wxParse-th,.wxParse-td{
-    display: flex;
-    width: 580px;
-    overflow: auto;
-}*/
-
-.wxParse-u {
-  text-decoration: underline;
-}
-.wxParse-hide{
-    display: none;
-}
-.WxEmojiView{
-    align-items: center;
-}
-.wxEmoji{
-    width: 16px;
-    height:16px;
-}
-.wxParse-tr{
-	display: flex;
-	border-right:1px solid #e0e0e0;
-	border-bottom:1px solid #e0e0e0;
-}
-.wxParse-th,
-.wxParse-td{
-	flex:1;
-	padding:5px;
-	font-size:28rpx;
-	border-left:1px solid #e0e0e0;
-	word-break: break-all;
-}
-.wxParse-td:last{
-	border-top:1px solid #e0e0e0;
-}
-.wxParse-th{
-	background:#f0f0f0;
-	border-top:1px solid #e0e0e0;
-}
-
+
+/**
+ * author: Di (微信小程序开发工程师)
+ * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
+ *               垂直微信小程序开发交流社区
+ * 
+ * github地址: https://github.com/icindy/wxParse
+ * 
+ * for: 微信小程序富文本解析
+ * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
+ */
+
+.wxParse{
+    margin: 0 5px;
+    font-family: Helvetica,sans-serif;
+    font-size: 28rpx;
+    color: #666;
+    line-height: 1.8;
+}
+view{
+    word-break:break-all; overflow:auto;
+}
+.wxParse-inline{
+    display: inline;
+    margin: 0;
+    padding: 0;
+}
+/*//标题 */
+.wxParse-div{margin: 0;padding: 0;}
+.wxParse-h1{ font-size:2em; margin: .67em 0 }
+.wxParse-h2{ font-size:1.5em; margin: .75em 0 }
+.wxParse-h3{ font-size:1.17em; margin: .83em 0 }
+.wxParse-h4{ margin: 1.12em 0}
+.wxParse-h5 { font-size:.83em; margin: 1.5em 0 }
+.wxParse-h6{ font-size:.75em; margin: 1.67em 0 }
+
+.wxParse-h1 {
+  font-size: 18px;
+  font-weight: 400;
+  margin-bottom: .9em;
+}
+.wxParse-h2 {
+  font-size: 16px;
+  font-weight: 400;
+  margin-bottom: .34em;
+}
+.wxParse-h3 {
+  font-weight: 400;
+  font-size: 15px;
+  margin-bottom: .34em;
+}
+.wxParse-h4 {
+  font-weight: 400;
+  font-size: 14px;
+  margin-bottom: .24em;
+}
+.wxParse-h5 {
+  font-weight: 400;
+  font-size: 13px;
+  margin-bottom: .14em;
+}
+.wxParse-h6 {
+  font-weight: 400;
+  font-size: 12px;
+  margin-bottom: .04em;
+}
+
+.wxParse-h1, .wxParse-h2, .wxParse-h3, .wxParse-h4, .wxParse-h5, .wxParse-h6, .wxParse-b, .wxParse-strong  { font-weight: bolder }
+
+.wxParse-i,.wxParse-cite,.wxParse-em,.wxParse-var,.wxParse-address{font-style:italic}
+.wxParse-pre,.wxParse-tt,.wxParse-code,.wxParse-kbd,.wxParse-samp{font-family:monospace}
+.wxParse-pre{white-space:pre}
+.wxParse-big{font-size:1.17em}
+.wxParse-small,.wxParse-sub,.wxParse-sup{font-size:.83em}
+.wxParse-sub{vertical-align:sub}
+.wxParse-sup{vertical-align:super}
+.wxParse-s,.wxParse-strike,.wxParse-del{text-decoration:line-through}
+/*wxparse-自定义个性化的css样式*/
+/*增加video的css样式*/
+.wxParse-strong,wxParse-s{display: inline}
+.wxParse-a{
+    color: deepskyblue;
+    word-break:break-all;
+    overflow:auto;
+}
+
+.wxParse-video{
+    text-align: center;
+    margin: 10px 0;
+}
+
+.wxParse-video-video{
+    width:100%;
+}
+
+.wxParse-img{
+    background-color: #efefef;
+    overflow: hidden;
+    width:40px;
+    height: 40px;
+}
+
+.wxParse-blockquote {
+    margin: 0;
+    padding:10px 0 10px 5px;
+    font-family:Courier, Calibri,"宋体";
+    background:#f5f5f5;
+    border-left: 3px solid #dbdbdb;
+}
+
+.wxParse-code,.wxParse-wxxxcode-style{
+    display: inline;
+    background:#f5f5f5;
+}
+.wxParse-ul{
+    margin: 20rpx 10rpx;
+}
+
+.wxParse-li,.wxParse-li-inner{
+    display: flex;
+    align-items: baseline;
+    margin: 10rpx 0;
+}
+.wxParse-li-text{
+    
+    align-items: center;
+    line-height: 20px;
+}
+
+.wxParse-li-circle{
+    display: inline-flex;
+    width: 5px;
+    height: 5px;
+    background-color: #333;
+    margin-right: 5px;
+}
+
+.wxParse-li-square{
+    display: inline-flex;
+    width: 10rpx;
+    height: 10rpx;
+    background-color: #333;
+    margin-right: 5px;
+}
+.wxParse-li-ring{
+    display: inline-flex;
+    width: 10rpx;
+    height: 10rpx;
+    border: 2rpx solid #333;
+    border-radius: 50%;
+    background-color: #fff;
+    margin-right: 5px;
+}
+
+/*.wxParse-table{
+    width: 100%;
+    height: 400px;
+}
+.wxParse-thead,.wxParse-tfoot,.wxParse-tr{
+    display: flex;
+    flex-direction: row;
+}
+.wxParse-th,.wxParse-td{
+    display: flex;
+    width: 580px;
+    overflow: auto;
+}*/
+
+.wxParse-u {
+  text-decoration: underline;
+}
+.wxParse-hide{
+    display: none;
+}
+.WxEmojiView{
+    align-items: center;
+}
+.wxEmoji{
+    width: 16px;
+    height:16px;
+}
+.wxParse-tr{
+	display: flex;
+	border-right:1px solid #e0e0e0;
+	border-bottom:1px solid #e0e0e0;
+}
+.wxParse-th,
+.wxParse-td{
+	flex:1;
+	padding:5px;
+	font-size:28rpx;
+	border-left:1px solid #e0e0e0;
+	word-break: break-all;
+}
+.wxParse-td:last{
+	border-top:1px solid #e0e0e0;
+}
+.wxParse-th{
+	background:#f0f0f0;
+	border-top:1px solid #e0e0e0;
+}
+
diff --git a/litemall-wx/pages/help/help.js b/litemall-wx/pages/MessageDetails/MessageDetails.js
similarity index 41%
rename from litemall-wx/pages/help/help.js
rename to litemall-wx/pages/MessageDetails/MessageDetails.js
index 85d4ba25..38cf265e 100644
--- a/litemall-wx/pages/help/help.js
+++ b/litemall-wx/pages/MessageDetails/MessageDetails.js
@@ -1,120 +1,90 @@
+// pages/MessageDetails/MessageDetails.js
 var util = require('../../utils/util.js');
 var api = require('../../config/api.js');
-var app = getApp()
-
+var WxParse = require('../../lib/wxParse/wxParse.js');
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    issueList: [],
-    page: 1,
-    limit: 10,
-    count: 0,
-    showPage: false
+    id:'',
+    content:{}
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
-    this.getIssue();
+  onLoad(options) {
+    console.log('options',options)
+    // 页面初始化 options为页面跳转所带来的参数
+    this.setData({
+      id: options.id
+    });
+    this.getFootprintList()
   },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function () {
+  onReady() {
 
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {
+  onShow() {
 
   },
-
+  getFootprintList() {
+    wx.showLoading({
+      title: '加载中...',
+    });
+    let that = this;
+    let sessuserInfo = wx.getStorageSync('userInfo');
+    util.request(api.NoticeCatnotice,{noticeId:that.data.id,userType:sessuserInfo.userType,},'POST').then(function(res) {
+      if (res.errno === 0) {
+        that.setData({
+          content:res.data
+        })
+        WxParse.wxParse('goodsDetail', 'html',res.data.content, that);
+      }
+      wx.hideLoading();
+    });
+  },
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function () {
+  onHide() {
 
   },
 
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload: function () {
+  onUnload() {
 
   },
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh: function () {
+  onPullDownRefresh() {
 
   },
 
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function () {
+  onReachBottom() {
 
   },
 
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
-
-  },
-  nextPage: function (event) {
-    var that = this;
-    if (this.data.page > that.data.count / that.data.limit) {
-      return true;
-    }
-
-    that.setData({
-      page: that.data.page + 1
-    });
-
-    this.getIssue();
+  onShareAppMessage() {
 
-  },
-  getIssue: function () {
-
-    let that = this;
-    that.setData({
-      showPage: false,
-      issueList: []
-    });
-
-    util.request(api.IssueList, {
-      page: that.data.page,
-      limit: that.data.limit
-    }).then(function (res) {
-      if (res.errno === 0) {
-
-        that.setData({
-          issueList: res.data.list,
-          showPage: true,
-          count: res.data.total
-        });
-      }
-    });
-
-  },
-  prevPage: function (event) {
-    if (this.data.page <= 1) {
-      return false;
-    }
-
-    var that = this;
-    that.setData({
-      page: that.data.page - 1
-    });
-    this.getIssue();
   }
 })
\ No newline at end of file
diff --git a/litemall-wx/pages/MessageDetails/MessageDetails.json b/litemall-wx/pages/MessageDetails/MessageDetails.json
new file mode 100644
index 00000000..9d7f4fb5
--- /dev/null
+++ b/litemall-wx/pages/MessageDetails/MessageDetails.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "公告详情"
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/MessageDetails/MessageDetails.wxml b/litemall-wx/pages/MessageDetails/MessageDetails.wxml
new file mode 100644
index 00000000..1674137c
--- /dev/null
+++ b/litemall-wx/pages/MessageDetails/MessageDetails.wxml
@@ -0,0 +1,5 @@
+<!--pages/MessageDetails/MessageDetails.wxml-->
+<view class="detail">
+  <import src="/lib/wxParse/wxParse.wxml" />
+  <template is="wxParse" data="{{wxParseData:goodsDetail.nodes}}" />
+</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/MessageDetails/MessageDetails.wxss b/litemall-wx/pages/MessageDetails/MessageDetails.wxss
new file mode 100644
index 00000000..b3ea1dc5
--- /dev/null
+++ b/litemall-wx/pages/MessageDetails/MessageDetails.wxss
@@ -0,0 +1,4 @@
+/* pages/MessageDetails/MessageDetails.wxss */
+.detail{
+  padding: 30rpx;
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/about/about.js b/litemall-wx/pages/about/about.js
deleted file mode 100644
index d46afe44..00000000
--- a/litemall-wx/pages/about/about.js
+++ /dev/null
@@ -1,57 +0,0 @@
-const util = require('../../utils/util.js');
-const api = require('../../config/api.js');
-
-//获取应用实例
-const app = getApp();
-
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    name: 'litemall',
-    address: 'https://github.com/linlinjava/litemall',
-    latitude: '31.201900',
-    longitude: '121.587839',
-    phone: '021-xxxx-xxxx',
-    qq: '705144434'
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.getAbout()
-  },
-  getAbout: function () {
-    let that = this;
-    util.request(api.AboutUrl).then(function (res) {
-      if (res.errno === 0) {
-        that.setData({
-          name: res.data.name,
-          address: res.data.address,
-          phone: res.data.phone,
-          qq: res.data.qq,
-          latitude: res.data.latitude,
-          longitude: res.data.longitude
-        });
-      }
-    });
-  },
-  showLocation: function (e) {
-    var that = this
-    wx.openLocation({
-      latitude: parseFloat(that.data.latitude),
-      longitude: parseFloat(that.data.longitude),
-      name: that.data.name,
-      address: that.data.address,
-    })
-  },
-  callPhone: function (e) {
-    var that = this
-    wx.makePhoneCall({
-      phoneNumber: that.data.phone,
-    })
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/about/about.json b/litemall-wx/pages/about/about.json
deleted file mode 100644
index 9e26dfee..00000000
--- a/litemall-wx/pages/about/about.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/litemall-wx/pages/about/about.wxml b/litemall-wx/pages/about/about.wxml
deleted file mode 100644
index 50ae10c1..00000000
--- a/litemall-wx/pages/about/about.wxml
+++ /dev/null
@@ -1,40 +0,0 @@
-<view class="container">
-
-  <view class="label">项目名称:</view>
-  <view class="about-item">
-    <view class="item-left">
-      <text>{{name}}</text> 
-    </view>
-  </view>
-
-  <view class="label">项目地址:</view>
-  <view class="about-item">
-    <view class="item-left">
-      <text>{{address}}</text> 
-    </view>
-    <view class="item-right" bindtap="showLocation">
-      <van-icon class="right-icon" name="location-o" />    
-    </view>
-  </view>
-
-  <view class="label">电话号码:</view>
-  <view class="about-item">
-    <view class="item-left">
-      <text>{{phone}}</text> 
-    </view>
-    <view class="item-right" bindtap="callPhone">
-      <van-icon class="right-icon" name="phone-o" />
-    </view>
-  </view>
-
-  <view class="label">QQ交流群: </view>
-  <view class="about-item">
-    <view class="item-left">
-      <text>{{qq}}</text> 
-    </view>
-    <view class="item-right">
-      <van-icon class="right-icon" name="friends-o" />
-    </view>
-  </view>
-
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/about/about.wxss b/litemall-wx/pages/about/about.wxss
deleted file mode 100644
index 8ac56f86..00000000
--- a/litemall-wx/pages/about/about.wxss
+++ /dev/null
@@ -1,36 +0,0 @@
-/* about.wxss */
-
-.label {
-  font-size: 26rpx;
-  margin-left: 20rpx;
-  padding: 10rpx 0;
-} 
-
-
-.about-item{
-  background: white;
-  border-top: solid #f2f2f2 0.5rpx;
-  border-bottom: solid #f2f2f2 0.5rpx;
-  width: 100%;
-  height: 100rpx;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-}
-
-.item-left{
-  font-size: 38rpx;
-  margin-left: 40rpx;
-  margin-top: auto;
-  margin-bottom: auto;
-}
-
-.item-right{
-  margin-right: 15rpx;
-  margin-top: auto;
-  margin-bottom: auto;
-}
-.right-icon{
-  width: 40rpx;
-  height: 40rpx;
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/anchor/anchor.js b/litemall-wx/pages/anchor/anchor.js
new file mode 100644
index 00000000..4ac820d3
--- /dev/null
+++ b/litemall-wx/pages/anchor/anchor.js
@@ -0,0 +1,49 @@
+const urls = [{
+    url: 'https://vdept3.bdstatic.com/mda-qcieasan86x6zvc2/sc/cae_h264/1710849831363706776/mda-qcieasan86x6zvc2.mp4?v_from_s=hkapp-haokan-nanjing&auth_key=1710996777-0-0-a60d3fb122fa56d27c00b16b906bc327&bcevod_channel=searchbox_feed&cr=2&cd=0&pd=1&pt=3&logid=3177422946&vid=8840389684363742807&klogid=3177422946&abtest=',
+    id: 1,
+  },
+  {
+    url: 'https://vdept3.bdstatic.com/mda-qcgeivs0ra61jhby/sc/cae_h264/1710670691253547889/mda-qcgeivs0ra61jhby.mp4?v_from_s=hkapp-haokan-nanjing&auth_key=1710996817-0-0-239af157c468c3db4c727365a9058586&bcevod_channel=searchbox_feed&cr=2&cd=0&pd=1&pt=3&logid=3217312702&vid=1845506207132564873&klogid=3217312702&abtest=',
+    id: 2
+  },
+  {
+    url: 'https://vdept3.bdstatic.com/mda-qb43e4efpc3apjwa/sc/cae_h264/1707122276399988028/mda-qb43e4efpc3apjwa.mp4?v_from_s=hkapp-haokan-nanjing&auth_key=1710996832-0-0-2ddef13400f65f66e35c56d64e61636d&bcevod_channel=searchbox_feed&cr=2&cd=0&pd=1&pt=3&logid=3232102214&vid=4958415403838691973&klogid=3232102214&abtest=',
+    id: 3,
+  },
+  {
+    url: 'https://vdept3.bdstatic.com/mda-qc63v0iabfr45d3h/sc/cae_h264/1709811904354890676/mda-qc63v0iabfr45d3h.mp4?v_from_s=hkapp-haokan-nanjing&auth_key=1710996855-0-0-2473ac8f54c554c9a2d6230fa0de0b1a&bcevod_channel=searchbox_feed&cr=2&cd=0&pd=1&pt=3&logid=3255835181&vid=12212515584897531353&klogid=3255835181&abtest=',
+    id: 4
+  },
+]
+
+const videoList = urls
+Page({
+  data: {
+    videoList
+  },
+
+  onPlay(e) {},
+
+  onPause(e) {
+    //  console.log('pause', e.detail.activeId)
+  },
+  goInformation(){
+    let str = ''
+    wx.navigateTo({
+      url: "/pages/information/information?data="+encodeURIComponent(str)
+    });
+  },
+  onEnded(e) {},
+
+  onError(e) {},
+
+  onWaiting(e) {},
+
+  onTimeUpdate(e) {},
+
+  onProgress(e) {},
+
+  onLoadedMetaData(e) {
+    console.log('LoadedMetaData', e)
+  }
+})
\ No newline at end of file
diff --git a/litemall-wx/pages/anchor/anchor.json b/litemall-wx/pages/anchor/anchor.json
new file mode 100644
index 00000000..ff778051
--- /dev/null
+++ b/litemall-wx/pages/anchor/anchor.json
@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "mp-video-swiper": "../../components/video-swiper/index"
+  },
+  "navigationStyle": "custom"
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/anchor/anchor.wxml b/litemall-wx/pages/anchor/anchor.wxml
new file mode 100644
index 00000000..e5d14e1f
--- /dev/null
+++ b/litemall-wx/pages/anchor/anchor.wxml
@@ -0,0 +1,17 @@
+<mp-video-swiper 
+  class="video-swiper" 
+  video-list="{{videoList}}" 
+  bindplay="onPlay"
+  bindpause="onPause"
+  bindtimeupdate="onTimeUpdate"
+  bindended="onEnded"
+  binderror="onError"
+  bindwaiting="onWaiting"
+  bindprogress="onProgress"
+  bindloadedmetadata="onLoadedMetaData"
+></mp-video-swiper>
+<view class="main">
+  <view class="icon"><image class="img" src="./assets/sex.png" bindtap="goInformation" alt="" /></view>
+  <view class="icon"><van-icon name="like" size='36' color="#ccc" /></view>
+  <view class="icon"><van-icon name="more" size='36' color="#ccc" /></view>
+</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/anchor/anchor.wxss b/litemall-wx/pages/anchor/anchor.wxss
new file mode 100644
index 00000000..80e1e152
--- /dev/null
+++ b/litemall-wx/pages/anchor/anchor.wxss
@@ -0,0 +1,64 @@
+@import '../../components/weui.wxss';
+
+page{
+    background-color: #F8F8F8;
+    font-size: 16px;
+    font-family: -apple-system-font,Helvetica Neue,Helvetica,sans-serif;
+}
+.page__hd {
+    padding: 40px;
+}
+.page__bd {
+    padding-bottom: 40px;
+}
+.page__bd_spacing {
+    padding-left: 15px;
+    padding-right: 15px;
+}
+
+.page__ft{
+    padding-bottom: 10px;
+    text-align: center;
+}
+
+.page__title {
+    text-align: left;
+    font-size: 20px;
+    font-weight: 400;
+}
+
+.page__desc {
+    margin-top: 5px;
+    color: #888888;
+    text-align: left;
+    font-size: 14px;
+}
+.weui-cell_example:before{
+    left:52px;
+}
+page{
+    background-color: #FFFFFF;
+    height: 100%;
+}
+
+mp-video-swiper {
+    width: 100%;
+    height: 100%;
+}
+.main{
+  position: fixed;
+  z-index: 99999;
+  right: 0;
+  bottom: 100rpx;
+}
+
+.main .icon{
+  text-align: center;
+  width: 120rpx;
+  height: 160rpx;
+  line-height: 160rpx;
+}
+.main .icon .img{
+  width: 70rpx;
+  height: 70rpx;
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/anchor/assets/mom.png b/litemall-wx/pages/anchor/assets/mom.png
new file mode 100644
index 0000000000000000000000000000000000000000..b29aba7b24f26ddc74489a025508580854d563b2
GIT binary patch
literal 7035
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
WVSASi;=a448bA%DjjUF*!u%ghoC=%(

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/anchor/assets/sex.png b/litemall-wx/pages/anchor/assets/sex.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a619da42f9f1869f3ac097298f2f5c3ce5c5696
GIT binary patch
literal 11453
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
X!j9E=7f<?J00000NkvXXu0mjfhf1QY

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/auth/accountLogin/accountLogin.js b/litemall-wx/pages/auth/accountLogin/accountLogin.js
index 959f37e2..ca66bd82 100644
--- a/litemall-wx/pages/auth/accountLogin/accountLogin.js
+++ b/litemall-wx/pages/auth/accountLogin/accountLogin.js
@@ -1,117 +1,29 @@
-var api = require('../../../config/api.js');
-var util = require('../../../utils/util.js');
-var user = require('../../../utils/user.js');
-
-var app = getApp();
-Page({
-  data: {
-    username: '',
-    password: '',
-    code: '',
-    loginErrorCount: 0
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    // 页面渲染完成
-
-  },
-  onReady: function() {
-
-  },
-  onShow: function() {
-    // 页面显示
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-
-  },
-  accountLogin: function() {
-    var that = this;
-
-    if (this.data.password.length < 1 || this.data.username.length < 1) {
-      wx.showModal({
-        title: '错误信息',
-        content: '请输入用户名和密码',
-        showCancel: false
-      });
-      return false;
-    }
-
-    wx.request({
-      url: api.AuthLoginByAccount,
-      data: {
-        username: that.data.username,
-        password: that.data.password
-      },
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      },
-      success: function(res) {
-        if (res.data.errno == 0) {
-          that.setData({
-            loginErrorCount: 0
-          });
-          app.globalData.hasLogin = true;
-          wx.setStorageSync('userInfo', res.data.data.userInfo);
-          wx.setStorage({
-            key: "token",
-            data: res.data.data.token,
-            success: function() {
-              wx.switchTab({
-                url: '/pages/ucenter/index/index'
-              });
-            }
-          });
-        } else {
-          that.setData({
-            loginErrorCount: that.data.loginErrorCount + 1
-          });
-          app.globalData.hasLogin = false;
-          util.showErrorToast('账户登录失败');
-        }
-      }
-    });
-  },
-  bindUsernameInput: function(e) {
-
-    this.setData({
-      username: e.detail.value
-    });
-  },
-  bindPasswordInput: function(e) {
-
-    this.setData({
-      password: e.detail.value
-    });
-  },
-  bindCodeInput: function(e) {
-
-    this.setData({
-      code: e.detail.value
-    });
-  },
-  clearInput: function(e) {
-    switch (e.currentTarget.id) {
-      case 'clear-username':
-        this.setData({
-          username: ''
-        });
-        break;
-      case 'clear-password':
-        this.setData({
-          password: ''
-        });
-        break;
-      case 'clear-code':
-        this.setData({
-          code: ''
-        });
-        break;
-    }
-  }
+var api = require('../../../config/api.js');
+var util = require('../../../utils/util.js');
+var user = require('../../../utils/user.js');
+
+var app = getApp();
+Page({
+  data: {
+    
+  },
+  onLoad: function(options) {
+    // 页面初始化 options为页面跳转所带来的参数
+    // 页面渲染完成
+
+  },
+  onReady: function() {
+
+  },
+  onShow: function() {
+    // 页面显示
+  },
+  onHide: function() {
+    // 页面隐藏
+
+  },
+  onUnload: function() {
+    // 页面关闭
+
+  },
 })
\ No newline at end of file
diff --git a/litemall-wx/pages/auth/accountLogin/accountLogin.json b/litemall-wx/pages/auth/accountLogin/accountLogin.json
index edc46d87..2d2d5628 100644
--- a/litemall-wx/pages/auth/accountLogin/accountLogin.json
+++ b/litemall-wx/pages/auth/accountLogin/accountLogin.json
@@ -1,3 +1,3 @@
-{
-  "navigationBarTitleText": "账号登录"
+{
+  "navigationBarTitleText": "隐私协议"
 }
\ No newline at end of file
diff --git a/litemall-wx/pages/auth/accountLogin/accountLogin.wxml b/litemall-wx/pages/auth/accountLogin/accountLogin.wxml
index 26a78fe9..c5b380bd 100644
--- a/litemall-wx/pages/auth/accountLogin/accountLogin.wxml
+++ b/litemall-wx/pages/auth/accountLogin/accountLogin.wxml
@@ -1,29 +1,17 @@
-<view class="container">
-    <view class="form-box">
-
-    	<view class="form-item">
-    		<input class="username" value="{{username}}" bindinput="bindUsernameInput" placeholder="账号"/>
-        <van-icon name="close" wx:if="{{ username.length > 0 }}" id="clear-username" class="clear" catchtap="clearInput"/>
-    	</view>
-
-    	<view class="form-item">
-    		<input class="password" value="{{password}}" password bindinput="bindPasswordInput" placeholder="密码"/>
-        <van-icon class="clear" id="clear-password" wx:if="{{ password.length > 0 }}" name="close" catchtap="clearInput"/>      
-    	</view>
-
-		 <!-- <view class="form-item-code" wx-if="{{loginErrorCount >= 3}}">
-			<view class="form-item code-item">
-				<input class="code" value="{{code}}" bindinput="bindCodeInput" placeholder="验证码"/>
-        <van-icon class="clear" id="clear-code" wx:if="{{ code.length > 0 }}" name="close" catchtap="clearInput"/>        
-			</view>
-			<image class="code-img" src="captcha.png"></image>
-		</view>  -->
-
-    <button type="primary" class="login-btn" bindtap="accountLogin">账号登录</button>
-
-     <view class="form-item-text">
-      <navigator url="/pages/auth/register/register" class="register">注册账号</navigator>
-			<navigator url="/pages/auth/reset/reset" class="reset">忘记密码</navigator>
-    </view> 
-    </view>
+<view class="container">
+    <text class="title">信息收集：\n</text>
+    <text class="text">我们将收集您的个人信息，包括但不限于姓名、联系方式、身份证号码、履历等，用于招聘目的。\n</text>
+    <text class="title">信息使用：\n</text>
+    <text class="text">我们承诺对收集到的信息进行保密，仅在招聘过程中使用，并不会用于其他目的。我们将采取合理的措施保护您的信息安全。\n</text>
+    <text class="title">信息共享：\n</text>
+    <text class="text">除非经过您的同意或法律规定，否则我们不会将您的信息分享给任何第三方。\n</text>
+    <text class="title">信息存储：\n</text>
+    <text class="text">我们将在合理期限内保存您的信息，超过期限后将予以删除。\n</text>
+    <text class="title">信息安全：\n</text>
+    <text class="text" >我们将采取合理的安全措施，保护您的个人信息不被泄露、篡改或丢失。\n</text>
+    <text class="title">隐私权利：\n</text>
+    <text class="text">您有权查看、更正、删除您的个人信息，也可以撤回您的同意。如果您有任何疑问或投诉，请联系我们。\n</text>
+    <text class="title">法律适用：\n</text>
+    <text class="text">本协议适用于中华人民共和国的法律法规。\n</text>
+    <text class="text">请您仔细阅读本协议，并在同意的情况下参与我们的招聘活动。如果您不同意本协议的任何内容，请您立即停止使用我们的服务。</text>
 </view>
\ No newline at end of file
diff --git a/litemall-wx/pages/auth/accountLogin/accountLogin.wxss b/litemall-wx/pages/auth/accountLogin/accountLogin.wxss
index c2eadeba..3884698f 100644
--- a/litemall-wx/pages/auth/accountLogin/accountLogin.wxss
+++ b/litemall-wx/pages/auth/accountLogin/accountLogin.wxss
@@ -1,101 +1,16 @@
-.form-box {
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-  padding: 0 40rpx;
-  margin-top: 200rpx;
-  background: #fff;
-}
-
-.form-item {
-  position: relative;
-  background: #fff;
-  height: 96rpx;
-  border-bottom: 1px solid #d9d9d9;
-}
-
-.form-item .username, .form-item .password, .form-item .code {
-  position: absolute;
-  top: 26rpx;
-  left: 0;
-  display: block;
-  width: 100%;
-  height: 44rpx;
-  background: #fff;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.form-item-code {
-  margin-top: 32rpx;
-  height: auto;
-  overflow: hidden;
-  width: 100%;
-}
-
-.form-item-code .form-item {
-  float: left;
-  width: 350rpx;
-}
-
-.form-item-code .code-img {
-  float: right;
-  margin-top: 4rpx;
-  height: 88rpx;
-  width: 236rpx;
-}
-
-.form-item .clear {
-  position: absolute;
-  top: 32rpx;
-  right: 18rpx;
-  z-index: 2;
-  display: block;
-  background: #fff;
-}
-
-.login-btn {
-  margin: 60rpx 0 40rpx 0;
-  height: 96rpx;
-  line-height: 96rpx;
-  font-size: 30rpx;
-  border-radius: 6rpx;
-  width: 90%;
-  color: #fff;
-  right: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  position: flex;
-  bottom: 0;
-  left: 0;
-  padding: 0;
-  margin-left: 5%;
-  text-align: center;
-  /* padding-left: -5rpx; */
-  border-top-left-radius: 50rpx;
-  border-bottom-left-radius: 50rpx;
-  border-top-right-radius: 50rpx;
-  border-bottom-right-radius: 50rpx;
-  letter-spacing: 3rpx;
-  background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
-}
-
-.form-item-text {
-  height: 35rpx;
-  width: 100%;
-}
-
-.form-item-text .register {
-  display: block;
-  height: 34rpx;
-  float: left;
-  font-size: 28rpx;
-}
-
-.form-item-text .reset {
-  display: block;
-  height: 34rpx;
-  float: right;
-  font-size: 28rpx;
-}
+.container{
+  width: 100%;
+  height: 100vh;
+  background-color: #fff;
+  padding: 0 20px;
+  padding-top: 60rpx;
+}
+.container .title{
+  font-size: 30rpx;
+  font-weight: 600;
+  line-height: 50rpx;
+}
+.container .text{
+  font-size: 26rpx;
+  line-height: 40rpx;
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/auth/authorization/assets/denglu.svg b/litemall-wx/pages/auth/authorization/assets/denglu.svg
new file mode 100644
index 00000000..98beea8d
--- /dev/null
+++ b/litemall-wx/pages/auth/authorization/assets/denglu.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg height="8887" node-id="1" sillyvg="true" template-height="8887" template-width="11927" version="1.1" viewBox="0 0 11927 8887" width="11927" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs node-id="176"></defs><path d="M 11926.20 7809.24 L 0.00 7809.24 L 0.00 7815.21 L 11926.20 7815.21 L 11926.20 7809.24 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="178" stroke="none" target-height="5.9697266" target-width="11926.2" target-x="0" target-y="7809.24"></path><path d="M 2977.24 8170.13 L 2187.26 8170.13 L 2187.26 8176.09 L 2977.24 8176.09 L 2977.24 8170.13 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="180" stroke="none" target-height="5.959961" target-width="789.98" target-x="2187.26" target-y="8170.13"></path><path d="M 1937.28 8170.13 L 1479.56 8170.13 L 1479.56 8176.09 L 1937.28 8176.09 L 1937.28 8170.13 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="182" stroke="none" target-height="5.959961" target-width="457.71997" target-x="1479.56" target-y="8170.13"></path><path d="M 5022.10 8257.91 L 4564.38 8257.91 L 4564.38 8263.87 L 5022.10 8263.87 L 5022.10 8257.91 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="184" stroke="none" target-height="5.959961" target-width="457.7202" target-x="4564.38" target-y="8257.91"></path><path d="M 7408.76 8391.00 L 6378.58 8391.00 L 6378.58 8396.97 L 7408.76 8396.97 L 7408.76 8391.00 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="186" stroke="none" target-height="5.9697266" target-width="1030.1797" target-x="6378.58" target-y="8391"></path><path d="M 6166.30 8391.00 L 6015.31 8391.00 L 6015.31 8396.97 L 6166.30 8396.97 L 6166.30 8391.00 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="188" stroke="none" target-height="5.9697266" target-width="150.98975" target-x="6015.31" target-y="8391"></path><path d="M 10813.40 8257.91 L 8578.96 8257.91 L 8578.96 8263.87 L 10813.40 8263.87 L 10813.40 8257.91 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="190" stroke="none" target-height="5.959961" target-width="2234.4404" target-x="8578.96" target-y="8257.91"></path><path d="M 5653.00 6745.43 L 1047.35 6745.43 C 1011.27 6745.37 976.69 6730.99 951.20 6705.46 C 925.71 6679.92 911.40 6645.32 911.40 6609.23 L 911.40 135.00 C 911.71 99.13 926.17 64.83 951.62 39.55 C 977.08 14.27 1011.48 0.06 1047.35 0.00 L 5653.00 0.00 C 5689.12 0.00 5723.76 14.35 5749.30 39.89 C 5774.84 65.43 5789.19 100.08 5789.19 136.20 L 5789.19 6609.23 C 5789.19 6645.36 5774.84 6680.00 5749.30 6705.54 C 5723.76 6731.08 5689.12 6745.43 5653.00 6745.43 Z M 1047.35 4.77 C 1012.86 4.83 979.79 18.58 955.42 43.00 C 931.05 67.42 917.36 100.50 917.36 135.00 L 917.36 6609.23 C 917.36 6643.73 931.05 6676.82 955.42 6701.24 C 979.79 6725.66 1012.86 6739.41 1047.35 6739.47 L 5653.00 6739.47 C 5687.52 6739.41 5720.61 6725.66 5745.02 6701.25 C 5769.43 6676.84 5783.17 6643.76 5783.23 6609.23 L 5783.23 135.00 C 5783.17 100.48 5769.43 67.39 5745.02 42.98 C 5720.61 18.57 5687.52 4.83 5653.00 4.77 L 1047.35 4.77 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="192" stroke="none" target-height="6745.43" target-width="4877.794" target-x="911.396" target-y="0"></path><path d="M 10812.50 6745.43 L 6206.61 6745.43 C 6170.51 6745.37 6135.90 6731.00 6110.37 6705.47 C 6084.84 6679.94 6070.47 6645.34 6070.41 6609.23 L 6070.41 135.00 C 6070.79 99.11 6085.30 64.81 6110.79 39.54 C 6136.28 14.27 6170.71 0.06 6206.61 0.00 L 10812.50 0.00 C 10848.30 0.12 10882.70 14.37 10908.10 39.64 C 10933.50 64.91 10947.90 99.17 10948.20 135.00 L 10948.20 6609.23 C 10948.20 6645.27 10933.90 6679.84 10908.50 6705.37 C 10883.00 6730.90 10848.50 6745.31 10812.50 6745.43 Z M 6206.61 4.77 C 6172.09 4.83 6139.00 18.57 6114.59 42.98 C 6090.18 67.39 6076.44 100.48 6076.37 135.00 L 6076.37 6609.23 C 6076.44 6643.76 6090.18 6676.84 6114.59 6701.25 C 6139.00 6725.66 6172.09 6739.41 6206.61 6739.47 L 10812.50 6739.47 C 10847.00 6739.41 10880.10 6725.66 10904.50 6701.25 C 10928.90 6676.84 10942.70 6643.76 10942.70 6609.23 L 10942.70 135.00 C 10942.70 100.48 10928.90 67.39 10904.50 42.98 C 10880.10 18.57 10847.00 4.83 10812.50 4.77 L 6206.61 4.77 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="194" stroke="none" target-height="6745.43" target-width="4877.79" target-x="6070.41" target-y="0"></path><path d="M 6378.11 5771.78 L 5853.59 5771.78 L 5853.59 7852.42 L 6378.11 7852.42 L 6378.11 5771.78 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="196" stroke="none" target-height="2080.6401" target-width="524.52" target-x="5853.59" target-y="5771.78"></path><path d="M 6278.40 7852.42 L 6378.11 7852.42 L 6378.11 7569.05 L 6173.93 7569.05 L 6278.40 7852.42 Z" fill="#fafafa" fill-rule="nonzero" node-id="198" stroke="none" target-height="283.37012" target-width="204.17969" target-x="6173.93" target-y="7569.05"></path><path d="M 4079.70 5771.78 L 3555.19 5771.78 L 3555.19 7852.42 L 4079.70 7852.42 L 4079.70 5771.78 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="200" stroke="none" target-height="2080.6401" target-width="524.51" target-x="3555.19" target-y="5771.78"></path><path d="M 6378.11 5771.78 L 3992.88 5771.78 L 3992.88 7678.53 L 6378.11 7678.53 L 6378.11 5771.78 Z" fill="#fafafa" fill-rule="nonzero" node-id="202" stroke="none" target-height="1906.75" target-width="2385.23" target-x="3992.88" target-y="5771.78"></path><path d="M 6291.52 5865.52 L 6291.52 6370.00 L 4078.74 6370.00 L 4078.74 5865.52 L 6290.81 5865.52 M 6300.11 5856.22 L 4070.16 5856.22 L 4070.16 6379.06 L 6300.83 6379.06 L 6300.83 5856.22 L 6300.11 5856.22 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="204" stroke="none" target-height="522.83984" target-width="2230.6702" target-x="4070.16" target-y="5856.22"></path><path d="M 4092.34 7852.42 L 3992.88 7852.42 L 3992.88 7569.05 L 4196.81 7569.05 L 4092.34 7852.42 Z" fill="#fafafa" fill-rule="nonzero" node-id="206" stroke="none" target-height="283.37012" target-width="203.93018" target-x="3992.88" target-y="7569.05"></path><path d="M 5132.78 6117.64 C 5132.78 6128.07 5135.87 6138.26 5141.66 6146.93 C 5147.45 6155.59 5155.69 6162.35 5165.32 6166.34 C 5174.95 6170.33 5185.55 6171.37 5195.77 6169.34 C 5206.00 6167.31 5215.39 6162.29 5222.77 6154.91 C 5230.14 6147.54 5235.16 6138.15 5237.19 6127.92 C 5239.23 6117.70 5238.18 6107.10 5234.19 6097.47 C 5230.20 6087.84 5223.45 6079.60 5214.78 6073.81 C 5206.11 6068.02 5195.92 6064.93 5185.49 6064.93 C 5171.51 6064.93 5158.10 6070.48 5148.22 6080.37 C 5138.33 6090.25 5132.78 6103.66 5132.78 6117.64 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="208" stroke="none" target-height="106.43994" target-width="106.450195" target-x="5132.78" target-y="6064.93"></path><path d="M 6291.52 6472.80 L 6291.52 6977.28 L 4078.74 6977.28 L 4078.74 6472.80 L 6290.81 6472.80 M 6300.11 6463.74 L 4070.16 6463.74 L 4070.16 6986.58 L 6300.83 6986.58 L 6300.83 6463.98 L 6300.11 6463.74 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="210" stroke="none" target-height="522.83984" target-width="2230.6702" target-x="4070.16" target-y="6463.74"></path><path d="M 5132.78 6726.35 C 5132.78 6736.78 5135.87 6746.97 5141.66 6755.64 C 5147.45 6764.31 5155.69 6771.06 5165.32 6775.05 C 5174.95 6779.04 5185.55 6780.08 5195.77 6778.05 C 5206.00 6776.02 5215.39 6771.00 5222.77 6763.62 C 5230.14 6756.25 5235.16 6746.86 5237.19 6736.63 C 5239.23 6726.41 5238.18 6715.81 5234.19 6706.18 C 5230.20 6696.55 5223.45 6688.31 5214.78 6682.52 C 5206.11 6676.73 5195.92 6673.64 5185.49 6673.64 C 5171.51 6673.64 5158.10 6679.19 5148.22 6689.08 C 5138.33 6698.96 5132.78 6712.37 5132.78 6726.35 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="212" stroke="none" target-height="106.43994" target-width="106.450195" target-x="5132.78" target-y="6673.64"></path><path d="M 6291.52 7080.32 L 6291.52 7585.03 L 4078.74 7585.03 L 4078.74 7080.32 L 6290.81 7080.32 M 6300.11 7071.02 L 4070.16 7071.02 L 4070.16 7594.10 L 6300.83 7594.10 L 6300.83 7071.02 L 6300.11 7071.02 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="214" stroke="none" target-height="523.0801" target-width="2230.6702" target-x="4070.16" target-y="7071.02"></path><path d="M 5132.78 7332.68 C 5132.83 7343.09 5135.96 7353.26 5141.78 7361.90 C 5147.60 7370.53 5155.85 7377.25 5165.48 7381.21 C 5175.12 7385.16 5185.71 7386.17 5195.92 7384.11 C 5206.13 7382.05 5215.50 7377.01 5222.85 7369.63 C 5230.20 7362.25 5235.19 7352.85 5237.21 7342.63 C 5239.22 7332.42 5238.17 7321.83 5234.17 7312.21 C 5230.17 7302.59 5223.42 7294.37 5214.75 7288.59 C 5206.09 7282.81 5195.91 7279.72 5185.49 7279.72 C 5178.55 7279.72 5171.67 7281.10 5165.26 7283.76 C 5158.85 7286.42 5153.03 7290.33 5148.13 7295.25 C 5143.23 7300.17 5139.36 7306.01 5136.72 7312.43 C 5134.09 7318.85 5132.75 7325.73 5132.78 7332.68 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="216" stroke="none" target-height="106.44971" target-width="106.470215" target-x="5132.75" target-y="7279.72"></path><path d="M 3759.36 4563.42 L 3234.85 4563.42 L 3234.85 7852.66 L 3759.36 7852.66 L 3759.36 4563.42 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="218" stroke="none" target-height="3289.2402" target-width="524.51" target-x="3234.85" target-y="4563.42"></path><path d="M 3659.66 7852.42 L 3759.36 7852.42 L 3759.36 7569.05 L 3555.42 7569.05 L 3659.66 7852.42 Z" fill="#fafafa" fill-rule="nonzero" node-id="220" stroke="none" target-height="283.37012" target-width="203.94019" target-x="3555.42" target-y="7569.05"></path><path d="M 1799.18 4563.42 L 1274.67 4563.42 L 1274.67 7852.66 L 1799.18 7852.66 L 1799.18 4563.42 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="222" stroke="none" target-height="3289.2402" target-width="524.51" target-x="1274.67" target-y="4563.42"></path><path d="M 3759.36 4563.42 L 1712.12 4563.42 L 1712.12 7678.77 L 3759.36 7678.77 L 3759.36 4563.42 Z" fill="#fafafa" fill-rule="nonzero" node-id="224" stroke="none" target-height="3115.35" target-width="2047.2401" target-x="1712.12" target-y="4563.42"></path><path d="M 3671.11 4651.20 L 3671.11 5356.51 L 1800.37 5356.51 L 1800.37 4651.20 L 3671.11 4651.20 Z M 3682.08 4640.47 L 1788.92 4640.47 L 1788.92 5366.77 L 3681.60 5366.77 L 3681.60 4640.71 L 3682.08 4640.47 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="226" stroke="none" target-height="726.2998" target-width="1893.16" target-x="1788.92" target-y="4640.47"></path><path d="M 3671.11 5442.62 L 3671.11 7313.35 L 2779.99 7313.35 L 2779.99 5442.62 L 3671.11 5442.62 Z M 3682.08 5431.65 L 2769.25 5431.65 L 2769.25 7324.33 L 3682.08 7324.33 L 3682.08 5431.65 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="228" stroke="none" target-height="1892.6802" target-width="912.8301" target-x="2769.25" target-y="5431.65"></path><path d="M 2691.49 5442.62 L 2691.49 7313.35 L 1800.37 7313.35 L 1800.37 5442.62 L 2691.49 5442.62 Z M 2702.23 5431.65 L 1788.92 5431.65 L 1788.92 7324.33 L 2701.75 7324.33 L 2701.75 5431.65 L 2702.23 5431.65 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="230" stroke="none" target-height="1892.6802" target-width="913.30994" target-x="1788.92" target-y="5431.65"></path><path d="M 1811.82 7852.42 L 1712.12 7852.42 L 1712.12 7569.05 L 1916.29 7569.05 L 1811.82 7852.42 Z" fill="#fafafa" fill-rule="nonzero" node-id="232" stroke="none" target-height="283.37012" target-width="204.17004" target-x="1712.12" target-y="7569.05"></path><path d="M 2682.91 5004.21 C 2682.86 5014.70 2685.92 5024.96 2691.71 5033.70 C 2697.50 5042.44 2705.76 5049.26 2715.43 5053.30 C 2725.10 5057.35 2735.75 5058.43 2746.04 5056.42 C 2756.33 5054.40 2765.79 5049.38 2773.22 5041.98 C 2780.65 5034.58 2785.71 5025.15 2787.78 5014.87 C 2789.84 5004.59 2788.80 4993.93 2784.80 4984.24 C 2780.80 4974.55 2774.02 4966.27 2765.30 4960.44 C 2756.59 4954.61 2746.34 4951.50 2735.86 4951.50 C 2721.86 4951.50 2708.42 4957.05 2698.50 4966.93 C 2688.58 4976.80 2682.97 4990.21 2682.91 5004.21 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="234" stroke="none" target-height="106.930176" target-width="106.97998" target-x="2682.86" target-y="4951.5"></path><path d="M 2871.82 6333.50 C 2871.82 6343.99 2874.93 6354.23 2880.76 6362.95 C 2886.59 6371.66 2894.87 6378.45 2904.56 6382.45 C 2914.25 6386.45 2924.91 6387.48 2935.19 6385.42 C 2945.47 6383.36 2954.90 6378.29 2962.30 6370.86 C 2969.69 6363.43 2974.72 6353.97 2976.73 6343.69 C 2978.75 6333.40 2977.67 6322.75 2973.62 6313.07 C 2969.58 6303.40 2962.75 6295.15 2954.01 6289.36 C 2945.27 6283.57 2935.01 6280.50 2924.53 6280.55 C 2917.59 6280.55 2910.71 6281.92 2904.30 6284.59 C 2897.89 6287.25 2892.07 6291.15 2887.17 6296.07 C 2882.27 6301.00 2878.40 6306.83 2875.76 6313.26 C 2873.13 6319.68 2871.79 6326.56 2871.82 6333.50 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="236" stroke="none" target-height="106.97998" target-width="106.95996" target-x="2871.79" target-y="6280.5"></path><path d="M 2494.23 6333.50 C 2494.28 6343.92 2497.41 6354.09 2503.23 6362.72 C 2509.06 6371.36 2517.30 6378.08 2526.94 6382.03 C 2536.58 6385.99 2547.17 6387.00 2557.38 6384.94 C 2567.59 6382.88 2576.96 6377.84 2584.31 6370.45 C 2591.65 6363.07 2596.65 6353.68 2598.67 6343.46 C 2600.68 6333.24 2599.62 6322.66 2595.63 6313.04 C 2591.63 6303.42 2584.87 6295.20 2576.21 6289.42 C 2567.55 6283.64 2557.36 6280.55 2546.95 6280.55 C 2540.01 6280.55 2533.13 6281.92 2526.72 6284.59 C 2520.31 6287.25 2514.49 6291.15 2509.59 6296.07 C 2504.69 6300.99 2500.81 6306.83 2498.18 6313.26 C 2495.54 6319.68 2494.20 6326.56 2494.23 6333.50 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="238" stroke="none" target-height="106.450195" target-width="106.47998" target-x="2494.2" target-y="6280.55"></path><path d="M 2434.61 3646.30 L 2213.49 3646.30 C 2233.87 3753.56 2246.70 3862.12 2251.90 3971.17 C 2251.90 4090.43 2083.50 4563.42 2323.45 4563.42 C 2563.41 4563.42 2395.01 4091.63 2395.01 3971.17 C 2400.60 3862.09 2413.83 3753.53 2434.61 3646.30 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="240" stroke="none" target-height="917.1199" target-width="479.9099" target-x="2083.5" target-y="3646.3"></path><path d="M 1593.33 4130.03 L 1593.33 4273.14 C 1593.59 4349.86 1624.17 4423.37 1678.42 4477.62 C 1732.67 4531.87 1806.18 4562.46 1882.90 4562.71 L 2026.01 4562.71 C 2102.74 4562.46 2176.24 4531.87 2230.49 4477.62 C 2284.74 4423.37 2315.33 4349.86 2315.58 4273.14 L 2315.58 4130.03 L 1593.33 4130.03 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="242" stroke="none" target-height="432.68018" target-width="722.2501" target-x="1593.33" target-y="4130.03"></path><path d="M 4667.18 5468.38 C 4667.18 5635.35 4853.94 5771.78 5082.21 5771.78 L 5288.29 5771.78 C 5516.56 5771.78 5703.32 5635.35 5703.32 5468.38 L 4667.18 5468.38 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="244" stroke="none" target-height="303.3999" target-width="1036.1396" target-x="4667.18" target-y="5468.38"></path><path d="M 10127.90 5223.65 C 10002.90 5325.74 9830.25 5512.51 9672.35 5775.36 C 9566.92 5950.43 9503.47 6133.14 9475.57 6375.96 C 9475.57 6101.66 9477.24 5807.08 9478.19 5528.96 C 9509.91 5457.41 9582.43 5292.35 9634.42 5162.12 C 9807.83 4727.29 9872.95 4620.19 10028.70 4245.23 C 10236.90 3744.33 10450.20 3151.37 10389.10 3198.83 C 10264.60 3295.43 9787.55 4188.70 9736.03 4316.55 C 9595.60 4657.74 9508.78 5018.60 9478.67 5386.33 C 9478.67 5123.95 9480.58 4885.43 9481.53 4700.33 C 9484.87 4096.63 9495.13 3901.76 9500.13 3841.65 C 9519.46 3811.12 9542.11 3775.58 9555.47 3756.50 C 9667.58 3594.30 9710.75 3456.44 9816.18 3214.57 C 9965.97 2872.29 10094.80 2264.30 10057.10 2294.83 C 9900.14 2422.68 9776.58 2696.98 9613.91 3046.89 C 9451.24 3396.81 9497.75 3597.88 9465.55 3896.51 C 9458.87 3955.19 9453.62 4176.54 9449.81 4483.04 C 9407.83 4156.26 9328.64 3941.12 9184.33 3745.53 C 9006.87 3504.86 8835.13 3342.42 8709.19 3257.51 C 8583.25 3172.59 8926.73 3763.66 9090.83 4020.78 C 9237.04 4250.72 9371.81 4453.23 9448.61 4652.87 C 9444.56 5068.61 9442.65 5594.80 9442.65 6084.01 C 9404.96 5861.23 9343.42 5621.03 9261.37 5435.22 C 9162.62 5211.97 9010.92 4869.45 8889.99 4753.29 C 8861.13 4725.38 9016.41 5391.57 9116.11 5568.56 C 9215.81 5745.54 9289.04 5912.75 9351.77 6013.17 C 9366.32 6037.02 9414.98 6126.94 9442.65 6178.94 C 9442.65 6776.92 9445.99 7304.53 9451.24 7484.14 L 9477.00 7484.14 C 9475.33 7437.86 9474.85 7133.51 9475.57 6730.88 C 9537.82 6512.39 9679.98 6262.90 9797.33 6035.35 C 9925.18 5788.95 10252.90 5122.28 10127.90 5223.65 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="246" stroke="none" target-height="5219.84" target-width="1866.9502" target-x="8583.25" target-y="2264.3"></path><path d="M 9837.64 7852.42 L 9090.11 7852.42 L 9033.58 7119.68 L 9894.17 7119.68 L 9837.64 7852.42 Z" fill="#f0f0f0" fill-rule="nonzero" node-id="248" stroke="none" target-height="732.73975" target-width="860.58984" target-x="9033.58" target-y="7119.68"></path><path d="M 9949.75 7205.07 L 8977.77 7205.07 L 8950.10 6957.72 L 9977.66 6957.72 L 9949.75 7205.07 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="250" stroke="none" target-height="247.34961" target-width="1027.5605" target-x="8950.1" target-y="6957.72"></path><path d="M 2963.89 488.97 L 1626.97 488.97 L 1626.97 1957.08 L 2963.89 1957.08 L 2963.89 488.97 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="252" stroke="none" target-height="1468.1069" target-width="1336.9199" target-x="1626.97" target-y="488.973"></path><path d="M 3108.67 488.97 L 1727.62 488.97 L 1727.62 1957.08 L 3108.67 1957.08 L 3108.67 488.97 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="254" stroke="none" target-height="1468.1069" target-width="1381.0499" target-x="1727.62" target-y="488.973"></path><path d="M 2992.99 1841.40 L 2992.99 604.66 L 1843.31 604.66 L 1843.31 1841.40 L 2992.99 1841.40 Z" fill="#ffffff" fill-rule="nonzero" node-id="256" stroke="none" target-height="1236.744" target-width="1149.6799" target-x="1843.31" target-y="604.656"></path><path d="M 2714.15 1541.34 L 2714.15 904.24 L 2121.90 904.24 L 2121.90 1541.34 L 2714.15 1541.34 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="258" stroke="none" target-height="637.1" target-width="592.25" target-x="2121.9" target-y="904.24"></path><path d="M 9780.64 659.99 L 8538.65 659.99 L 8538.65 2023.87 L 9780.64 2023.87 L 9780.64 659.99 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="260" stroke="none" target-height="1363.876" target-width="1241.9893" target-x="8538.65" target-y="659.994"></path><path d="M 9915.16 659.99 L 8632.39 659.99 L 8632.39 2023.87 L 9915.16 2023.87 L 9915.16 659.99 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="262" stroke="none" target-height="1363.876" target-width="1282.7705" target-x="8632.39" target-y="659.994"></path><path d="M 9807.83 1916.29 L 9807.83 767.57 L 8739.96 767.57 L 8739.96 1916.29 L 9807.83 1916.29 Z" fill="#ffffff" fill-rule="nonzero" node-id="264" stroke="none" target-height="1148.7241" target-width="1067.8701" target-x="8739.96" target-y="767.566"></path><path d="M 9273.78 1675.15 C 9457.81 1675.15 9606.99 1525.96 9606.99 1341.93 C 9606.99 1157.90 9457.81 1008.71 9273.78 1008.71 C 9089.74 1008.71 8940.56 1157.90 8940.56 1341.93 C 8940.56 1525.96 9089.74 1675.15 9273.78 1675.15 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="266" stroke="none" target-height="666.44" target-width="666.43066" target-x="8940.56" target-y="1008.71"></path><path d="M 4352.81 1364.35 L 3361.03 1364.35 L 3361.03 2453.45 L 4352.81 2453.45 L 4352.81 1364.35 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="268" stroke="none" target-height="1089.1" target-width="991.78" target-x="3361.03" target-y="1364.35"></path><path d="M 4460.14 1364.35 L 3435.69 1364.35 L 3435.69 2453.45 L 4460.14 2453.45 L 4460.14 1364.35 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="270" stroke="none" target-height="1089.1" target-width="1024.4502" target-x="3435.69" target-y="1364.35"></path><path d="M 4374.27 2367.58 L 4374.27 1450.22 L 3521.55 1450.22 L 3521.55 2367.58 L 4374.27 2367.58 Z" fill="#ffffff" fill-rule="nonzero" node-id="272" stroke="none" target-height="917.3601" target-width="852.72" target-x="3521.55" target-y="1450.22"></path><path d="M 3948.03 1676.82 L 3714.76 2080.87 L 4181.31 2080.87 L 3948.03 1676.82 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="274" stroke="none" target-height="404.05017" target-width="466.55005" target-x="3714.76" target-y="1676.82"></path><path d="M 5963.08 8886.41 C 8517.24 8886.41 10587.80 8765.53 10587.80 8616.41 C 10587.80 8467.28 8517.24 8346.40 5963.08 8346.40 C 3408.91 8346.40 1338.35 8467.28 1338.35 8616.41 C 1338.35 8765.53 3408.91 8886.41 5963.08 8886.41 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="276" stroke="none" target-height="540.00977" target-width="9249.45" target-x="1338.35" target-y="8346.4"></path><path d="M 8330.42 2586.31 L 8093.80 2490.90 C 8093.80 2490.90 7781.58 3060.25 7692.13 3089.11 C 7570.48 3128.23 7318.60 3237.00 7169.29 3256.08 C 7149.01 3279.93 7115.86 3354.11 7118.96 3381.06 C 7319.56 3448.09 7760.35 3359.12 7854.80 3288.99 C 8069.71 3129.90 8330.42 2586.31 8330.42 2586.31 Z" fill="#e58a7b" fill-rule="nonzero" node-id="278" stroke="none" target-height="957.1902" target-width="1214.56" target-x="7115.86" target-y="2490.9"></path><path d="M 8403.17 2456.79 C 8447.29 2619.70 8208.29 2947.43 8208.29 2947.43 L 7895.11 2771.88 C 7895.11 2771.88 7953.79 2637.11 8025.35 2499.96 C 8140.08 2278.37 8352.84 2270.98 8403.17 2456.79 Z" fill="#429cfd" fill-rule="nonzero" node-id="280" stroke="none" target-height="676.44995" target-width="552.1802" target-x="7895.11" target-y="2270.98"></path><g node-id="588"><path d="M 8403.17 2456.79 C 8447.29 2619.70 8208.29 2947.43 8208.29 2947.43 L 7895.11 2771.88 C 7895.11 2771.88 7953.79 2637.11 8025.35 2499.96 C 8140.08 2278.37 8352.84 2270.98 8403.17 2456.79 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="1" node-id="284" stroke="none" target-height="676.44995" target-width="552.1802" target-x="7895.11" target-y="2270.98"></path></g><g node-id="589"><path d="M 8019.38 2842.00 L 8142.70 2911.17 L 8164.41 2532.64 C 8092.61 2587.74 8042.04 2753.75 8019.38 2842.00 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="2" node-id="289" stroke="none" target-height="378.53003" target-width="145.03027" target-x="8019.38" target-y="2532.64"></path></g><path d="M 8197.08 2334.19 C 8197.08 2334.19 7953.31 2876.59 8095.47 3886.49 L 9056.00 3886.49 C 9071.27 3739.09 9020.70 3019.70 9203.65 2325.12 C 9098.28 2304.53 8991.67 2290.90 8884.51 2284.34 C 8748.58 2276.46 8612.32 2276.46 8476.39 2284.34 C 8382.17 2293.90 8288.80 2310.57 8197.08 2334.19 Z" fill="#429cfd" fill-rule="nonzero" node-id="292" stroke="none" target-height="1610.03" target-width="1250.3403" target-x="7953.31" target-y="2276.46"></path><path d="M 8197.08 2334.19 C 8197.08 2334.19 7953.31 2876.59 8095.47 3886.49 L 9056.00 3886.49 C 9071.27 3739.09 9020.70 3019.70 9203.65 2325.12 C 9098.28 2304.53 8991.67 2290.90 8884.51 2284.34 C 8748.58 2276.46 8612.32 2276.46 8476.39 2284.34 C 8382.17 2293.90 8288.80 2310.57 8197.08 2334.19 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="3" node-id="296" stroke="none" target-height="1610.03" target-width="1250.3403" target-x="7953.31" target-y="2276.46"></path><path d="M 7974.30 8637.88 C 7972.87 8663.64 8337.10 8684.39 8787.67 8684.39 C 9238.24 8684.39 9605.08 8663.64 9606.52 8637.88 C 9607.95 8612.11 9243.96 8591.60 8793.15 8591.60 C 8342.34 8591.60 7975.97 8612.35 7974.30 8637.88 Z" fill="#e8ecf1" fill-rule="nonzero" group-id="4" node-id="301" stroke="none" target-height="92.79004" target-width="1635.0801" target-x="7972.87" target-y="8591.6"></path><path d="M 8615.47 7961.01 L 8445.10 8026.96 L 8591.85 8406.06 L 8762.22 8340.11 L 8615.47 7961.01 Z" fill="#e58a7b" fill-rule="nonzero" node-id="304" stroke="none" target-height="445.0498" target-width="317.12012" target-x="8445.1" target-y="7961.01"></path><path d="M 9375.15 8454.45 L 9195.54 8454.45 L 9129.71 8038.70 L 9309.32 8038.70 L 9375.15 8454.45 Z" fill="#e58a7b" fill-rule="nonzero" node-id="306" stroke="none" target-height="415.75" target-width="245.44043" target-x="9129.71" target-y="8038.7"></path><path d="M 9183.14 8433.70 L 9384.93 8433.70 C 9388.43 8433.71 9391.81 8434.96 9394.48 8437.23 C 9397.14 8439.50 9398.91 8442.65 9399.48 8446.10 L 9425.48 8605.67 C 9426.02 8609.68 9425.70 8613.75 9424.54 8617.62 C 9423.37 8621.49 9421.38 8625.06 9418.71 8628.09 C 9416.04 8631.12 9412.75 8633.55 9409.06 8635.19 C 9405.37 8636.84 9401.37 8637.67 9397.33 8637.63 C 9326.97 8636.44 9293.10 8632.15 9204.37 8632.15 C 9149.74 8632.15 9037.40 8637.87 8961.55 8637.87 C 8885.70 8637.87 8880.69 8563.45 8911.94 8556.54 C 9052.19 8526.24 9106.57 8484.98 9153.32 8444.91 C 9161.56 8437.67 9172.17 8433.68 9183.14 8433.70 Z" fill="#263238" fill-rule="nonzero" node-id="308" stroke="none" target-height="204.19043" target-width="545.3291" target-x="8880.69" target-y="8433.68"></path><path d="M 8586.83 8372.16 L 8777.65 8316.35 C 8781.05 8315.39 8784.68 8315.62 8787.94 8317.01 C 8791.19 8318.40 8793.87 8320.86 8795.54 8323.98 L 8867.09 8467.09 C 8868.76 8470.72 8869.61 8474.67 8869.58 8478.67 C 8869.56 8482.66 8868.67 8486.60 8866.96 8490.21 C 8865.26 8493.82 8862.79 8497.02 8859.72 8499.58 C 8856.65 8502.13 8853.06 8503.99 8849.21 8505.02 C 8779.80 8524.10 8733.28 8535.79 8646.46 8561.07 C 8586.59 8578.48 8525.53 8606.87 8466.38 8625.71 C 8425.35 8638.83 8328.99 8639.31 8279.14 8639.31 C 8205.43 8639.31 8188.97 8561.55 8220.70 8557.97 C 8300.60 8549.14 8311.34 8553.20 8355.46 8531.02 C 8427.66 8499.46 8493.10 8454.26 8548.19 8397.92 C 8558.58 8386.08 8571.91 8377.19 8586.83 8372.16 Z" fill="#263238" fill-rule="nonzero" node-id="310" stroke="none" target-height="323.91992" target-width="680.64014" target-x="8188.97" target-y="8315.39"></path><path d="M 7199.34 3255.12 L 7001.84 3172.36 L 6920.51 3391.32 C 7001.46 3403.65 7083.81 3403.65 7164.76 3391.32 L 7199.34 3255.12 Z" fill="#e58a7b" fill-rule="nonzero" node-id="312" stroke="none" target-height="231.2898" target-width="278.83008" target-x="6920.51" target-y="3172.36"></path><path d="M 6854.91 3166.63 L 6849.67 3312.13 L 6920.51 3390.84 L 7001.84 3171.88 L 6854.91 3166.63 Z" fill="#e58a7b" fill-rule="nonzero" node-id="314" stroke="none" target-height="224.2102" target-width="152.16992" target-x="6849.67" target-y="3166.63"></path><path d="M 8638.84 7993.20 L 8467.94 8059.18 L 8543.63 8255.22 L 8714.52 8189.24 L 8638.84 7993.20 Z" fill="#cf6f64" fill-rule="nonzero" node-id="316" stroke="none" target-height="262.01953" target-width="246.5791" target-x="8467.94" target-y="7993.2"></path><path d="M 9309.32 8038.70 L 9129.71 8038.70 L 9163.82 8253.14 L 9343.42 8253.14 L 9309.32 8038.70 Z" fill="#cf6f64" fill-rule="nonzero" node-id="318" stroke="none" target-height="214.43945" target-width="213.70996" target-x="9129.71" target-y="8038.7"></path><path d="M 8064.94 3613.38 C 8068.52 3656.56 8072.57 3700.68 8077.82 3746.00 L 8791.96 3514.16 C 8903.48 3481.11 9000.41 3411.02 9066.74 3315.47 C 9069.60 3251.78 9073.18 3184.76 9078.66 3114.87 C 9081.05 3081.00 9083.91 3046.18 9087.01 3010.88 C 9090.11 2975.57 9094.41 2936.46 9098.94 2898.77 L 8064.94 3613.38 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="5" node-id="322" stroke="none" target-height="847.23" target-width="1034.0005" target-x="8064.94" target-y="2898.77"></path><path d="M 8298.22 2831.03 L 8274.36 2828.17 C 8288.44 2708.91 8377.41 2614.93 8471.15 2617.31 L 8471.15 2641.17 C 8389.09 2639.50 8310.86 2724.17 8298.22 2831.03 Z" fill="#ffffff" fill-rule="nonzero" node-id="325" stroke="none" target-height="216.1001" target-width="196.79004" target-x="8274.36" target-y="2614.93"></path><path d="M 8425.35 3051.19 L 8421.29 3051.19 L 8421.29 3027.33 C 8503.35 3030.43 8580.39 2944.81 8593.03 2838.19 L 8616.88 2841.05 C 8604.24 2957.69 8518.14 3051.19 8425.35 3051.19 Z" fill="#ffffff" fill-rule="nonzero" node-id="327" stroke="none" target-height="213" target-width="195.58984" target-x="8421.29" target-y="2838.19"></path><path d="M 8871.15 1824.70 C 8837.52 1956.13 8797.92 2196.80 8884.51 2284.34 C 8884.51 2284.34 8823.92 2417.67 8579.91 2417.67 C 8356.89 2417.67 8476.39 2284.34 8476.39 2284.34 C 8624.75 2249.51 8627.38 2141.22 8607.82 2038.66 L 8871.15 1824.70 Z" fill="#e58a7b" fill-rule="nonzero" node-id="329" stroke="none" target-height="592.97" target-width="527.6201" target-x="8356.89" target-y="1824.7"></path><path d="M 8763.81 1912.00 L 8608.06 2038.66 C 8612.89 2062.22 8615.68 2086.17 8616.41 2110.21 C 8661.96 2155.53 8753.32 2040.80 8762.62 1982.13 C 8767.35 1959.03 8767.75 1935.25 8763.81 1912.00 Z" fill="#cf6f64" fill-rule="nonzero" node-id="331" stroke="none" target-height="243.53003" target-width="159.69043" target-x="8608.06" target-y="1912"></path><path d="M 8340.20 1823.03 C 8351.03 1841.82 8365.63 1858.16 8383.07 1871.05 C 8400.52 1883.94 8420.43 1893.09 8441.57 1897.93 C 8498.81 1910.57 8527.44 1857.86 8511.70 1804.90 C 8497.62 1757.20 8450.63 1693.04 8392.43 1704.01 C 8379.97 1706.58 8368.30 1712.10 8358.40 1720.10 C 8348.50 1728.11 8340.67 1738.37 8335.56 1750.02 C 8330.44 1761.68 8328.19 1774.39 8329.00 1787.09 C 8329.81 1799.79 8333.65 1812.12 8340.20 1823.03 Z" fill="#cf6f64" fill-rule="nonzero" node-id="333" stroke="none" target-height="217.5299" target-width="199.25" target-x="8328.19" target-y="1693.04"></path><path d="M 8434.89 1402.51 C 8345.68 1443.30 8314.20 1797.75 8426.30 1850.22 C 8538.41 1902.70 8603.77 1324.99 8434.89 1402.51 Z" fill="#263238" fill-rule="nonzero" node-id="335" stroke="none" target-height="577.70996" target-width="289.56934" target-x="8314.2" target-y="1324.99"></path><path d="M 8898.34 1626.97 C 8876.87 1804.90 8874.49 1909.62 8779.08 2000.73 C 8749.51 2030.97 8712.17 2052.45 8671.17 2062.79 C 8630.16 2073.14 8587.10 2071.96 8546.73 2059.37 C 8506.35 2046.79 8470.24 2023.29 8442.39 1991.48 C 8414.53 1959.66 8396.00 1920.76 8388.86 1879.08 C 8359.99 1719.27 8399.83 1455.23 8578.24 1384.39 C 8615.73 1367.85 8656.96 1361.65 8697.65 1366.41 C 8738.34 1371.17 8777.02 1386.73 8809.68 1411.48 C 8842.33 1436.23 8867.77 1469.26 8883.36 1507.15 C 8898.95 1545.03 8904.12 1586.40 8898.34 1626.97 Z" fill="#e58a7b" fill-rule="nonzero" node-id="337" stroke="none" target-height="711.48987" target-width="544.1299" target-x="8359.99" target-y="1361.65"></path><path d="M 8605.20 1494.59 C 8737.34 1460.95 8834.42 1438.06 8799.59 1548.01 C 8753.56 1694.94 8698.22 1837.10 8772.40 1843.54 C 8817.72 1847.60 9018.08 1762.69 8992.56 1676.58 C 8970.37 1601.68 9064.11 1581.17 9080.81 1543.24 C 9142.59 1405.85 8965.84 1423.98 8997.33 1340.50 C 9028.81 1257.02 8854.21 1122.49 8758.80 1189.51 C 8603.53 1297.80 8337.10 1296.13 8477.11 1117.96 C 8577.53 990.83 8398.40 1016.82 8398.40 1016.82 C 8398.40 1016.82 8506.69 1080.99 8324.45 1180.21 C 8131.73 1286.12 8308.47 1570.67 8605.20 1494.59 Z" fill="#263238" fill-rule="nonzero" node-id="339" stroke="none" target-height="856.77496" target-width="1010.85986" target-x="8131.73" target-y="990.825"></path><path d="M 8968.47 1823.03 C 8942.38 1860.78 8903.19 1887.48 8858.51 1897.93 C 8799.59 1910.57 8776.93 1857.86 8799.12 1804.90 C 8818.91 1757.20 8873.30 1693.04 8929.59 1704.01 C 8985.88 1714.98 8998.76 1776.28 8968.47 1823.03 Z" fill="#e58a7b" fill-rule="nonzero" node-id="341" stroke="none" target-height="217.5299" target-width="221.83008" target-x="8776.93" target-y="1693.04"></path><path d="M 8095.47 3886.49 C 8095.47 3886.49 7934.23 5329.56 7921.59 5877.21 C 7908.71 6446.80 8468.05 8224.04 8468.05 8224.04 L 8754.27 8104.77 C 8754.27 8104.77 8420.34 6480.91 8468.05 5921.57 C 8518.61 5311.67 8727.56 3887.45 8727.56 3887.45 L 8095.47 3886.49 Z" fill="#429cfd" fill-rule="nonzero" node-id="343" stroke="none" target-height="4337.55" target-width="845.5596" target-x="7908.71" target-y="3886.49"></path><path d="M 8496.19 4282.68 C 8367.63 4549.35 8454.21 5076.72 8523.86 5389.19 C 8550.34 5168.56 8581.82 4929.08 8611.64 4707.49 C 8608.77 4366.88 8582.30 4103.79 8496.19 4282.68 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="6" node-id="347" stroke="none" target-height="1285.3999" target-width="244.00977" target-x="8367.63" target-y="4103.79"></path><path d="M 8741.63 8010.32 C 8743.06 8010.32 8775.50 8101.44 8775.50 8101.44 L 8445.39 8240.26 L 8393.39 8143.42 L 8741.63 8010.32 Z" fill="#429cfd" fill-rule="nonzero" node-id="350" stroke="none" target-height="229.93994" target-width="382.11035" target-x="8393.39" target-y="8010.32"></path><path d="M 8436.32 3886.49 C 8436.32 3886.49 8559.64 5258.96 8641.21 5772.97 C 8730.90 6336.13 9082.48 8211.63 9082.48 8211.63 L 9411.40 8211.63 C 9411.40 8211.63 9214.38 6381.68 9177.17 5824.02 C 9136.63 5219.12 9056.00 3886.49 9056.00 3886.49 L 8436.32 3886.49 Z" fill="#429cfd" fill-rule="nonzero" node-id="352" stroke="none" target-height="4325.1396" target-width="975.0801" target-x="8436.32" target-y="3886.49"></path><path d="M 9416.41 8126.00 C 9417.84 8126.00 9427.38 8217.83 9427.38 8217.83 L 9065.78 8217.83 L 9040.02 8112.41 L 9416.41 8126.00 Z" fill="#429cfd" fill-rule="nonzero" node-id="354" stroke="none" target-height="105.41992" target-width="387.36035" target-x="9040.02" target-y="8112.41"></path><path d="M 9290.47 8017.24 C 9289.73 8017.25 9289.00 8016.99 9288.43 8016.50 C 9287.86 8016.02 9287.49 8015.35 9287.37 8014.61 C 9285.46 7997.92 9107.76 6344.95 9074.37 5844.05 C 9038.12 5300.70 8965.13 4095.44 8964.41 4083.28 C 8964.38 4082.88 8964.43 4082.48 8964.56 4082.11 C 8964.69 4081.73 8964.89 4081.39 8965.16 4081.10 C 8965.43 4080.81 8965.76 4080.57 8966.12 4080.41 C 8966.48 4080.26 8966.88 4080.17 8967.27 4080.18 C 8968.06 4080.17 8968.81 4080.47 8969.39 4081.00 C 8969.96 4081.53 8970.31 4082.26 8970.37 4083.04 C 8970.37 4095.20 9044.08 5299.51 9080.33 5843.82 C 9113.73 6344.71 9291.43 7996.49 9293.10 8014.38 C 9293.16 8014.77 9293.15 8015.17 9293.05 8015.56 C 9292.95 8015.95 9292.77 8016.31 9292.53 8016.63 C 9292.28 8016.94 9291.97 8017.20 9291.61 8017.39 C 9291.26 8017.58 9290.87 8017.69 9290.47 8017.71 L 9290.47 8017.24 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="7" node-id="358" stroke="none" target-height="3937.54" target-width="328.78027" target-x="8964.38" target-y="4080.17"></path><path d="M 8625.47 1676.58 C 8625.47 1691.13 8616.41 1702.82 8606.87 1702.82 C 8597.32 1702.82 8590.41 1691.13 8591.36 1676.58 C 8592.32 1662.03 8600.43 1650.34 8609.97 1650.34 C 8619.51 1650.34 8626.42 1662.27 8625.47 1676.58 Z" fill="#263238" fill-rule="nonzero" node-id="361" stroke="none" target-height="52.47998" target-width="36.009766" target-x="8590.41" target-y="1650.34"></path><path d="M 8461.84 1676.58 C 8461.84 1691.13 8452.54 1702.82 8443.24 1702.82 C 8433.94 1702.82 8426.78 1691.13 8427.50 1676.58 C 8428.21 1662.03 8436.80 1650.34 8446.34 1650.34 C 8455.88 1650.34 8462.80 1662.27 8461.84 1676.58 Z" fill="#263238" fill-rule="nonzero" node-id="363" stroke="none" target-height="52.47998" target-width="36.01953" target-x="8426.78" target-y="1650.34"></path><path d="M 8513.36 1683.97 C 8493.45 1728.40 8467.79 1770.02 8437.04 1807.77 C 8460.89 1831.62 8505.49 1820.65 8505.49 1820.65 L 8513.36 1683.97 Z" fill="#df5753" fill-rule="nonzero" node-id="365" stroke="none" target-height="147.65002" target-width="76.32031" target-x="8437.04" target-y="1683.97"></path><path d="M 8517.66 1881.47 C 8517.10 1881.47 8516.56 1881.36 8516.05 1881.14 C 8515.54 1880.92 8515.08 1880.60 8514.70 1880.20 C 8514.32 1879.80 8514.03 1879.32 8513.84 1878.80 C 8513.65 1878.28 8513.57 1877.73 8513.60 1877.18 C 8513.66 1876.02 8514.17 1874.92 8515.01 1874.12 C 8515.86 1873.33 8516.97 1872.88 8518.13 1872.88 C 8536.38 1873.01 8554.42 1869.05 8570.93 1861.29 C 8587.44 1853.53 8602.00 1842.17 8613.54 1828.04 C 8614.37 1827.32 8615.43 1826.92 8616.53 1826.92 C 8617.62 1826.92 8618.68 1827.32 8619.51 1828.04 C 8620.28 1828.84 8620.71 1829.91 8620.71 1831.02 C 8620.71 1832.13 8620.28 1833.20 8619.51 1834.00 C 8607.15 1849.02 8591.59 1861.07 8573.97 1869.29 C 8556.34 1877.50 8537.10 1881.66 8517.66 1881.47 Z" fill="#263238" fill-rule="nonzero" node-id="367" stroke="none" target-height="54.73999" target-width="107.13965" target-x="8513.57" target-y="1826.92"></path><path d="M 8654.57 1632.69 C 8653.43 1633.28 8652.16 1633.58 8650.87 1633.58 C 8649.59 1633.58 8648.32 1633.28 8647.18 1632.69 C 8638.25 1626.92 8628.10 1623.33 8617.53 1622.21 C 8606.97 1621.10 8596.29 1622.48 8586.35 1626.25 C 8585.38 1626.73 8584.33 1627.02 8583.25 1627.09 C 8582.17 1627.16 8581.08 1627.01 8580.06 1626.66 C 8579.04 1626.30 8578.10 1625.74 8577.29 1625.02 C 8576.49 1624.29 8575.84 1623.41 8575.38 1622.43 C 8574.49 1620.31 8574.47 1617.93 8575.32 1615.79 C 8576.17 1613.65 8577.81 1611.93 8579.91 1610.98 C 8592.38 1605.89 8605.90 1603.88 8619.31 1605.13 C 8632.72 1606.37 8645.64 1610.84 8656.96 1618.14 C 8657.87 1618.76 8658.65 1619.56 8659.25 1620.49 C 8659.86 1621.41 8660.27 1622.45 8660.47 1623.54 C 8660.67 1624.62 8660.65 1625.74 8660.42 1626.82 C 8660.18 1627.90 8659.74 1628.92 8659.10 1629.83 C 8657.90 1631.20 8656.32 1632.19 8654.57 1632.69 Z" fill="#263238" fill-rule="nonzero" node-id="369" stroke="none" target-height="29.699951" target-width="86.200195" target-x="8574.47" target-y="1603.88"></path><path d="M 8398.63 1584.99 C 8397.36 1584.68 8396.21 1584.02 8395.30 1583.08 C 8394.50 1582.30 8393.87 1581.37 8393.44 1580.35 C 8393.01 1579.32 8392.79 1578.22 8392.79 1577.11 C 8392.79 1576.00 8393.01 1574.90 8393.44 1573.88 C 8393.87 1572.86 8394.50 1571.93 8395.30 1571.15 C 8404.44 1560.90 8415.82 1552.89 8428.57 1547.76 C 8441.31 1542.63 8455.06 1540.51 8468.76 1541.57 C 8469.86 1541.74 8470.91 1542.14 8471.85 1542.73 C 8472.79 1543.32 8473.60 1544.10 8474.22 1545.02 C 8474.85 1545.93 8475.28 1546.97 8475.49 1548.06 C 8475.70 1549.15 8475.68 1550.27 8475.44 1551.35 C 8474.93 1553.56 8473.63 1555.51 8471.78 1556.83 C 8469.94 1558.14 8467.68 1558.74 8465.42 1558.51 C 8454.58 1557.83 8443.73 1559.62 8433.69 1563.75 C 8423.65 1567.88 8414.68 1574.25 8407.46 1582.36 C 8406.37 1583.57 8404.97 1584.45 8403.42 1584.92 C 8401.86 1585.38 8400.20 1585.40 8398.63 1584.99 Z" fill="#263238" fill-rule="nonzero" node-id="371" stroke="none" target-height="44.890015" target-width="82.91016" target-x="8392.79" target-y="1540.51"></path><path d="M 9295.96 2559.83 L 9047.89 2493.76 C 9047.89 2493.76 8804.60 3092.69 8718.49 3131.57 C 8601.62 3185.00 8305.61 3370.09 8179.67 3457.63 C 8172.75 3487.44 8178.24 3566.40 8193.98 3588.10 C 8408.65 3548.98 8819.63 3390.84 8905.50 3310.46 C 9101.32 3127.04 9295.96 2559.83 9295.96 2559.83 Z" fill="#e58a7b" fill-rule="nonzero" node-id="373" stroke="none" target-height="1094.3401" target-width="1123.21" target-x="8172.75" target-y="2493.76"></path><path d="M 9122.79 8465.18 C 9110.69 8466.14 9098.63 8462.85 9088.68 8455.88 C 9085.61 8453.11 9083.31 8449.58 9082.02 8445.65 C 9080.72 8441.72 9080.47 8437.52 9081.29 8433.46 C 9081.44 8430.93 9082.27 8428.48 9083.70 8426.38 C 9085.13 8424.28 9087.10 8422.61 9089.40 8421.53 C 9109.43 8411.28 9165.49 8446.82 9171.93 8450.87 C 9172.63 8451.31 9173.18 8451.96 9173.48 8452.74 C 9173.78 8453.51 9173.82 8454.37 9173.60 8455.17 C 9173.39 8456.00 9172.98 8456.76 9172.39 8457.39 C 9171.81 8458.02 9171.07 8458.48 9170.26 8458.74 C 9154.71 8462.56 9138.80 8464.72 9122.79 8465.18 Z M 9098.94 8427.97 C 9097.13 8427.57 9095.26 8427.57 9093.45 8427.97 C 9092.54 8428.44 9091.78 8429.16 9091.27 8430.05 C 9090.76 8430.94 9090.53 8431.96 9090.59 8432.98 C 9089.95 8435.76 9090.06 8438.65 9090.90 8441.37 C 9091.74 8444.10 9093.28 8446.55 9095.36 8448.49 C 9104.66 8456.84 9128.04 8457.79 9158.81 8451.83 C 9140.49 8439.76 9119.85 8431.64 9098.22 8427.97 L 9098.94 8427.97 Z" fill="#429cfd" fill-rule="nonzero" node-id="375" stroke="none" target-height="54.859375" target-width="93.350586" target-x="9080.47" target-y="8411.28"></path><path d="M 9169.06 8458.74 C 9168.44 8458.94 9167.78 8458.94 9167.16 8458.74 C 9149.27 8448.72 9115.64 8409.37 9120.64 8389.33 C 9121.39 8386.16 9123.19 8383.32 9125.74 8381.29 C 9128.29 8379.26 9131.45 8378.14 9134.72 8378.12 C 9137.92 8377.69 9141.17 8377.96 9144.26 8378.91 C 9147.35 8379.86 9150.20 8381.46 9152.61 8383.61 C 9172.40 8400.54 9173.60 8452.54 9173.60 8455.16 C 9173.71 8455.95 9173.56 8456.75 9173.17 8457.44 C 9172.79 8458.13 9172.18 8458.67 9171.45 8458.98 C 9170.65 8459.14 9169.82 8459.06 9169.06 8458.74 Z M 9137.10 8385.99 L 9135.43 8385.99 C 9129.95 8385.99 9129.23 8389.09 9128.99 8390.29 C 9126.13 8401.97 9147.36 8431.79 9165.01 8445.86 C 9164.93 8425.71 9158.69 8406.07 9147.12 8389.57 C 9144.35 8387.16 9140.77 8385.88 9137.10 8385.99 Z" fill="#429cfd" fill-rule="nonzero" node-id="377" stroke="none" target-height="81.44922" target-width="58.070313" target-x="9115.64" target-y="8377.69"></path><path d="M 8489.51 8435.37 C 8474.92 8440.46 8459.03 8440.46 8444.43 8435.37 C 8441.12 8433.57 8438.31 8430.97 8436.26 8427.80 C 8434.22 8424.63 8433.01 8421.00 8432.74 8417.24 C 8432.44 8414.88 8432.74 8412.49 8433.62 8410.27 C 8434.50 8408.06 8435.92 8406.11 8437.75 8404.60 C 8456.83 8387.42 8534.83 8404.60 8543.66 8407.94 C 8544.50 8408.15 8545.24 8408.65 8545.76 8409.34 C 8546.28 8410.04 8546.55 8410.89 8546.52 8411.75 C 8546.55 8412.65 8546.32 8413.53 8545.86 8414.30 C 8545.39 8415.06 8544.71 8415.67 8543.90 8416.05 C 8526.33 8423.98 8508.14 8430.44 8489.51 8435.37 Z M 8450.63 8406.98 C 8447.91 8407.53 8445.36 8408.76 8443.24 8410.56 C 8442.48 8411.13 8441.90 8411.90 8441.56 8412.79 C 8441.22 8413.68 8441.14 8414.64 8441.33 8415.57 C 8441.49 8418.07 8442.27 8420.50 8443.60 8422.62 C 8444.93 8424.75 8446.78 8426.51 8448.96 8427.74 C 8461.60 8434.41 8490.94 8429.17 8528.87 8413.19 C 8503.32 8406.74 8476.87 8404.65 8450.63 8406.98 Z" fill="#429cfd" fill-rule="nonzero" node-id="379" stroke="none" target-height="53.04004" target-width="114.109375" target-x="8432.44" target-y="8387.42"></path><path d="M 8543.18 8416.05 L 8541.27 8416.05 C 8517.42 8411.75 8469.71 8384.32 8468.28 8363.81 C 8468.28 8359.04 8470.43 8352.36 8481.88 8348.55 C 8485.75 8347.17 8489.85 8346.58 8493.95 8346.83 C 8498.05 8347.08 8502.06 8348.15 8505.73 8349.98 C 8531.49 8362.62 8545.09 8408.41 8545.80 8410.56 C 8545.97 8411.28 8545.95 8412.03 8545.74 8412.75 C 8545.53 8413.46 8545.14 8414.10 8544.61 8414.62 C 8544.26 8415.20 8543.76 8415.69 8543.18 8416.05 Z M 8486.65 8355.70 L 8484.27 8355.70 C 8476.87 8358.32 8476.87 8361.43 8476.87 8362.38 C 8476.87 8374.78 8511.46 8397.44 8535.55 8405.08 C 8530.00 8385.92 8518.26 8369.14 8502.15 8357.37 C 8497.36 8354.93 8491.85 8354.34 8486.65 8355.70 Z" fill="#429cfd" fill-rule="nonzero" node-id="381" stroke="none" target-height="69.46973" target-width="77.68945" target-x="8468.28" target-y="8346.58"></path><path d="M 8199.95 3443.56 L 7951.17 3558.05 L 7922.30 3629.60 L 8014.14 3691.38 C 8014.14 3691.38 8185.87 3672.78 8234.77 3562.34 L 8199.95 3443.56 Z" fill="#e58a7b" fill-rule="nonzero" node-id="383" stroke="none" target-height="247.81982" target-width="312.46973" target-x="7922.3" target-y="3443.56"></path><path d="M 8210.44 3592.16 C 8204.88 3544.36 8189.10 3498.31 8164.17 3457.15 L 8203.52 3427.58 C 8233.13 3475.00 8252.01 3528.32 8258.86 3583.81 L 8210.44 3592.16 Z" fill="#263238" fill-rule="nonzero" node-id="385" stroke="none" target-height="164.57983" target-width="94.69043" target-x="8164.17" target-y="3427.58"></path><path d="M 8252.90 3477.43 C 8258.16 3485.70 8260.74 3495.39 8260.30 3505.18 C 8259.85 3514.98 8256.40 3524.39 8250.42 3532.16 C 8244.43 3539.92 8236.20 3545.65 8226.84 3548.57 C 8217.48 3551.48 8207.45 3551.45 8198.12 3548.46 C 8188.78 3545.48 8180.59 3539.69 8174.66 3531.88 C 8168.73 3524.08 8165.34 3514.64 8164.97 3504.84 C 8164.60 3495.05 8167.25 3485.37 8172.57 3477.14 C 8177.89 3468.90 8185.62 3462.51 8194.70 3458.82 C 8204.89 3453.63 8216.73 3452.67 8227.62 3456.15 C 8238.52 3459.64 8247.61 3467.28 8252.90 3477.43 Z" fill="#263238" fill-rule="nonzero" node-id="387" stroke="none" target-height="98.81006" target-width="96.14014" target-x="8164.6" target-y="3452.67"></path><path d="M 7783.01 3650.60 L 7816.16 3683.99 L 8039.42 3588.58 L 7951.17 3558.05 L 7783.01 3650.60 Z" fill="#e58a7b" fill-rule="nonzero" node-id="389" stroke="none" target-height="125.93994" target-width="256.41016" target-x="7783.01" target-y="3558.05"></path><path d="M 8741.63 8010.32 C 8743.06 8010.32 8775.50 8101.44 8775.50 8101.44 L 8445.39 8240.26 L 8393.39 8143.42 L 8741.63 8010.32 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="8" node-id="393" stroke="none" target-height="229.93994" target-width="382.11035" target-x="8393.39" target-y="8010.32"></path><path d="M 9416.41 8126.00 C 9417.84 8126.00 9427.38 8217.83 9427.38 8217.83 L 9065.78 8217.83 L 9040.02 8112.41 L 9416.41 8126.00 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="9" node-id="398" stroke="none" target-height="105.41992" target-width="387.36035" target-x="9040.02" target-y="8112.41"></path><path d="M 9360.60 2491.13 C 9426.19 2702.70 9169.78 2992.03 9169.78 2992.03 L 8815.57 2847.49 C 8857.56 2725.20 8905.97 2605.22 8960.60 2488.03 C 9069.36 2253.56 9294.29 2277.66 9360.60 2491.13 Z" fill="#429cfd" fill-rule="nonzero" node-id="401" stroke="none" target-height="738.47" target-width="610.6201" target-x="8815.57" target-y="2253.56"></path><path d="M 9360.60 2491.13 C 9426.19 2702.70 9169.78 2992.03 9169.78 2992.03 L 8815.57 2847.49 C 8857.56 2725.20 8905.97 2605.22 8960.60 2488.03 C 9069.36 2253.56 9294.29 2277.66 9360.60 2491.13 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="10" node-id="405" stroke="none" target-height="738.47" target-width="610.6201" target-x="8815.57" target-y="2253.56"></path><path d="M 5840.95 371.38 L 5688.54 371.38 L 5688.54 395.95 L 5840.95 395.95 L 5840.95 371.38 Z" fill="#429cfd" fill-rule="nonzero" node-id="408" stroke="none" target-height="24.567993" target-width="152.41016" target-x="5688.54" target-y="371.381"></path><path d="M 7813.97 1343.76 L 7795.52 1753.12 L 7820.07 1754.23 L 7838.51 1344.86 L 7813.97 1343.76 Z" fill="#429cfd" fill-rule="nonzero" node-id="410" stroke="none" target-height="410.46997" target-width="42.989746" target-x="7795.52" target-y="1343.76"></path><path d="M 7766.55 481.58 L 4951.98 481.58 L 4690.08 6342.57 L 7504.65 6342.57 L 7766.55 481.58 Z" fill="#429cfd" fill-rule="nonzero" node-id="412" stroke="none" target-height="5860.9917" target-width="3076.4697" target-x="4690.08" target-y="481.578"></path><path d="M 7682.59 562.20 L 4868.02 562.20 L 4606.12 6423.19 L 7420.69 6423.19 L 7682.59 562.20 Z" fill="#fafafa" fill-opacity="0.56" fill-rule="nonzero" group-id="11" node-id="416" stroke="none" target-height="5860.991" target-width="3076.4697" target-x="4606.12" target-y="562.199"></path><path d="M 7598.63 642.58 L 4784.06 642.58 L 4521.92 6503.57 L 7336.49 6503.57 L 7598.63 642.58 Z" fill="#429cfd" fill-opacity="0.07" fill-rule="nonzero" group-id="12" node-id="421" stroke="none" target-height="5860.988" target-width="3076.71" target-x="4521.92" target-y="642.582"></path><path d="M 7278.29 3198.83 L 4875.89 3198.83 L 4855.85 3647.26 L 7258.26 3647.26 L 7278.29 3198.83 Z" fill="#ffffff" fill-rule="nonzero" node-id="424" stroke="none" target-height="448.42993" target-width="2422.44" target-x="4855.85" target-y="3198.83"></path><path d="M 6197.07 2871.58 L 4890.44 2871.58 L 4881.61 3072.18 L 6188.24 3072.18 L 6197.07 2871.58 Z" fill="#429cfd" fill-rule="nonzero" node-id="426" stroke="none" target-height="200.59985" target-width="1315.46" target-x="4881.61" target-y="2871.58"></path><path d="M 7224.15 4409.10 L 4821.74 4409.10 L 4801.71 4857.52 L 7204.11 4857.52 L 7224.15 4409.10 Z" fill="#ffffff" fill-rule="nonzero" node-id="428" stroke="none" target-height="448.41992" target-width="2422.44" target-x="4801.71" target-y="4409.1"></path><path d="M 6783.60 5463.13 L 5168.08 5463.13 L 5143.99 6000.53 L 6759.51 6000.53 L 6783.60 5463.13 Z" fill="#429cfd" fill-opacity="0.47" fill-rule="nonzero" group-id="13" node-id="432" stroke="none" target-height="537.3999" target-width="1639.6099" target-x="5143.99" target-y="5463.13"></path><path d="M 6675.54 6084.01 L 5060.03 6084.01 C 5059.32 6084.19 5058.59 6084.19 5057.88 6084.01 C 5057.65 6083.31 5057.65 6082.56 5057.88 6081.86 L 5081.73 5544.23 C 5081.73 5543.86 5081.81 5543.50 5081.95 5543.17 C 5082.10 5542.83 5082.31 5542.53 5082.58 5542.29 C 5082.85 5542.04 5083.17 5541.85 5083.52 5541.73 C 5083.86 5541.62 5084.23 5541.57 5084.60 5541.61 L 6700.11 5541.61 C 6700.41 5541.46 6700.74 5541.38 6701.07 5541.38 C 6701.40 5541.38 6701.72 5541.46 6702.02 5541.61 C 6702.19 5541.90 6702.28 5542.23 6702.28 5542.56 C 6702.28 5542.90 6702.19 5543.22 6702.02 5543.51 L 6678.65 6082.34 C 6678.36 6082.90 6677.91 6083.36 6677.35 6083.66 C 6676.80 6083.95 6676.17 6084.08 6675.54 6084.01 Z M 5062.89 6078.28 L 6672.68 6078.28 L 6696.53 5546.38 L 5086.74 5546.38 L 5062.89 6078.28 Z" fill="#ffffff" fill-rule="nonzero" node-id="435" stroke="none" target-height="542.81006" target-width="1644.6299" target-x="5057.65" target-y="5541.38"></path><path d="M 5914.89 4081.85 L 4836.29 4081.85 L 4827.47 4282.68 L 5905.83 4282.68 L 5914.89 4081.85 Z" fill="#429cfd" fill-rule="nonzero" node-id="437" stroke="none" target-height="200.83008" target-width="1087.4199" target-x="4827.47" target-y="4081.85"></path><path d="M 6752.83 1750.28 C 6746.66 1880.79 6700.25 2006.19 6619.97 2109.26 C 6560.54 2187.12 6484.06 2250.32 6396.41 2294.03 C 6308.75 2337.73 6212.25 2360.77 6114.30 2361.38 C 6035.15 2361.98 5956.72 2346.38 5883.83 2315.52 C 5810.94 2284.66 5745.14 2239.21 5690.48 2181.96 C 5635.82 2124.71 5593.46 2056.87 5566.01 1982.63 C 5538.56 1908.39 5526.61 1829.32 5530.87 1750.28 C 5539.26 1586.28 5609.99 1431.67 5728.59 1318.08 C 5847.19 1204.49 6004.70 1140.49 6168.92 1139.19 C 6248.13 1138.45 6326.65 1153.96 6399.63 1184.76 C 6472.61 1215.57 6538.49 1261.01 6593.22 1318.28 C 6647.94 1375.55 6690.34 1443.44 6717.79 1517.74 C 6745.24 1592.05 6757.17 1671.19 6752.83 1750.28 Z" fill="#ffffff" fill-rule="nonzero" node-id="439" stroke="none" target-height="1223.53" target-width="1230.56" target-x="5526.61" target-y="1138.45"></path><path d="M 6810.31 1267.03 C 6808.75 1301.74 6796.41 1335.09 6775.01 1362.44 C 6759.17 1383.12 6738.82 1399.91 6715.50 1411.53 C 6692.19 1423.14 6666.53 1429.28 6640.48 1429.47 C 6615.25 1429.62 6590.36 1423.59 6567.99 1411.91 C 6545.62 1400.23 6526.45 1383.24 6512.16 1362.44 C 6493.23 1334.34 6483.86 1300.88 6485.44 1267.03 C 6487.75 1223.49 6506.58 1182.46 6538.09 1152.33 C 6569.60 1122.19 6611.43 1105.20 6655.03 1104.84 C 6676.07 1104.65 6696.92 1108.76 6716.30 1116.94 C 6735.69 1125.11 6753.19 1137.17 6767.74 1152.36 C 6782.29 1167.56 6793.57 1185.57 6800.89 1205.29 C 6808.21 1225.01 6811.42 1246.03 6810.31 1267.03 Z" fill="#429cfd" fill-rule="nonzero" node-id="441" stroke="none" target-height="324.96997" target-width="327.56006" target-x="6483.86" target-y="1104.65"></path><path d="M 5134.69 3423.05 C 5133.54 3442.27 5125.15 3460.34 5111.21 3473.62 C 5097.26 3486.90 5078.80 3494.40 5059.55 3494.60 C 5050.25 3494.71 5041.03 3492.92 5032.46 3489.32 C 5023.89 3485.73 5016.14 3480.41 5009.70 3473.71 C 5003.26 3467.00 4998.27 3459.04 4995.03 3450.33 C 4991.79 3441.62 4990.37 3432.33 4990.86 3423.05 C 4991.89 3403.79 5000.25 3385.65 5014.21 3372.35 C 5028.18 3359.04 5046.70 3351.58 5065.99 3351.49 C 5075.28 3351.41 5084.48 3353.23 5093.04 3356.84 C 5101.60 3360.45 5109.33 3365.76 5115.76 3372.46 C 5122.19 3379.16 5127.19 3387.10 5130.44 3395.80 C 5133.70 3404.50 5135.14 3413.77 5134.69 3423.05 Z" fill="#263238" fill-rule="nonzero" node-id="443" stroke="none" target-height="143.30005" target-width="144.77002" target-x="4990.37" target-y="3351.41"></path><path d="M 5456.21 3423.04 C 5455.12 3442.28 5446.75 3460.39 5432.80 3473.68 C 5418.84 3486.97 5400.35 3494.45 5381.08 3494.60 C 5371.80 3494.68 5362.61 3492.86 5354.06 3489.25 C 5345.52 3485.64 5337.80 3480.32 5331.39 3473.62 C 5324.97 3466.91 5320.00 3458.97 5316.77 3450.27 C 5313.55 3441.57 5312.14 3432.31 5312.62 3423.04 C 5313.66 3403.82 5321.98 3385.72 5335.89 3372.43 C 5349.81 3359.13 5368.27 3351.64 5387.52 3351.49 C 5396.82 3351.38 5406.04 3353.17 5414.61 3356.77 C 5423.18 3360.36 5430.93 3365.68 5437.37 3372.38 C 5443.81 3379.09 5448.80 3387.05 5452.04 3395.76 C 5455.29 3404.47 5456.70 3413.76 5456.21 3423.04 Z" fill="#263238" fill-rule="nonzero" node-id="445" stroke="none" target-height="143.30005" target-width="144.56006" target-x="5312.14" target-y="3351.38"></path><path d="M 5777.98 3423.04 C 5776.89 3442.28 5768.52 3460.39 5754.56 3473.68 C 5740.61 3486.97 5722.12 3494.45 5702.85 3494.60 C 5693.56 3494.68 5684.36 3492.86 5675.80 3489.25 C 5667.24 3485.64 5659.51 3480.33 5653.08 3473.63 C 5646.65 3466.93 5641.65 3458.99 5638.40 3450.29 C 5635.14 3441.59 5633.70 3432.32 5634.15 3423.04 C 5635.24 3403.80 5643.62 3385.70 5657.57 3372.41 C 5671.53 3359.12 5690.02 3351.64 5709.29 3351.49 C 5718.58 3351.38 5727.80 3353.17 5736.38 3356.77 C 5744.95 3360.36 5752.70 3365.68 5759.14 3372.38 C 5765.58 3379.09 5770.57 3387.05 5773.81 3395.76 C 5777.05 3404.47 5778.47 3413.76 5777.98 3423.04 Z" fill="#263238" fill-rule="nonzero" node-id="447" stroke="none" target-height="143.30005" target-width="144.77002" target-x="5633.7" target-y="3351.38"></path><path d="M 5080.54 4633.31 C 5079.40 4652.53 5071.01 4670.60 5057.06 4683.88 C 5043.12 4697.16 5024.66 4704.66 5005.41 4704.87 C 4996.12 4704.94 4986.92 4703.12 4978.36 4699.52 C 4969.80 4695.91 4962.07 4690.60 4955.64 4683.90 C 4949.20 4677.20 4944.21 4669.25 4940.95 4660.56 C 4937.70 4651.86 4936.26 4642.59 4936.71 4633.31 C 4937.80 4614.07 4946.17 4595.97 4960.13 4582.68 C 4974.08 4569.39 4992.58 4561.91 5011.85 4561.75 C 5021.13 4561.68 5030.34 4563.50 5038.90 4567.11 C 5047.45 4570.71 5055.19 4576.03 5061.62 4582.73 C 5068.05 4589.43 5073.04 4597.37 5076.30 4606.07 C 5079.55 4614.76 5081.00 4624.04 5080.54 4633.31 Z" fill="#263238" fill-rule="nonzero" node-id="449" stroke="none" target-height="143.25977" target-width="144.74023" target-x="4936.26" target-y="4561.68"></path><path d="M 5402.07 4633.31 C 5400.98 4652.51 5392.64 4670.58 5378.74 4683.87 C 5364.83 4697.15 5346.40 4704.66 5327.17 4704.87 C 5317.88 4704.98 5308.66 4703.18 5300.08 4699.59 C 5291.51 4695.99 5283.76 4690.68 5277.32 4683.97 C 5270.89 4677.26 5265.89 4669.31 5262.65 4660.59 C 5259.41 4651.88 5257.99 4642.60 5258.48 4633.31 C 5259.57 4614.07 5267.94 4595.97 5281.90 4582.68 C 5295.85 4569.39 5314.34 4561.91 5333.61 4561.75 C 5342.89 4561.68 5352.08 4563.50 5360.63 4567.11 C 5369.18 4570.72 5376.89 4576.04 5383.31 4582.74 C 5389.72 4589.44 5394.69 4597.39 5397.92 4606.08 C 5401.15 4614.78 5402.56 4624.05 5402.07 4633.31 Z" fill="#263238" fill-rule="nonzero" node-id="451" stroke="none" target-height="143.2998" target-width="144.56982" target-x="5257.99" target-y="4561.68"></path><path d="M 5724.55 4633.31 C 5723.46 4652.55 5715.09 4670.66 5701.13 4683.95 C 5687.18 4697.24 5668.69 4704.72 5649.42 4704.87 C 5640.14 4704.91 5630.95 4703.07 5622.41 4699.45 C 5613.87 4695.83 5606.15 4690.51 5599.73 4683.82 C 5593.30 4677.13 5588.30 4669.20 5585.04 4660.52 C 5581.77 4651.84 5580.30 4642.58 5580.72 4633.31 C 5581.87 4614.09 5590.26 4596.02 5604.20 4582.74 C 5618.15 4569.46 5636.60 4561.96 5655.86 4561.75 C 5665.15 4561.64 5674.37 4563.44 5682.95 4567.04 C 5691.52 4570.63 5699.27 4575.94 5705.71 4582.65 C 5712.15 4589.36 5717.14 4597.31 5720.38 4606.03 C 5723.62 4614.74 5725.04 4624.03 5724.55 4633.31 Z" fill="#263238" fill-rule="nonzero" node-id="453" stroke="none" target-height="143.27002" target-width="144.74023" target-x="5580.3" target-y="4561.64"></path><path d="M 6045.61 4633.31 C 6044.46 4652.53 6036.07 4670.60 6022.13 4683.88 C 6008.18 4697.16 5989.72 4704.66 5970.47 4704.87 C 5961.19 4704.91 5952.00 4703.07 5943.46 4699.45 C 5934.92 4695.83 5927.20 4690.51 5920.78 4683.82 C 5914.35 4677.13 5909.36 4669.20 5906.09 4660.52 C 5902.82 4651.83 5901.36 4642.58 5901.78 4633.31 C 5902.92 4614.09 5911.31 4596.02 5925.25 4582.74 C 5939.20 4569.46 5957.66 4561.96 5976.91 4561.75 C 5986.20 4561.68 5995.40 4563.50 6003.96 4567.11 C 6012.52 4570.71 6020.25 4576.03 6026.68 4582.73 C 6033.11 4589.43 6038.11 4597.37 6041.36 4606.07 C 6044.62 4614.76 6046.06 4624.04 6045.61 4633.31 Z" fill="#263238" fill-rule="nonzero" node-id="455" stroke="none" target-height="143.22998" target-width="144.7002" target-x="5901.36" target-y="4561.68"></path><path d="M 6368.57 4633.31 C 6367.42 4652.53 6359.03 4670.60 6345.09 4683.88 C 6331.14 4697.16 6312.68 4704.66 6293.43 4704.87 C 6284.13 4704.98 6274.91 4703.18 6266.34 4699.59 C 6257.77 4695.99 6250.02 4690.68 6243.58 4683.97 C 6237.14 4677.26 6232.15 4669.31 6228.91 4660.59 C 6225.67 4651.88 6224.25 4642.60 6224.74 4633.31 C 6225.83 4614.07 6234.20 4595.97 6248.15 4582.68 C 6262.11 4569.39 6280.60 4561.91 6299.87 4561.75 C 6309.16 4561.68 6318.36 4563.50 6326.92 4567.11 C 6335.48 4570.71 6343.21 4576.03 6349.64 4582.73 C 6356.07 4589.43 6361.07 4597.37 6364.32 4606.07 C 6367.58 4614.76 6369.02 4624.04 6368.57 4633.31 Z" fill="#263238" fill-rule="nonzero" node-id="457" stroke="none" target-height="143.2998" target-width="144.77002" target-x="6224.25" target-y="4561.68"></path><path d="M 6319.75 1718.46 C 6419.58 1620.83 6424.88 1464.34 6331.58 1368.93 C 6238.28 1273.52 6081.71 1275.32 5981.88 1372.95 C 5882.05 1470.58 5876.75 1627.07 5970.05 1722.48 C 6063.35 1817.88 6219.91 1816.08 6319.75 1718.46 Z" fill="#429cfd" fill-rule="nonzero" node-id="459" stroke="none" target-height="544.36" target-width="548.1299" target-x="5876.75" target-y="1273.52"></path><path d="M 6619.97 2109.26 C 6560.54 2187.12 6484.06 2250.32 6396.41 2294.03 C 6308.75 2337.73 6212.24 2360.77 6114.30 2361.38 C 6019.32 2362.18 5925.60 2339.61 5841.41 2295.64 C 5757.22 2251.67 5685.14 2187.66 5631.53 2109.26 C 5747.45 1993.81 5930.88 1918.44 6134.10 1918.44 C 6337.32 1918.44 6514.30 1993.81 6619.97 2109.26 Z" fill="#429cfd" fill-rule="nonzero" node-id="461" stroke="none" target-height="443.74" target-width="988.4404" target-x="5631.53" target-y="1918.44"></path><path d="M 6319.75 1718.46 C 6419.58 1620.83 6424.88 1464.34 6331.58 1368.93 C 6238.28 1273.52 6081.71 1275.32 5981.88 1372.95 C 5882.05 1470.58 5876.75 1627.07 5970.05 1722.48 C 6063.35 1817.88 6219.91 1816.08 6319.75 1718.46 Z" fill="#ffffff" fill-opacity="0.1" fill-rule="nonzero" group-id="14" node-id="465" stroke="none" target-height="544.36" target-width="548.1299" target-x="5876.75" target-y="1273.52"></path><path d="M 6619.97 2109.26 C 6560.54 2187.12 6484.06 2250.32 6396.41 2294.03 C 6308.75 2337.73 6212.24 2360.77 6114.30 2361.38 C 6019.32 2362.18 5925.60 2339.61 5841.41 2295.64 C 5757.22 2251.67 5685.14 2187.66 5631.53 2109.26 C 5747.45 1993.81 5930.88 1918.44 6134.10 1918.44 C 6337.32 1918.44 6514.30 1993.81 6619.97 2109.26 Z" fill="#ffffff" fill-opacity="0.1" fill-rule="nonzero" group-id="15" node-id="470" stroke="none" target-height="443.74" target-width="988.4404" target-x="5631.53" target-y="1918.44"></path><path d="M 3110.58 3755.31 C 3087.92 3804.92 3064.07 3859.54 3043.32 3912.49 C 3022.56 3965.45 3001.34 4020.07 2982.97 4074.45 C 2945.47 4181.63 2916.91 4291.72 2897.58 4403.61 L 2892.33 4438.68 C 2891.83 4444.69 2892.40 4450.75 2894.00 4456.57 C 2899.63 4476.33 2908.50 4495.03 2920.24 4511.90 C 2950.87 4555.57 2986.40 4595.58 3026.14 4631.16 C 3068.04 4670.14 3111.99 4706.84 3157.81 4741.12 C 3203.60 4776.42 3251.79 4810.77 3299.25 4843.21 L 3254.65 4926.93 C 3141.31 4877.55 3033.72 4815.88 2933.83 4743.03 C 2880.54 4704.17 2832.45 4658.63 2790.72 4607.55 C 2765.99 4577.14 2746.70 4542.68 2733.71 4505.70 C 2726.16 4482.60 2722.30 4458.45 2722.26 4434.14 C 2722.26 4428.42 2722.26 4420.07 2722.26 4416.02 L 2722.26 4404.33 L 2724.65 4380.48 C 2738.32 4256.21 2764.45 4133.63 2802.65 4014.58 C 2821.25 3955.91 2841.05 3897.47 2863.71 3840.46 C 2886.37 3783.45 2909.74 3727.64 2938.60 3669.68 L 3110.58 3755.31 Z" fill="#e58a7b" fill-rule="nonzero" node-id="473" stroke="none" target-height="1257.2502" target-width="576.99" target-x="2722.26" target-y="3669.68"></path><path d="M 3265.62 4828.42 L 3434.25 4743.03 L 3390.61 4928.12 C 3390.61 4928.12 3274.92 4960.56 3221.25 4904.27 L 3265.62 4828.42 Z" fill="#e58a7b" fill-rule="nonzero" node-id="475" stroke="none" target-height="217.53027" target-width="213" target-x="3221.25" target-y="4743.03"></path><path d="M 3588.58 4773.32 L 3543.74 4926.46 L 3390.61 4928.12 L 3434.26 4743.03 L 3588.58 4773.32 Z" fill="#e58a7b" fill-rule="nonzero" node-id="477" stroke="none" target-height="185.09033" target-width="197.96997" target-x="3390.61" target-y="4743.03"></path><path d="M 3826.63 2862.28 C 3835.65 2895.33 3848.20 2927.32 3864.07 2957.69 C 3859.44 2962.95 3853.46 2966.85 3846.79 2968.99 C 3840.11 2971.14 3832.98 2971.43 3826.15 2969.85 L 3826.63 2862.28 Z" fill="#df5753" fill-rule="nonzero" node-id="479" stroke="none" target-height="109.1499" target-width="37.920166" target-x="3826.15" target-y="2862.28"></path><path d="M 3821.62 2863.71 C 3831.50 2863.71 3839.51 2851.43 3839.51 2836.28 C 3839.51 2821.13 3831.50 2808.85 3821.62 2808.85 C 3811.74 2808.85 3803.73 2821.13 3803.73 2836.28 C 3803.73 2851.43 3811.74 2863.71 3821.62 2863.71 Z" fill="#263238" fill-rule="nonzero" node-id="481" stroke="none" target-height="54.859863" target-width="35.78003" target-x="3803.73" target-y="2808.85"></path><path d="M 3816.37 2809.80 L 3852.62 2799.54 C 3852.62 2799.54 3834.97 2827.69 3816.37 2809.80 Z" fill="#263238" fill-rule="nonzero" node-id="483" stroke="none" target-height="28.149902" target-width="36.25" target-x="3816.37" target-y="2799.54"></path><path d="M 3360.79 3037.35 C 3382.49 3148.27 3404.20 3351.73 3326.44 3425.91 C 3326.44 3425.91 3356.97 3538.49 3563.30 3538.49 C 3790.13 3538.49 3671.58 3425.91 3671.58 3425.91 C 3547.79 3396.33 3550.89 3304.50 3572.60 3218.15 L 3360.79 3037.35 Z" fill="#e58a7b" fill-rule="nonzero" node-id="485" stroke="none" target-height="501.1399" target-width="463.68994" target-x="3326.44" target-y="3037.35"></path><path d="M 3300.44 2784.52 C 3311.89 2969.85 3312.85 3048.56 3406.35 3143.73 C 3547.31 3286.85 3772.48 3232.47 3816.61 3048.33 C 3856.44 2881.36 3831.16 2606.58 3649.64 2532.88 C 3609.80 2516.46 3566.42 2510.49 3523.63 2515.51 C 3480.83 2520.53 3440.02 2536.39 3405.06 2561.58 C 3370.10 2586.78 3342.14 2620.47 3323.84 2659.48 C 3305.53 2698.49 3297.48 2741.53 3300.44 2784.52 Z" fill="#e58a7b" fill-rule="nonzero" node-id="487" stroke="none" target-height="776.3601" target-width="558.95996" target-x="3297.48" target-y="2510.49"></path><path d="M 3318.81 2576.05 C 3225.79 2609.92 3101.75 2584.64 3150.41 2871.58 C 3201.93 3175.46 3122.74 3275.40 3122.74 3275.40 C 3122.74 3275.40 3475.52 3350.53 3835.69 3270.87 C 3835.69 3270.87 3725.73 3078.62 3756.50 2936.94 C 3795.86 2758.04 3764.85 2691.97 3764.85 2691.97 C 3764.85 2691.97 3449.52 2528.35 3318.81 2576.05 Z" fill="#263238" fill-rule="nonzero" node-id="489" stroke="none" target-height="822.17993" target-width="733.93994" target-x="3101.75" target-y="2528.35"></path><path d="M 3712.37 2881.12 C 3712.47 2916.36 3722.56 2950.85 3741.47 2980.58 C 3766.76 3019.22 3796.57 3004.44 3803.97 2963.41 C 3810.64 2927.39 3805.64 2863.71 3773.43 2838.90 C 3741.23 2814.09 3712.85 2838.42 3712.37 2881.12 Z" fill="#e58a7b" fill-rule="nonzero" node-id="491" stroke="none" target-height="205.12988" target-width="98.269775" target-x="3712.37" target-y="2814.09"></path><path d="M 3237.95 2607.30 C 3211.24 2532.16 3338.61 2416.48 3608.14 2464.18 C 3877.67 2511.89 3889.36 2736.34 3889.36 2736.34 L 3834.97 2671.46 L 3837.36 2739.68 L 3560.43 2792.87 L 3237.95 2607.30 Z" fill="#263238" fill-rule="nonzero" node-id="493" stroke="none" target-height="376.39014" target-width="678.1201" target-x="3211.24" target-y="2416.48"></path><path d="M 3260.85 3438.55 C 3259.26 3427.66 3261.98 3416.58 3268.44 3407.66 C 3274.90 3398.75 3284.59 3392.72 3295.43 3390.84 C 3379.39 3377.01 3570.21 3348.86 3666.10 3362.22 C 3737.66 3372.24 3756.26 3413.74 3759.36 3447.85 C 3759.85 3453.82 3759.05 3459.83 3757.02 3465.47 C 3754.99 3471.11 3751.78 3476.24 3747.60 3480.54 C 3743.42 3484.83 3738.37 3488.18 3732.78 3490.36 C 3727.20 3492.54 3721.22 3493.50 3715.23 3493.17 L 3300.68 3474.56 C 3290.91 3474.07 3281.61 3470.22 3274.35 3463.65 C 3267.09 3457.09 3262.32 3448.22 3260.85 3438.55 Z" fill="#429cfd" fill-rule="nonzero" node-id="495" stroke="none" target-height="144.6399" target-width="500.5901" target-x="3259.26" target-y="3348.86"></path><path d="M 3260.85 3438.55 C 3259.26 3427.66 3261.98 3416.58 3268.44 3407.66 C 3274.90 3398.75 3284.59 3392.72 3295.43 3390.84 C 3379.39 3377.01 3570.21 3348.86 3666.10 3362.22 C 3737.66 3372.24 3756.26 3413.74 3759.36 3447.85 C 3759.85 3453.82 3759.05 3459.83 3757.02 3465.47 C 3754.99 3471.11 3751.78 3476.24 3747.60 3480.54 C 3743.42 3484.83 3738.37 3488.18 3732.78 3490.36 C 3727.20 3492.54 3721.22 3493.50 3715.23 3493.17 L 3300.68 3474.56 C 3290.91 3474.07 3281.61 3470.22 3274.35 3463.65 C 3267.09 3457.09 3262.32 3448.22 3260.85 3438.55 Z" fill="#000000" fill-opacity="0.6" fill-rule="nonzero" group-id="16" node-id="499" stroke="none" target-height="144.6399" target-width="500.5901" target-x="3259.26" target-y="3348.86"></path><path d="M 3500.56 7605.55 L 3654.41 7712.41 L 3911.78 7363.45 L 3757.93 7256.83 L 3500.56 7605.55 Z" fill="#e58a7b" fill-rule="nonzero" node-id="502" stroke="none" target-height="455.58008" target-width="411.21997" target-x="3500.56" target-y="7256.83"></path><path d="M 3141.83 7598.63 L 3304.26 7691.18 L 3532.05 7322.18 L 3369.61 7229.63 L 3141.83 7598.63 Z" fill="#e58a7b" fill-rule="nonzero" node-id="504" stroke="none" target-height="461.5503" target-width="390.21997" target-x="3141.83" target-y="7229.63"></path><path d="M 3911.54 7363.45 L 3778.92 7543.29 L 3625.07 7436.67 L 3757.69 7256.83 L 3911.54 7363.45 Z" fill="#cf6f64" fill-rule="nonzero" node-id="506" stroke="none" target-height="286.45996" target-width="286.46997" target-x="3625.07" target-y="7256.83"></path><path d="M 3369.38 7229.63 L 3532.05 7322.42 L 3414.70 7512.52 L 3252.02 7419.74 L 3369.38 7229.63 Z" fill="#cf6f64" fill-rule="nonzero" node-id="508" stroke="none" target-height="282.89014" target-width="280.03003" target-x="3252.02" target-y="7229.63"></path><path d="M 3630.32 4603.50 C 3630.32 4603.50 4230.92 5360.33 4118.10 6084.25 C 4027.22 6668.87 3500.09 7460.53 3500.09 7460.53 L 3252.26 7337.45 C 3426.94 6987.42 3576.01 6625.19 3698.30 6253.60 C 3736.01 6138.23 3747.02 6015.81 3730.49 5895.57 C 3713.96 5775.32 3670.33 5660.41 3602.89 5559.50 C 3298.54 5115.13 2810.99 5379.65 3138.96 4603.50 L 3630.32 4603.50 Z" fill="#429cfd" fill-rule="nonzero" node-id="510" stroke="none" target-height="2857.0298" target-width="1419.9299" target-x="2810.99" target-y="4603.5"></path><path d="M 3630.32 4603.50 C 3630.32 4603.50 4230.92 5360.33 4118.10 6084.25 C 4027.22 6668.87 3500.09 7460.53 3500.09 7460.53 L 3252.26 7337.45 C 3426.94 6987.42 3576.01 6625.19 3698.30 6253.60 C 3736.01 6138.23 3747.02 6015.81 3730.49 5895.57 C 3713.96 5775.32 3670.33 5660.41 3602.89 5559.50 C 3298.54 5115.13 2810.99 5379.65 3138.96 4603.50 L 3630.32 4603.50 Z" fill="#000000" fill-opacity="0.6" fill-rule="nonzero" group-id="17" node-id="514" stroke="none" target-height="2857.0298" target-width="1419.9299" target-x="2810.99" target-y="4603.5"></path><path d="M 3924.90 5089.61 L 3837.60 5002.78 C 3837.60 5009.70 4006.71 6053.72 4054.18 6347.10 C 4082.19 6261.39 4103.64 6173.68 4118.34 6084.72 C 4174.15 5729.56 4057.52 5366.77 3924.90 5089.61 Z" fill="#000000" fill-opacity="0.4" fill-rule="nonzero" group-id="18" node-id="519" stroke="none" target-height="1344.3203" target-width="336.5498" target-x="3837.6" target-y="5002.78"></path><path d="M 3898.42 4603.50 C 3898.42 4603.50 4621.62 5554.73 4642.14 6125.03 C 4659.07 6602.08 3855.01 7526.36 3855.01 7526.36 L 3621.26 7375.13 C 3621.26 7375.13 4091.86 6718.72 4210.41 6182.52 C 4164.61 5651.09 3196.21 4603.50 3196.21 4603.50 L 3898.42 4603.50 Z" fill="#429cfd" fill-rule="nonzero" node-id="522" stroke="none" target-height="2922.8599" target-width="1462.8599" target-x="3196.21" target-y="4603.5"></path><path d="M 3898.42 4603.50 C 3898.42 4603.50 4621.62 5554.73 4642.14 6125.03 C 4659.07 6602.08 3855.01 7526.36 3855.01 7526.36 L 3621.26 7375.13 C 3621.26 7375.13 4091.86 6718.72 4210.41 6182.52 C 4164.61 5651.09 3196.21 4603.50 3196.21 4603.50 L 3898.42 4603.50 Z" fill="#000000" fill-opacity="0.6" fill-rule="nonzero" group-id="19" node-id="526" stroke="none" target-height="2922.8599" target-width="1462.8599" target-x="3196.21" target-y="4603.5"></path><path d="M 3003.72 3468.36 C 2926.44 3486.73 2852.26 3767.71 2852.26 3767.71 L 3154.47 3969.50 C 3154.47 3969.50 3255.12 3747.20 3219.82 3649.88 C 3183.33 3548.51 3100.80 3445.23 3003.72 3468.36 Z" fill="#429cfd" fill-rule="nonzero" node-id="529" stroke="none" target-height="524.27" target-width="402.8601" target-x="2852.26" target-y="3445.23"></path><path d="M 3062.87 3649.40 L 3041.88 3894.37 L 3154.23 3969.74 C 3185.25 3899.90 3208.22 3826.76 3222.69 3751.73 L 3062.87 3649.40 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="20" node-id="533" stroke="none" target-height="320.3401" target-width="180.81006" target-x="3041.88" target-y="3649.4"></path><path d="M 3987.87 3473.85 C 3987.87 3473.85 4077.07 3505.10 3898.42 4603.26 L 3138.49 4603.26 C 3151.37 4293.18 3151.60 4102.36 3003.72 3468.36 C 3110.13 3446.44 3217.98 3432.25 3326.44 3425.91 C 3441.34 3417.67 3556.68 3417.67 3671.59 3425.91 C 3819.95 3439.50 3987.87 3473.85 3987.87 3473.85 Z" fill="#429cfd" fill-rule="nonzero" node-id="536" stroke="none" target-height="1185.5898" target-width="1073.3501" target-x="3003.72" target-y="3417.67"></path><path d="M 4065.15 3649.40 C 4082.32 3697.11 4100.45 3748.39 4119.53 3797.76 C 4138.61 3847.14 4156.74 3897.94 4176.06 3948.03 L 4234.50 4097.83 L 4249.29 4135.27 L 4256.92 4153.88 L 4260.50 4163.18 C 4260.50 4164.85 4260.50 4164.85 4260.50 4164.61 C 4256.14 4158.47 4250.43 4153.41 4243.80 4149.82 C 4234.37 4144.27 4223.73 4141.08 4212.79 4140.52 C 4203.71 4140.24 4194.67 4141.95 4186.32 4145.53 C 4175.35 4150.54 4175.35 4152.69 4175.58 4152.45 C 4177.57 4150.86 4179.33 4149.01 4180.83 4146.96 C 4194.04 4129.63 4205.46 4111.01 4214.94 4091.39 C 4226.15 4069.44 4236.88 4046.07 4247.62 4022.45 C 4268.61 3974.75 4287.93 3925.37 4307.25 3875.52 C 4326.57 3825.67 4344.94 3775.34 4362.82 3724.54 L 4417.21 3572.36 L 4509.04 3596.21 C 4490.91 3704.98 4467.54 3810.88 4439.39 3918.69 C 4425.79 3972.36 4409.81 4025.55 4391.69 4079.22 C 4382.62 4106.17 4372.60 4132.89 4361.15 4160.32 C 4349.22 4190.09 4334.53 4218.68 4317.27 4245.71 C 4310.92 4254.81 4303.91 4263.42 4296.28 4271.47 C 4284.10 4284.63 4269.31 4295.10 4252.87 4302.24 C 4238.27 4308.51 4222.46 4311.44 4206.59 4310.83 C 4188.81 4310.16 4171.50 4304.99 4156.26 4295.80 C 4138.29 4284.59 4123.38 4269.10 4112.85 4250.72 C 4109.27 4244.52 4106.17 4238.32 4104.03 4233.78 L 4099.50 4224.72 L 4090.43 4206.11 L 4072.30 4169.14 C 4048.45 4119.53 4024.60 4069.44 4003.85 4019.11 C 3983.10 3968.78 3961.15 3917.74 3940.64 3866.46 C 3920.13 3815.18 3901.76 3763.89 3884.35 3708.56 L 4065.15 3649.40 Z" fill="#e58a7b" fill-rule="nonzero" node-id="538" stroke="none" target-height="739.07983" target-width="624.68994" target-x="3884.35" target-y="3572.36"></path><path d="M 3987.87 3473.85 C 4079.22 3495.56 4182.03 3765.56 4182.03 3765.56 L 3910.35 3996.69 C 3910.35 3996.69 3734.56 3702.36 3770.10 3605.28 C 3807.07 3504.14 3868.61 3445.47 3987.87 3473.85 Z" fill="#429cfd" fill-rule="nonzero" node-id="540" stroke="none" target-height="551.22" target-width="447.46973" target-x="3734.56" target-y="3445.47"></path><path d="M 4460.38 3486.97 L 4555.79 3407.30 L 4622.10 3510.58 L 4573.20 3596.69 C 4573.20 3596.69 4495.44 3668.25 4426.75 3631.75 C 4415.85 3607.25 4413.23 3579.85 4419.30 3553.72 C 4425.37 3527.60 4439.79 3504.16 4460.38 3486.97 Z" fill="#e58a7b" fill-rule="nonzero" node-id="542" stroke="none" target-height="260.94995" target-width="208.87012" target-x="4413.23" target-y="3407.3"></path><path d="M 4728.00 3407.54 L 4720.85 3433.54 L 4569.86 3458.82 L 4555.07 3407.30 L 4728.00 3407.54 Z" fill="#e58a7b" fill-rule="nonzero" node-id="544" stroke="none" target-height="51.52002" target-width="172.93018" target-x="4555.07" target-y="3407.3"></path><path d="M 3873.61 7538.52 L 3601.22 7362.49 L 3650.12 7277.58 L 3956.14 7465.77 L 3873.61 7538.52 Z" fill="#429cfd" fill-rule="nonzero" node-id="546" stroke="none" target-height="260.93994" target-width="354.91992" target-x="3601.22" target-y="7277.58"></path><path d="M 3410.88 7678.77 C 3386.98 7675.85 3364.02 7667.71 3343.62 7654.92 C 3342.77 7654.63 3342.04 7654.08 3341.53 7653.35 C 3341.01 7652.63 3340.73 7651.76 3340.73 7650.87 C 3340.73 7649.98 3341.01 7649.11 3341.53 7648.38 C 3342.04 7647.65 3342.77 7647.10 3343.62 7646.81 C 3351.01 7644.43 3415.17 7624.63 3433.78 7639.89 C 3435.87 7641.63 3437.46 7643.90 3438.38 7646.46 C 3439.30 7649.01 3439.53 7651.77 3439.02 7654.44 C 3438.69 7658.74 3437.27 7662.88 3434.89 7666.47 C 3432.51 7670.06 3429.25 7672.98 3425.43 7674.96 C 3420.96 7677.40 3415.97 7678.71 3410.88 7678.77 Z M 3357.21 7652.54 C 3387.03 7667.80 3410.88 7673.29 3422.33 7667.56 C 3424.82 7666.18 3426.92 7664.19 3428.42 7661.76 C 3429.93 7659.34 3430.78 7656.58 3430.92 7653.73 C 3430.92 7649.91 3430.92 7648.24 3428.77 7647.29 C 3418.75 7639.18 3382.97 7645.38 3356.73 7652.54 L 3357.21 7652.54 Z" fill="#263238" fill-rule="nonzero" node-id="548" stroke="none" target-height="54.140137" target-width="98.80005" target-x="3340.73" target-y="7624.63"></path><path d="M 3345.29 7656.59 C 3344.03 7656.57 3342.83 7656.06 3341.95 7655.16 C 3341.59 7654.50 3341.41 7653.76 3341.41 7653.01 C 3341.41 7652.26 3341.59 7651.53 3341.95 7650.87 C 3341.95 7648.72 3357.45 7596.96 3381.78 7585.27 C 3384.89 7583.85 3388.26 7583.12 3391.68 7583.12 C 3395.09 7583.12 3398.47 7583.85 3401.58 7585.27 C 3404.93 7586.33 3407.83 7588.48 3409.81 7591.37 C 3411.80 7594.27 3412.77 7597.75 3412.55 7601.25 C 3410.88 7622.72 3367.23 7652.30 3347.19 7657.31 L 3345.29 7656.59 Z M 3391.56 7591.47 C 3389.24 7591.55 3386.96 7592.11 3384.88 7593.14 C 3370.09 7600.30 3357.93 7628.21 3351.96 7645.14 C 3372.95 7636.32 3401.82 7612.94 3402.77 7599.82 C 3402.77 7597.67 3402.77 7595.05 3397.28 7592.67 C 3395.50 7591.71 3393.56 7591.06 3391.56 7590.76 L 3391.56 7591.47 Z" fill="#263238" fill-rule="nonzero" node-id="550" stroke="none" target-height="74.18994" target-width="71.36011" target-x="3341.41" target-y="7583.12"></path><path d="M 3751.25 7781.81 C 3724.30 7781.81 3686.85 7747.23 3666.34 7726.00 C 3665.81 7725.27 3665.53 7724.39 3665.53 7723.50 C 3665.53 7722.60 3665.81 7721.72 3666.34 7720.99 C 3666.81 7720.22 3667.48 7719.60 3668.28 7719.18 C 3669.07 7718.76 3669.97 7718.56 3670.87 7718.61 C 3680.41 7718.61 3763.18 7731.01 3774.87 7754.38 C 3776.10 7756.48 3776.76 7758.87 3776.76 7761.30 C 3776.76 7763.74 3776.10 7766.12 3774.87 7768.22 C 3773.11 7771.86 3770.46 7774.99 3767.17 7777.33 C 3763.87 7779.67 3760.04 7781.13 3756.02 7781.58 L 3751.25 7781.81 Z M 3682.08 7729.34 C 3712.13 7758.44 3738.61 7774.66 3753.64 7772.75 C 3756.27 7772.41 3758.78 7771.42 3760.94 7769.88 C 3763.10 7768.34 3764.85 7766.30 3766.04 7763.93 C 3766.57 7763.11 3766.86 7762.16 3766.86 7761.18 C 3766.86 7760.21 3766.57 7759.25 3766.04 7758.44 C 3759.84 7745.56 3715.71 7734.59 3682.08 7729.34 Z" fill="#263238" fill-rule="nonzero" node-id="552" stroke="none" target-height="63.25" target-width="111.22998" target-x="3665.53" target-y="7718.56"></path><path d="M 3684.70 7728.15 C 3679.35 7728.30 3673.99 7727.90 3668.72 7726.96 C 3667.99 7726.85 3667.29 7726.55 3666.71 7726.09 C 3666.12 7725.63 3665.67 7725.02 3665.38 7724.33 C 3665.03 7723.63 3664.84 7722.85 3664.84 7722.07 C 3664.84 7721.28 3665.03 7720.50 3665.38 7719.80 C 3666.81 7718.13 3699.02 7679.25 3729.55 7676.63 C 3738.19 7675.96 3746.75 7678.70 3753.40 7684.26 C 3762.70 7692.37 3762.22 7699.53 3759.84 7704.06 C 3753.88 7720.28 3712.61 7728.15 3684.70 7728.15 Z M 3678.50 7719.32 C 3705.22 7720.75 3747.91 7711.93 3753.40 7700.24 C 3753.40 7700.24 3755.31 7696.42 3749.11 7691.18 C 3746.64 7689.03 3743.75 7687.42 3740.64 7686.43 C 3737.52 7685.45 3734.23 7685.11 3730.98 7685.45 C 3710.41 7691.19 3692.10 7703.10 3678.50 7719.56 L 3678.50 7719.32 Z" fill="#263238" fill-rule="nonzero" node-id="554" stroke="none" target-height="52.339844" target-width="97.85986" target-x="3664.84" target-y="7675.96"></path><path d="M 3351.73 7630.83 L 3149.46 7573.58 C 3145.97 7572.53 3142.22 7572.80 3138.92 7574.34 C 3135.62 7575.88 3133.00 7578.58 3131.57 7581.93 L 3063.35 7735.30 C 3061.75 7739.23 3061.00 7743.45 3061.14 7747.69 C 3061.29 7751.93 3062.33 7756.09 3064.20 7759.90 C 3066.07 7763.71 3068.73 7767.08 3071.99 7769.79 C 3075.26 7772.49 3079.06 7774.48 3083.15 7775.61 C 3154.71 7794.22 3189.05 7799.47 3278.02 7824.99 C 3332.88 7840.25 3411.12 7868.64 3486.73 7890.10 C 3562.34 7911.57 3587.62 7837.87 3558.29 7822.13 C 3425.67 7752.00 3415.17 7702.86 3378.92 7650.39 C 3372.42 7640.89 3362.80 7633.96 3351.73 7630.83 Z" fill="#429cfd" fill-rule="nonzero" node-id="556" stroke="none" target-height="339.04004" target-width="526.6201" target-x="3061" target-y="7572.53"></path><path d="M 3671.82 7698.09 L 3499.13 7578.83 C 3496.21 7576.70 3492.60 7575.71 3488.99 7576.07 C 3485.39 7576.42 3482.04 7578.08 3479.57 7580.74 L 3365.08 7703.82 C 3362.29 7707.00 3360.21 7710.74 3358.98 7714.78 C 3357.75 7718.83 3357.39 7723.10 3357.93 7727.29 C 3358.47 7731.49 3359.90 7735.52 3362.12 7739.12 C 3364.34 7742.73 3367.30 7745.81 3370.81 7748.18 C 3431.63 7788.97 3463.12 7805.43 3539.21 7858.14 C 3586.91 7890.58 3679.22 7962.61 3743.62 8007.46 C 3808.02 8052.30 3855.96 7990.76 3833.07 7966.43 C 3730.50 7856.95 3708.08 7788.25 3691.14 7726.00 C 3688.20 7714.71 3681.36 7704.82 3671.82 7698.09 Z" fill="#429cfd" fill-rule="nonzero" node-id="558" stroke="none" target-height="476.58984" target-width="498.57007" target-x="3357.39" target-y="7575.71"></path><path d="M 3531.81 7476.27 L 3220.54 7321.46 L 3252.74 7237.03 L 3585.24 7400.18 L 3531.81 7476.27 Z" fill="#429cfd" fill-rule="nonzero" node-id="560" stroke="none" target-height="239.24023" target-width="364.69995" target-x="3220.54" target-y="7237.03"></path><path d="M 3127.04 4558.65 L 3100.80 4627.35 C 3098.18 4632.60 3104.38 4638.08 3113.20 4638.08 L 3902.24 4638.08 C 3909.15 4638.08 3914.88 4634.74 3915.36 4630.45 L 3922.03 4562.23 C 3922.03 4557.70 3916.55 4553.64 3909.15 4553.64 L 3139.44 4553.64 C 3137.12 4553.43 3134.79 4553.77 3132.63 4554.64 C 3130.47 4555.51 3128.55 4556.89 3127.04 4558.65 Z" fill="#429cfd" fill-rule="nonzero" node-id="562" stroke="none" target-height="84.6499" target-width="823.8501" target-x="3098.18" target-y="4553.43"></path><path d="M 3127.04 4558.65 L 3100.80 4627.35 C 3098.18 4632.60 3104.38 4638.08 3113.20 4638.08 L 3902.24 4638.08 C 3909.15 4638.08 3914.88 4634.74 3915.36 4630.45 L 3922.03 4562.23 C 3922.03 4557.70 3916.55 4553.64 3909.15 4553.64 L 3139.44 4553.64 C 3137.12 4553.43 3134.79 4553.77 3132.63 4554.64 C 3130.47 4555.51 3128.55 4556.89 3127.04 4558.65 Z" fill="#ffffff" fill-opacity="0.4" fill-rule="nonzero" group-id="21" node-id="566" stroke="none" target-height="84.6499" target-width="823.8501" target-x="3098.18" target-y="4553.43"></path><path d="M 3251.31 4644.76 L 3230.56 4644.76 C 3226.50 4644.76 3223.40 4642.61 3223.64 4639.99 L 3233.42 4551.50 C 3233.42 4549.11 3237.23 4546.96 3241.29 4546.96 L 3262.04 4546.96 C 3266.10 4546.96 3269.20 4549.11 3268.96 4551.50 L 3259.18 4639.99 C 3258.94 4642.61 3255.36 4644.76 3251.31 4644.76 Z" fill="#429cfd" fill-rule="nonzero" node-id="569" stroke="none" target-height="97.799805" target-width="45.80005" target-x="3223.4" target-y="4546.96"></path><path d="M 3737.89 4644.76 L 3717.38 4644.76 C 3713.33 4644.76 3710.23 4642.61 3710.46 4639.99 L 3720.01 4551.50 C 3720.01 4549.11 3724.06 4546.96 3728.11 4546.96 L 3748.63 4546.96 C 3752.68 4546.96 3756.02 4549.11 3755.54 4551.50 L 3746.00 4639.99 C 3744.81 4642.61 3742.19 4644.76 3737.89 4644.76 Z" fill="#429cfd" fill-rule="nonzero" node-id="571" stroke="none" target-height="97.799805" target-width="45.79004" target-x="3710.23" target-y="4546.96"></path><path d="M 3233.18 8684.15 C 3586.09 8684.15 3872.18 8663.43 3872.18 8637.88 C 3872.18 8612.32 3586.09 8591.60 3233.18 8591.60 C 2880.27 8591.60 2594.18 8612.32 2594.18 8637.88 C 2594.18 8663.43 2880.27 8684.15 3233.18 8684.15 Z" fill="#f5f5f5" fill-rule="nonzero" group-id="22" node-id="575" stroke="none" target-height="92.55078" target-width="1278" target-x="2594.18" target-y="8591.6"></path><path d="M 3622.45 8572.52 C 3509.39 8539.60 3383.93 8497.38 3308.08 8453.26 C 3305.93 8451.83 3303.54 8451.11 3301.40 8449.92 L 3301.40 7938.05 L 3530.14 7938.05 C 3547.50 7937.02 3563.82 7929.40 3575.75 7916.74 C 3587.68 7904.08 3594.33 7887.34 3594.33 7869.95 C 3594.33 7852.55 3587.68 7835.82 3575.75 7823.16 C 3563.82 7810.50 3547.50 7802.88 3530.14 7801.85 L 3302.59 7801.85 L 3302.59 5468.62 L 3165.20 5468.62 L 3165.20 7801.85 L 2937.89 7801.85 C 2928.61 7801.30 2919.31 7802.65 2910.57 7805.83 C 2901.83 7809.00 2893.83 7813.93 2887.07 7820.31 C 2880.30 7826.68 2874.91 7834.38 2871.22 7842.91 C 2867.54 7851.45 2865.64 7860.65 2865.64 7869.95 C 2865.64 7879.25 2867.54 7888.45 2871.22 7896.98 C 2874.91 7905.52 2880.30 7913.21 2887.07 7919.59 C 2893.83 7925.97 2901.83 7930.90 2910.57 7934.07 C 2919.31 7937.24 2928.61 7938.60 2937.89 7938.05 L 3165.20 7938.05 L 3165.20 8449.20 C 3163.05 8449.20 3160.91 8451.11 3158.76 8452.54 C 3081.72 8497.38 2957.21 8539.60 2844.15 8571.80 C 2836.51 8574.11 2829.95 8579.08 2825.66 8585.81 C 2821.37 8592.53 2819.63 8600.57 2820.75 8608.47 C 2821.88 8616.37 2825.79 8623.61 2831.79 8628.87 C 2837.79 8634.13 2845.47 8637.07 2853.45 8637.16 L 3613.15 8637.16 C 3620.77 8636.64 3627.99 8633.52 3633.59 8628.32 C 3639.19 8623.12 3642.84 8616.16 3643.93 8608.60 C 3645.02 8601.03 3643.48 8593.33 3639.57 8586.76 C 3635.66 8580.19 3629.62 8575.17 3622.45 8572.52 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="578" stroke="none" target-height="3168.54" target-width="825.39014" target-x="2819.63" target-y="5468.62"></path><path d="M 3657.51 5231.05 L 2809.32 5231.05 C 2741.09 5231.05 2685.77 5286.37 2685.77 5354.60 L 2685.77 5606.72 C 2685.77 5674.96 2741.09 5730.28 2809.32 5730.28 L 3657.51 5730.28 C 3725.75 5730.28 3781.07 5674.96 3781.07 5606.72 L 3781.07 5354.60 C 3781.07 5286.37 3725.75 5231.05 3657.51 5231.05 Z" fill="#429cfd" fill-rule="nonzero" node-id="580" stroke="none" target-height="499.22998" target-width="1095.3" target-x="2685.77" target-y="5231.05"></path><path d="M 2801.45 5730.52 L 2801.45 5773.93 C 2801.45 5809.71 2840.33 5838.81 2888.04 5838.81 L 3579.75 5838.81 C 3627.46 5838.81 3666.34 5809.71 3666.34 5773.93 L 3666.34 5730.52 L 2801.45 5730.52 Z" fill="#429cfd" fill-rule="nonzero" node-id="582" stroke="none" target-height="108.29004" target-width="864.89014" target-x="2801.45" target-y="5730.52"></path><path d="M 2801.45 5730.52 L 2801.45 5773.93 C 2801.45 5809.71 2840.33 5838.81 2888.04 5838.81 L 3579.75 5838.81 C 3627.46 5838.81 3666.34 5809.71 3666.34 5773.93 L 3666.34 5730.52 L 2801.45 5730.52 Z" fill="#ffffff" fill-opacity="0.3" fill-rule="nonzero" group-id="23" node-id="586" stroke="none" target-height="108.29004" target-width="864.89014" target-x="2801.45" target-y="5730.52"></path></svg>
\ No newline at end of file
diff --git a/litemall-wx/pages/auth/authorization/authorization.js b/litemall-wx/pages/auth/authorization/authorization.js
new file mode 100644
index 00000000..77a2bef2
--- /dev/null
+++ b/litemall-wx/pages/auth/authorization/authorization.js
@@ -0,0 +1,101 @@
+var api = require('../../../config/api.js')
+var util = require('../../../utils/util.js')
+var user = require('../../../utils/user.js')
+
+var app = getApp()
+Page({
+  data: {
+    radio:'',
+    show:false,
+  },
+  onLoad: function (options) {
+  },
+  onReady: function () {},
+  onShow: function () {
+    // 页面显示
+  },
+  onHide: function () {
+    // 页面隐藏
+  },
+  onUnload: function () {
+    // 页面关闭
+  },
+  changeActive: function (e) {
+    var current = e.target.dataset.item;
+    this.setData({
+      active: current,
+    })
+  },
+  getPhoneNumber: function (e) {
+    console.log('e',e)
+    if(this.data.radio!='1'){
+      wx.showToast({
+        title: '请勾选隐私协议',
+        icon: 'none'
+      });
+      return
+    }
+    this.doLogin(e.detail)
+  },
+  doLogin: function (userInfo) {
+    user.checkLogin().catch(() => {
+      user
+        .loginByWeixin(userInfo)
+        .then((res) => {
+          console.log('res',res)
+          if(!!res.data.userInfo.userType){
+            var pages = getCurrentPages();   //当前页面
+            var prevPage = pages[pages.length - 2];   //上个页面
+            // 赋值给上一个页面赋值
+            let parmasData = {
+              login:true,
+            }
+            prevPage.setData({
+              params: parmasData,
+            });
+            app.globalData.hasLogin = true
+            wx.navigateBack({
+              delta: 1,
+            })
+          }else{
+            let str = JSON.stringify(res.data.userInfo)
+            wx.navigateTo({
+              url: "/pages/auth/login/login?data="+encodeURIComponent(JSON.stringify(res.data.userInfo)),
+            })
+          }
+          
+        })
+        .catch((err) => {
+          app.globalData.hasLogin = false
+          util.showErrorToast('微信登录失败')
+        })
+    })
+  },
+  onChange: function (event) {
+    console.log(event.detail)
+    this.setData({
+      radio:event.detail
+    })
+  },
+  goaccountLogin: function () {
+    this.setData({
+      show:true
+    })
+  },
+  goaccountLoginfalse: function (e) {
+    this.setData({
+      radio:e.currentTarget.dataset.type == 'true'
+    })
+    this.onClose()
+  },
+  onClose: function () {
+    this.setData({
+      show:false
+    })
+  },
+  accountLogin: function () {
+    wx.navigateTo({
+      url: '/pages/auth/accountLogin/accountLogin',
+    })
+  },
+})
diff --git a/litemall-wx/pages/auth/authorization/authorization.json b/litemall-wx/pages/auth/authorization/authorization.json
new file mode 100644
index 00000000..1ce07e26
--- /dev/null
+++ b/litemall-wx/pages/auth/authorization/authorization.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "登录"
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/auth/authorization/authorization.wxml b/litemall-wx/pages/auth/authorization/authorization.wxml
new file mode 100644
index 00000000..5b279dbf
--- /dev/null
+++ b/litemall-wx/pages/auth/authorization/authorization.wxml
@@ -0,0 +1,34 @@
+<view class="container">
+    <view class="benpos">
+      <image class="login" src="./assets/denglu.svg" mode=""/>
+          <button class="authorized-btn" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">手机号登录</button>
+      <view class="box">
+        <van-checkbox value="{{ radio }}" shape="square" bind:change="onChange"></van-checkbox><text class="xieyi" bindtap="goaccountLogin">《隐私协议》</text>
+      </view>
+    </view>
+</view>
+<van-popup show="{{ show }}"  round position="bottom"  custom-style="height: 40%" closeable bind:close="onClose" >
+  <view class="yinsixieyi">
+    <text class="title">信息收集：\n</text>
+    <text class="text">我们将收集您的个人信息，包括但不限于姓名、联系方式、身份证号码、履历等，用于招聘目的。\n</text>
+    <text class="title">信息使用：\n</text>
+    <text class="text">我们承诺对收集到的信息进行保密，仅在招聘过程中使用，并不会用于其他目的。我们将采取合理的措施保护您的信息安全。\n</text>
+    <text class="title">信息共享：\n</text>
+    <text class="text">除非经过您的同意或法律规定，否则我们不会将您的信息分享给任何第三方。\n</text>
+    <text class="title">信息存储：\n</text>
+    <text class="text">我们将在合理期限内保存您的信息，超过期限后将予以删除。\n</text>
+    <text class="title">信息安全：\n</text>
+    <text class="text" >我们将采取合理的安全措施，保护您的个人信息不被泄露、篡改或丢失。\n</text>
+    <text class="title">隐私权利：\n</text>
+    <text class="text">您有权查看、更正、删除您的个人信息，也可以撤回您的同意。如果您有任何疑问或投诉，请联系我们。\n</text>
+    <text class="title">法律适用：\n</text>
+    <text class="text">本协议适用于中华人民共和国的法律法规。\n</text>
+    <text class="text">请您仔细阅读本协议，并在同意的情况下参与我们的招聘活动。如果您不同意本协议的任何内容，请您立即停止使用我们的服务。</text>
+</view>
+<view class="bombtn">
+  <view class="btn">
+    <view class="noagree"  bindtap="goaccountLoginfalse"  data-type="false">不同意</view>
+    <view class="agree"  bindtap="goaccountLoginfalse"  data-type="true">同意</view>
+  </view>
+</view>
+</van-popup>
\ No newline at end of file
diff --git a/litemall-wx/pages/auth/authorization/authorization.wxss b/litemall-wx/pages/auth/authorization/authorization.wxss
new file mode 100644
index 00000000..ba1b20f0
--- /dev/null
+++ b/litemall-wx/pages/auth/authorization/authorization.wxss
@@ -0,0 +1,83 @@
+.container{
+  width: 100%;
+  height: 100vh;
+  background-color: #fff;
+}
+.benpos{
+  position: relative;
+  top: 20%;
+}
+.benpos .login{
+  position: relative;
+  left: 50%;
+  transform: translateX(-50%);
+}
+.benpos .box{
+  margin-top: 20rpx;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+}
+
+.benpos .box .van-icon-success:before{
+  color: #FFF;
+}
+.xieyi{
+  color: #703EDD;
+}
+.authorized-btn {
+  width: 90%;
+  margin: 0 auto;
+  border-radius: 40rpx;
+  text-align: center;
+  margin-top: 60rpx;
+  background-image: linear-gradient(to right, #8d65e4 0%, #703EDD 100%);
+  border: 1rpx solid #703EDD;
+  color: #fff;
+  font-size: 28rpx;
+  padding: 8rpx;
+  
+}
+.yinsixieyi{
+  padding: 60rpx 30rpx;
+  padding-bottom: 100rpx;
+}
+.yinsixieyi .title{
+  font-size: 30rpx;
+  font-weight: 600;
+  line-height: 50rpx;
+}
+.yinsixieyi .text{
+  font-size: 26rpx;
+  line-height: 40rpx;
+}
+.bombtn{
+  position: relative;
+  background-color: #fff;
+  position: fixed;
+  margin: 0 30rpx;
+  width: 100%;
+  height: 120rpx;
+  bottom: 0rpx;
+}
+.btn{
+  width: 90%;
+  display: flex;
+  text-align: center;
+  position: fixed;
+  bottom: 40rpx;
+}
+.btn .noagree{
+  width: 200rpx;
+  line-height: 80rpx;
+  background-color: rgb(228, 224, 224);
+  font-weight: 600;
+  margin-right: 30rpx;
+}
+.btn .agree{
+  flex: 1;
+  line-height: 80rpx;
+  background-color: #703EDD;
+  color: #fff;
+  font-weight: 600;
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/auth/login/assets/shangjia.png b/litemall-wx/pages/auth/login/assets/shangjia.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b1c5821ee8d2277d508b33f281f63b05ef9e627
GIT binary patch
literal 112336
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
Vl6wXBL_xrRvQL#Hi=LPS{yz(V#bN*e

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/auth/login/assets/zhubo.png b/litemall-wx/pages/auth/login/assets/zhubo.png
new file mode 100644
index 0000000000000000000000000000000000000000..193d935897bc0c4a21ed90dade5cb51c943842aa
GIT binary patch
literal 3861
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/auth/login/assets/zhubop.png b/litemall-wx/pages/auth/login/assets/zhubop.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb09a677867d102b63302fdfefde7acc41c8e4b4
GIT binary patch
literal 133080
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%0Dl^@0&4j`evn4E+fWLKB-*h`+Pl{AUI1@Fg
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
Ul{%xq%c{Jr%x%pc9LL808|YAmg8%>k

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/auth/login/assets/zhubosousuo.png b/litemall-wx/pages/auth/login/assets/zhubosousuo.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f2433440904a4830ab74733d3f85cf36e0d26f8
GIT binary patch
literal 4106
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
UxP3alp7BW@=o;Uv)OLFPAOCEzYybcN

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/auth/login/assets/zhubozhongxin.png b/litemall-wx/pages/auth/login/assets/zhubozhongxin.png
new file mode 100644
index 0000000000000000000000000000000000000000..87ac8790b4117601f9f8750baca635e908cb657d
GIT binary patch
literal 5466
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/auth/login/login.js b/litemall-wx/pages/auth/login/login.js
index 9fff27c1..ff514777 100644
--- a/litemall-wx/pages/auth/login/login.js
+++ b/litemall-wx/pages/auth/login/login.js
@@ -1,73 +1,112 @@
-var api = require('../../../config/api.js');
-var util = require('../../../utils/util.js');
-var user = require('../../../utils/user.js');
-
-var app = getApp();
-Page({
-  data: {
-    canIUseGetUserProfile: false,
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    // 页面渲染完成
-    if (wx.getUserProfile) {
-      this.setData({
-        canIUseGetUserProfile: true
-      })
-    }
-  },
-  onReady: function() {
-
-  },
-  onShow: function() {
-    // 页面显示
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-
-  },
-  wxLogin: function(e) {
-    if (this.data.canIUseGetUserProfile) {
-      wx.getUserProfile({
-        desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
-        success: (res) => {
-          this.doLogin({...res.userInfo, ...{userType:'ZB_EMP'}})
-        },
-        fail: () => {
-          util.showErrorToast('微信登录失败');
-        }
-      })
-    }
-    else {
-      if (e.detail.userInfo == undefined) {
-        app.globalData.hasLogin = false;
-        util.showErrorToast('微信登录失败');
-        return;
-      }
-      this.doLogin({...e.detail.userInfo, ...{userType:'ZB_EMP'}})
-    }
-  },
-  doLogin: function(userInfo) {
-    user.checkLogin().catch(() => {
-      user.loginByWeixin(userInfo).then(res => {
-        app.globalData.hasLogin = true;
-        wx.navigateBack({
-          delta: 1
-        })
-      }).catch((err) => {
-        app.globalData.hasLogin = false;
-        util.showErrorToast('微信登录失败');
-      });
-
-    });
-  },
-  accountLogin: function() {
-    wx.navigateTo({
-      url: "/pages/auth/accountLogin/accountLogin"
-    });
-  }
-})
\ No newline at end of file
+var api = require('../../../config/api.js')
+var util = require('../../../utils/util.js')
+var user = require('../../../utils/user.js')
+
+var app = getApp()
+Page({
+  data: {
+    canIUseGetUserProfile: false,
+    isAuthInfo: '',
+    loginResult: '',
+    orderAmount: '',
+    active: 'ZB_EMP',
+    id:'',
+    main:{}
+  },
+  onLoad: function (options) {
+    // 页面初始化 options为页面跳转所带来的参数
+    // 页面渲染完成
+      console.log('options',options)
+      let data = JSON.parse(decodeURIComponent(options.data))
+      console.log(data)
+      // 页面初始化 options为页面跳转所带来的参数
+      var that = this;
+      that.setData({
+        id: data.id,
+        main:data
+      });
+  },
+  onReady: function () {},
+  onShow: function () {
+    // 页面显示
+  },
+  onHide: function () {
+    // 页面隐藏
+  },
+  onUnload: function () {
+    // 页面关闭
+  },
+  changeActive: function (e) {
+    var current = e.target.dataset.item;
+    this.setData({
+      active: current,
+    })
+  },
+  getPhoneNumber: function (datas) {
+    console.log(datas) //微信小程序返回的相关数据
+    this.uniLogin(datas)
+  },
+  uniLogin: function (datas) {
+    wx.login({
+      provider: 'weixin',
+      success: (res) => {
+        console.log(res)
+        let code = res.code
+        let params = {
+          code: code,
+          iv: datas.detail.iv,
+          encryptedData: datas.detail.encryptedData,
+        }
+      },
+    })
+  },
+  wxLogin: function (e) {
+    let that = this;
+    let userType = e.currentTarget.dataset.item
+    // let mannagerFlag = 0
+    // if(userType=='mannagerFlag'){
+    //   mannagerFlag = 1
+    // }
+    util.request(api.UserUpdate,{id:that.data.id,userType:userType},'POST').then(function (res) {
+      if (res.errno == 0) {
+        let data = {...that.data.main,...{userType:userType}}
+        wx.setStorageSync('userInfo', data);
+        wx.switchTab ({
+          url: "/pages/index/index",
+        })
+      }
+    });
+    
+  },
+  doLogin: function (userInfo) {
+    user.checkLogin().catch(() => {
+      user
+        .loginByWeixin(userInfo)
+        .then((res) => {
+          console.log(res)
+          var pages = getCurrentPages();   //当前页面
+          var prevPage = pages[pages.length - 2];   //上个页面
+          // 赋值给上一个页面赋值
+          let parmasData = {
+            login:true,
+          }
+          prevPage.setData({
+            params: parmasData,
+          });
+          app.globalData.hasLogin = true
+          wx.navigateBack({
+            delta: 1,
+          })
+        })
+        .catch((err) => {
+          app.globalData.hasLogin = false
+          util.showErrorToast('微信登录失败')
+        })
+    })
+  },
+  accountLogin: function () {
+    wx.navigateTo({
+      url: '/pages/auth/accountLogin/accountLogin',
+    })
+  },
+})
diff --git a/litemall-wx/pages/auth/login/login.json b/litemall-wx/pages/auth/login/login.json
index a78fcb7d..799a978d 100644
--- a/litemall-wx/pages/auth/login/login.json
+++ b/litemall-wx/pages/auth/login/login.json
@@ -1,3 +1,4 @@
-{
-  "navigationBarTitleText": "登录"
+{
+  "navigationBarTitleText": "登录",
+  "navigationStyle": "custom"
 }
\ No newline at end of file
diff --git a/litemall-wx/pages/auth/login/login.wxml b/litemall-wx/pages/auth/login/login.wxml
index 110540b0..2e36806b 100644
--- a/litemall-wx/pages/auth/login/login.wxml
+++ b/litemall-wx/pages/auth/login/login.wxml
@@ -1,7 +1,60 @@
-<view class="container">
-  <view class="login-box">
-    <button wx:if="{{canIUseGetUserProfile}}" type="primary" class="wx-login-btn" bindtap="wxLogin">微信直接登录</button>  
-    <button wx:else type="primary" open-type="getUserProfile" class="wx-login-btn" open-type="getUserInfo" bindgetuserinfo="wxLogin">微信直接登录</button>
-    <button type="primary" class="account-login-btn" bindtap="accountLogin">账号登录</button>
-  </view>
-</view>
\ No newline at end of file
+<view class="container">
+  <view class="container-both">
+
+    <view class="login-img login-img_top">
+      <image class="imgw" src="./assets/shangjia.png" mode="widthFix" alt="" />
+    </view>
+    <button  class="authorized-btn" data-item="CUSTOMER" bindtap="wxLogin">我是商家</button>
+    <!-- <button  class="authorized-btn btntop" data-item="mannagerFlag" bindtap="wxLogin">我是经纪人</button> -->
+  </view>
+  <view class="container-both">
+    <view class="main">
+      <view class="line"></view>
+      <text class="text">您的身份是</text>
+    </view>
+    <view class="login-img">
+      <image class="imgw" src="./assets/zhubop.png" mode="widthFix" alt="" />
+    </view>
+    <button class="authorized-btn" data-item="ZB_EMP" bindtap="wxLogin">我是主播</button>
+  </view>
+  <!-- <view class="login-box">
+    <button wx:if="{{canIUseGetUserProfile}}" type="primary" class="wx-login-btn" bindtap="wxLogin">微信直接登录1</button>  
+    <button wx:else type="primary" open-type="getUserProfile" class="wx-login-btn" open-type="getUserInfo" bindgetuserinfo="wxLogin">微信直接登录2</button>
+    <button type="primary" class="account-login-btn" bindtap="accountLogin">账号登录</button>
+  </view> -->
+</view>
+<!-- <view class="con">
+    <view class="login">登录</view>
+    <view class="blg">
+      <view class="login-form">
+        <view class="broadcast">怡播间</view>
+        <view class="identity">选择正确的身份登录，获得系统推荐</view>
+        <view class="both both-top">
+          <view><image class="image" src="./assets/zhubo.png" alt="" /></view>
+          <view>
+            <image class="image" src="./assets/zhubozhongxin.png" alt="" />
+          </view>
+        </view>
+        <view class="both">
+          <view
+            class="{{active == 'CUSTOMER' ? 'active' : 'text'}}"
+            data-item="CUSTOMER"
+            bindtap="changeActive"
+          >
+            商家
+          </view>
+          <view
+            data-item="ZB_EMP"
+            class="{{active == 'ZB_EMP' ? 'active' : 'text'}}"
+            bindtap="changeActive"
+          >
+            主播
+          </view>
+        </view>
+        <view>
+          <button wx:if="{{canIUseGetUserProfile}}"  class="authorized-btn"  bindtap="wxLogin">微信直接登录</button>  
+          <button wx:else  open-type="getUserProfile" class="authorized-btn" open-type="getUserInfo" bindgetuserinfo="wxLogin">微信直接登录</button>
+        </view>
+      </view>
+    </view>
+  </view> -->
\ No newline at end of file
diff --git a/litemall-wx/pages/auth/login/login.wxss b/litemall-wx/pages/auth/login/login.wxss
index 179b814e..42124c52 100644
--- a/litemall-wx/pages/auth/login/login.wxss
+++ b/litemall-wx/pages/auth/login/login.wxss
@@ -1,61 +1,306 @@
-.login-box {
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-  padding: 0 40rpx;
-  margin-top: 200rpx;
-  background: #fff;
-}
-
-.wx-login-btn {
-  margin: 60rpx 0 40rpx 0;
-  height: 96rpx;
-  line-height: 96rpx;
-  font-size: 30rpx;
-  border-radius: 6rpx;
-  width: 90%;
-  color: #fff;
-  right: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  position: flex;
-  bottom: 0;
-  left: 0;
-  padding: 0;
-  margin-left: 5%;
-  text-align: center;
-  /* padding-left: -5rpx; */
-  border-top-left-radius: 50rpx;
-  border-bottom-left-radius: 50rpx;
-  border-top-right-radius: 50rpx;
-  border-bottom-right-radius: 50rpx;
-  letter-spacing: 3rpx;
-}
-
-.account-login-btn {
-  width: 90%;
-  margin: 0 auto;
-  color: #fff;
-  font-size: 30rpx;
-  height: 96rpx;
-  line-height: 96rpx;
-  right: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  position: flex;
-  bottom: 0;
-  left: 0;
-  border-radius: 0;
-  padding: 0;
-  margin-left: 5%;
-  text-align: center;
-  /* padding-left: -5rpx; */
-  border-top-left-radius: 50rpx;
-  border-bottom-left-radius: 50rpx;
-  border-top-right-radius: 50rpx;
-  border-bottom-right-radius: 50rpx;
-  letter-spacing: 3rpx;
-  background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
-}
+.container{
+  width: 100%;
+  height: 100vh;
+  background-color: #fff;
+}
+.container .container-both{
+  height: 50%;
+}
+.container .login-img{
+  padding: 20rpx 40rpx;
+}
+.container .login-img_top{
+  padding-top: 160rpx;
+}
+.container .login-img .imgw{
+  width: 300rpx;
+}
+.container .main{
+  width: 100%;
+  text-align: center;
+}
+.container .main .line{
+  height: 2rpx;
+  width: 100%;
+  background-color: rgb(235, 230, 230);
+}
+.container .main .text{
+  background-color: #fff;
+  position: relative;
+  top: -20rpx;
+  padding: 0 20rpx;
+}
+
+
+
+.con {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  top: 0;
+  right: 0;
+  background: #703EDD;
+  overflow: hidden;
+  padding-top: 200rpx;
+}
+
+.con .login {
+  text-align: center;
+  font-size: 60rpx;
+  color: #fff;
+}
+
+.blg {
+  margin-top: 80rpx;
+  height: 100%;
+  background-color: #eeecec;
+  border-top-left-radius: 80rpx;
+  border-top-right-radius: 80rpx;
+}
+
+image {
+  display: block;
+  width: 130rpx;
+  height: 130rpx;
+  margin: auto;
+  border-radius: 50%;
+  width: 150rpx;
+  height: 150rpx;
+  margin-bottom: 8%;
+}
+
+.login-form {
+  width: 90%;
+  height: 600rpx;
+  margin: 0 auto;
+  border-radius: 40rpx;
+  position: relative;
+  top: -50rpx;
+  background-color: #fff;
+  text-align: center;
+}
+
+.login-form .broadcast {
+  padding-top: 40rpx;
+  font-weight: 600;
+}
+
+.login-form .identity {
+  margin-top: 20rpx;
+  font-size: 20rpx;
+  color: #333;
+}
+
+.login-form .both {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: space-evenly;
+  -webkit-justify-content: space-evenly;
+  justify-content: space-evenly;
+}
+
+.login-form .both .image {
+  width: 56rpx;
+  height: 56rpx;
+}
+
+.login-form .both .text {
+  display:inline-block;
+  margin-top: 20rpx;
+  font-size: 26rpx;
+  width: 100rpx;
+  height: 46rpx;
+  line-height: 46rpx;
+  border: 1px solid #ccc;
+  border-radius: 32rpx;
+}
+
+.login-form .both-top {
+  margin-top: 40rpx;
+}
+
+.active {
+  display:inline-block;
+  margin-top: 20rpx;
+  font-size: 26rpx;
+  width: 100rpx;
+  height: 46rpx;
+  line-height: 46rpx;
+  border-radius: 32rpx;
+  color: #703EDD;
+  border: 1px solid #703EDD !important;
+}
+
+.authorized-btn {
+  width: 60%;
+  margin: 0 auto;
+  border-radius: 40rpx;
+  text-align: center;
+  background-image: linear-gradient(to right, #8d65e4 0%, #703EDD 100%);
+  border: 1rpx solid #703EDD;
+  color: #fff;
+  font-size: 28rpx;
+  padding: 8rpx;
+}
+.btntop{
+  margin-top: 20rpx;
+}
+.to-idx-btn {
+  width: 90%;
+  margin: 0 auto;
+  text-align: center;
+  background-color: #eeeeee;
+  color: #333;
+  border-radius: 6rpx;
+  font-size: 26rpx;
+  padding: 8rpx;
+  margin-top: 30rpx;
+}
+
+.form-title {
+  width: 100%;
+  margin-bottom: 50rpx;
+  font-size: 32rpx;
+  text-align: center;
+  color: #00a0e9;
+  margin-bottom: 50rpx;
+  font-size: 32rpx;
+}
+
+.item {
+  display: block;
+  margin-bottom: 30rpx;
+  margin-bottom: 30rpx;
+}
+
+.account {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  background: #f8f8f8;
+  padding: 15rpx;
+  box-sizing: border-box;
+  font-size: 26rpx;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+  align-items: center;
+}
+
+.account input {
+  padding-left: 20rpx;
+  width: 75%;
+  padding-left: 20rpx;
+}
+
+button::after {
+  border: 0 !important;
+}
+
+.operate {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+  justify-content: space-between;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+  align-items: center;
+}
+
+.to-register {
+  font-size: 28rpx;
+  color: #00aaff;
+  font-size: 28rpx;
+}
+
+.error .error-text {
+  display: block;
+  width: 100%;
+  font-size: 28rpx;
+  color: #e43130;
+  text-align: left;
+  margin-top: 10rpx;
+  font-size: 28rpx;
+  margin-top: 10rpx;
+}
+
+.error .error-text .warning-icon {
+  display: inline-block;
+  color: #fff;
+  width: 26rpx;
+  height: 26rpx;
+  line-height: 26rpx;
+  background: #e43130;
+  border-radius: 50%;
+  text-align: center;
+  margin-right: 12rpx;
+  font-size: 22rpx;
+  width: 26rpx;
+  height: 26rpx;
+  line-height: 26rpx;
+  margin-right: 12rpx;
+  font-size: 22rpx;
+}
+.login-box {
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+  padding: 0 40rpx;
+  margin-top: 200rpx;
+  background: #fff;
+}
+
+.wx-login-btn {
+  margin: 60rpx 0 40rpx 0;
+  height: 96rpx;
+  line-height: 96rpx;
+  font-size: 30rpx;
+  border-radius: 6rpx;
+  width: 90%;
+  color: #fff;
+  right: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: flex;
+  bottom: 0;
+  left: 0;
+  padding: 0;
+  margin-left: 5%;
+  text-align: center;
+  /* padding-left: -5rpx; */
+  border-top-left-radius: 50rpx;
+  border-bottom-left-radius: 50rpx;
+  border-top-right-radius: 50rpx;
+  border-bottom-right-radius: 50rpx;
+  letter-spacing: 3rpx;
+}
+
+.account-login-btn {
+  width: 90%;
+  margin: 0 auto;
+  color: #fff;
+  font-size: 30rpx;
+  height: 96rpx;
+  line-height: 96rpx;
+  right: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: flex;
+  bottom: 0;
+  left: 0;
+  border-radius: 0;
+  padding: 0;
+  margin-left: 5%;
+  text-align: center;
+  /* padding-left: -5rpx; */
+  border-top-left-radius: 50rpx;
+  border-bottom-left-radius: 50rpx;
+  border-top-right-radius: 50rpx;
+  border-bottom-right-radius: 50rpx;
+  letter-spacing: 3rpx;
+  background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
+}
diff --git a/litemall-wx/pages/auth/register/register.js b/litemall-wx/pages/auth/register/register.js
index fa10d425..b21d2a9f 100644
--- a/litemall-wx/pages/auth/register/register.js
+++ b/litemall-wx/pages/auth/register/register.js
@@ -1,212 +1,212 @@
-var api = require('../../../config/api.js');
-var check = require('../../../utils/check.js');
-
-var app = getApp();
-Page({
-  data: {
-    username: '',
-    password: '',
-    confirmPassword: '',
-    mobile: '',
-    code: ''
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    // 页面渲染完成
-
-  },
-  onReady: function() {
-
-  },
-  onShow: function() {
-    // 页面显示
-
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-
-  },
-  sendCode: function() {
-    let that = this;
-
-    if (this.data.mobile.length == 0) {
-      wx.showModal({
-        title: '错误信息',
-        content: '手机号不能为空',
-        showCancel: false
-      });
-      return false;
-    }
-
-    wx.request({
-      url: api.AuthRegisterCaptcha,
-      data: {
-        mobile: that.data.mobile
-      },
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      },
-      success: function(res) {
-        if (res.data.errno == 0) {
-          wx.showModal({
-            title: '发送成功',
-            content: '验证码已发送',
-            showCancel: false
-          });
-        } else {
-          wx.showModal({
-            title: '错误信息',
-            content: res.data.errmsg,
-            showCancel: false
-          });
-        }
-      }
-    });
-  },
-  requestRegister: function(wxCode) {
-    let that = this;
-    wx.request({
-      url: api.AuthRegister,
-      data: {
-        username: that.data.username,
-        password: that.data.password,
-        mobile: that.data.mobile,
-        code: that.data.code,
-        wxCode: wxCode
-      },
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      },
-      success: function(res) {
-        if (res.data.errno == 0) {
-          app.globalData.hasLogin = true;
-          wx.setStorageSync('userInfo', res.data.data.userInfo);
-          wx.setStorage({
-            key: "token",
-            data: res.data.data.token,
-            success: function() {
-              wx.switchTab({
-                url: '/pages/ucenter/index/index'
-              });
-            }
-          });
-        } else {
-          wx.showModal({
-            title: '错误信息',
-            content: res.data.errmsg,
-            showCancel: false
-          });
-        }
-      }
-    });
-  },
-  startRegister: function() {
-    var that = this;
-
-    if (this.data.password.length < 6 || this.data.username.length < 6) {
-      wx.showModal({
-        title: '错误信息',
-        content: '用户名和密码不得少于6位',
-        showCancel: false
-      });
-      return false;
-    }
-
-    if (this.data.password != this.data.confirmPassword) {
-      wx.showModal({
-        title: '错误信息',
-        content: '确认密码不一致',
-        showCancel: false
-      });
-      return false;
-    }
-
-    if (this.data.mobile.length == 0 || this.data.code.length == 0) {
-      wx.showModal({
-        title: '错误信息',
-        content: '手机号和验证码不能为空',
-        showCancel: false
-      });
-      return false;
-    }
-
-    wx.login({
-      success: function(res) {
-        if (!res.code) {
-          wx.showModal({
-            title: '错误信息',
-            content: '注册失败',
-            showCancel: false
-          });
-        }
-
-        that.requestRegister(res.code);
-      }
-    });
-  },
-  bindUsernameInput: function(e) {
-
-    this.setData({
-      username: e.detail.value
-    });
-  },
-  bindPasswordInput: function(e) {
-
-    this.setData({
-      password: e.detail.value
-    });
-  },
-  bindConfirmPasswordInput: function(e) {
-
-    this.setData({
-      confirmPassword: e.detail.value
-    });
-  },
-  bindMobileInput: function(e) {
-
-    this.setData({
-      mobile: e.detail.value
-    });
-  },
-  bindCodeInput: function(e) {
-
-    this.setData({
-      code: e.detail.value
-    });
-  },
-  clearInput: function(e) {
-    switch (e.currentTarget.id) {
-      case 'clear-username':
-        this.setData({
-          username: ''
-        });
-        break;
-      case 'clear-password':
-        this.setData({
-          password: ''
-        });
-        break;
-      case 'clear-confirm-password':
-        this.setData({
-          confirmPassword: ''
-        });
-        break;
-      case 'clear-mobile':
-        this.setData({
-          mobile: ''
-        });
-        break;
-      case 'clear-code':
-        this.setData({
-          code: ''
-        });
-        break;
-    }
-  }
+var api = require('../../../config/api.js');
+var check = require('../../../utils/check.js');
+
+var app = getApp();
+Page({
+  data: {
+    username: '',
+    password: '',
+    confirmPassword: '',
+    mobile: '',
+    code: ''
+  },
+  onLoad: function(options) {
+    // 页面初始化 options为页面跳转所带来的参数
+    // 页面渲染完成
+
+  },
+  onReady: function() {
+
+  },
+  onShow: function() {
+    // 页面显示
+
+  },
+  onHide: function() {
+    // 页面隐藏
+
+  },
+  onUnload: function() {
+    // 页面关闭
+
+  },
+  sendCode: function() {
+    let that = this;
+
+    if (this.data.mobile.length == 0) {
+      wx.showModal({
+        title: '错误信息',
+        content: '手机号不能为空',
+        showCancel: false
+      });
+      return false;
+    }
+
+    wx.request({
+      url: api.AuthRegisterCaptcha,
+      data: {
+        mobile: that.data.mobile
+      },
+      method: 'POST',
+      header: {
+        'content-type': 'application/json'
+      },
+      success: function(res) {
+        if (res.data.errno == 0) {
+          wx.showModal({
+            title: '发送成功',
+            content: '验证码已发送',
+            showCancel: false
+          });
+        } else {
+          wx.showModal({
+            title: '错误信息',
+            content: res.data.errmsg,
+            showCancel: false
+          });
+        }
+      }
+    });
+  },
+  requestRegister: function(wxCode) {
+    let that = this;
+    wx.request({
+      url: api.AuthRegister,
+      data: {
+        username: that.data.username,
+        password: that.data.password,
+        mobile: that.data.mobile,
+        code: that.data.code,
+        wxCode: wxCode
+      },
+      method: 'POST',
+      header: {
+        'content-type': 'application/json'
+      },
+      success: function(res) {
+        if (res.data.errno == 0) {
+          app.globalData.hasLogin = true;
+          wx.setStorageSync('userInfo', res.data.data.userInfo);
+          wx.setStorage({
+            key: "token",
+            data: res.data.data.token,
+            success: function() {
+              wx.switchTab({
+                url: '/pages/ucenter/index/index'
+              });
+            }
+          });
+        } else {
+          wx.showModal({
+            title: '错误信息',
+            content: res.data.errmsg,
+            showCancel: false
+          });
+        }
+      }
+    });
+  },
+  startRegister: function() {
+    var that = this;
+
+    if (this.data.password.length < 6 || this.data.username.length < 6) {
+      wx.showModal({
+        title: '错误信息',
+        content: '用户名和密码不得少于6位',
+        showCancel: false
+      });
+      return false;
+    }
+
+    if (this.data.password != this.data.confirmPassword) {
+      wx.showModal({
+        title: '错误信息',
+        content: '确认密码不一致',
+        showCancel: false
+      });
+      return false;
+    }
+
+    if (this.data.mobile.length == 0 || this.data.code.length == 0) {
+      wx.showModal({
+        title: '错误信息',
+        content: '手机号和验证码不能为空',
+        showCancel: false
+      });
+      return false;
+    }
+
+    wx.login({
+      success: function(res) {
+        if (!res.code) {
+          wx.showModal({
+            title: '错误信息',
+            content: '注册失败',
+            showCancel: false
+          });
+        }
+
+        that.requestRegister(res.code);
+      }
+    });
+  },
+  bindUsernameInput: function(e) {
+
+    this.setData({
+      username: e.detail.value
+    });
+  },
+  bindPasswordInput: function(e) {
+
+    this.setData({
+      password: e.detail.value
+    });
+  },
+  bindConfirmPasswordInput: function(e) {
+
+    this.setData({
+      confirmPassword: e.detail.value
+    });
+  },
+  bindMobileInput: function(e) {
+
+    this.setData({
+      mobile: e.detail.value
+    });
+  },
+  bindCodeInput: function(e) {
+
+    this.setData({
+      code: e.detail.value
+    });
+  },
+  clearInput: function(e) {
+    switch (e.currentTarget.id) {
+      case 'clear-username':
+        this.setData({
+          username: ''
+        });
+        break;
+      case 'clear-password':
+        this.setData({
+          password: ''
+        });
+        break;
+      case 'clear-confirm-password':
+        this.setData({
+          confirmPassword: ''
+        });
+        break;
+      case 'clear-mobile':
+        this.setData({
+          mobile: ''
+        });
+        break;
+      case 'clear-code':
+        this.setData({
+          code: ''
+        });
+        break;
+    }
+  }
 })
\ No newline at end of file
diff --git a/litemall-wx/pages/auth/register/register.json b/litemall-wx/pages/auth/register/register.json
index 3de30889..f5fa51db 100644
--- a/litemall-wx/pages/auth/register/register.json
+++ b/litemall-wx/pages/auth/register/register.json
@@ -1,3 +1,3 @@
-{
-  "navigationBarTitleText": "注册"
+{
+  "navigationBarTitleText": "注册"
 }
\ No newline at end of file
diff --git a/litemall-wx/pages/auth/register/register.wxml b/litemall-wx/pages/auth/register/register.wxml
index c9522ea5..9c82c05c 100644
--- a/litemall-wx/pages/auth/register/register.wxml
+++ b/litemall-wx/pages/auth/register/register.wxml
@@ -1,35 +1,35 @@
-<view class="container">
-  <view class="form-box">
-
-    <view class="form-item">
-      <input class="username" value="{{username}}" bindinput="bindUsernameInput" placeholder="用户名" auto-focus/>
-      <van-icon  wx:if="{{ username.length > 0 }}" id="clear-username" class="clear" name="close" catchtap="clearInput"/>      
-    </view>
-
-    <view class="form-item">
-      <input class="password" value="{{password}}" password bindinput="bindPasswordInput" placeholder="密码" />
-      <van-icon class="clear" id="clear-password" wx:if="{{ password.length > 0 }}" name="close" catchtap="clearInput"/>      
-    </view>
-
-    <view class="form-item">
-      <input class="password" value="{{confirmPassword}}" password bindinput="bindConfirmPasswordInput" placeholder="确认密码" />
-      <van-icon class="clear" id="clear-confirm-password" wx:if="{{ confirmPassword.length > 0 }}" name="close" catchtap="clearInput"/>
-    </view>
-
-    <view class="form-item">
-      <input class="mobile" value="{{mobile}}" bindinput="bindMobileInput" placeholder="手机号" />
-      <van-icon class="clear" id="clear-mobile" wx:if="{{ mobile.length > 0 }}" name="close" catchtap="clearInput"/>      
-    </view>
-
-    <view class="form-item-code">
-      <view class="form-item code-item">
-        <input class="code" value="{{code}}" bindinput="bindCodeInput" placeholder="验证码" />
-        <van-icon class="clear" id="clear-code" wx:if="{{ code.length > 0 }}" name="close" catchtap="clearInput"/>      
-      </view>
-      <view class="code-btn" bindtap="sendCode">获取验证码</view>
-    </view>
-
-    <button type="primary" class="register-btn" bindtap="startRegister">注册</button>
-
-  </view>
+<view class="container">
+  <view class="form-box">
+
+    <view class="form-item">
+      <input class="username" value="{{username}}" bindinput="bindUsernameInput" placeholder="用户名" auto-focus/>
+      <van-icon  wx:if="{{ username.length > 0 }}" id="clear-username" class="clear" name="close" catchtap="clearInput"/>      
+    </view>
+
+    <view class="form-item">
+      <input class="password" value="{{password}}" password bindinput="bindPasswordInput" placeholder="密码" />
+      <van-icon class="clear" id="clear-password" wx:if="{{ password.length > 0 }}" name="close" catchtap="clearInput"/>      
+    </view>
+
+    <view class="form-item">
+      <input class="password" value="{{confirmPassword}}" password bindinput="bindConfirmPasswordInput" placeholder="确认密码" />
+      <van-icon class="clear" id="clear-confirm-password" wx:if="{{ confirmPassword.length > 0 }}" name="close" catchtap="clearInput"/>
+    </view>
+
+    <view class="form-item">
+      <input class="mobile" value="{{mobile}}" bindinput="bindMobileInput" placeholder="手机号" />
+      <van-icon class="clear" id="clear-mobile" wx:if="{{ mobile.length > 0 }}" name="close" catchtap="clearInput"/>      
+    </view>
+
+    <view class="form-item-code">
+      <view class="form-item code-item">
+        <input class="code" value="{{code}}" bindinput="bindCodeInput" placeholder="验证码" />
+        <van-icon class="clear" id="clear-code" wx:if="{{ code.length > 0 }}" name="close" catchtap="clearInput"/>      
+      </view>
+      <view class="code-btn" bindtap="sendCode">获取验证码</view>
+    </view>
+
+    <button type="primary" class="register-btn" bindtap="startRegister">注册</button>
+
+  </view>
 </view>
\ No newline at end of file
diff --git a/litemall-wx/pages/auth/register/register.wxss b/litemall-wx/pages/auth/register/register.wxss
index f762d7af..80a6cc4c 100644
--- a/litemall-wx/pages/auth/register/register.wxss
+++ b/litemall-wx/pages/auth/register/register.wxss
@@ -1,67 +1,67 @@
-.form-box {
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-  padding: 0 40rpx;
-  margin-top: 96rpx;
-  background: #fff;
-}
-
-.form-item {
-  position: relative;
-  background: #fff;
-  height: 96rpx;
-  border-bottom: 1px solid #d9d9d9;
-}
-
-.form-item .username, .form-item .password, .form-item .mobile, .form-item .code {
-  position: absolute;
-  top: 26rpx;
-  left: 0;
-  display: block;
-  width: 100%;
-  height: 44rpx;
-  background: #fff;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.form-item-code {
-  margin-top: 32rpx;
-  height: auto;
-  overflow: hidden;
-  width: 100%;
-}
-
-.form-item-code .form-item {
-  float: left;
-  width: 350rpx;
-}
-
-.form-item-code .code-btn {
-  float: right;
-  padding: 20rpx 40rpx;
-  border: 1px solid #d9d9d9;
-  border-radius: 10rpx;
-  color: #fff;
-  background: green;
-}
-
-.form-item .clear {
-  position: absolute;
-  top: 32rpx;
-  right: 18rpx;
-  z-index: 2;
-  display: block;
-  background: #fff;
-}
-
-.register-btn {
-  margin: 60rpx 0 40rpx 0;
-  height: 96rpx;
-  line-height: 96rpx;
-  color: #fff;
-  font-size: 30rpx;
-  width: 100%;
-  border-radius: 6rpx;
-}
+.form-box {
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+  padding: 0 40rpx;
+  margin-top: 96rpx;
+  background: #fff;
+}
+
+.form-item {
+  position: relative;
+  background: #fff;
+  height: 96rpx;
+  border-bottom: 1px solid #d9d9d9;
+}
+
+.form-item .username, .form-item .password, .form-item .mobile, .form-item .code {
+  position: absolute;
+  top: 26rpx;
+  left: 0;
+  display: block;
+  width: 100%;
+  height: 44rpx;
+  background: #fff;
+  color: #333;
+  font-size: 30rpx;
+}
+
+.form-item-code {
+  margin-top: 32rpx;
+  height: auto;
+  overflow: hidden;
+  width: 100%;
+}
+
+.form-item-code .form-item {
+  float: left;
+  width: 350rpx;
+}
+
+.form-item-code .code-btn {
+  float: right;
+  padding: 20rpx 40rpx;
+  border: 1px solid #d9d9d9;
+  border-radius: 10rpx;
+  color: #fff;
+  background: green;
+}
+
+.form-item .clear {
+  position: absolute;
+  top: 32rpx;
+  right: 18rpx;
+  z-index: 2;
+  display: block;
+  background: #fff;
+}
+
+.register-btn {
+  margin: 60rpx 0 40rpx 0;
+  height: 96rpx;
+  line-height: 96rpx;
+  color: #fff;
+  font-size: 30rpx;
+  width: 100%;
+  border-radius: 6rpx;
+}
diff --git a/litemall-wx/pages/auth/reset/reset.js b/litemall-wx/pages/auth/reset/reset.js
index 3e3fab66..90b137c8 100644
--- a/litemall-wx/pages/auth/reset/reset.js
+++ b/litemall-wx/pages/auth/reset/reset.js
@@ -1,163 +1,163 @@
-var api = require('../../../config/api.js');
-var check = require('../../../utils/check.js');
-
-var app = getApp();
-Page({
-  data: {
-    mobile: '',
-    code: '',
-    password: '',
-    confirmPassword: ''
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    // 页面渲染完成
-
-  },
-  onReady: function() {
-
-  },
-  onShow: function() {
-    // 页面显示
-
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-
-  },
-
-  sendCode: function() {
-    let that = this;
-    wx.request({
-      url: api.AuthRegisterCaptcha,
-      data: {
-        mobile: that.data.mobile
-      },
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      },
-      success: function(res) {
-        if (res.data.errno == 0) {
-          wx.showModal({
-            title: '发送成功',
-            content: '验证码已发送',
-            showCancel: false
-          });
-        } else {
-          wx.showModal({
-            title: '错误信息',
-            content: res.data.errmsg,
-            showCancel: false
-          });
-        }
-      }
-    });
-  },
-  startReset: function() {
-    var that = this;
-
-    if (this.data.mobile.length == 0 || this.data.code.length == 0) {
-      wx.showModal({
-        title: '错误信息',
-        content: '手机号和验证码不能为空',
-        showCancel: false
-      });
-      return false;
-    }
-
-    if (this.data.password.length < 3) {
-      wx.showModal({
-        title: '错误信息',
-        content: '用户名和密码不得少于3位',
-        showCancel: false
-      });
-      return false;
-    }
-
-    if (this.data.password != this.data.confirmPassword) {
-      wx.showModal({
-        title: '错误信息',
-        content: '确认密码不一致',
-        showCancel: false
-      });
-      return false;
-    }
-
-    wx.request({
-      url: api.AuthReset,
-      data: {
-        mobile: that.data.mobile,
-        code: that.data.code,
-        password: that.data.password
-      },
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      },
-      success: function(res) {
-        if (res.data.errno == 0) {
-          wx.navigateBack();
-        } else {
-          wx.showModal({
-            title: '密码重置失败',
-            content: res.data.errmsg,
-            showCancel: false
-          });
-        }
-      }
-    });
-  },
-  bindPasswordInput: function(e) {
-
-    this.setData({
-      password: e.detail.value
-    });
-  },
-  bindConfirmPasswordInput: function(e) {
-
-    this.setData({
-      confirmPassword: e.detail.value
-    });
-  },
-  bindMobileInput: function(e) {
-
-    this.setData({
-      mobile: e.detail.value
-    });
-  },
-  bindCodeInput: function(e) {
-
-    this.setData({
-      code: e.detail.value
-    });
-  },
-  clearInput: function(e) {
-    switch (e.currentTarget.id) {
-      case 'clear-password':
-        this.setData({
-          password: ''
-        });
-        break;
-      case 'clear-confirm-password':
-        this.setData({
-          confirmPassword: ''
-        });
-        break;
-      case 'clear-mobile':
-        this.setData({
-          mobile: ''
-        });
-        break;
-      case 'clear-code':
-        this.setData({
-          code: ''
-        });
-        break;
-    }
-  }
+var api = require('../../../config/api.js');
+var check = require('../../../utils/check.js');
+
+var app = getApp();
+Page({
+  data: {
+    mobile: '',
+    code: '',
+    password: '',
+    confirmPassword: ''
+  },
+  onLoad: function(options) {
+    // 页面初始化 options为页面跳转所带来的参数
+    // 页面渲染完成
+
+  },
+  onReady: function() {
+
+  },
+  onShow: function() {
+    // 页面显示
+
+  },
+  onHide: function() {
+    // 页面隐藏
+
+  },
+  onUnload: function() {
+    // 页面关闭
+
+  },
+
+  sendCode: function() {
+    let that = this;
+    wx.request({
+      url: api.AuthRegisterCaptcha,
+      data: {
+        mobile: that.data.mobile
+      },
+      method: 'POST',
+      header: {
+        'content-type': 'application/json'
+      },
+      success: function(res) {
+        if (res.data.errno == 0) {
+          wx.showModal({
+            title: '发送成功',
+            content: '验证码已发送',
+            showCancel: false
+          });
+        } else {
+          wx.showModal({
+            title: '错误信息',
+            content: res.data.errmsg,
+            showCancel: false
+          });
+        }
+      }
+    });
+  },
+  startReset: function() {
+    var that = this;
+
+    if (this.data.mobile.length == 0 || this.data.code.length == 0) {
+      wx.showModal({
+        title: '错误信息',
+        content: '手机号和验证码不能为空',
+        showCancel: false
+      });
+      return false;
+    }
+
+    if (this.data.password.length < 3) {
+      wx.showModal({
+        title: '错误信息',
+        content: '用户名和密码不得少于3位',
+        showCancel: false
+      });
+      return false;
+    }
+
+    if (this.data.password != this.data.confirmPassword) {
+      wx.showModal({
+        title: '错误信息',
+        content: '确认密码不一致',
+        showCancel: false
+      });
+      return false;
+    }
+
+    wx.request({
+      url: api.AuthReset,
+      data: {
+        mobile: that.data.mobile,
+        code: that.data.code,
+        password: that.data.password
+      },
+      method: 'POST',
+      header: {
+        'content-type': 'application/json'
+      },
+      success: function(res) {
+        if (res.data.errno == 0) {
+          wx.navigateBack();
+        } else {
+          wx.showModal({
+            title: '密码重置失败',
+            content: res.data.errmsg,
+            showCancel: false
+          });
+        }
+      }
+    });
+  },
+  bindPasswordInput: function(e) {
+
+    this.setData({
+      password: e.detail.value
+    });
+  },
+  bindConfirmPasswordInput: function(e) {
+
+    this.setData({
+      confirmPassword: e.detail.value
+    });
+  },
+  bindMobileInput: function(e) {
+
+    this.setData({
+      mobile: e.detail.value
+    });
+  },
+  bindCodeInput: function(e) {
+
+    this.setData({
+      code: e.detail.value
+    });
+  },
+  clearInput: function(e) {
+    switch (e.currentTarget.id) {
+      case 'clear-password':
+        this.setData({
+          password: ''
+        });
+        break;
+      case 'clear-confirm-password':
+        this.setData({
+          confirmPassword: ''
+        });
+        break;
+      case 'clear-mobile':
+        this.setData({
+          mobile: ''
+        });
+        break;
+      case 'clear-code':
+        this.setData({
+          code: ''
+        });
+        break;
+    }
+  }
 })
\ No newline at end of file
diff --git a/litemall-wx/pages/auth/reset/reset.json b/litemall-wx/pages/auth/reset/reset.json
index 1292cd1b..5cfa3053 100644
--- a/litemall-wx/pages/auth/reset/reset.json
+++ b/litemall-wx/pages/auth/reset/reset.json
@@ -1,3 +1,3 @@
-{
-  "navigationBarTitleText": "密码重置"
+{
+  "navigationBarTitleText": "密码重置"
 }
\ No newline at end of file
diff --git a/litemall-wx/pages/auth/reset/reset.wxml b/litemall-wx/pages/auth/reset/reset.wxml
index a3a62515..bd941e86 100644
--- a/litemall-wx/pages/auth/reset/reset.wxml
+++ b/litemall-wx/pages/auth/reset/reset.wxml
@@ -1,30 +1,30 @@
-<view class="container">
-  <view class="form-box">
-
-    <view class="form-item">
-      <input class="mobile" value="{{mobile}}" bindinput="bindMobileInput" placeholder="手机号" />
-      <van-icon  wx:if="{{ mobile.length > 0 }}" id="clear-mobile" class="clear" catchtap="clearInput" name="close" />      
-    </view>
-
-    <view class="form-item-code">
-      <view class="form-item code-item">
-        <input class="code" value="{{code}}" bindinput="bindCodeInput" placeholder="验证码" />
-        <van-icon  wx:if="{{ code.length > 0 }}" id="clear-code" class="clear" catchtap="clearInput" name="close" />      
-      </view>
-      <view class="code-btn" bindtap="sendCode">获取验证码</view>
-    </view>
-
-    <view class="form-item">
-      <input class="password" value="{{password}}" password bindinput="bindPasswordInput" placeholder="密码" />
-      <van-icon  wx:if="{{ password.length > 0 }}" id="clear-password" class="clear" catchtap="clearInput" name="close" />      
-    </view>
-
-    <view class="form-item">
-      <input class="password" value="{{confirmPassword}}" password bindinput="bindConfirmPasswordInput" placeholder="确认密码" />
-      <van-icon  wx:if="{{ confirmPassword.length > 0 }}" id="clear-confirm-password" class="clear" catchtap="clearInput" name="close" />
-    </view>
-
-    <button type="default" class="reset-btn" bindtap="startReset">密码重置</button>
-
-  </view>
+<view class="container">
+  <view class="form-box">
+
+    <view class="form-item">
+      <input class="mobile" value="{{mobile}}" bindinput="bindMobileInput" placeholder="手机号" />
+      <van-icon  wx:if="{{ mobile.length > 0 }}" id="clear-mobile" class="clear" catchtap="clearInput" name="close" />      
+    </view>
+
+    <view class="form-item-code">
+      <view class="form-item code-item">
+        <input class="code" value="{{code}}" bindinput="bindCodeInput" placeholder="验证码" />
+        <van-icon  wx:if="{{ code.length > 0 }}" id="clear-code" class="clear" catchtap="clearInput" name="close" />      
+      </view>
+      <view class="code-btn" bindtap="sendCode">获取验证码</view>
+    </view>
+
+    <view class="form-item">
+      <input class="password" value="{{password}}" password bindinput="bindPasswordInput" placeholder="密码" />
+      <van-icon  wx:if="{{ password.length > 0 }}" id="clear-password" class="clear" catchtap="clearInput" name="close" />      
+    </view>
+
+    <view class="form-item">
+      <input class="password" value="{{confirmPassword}}" password bindinput="bindConfirmPasswordInput" placeholder="确认密码" />
+      <van-icon  wx:if="{{ confirmPassword.length > 0 }}" id="clear-confirm-password" class="clear" catchtap="clearInput" name="close" />
+    </view>
+
+    <button type="default" class="reset-btn" bindtap="startReset">密码重置</button>
+
+  </view>
 </view>
\ No newline at end of file
diff --git a/litemall-wx/pages/auth/reset/reset.wxss b/litemall-wx/pages/auth/reset/reset.wxss
index c432696e..325779b7 100644
--- a/litemall-wx/pages/auth/reset/reset.wxss
+++ b/litemall-wx/pages/auth/reset/reset.wxss
@@ -1,66 +1,66 @@
-.form-box {
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-  padding: 0 40rpx;
-  margin-top: 96rpx;
-  background: #fff;
-}
-
-.form-item {
-  position: relative;
-  background: #fff;
-  height: 96rpx;
-  border-bottom: 1px solid #d9d9d9;
-}
-
-.form-item .mobile, .form-item .password, .form-item .code {
-  position: absolute;
-  top: 26rpx;
-  left: 0;
-  display: block;
-  width: 100%;
-  height: 44rpx;
-  background: #fff;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.form-item-code {
-  margin-top: 32rpx;
-  height: auto;
-  overflow: hidden;
-  width: 100%;
-}
-
-.form-item-code .form-item {
-  float: left;
-  width: 350rpx;
-}
-
-.form-item-code .code-btn {
-  float: right;
-  padding: 20rpx 40rpx;
-  border: 1px solid #d9d9d9;
-  border-radius: 10rpx;
-}
-
-.form-item .clear {
-  position: absolute;
-  top: 32rpx;
-  right: 18rpx;
-  z-index: 2;
-  display: block;
-  background: #fff;
-}
-
-.reset-btn {
-  margin: 60rpx 0 40rpx 0;
-  height: 96rpx;
-  line-height: 96rpx;
-  color: #fff;
-  font-size: 30rpx;
-  width: 100%;
-  background: #b4282d;
-  border-radius: 6rpx;
-}
+.form-box {
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+  padding: 0 40rpx;
+  margin-top: 96rpx;
+  background: #fff;
+}
+
+.form-item {
+  position: relative;
+  background: #fff;
+  height: 96rpx;
+  border-bottom: 1px solid #d9d9d9;
+}
+
+.form-item .mobile, .form-item .password, .form-item .code {
+  position: absolute;
+  top: 26rpx;
+  left: 0;
+  display: block;
+  width: 100%;
+  height: 44rpx;
+  background: #fff;
+  color: #333;
+  font-size: 30rpx;
+}
+
+.form-item-code {
+  margin-top: 32rpx;
+  height: auto;
+  overflow: hidden;
+  width: 100%;
+}
+
+.form-item-code .form-item {
+  float: left;
+  width: 350rpx;
+}
+
+.form-item-code .code-btn {
+  float: right;
+  padding: 20rpx 40rpx;
+  border: 1px solid #d9d9d9;
+  border-radius: 10rpx;
+}
+
+.form-item .clear {
+  position: absolute;
+  top: 32rpx;
+  right: 18rpx;
+  z-index: 2;
+  display: block;
+  background: #fff;
+}
+
+.reset-btn {
+  margin: 60rpx 0 40rpx 0;
+  height: 96rpx;
+  line-height: 96rpx;
+  color: #fff;
+  font-size: 30rpx;
+  width: 100%;
+  background: #b4282d;
+  border-radius: 6rpx;
+}
diff --git a/litemall-wx/pages/brand/brand.json b/litemall-wx/pages/brand/brand.json
deleted file mode 100644
index 7e072fdc..00000000
--- a/litemall-wx/pages/brand/brand.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "品牌商直供"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/brand/brand.wxml b/litemall-wx/pages/brand/brand.wxml
deleted file mode 100644
index ef2e2b9a..00000000
--- a/litemall-wx/pages/brand/brand.wxml
+++ /dev/null
@@ -1,16 +0,0 @@
-<view class="container">
-  <view class="brand-list">
-    <navigator url="../brandDetail/brandDetail?id={{item.id}}" class="item" wx:for="{{brandList}}" wx:key="id">
-      <view class="img-bg">
-        <image src="{{item.picUrl}}" background-size="cover"></image>
-      </view>
-      <view class="txt-box">
-        <view class="line">
-          <text class="name">{{item.name}}</text>
-          <text class="s">|</text>
-          <text class="price">{{item.floorPrice}}元起</text>
-        </view>
-      </view>
-    </navigator>
-  </view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/brand/brand.wxss b/litemall-wx/pages/brand/brand.wxss
deleted file mode 100644
index 4fdc8c57..00000000
--- a/litemall-wx/pages/brand/brand.wxss
+++ /dev/null
@@ -1,52 +0,0 @@
-.brand-list .item {
-  display: block;
-  width: 750rpx;
-  height: 416rpx;
-  position: relative;
-  margin-bottom: 4rpx;
-}
-
-.brand-list .item .img-bg {
-  position: absolute;
-  left: 0;
-  top: 0;
-  z-index: 0;
-  width: 750rpx;
-  height: 417rpx;
-  overflow: hidden;
-}
-
-.brand-list .item .img-bg image {
-  width: 750rpx;
-  height: 416rpx;
-}
-
-.brand-list .item .txt-box {
-  position: absolute;
-  left: 0;
-  top: 0;
-  display: table;
-  z-index: 0;
-  width: 750rpx;
-  height: 417rpx;
-}
-
-.brand-list .item .line {
-  display: table-cell;
-  vertical-align: middle;
-  text-align: center;
-  height: 63rpx;
-  line-height: 63rpx;
-}
-
-.brand-list .item .line text {
-  font-size: 35rpx;
-  font-weight: 700;
-  text-shadow: 1rpx 1rpx rgba(0, 0, 0, 0.32);
-  color: #fff;
-}
-
-.brand-list .item .line .s {
-  padding: 0 10rpx;
-  font-size: 40rpx;
-}
diff --git a/litemall-wx/pages/brandDetail/brandDetail.js b/litemall-wx/pages/brandDetail/brandDetail.js
deleted file mode 100644
index e19772bf..00000000
--- a/litemall-wx/pages/brandDetail/brandDetail.js
+++ /dev/null
@@ -1,69 +0,0 @@
-var util = require('../../utils/util.js');
-var api = require('../../config/api.js');
-
-
-var app = getApp();
-
-Page({
-  data: {
-    id: 0,
-    brand: {},
-    goodsList: [],
-    page: 1,
-    limit: 10
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    var that = this;
-    that.setData({
-      id: parseInt(options.id)
-    });
-    this.getBrand();
-  },
-  getBrand: function() {
-    let that = this;
-    util.request(api.BrandDetail, {
-      id: that.data.id
-    }).then(function(res) {
-      if (res.errno === 0) {
-        that.setData({
-          brand: res.data
-        });
-
-        that.getGoodsList();
-      }
-    });
-  },
-  getGoodsList() {
-    var that = this;
-
-    util.request(api.GoodsList, {
-        brandId: that.data.id,
-        page: that.data.page,
-        limit: that.data.limit
-      })
-      .then(function(res) {
-        if (res.errno === 0) {
-          that.setData({
-            goodsList: res.data.list
-          });
-        }
-      });
-  },
-  onReady: function() {
-    // 页面渲染完成
-
-  },
-  onShow: function() {
-    // 页面显示
-
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/brandDetail/brandDetail.json b/litemall-wx/pages/brandDetail/brandDetail.json
deleted file mode 100644
index 99152bd8..00000000
--- a/litemall-wx/pages/brandDetail/brandDetail.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "品牌商详情"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/brandDetail/brandDetail.wxml b/litemall-wx/pages/brandDetail/brandDetail.wxml
deleted file mode 100644
index bf4e9ed4..00000000
--- a/litemall-wx/pages/brandDetail/brandDetail.wxml
+++ /dev/null
@@ -1,28 +0,0 @@
-<view class="container">
-  <view class="brand-info">
-    <view class="name">
-      <image class="img" src="{{brand.picUrl}}" background-size="cover"></image>
-      <view class="info-box">
-        <view class="info">
-          <text class="txt">{{brand.name}}</text>
-          <text class="line"></text>
-        </view>
-      </view>
-    </view>
-    <view class="desc">
-      {{brand.desc}}
-    </view>
-  </view>
-
-  <view class="cate-item">
-    <view class="b">
-      <block wx:for="{{goodsList}}" wx:key="id" wx:for-index="iindex" wx:for-item="iitem">
-        <navigator class="item {{iindex % 2 == 0 ? 'item-b' : ''}}" url="../goods/goods?id={{iitem.id}}">
-          <image class="img" src="{{iitem.picUrl}}" background-size="cover"></image>
-          <text class="name">{{iitem.name}}</text>
-          <text class="price">￥{{iitem.retailPrice}}</text>
-        </navigator>
-      </block>
-    </view>
-  </view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/brandDetail/brandDetail.wxss b/litemall-wx/pages/brandDetail/brandDetail.wxss
deleted file mode 100644
index 3126093f..00000000
--- a/litemall-wx/pages/brandDetail/brandDetail.wxss
+++ /dev/null
@@ -1,111 +0,0 @@
-page {
-  background: #f4f4f4;
-}
-
-.brand-info .name {
-  width: 100%;
-  height: 290rpx;
-  position: relative;
-}
-
-.brand-info .img {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 290rpx;
-}
-
-.brand-info .info-box {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 290rpx;
-  text-align: center;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.brand-info .info {
-  display: block;
-}
-
-.brand-info .txt {
-  display: block;
-  height: 37.5rpx;
-  font-size: 37.5rpx;
-  color: #fff;
-}
-
-.brand-info .line {
-  margin: 0 auto;
-  margin-top: 16rpx;
-  display: block;
-  height: 2rpx;
-  width: 145rpx;
-  background: #fff;
-}
-
-.brand-info .desc {
-  background: #fff;
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-  padding: 41.5rpx 31.25rpx;
-  font-size: 30rpx;
-  color: #666;
-  line-height: 41.5rpx;
-  text-align: center;
-}
-
-.cate-item .b {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-  border-top: 1rpx solid #f4f4f4;
-  margin-top: 20rpx;
-}
-
-.cate-item .b .item {
-  float: left;
-  background: #fff;
-  width: 375rpx;
-  padding-bottom: 33.333rpx;
-  border-bottom: 1rpx solid #f4f4f4;
-  height: auto;
-  overflow: hidden;
-  text-align: center;
-}
-
-.cate-item .b .item-b {
-  border-right: 1rpx solid #f4f4f4;
-}
-
-.cate-item .item .img {
-  margin-top: 10rpx;
-  width: 302rpx;
-  height: 302rpx;
-}
-
-.cate-item .item .name {
-  display: block;
-  width: 365.625rpx;
-  height: 35rpx;
-  padding: 0 20rpx;
-  overflow: hidden;
-  margin: 11.5rpx 0 22rpx 0;
-  text-align: center;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.cate-item .item .price {
-  display: block;
-  width: 365.625rpx;
-  height: 30rpx;
-  text-align: center;
-  font-size: 30rpx;
-  color: #b4282d;
-}
diff --git a/litemall-wx/pages/cart/cart.js b/litemall-wx/pages/cart/cart.js
deleted file mode 100644
index 65552bce..00000000
--- a/litemall-wx/pages/cart/cart.js
+++ /dev/null
@@ -1,303 +0,0 @@
-var util = require('../../utils/util.js');
-var api = require('../../config/api.js');
-var user = require('../../utils/user.js');
-
-var app = getApp();
-
-Page({
-  data: {
-    cartGoods: [],
-    cartTotal: {
-      "goodsCount": 0,
-      "goodsAmount": 0.00,
-      "checkedGoodsCount": 0,
-      "checkedGoodsAmount": 0.00
-    },
-    isEditCart: false,
-    checkedAllStatus: true,
-    editCartList: [],
-    hasLogin: false
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-  },
-  onReady: function() {
-    // 页面渲染完成
-  },
-  onPullDownRefresh() {
-    wx.showNavigationBarLoading() //在标题栏中显示加载
-    this.getCartList();
-    wx.hideNavigationBarLoading() //完成停止加载
-    wx.stopPullDownRefresh() //停止下拉刷新
-  },
-  onShow: function() {
-    // 页面显示
-    if (app.globalData.hasLogin) {
-      this.getCartList();
-    }
-
-    this.setData({
-      hasLogin: app.globalData.hasLogin
-    });
-
-  },
-  onHide: function() {
-    // 页面隐藏
-  },
-  onUnload: function() {
-    // 页面关闭
-  },
-  goLogin() {
-    wx.navigateTo({
-      url: "/pages/auth/login/login"
-    });
-  },
-  getCartList: function() {
-    let that = this;
-    util.request(api.CartList).then(function(res) {
-      if (res.errno === 0) {
-        that.setData({
-          cartGoods: res.data.cartList,
-          cartTotal: res.data.cartTotal
-        });
-
-        that.setData({
-          checkedAllStatus: that.isCheckedAll()
-        });
-      }
-    });
-  },
-  isCheckedAll: function() {
-    //判断购物车商品已全选
-    return this.data.cartGoods.every(function(element, index, array) {
-      if (element.checked == true) {
-        return true;
-      } else {
-        return false;
-      }
-    });
-  },
-  doCheckedAll: function() {
-    let checkedAll = this.isCheckedAll()
-    this.setData({
-      checkedAllStatus: this.isCheckedAll()
-    });
-  },
-  checkedItem: function(event) {
-    let itemIndex = event.target.dataset.itemIndex;
-    let that = this;
-
-    let productIds = [];
-    productIds.push(that.data.cartGoods[itemIndex].productId);
-    if (!this.data.isEditCart) {
-      util.request(api.CartChecked, {
-        productIds: productIds,
-        isChecked: that.data.cartGoods[itemIndex].checked ? 0 : 1
-      }, 'POST').then(function(res) {
-        if (res.errno === 0) {
-          that.setData({
-            cartGoods: res.data.cartList,
-            cartTotal: res.data.cartTotal
-          });
-        }
-
-        that.setData({
-          checkedAllStatus: that.isCheckedAll()
-        });
-      });
-    } else {
-      //编辑状态
-      let tmpCartData = this.data.cartGoods.map(function(element, index, array) {
-        if (index == itemIndex) {
-          element.checked = !element.checked;
-        }
-
-        return element;
-      });
-
-      that.setData({
-        cartGoods: tmpCartData,
-        checkedAllStatus: that.isCheckedAll(),
-        'cartTotal.checkedGoodsCount': that.getCheckedGoodsCount()
-      });
-    }
-  },
-  getCheckedGoodsCount: function() {
-    let checkedGoodsCount = 0;
-    this.data.cartGoods.forEach(function(v) {
-      if (v.checked === true) {
-        checkedGoodsCount += v.number;
-      }
-    });
-    console.log(checkedGoodsCount);
-    return checkedGoodsCount;
-  },
-  checkedAll: function() {
-    let that = this;
-
-    if (!this.data.isEditCart) {
-      var productIds = this.data.cartGoods.map(function(v) {
-        return v.productId;
-      });
-      util.request(api.CartChecked, {
-        productIds: productIds,
-        isChecked: that.isCheckedAll() ? 0 : 1
-      }, 'POST').then(function(res) {
-        if (res.errno === 0) {
-          console.log(res.data);
-          that.setData({
-            cartGoods: res.data.cartList,
-            cartTotal: res.data.cartTotal
-          });
-        }
-
-        that.setData({
-          checkedAllStatus: that.isCheckedAll()
-        });
-      });
-    } else {
-      //编辑状态
-      let checkedAllStatus = that.isCheckedAll();
-      let tmpCartData = this.data.cartGoods.map(function(v) {
-        v.checked = !checkedAllStatus;
-        return v;
-      });
-
-      that.setData({
-        cartGoods: tmpCartData,
-        checkedAllStatus: that.isCheckedAll(),
-        'cartTotal.checkedGoodsCount': that.getCheckedGoodsCount()
-      });
-    }
-
-  },
-  editCart: function() {
-    var that = this;
-    if (this.data.isEditCart) {
-      this.getCartList();
-      this.setData({
-        isEditCart: !this.data.isEditCart
-      });
-    } else {
-      //编辑状态
-      let tmpCartList = this.data.cartGoods.map(function(v) {
-        v.checked = false;
-        return v;
-      });
-      this.setData({
-        editCartList: this.data.cartGoods,
-        cartGoods: tmpCartList,
-        isEditCart: !this.data.isEditCart,
-        checkedAllStatus: that.isCheckedAll(),
-        'cartTotal.checkedGoodsCount': that.getCheckedGoodsCount()
-      });
-    }
-
-  },
-  updateCart: function(productId, goodsId, number, id) {
-    let that = this;
-
-    util.request(api.CartUpdate, {
-      productId: productId,
-      goodsId: goodsId,
-      number: number,
-      id: id
-    }, 'POST').then(function(res) {
-      that.setData({
-        checkedAllStatus: that.isCheckedAll()
-      });
-    });
-
-  },
-  cutNumber: function(event) {
-
-    let itemIndex = event.target.dataset.itemIndex;
-    let cartItem = this.data.cartGoods[itemIndex];
-    let number = (cartItem.number - 1 > 1) ? cartItem.number - 1 : 1;
-    cartItem.number = number;
-    this.setData({
-      cartGoods: this.data.cartGoods
-    });
-    this.updateCart(cartItem.productId, cartItem.goodsId, number, cartItem.id);
-  },
-  addNumber: function(event) {
-    let itemIndex = event.target.dataset.itemIndex;
-    let cartItem = this.data.cartGoods[itemIndex];
-    let number = cartItem.number + 1;
-    cartItem.number = number;
-    this.setData({
-      cartGoods: this.data.cartGoods
-    });
-    this.updateCart(cartItem.productId, cartItem.goodsId, number, cartItem.id);
-
-  },
-  checkoutOrder: function() {
-    //获取已选择的商品
-    let that = this;
-
-    var checkedGoods = this.data.cartGoods.filter(function(element, index, array) {
-      if (element.checked == true) {
-        return true;
-      } else {
-        return false;
-      }
-    });
-
-    if (checkedGoods.length <= 0) {
-      return false;
-    }
-
-    // storage中设置了cartId，则是购物车购买
-    try {
-      wx.setStorageSync('cartId', 0);
-      wx.navigateTo({
-        url: '/pages/checkout/checkout'
-      })
-    } catch (e) {}
-
-  },
-  deleteCart: function() {
-    //获取已选择的商品
-    let that = this;
-
-    let productIds = this.data.cartGoods.filter(function(element, index, array) {
-      if (element.checked == true) {
-        return true;
-      } else {
-        return false;
-      }
-    });
-
-    if (productIds.length <= 0) {
-      return false;
-    }
-
-    productIds = productIds.map(function(element, index, array) {
-      if (element.checked == true) {
-        return element.productId;
-      }
-    });
-
-
-    util.request(api.CartDelete, {
-      productIds: productIds
-    }, 'POST').then(function(res) {
-      if (res.errno === 0) {
-        console.log(res.data);
-        let cartList = res.data.cartList.map(v => {
-          v.checked = false;
-          return v;
-        });
-
-        that.setData({
-          cartGoods: cartList,
-          cartTotal: res.data.cartTotal
-        });
-      }
-
-      that.setData({
-        checkedAllStatus: that.isCheckedAll()
-      });
-    });
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/cart/cart.json b/litemall-wx/pages/cart/cart.json
deleted file mode 100644
index ef6c8d4b..00000000
--- a/litemall-wx/pages/cart/cart.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "enablePullDownRefresh": true,
-  "navigationBarTitleText": "购物车"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/cart/cart.wxml b/litemall-wx/pages/cart/cart.wxml
deleted file mode 100644
index 15bcda19..00000000
--- a/litemall-wx/pages/cart/cart.wxml
+++ /dev/null
@@ -1,61 +0,0 @@
-<view class="container">
-  <view class="no-login" wx:if="{{!hasLogin}}">
-    <view class="c">
-      <text>还没有登录</text>
-      <button style="background-color:#A9A9A9" bindtap="goLogin">去登录</button>
-    </view>
-  </view>
-  <view class='login' wx:else>
-    <view class="service-policy">
-      <view class="item">30天无忧退货</view>
-      <view class="item">48小时快速退款</view>
-      <view class="item">满88元免邮费</view>
-    </view>
-    <view class="no-cart" wx:if="{{cartGoods.length <= 0}}">
-      <view class="c">
-        <text>空空如也~</text>
-        <text>去添加点什么吧</text>
-      </view>
-    </view>
-    <view class="cart-view" wx:else>
-      <view class="list">
-        <view class="group-item">
-          <view class="goods">
-            <view class="item {{isEditCart ? 'edit' : ''}}" wx:for="{{cartGoods}}" wx:key="id">
-              <van-checkbox value="{{ item.checked }}" bind:change="checkedItem" data-item-index="{{index}}"></van-checkbox>
-              <view class="cart-goods">
-                <image class="img" src="{{item.picUrl}}"></image>
-                <view class="info">
-                  <view class="t">
-                    <text class="name">{{item.goodsName}}</text>
-                    <text class="num">x{{item.number}}</text>
-                  </view>
-                  <view class="attr">{{ isEditCart ? '已选择:' : ''}}{{item.specifications||''}}</view>
-                  <view class="b">
-                    <text class="price">￥{{item.price}}</text>
-                    <view class="selnum">
-                      <view class="cut" bindtap="cutNumber" data-item-index="{{index}}">-</view>
-                      <input value="{{item.number}}" class="number" disabled="true" type="number" />
-                      <view class="add" bindtap="addNumber" data-item-index="{{index}}">+</view>
-                    </view>
-                  </view>
-                </view>
-              </view>
-            </view>
-          </view>
-        </view>
-
-      </view>
-      <view class="cart-bottom">
-        <van-checkbox value="{{ checkedAllStatus }}" bind:change="checkedAll">全选（{{cartTotal.checkedGoodsCount}}）</van-checkbox>
-        <view class="total">{{!isEditCart ? '￥'+cartTotal.checkedGoodsAmount : ''}}</view>
-        <view class='action_btn_area'>
-          <view class="{{!isEditCart ? 'edit' : 'sure'}}" bindtap="editCart">{{!isEditCart ? '编辑' : '完成'}}</view>
-          <view class="delete" bindtap="deleteCart" wx:if="{{isEditCart}}">删除({{cartTotal.checkedGoodsCount}})</view>
-          <view class="checkout" bindtap="checkoutOrder" wx:if="{{!isEditCart}}">下单</view>
-          <!-- </view>  -->
-        </view>
-      </view>
-    </view>
-  </view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/cart/cart.wxss b/litemall-wx/pages/cart/cart.wxss
deleted file mode 100644
index 31e5eac8..00000000
--- a/litemall-wx/pages/cart/cart.wxss
+++ /dev/null
@@ -1,492 +0,0 @@
-page {
-  height: 100%;
-  min-height: 100%;
-  background: #f4f4f4;
-}
-
-.container {
-  background: #f4f4f4;
-  width: 100%;
-  height: auto;
-  min-height: 100%;
-  overflow: hidden;
-}
-
-.service-policy {
-  width: 750rpx;
-  height: 73rpx;
-  background: #f4f4f4;
-  padding: 0 31.25rpx;
-  display: flex;
-  flex-flow: row nowrap;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.service-policy .item {
-  background-size: 10rpx;
-  padding-left: 15rpx;
-  display: flex;
-  align-items: center;
-  font-size: 25rpx;
-  color: #666;
-}
-
-.no-login {
-  width: 100%;
-  height: auto;
-  margin: 0 auto;
-}
-
-.no-login .c {
-  width: 100%;
-  height: auto;
-  margin-top: 400rpx;
-}
-
-.no-login .c text {
-  margin: 0 auto;
-  display: block;
-  width: 258rpx;
-  height: 59rpx;
-  line-height: 29rpx;
-  text-align: center;
-  font-size: 35rpx;
-  color: #999;
-}
-
-.no-login button {
-  width: 90%;
-  margin: 0 auto;
-  color: #fff;
-  font-size: 30rpx;
-  height: 96rpx;
-  line-height: 96rpx;
-  right: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  position: flex;
-  bottom: 0;
-  left: 0;
-  border-radius: 0;
-  padding: 0;
-  margin-left: 5%;
-  text-align: center;
-  /* padding-left: -5rpx; */
-  border-top-left-radius: 50rpx;
-  border-bottom-left-radius: 50rpx;
-  border-top-right-radius: 50rpx;
-  border-bottom-right-radius: 50rpx;
-  letter-spacing: 3rpx;
-  background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
-}
-
-.no-cart {
-  width: 100%;
-  height: auto;
-  margin: 0 auto;
-}
-
-.no-cart .c {
-  width: 100%;
-  height: auto;
-  margin-top: 400rpx;
-}
-
-.no-cart .c text {
-  margin: 0 auto;
-  display: block;
-  width: 258rpx;
-  height: 29rpx;
-  line-height: 29rpx;
-  text-align: center;
-  font-size: 29rpx;
-  color: #999;
-}
-
-.cart-view {
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-}
-
-.cart-view .list {
-  height: auto;
-  width: 100%;
-  overflow: hidden;
-  margin-bottom: 120rpx;
-}
-
-.cart-view .group-item {
-  height: auto;
-  width: 100%;
-  background: #fff;
-  margin-bottom: 18rpx;
-}
-
-.cart-view .item {
-  height: 164rpx;
-  width: 100%;
-  overflow: hidden;
-}
-
-.cart-view .item .van-checkbox {
-  float: left;
-  margin: 65rpx 18rpx 65rpx 18rpx;
-}
-
-.cart-view .item .van-checkbox .van-icon {
-  color: #fff;
-}
-
-.cart-view .item .cart-goods {
-  float: left;
-  height: 164rpx;
-  width: 672rpx;
-  border-bottom: 1px solid #f4f4f4;
-}
-
-.cart-view .item .img {
-  float: left;
-  height: 125rpx;
-  width: 125rpx;
-  background: #f4f4f4;
-  margin: 19.5rpx 18rpx 19.5rpx 0;
-}
-
-.cart-view .item .info {
-  float: left;
-  height: 125rpx;
-  width: 503rpx;
-  margin: 19.5rpx 26rpx 19.5rpx 0;
-}
-
-.cart-view .item .t {
-  margin: 8rpx 0;
-  height: 28rpx;
-  font-size: 25rpx;
-  color: #333;
-  overflow: hidden;
-}
-
-.cart-view .item .name {
-  height: 28rpx;
-  max-width: 310rpx;
-  line-height: 28rpx;
-  font-size: 25rpx;
-  color: #333;
-  overflow: hidden;
-}
-
-.cart-view .item .num {
-  height: 28rpx;
-  line-height: 28rpx;
-  float: right;
-}
-
-.cart-view .item .attr {
-  margin-bottom: 17rpx;
-  height: 24rpx;
-  line-height: 24rpx;
-  font-size: 22rpx;
-  color: #666;
-  overflow: hidden;
-}
-
-.cart-view .item .b {
-  height: 28rpx;
-  line-height: 28rpx;
-  font-size: 25rpx;
-  color: #333;
-  overflow: hidden;
-}
-
-.cart-view .item .price {
-  float: left;
-}
-
-.cart-view .item.edit .t {
-  display: none;
-}
-
-.cart-view .item.edit .attr {
-  text-align: right;
-  padding-right: 25rpx;
-  background-size: 12rpx 20rpx;
-  margin-bottom: 24rpx;
-  height: 39rpx;
-  line-height: 39rpx;
-  font-size: 24rpx;
-  color: #999;
-  overflow: hidden;
-}
-
-.cart-view .item.edit .b {
-  display: flex;
-  height: 52rpx;
-  overflow: hidden;
-}
-
-.cart-view .item.edit .price {
-  line-height: 52rpx;
-  height: 52rpx;
-  flex: 1;
-}
-
-.cart-view .item .selnum {
-  display: none;
-}
-
-.cart-view .item.edit .selnum {
-  width: 235rpx;
-  height: 52rpx;
-  border: 1rpx solid #ccc;
-  display: flex;
-}
-
-.selnum .cut {
-  width: 70rpx;
-  height: 100%;
-  text-align: center;
-  line-height: 50rpx;
-}
-
-.selnum .number {
-  flex: 1;
-  height: 100%;
-  text-align: center;
-  line-height: 68.75rpx;
-  border-left: 1px solid #ccc;
-  border-right: 1px solid #ccc;
-  float: left;
-}
-
-.selnum .add {
-  width: 80rpx;
-  height: 100%;
-  text-align: center;
-  line-height: 50rpx;
-}
-
-.cart-view .group-item .header {
-  width: 100%;
-  height: 94rpx;
-  line-height: 94rpx;
-  padding: 0 26rpx;
-  border-bottom: 1px solid #f4f4f4;
-}
-
-.cart-view .promotion .icon {
-  display: inline-block;
-  height: 24rpx;
-  width: 15rpx;
-}
-
-.cart-view .promotion {
-  margin-top: 25.5rpx;
-  float: left;
-  height: 43rpx;
-  width: 480rpx;
-  /*margin-right: 84rpx;*/
-  line-height: 43rpx;
-  font-size: 0;
-}
-
-.cart-view .promotion .tag {
-  border: 1px solid #f48f18;
-  height: 37rpx;
-  line-height: 31rpx;
-  padding: 0 9rpx;
-  margin-right: 10rpx;
-  color: #f48f18;
-  font-size: 24.5rpx;
-}
-
-.cart-view .promotion .txt {
-  height: 43rpx;
-  line-height: 43rpx;
-  padding-right: 10rpx;
-  color: #333;
-  font-size: 29rpx;
-  overflow: hidden;
-}
-
-.cart-view .get {
-  margin-top: 18rpx;
-  float: right;
-  height: 58rpx;
-  padding-left: 14rpx;
-  border-left: 1px solid #d9d9d9;
-  line-height: 58rpx;
-  font-size: 29rpx;
-  color: #333;
-}
-
-.cart-bottom {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  height: 100rpx;
-  width: 100%;
-  background: #fff;
-  display: flex;
-}
-
-.cart-bottom .van-checkbox {
-  float: left;
-  margin: 33rpx 18rpx 33rpx 26rpx;
-    font-size: 29rpx;
-}
-
-.cart-bottom .van-checkbox .van-icon {
-  color: #fff;
-}
-
-.cart-bottom .total {
-  height: 34rpx;
-  flex: 1;
-  margin: 33rpx 10rpx;
-  font-size: 29rpx;
-}
-
-.cart-bottom .delete {
-  text-align: center;
-  width: 180rpx;
-  height: 80rpx;
-  line-height: 82rpx;
-  padding: 0;
-  margin: 0;
-  margin-left: -5rpx;
-  padding-right: 25rpx;
-  font-size: 25rpx;
-  color: #f4f4f4;
-  /* text-align: center; */
-  border-top-left-radius: 0rpx;
-  border-bottom-left-radius: 0rpx;
-  border-top-right-radius: 50rpx;
-  border-bottom-right-radius: 50rpx;
-  letter-spacing: 3rpx;
-  background-image: linear-gradient(to right, #9a9ba1 0%, #ae8b9c 100%);
-}
-
-.cart-bottom .checkout {
-  height: 100rpx;
-  width: 210rpx;
-  text-align: center;
-  line-height: 100rpx;
-  font-size: 29rpx;
-  background: #b4282d;
-  color: #fff;
-}
-
-.action_btn_area {
-  /* border: 1px solid #333; */
-  position: absolute;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  right: 0;
-  top: 0;
-  width: 380rpx;
-  height: 100rpx;
-}
-
-.action_btn_area .edit {
-  width: 140rpx;
-  /* border: 1px solid #000; */
-  height: 80rpx;
-  line-height: 82rpx;
-  padding: 0;
-  margin: 0;
-  margin-right: 5rpx;
-  text-align: center;
-  /* padding-left: 25rpx; */
-  font-size: 25rpx;
-  color: #f4f4f4;
-  border-top-left-radius: 50rpx;
-  border-bottom-left-radius: 50rpx;
-  border-top-right-radius: 50rpx;
-  border-bottom-right-radius: 50rpx;
-  letter-spacing: 3rpx;
-  /* background-image: linear-gradient(to right, #ff7701 100%); */
-  background-image: linear-gradient(to right, #ab956d 0%, #ab956d 100%);
-}
-
-.action_btn_area .checkout {
-  width: 140rpx;
-  height: 80rpx;
-  line-height: 82rpx;
-  padding: 0;
-  margin: 0;
-  margin-left: 5rpx;
-  /* padding-right: 25rpx; */
-  font-size: 25rpx;
-  color: #f4f4f4;
-  text-align: center;
-  border-top-left-radius: 50rpx;
-  border-bottom-left-radius: 50rpx;
-  border-top-right-radius: 50rpx;
-  border-bottom-right-radius: 50rpx;
-  letter-spacing: 3rpx;
-  background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
-}
-
-.action_btn_area .delete {
-  width: 140rpx;
-  /* border: 1px solid #000; */
-  height: 80rpx;
-  line-height: 82rpx;
-  padding: 0;
-  margin: 0;
-  margin-right: 5rpx;
-  text-align: center;
-  padding-left: -5rpx;
-  font-size: 25rpx;
-  color: #f4f4f4;
-  border-top-left-radius: 50rpx;
-  border-bottom-left-radius: 50rpx;
-  border-top-right-radius: 50rpx;
-  border-bottom-right-radius: 50rpx;
-  letter-spacing: 3rpx;
-  background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
-}
-
-.action_btn_area .sure {
-  text-align: center;
-  width: 140rpx;
-  height: 80rpx;
-  line-height: 82rpx;
-  padding: 0;
-  margin: 0;
-  margin-right: 10rpx;
-  padding-left: -5rpx;
-  font-size: 25rpx;
-  color: #f4f4f4;
-  /* text-align: center; */
-  border-top-left-radius: 50rpx;
-  border-bottom-left-radius: 50rpx;
-  border-top-right-radius: 50rpx;
-  border-bottom-right-radius: 50rpx;
-  letter-spacing: 3rpx;
-  background-image: linear-gradient(to right, #ab956d 0%, #ab956d 100%);
-  /* background-image: linear-gradient(to right, #ff7701 0%, #fe4800 100%); */
-}
-
-.auth_btn {
-  position: fixed;
-  top: 55vh;
-  left: 10vw;
-  width: 80vw;
-  height: 96rpx;
-  line-height: 96rpx;
-  font-size: 25rpx;
-  color: #f4f4f4;
-  /* text-align: center; */
-  border-top-left-radius: 50rpx;
-  border-bottom-left-radius: 50rpx;
-  border-top-right-radius: 50rpx;
-  border-bottom-right-radius: 50rpx;
-  letter-spacing: 3rpx;
-  background-image: linear-gradient(to right, #8baaaa 0%, #9a9ba1 100%);
-}
diff --git a/litemall-wx/pages/catalog/catalog.js b/litemall-wx/pages/catalog/catalog.js
deleted file mode 100644
index 80361bd3..00000000
--- a/litemall-wx/pages/catalog/catalog.js
+++ /dev/null
@@ -1,77 +0,0 @@
-var util = require('../../utils/util.js');
-var api = require('../../config/api.js');
-
-Page({
-  data: {
-    categoryList: [],
-    currentCategory: {},
-    currentSubCategoryList: {},
-    scrollLeft: 0,
-    scrollTop: 0,
-    goodsCount: 0,
-    scrollHeight: 0
-  },
-  onLoad: function(options) {
-    this.getCatalog();
-  },
-  onPullDownRefresh() {
-    wx.showNavigationBarLoading() //在标题栏中显示加载
-    this.getCatalog();
-    wx.hideNavigationBarLoading() //完成停止加载
-    wx.stopPullDownRefresh() //停止下拉刷新
-  },
-  getCatalog: function() {
-    //CatalogList
-    let that = this;
-    wx.showLoading({
-      title: '加载中...',
-    });
-    util.request(api.CatalogList).then(function(res) {
-      that.setData({
-        categoryList: res.data.categoryList,
-        currentCategory: res.data.currentCategory,
-        currentSubCategoryList: res.data.currentSubCategory
-      });
-      wx.hideLoading();
-    });
-    util.request(api.GoodsCount).then(function(res) {
-      that.setData({
-        goodsCount: res.data
-      });
-    });
-
-  },
-  getCurrentCategory: function(id) {
-    let that = this;
-    util.request(api.CatalogCurrent, {
-        id: id
-      })
-      .then(function(res) {
-        that.setData({
-          currentCategory: res.data.currentCategory,
-          currentSubCategoryList: res.data.currentSubCategory
-        });
-      });
-  },
-  onReady: function() {
-    // 页面渲染完成
-  },
-  onShow: function() {
-    // 页面显示
-  },
-  onHide: function() {
-    // 页面隐藏
-  },
-  onUnload: function() {
-    // 页面关闭
-  },
-  switchCate: function(event) {
-    var that = this;
-    var currentTarget = event.currentTarget;
-    if (this.data.currentCategory.id == event.currentTarget.dataset.id) {
-      return false;
-    }
-
-    this.getCurrentCategory(event.currentTarget.dataset.id);
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/catalog/catalog.json b/litemall-wx/pages/catalog/catalog.json
deleted file mode 100644
index 48d7c2d0..00000000
--- a/litemall-wx/pages/catalog/catalog.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "分类"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/catalog/catalog.wxml b/litemall-wx/pages/catalog/catalog.wxml
deleted file mode 100644
index d6cc2282..00000000
--- a/litemall-wx/pages/catalog/catalog.wxml
+++ /dev/null
@@ -1,30 +0,0 @@
-<view class="container">
-  <view class="search">
-    <navigator url="/pages/search/search" class="input">
-      <van-icon name="search"/>
-      <text class="txt">商品搜索, 共{{goodsCount}}款好物</text>
-    </navigator>
-  </view>
-  <view class="catalog">
-    <scroll-view class="nav" scroll-y="true">
-      <view class="item {{ currentCategory.id == item.id ? 'active' : ''}}" wx:for="{{categoryList}}" wx:key="id" data-id="{{item.id}}" data-index="{{index}}" bindtap="switchCate">{{item.name}}</view>
-    </scroll-view>
-    <scroll-view class="cate" scroll-y="true">
-      <navigator url="url" class="banner">
-        <image class="image" src="{{currentCategory.picUrl}}"></image>
-        <view class="txt">{{currentCategory.frontName}}</view>
-      </navigator>
-      <view class="hd">
-        <text class="line"></text>
-        <text class="txt">{{currentCategory.name}}分类</text>
-        <text class="line"></text>
-      </view>
-      <view class="bd">
-        <navigator url="/pages/category/category?id={{item.id}}" class="item {{(index+1) % 3 == 0 ? 'last' : ''}}" wx:key="id" wx:for="{{currentSubCategoryList}}">
-          <image class="icon" src="{{item.picUrl}}"></image>
-          <text class="txt">{{item.name}}</text>
-        </navigator>
-      </view>
-    </scroll-view>
-  </view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/catalog/catalog.wxss b/litemall-wx/pages/catalog/catalog.wxss
deleted file mode 100644
index abd0513f..00000000
--- a/litemall-wx/pages/catalog/catalog.wxss
+++ /dev/null
@@ -1,160 +0,0 @@
-page {
-  height: 100%;
-}
-
-.container {
-  background: #f9f9f9;
-  height: 100%;
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-}
-
-.search {
-  height: 88rpx;
-  width: 100%;
-  padding: 0 30rpx;
-  background: #fff;
-  display: flex;
-  align-items: center;
-}
-
-.search .input {
-  width: 690rpx;
-  height: 56rpx;
-  background: #ededed;
-  border-radius: 8rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.search .van-icon-search {
-  line-height: 56rpx;
-}
-
-.search .txt {
-  height: 42rpx;
-  line-height: 42rpx;
-  color: #666;
-  padding-left: 10rpx;
-  font-size: 30rpx;
-}
-
-.catalog {
-  flex: 1;
-  width: 100%;
-  background: #fff;
-  display: flex;
-  border-top: 1px solid #fafafa;
-}
-
-.catalog .nav {
-  width: 162rpx;
-  height: 100%;
-}
-
-.catalog .nav .item {
-  text-align: center;
-  line-height: 90rpx;
-  width: 162rpx;
-  height: 90rpx;
-  color: #333;
-  font-size: 28rpx;
-  border-left: 6rpx solid #fff;
-}
-
-.catalog .nav .item.active {
-  color: #ab956d;
-  font-size: 36rpx;
-  border-left: 6rpx solid #ab956d;
-}
-
-.catalog .cate {
-  border-left: 1px solid #fafafa;
-  flex: 1;
-  height: 100%;
-  padding: 0 30rpx 0 30rpx;
-}
-
-.banner {
-  display: block;
-  height: 222rpx;
-  width: 100%;
-  position: relative;
-}
-
-.banner .image {
-  position: absolute;
-  top: 30rpx;
-  left: 0;
-  border-radius: 4rpx;
-  height: 192rpx;
-  width: 100%;
-}
-
-.banner .txt {
-  position: absolute;
-  top: 30rpx;
-  text-align: center;
-  color: #fff;
-  font-size: 28rpx;
-  left: 0;
-  height: 192rpx;
-  line-height: 192rpx;
-  width: 100%;
-}
-
-.catalog .hd {
-  height: 108rpx;
-  width: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.catalog .hd .txt {
-  font-size: 24rpx;
-  text-align: center;
-  color: #333;
-  padding: 0 10rpx;
-  width: auto;
-}
-
-.catalog .hd .line {
-  width: 40rpx;
-  height: 1px;
-  background: #d9d9d9;
-}
-
-.catalog .bd {
-  height: auto;
-  width: 100%;
-  overflow: hidden;
-}
-
-.catalog .bd .item {
-  display: block;
-  float: left;
-  height: 216rpx;
-  width: 144rpx;
-  margin-right: 34rpx;
-}
-
-.catalog .bd .item.last {
-  margin-right: 0;
-}
-
-.catalog .bd .item .icon {
-  height: 144rpx;
-  width: 144rpx;
-}
-
-.catalog .bd .item .txt {
-  display: block;
-  text-align: center;
-  font-size: 24rpx;
-  color: #333;
-  height: 72rpx;
-  width: 144rpx;
-}
diff --git a/litemall-wx/pages/category/category.js b/litemall-wx/pages/category/category.js
deleted file mode 100644
index 97ef0395..00000000
--- a/litemall-wx/pages/category/category.js
+++ /dev/null
@@ -1,153 +0,0 @@
-var util = require('../../utils/util.js');
-var api = require('../../config/api.js');
-
-Page({
-  data: {
-    navList: [],
-    goodsList: [],
-    id: 0,
-    currentCategory: {},
-    scrollLeft: 0,
-    scrollTop: 0,
-    scrollHeight: 0,
-    page: 1,
-    limit: 10,
-    pages:1, //总页数
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    var that = this;
-    if (options.id) {
-      that.setData({
-        id: parseInt(options.id)
-      });
-    }
-
-    wx.getSystemInfo({
-      success: function(res) {
-        that.setData({
-          scrollHeight: res.windowHeight
-        });
-      }
-    });
-
-
-    this.getCategoryInfo();
-
-  },
-  getCategoryInfo: function() {
-    let that = this;
-    util.request(api.GoodsCategory, {
-        id: this.data.id
-      })
-      .then(function(res) {
-
-        if (res.errno == 0) {
-          that.setData({
-            navList: res.data.brotherCategory,
-            currentCategory: res.data.currentCategory
-          });
-
-          wx.setNavigationBarTitle({
-            title: res.data.parentCategory.name
-          })
-
-          // 当id是L1分类id时，这里需要重新设置成L1分类的一个子分类的id
-          if (res.data.parentCategory.id == that.data.id) {
-            that.setData({
-              id: res.data.currentCategory.id
-            });
-          }
-
-          //nav位置
-          let currentIndex = 0;
-          let navListCount = that.data.navList.length;
-          for (let i = 0; i < navListCount; i++) {
-            currentIndex += 1;
-            if (that.data.navList[i].id == that.data.id) {
-              break;
-            }
-          }
-          if (currentIndex > navListCount / 2 && navListCount > 5) {
-            that.setData({
-              scrollLeft: currentIndex * 60
-            });
-          }
-          that.getGoodsList();
-
-        } else {
-          //显示错误信息
-        }
-
-      });
-  },
-  onReady: function() {
-    // 页面渲染完成
-  },
-  onShow: function() {
-    // 页面显示
-  },
-  onHide: function() {
-    // 页面隐藏
-  },
-  //触底开始下一页
-  onReachBottom: function () {
-    var that=this;
-
-    var pagenum = that.data.page + 1; //获取当前页数并+1
-    if(pagenum <=that.data.pages){
-      that.setData({
-        page: pagenum, //更新当前页数
-      })
-      that.getGoodsList();//重新调用请求获取下一页数据
-    }else{
-      util.showErrorToast("已经是最后一页了");
-    }
-  },
-
-  getGoodsList: function() {
-    var that = this;
-
-    util.request(api.GoodsList, {
-        categoryId: that.data.id,
-        page: that.data.page,
-        limit: that.data.limit
-      })
-      .then(function(res) {
-        var arr1 = that.data.goodsList; //从data获取当前datalist数组
-        var arr2 = res.data.list; //从此次请求返回的数据中获取新数组
-        arr1 = arr1.concat(arr2); //合并数组
-        that.setData({
-          goodsList: arr1,
-          pages: res.data.pages //得到总页数
-        });
-      });
-  },
-  onUnload: function() {
-    // 页面关闭
-  },
-  switchCate: function(event) {
-    if (this.data.id == event.currentTarget.dataset.id) {
-      return false;
-    }
-    var that = this;
-    var clientX = event.detail.x;
-    var currentTarget = event.currentTarget;
-    if (clientX < 60) {
-      that.setData({
-        scrollLeft: currentTarget.offsetLeft - 60
-      });
-    } else if (clientX > 330) {
-      that.setData({
-        scrollLeft: currentTarget.offsetLeft
-      });
-    }
-    this.setData({
-      id: event.currentTarget.dataset.id,
-      page:1, //从第一页开始查
-      goodsList:[]
-    });
-
-    this.getCategoryInfo();
-  }
-})
diff --git a/litemall-wx/pages/category/category.json b/litemall-wx/pages/category/category.json
deleted file mode 100644
index 9e26dfee..00000000
--- a/litemall-wx/pages/category/category.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/litemall-wx/pages/category/category.wxml b/litemall-wx/pages/category/category.wxml
deleted file mode 100644
index a973285e..00000000
--- a/litemall-wx/pages/category/category.wxml
+++ /dev/null
@@ -1,25 +0,0 @@
-<view class="container">
-  <view class="cate-nav">
-    <scroll-view scroll-x="true" class="cate-nav-body" style="width: 750rpx;" scroll-left="{{scrollLeft}}">
-      <view wx:for="{{navList}}" class="item {{ id == item.id ? 'active' : ''}}" wx:key="id" data-id="{{item.id}}" data-index="{{index}}" bindtap="switchCate">
-        <view class="name">{{item.name}}</view>
-      </view>
-    </scroll-view>
-  </view>
-  <scroll-view scroll-y="true" scroll-top="{{scrollTop}}" style="height:{{scrollHeight}}px;">
-
-    <view class="cate-item">
-      <view class="h">
-        <text class="name">{{currentCategory.name}}</text>
-        <text class="desc">{{currentCategory.desc}}</text>
-      </view>
-      <view class="b">
-        <navigator class="item {{(iindex + 1) % 2 == 0 ? 'item-b' : ''}}" url="/pages/goods/goods?id={{iitem.id}}" wx:for="{{goodsList}}" wx:key="id" wx:for-item="iitem" wx:for-index="iindex">
-          <image class="img" src="{{iitem.picUrl}}" background-size="cover"></image>
-          <text class="name">{{iitem.name}}</text>
-          <text class="price">￥{{iitem.retailPrice}}</text>
-        </navigator>
-      </view>
-    </view>
-  </scroll-view>
-</view>
diff --git a/litemall-wx/pages/category/category.wxss b/litemall-wx/pages/category/category.wxss
deleted file mode 100644
index 8a31dbda..00000000
--- a/litemall-wx/pages/category/category.wxss
+++ /dev/null
@@ -1,118 +0,0 @@
-.container {
-  background: #f9f9f9;
-}
-
-.cate-nav {
-  position: fixed;
-  left: 0;
-  top: 0;
-  z-index: 1000;
-}
-
-.cate-nav-body {
-  height: 84rpx;
-  white-space: nowrap;
-  background: #fff;
-  border-top: 1px solid rgba(0, 0, 0, 0.15);
-  overflow: hidden;
-}
-
-.cate-nav .item {
-  display: inline-block;
-  height: 84rpx;
-  min-width: 130rpx;
-  padding: 0 15rpx;
-}
-
-.cate-nav .item .name {
-  display: block;
-  height: 84rpx;
-  padding: 0 20rpx;
-  line-height: 84rpx;
-  color: #333;
-  font-size: 30rpx;
-  width: auto;
-}
-
-.cate-nav .item.active .name {
-  color: #ab956d;
-  border-bottom: 2px solid #ab956d;
-}
-
-.cate-item {
-  margin-top: 94rpx;
-  height: auto;
-  overflow: hidden;
-}
-
-.cate-item .h {
-  height: 145rpx;
-  width: 750rpx;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-
-.cate-item .h .name {
-  display: block;
-  height: 35rpx;
-  margin-bottom: 18rpx;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.cate-item .h .desc {
-  display: block;
-  height: 24rpx;
-  font-size: 24rpx;
-  color: #999;
-}
-
-.cate-item .b {
-  width: 750rpx;
-  padding: 0 6.25rpx;
-  height: auto;
-  overflow: hidden;
-}
-
-.cate-item .b .item {
-  float: left;
-  background: #fff;
-  width: 365rpx;
-  margin-bottom: 6.25rpx;
-  padding-bottom: 33.333rpx;
-  height: auto;
-  overflow: hidden;
-  text-align: center;
-}
-
-.cate-item .b .item-b {
-  margin-left: 6.25rpx;
-}
-
-.cate-item .item .img {
-  width: 302rpx;
-  height: 302rpx;
-}
-
-.cate-item .item .name {
-  display: block;
-  width: 365.625rpx;
-  height: 35rpx;
-  margin: 11.5rpx 0 22rpx 0;
-  text-align: center;
-  overflow: hidden;
-  padding: 0 20rpx;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.cate-item .item .price {
-  display: block;
-  width: 365.625rpx;
-  height: 30rpx;
-  text-align: center;
-  font-size: 30rpx;
-  color: #ab956d;
-}
diff --git a/litemall-wx/pages/checkout/checkout.js b/litemall-wx/pages/checkout/checkout.js
deleted file mode 100644
index 1fe21e41..00000000
--- a/litemall-wx/pages/checkout/checkout.js
+++ /dev/null
@@ -1,213 +0,0 @@
-var util = require('../../utils/util.js');
-var api = require('../../config/api.js');
-
-var app = getApp();
-
-Page({
-  data: {
-    checkedGoodsList: [],
-    checkedAddress: {},
-    availableCouponLength: 0, // 可用的优惠券数量
-    goodsTotalPrice: 0.00, //商品总价
-    freightPrice: 0.00, //快递费
-    couponPrice: 0.00, //优惠券的价格
-    grouponPrice: 0.00, //团购优惠价格
-    orderTotalPrice: 0.00, //订单总价
-    actualPrice: 0.00, //实际需要支付的总价
-    cartId: 0,
-    addressId: 0,
-    couponId: 0,
-    userCouponId: 0,
-    message: '',
-    grouponLinkId: 0, //参与的团购
-    grouponRulesId: 0 //团购规则ID
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-  },
-
-  //获取checkou信息
-  getCheckoutInfo: function() {
-    let that = this;
-    util.request(api.CartCheckout, {
-      cartId: that.data.cartId,
-      addressId: that.data.addressId,
-      couponId: that.data.couponId,
-      userCouponId: that.data.userCouponId,
-      grouponRulesId: that.data.grouponRulesId
-    }).then(function(res) {
-      if (res.errno === 0) {
-        that.setData({
-          checkedGoodsList: res.data.checkedGoodsList,
-          checkedAddress: res.data.checkedAddress,
-          availableCouponLength: res.data.availableCouponLength,
-          actualPrice: res.data.actualPrice,
-          couponPrice: res.data.couponPrice,
-          grouponPrice: res.data.grouponPrice,
-          freightPrice: res.data.freightPrice,
-          goodsTotalPrice: res.data.goodsTotalPrice,
-          orderTotalPrice: res.data.orderTotalPrice,
-          addressId: res.data.addressId,
-          couponId: res.data.couponId,
-          userCouponId: res.data.userCouponId,
-          grouponRulesId: res.data.grouponRulesId,
-        });
-      }
-      wx.hideLoading();
-    });
-  },
-  selectAddress() {
-    wx.navigateTo({
-      url: '/pages/ucenter/address/address',
-    })
-  },
-  selectCoupon() {
-    wx.navigateTo({
-      url: '/pages/ucenter/couponSelect/couponSelect',
-    })
-  },
-  bindMessageInput: function(e) {
-    this.setData({
-      message: e.detail.value
-    });
-  },
-  onReady: function() {
-    // 页面渲染完成
-
-  },
-  onShow: function() {
-    // 页面显示
-    wx.showLoading({
-      title: '加载中...',
-    });
-    try {
-      var cartId = wx.getStorageSync('cartId');
-      if (cartId === "") {
-        cartId = 0;
-      }
-      var addressId = wx.getStorageSync('addressId');
-      if (addressId === "") {
-        addressId = 0;
-      }
-      var couponId = wx.getStorageSync('couponId');
-      if (couponId === "") {
-        couponId = 0;
-      }
-      var userCouponId = wx.getStorageSync('userCouponId');
-      if (userCouponId === "") {
-        userCouponId = 0;
-      }
-      var grouponRulesId = wx.getStorageSync('grouponRulesId');
-      if (grouponRulesId === "") {
-        grouponRulesId = 0;
-      }
-      var grouponLinkId = wx.getStorageSync('grouponLinkId');
-      if (grouponLinkId === "") {
-        grouponLinkId = 0;
-      }
-
-      this.setData({
-        cartId: cartId,
-        addressId: addressId,
-        couponId: couponId,
-        userCouponId: userCouponId,
-        grouponRulesId: grouponRulesId,
-        grouponLinkId: grouponLinkId
-      });
-
-    } catch (e) {
-      // Do something when catch error
-      console.log(e);
-    }
-
-    this.getCheckoutInfo();
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-
-  },
-  submitOrder: function() {
-    if (this.data.addressId <= 0) {
-      util.showErrorToast('请选择收货地址');
-      return false;
-    }
-    util.request(api.OrderSubmit, {
-      cartId: this.data.cartId,
-      addressId: this.data.addressId,
-      couponId: this.data.couponId,
-      userCouponId: this.data.userCouponId,
-      message: this.data.message,
-      grouponRulesId: this.data.grouponRulesId,
-      grouponLinkId: this.data.grouponLinkId
-    }, 'POST').then(res => {
-      if (res.errno === 0) {
-
-        // 下单成功，重置couponId
-        try {
-          wx.setStorageSync('couponId', 0);
-        } catch (error) {
-
-        }
-
-        const orderId = res.data.orderId;
-        const grouponLinkId = res.data.grouponLinkId;
-        const payed = res.data.payed
-        if (payed) {
-          wx.redirectTo({
-            url: '/pages/payResult/payResult?status=1&orderId=' + orderId
-          });
-          return
-        }
-        util.request(api.OrderPrepay, {
-          orderId: orderId
-        }, 'POST').then(function(res) {
-          if (res.errno === 0) {
-            const payParam = res.data;
-            console.log("支付过程开始");
-            wx.requestPayment({
-              'timeStamp': payParam.timeStamp,
-              'nonceStr': payParam.nonceStr,
-              'package': payParam.packageValue,
-              'signType': payParam.signType,
-              'paySign': payParam.paySign,
-              'success': function(res) {
-                console.log("支付过程成功");
-                if (grouponLinkId) {
-                  setTimeout(() => {
-                    wx.redirectTo({
-                      url: '/pages/groupon/grouponDetail/grouponDetail?id=' + grouponLinkId
-                    })
-                  }, 1000);
-                } else {
-                  wx.redirectTo({
-                    url: '/pages/payResult/payResult?status=1&orderId=' + orderId
-                  });
-                }
-              },
-              'fail': function(res) {
-                console.log("支付过程失败");
-                wx.redirectTo({
-                  url: '/pages/payResult/payResult?status=0&orderId=' + orderId
-                });
-              },
-              'complete': function(res) {
-                console.log("支付过程结束")
-              }
-            });
-          } else {
-            wx.redirectTo({
-              url: '/pages/payResult/payResult?status=0&orderId=' + orderId
-            });
-          }
-        });
-
-      } else {
-        util.showErrorToast(res.errmsg);
-      }
-    });
-  }
-});
\ No newline at end of file
diff --git a/litemall-wx/pages/checkout/checkout.json b/litemall-wx/pages/checkout/checkout.json
deleted file mode 100644
index 08b75ef7..00000000
--- a/litemall-wx/pages/checkout/checkout.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "填写订单"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/checkout/checkout.wxml b/litemall-wx/pages/checkout/checkout.wxml
deleted file mode 100644
index f842c10a..00000000
--- a/litemall-wx/pages/checkout/checkout.wxml
+++ /dev/null
@@ -1,97 +0,0 @@
-<view class="container">
-  <view class="address-box">
-    <view class="address-item" bindtap="selectAddress" wx:if="{{checkedAddress.id > 0}}">
-      <view class="l">
-        <text class="name">{{checkedAddress.name}}</text>
-        <text class="default" wx:if="{{checkedAddress.isDefault}}">默认</text>
-      </view>
-      <view class="m">
-        <text class="mobile">{{checkedAddress.tel}}</text>
-        <text class="address">{{checkedAddress.addressDetail}}</text>
-      </view>
-      <view class="r">
-        <van-icon name="arrow" />
-      </view>
-    </view>
-    <view class="address-item address-empty" bindtap="selectAddress" wx:else>
-      <view class="m">
-        还没有收货地址，去添加
-      </view>
-      <view class="r">
-        <van-icon name="arrow" />      
-      </view>
-    </view>
-  </view>
-
-  <view class="coupon-box">
-    <view class="coupon-item" bindtap="selectCoupon">
-      <view class="l" wx:if="{{couponId == 0}}">
-        <text class="name">没有可用的优惠券</text>
-        <text class="txt">0张</text>
-      </view>
-      <view class="l" wx:elif="{{couponId == -1}}">
-        <text class="name">优惠券</text>
-        <text class="txt">{{availableCouponLength}}张</text>
-      </view>
-      <view class="l" wx:else>
-        <text class="name">优惠券</text>
-        <text class="txt">-￥{{couponPrice}}元</text>
-      </view>      
-      <view class="r">
-        <van-icon name="arrow" />      
-      </view>
-    </view>
-  </view>
-
-  <view class="message-box">
-    <input class="message-item" bindinput="bindMessageInput" placeholder="如需要，请输入留言" value="{{message}}" />
-  </view>
-
-  <view class="order-box">
-    <view class="order-item">
-      <view class="l">
-        <text class="name">商品合计</text>
-      </view>
-      <view class="r">
-        <text class="txt">￥{{goodsTotalPrice}}元</text>
-      </view>
-    </view>
-    <view class="order-item">
-      <view class="l">
-        <text class="name">运费</text>
-      </view>
-      <view class="r">
-        <text class="txt">￥{{freightPrice}}元</text>
-      </view>
-    </view>
-    <view class="order-item no-border">
-      <view class="l">
-        <text class="name">优惠券</text>
-      </view>
-      <view class="r">
-        <text class="txt">-￥{{couponPrice}}元</text>
-      </view>
-    </view>
-  </view>
-
-  <view class="goods-items">
-    <view class="item" wx:for="{{checkedGoodsList}}" wx:key="id">
-      <view class="img">
-        <image src="{{item.picUrl}}"></image>
-      </view>
-      <view class="info">
-        <view class="t">
-          <text class="name">{{item.goodsName}}</text>
-          <text class="number">x{{item.number}}</text>
-        </view>
-        <view class="m">{{item.specifications}}</view>
-        <view class="b">￥{{item.price}}</view>
-      </view>
-    </view>
-  </view>
-
-  <view class="order-total">
-    <view class="l">实付：￥{{actualPrice}}</view>
-    <view class="r" bindtap="submitOrder">去付款</view>
-  </view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/checkout/checkout.wxss b/litemall-wx/pages/checkout/checkout.wxss
deleted file mode 100644
index c425cf5a..00000000
--- a/litemall-wx/pages/checkout/checkout.wxss
+++ /dev/null
@@ -1,310 +0,0 @@
-page {
-  height: 100%;
-  background: #f4f4f4;
-}
-
-.address-box {
-  width: 100%;
-  height: 166.55rpx;
-  background-size: 62.5rpx 10.5rpx;
-  margin-bottom: 20rpx;
-  padding-top: 10.5rpx;
-}
-
-.address-item {
-  display: flex;
-  height: 155.55rpx;
-  background: #fff;
-  padding: 41.6rpx 0 41.6rpx 31.25rpx;
-}
-
-.address-item.address-empty {
-  line-height: 75rpx;
-  text-align: center;
-}
-
-.address-box .l {
-  width: 125rpx;
-  height: 100%;
-}
-
-.address-box .l .name {
-  margin-left: 6.25rpx;
-  margin-top: -7.25rpx;
-  display: block;
-  width: 125rpx;
-  height: 43rpx;
-  line-height: 43rpx;
-  font-size: 30rpx;
-  color: #333;
-  margin-bottom: 5rpx;
-}
-
-.address-box .l .default {
-  margin-left: 6.25rpx;
-  display: block;
-  width: 62rpx;
-  height: 33rpx;
-  border-radius: 5rpx;
-  border: 1px solid #b4282d;
-  font-size: 20.5rpx;
-  text-align: center;
-  line-height: 29rpx;
-  color: #b4282d;
-}
-
-.address-box .m {
-  flex: 1;
-  height: 72.25rpx;
-  color: #999;
-}
-
-.address-box .mobile {
-  display: block;
-  height: 29rpx;
-  line-height: 29rpx;
-  margin-bottom: 6.25rpx;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.address-box .address {
-  display: block;
-  height: 37.5rpx;
-  line-height: 37.5rpx;
-  font-size: 25rpx;
-  color: #666;
-}
-
-.address-box .r {
-  width: 77rpx;
-  height: 77rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.address-box .r image {
-  width: 52.078rpx;
-  height: 52.078rpx;
-}
-
-.coupon-box {
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-  background: #fff;
-}
-
-.coupon-box .coupon-item {
-  width: 100%;
-  height: 108.3rpx;
-  overflow: hidden;
-  background: #fff;
-  display: flex;
-  padding-left: 31.25rpx;
-}
-
-.coupon-box .l {
-  flex: 1;
-  height: 43rpx;
-  line-height: 43rpx;
-  padding-top: 35rpx;
-}
-
-.coupon-box .l .name {
-  float: left;
-  font-size: 30rpx;
-  color: #666;
-}
-
-.coupon-box .l .txt {
-  float: right;
-  font-size: 30rpx;
-  color: #666;
-}
-
-.coupon-box .r {
-  margin-top: 15.5rpx;
-  width: 77rpx;
-  height: 77rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.coupon-box .r image {
-  width: 52.078rpx;
-  height: 52.078rpx;
-}
-
-.message-box {
-  margin-top: 20rpx;
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-  background: #fff;
-}
-
-.message-box .message-item {
-  height: 52.078rpx;
-  overflow: hidden;
-  background: #fff;
-  display: flex;
-  margin-left: 31.25rpx;
-  padding-right: 31.25rpx;
-  padding-top: 26rpx;
-}
-
-.order-box {
-  margin-top: 20rpx;
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-  background: #fff;
-}
-
-.order-box .order-item {
-  height: 104.3rpx;
-  overflow: hidden;
-  background: #fff;
-  display: flex;
-  margin-left: 31.25rpx;
-  padding-right: 31.25rpx;
-  padding-top: 26rpx;
-  border-bottom: 1px solid #d9d9d9;
-}
-
-.order-box .order-item .l {
-  float: left;
-  height: 52rpx;
-  width: 50%;
-  line-height: 52rpx;
-  overflow: hidden;
-}
-
-.order-box .order-item .r {
-  float: right;
-  text-align: right;
-  width: 50%;
-  height: 52rpx;
-  line-height: 52rpx;
-  overflow: hidden;
-}
-
-.order-box .order-item.no-border {
-  border-bottom: none;
-}
-
-.goods-items {
-  margin-top: 20rpx;
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-  background: #fff;
-  padding-left: 31.25rpx;
-  margin-bottom: 120rpx;
-}
-
-.goods-items .item {
-  height: 192rpx;
-  padding-right: 31.25rpx;
-  display: flex;
-  align-items: center;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.15);
-}
-
-.goods-items .item.no-border {
-  border-bottom: none;
-}
-
-.goods-items .item:last-child {
-  border-bottom: none;
-}
-
-.goods-items .img {
-  height: 145.83rpx;
-  width: 145.83rpx;
-  background-color: #f4f4f4;
-  margin-right: 20rpx;
-}
-
-.goods-items .img image {
-  height: 145.83rpx;
-  width: 145.83rpx;
-}
-
-.goods-items .info {
-  flex: 1;
-  height: 145.83rpx;
-  padding-top: 5rpx;
-}
-
-.goods-items .t {
-  height: 33rpx;
-  line-height: 33rpx;
-  margin-bottom: 10rpx;
-  overflow: hidden;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.goods-items .t .name {
-  display: block;
-  float: left;
-}
-
-.goods-items .t .number {
-  display: block;
-  float: right;
-  text-align: right;
-}
-
-.goods-items .m {
-  height: 29rpx;
-  overflow: hidden;
-  line-height: 29rpx;
-  margin-bottom: 25rpx;
-  font-size: 25rpx;
-  color: #666;
-}
-
-.goods-items .b {
-  height: 41rpx;
-  overflow: hidden;
-  line-height: 41rpx;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.order-total {
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  height: 100rpx;
-  width: 100%;
-  display: flex;
-}
-
-.order-total .l {
-  flex: 1;
-  height: 100rpx;
-  line-height: 100rpx;
-  color: #b4282d;
-  background: #fff;
-  font-size: 33rpx;
-  padding-left: 31.25rpx;
-  border-top: 1rpx solid rgba(0, 0, 0, 0.2);
-  border-bottom: 1rpx solid rgba(0, 0, 0, 0.2);
-}
-
-.order-total .r {
-  width: 233rpx;
-  height: 100rpx;
-  background: #b4282d;
-  border: 1px solid #b4282d;
-  line-height: 100rpx;
-  text-align: center;
-  color: #fff;
-  font-size: 30rpx;
-}
diff --git a/litemall-wx/pages/comDetails/comDetails.js b/litemall-wx/pages/comDetails/comDetails.js
new file mode 100644
index 00000000..b5298a2e
--- /dev/null
+++ b/litemall-wx/pages/comDetails/comDetails.js
@@ -0,0 +1,116 @@
+// pages/details/details.js
+const util = require('../../utils/util.js');
+const api = require('../../config/api.js');
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    data: {},
+    pinlei:['直播','测试'],
+    userHasCollect:0,
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    console.log('options',options)
+    // 页面初始化 options为页面跳转所带来的参数
+    var that = this;
+    that.setData({
+      id: options.id
+    });
+    // GoodsDetail
+    util.request(api.TopicDetail, {
+      id: that.data.id
+    }).then(function(res) {
+      if (res.errno === 0) {
+        that.setData({
+          data: res.data,
+          userHasCollect: res.data.userHasCollect
+        });
+      }
+    });
+  },
+  viewDetails(e) {
+    let str = e.currentTarget.dataset.item.id
+     wx.navigateTo({
+       url: "/pages/details/details?id="+str
+     });
+  },
+  addCollectOrNot: function() {
+    let that = this;
+    util.request(api.CollectAddOrDelete, {
+        type: 1,
+        valueId: this.data.id
+      }, "POST")
+      .then(function(res) {
+        if (that.data.userHasCollect == 1) {
+          that.setData({
+            userHasCollect: 0
+          });
+        } else {
+          that.setData({
+            userHasCollect: 1
+          });
+        }
+
+      });
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+  imgPreview: function(e) {
+    console.log(e)
+    var current = e.target.dataset.src;
+    wx.previewImage({
+      current: current, // 当前显示图片的http链接
+      urls: [current] // 需要预览的图片http链接列表
+    })
+  },
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/litemall-wx/pages/comDetails/comDetails.json b/litemall-wx/pages/comDetails/comDetails.json
new file mode 100644
index 00000000..23032151
--- /dev/null
+++ b/litemall-wx/pages/comDetails/comDetails.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": ""
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/comDetails/comDetails.wxml b/litemall-wx/pages/comDetails/comDetails.wxml
new file mode 100644
index 00000000..51b55aa2
--- /dev/null
+++ b/litemall-wx/pages/comDetails/comDetails.wxml
@@ -0,0 +1,73 @@
+<!--pages/details/details.wxml-->
+<wxs module="m1">
+      var getinclude = function (name) {
+           return name.substring(0, 1) + "✱✱"
+      }
+     module.exports.getinclude = getinclude;
+  </wxs>
+<view>
+  <!-- <swiper class="goodsimgs" indicator-dots="true" autoplay="true" interval="3000" duration="1000">
+        <swiper-item wx:for="{{data.details}}" wx:key="*this">
+        <image src="{{item}}" mode="aspectFit|aspectFill|widthFix"></image>
+        </swiper-item>
+  </swiper> -->
+
+  <image class="picUrl" src="{{data.topic.gallery[0]}}" mode="aspectFill" lazy-load="false">
+
+  </image>
+</view>
+<view class="requirement">
+  <view class="capacity">
+    <view class="infoName">
+      {{ data.topic.title }}
+    </view>
+    <view class="title_bottom">
+      公司详情
+    </view>
+    <view class="list">
+      <text class="item" wx:for="{{data.topic.workStyle}}" :key="index">{{ item }}</text>
+    </view>
+    <view class="imglist">
+      <image class="item" wx:for="{{ data.topic.gallery }}" wx:for-item="item" src="{{item}}" mode="aspectFill" data-src="{{item}}" bindtap="imgPreview">
+      </image>
+    </view>
+    <view class="title">
+      公司地址
+    </view>
+    <view class="adress">
+      <text>{{data.topic.province}}{{data.topic.city}}{{data.topic.county}}{{data.topic.address}}</text>
+    </view>
+  </view>
+</view>
+<view wx:for="{{data.goods}}">
+  <view class="imgover" data-item="{{item}}" bindtap="viewDetails">
+    <view class='item-main'>
+      <view class="both">
+        <view>{{item.name}}</view>
+        <view>{{item.title}}</view>
+      </view>
+      <view class="company">{{item.title}}</view>
+      <view class="list">
+        <text class="item" wx:for="{{item.workStyle}}" :key="index">{{ item }}</text>
+      </view>
+      <view class="both">
+        <view>
+          <view class="avgboth">
+            <image class="avgimg" src="{{data.topic.picUrl}}" mode="" />
+            <view class="contact">
+              {{ m1.getinclude(data.topic.contact) }} • {{data.topic.contactPost}}
+            </view>
+          </view>
+          <view>
+          </view>
+        </view>
+        <view>{{item.currentCity}}</view>
+      </view>
+    </view>
+  </view>
+</view>
+<!-- <view class="bottombtn">
+    <view class="right_btn">
+      <van-icon name="star" size="32" color="{{userHasCollect==1?'#703EDD':''}}" bindtap="addCollectOrNot" />
+    </view>
+</view> -->
\ No newline at end of file
diff --git a/litemall-wx/pages/comDetails/comDetails.wxss b/litemall-wx/pages/comDetails/comDetails.wxss
new file mode 100644
index 00000000..d418f83d
--- /dev/null
+++ b/litemall-wx/pages/comDetails/comDetails.wxss
@@ -0,0 +1,159 @@
+/* pages/details/details.wxss */
+page {
+    height: 100%;
+    width: 100%;
+    background: #e9e5f1;
+}
+.picUrl{
+  width: 100%;
+}
+::-webkit-scrollbar {
+    width: 0;
+    height: 0;
+    color: transparent;
+}
+.goodsimgs {
+    width: 750rpx;
+    height: 750rpx;
+}
+
+.goodsimgs image {
+    width: 750rpx;
+    height: 750rpx;
+}
+.requirement{
+    padding: 0 20rpx;
+    position: relative;
+    top: -50rpx;
+}
+.requirement .requirement-bg{
+    background-color: #d3cbe4;
+    padding: 30rpx;
+    border-radius: 30rpx;
+}
+.requirement .requirement-bg .title{
+    margin-bottom: 20rpx;
+}
+.requirement .capacity{
+    margin-top: 30rpx;
+    background-color: #fff;
+    border-radius: 30rpx;
+}
+.requirement .capacity .infoName{
+  padding-left: 30rpx;
+  font-size: 40rpx;
+  padding-top: 20rpx;
+}
+.requirement .capacity .title_bottom{
+    padding: 30rpx;
+}
+.requirement .capacity .title {
+    padding: 30rpx;
+}
+.requirement .capacity .list {
+    margin: 0 30rpx;
+    border-top: 2rpx #ccc solid;
+    padding-top: 20rpx;
+    padding-bottom: 30rpx;
+}
+.requirement .capacity .adress{
+    margin: 0 30rpx;
+    padding-bottom: 30rpx;
+}
+.requirement .capacity .imglist{
+    margin: 0 30rpx;
+    display: flex;
+    overflow: hidden;
+    overflow-x: auto;
+}
+.requirement .capacity .imglist .item{
+    width: 240rpx;
+    min-width: 240rpx;
+    height: 340rpx;
+    margin-right: 20rpx;
+    border-radius: 12rpx;
+}
+.requirement .capacity .list .item {
+    font-size: 26rpx;
+    display: inline-block;
+    padding: 10rpx 28rpx;
+    line-height: 30rpx;
+    margin: 10rpx 40rpx;
+    border-radius: 14rpx;
+    background-color: #ccc;
+    /* border: 2rpx solid #703EDD; */
+    /* color: #703EDD; */
+    margin-left: 0;
+}
+.bottombtn{
+    width: 100%;
+    height: 120rpx;
+    background: #fff;
+    position: fixed;
+    bottom: 0;
+    
+}
+.bottombtn .right_btn{
+  display: flex;
+  align-items: inherit;
+    justify-content: flex-end;
+    padding-right: 30rpx;
+}
+.bottombtn .right_btn .btn{
+    width: 200rpx;
+    margin-top: 30rpx;
+    height:70rpx;
+    line-height: 70rpx;
+    text-align: center;
+    background-color: #703EDD;
+    color: #fff;
+    border-radius: 30rpx;
+}
+.bottombtn .right_btn .van-icon{
+    color: #ccc;
+    padding-right: 60rpx !important;
+    padding-top: 20rpx;
+}
+.imgover{
+  padding: 20rpx 20rpx;
+  position: relative;
+  top: -50rpx;
+}
+.imgover .item-main{
+  background-color: #fff;
+  border-radius: 20rpx;
+  padding: 20rpx;
+
+}
+.imgover .item-main .both{
+  display: flex;
+}
+.imgover .item-main .company{
+  margin-top: 10rpx;
+  margin-bottom: 10rpx;
+  font-size: 26rpx;
+}
+.imgover .item-main .both  .avgboth{
+  
+  display: flex;
+  line-height: 50rpx;
+}
+.imgover .item-main .both  .avgboth .contact{
+  padding-left: 20rpx;
+  font-size: 26rpx;
+}
+.imgover .item-main .both .avgimg{
+  width: 50rpx;
+  height: 50rpx;
+  border-radius: 50%;
+}
+.imgover .item-main .list .item{
+  font-size: 26rpx;
+    display: inline-block;
+    padding: 8rpx 16rpx;
+    line-height: 30rpx;
+    margin: 10rpx;
+    border-radius: 8rpx;
+    background-color: #fcf7f7;
+    margin-left: 0;
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/comment/comment.js b/litemall-wx/pages/comment/comment.js
deleted file mode 100644
index 9c30d6bb..00000000
--- a/litemall-wx/pages/comment/comment.js
+++ /dev/null
@@ -1,140 +0,0 @@
-var app = getApp();
-var util = require('../../utils/util.js');
-var api = require('../../config/api.js');
-
-Page({
-  data: {
-    comments: [],
-    allCommentList: [],
-    picCommentList: [],
-    type: 0,
-    valueId: 0,
-    showType: 0,
-    allCount: 0,
-    hasPicCount: 0,
-    allPage: 1,
-    picPage: 1,
-    limit: 20
-  },
-  getCommentCount: function() {
-    let that = this;
-    util.request(api.CommentCount, {
-      valueId: that.data.valueId,
-      type: that.data.type
-    }).then(function(res) {
-      if (res.errno === 0) {
-        that.setData({
-          allCount: res.data.allCount,
-          hasPicCount: res.data.hasPicCount
-        });
-      }
-    });
-  },
-  getCommentList: function() {
-    let that = this;
-    util.request(api.CommentList, {
-      valueId: that.data.valueId,
-      type: that.data.type,
-      limit: that.data.limit,
-      page: (that.data.showType == 0 ? that.data.allPage : that.data.picPage),
-      showType: that.data.showType
-    }).then(function(res) {
-      if (res.errno === 0) {
-
-        if (that.data.showType == 0) {
-          that.setData({
-            allCommentList: that.data.allCommentList.concat(res.data.list),
-            allPage: res.data.page,
-            comments: that.data.allCommentList.concat(res.data.list)
-          });
-        } else {
-          that.setData({
-            picCommentList: that.data.picCommentList.concat(res.data.list),
-            picPage: res.data.page,
-            comments: that.data.picCommentList.concat(res.data.list)
-          });
-        }
-      }
-    });
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    this.setData({
-      type: options.type,
-      valueId: options.valueId
-    });
-    this.getCommentCount();
-    this.getCommentList();
-  },
-  onPullDownRefresh() {
-    this.setData({
-      allCommentList: [],
-      allPage: 1,
-      picCommentList: [],
-      picPage: 1,
-      comments: []
-    });
-    wx.showNavigationBarLoading() //在标题栏中显示加载
-    this.getCommentCount();
-    this.getCommentList();
-    wx.hideNavigationBarLoading() //完成停止加载
-    wx.stopPullDownRefresh() //停止下拉刷新
-  },
-  onReady: function() {
-    // 页面渲染完成
-
-  },
-  onShow: function() {
-    // 页面显示
-
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-
-  },
-  switchTab: function() {
-    let that = this;
-    if (that.data.showType == 0) {
-      that.setData({
-        allCommentList: [],
-        allPage: 1,
-        comments: [],
-        showType: 1
-      });
-    } else {
-      that.setData({
-        picCommentList: [],
-        picPage: 1,
-        comments: [],
-        showType: 0
-      });
-    }
-    this.getCommentList();
-  },
-  onReachBottom: function() {
-    if (this.data.showType == 0) {
-
-      if (this.data.allCount / this.data.limit < this.data.allPage) {
-        return false;
-      }
-
-      this.setData({
-        'allPage': this.data.allPage + 1
-      });
-    } else {
-      if (this.data.hasPicCount / this.data.limit < this.data.picPage) {
-        return false;
-      }
-
-      this.setData({
-        'picPage': this.data.picPage + 1
-      });
-    }
-
-    this.getCommentList();
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/comment/comment.json b/litemall-wx/pages/comment/comment.json
deleted file mode 100644
index 6da5ff8d..00000000
--- a/litemall-wx/pages/comment/comment.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "enablePullDownRefresh": true,
-  "navigationBarTitleText": "评价"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/comment/comment.wxml b/litemall-wx/pages/comment/comment.wxml
deleted file mode 100644
index 336321b4..00000000
--- a/litemall-wx/pages/comment/comment.wxml
+++ /dev/null
@@ -1,30 +0,0 @@
-<view class="comments">
-  <view class="h">
-    <view class="item {{ showType == 0 ? 'active' : ''}}" bindtap="switchTab">
-      <view class="txt">全部({{allCount}})</view>
-    </view>
-    <view class="item {{ showType == 0 ? '' : 'active'}}" bindtap="switchTab">
-      <view class="txt">有图({{hasPicCount}})</view>
-    </view>
-  </view>
-  <view class="b">
-    <view class="item" wx:for="{{comments}}" wx:key="id">
-      <view class="info">
-        <view class="user">
-          <image src="{{item.userInfo.avatarUrl}}"></image>
-          <text>{{item.userInfo.nickname}}</text>
-        </view>
-        <view class="time">{{item.addTime}}</view>
-      </view>
-      <view class="comment">{{item.content}}</view>
-      <view class="imgs" wx:if="{{item.picList.length > 0}}">
-        <image class="img" wx:for="{{item.picList}}" wx:key="*this" wx:for-item="pitem" src="{{pitem}}"></image>
-      </view>
-      <view class="customer-service" wx:if="{{item.adminContent}}">
-        <text class="u">商家回复：</text>
-        <text class="c">{{item.adminContent}}</text>
-      </view>
-    </view>
-
-  </view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/comment/comment.wxss b/litemall-wx/pages/comment/comment.wxss
deleted file mode 100644
index 700517e7..00000000
--- a/litemall-wx/pages/comment/comment.wxss
+++ /dev/null
@@ -1,155 +0,0 @@
-.comments {
-  width: 100%;
-  height: auto;
-  padding-left: 30rpx;
-  background: #fff;
-  margin: 20rpx 0;
-}
-
-.comments .h {
-  position: fixed;
-  left: 0;
-  top: 0;
-  z-index: 1000;
-  width: 100%;
-  display: flex;
-  background: #fff;
-  height: 84rpx;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.15);
-}
-
-.comments .h .item {
-  display: inline-block;
-  height: 82rpx;
-  width: 50%;
-  padding: 0 15rpx;
-  text-align: center;
-}
-
-.comments .h .item .txt {
-  display: inline-block;
-  height: 82rpx;
-  padding: 0 20rpx;
-  line-height: 82rpx;
-  color: #333;
-  font-size: 30rpx;
-  width: 170rpx;
-}
-
-.comments .h .item.active .txt {
-  color: #ab2b2b;
-  border-bottom: 4rpx solid #ab2b2b;
-}
-
-.comments .b {
-  margin-top: 85rpx;
-  height: auto;
-  width: 720rpx;
-}
-
-.comments .b.no-h {
-  margin-top: 0;
-}
-
-.comments .item {
-  height: auto;
-  width: 720rpx;
-  overflow: hidden;
-  border-bottom: 1px solid #d9d9d9;
-  padding-bottom: 25rpx;
-}
-
-.comments .info {
-  height: 127rpx;
-  width: 100%;
-  padding: 33rpx 0 27rpx 0;
-}
-
-.comments .user {
-  float: left;
-  width: auto;
-  height: 67rpx;
-  line-height: 67rpx;
-  font-size: 0;
-}
-
-.comments .user image {
-  float: left;
-  width: 67rpx;
-  height: 67rpx;
-  margin-right: 17rpx;
-  border-radius: 50%;
-}
-
-.comments .user text {
-  display: inline-block;
-  width: auto;
-  height: 66rpx;
-  overflow: hidden;
-  font-size: 29rpx;
-  line-height: 66rpx;
-}
-
-.comments .time {
-  display: block;
-  float: right;
-  width: auto;
-  height: 67rpx;
-  line-height: 67rpx;
-  color: #7f7f7f;
-  font-size: 25rpx;
-  margin-right: 30rpx;
-}
-
-.comments .comment {
-  width: 720rpx;
-  padding-right: 30rpx;
-  line-height: 45.8rpx;
-  font-size: 29rpx;
-  margin-bottom: 16rpx;
-}
-
-.comments .imgs {
-  width: 720rpx;
-  height: 150rpx;
-  margin-bottom: 25rpx;
-}
-
-.comments .imgs .img {
-  height: 150rpx;
-  width: 150rpx;
-  margin-right: 28rpx;
-}
-
-.comments .spec {
-  width: 720rpx;
-  height: 25rpx;
-  font-size: 24rpx;
-  color: #999;
-}
-
-.comments .spec .item {
-  color: #7f7f7f;
-  font-size: 25rpx;
-}
-
-.comments .customer-service {
-  width: 690rpx;
-  height: auto;
-  overflow: hidden;
-  margin-top: 23rpx;
-  background: rgba(0, 0, 0, 0.03);
-  padding: 21rpx;
-}
-
-.comments .customer-service .u {
-  font-size: 24rpx;
-  color: #333;
-  line-height: 37.5rpx;
-}
-
-.comments .customer-service .c {
-  font-size: 24rpx;
-  color: #999;
-  line-height: 37.5rpx;
-}
diff --git a/litemall-wx/pages/commentPost/commentPost.js b/litemall-wx/pages/commentPost/commentPost.js
deleted file mode 100644
index ba7c723d..00000000
--- a/litemall-wx/pages/commentPost/commentPost.js
+++ /dev/null
@@ -1,172 +0,0 @@
-// 上传组件 基于https://github.com/Tencent/weui-wxss/tree/master/src/example/uploader
-var app = getApp();
-var util = require('../../utils/util.js');
-var api = require('../../config/api.js');
-Page({
-  data: {
-    ogid: 0,
-    orderGoods: {},
-    content: '',
-    stars: [0, 1, 2, 3, 4],
-    star: 5,
-    starText: '十分满意',
-    hasPicture: false,
-    picUrls: [],
-    files: []
-  },
-  chooseImage: function(e) {
-    if (this.data.files.length >= 5) {
-      util.showErrorToast('只能上传五张图片')
-      return false;
-    }
-
-    var that = this;
-    wx.chooseImage({
-      count: 1,
-      sizeType: ['original', 'compressed'],
-      sourceType: ['album', 'camera'],
-      success: function(res) {
-        that.setData({
-          files: that.data.files.concat(res.tempFilePaths)
-        });
-        that.upload(res);
-      }
-    })
-  },
-  upload: function(res) {
-    var that = this;
-    const uploadTask = wx.uploadFile({
-      url: api.StorageUpload,
-      filePath: res.tempFilePaths[0],
-      name: 'file',
-      success: function(res) {
-        var _res = JSON.parse(res.data);
-        if (_res.errno === 0) {
-          var url = _res.data.url
-          that.data.picUrls.push(url)
-          that.setData({
-            hasPicture: true,
-            picUrls: that.data.picUrls
-          })
-        }
-      },
-      fail: function(e) {
-        wx.showModal({
-          title: '错误',
-          content: '上传失败',
-          showCancel: false
-        })
-      },
-    })
-
-    uploadTask.onProgressUpdate((res) => {
-      console.log('上传进度', res.progress)
-      console.log('已经上传的数据长度', res.totalBytesSent)
-      console.log('预期需要上传的数据总长度', res.totalBytesExpectedToSend)
-    })
-
-  },
-  previewImage: function(e) {
-    wx.previewImage({
-      current: e.currentTarget.id, // 当前显示图片的http链接
-      urls: this.data.files // 需要预览的图片http链接列表
-    })
-  },
-  selectRater: function(e) {
-    var star = e.currentTarget.dataset.star + 1;
-    var starText;
-    if (star == 1) {
-      starText = '很差';
-    } else if (star == 2) {
-      starText = '不太满意';
-    } else if (star == 3) {
-      starText = '满意';
-    } else if (star == 4) {
-      starText = '比较满意';
-    } else {
-      starText = '十分满意'
-    }
-    this.setData({
-      star: star,
-      starText: starText
-    })
-
-  },
-  onLoad: function(options) {
-    var that = this;
-    that.setData({
-      ogid: options.ogid
-    });
-    this.getOrderGoods();
-  },
-  getOrderGoods: function() {
-    let that = this;
-    util.request(api.OrderGoods, {
-      ogid: that.data.ogid
-    }).then(function(res) {
-      if (res.errno === 0) {
-        that.setData({
-          orderGoods: res.data,
-        });
-      }
-    });
-  },
-  onClose: function() {
-    wx.navigateBack();
-  },
-  onPost: function() {
-    let that = this;
-
-    if (!this.data.content) {
-      util.showErrorToast('请填写评论')
-      return false;
-    }
-
-    util.request(api.OrderComment, {
-      orderGoodsId: that.data.orderGoods.id,
-      content: that.data.content,
-      star: that.data.star,
-      hasPicture: that.data.hasPicture,
-      picUrls: that.data.picUrls
-    }, 'POST').then(function(res) {
-      if (res.errno === 0) {
-        wx.showToast({
-          title: '评论成功',
-          complete: function() {
-            wx.switchTab({
-              url: '/pages/ucenter/index/index'
-            })
-          }
-        })
-      }
-    });
-  },
-  bindInputValue(event) {
-
-    let value = event.detail.value;
-
-    //判断是否超过140个字符
-    if (value && value.length > 140) {
-      return false;
-    }
-
-    this.setData({
-      content: event.detail.value,
-    })
-  },
-  onReady: function() {
-
-  },
-  onShow: function() {
-    // 页面显示
-
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/commentPost/commentPost.json b/litemall-wx/pages/commentPost/commentPost.json
deleted file mode 100644
index 1ce26b43..00000000
--- a/litemall-wx/pages/commentPost/commentPost.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "评价"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/commentPost/commentPost.wxml b/litemall-wx/pages/commentPost/commentPost.wxml
deleted file mode 100644
index 7c217965..00000000
--- a/litemall-wx/pages/commentPost/commentPost.wxml
+++ /dev/null
@@ -1,55 +0,0 @@
-<view class="container">
-  <view class="post-comment">
-    <view class="goods">
-      <view class="img">
-        <image src="{{orderGoods.picUrl}}"></image>
-      </view>
-      <view class="info">
-        <view class="t">
-          <text class="name">{{orderGoods.goodsName}} x{{orderGoods.number}}</text>
-        </view>
-        <view class="attr">{{orderGoods.goodsSpecificationValues}}</view>
-      </view>
-    </view>
-    <view class="rater">
-      <text class="rater-title">评分</text>
-      <block wx:for="{{stars}}" wx:key="*this" wx:for-item="item">
-        <van-icon name="star" bindtap="selectRater" color="#ab956d" data-star="{{item}}" wx:if="{{item < star}}"/>
-        <van-icon name="star-o" bindtap="selectRater" data-star="{{item}}" wx:else/>
-      </block>
-      <text class="rater-desc">{{starText}}</text>
-    </view>
-    <view class="input-box">
-      <textarea class="content" focus="true" bindinput="bindInputValue" maxlength="140" placeholder="留言经过筛选后，对所有人可见" />
-      <text class="count">{{140 - content.length}}</text>
-    </view>
-
-    <view class="weui-uploader">
-      <view class="weui-uploader__hd">
-        <view class="weui-uploader__title">图片上传</view>
-        <view class="weui-uploader__info">{{picUrls.length}}/{{files.length}}</view>
-      </view>
-      <view class="weui-uploader__bd">
-        <view class="weui-uploader__files" id="uploaderFiles">
-          <block wx:for="{{files}}" wx:key="*this">
-            <view class="weui-uploader__file" bindtap="previewImage" id="{{item}}">
-              <image class="weui-uploader__img" src="{{item}}" mode="aspectFill" />
-            </view>
-            <!-- <view class="weui-uploader__file weui-uploader__file_status" bindtap="previewImage" id="{{item}}">
-              <image class="weui-uploader__img" src="{{item}}" mode="aspectFill" />
-              <view class="weui-uploader__file-content">50%</view>
-            </view> -->
-          </block>
-          <view class="weui-uploader__input-box">
-            <view class="weui-uploader__input" bindtap="chooseImage"></view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <view class="btns">
-      <view class="close" bindtap="onClose">取消</view>
-      <view class="post" bindtap="onPost">发表</view>
-    </view>
-  </view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/commentPost/commentPost.wxss b/litemall-wx/pages/commentPost/commentPost.wxss
deleted file mode 100644
index dae5457a..00000000
--- a/litemall-wx/pages/commentPost/commentPost.wxss
+++ /dev/null
@@ -1,246 +0,0 @@
-page, .container {
-  height: 100%;
-  background: #f4f4f4;
-}
-
-.post-comment {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-  padding: 30rpx;
-  background: #fff;
-}
-
-.post-comment .goods {
-  display: flex;
-  align-items: center;
-  height: 199rpx;
-  margin-left: 31.25rpx;
-}
-
-.post-comment .goods .img {
-  height: 145.83rpx;
-  width: 145.83rpx;
-  background: #f4f4f4;
-}
-
-.post-comment .goods .img image {
-  height: 145.83rpx;
-  width: 145.83rpx;
-}
-
-.post-comment .goods .info {
-  height: 145.83rpx;
-  flex: 1;
-  padding-left: 20rpx;
-}
-
-.post-comment .goods .name {
-  margin-top: 30rpx;
-  display: block;
-  height: 44rpx;
-  line-height: 44rpx;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.post-comment .goods .number {
-  display: block;
-  height: 37rpx;
-  line-height: 37rpx;
-  color: #666;
-  font-size: 25rpx;
-}
-
-.post-comment .goods .status {
-  width: 105rpx;
-  color: #b4282d;
-  font-size: 25rpx;
-}
-
-.post-comment .rater {
-  display: flex;
-  flex-direction: row;
-  height: 55rpx;
-}
-
-.post-comment .rater .rater-title {
-  font-size: 29rpx;
-  padding-right: 10rpx;
-}
-
-.post-comment .rater image {
-  padding-left: 5rpx;
-  height: 50rpx;
-  width: 50rpx;
-}
-
-.post-comment .rater .rater-desc {
-  font-size: 29rpx;
-  padding-left: 10rpx;
-}
-
-.post-comment .input-box {
-  height: 337.5rpx;
-  width: 690rpx;
-  position: relative;
-  background: #fff;
-}
-
-.post-comment .input-box .content {
-  position: absolute;
-  top: 0;
-  left: 0;
-  display: block;
-  background: #fff;
-  font-size: 29rpx;
-  border: 5px solid #f4f4f4;
-  height: 300rpx;
-  width: 650rpx;
-  padding: 20rpx;
-}
-
-.post-comment .input-box .count {
-  position: absolute;
-  bottom: 20rpx;
-  right: 20rpx;
-  display: block;
-  height: 30rpx;
-  width: 50rpx;
-  font-size: 29rpx;
-  color: #999;
-}
-
-.post-comment .btns {
-  height: 108rpx;
-}
-
-.post-comment .close {
-  float: left;
-  height: 108rpx;
-  line-height: 108rpx;
-  text-align: left;
-  color: #666;
-  padding: 0 30rpx;
-}
-
-.post-comment .post {
-  float: right;
-  height: 108rpx;
-  line-height: 108rpx;
-  text-align: right;
-  padding: 0 30rpx;
-}
-
-.weui-uploader {
-  margin-top: 50rpx;
-}
-
-.weui-uploader__hd {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  padding-bottom: 10px;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-  align-items: center;
-}
-
-.weui-uploader__title {
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-  flex: 1;
-}
-
-.weui-uploader__info {
-  color: #b2b2b2;
-}
-
-.weui-uploader__bd {
-  margin-bottom: -4px;
-  margin-right: -9px;
-  overflow: hidden;
-}
-
-.weui-uploader__file {
-  float: left;
-  margin-right: 9px;
-  margin-bottom: 9px;
-}
-
-.weui-uploader__img {
-  display: block;
-  width: 79px;
-  height: 79px;
-}
-
-.weui-uploader__file_status {
-  position: relative;
-}
-
-.weui-uploader__file_status:before {
-  content: " ";
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-.weui-uploader__file-content {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  -webkit-transform: translate(-50%, -50%);
-  transform: translate(-50%, -50%);
-  color: #fff;
-}
-
-.weui-uploader__input-box {
-  float: left;
-  position: relative;
-  margin-right: 9px;
-  margin-bottom: 9px;
-  width: 77px;
-  height: 77px;
-  border: 1px solid #d9d9d9;
-}
-
-.weui-uploader__input-box:after, .weui-uploader__input-box:before {
-  content: " ";
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  -webkit-transform: translate(-50%, -50%);
-  transform: translate(-50%, -50%);
-  background-color: #d9d9d9;
-}
-
-.weui-uploader__input-box:before {
-  width: 2px;
-  height: 39.5px;
-}
-
-.weui-uploader__input-box:after {
-  width: 39.5px;
-  height: 2px;
-}
-
-.weui-uploader__input-box:active {
-  border-color: #999;
-}
-
-.weui-uploader__input-box:active:after, .weui-uploader__input-box:active:before {
-  background-color: #999;
-}
-
-.weui-uploader__input {
-  position: absolute;
-  z-index: 1;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  opacity: 0;
-}
diff --git a/litemall-wx/pages/coupon/coupon.js b/litemall-wx/pages/coupon/coupon.js
deleted file mode 100644
index e18bee28..00000000
--- a/litemall-wx/pages/coupon/coupon.js
+++ /dev/null
@@ -1,150 +0,0 @@
-var util = require('../../utils/util.js');
-var api = require('../../config/api.js');
-
-var app = getApp();
-
-Page({
-  data: {
-    couponList: [],
-    page: 1,
-    limit: 10,
-    count: 0,
-    scrollTop: 0,
-    showPage: false
-  },
-
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.getCouponList();
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  },
-  getCouponList: function () {
-
-    let that = this;
-    that.setData({
-      scrollTop: 0,
-      showPage: false,
-      couponList: []
-    });
-    // 页面渲染完成
-    wx.showToast({
-      title: '加载中...',
-      icon: 'loading',
-      duration: 2000
-    });
-
-    util.request(api.CouponList, {
-      page: that.data.page,
-      limit: that.data.limit
-    }).then(function (res) {
-      if (res.errno === 0) {
-
-        that.setData({
-          scrollTop: 0,
-          couponList: res.data.list,
-          showPage: true,
-          count: res.data.total
-        });
-      }
-      wx.hideToast();
-    });
-
-  },
-  getCoupon(e) {
-    if (!app.globalData.hasLogin) {
-      wx.navigateTo({
-        url: "/pages/auth/login/login"
-      });
-      return;
-    }
-
-    let couponId = e.currentTarget.dataset.index
-    util.request(api.CouponReceive, {
-      couponId: couponId
-    }, 'POST').then(res => {
-      if (res.errno === 0) {
-        wx.showToast({
-          title: "领取成功"
-        })
-      }
-      else {
-        util.showErrorToast(res.errmsg);
-      }
-    })
-  },
-  nextPage: function (event) {
-    var that = this;
-    if (this.data.page > that.data.count / that.data.limit) {
-      return true;
-    }
-
-    that.setData({
-      page: that.data.page + 1
-    });
-
-    this.getCouponList();
-
-  },
-  prevPage: function (event) {
-    if (this.data.page <= 1) {
-      return false;
-    }
-
-    var that = this;
-    that.setData({
-      page: that.data.page - 1
-    });
-    this.getCouponList();
-  }
-})
diff --git a/litemall-wx/pages/coupon/coupon.json b/litemall-wx/pages/coupon/coupon.json
deleted file mode 100644
index caada87c..00000000
--- a/litemall-wx/pages/coupon/coupon.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "优惠券专区"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/coupon/coupon.wxml b/litemall-wx/pages/coupon/coupon.wxml
deleted file mode 100644
index 3bb12961..00000000
--- a/litemall-wx/pages/coupon/coupon.wxml
+++ /dev/null
@@ -1,28 +0,0 @@
-<view class="container">
-  <scroll-view class="coupon-list" scroll-y="true" scroll-top="{{scrollTop}}">
-
-    <view class="item" wx:for="{{couponList}}" wx:for-index="index" wx:for-item="item" wx:key="id" bindtap="getCoupon" data-index="{{item.id}}">
-      <view class="tag">{{item.tag}}</view>
-      <view class="content">
-        <view class="left">
-          <view class="discount">{{item.discount}}元</view>
-          <view class="min"> 满{{item.min}}元使用</view>
-        </view>
-        <view class="right">
-          <view class="name">{{item.name}}</view>
-          <view class="time" wx:if="{{item.days != 0}}">有效期：{{item.days}}天</view>
-          <view class="time" wx:else> 有效期：{{item.startTime}} - {{item.endTime}}</view>
-        </view>
-      </view>
-      <view class="condition">
-        <text class="txt">{{item.desc}}</text>
-        <image src="{{item.pic}}" class="icon"></image>
-      </view>
-    </view>
-
-    <view class="page" wx:if="{{showPage}}">
-      <view class="prev {{ page <= 1 ? 'disabled' : ''}}" bindtap="prevPage">上一页</view>
-      <view class="next {{ (count / limit) < page ? 'disabled' : ''}}" bindtap="nextPage">下一页</view>
-    </view>
-  </scroll-view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/coupon/coupon.wxss b/litemall-wx/pages/coupon/coupon.wxss
deleted file mode 100644
index 640ea9ad..00000000
--- a/litemall-wx/pages/coupon/coupon.wxss
+++ /dev/null
@@ -1,132 +0,0 @@
-page {
-  background: #f4f4f4;
-  min-height: 100%;
-}
-
-.container {
-  background: #f4f4f4;
-  min-height: 100%;
-  padding-top: 30rpx;
-}
-
-.coupon-list {
-  width: 750rpx;
-  height: 100%;
-  overflow: hidden;
-}
-
-.item {
-  position: relative;
-  height: 290rpx;
-  width: 700rpx;
-  background: linear-gradient(to right, #cfa568, #e3bf79);
-  margin-bottom: 30rpx;
-  margin-left: 30rpx;
-  margin-right: 30rpx;
-  padding-top: 52rpx;
-}
-
-.tag {
-  height: 32rpx;
-  background: #a48143;
-  padding-left: 16rpx;
-  padding-right: 16rpx;
-  position: absolute;
-  left: 20rpx;
-  color: #fff;
-  top: 20rpx;
-  font-size: 20rpx;
-  text-align: center;
-  line-height: 32rpx;
-}
-
-.content {
-  margin-top: 24rpx;
-  margin-left: 40rpx;
-  display: flex;
-  margin-right: 40rpx;
-  flex-direction: row;
-}
-
-.content .left {
-  flex: 1;
-}
-
-.discount {
-  font-size: 50rpx;
-  color: #b4282d;
-}
-
-.min {
-  color: #fff;
-}
-
-.content .right {
-  width: 400rpx;
-}
-
-.name {
-  font-size: 44rpx;
-  color: #fff;
-  margin-bottom: 14rpx;
-}
-
-.time {
-  font-size: 24rpx;
-  color: #fff;
-  line-height: 30rpx;
-}
-
-.condition {
-  position: absolute;
-  width: 100%;
-  bottom: 0;
-  left: 0;
-  height: 78rpx;
-  background: rgba(0, 0, 0, 0.08);
-  padding: 24rpx 40rpx;
-  display: flex;
-  flex-direction: row;
-}
-
-.condition .txt {
-  display: block;
-  height: 30rpx;
-  flex: 1;
-  overflow: hidden;
-  font-size: 24rpx;
-  line-height: 30rpx;
-  color: #fff;
-}
-
-.condition .icon {
-  margin-left: 30rpx;
-  width: 24rpx;
-  height: 24rpx;
-}
-
-
-.page {
-  width: 750rpx;
-  height: 108rpx;
-  background: #fff;
-  margin-bottom: 20rpx;
-}
-
-.page view {
-  height: 108rpx;
-  width: 50%;
-  float: left;
-  font-size: 29rpx;
-  color: #333;
-  text-align: center;
-  line-height: 108rpx;
-}
-
-.page .prev {
-  border-right: 1px solid #d9d9d9;
-}
-
-.page .disabled {
-  color: #ccc;
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/topicDetail/topicDetail.js b/litemall-wx/pages/details/details.js
similarity index 32%
rename from litemall-wx/pages/topicDetail/topicDetail.js
rename to litemall-wx/pages/details/details.js
index b6494a54..d8c98799 100644
--- a/litemall-wx/pages/topicDetail/topicDetail.js
+++ b/litemall-wx/pages/details/details.js
@@ -1,70 +1,41 @@
-var app = getApp();
+// pages/details/details.js
+const util = require('../../utils/util.js');
+const api = require('../../config/api.js');
 var WxParse = require('../../lib/wxParse/wxParse.js');
-var util = require('../../utils/util.js');
-var api = require('../../config/api.js');
-
 Page({
+
+  /**
+   * 页面的初始数据
+   */
   data: {
-    id: 0,
-    topic: {},
-    topicList: [],
-    commentCount: 0,
-    commentList: [],
-    topicGoods: [],
-    collect: false,
-    userHasCollect: 0
+    data: {},
+    pinlei:['直播','测试'],
+    userHasCollect:0,
   },
-  onLoad: function(options) {
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    console.log('options',options)
     // 页面初始化 options为页面跳转所带来的参数
     var that = this;
     that.setData({
       id: options.id
     });
-
-    util.request(api.TopicDetail, {
+    // GoodsDetail
+    util.request(api.GoodsDetail, {
       id: that.data.id
     }).then(function(res) {
       if (res.errno === 0) {
         that.setData({
-          topic: res.data.topic,
-          topicGoods: res.data.goods,
-          userHasCollect: res.data.userHasCollect,
-          collect: res.data.userHasCollect == 1
-        });
-
-        WxParse.wxParse('topicDetail', 'html', res.data.topic.content, that);
-      }
-    });
-
-    util.request(api.TopicRelated, {
-      id: that.data.id
-    }).then(function(res) {
-      if (res.errno === 0) {
-        that.setData({
-          topicList: res.data.list
+          data: res.data,
+          userHasCollect: res.data.userHasCollect
         });
+        WxParse.wxParse('goodsDetail', 'html', res.data.info.detail, that);
       }
     });
   },
-  getCommentList() {
-    let that = this;
-    util.request(api.CommentList, {
-      valueId: that.data.id,
-      type: 1,
-      showType: 0,
-      page: 1,
-      limit: 5
-    }).then(function(res) {
-      if (res.errno === 0) {
-        that.setData({
-          commentList: res.data.list,
-          commentCount: res.data.total
-        });
-      }
-    });
-  },
-
-  //添加或是取消收藏
   addCollectOrNot: function() {
     let that = this;
     util.request(api.CollectAddOrDelete, {
@@ -74,44 +45,69 @@ Page({
       .then(function(res) {
         if (that.data.userHasCollect == 1) {
           that.setData({
-            collect: false,
             userHasCollect: 0
           });
         } else {
           that.setData({
-            collect: true,
             userHasCollect: 1
           });
         }
 
       });
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
 
   },
 
-  postComment() {
-    if (!app.globalData.hasLogin) {
-      wx.navigateTo({
-        url: "/pages/auth/login/login"
-      });
-    } else {
-      wx.navigateTo({
-        url: '/pages/topicCommentPost/topicCommentPost?valueId=' + this.data.id + '&type=1',
-      })
-    }
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
   },
-  onReady: function() {
+  imgPreview: function(e) {
+    console.log(e)
+    var current = e.target.dataset.src;
+    wx.previewImage({
+      current: current, // 当前显示图片的http链接
+      urls: this.data.data.info.gallery // 需要预览的图片http链接列表
+    })
+  },
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
 
   },
-  onShow: function() {
-    // 页面显示
-    this.getCommentList();
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
   },
-  onHide: function() {
-    // 页面隐藏
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
 
   },
-  onUnload: function() {
-    // 页面关闭
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
 
   }
 })
\ No newline at end of file
diff --git a/litemall-wx/pages/details/details.json b/litemall-wx/pages/details/details.json
new file mode 100644
index 00000000..23032151
--- /dev/null
+++ b/litemall-wx/pages/details/details.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": ""
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/details/details.wxml b/litemall-wx/pages/details/details.wxml
new file mode 100644
index 00000000..2b314444
--- /dev/null
+++ b/litemall-wx/pages/details/details.wxml
@@ -0,0 +1,65 @@
+<!--pages/details/details.wxml-->
+<view>
+    <!-- <swiper class="goodsimgs" indicator-dots="true" autoplay="true" interval="3000" duration="1000">
+        <swiper-item wx:for="{{data.details}}" wx:key="*this">
+        <image src="{{item}}" mode="aspectFit|aspectFill|widthFix"></image>
+        </swiper-item>
+  </swiper> -->
+  <image class="picUrl" src="{{data.topicInfo.gallery[0]}}" mode="aspectFill" lazy-load="false">
+  </image>
+</view>
+<view class="requirement">
+    <!-- <view class="requirement-bg">
+        <view class="title">
+            任职要求 ：
+        </view>
+        <view class="">
+            1,我是任职要求
+        </view>
+         <view class="">
+            2,我是任职要求
+        </view>
+         <view class="">
+            3,我是任职要求
+        </view>
+         <view class="">
+            4,我是任职要求
+        </view>
+    </view> -->
+    <view class="capacity">
+        <view class="infoName">
+          {{ data.info.name }}
+        </view>
+        <view class="title_bottom">
+            职位要求 
+        </view>
+        <view class="detail list">
+          <import src="/lib/wxParse/wxParse.wxml" />
+          <template is="wxParse" data="{{wxParseData:goodsDetail.nodes}}" />
+        </view>
+        <view class="title_bottom">
+            职位详情 
+        </view>
+        <view class="list">
+            <text class="item" wx:for="{{data.info.workStyle}}" :key="index">{{ item }}</text>
+        </view>
+        <view class="imglist">
+            <image class="item" wx:for="{{ data.info.gallery }}"  wx:for-item="item" src="{{item}}" mode="aspectFill" data-src="{{item}}" bindtap="imgPreview">
+            </image>
+        </view>
+        <view class="title">
+            职位地址 
+        </view>
+        <view class="adress">
+            <text>{{data.topicInfo.province}}{{data.topicInfo.city}}{{data.topicInfo.county}}{{data.topicInfo.address}}</text>
+        </view>
+    </view>
+</view>
+<view class="bottombtn">
+    <view class="right_btn">
+      <van-icon name="star" size="32" color="{{userHasCollect==1?'#703EDD':''}}" bindtap="addCollectOrNot" />
+        <!-- <view class="btn">
+            立即沟通
+        </view> -->
+    </view>
+</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/details/details.wxss b/litemall-wx/pages/details/details.wxss
new file mode 100644
index 00000000..7ab52e83
--- /dev/null
+++ b/litemall-wx/pages/details/details.wxss
@@ -0,0 +1,120 @@
+/* pages/details/details.wxss */
+page {
+    height: 100%;
+    width: 100%;
+    background: #e9e5f1;
+}
+.picUrl{
+  width: 100%;
+}
+::-webkit-scrollbar {
+    width: 0;
+    height: 0;
+    color: transparent;
+}
+.goodsimgs {
+    width: 750rpx;
+    height: 750rpx;
+}
+
+.goodsimgs image {
+    width: 750rpx;
+    height: 750rpx;
+}
+.requirement{
+    padding: 0 20rpx;
+    padding-bottom: 160rpx;
+    position: relative;
+    top: -50rpx;
+}
+.requirement .requirement-bg{
+    background-color: #d3cbe4;
+    padding: 30rpx;
+    border-radius: 30rpx;
+}
+.requirement .requirement-bg .title{
+    margin-bottom: 20rpx;
+}
+.requirement .capacity{
+    margin-top: 30rpx;
+    background-color: #fff;
+    border-radius: 30rpx;
+}
+.requirement .capacity .detail{
+  padding: 0 10rpx;
+}
+.requirement .capacity .infoName{
+  padding-left: 30rpx;
+  font-size: 40rpx;
+  padding-top: 20rpx;
+}
+.requirement .capacity .title_bottom{
+    padding: 30rpx;
+}
+.requirement .capacity .title {
+    padding: 30rpx;
+}
+.requirement .capacity .list {
+    margin: 0 30rpx;
+    border-top: 2rpx #ccc solid;
+    padding-top: 20rpx;
+    padding-bottom: 30rpx;
+}
+.requirement .capacity .adress{
+    margin: 0 30rpx;
+    padding-bottom: 30rpx;
+}
+.requirement .capacity .imglist{
+    margin: 0 30rpx;
+    display: flex;
+    overflow: hidden;
+    overflow-x: auto;
+}
+.requirement .capacity .imglist .item{
+    width: 240rpx;
+    min-width: 240rpx;
+    height: 340rpx;
+    margin-right: 20rpx;
+    border-radius: 12rpx;
+}
+.requirement .capacity .list .item {
+    font-size: 26rpx;
+    display: inline-block;
+    padding: 10rpx 28rpx;
+    line-height: 30rpx;
+    margin: 10rpx 40rpx;
+    border-radius: 14rpx;
+    background-color: #ccc;
+    /* border: 2rpx solid #703EDD; */
+    /* color: #703EDD; */
+    margin-left: 0;
+}
+.bottombtn{
+    width: 100%;
+    height: 120rpx;
+    background: #fff;
+    position: fixed;
+    bottom: 0;
+    
+}
+.bottombtn .right_btn{
+  display: flex;
+  align-items: inherit;
+    justify-content: flex-end;
+    padding-right: 30rpx;
+}
+.bottombtn .right_btn .btn{
+    width: 200rpx;
+    margin-top: 30rpx;
+    height:70rpx;
+    line-height: 70rpx;
+    text-align: center;
+    background-color: #703EDD;
+    color: #fff;
+    border-radius: 30rpx;
+}
+.bottombtn .right_btn .van-icon{
+    color: #ccc;
+    padding-right: 60rpx !important;
+    padding-top: 20rpx;
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/goods/goods.js b/litemall-wx/pages/goods/goods.js
index 759b7d85..63e7020f 100644
--- a/litemall-wx/pages/goods/goods.js
+++ b/litemall-wx/pages/goods/goods.js
@@ -1,667 +1,667 @@
-var app = getApp();
-var WxParse = require('../../lib/wxParse/wxParse.js');
-var util = require('../../utils/util.js');
-var api = require('../../config/api.js');
-var user = require('../../utils/user.js');
-
-Page({
-  data: {
-    canShare: false,
-    id: 0,
-    goods: {},
-    groupon: [], //该商品支持的团购规格
-    grouponLink: {}, //参与的团购
-    attribute: [],
-    issueList: [],
-    comment: [],
-    brand: {},
-    specificationList: [],
-    productList: [],
-    relatedGoods: [],
-    cartGoodsCount: 0,
-    userHasCollect: 0,
-    number: 1,
-    tmpPicUrl: '',
-    checkedSpecText: '规格数量选择',
-    tmpSpecText: '请选择规格数量',
-    checkedSpecPrice: 0,
-    openAttr: false,
-    openShare: false,
-    collect: false,
-    shareImage: '',
-    isGroupon: false, //标识是否是一个参团购买
-    soldout: false,
-    canWrite: false, //用户是否获取了保存相册的权限
-  },
-
-  // 页面分享
-  onShareAppMessage: function() {
-    let that = this;
-    return {
-      title: that.data.goods.name,
-      desc: '唯爱与美食不可辜负',
-      path: '/pages/index/index?goodId=' + this.data.id
-    }
-  },
-
-  shareFriendOrCircle: function() {
-    //var that = this;
-    if (this.data.openShare === false) {
-      this.setData({
-        openShare: !this.data.openShare
-      });
-    } else {
-      return false;
-    }
-  },
-  handleSetting: function(e) {
-      var that = this;
-      // console.log(e)
-      if (!e.detail.authSetting['scope.writePhotosAlbum']) {
-          wx.showModal({
-              title: '警告',
-              content: '不授权无法保存',
-              showCancel: false
-          })
-          that.setData({
-              canWrite: false
-          })
-      } else {
-          wx.showToast({
-              title: '保存成功'
-          })
-          that.setData({
-              canWrite: true
-          })
-      }
-  },
-  // 保存分享图
-  saveShare: function() {
-    let that = this;
-    wx.downloadFile({
-      url: that.data.shareImage,
-      success: function(res) {
-        console.log(res)
-        wx.saveImageToPhotosAlbum({
-          filePath: res.tempFilePath,
-          success: function(res) {
-            wx.showModal({
-              title: '生成海报成功',
-              content: '海报已成功保存到相册，可以分享到朋友圈了',
-              showCancel: false,
-              confirmText: '好的',
-              confirmColor: '#a78845',
-              success: function(res) {
-                if (res.confirm) {
-                  console.log('用户点击确定');
-                }
-              }
-            })
-          },
-          fail: function(res) {
-            console.log('fail')
-          }
-        })
-      },
-      fail: function() {
-        console.log('fail')
-      }
-    })
-  },
-
-  //从分享的团购进入
-  getGrouponInfo: function(grouponId) {
-    let that = this;
-    util.request(api.GroupOnJoin, {
-      grouponId: grouponId
-    }).then(function(res) {
-      if (res.errno === 0) {
-        that.setData({
-          grouponLink: res.data.groupon,
-          id: res.data.goods.id
-        });
-        //获取商品详情
-        that.getGoodsInfo();
-      }
-    });
-  },
-
-  // 获取商品信息
-  getGoodsInfo: function() {
-    let that = this;
-    util.request(api.GoodsDetail, {
-      id: that.data.id
-    }).then(function(res) {
-      if (res.errno === 0) {
-
-        let _specificationList = res.data.specificationList;
-        let _tmpPicUrl = res.data.productList[0].url;
-        //console.log("pic: "+_tmpPicUrl);
-        // 如果仅仅存在一种货品，那么商品页面初始化时默认checked
-        if (_specificationList.length == 1) {
-          if (_specificationList[0].valueList.length == 1) {
-            _specificationList[0].valueList[0].checked = true
-
-            // 如果仅仅存在一种货品，那么商品价格应该和货品价格一致
-            // 这里检测一下
-            let _productPrice = res.data.productList[0].price;
-            let _goodsPrice = res.data.info.retailPrice;
-            if (_productPrice != _goodsPrice) {
-              console.error('商品数量价格和货品不一致');
-            }
-
-            that.setData({
-              checkedSpecText: _specificationList[0].valueList[0].value,
-              tmpSpecText: '已选择：' + _specificationList[0].valueList[0].value
-            });
-          }
-        }
-        res.data.info.path = "pages/goods/goods?id=" + that.data.id
-
-        that.setData({
-          goods: res.data.info,
-          attribute: res.data.attribute,
-          issueList: res.data.issue,
-          comment: res.data.comment,
-          brand: res.data.brand,
-          specificationList: res.data.specificationList,
-          productList: res.data.productList,
-          userHasCollect: res.data.userHasCollect,
-          shareImage: res.data.shareImage,
-          checkedSpecPrice: res.data.info.retailPrice,
-          groupon: res.data.groupon,
-          canShare: res.data.share,
-          //选择规格时，默认展示第一张图片
-          tmpPicUrl: _tmpPicUrl
-        });
-
-        
-        //如果是通过分享的团购参加团购，则团购项目应该与分享的一致并且不可更改
-        if (that.data.isGroupon) {
-          let groupons = that.data.groupon;
-          for (var i = 0; i < groupons.length; i++) {
-            if (groupons[i].id != that.data.grouponLink.rulesId) {
-              groupons.splice(i, 1);
-            }
-          }
-          groupons[0].checked = true;
-          //重设团购规格
-          that.setData({
-            groupon: groupons
-          });
-
-        }
-
-        if (res.data.userHasCollect == 1) {
-          that.setData({
-            collect: true
-          });
-        } else {
-          that.setData({
-            collect: false
-          });
-        }
-
-        WxParse.wxParse('goodsDetail', 'html', res.data.info.detail, that);
-        //获取推荐商品
-        that.getGoodsRelated();
-      }
-    });
-  },
-
-  // 获取推荐商品
-  getGoodsRelated: function() {
-    let that = this;
-    util.request(api.GoodsRelated, {
-      id: that.data.id
-    }).then(function(res) {
-      if (res.errno === 0) {
-        that.setData({
-          relatedGoods: res.data.list,
-        });
-      }
-    });
-  },
-
-  // 团购选择
-  clickGroupon: function(event) {
-    let that = this;
-
-    //参与团购，不可更改选择
-    if (that.data.isGroupon) {
-      return;
-    }
-
-    let specName = event.currentTarget.dataset.name;
-    let specValueId = event.currentTarget.dataset.valueId;
-
-    let _grouponList = this.data.groupon;
-    for (let i = 0; i < _grouponList.length; i++) {
-      if (_grouponList[i].id == specValueId) {
-        if (_grouponList[i].checked) {
-          _grouponList[i].checked = false;
-        } else {
-          _grouponList[i].checked = true;
-        }
-      } else {
-        _grouponList[i].checked = false;
-      }
-    }
-
-    this.setData({
-      groupon: _grouponList,
-    });
-  },
-
-  // 规格选择
-  clickSkuValue: function(event) {
-    let that = this;
-    let specName = event.currentTarget.dataset.name;
-    let specValueId = event.currentTarget.dataset.valueId;
-
-    //判断是否可以点击
-
-    //TODO 性能优化，可在wx:for中添加index，可以直接获取点击的属性名和属性值，不用循环
-    let _specificationList = this.data.specificationList;
-    for (let i = 0; i < _specificationList.length; i++) {
-      if (_specificationList[i].name === specName) {
-        for (let j = 0; j < _specificationList[i].valueList.length; j++) {
-          if (_specificationList[i].valueList[j].id == specValueId) {
-            //如果已经选中，则反选
-            if (_specificationList[i].valueList[j].checked) {
-              _specificationList[i].valueList[j].checked = false;
-            } else {
-              _specificationList[i].valueList[j].checked = true;
-            }
-          } else {
-            _specificationList[i].valueList[j].checked = false;
-          }
-        }
-      }
-    }
-    this.setData({
-      specificationList: _specificationList,
-    });
-    //重新计算spec改变后的信息
-    this.changeSpecInfo();
-
-    //重新计算哪些值不可以点击
-  },
-
-  //获取选中的团购信息
-  getCheckedGrouponValue: function() {
-    let checkedValues = {};
-    let _grouponList = this.data.groupon;
-    for (let i = 0; i < _grouponList.length; i++) {
-      if (_grouponList[i].checked) {
-        checkedValues = _grouponList[i];
-      }
-    }
-
-    return checkedValues;
-  },
-
-  //获取选中的规格信息
-  getCheckedSpecValue: function() {
-    let checkedValues = [];
-    let _specificationList = this.data.specificationList;
-    for (let i = 0; i < _specificationList.length; i++) {
-      let _checkedObj = {
-        name: _specificationList[i].name,
-        valueId: 0,
-        valueText: ''
-      };
-      for (let j = 0; j < _specificationList[i].valueList.length; j++) {
-        if (_specificationList[i].valueList[j].checked) {
-          _checkedObj.valueId = _specificationList[i].valueList[j].id;
-          _checkedObj.valueText = _specificationList[i].valueList[j].value;
-        }
-      }
-      checkedValues.push(_checkedObj);
-    }
-
-    return checkedValues;
-  },
-
-  //判断规格是否选择完整
-  isCheckedAllSpec: function() {
-    return !this.getCheckedSpecValue().some(function(v) {
-      if (v.valueId == 0) {
-        return true;
-      }
-    });
-  },
-
-  getCheckedSpecKey: function() {
-    let checkedValue = this.getCheckedSpecValue().map(function(v) {
-      return v.valueText;
-    });
-    return checkedValue;
-  },
-
-  // 规格改变时，重新计算价格及显示信息
-  changeSpecInfo: function() {
-    let checkedNameValue = this.getCheckedSpecValue();
-
-    //设置选择的信息
-    let checkedValue = checkedNameValue.filter(function(v) {
-      if (v.valueId != 0) {
-        return true;
-      } else {
-        return false;
-      }
-    }).map(function(v) {
-      return v.valueText;
-    });
-    if (checkedValue.length > 0) {
-      this.setData({
-        tmpSpecText: checkedValue.join('　')
-      });
-    } else {
-      this.setData({
-        tmpSpecText: '请选择规格数量'
-      });
-    }
-
-    if (this.isCheckedAllSpec()) {
-      this.setData({
-        checkedSpecText: this.data.tmpSpecText
-      });
-
-      // 规格所对应的货品选择以后
-      let checkedProductArray = this.getCheckedProductItem(this.getCheckedSpecKey());
-      if (!checkedProductArray || checkedProductArray.length <= 0) {
-        this.setData({
-          soldout: true
-        });
-        console.error('规格所对应货品不存在');
-        return;
-      }
-
-      let checkedProduct = checkedProductArray[0];
-      //console.log("checkedProduct: "+checkedProduct.url);
-      if (checkedProduct.number > 0) {
-        this.setData({
-          checkedSpecPrice: checkedProduct.price,
-          tmpPicUrl: checkedProduct.url,
-          soldout: false
-        });
-      } else {
-        this.setData({
-          checkedSpecPrice: this.data.goods.retailPrice,
-          soldout: true
-        });
-      }
-
-    } else {
-      this.setData({
-        checkedSpecText: '规格数量选择',
-        checkedSpecPrice: this.data.goods.retailPrice,
-        soldout: false
-      });
-    }
-
-  },
-
-  // 获取选中的产品（根据规格）
-  getCheckedProductItem: function(key) {
-    return this.data.productList.filter(function(v) {
-      if (v.specifications.toString() == key.toString()) {
-        return true;
-      } else {
-        return false;
-      }
-    });
-  },
-
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    if (options.id) {
-      this.setData({
-        id: parseInt(options.id)
-      });
-      this.getGoodsInfo();
-    }
-
-    if (options.grouponId) {
-      this.setData({
-        isGroupon: true,
-      });
-      this.getGrouponInfo(options.grouponId);
-    }
-    let that = this;
-    wx.getSetting({
-        success: function (res) {
-            console.log(res)
-            //不存在相册授权
-            if (!res.authSetting['scope.writePhotosAlbum']) {
-                wx.authorize({
-                    scope: 'scope.writePhotosAlbum',
-                    success: function () {
-                        that.setData({
-                            canWrite: true
-                        })
-                    },
-                    fail: function (err) {
-                        that.setData({
-                            canWrite: false
-                        })
-                    }
-                })
-            } else {
-                that.setData({
-                    canWrite: true
-                });
-            }
-        }
-    })
-  },
-  onShow: function() {
-    // 页面显示
-    var that = this;
-    util.request(api.CartGoodsCount).then(function(res) {
-      if (res.errno === 0) {
-        that.setData({
-          cartGoodsCount: res.data
-        });
-      }
-    });
-  },
-
-  //添加或是取消收藏
-  addCollectOrNot: function() {
-    let that = this;
-    util.request(api.CollectAddOrDelete, {
-        type: 0,
-        valueId: this.data.id
-      }, "POST")
-      .then(function(res) {
-        if (that.data.userHasCollect == 1) {
-          that.setData({
-            collect: false,
-            userHasCollect: 0
-          });
-        } else {
-          that.setData({
-            collect: true,
-            userHasCollect: 1
-          });
-        }
-
-      });
-
-  },
-
-  //立即购买（先自动加入购物车）
-  addFast: function() {
-    var that = this;
-    if (this.data.openAttr == false) {
-      //打开规格选择窗口
-      this.setData({
-        openAttr: !this.data.openAttr
-      });
-    } else {
-
-      //提示选择完整规格
-      if (!this.isCheckedAllSpec()) {
-        util.showErrorToast('请选择完整规格');
-        return false;
-      }
-
-      //根据选中的规格，判断是否有对应的sku信息
-      let checkedProductArray = this.getCheckedProductItem(this.getCheckedSpecKey());
-      if (!checkedProductArray || checkedProductArray.length <= 0) {
-        //找不到对应的product信息，提示没有库存
-        util.showErrorToast('没有库存');
-        return false;
-      }
-
-      let checkedProduct = checkedProductArray[0];
-      //验证库存
-      if (checkedProduct.number <= 0) {
-        util.showErrorToast('没有库存');
-        return false;
-      }
-
-      //验证团购是否有效
-      let checkedGroupon = this.getCheckedGrouponValue();
-
-      //立即购买
-      util.request(api.CartFastAdd, {
-          goodsId: this.data.goods.id,
-          number: this.data.number,
-          productId: checkedProduct.id
-        }, "POST")
-        .then(function(res) {
-          if (res.errno == 0) {
-
-            // 如果storage中设置了cartId，则是立即购买，否则是购物车购买
-            try {
-              wx.setStorageSync('cartId', res.data);
-              wx.setStorageSync('grouponRulesId', checkedGroupon.id);
-              wx.setStorageSync('grouponLinkId', that.data.grouponLink.id);
-              wx.navigateTo({
-                url: '/pages/checkout/checkout'
-              })
-            } catch (e) {}
-
-          } else {
-            util.showErrorToast(res.errmsg);
-          }
-        });
-    }
-
-
-  },
-
-  //添加到购物车
-  addToCart: function() {
-    var that = this;
-    if (this.data.openAttr == false) {
-      //打开规格选择窗口
-      this.setData({
-        openAttr: !this.data.openAttr
-      });
-    } else {
-
-      //提示选择完整规格
-      if (!this.isCheckedAllSpec()) {
-        util.showErrorToast('请选择完整规格');
-        return false;
-      }
-
-      //根据选中的规格，判断是否有对应的sku信息
-      let checkedProductArray = this.getCheckedProductItem(this.getCheckedSpecKey());
-      if (!checkedProductArray || checkedProductArray.length <= 0) {
-        //找不到对应的product信息，提示没有库存
-        util.showErrorToast('没有库存');
-        return false;
-      }
-
-      let checkedProduct = checkedProductArray[0];
-      //验证库存
-      if (checkedProduct.number <= 0) {
-        util.showErrorToast('没有库存');
-        return false;
-      }
-
-      //添加到购物车
-      util.request(api.CartAdd, {
-          goodsId: this.data.goods.id,
-          number: this.data.number,
-          productId: checkedProduct.id
-        }, "POST")
-        .then(function(res) {
-          let _res = res;
-          if (_res.errno == 0) {
-            wx.showToast({
-              title: '添加成功'
-            });
-            that.setData({
-              openAttr: !that.data.openAttr,
-              cartGoodsCount: _res.data
-            });
-            if (that.data.userHasCollect == 1) {
-              that.setData({
-                collect: true
-              });
-            } else {
-              that.setData({
-                collect: false
-              });
-            }
-          } else {
-            util.showErrorToast(_res.errmsg);
-          }
-
-        });
-    }
-
-  },
-
-  cutNumber: function() {
-    this.setData({
-      number: (this.data.number - 1 > 1) ? this.data.number - 1 : 1
-    });
-  },
-  addNumber: function() {
-    this.setData({
-      number: this.data.number + 1
-    });
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-
-  },
-  switchAttrPop: function() {
-    if (this.data.openAttr == false) {
-      this.setData({
-        openAttr: !this.data.openAttr
-      });
-    }
-  },
-  closeAttr: function() {
-    this.setData({
-      openAttr: false,
-    });
-  },
-  closeShare: function() {
-    this.setData({
-      openShare: false,
-    });
-  },
-  openCartPage: function() {
-    wx.switchTab({
-      url: '/pages/cart/cart'
-    });
-  },
-  onReady: function() {
-    // 页面渲染完成
-
-  }
-
+var app = getApp();
+var WxParse = require('../../lib/wxParse/wxParse.js');
+var util = require('../../utils/util.js');
+var api = require('../../config/api.js');
+var user = require('../../utils/user.js');
+
+Page({
+  data: {
+    canShare: false,
+    id: 0,
+    goods: {},
+    groupon: [], //该商品支持的团购规格
+    grouponLink: {}, //参与的团购
+    attribute: [],
+    issueList: [],
+    comment: [],
+    brand: {},
+    specificationList: [],
+    productList: [],
+    relatedGoods: [],
+    cartGoodsCount: 0,
+    userHasCollect: 0,
+    number: 1,
+    tmpPicUrl: '',
+    checkedSpecText: '规格数量选择',
+    tmpSpecText: '请选择规格数量',
+    checkedSpecPrice: 0,
+    openAttr: false,
+    openShare: false,
+    collect: false,
+    shareImage: '',
+    isGroupon: false, //标识是否是一个参团购买
+    soldout: false,
+    canWrite: false, //用户是否获取了保存相册的权限
+  },
+
+  // 页面分享
+  onShareAppMessage: function() {
+    let that = this;
+    return {
+      title: that.data.goods.name,
+      desc: '唯爱与美食不可辜负',
+      path: '/pages/index/index?goodId=' + this.data.id
+    }
+  },
+
+  shareFriendOrCircle: function() {
+    //var that = this;
+    if (this.data.openShare === false) {
+      this.setData({
+        openShare: !this.data.openShare
+      });
+    } else {
+      return false;
+    }
+  },
+  handleSetting: function(e) {
+      var that = this;
+      // console.log(e)
+      if (!e.detail.authSetting['scope.writePhotosAlbum']) {
+          wx.showModal({
+              title: '警告',
+              content: '不授权无法保存',
+              showCancel: false
+          })
+          that.setData({
+              canWrite: false
+          })
+      } else {
+          wx.showToast({
+              title: '保存成功'
+          })
+          that.setData({
+              canWrite: true
+          })
+      }
+  },
+  // 保存分享图
+  saveShare: function() {
+    let that = this;
+    wx.downloadFile({
+      url: that.data.shareImage,
+      success: function(res) {
+        console.log(res)
+        wx.saveImageToPhotosAlbum({
+          filePath: res.tempFilePath,
+          success: function(res) {
+            wx.showModal({
+              title: '生成海报成功',
+              content: '海报已成功保存到相册，可以分享到朋友圈了',
+              showCancel: false,
+              confirmText: '好的',
+              confirmColor: '#a78845',
+              success: function(res) {
+                if (res.confirm) {
+                  console.log('用户点击确定');
+                }
+              }
+            })
+          },
+          fail: function(res) {
+            console.log('fail')
+          }
+        })
+      },
+      fail: function() {
+        console.log('fail')
+      }
+    })
+  },
+
+  //从分享的团购进入
+  getGrouponInfo: function(grouponId) {
+    let that = this;
+    util.request(api.GroupOnJoin, {
+      grouponId: grouponId
+    }).then(function(res) {
+      if (res.errno === 0) {
+        that.setData({
+          grouponLink: res.data.groupon,
+          id: res.data.goods.id
+        });
+        //获取商品详情
+        that.getGoodsInfo();
+      }
+    });
+  },
+
+  // 获取商品信息
+  getGoodsInfo: function() {
+    let that = this;
+    util.request(api.GoodsDetail, {
+      id: that.data.id
+    }).then(function(res) {
+      if (res.errno === 0) {
+
+        let _specificationList = res.data.specificationList;
+        let _tmpPicUrl = res.data.productList[0].url;
+        //console.log("pic: "+_tmpPicUrl);
+        // 如果仅仅存在一种货品，那么商品页面初始化时默认checked
+        if (_specificationList.length == 1) {
+          if (_specificationList[0].valueList.length == 1) {
+            _specificationList[0].valueList[0].checked = true
+
+            // 如果仅仅存在一种货品，那么商品价格应该和货品价格一致
+            // 这里检测一下
+            let _productPrice = res.data.productList[0].price;
+            let _goodsPrice = res.data.info.retailPrice;
+            if (_productPrice != _goodsPrice) {
+              console.error('商品数量价格和货品不一致');
+            }
+
+            that.setData({
+              checkedSpecText: _specificationList[0].valueList[0].value,
+              tmpSpecText: '已选择：' + _specificationList[0].valueList[0].value
+            });
+          }
+        }
+        res.data.info.path = "pages/goods/goods?id=" + that.data.id
+
+        that.setData({
+          goods: res.data.info,
+          attribute: res.data.attribute,
+          issueList: res.data.issue,
+          comment: res.data.comment,
+          brand: res.data.brand,
+          specificationList: res.data.specificationList,
+          productList: res.data.productList,
+          userHasCollect: res.data.userHasCollect,
+          shareImage: res.data.shareImage,
+          checkedSpecPrice: res.data.info.retailPrice,
+          groupon: res.data.groupon,
+          canShare: res.data.share,
+          //选择规格时，默认展示第一张图片
+          tmpPicUrl: _tmpPicUrl
+        });
+
+        
+        //如果是通过分享的团购参加团购，则团购项目应该与分享的一致并且不可更改
+        if (that.data.isGroupon) {
+          let groupons = that.data.groupon;
+          for (var i = 0; i < groupons.length; i++) {
+            if (groupons[i].id != that.data.grouponLink.rulesId) {
+              groupons.splice(i, 1);
+            }
+          }
+          groupons[0].checked = true;
+          //重设团购规格
+          that.setData({
+            groupon: groupons
+          });
+
+        }
+
+        if (res.data.userHasCollect == 1) {
+          that.setData({
+            collect: true
+          });
+        } else {
+          that.setData({
+            collect: false
+          });
+        }
+
+        WxParse.wxParse('goodsDetail', 'html', res.data.info.detail, that);
+        //获取推荐商品
+        that.getGoodsRelated();
+      }
+    });
+  },
+
+  // 获取推荐商品
+  getGoodsRelated: function() {
+    let that = this;
+    util.request(api.GoodsRelated, {
+      id: that.data.id
+    }).then(function(res) {
+      if (res.errno === 0) {
+        that.setData({
+          relatedGoods: res.data.list,
+        });
+      }
+    });
+  },
+
+  // 团购选择
+  clickGroupon: function(event) {
+    let that = this;
+
+    //参与团购，不可更改选择
+    if (that.data.isGroupon) {
+      return;
+    }
+
+    let specName = event.currentTarget.dataset.name;
+    let specValueId = event.currentTarget.dataset.valueId;
+
+    let _grouponList = this.data.groupon;
+    for (let i = 0; i < _grouponList.length; i++) {
+      if (_grouponList[i].id == specValueId) {
+        if (_grouponList[i].checked) {
+          _grouponList[i].checked = false;
+        } else {
+          _grouponList[i].checked = true;
+        }
+      } else {
+        _grouponList[i].checked = false;
+      }
+    }
+
+    this.setData({
+      groupon: _grouponList,
+    });
+  },
+
+  // 规格选择
+  clickSkuValue: function(event) {
+    let that = this;
+    let specName = event.currentTarget.dataset.name;
+    let specValueId = event.currentTarget.dataset.valueId;
+
+    //判断是否可以点击
+
+    //TODO 性能优化，可在wx:for中添加index，可以直接获取点击的属性名和属性值，不用循环
+    let _specificationList = this.data.specificationList;
+    for (let i = 0; i < _specificationList.length; i++) {
+      if (_specificationList[i].name === specName) {
+        for (let j = 0; j < _specificationList[i].valueList.length; j++) {
+          if (_specificationList[i].valueList[j].id == specValueId) {
+            //如果已经选中，则反选
+            if (_specificationList[i].valueList[j].checked) {
+              _specificationList[i].valueList[j].checked = false;
+            } else {
+              _specificationList[i].valueList[j].checked = true;
+            }
+          } else {
+            _specificationList[i].valueList[j].checked = false;
+          }
+        }
+      }
+    }
+    this.setData({
+      specificationList: _specificationList,
+    });
+    //重新计算spec改变后的信息
+    this.changeSpecInfo();
+
+    //重新计算哪些值不可以点击
+  },
+
+  //获取选中的团购信息
+  getCheckedGrouponValue: function() {
+    let checkedValues = {};
+    let _grouponList = this.data.groupon;
+    for (let i = 0; i < _grouponList.length; i++) {
+      if (_grouponList[i].checked) {
+        checkedValues = _grouponList[i];
+      }
+    }
+
+    return checkedValues;
+  },
+
+  //获取选中的规格信息
+  getCheckedSpecValue: function() {
+    let checkedValues = [];
+    let _specificationList = this.data.specificationList;
+    for (let i = 0; i < _specificationList.length; i++) {
+      let _checkedObj = {
+        name: _specificationList[i].name,
+        valueId: 0,
+        valueText: ''
+      };
+      for (let j = 0; j < _specificationList[i].valueList.length; j++) {
+        if (_specificationList[i].valueList[j].checked) {
+          _checkedObj.valueId = _specificationList[i].valueList[j].id;
+          _checkedObj.valueText = _specificationList[i].valueList[j].value;
+        }
+      }
+      checkedValues.push(_checkedObj);
+    }
+
+    return checkedValues;
+  },
+
+  //判断规格是否选择完整
+  isCheckedAllSpec: function() {
+    return !this.getCheckedSpecValue().some(function(v) {
+      if (v.valueId == 0) {
+        return true;
+      }
+    });
+  },
+
+  getCheckedSpecKey: function() {
+    let checkedValue = this.getCheckedSpecValue().map(function(v) {
+      return v.valueText;
+    });
+    return checkedValue;
+  },
+
+  // 规格改变时，重新计算价格及显示信息
+  changeSpecInfo: function() {
+    let checkedNameValue = this.getCheckedSpecValue();
+
+    //设置选择的信息
+    let checkedValue = checkedNameValue.filter(function(v) {
+      if (v.valueId != 0) {
+        return true;
+      } else {
+        return false;
+      }
+    }).map(function(v) {
+      return v.valueText;
+    });
+    if (checkedValue.length > 0) {
+      this.setData({
+        tmpSpecText: checkedValue.join('　')
+      });
+    } else {
+      this.setData({
+        tmpSpecText: '请选择规格数量'
+      });
+    }
+
+    if (this.isCheckedAllSpec()) {
+      this.setData({
+        checkedSpecText: this.data.tmpSpecText
+      });
+
+      // 规格所对应的货品选择以后
+      let checkedProductArray = this.getCheckedProductItem(this.getCheckedSpecKey());
+      if (!checkedProductArray || checkedProductArray.length <= 0) {
+        this.setData({
+          soldout: true
+        });
+        console.error('规格所对应货品不存在');
+        return;
+      }
+
+      let checkedProduct = checkedProductArray[0];
+      //console.log("checkedProduct: "+checkedProduct.url);
+      if (checkedProduct.number > 0) {
+        this.setData({
+          checkedSpecPrice: checkedProduct.price,
+          tmpPicUrl: checkedProduct.url,
+          soldout: false
+        });
+      } else {
+        this.setData({
+          checkedSpecPrice: this.data.goods.retailPrice,
+          soldout: true
+        });
+      }
+
+    } else {
+      this.setData({
+        checkedSpecText: '规格数量选择',
+        checkedSpecPrice: this.data.goods.retailPrice,
+        soldout: false
+      });
+    }
+
+  },
+
+  // 获取选中的产品（根据规格）
+  getCheckedProductItem: function(key) {
+    return this.data.productList.filter(function(v) {
+      if (v.specifications.toString() == key.toString()) {
+        return true;
+      } else {
+        return false;
+      }
+    });
+  },
+
+  onLoad: function(options) {
+    // 页面初始化 options为页面跳转所带来的参数
+    if (options.id) {
+      this.setData({
+        id: parseInt(options.id)
+      });
+      this.getGoodsInfo();
+    }
+
+    if (options.grouponId) {
+      this.setData({
+        isGroupon: true,
+      });
+      this.getGrouponInfo(options.grouponId);
+    }
+    let that = this;
+    wx.getSetting({
+        success: function (res) {
+            console.log(res)
+            //不存在相册授权
+            if (!res.authSetting['scope.writePhotosAlbum']) {
+                wx.authorize({
+                    scope: 'scope.writePhotosAlbum',
+                    success: function () {
+                        that.setData({
+                            canWrite: true
+                        })
+                    },
+                    fail: function (err) {
+                        that.setData({
+                            canWrite: false
+                        })
+                    }
+                })
+            } else {
+                that.setData({
+                    canWrite: true
+                });
+            }
+        }
+    })
+  },
+  onShow: function() {
+    // 页面显示
+    var that = this;
+    util.request(api.CartGoodsCount).then(function(res) {
+      if (res.errno === 0) {
+        that.setData({
+          cartGoodsCount: res.data
+        });
+      }
+    });
+  },
+
+  //添加或是取消收藏
+  addCollectOrNot: function() {
+    let that = this;
+    util.request(api.CollectAddOrDelete, {
+        type: 0,
+        valueId: this.data.id
+      }, "POST")
+      .then(function(res) {
+        if (that.data.userHasCollect == 1) {
+          that.setData({
+            collect: false,
+            userHasCollect: 0
+          });
+        } else {
+          that.setData({
+            collect: true,
+            userHasCollect: 1
+          });
+        }
+
+      });
+
+  },
+
+  //立即购买（先自动加入购物车）
+  addFast: function() {
+    var that = this;
+    if (this.data.openAttr == false) {
+      //打开规格选择窗口
+      this.setData({
+        openAttr: !this.data.openAttr
+      });
+    } else {
+
+      //提示选择完整规格
+      if (!this.isCheckedAllSpec()) {
+        util.showErrorToast('请选择完整规格');
+        return false;
+      }
+
+      //根据选中的规格，判断是否有对应的sku信息
+      let checkedProductArray = this.getCheckedProductItem(this.getCheckedSpecKey());
+      if (!checkedProductArray || checkedProductArray.length <= 0) {
+        //找不到对应的product信息，提示没有库存
+        util.showErrorToast('没有库存');
+        return false;
+      }
+
+      let checkedProduct = checkedProductArray[0];
+      //验证库存
+      if (checkedProduct.number <= 0) {
+        util.showErrorToast('没有库存');
+        return false;
+      }
+
+      //验证团购是否有效
+      let checkedGroupon = this.getCheckedGrouponValue();
+
+      //立即购买
+      util.request(api.CartFastAdd, {
+          goodsId: this.data.goods.id,
+          number: this.data.number,
+          productId: checkedProduct.id
+        }, "POST")
+        .then(function(res) {
+          if (res.errno == 0) {
+
+            // 如果storage中设置了cartId，则是立即购买，否则是购物车购买
+            try {
+              wx.setStorageSync('cartId', res.data);
+              wx.setStorageSync('grouponRulesId', checkedGroupon.id);
+              wx.setStorageSync('grouponLinkId', that.data.grouponLink.id);
+              wx.navigateTo({
+                url: '/pages/checkout/checkout'
+              })
+            } catch (e) {}
+
+          } else {
+            util.showErrorToast(res.errmsg);
+          }
+        });
+    }
+
+
+  },
+
+  //添加到购物车
+  addToCart: function() {
+    var that = this;
+    if (this.data.openAttr == false) {
+      //打开规格选择窗口
+      this.setData({
+        openAttr: !this.data.openAttr
+      });
+    } else {
+
+      //提示选择完整规格
+      if (!this.isCheckedAllSpec()) {
+        util.showErrorToast('请选择完整规格');
+        return false;
+      }
+
+      //根据选中的规格，判断是否有对应的sku信息
+      let checkedProductArray = this.getCheckedProductItem(this.getCheckedSpecKey());
+      if (!checkedProductArray || checkedProductArray.length <= 0) {
+        //找不到对应的product信息，提示没有库存
+        util.showErrorToast('没有库存');
+        return false;
+      }
+
+      let checkedProduct = checkedProductArray[0];
+      //验证库存
+      if (checkedProduct.number <= 0) {
+        util.showErrorToast('没有库存');
+        return false;
+      }
+
+      //添加到购物车
+      util.request(api.CartAdd, {
+          goodsId: this.data.goods.id,
+          number: this.data.number,
+          productId: checkedProduct.id
+        }, "POST")
+        .then(function(res) {
+          let _res = res;
+          if (_res.errno == 0) {
+            wx.showToast({
+              title: '添加成功'
+            });
+            that.setData({
+              openAttr: !that.data.openAttr,
+              cartGoodsCount: _res.data
+            });
+            if (that.data.userHasCollect == 1) {
+              that.setData({
+                collect: true
+              });
+            } else {
+              that.setData({
+                collect: false
+              });
+            }
+          } else {
+            util.showErrorToast(_res.errmsg);
+          }
+
+        });
+    }
+
+  },
+
+  cutNumber: function() {
+    this.setData({
+      number: (this.data.number - 1 > 1) ? this.data.number - 1 : 1
+    });
+  },
+  addNumber: function() {
+    this.setData({
+      number: this.data.number + 1
+    });
+  },
+  onHide: function() {
+    // 页面隐藏
+
+  },
+  onUnload: function() {
+    // 页面关闭
+
+  },
+  switchAttrPop: function() {
+    if (this.data.openAttr == false) {
+      this.setData({
+        openAttr: !this.data.openAttr
+      });
+    }
+  },
+  closeAttr: function() {
+    this.setData({
+      openAttr: false,
+    });
+  },
+  closeShare: function() {
+    this.setData({
+      openShare: false,
+    });
+  },
+  openCartPage: function() {
+    wx.switchTab({
+      url: '/pages/cart/cart'
+    });
+  },
+  onReady: function() {
+    // 页面渲染完成
+
+  }
+
 })
\ No newline at end of file
diff --git a/litemall-wx/pages/goods/goods.json b/litemall-wx/pages/goods/goods.json
index b5778ad4..e5e14f21 100644
--- a/litemall-wx/pages/goods/goods.json
+++ b/litemall-wx/pages/goods/goods.json
@@ -1,3 +1,3 @@
-{
-  "navigationBarTitleText": "商品详情"
+{
+  "navigationBarTitleText": "商品详情"
 }
\ No newline at end of file
diff --git a/litemall-wx/pages/goods/goods.wxml b/litemall-wx/pages/goods/goods.wxml
index b8c837bb..161997ba 100644
--- a/litemall-wx/pages/goods/goods.wxml
+++ b/litemall-wx/pages/goods/goods.wxml
@@ -1,202 +1,202 @@
-<view class="container">
-  <swiper class="goodsimgs" indicator-dots="true" autoplay="true" interval="3000" duration="1000">
-    <swiper-item wx:for="{{goods.gallery}}" wx:key="*this">
-      <image src="{{item}}" background-size="cover"></image>
-    </swiper-item>
-  </swiper>
-  <!-- 分享 -->
-  <view class='goods_name'>
-    <view class='goods_name_left'>{{goods.name}}</view>
-    <view hidden="{{!canShare}}" class="goods_name_right" bindtap="shareFriendOrCircle">分享</view>
-  </view>
-  <view class="share-pop-box" hidden="{{!openShare}}">
-    <view class="share-pop">
-      <view class="close" bindtap="closeShare">
-        <van-icon class="icon" name="cross" />      
-      </view>
-      <view class='share-info'>
-        <button class="sharebtn" open-type="share" wx:if="{{!isGroupon}}">
-          <image class='sharebtn_image' src='/static/images/wechat.png'></image>
-          <view class='sharebtn_text'>分享给好友</view>
-        </button>
-        <button  class="savesharebtn" open-type="openSetting" bindopensetting="handleSetting" wx:if="{{(!isGroupon) && (!canWrite)}}" >
-          <image class='sharebtn_image' src='/static/images/friend.png'></image>
-          <view class='sharebtn_text'>生成海报</view>
-        </button>
-        <button class="savesharebtn" bindtap="saveShare" wx:if="{{!isGroupon && canWrite}}">
-          <image class='sharebtn_image' src='/static/images/friend.png'></image>
-          <view class='sharebtn_text'>生成海报</view>
-        </button>
-      </view>
-    </view>
-  </view>
-
-  <view class="goods-info">
-    <view class="c">
-      <text class="desc">{{goods.brief}}</text>
-      <view class="price">
-        <view class="counterPrice">原价：￥{{goods.counterPrice}}</view>
-        <view class="retailPrice">现价：￥{{checkedSpecPrice}}</view>
-      </view>
-
-      <view class="brand" wx:if="{{brand.name}}">
-        <navigator url="../brandDetail/brandDetail?id={{brand.id}}">
-          <text>{{brand.name}}</text>
-        </navigator>
-      </view>
-    </view>
-  </view>
-  <view class="section-nav section-attr" bindtap="switchAttrPop">
-    <view class="t">{{checkedSpecText}}</view>
-    <van-icon class="i" name="arrow" />
-  </view>
-  <view class="comments" wx:if="{{comment.count > 0}}">
-    <view class="h">
-      <navigator url="/pages/comment/comment?valueId={{goods.id}}&type=0">
-        <text class="t">评价({{comment.count > 999 ? '999+' : comment.count}})</text>
-        <view class="i">
-          查看全部
-          <van-icon name="arrow" />
-        </view>
-      </navigator>
-    </view>
-    <view class="b">
-      <view class="item" wx:for="{{comment.data}}" wx:key="id">
-        <view class="info">
-          <view class="user">
-            <image src="{{item.avatar}}"></image>
-            <text>{{item.nickname}}</text>
-          </view>
-          <view class="time">{{item.addTime}}</view>
-        </view>
-        <view class="content">
-          {{item.content}}
-        </view>
-        <view class="imgs" wx:if="{{item.picList.length > 0}}">
-          <image class="img" wx:for="{{item.picList}}" wx:key="*this" wx:for-item="iitem" src="{{iitem}} "></image>
-        </view>
-        <view class="customer-service" wx:if="{{item.adminContent}}">
-          <text class="u">商家回复：</text>
-          <text class="c">{{item.adminContent}}</text>
-        </view>
-      </view>
-    </view>
-  </view>
-  <view class="goods-attr">
-    <view class="t">商品参数</view>
-    <view class="l">
-      <view class="item" wx:for="{{attribute}}" wx:key="name">
-        <text class="left">{{item.attribute}}</text>
-        <text class="right">{{item.value}}</text>
-      </view>
-    </view>
-  </view>
-
-  <view class="detail">
-    <import src="/lib/wxParse/wxParse.wxml" />
-    <template is="wxParse" data="{{wxParseData:goodsDetail.nodes}}" />
-  </view>
-
-  <view class="common-problem">
-    <view class="h">
-      <view class="line"></view>
-      <text class="title">常见问题</text>
-    </view>
-    <view class="b">
-      <view class="item" wx:for="{{issueList}}" wx:key="id">
-        <view class="question-box">
-          <text class="spot"></text>
-          <text class="question">{{item.question}}</text>
-        </view>
-        <view class="answer">
-          {{item.answer}}
-        </view>
-      </view>
-    </view>
-  </view>
-
-  <!-- 大家都在看 -->
-  <view class="related-goods" wx:if="{{relatedGoods.length > 0}}">
-    <view class="h">
-      <view class="line"></view>
-      <text class="title">大家都在看</text>
-    </view>
-    <view class="b">
-      <view class="item" wx:for="{{relatedGoods}}" wx:key="id">
-        <navigator url="/pages/goods/goods?id={{item.id}}">
-          <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
-          <text class="name">{{item.name}}</text>
-          <text class="price">￥{{item.retailPrice}}</text>
-        </navigator>
-      </view>
-    </view>
-  </view>
-</view>
-<!-- 规格选择界面 -->
-<view class="attr-pop-box" hidden="{{!openAttr}}">
-  <view class="attr-pop">
-    <view class="close" bindtap="closeAttr">
-      <van-icon  class="icon" name="cross" />      
-    </view>
-    <view class="img-info">
-      <image class="img" src="{{tmpPicUrl}}"></image>
-      <view class="info">
-        <view class="c">
-          <view class="p">价格：￥{{checkedSpecPrice}}</view>
-          <view class="a">{{tmpSpecText}}</view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 规格列表 -->
-    <view class="spec-con">
-      <view class="spec-item" wx:for="{{specificationList}}" wx:key="name">
-        <view class="name">{{item.name}}</view>
-        <view class="values">
-          <view class="value {{vitem.checked ? 'selected' : ''}}" bindtap="clickSkuValue" wx:for="{{item.valueList}}" wx:for-item="vitem" wx:key="id" data-value-id="{{vitem.id}}" data-name="{{vitem.specification}}">{{vitem.value}}</view>
-        </view>
-      </view>
-
-      <view class="spec-item" wx:if="{{groupon.length > 0}}">
-        <view class="name">团购立减</view>
-        <view class="values">
-          <view class="value {{vitem.checked ? 'selected' : ''}}" bindtap="clickGroupon" wx:for="{{groupon}}" wx:for-item="vitem" wx:key="{{vitem.id}}" data-value-id="{{vitem.id}}" data-name="{{vitem.specification}}">￥{{vitem.discount}} ({{vitem.discountMember}}人)</view>
-        </view>
-      </view>
-
-      <!-- 数量 -->
-      <view class="number-item">
-        <view class="name">数量</view>
-        <view class="selnum">
-          <view class="cut" bindtap="cutNumber">-</view>
-          <input value="{{number}}" class="number" disabled="true" type="number" />
-          <view class="add" bindtap="addNumber">+</view>
-        </view>
-      </view>
-
-    </view>
-  </view>
-</view>
-
-<!-- 底部按钮 -->
-<view class="bottom-btn">
-<view class="l">
-  <button show-message-card send-message-title="{{ goods.name }}" send-message-path="{{ goods.path }}"
-				send-message-img="{{ goods.picUrl }}" open-type="contact"  class="l-contact">
-				<van-icon class="icon" name="/static/images/customer.png" />
-			</button>
-</view>
-  <view class="l l-collect" bindtap="addCollectOrNot" wx:if="{{!isGroupon}}">
-    <van-icon class="icon" name="star" color="#ab956d" wx:if="{{collect}}"/>
-    <van-icon class="icon" name="star-o" wx:else/>
-  </view>
-  <view class="l l-cart" wx:if="{{!isGroupon}}">
-    <view class="box">
-      <text class="cart-count">{{cartGoodsCount}}</text>
-      <van-icon bindtap="openCartPage" class="icon" name="cart-o" />
-    </view>
-  </view>
-  <view class="r" bindtap="addToCart" wx:if="{{!soldout}}" wx:if="{{!isGroupon}}">加入购物车</view>
-  <view class="c" bindtap="addFast" wx:if="{{!soldout}}">{{isGroupon?'参加团购':'立即购买'}}</view>
-  <view class="n" wx:if="{{soldout}}">商品已售空</view>
+<view class="container">
+  <swiper class="goodsimgs" indicator-dots="true" autoplay="true" interval="3000" duration="1000">
+    <swiper-item wx:for="{{goods.gallery}}" wx:key="*this">
+      <image src="{{item}}" background-size="cover"></image>
+    </swiper-item>
+  </swiper>
+  <!-- 分享 -->
+  <view class='goods_name'>
+    <view class='goods_name_left'>{{goods.name}}</view>
+    <view hidden="{{!canShare}}" class="goods_name_right" bindtap="shareFriendOrCircle">分享</view>
+  </view>
+  <view class="share-pop-box" hidden="{{!openShare}}">
+    <view class="share-pop">
+      <view class="close" bindtap="closeShare">
+        <van-icon class="icon" name="cross" />      
+      </view>
+      <view class='share-info'>
+        <button class="sharebtn" open-type="share" wx:if="{{!isGroupon}}">
+          <image class='sharebtn_image' src='/static/images/wechat.png'></image>
+          <view class='sharebtn_text'>分享给好友</view>
+        </button>
+        <button  class="savesharebtn" open-type="openSetting" bindopensetting="handleSetting" wx:if="{{(!isGroupon) && (!canWrite)}}" >
+          <image class='sharebtn_image' src='/static/images/friend.png'></image>
+          <view class='sharebtn_text'>生成海报</view>
+        </button>
+        <button class="savesharebtn" bindtap="saveShare" wx:if="{{!isGroupon && canWrite}}">
+          <image class='sharebtn_image' src='/static/images/friend.png'></image>
+          <view class='sharebtn_text'>生成海报</view>
+        </button>
+      </view>
+    </view>
+  </view>
+
+  <view class="goods-info">
+    <view class="c">
+      <text class="desc">{{goods.brief}}</text>
+      <view class="price">
+        <view class="counterPrice">原价：￥{{goods.counterPrice}}</view>
+        <view class="retailPrice">现价：￥{{checkedSpecPrice}}</view>
+      </view>
+
+      <view class="brand" wx:if="{{brand.name}}">
+        <navigator url="../brandDetail/brandDetail?id={{brand.id}}">
+          <text>{{brand.name}}</text>
+        </navigator>
+      </view>
+    </view>
+  </view>
+  <view class="section-nav section-attr" bindtap="switchAttrPop">
+    <view class="t">{{checkedSpecText}}</view>
+    <van-icon class="i" name="arrow" />
+  </view>
+  <view class="comments" wx:if="{{comment.count > 0}}">
+    <view class="h">
+      <navigator url="/pages/comment/comment?valueId={{goods.id}}&type=0">
+        <text class="t">评价({{comment.count > 999 ? '999+' : comment.count}})</text>
+        <view class="i">
+          查看全部
+          <van-icon name="arrow" />
+        </view>
+      </navigator>
+    </view>
+    <view class="b">
+      <view class="item" wx:for="{{comment.data}}" wx:key="id">
+        <view class="info">
+          <view class="user">
+            <image src="{{item.avatar}}"></image>
+            <text>{{item.nickname}}</text>
+          </view>
+          <view class="time">{{item.addTime}}</view>
+        </view>
+        <view class="content">
+          {{item.content}}
+        </view>
+        <view class="imgs" wx:if="{{item.picList.length > 0}}">
+          <image class="img" wx:for="{{item.picList}}" wx:key="*this" wx:for-item="iitem" src="{{iitem}} "></image>
+        </view>
+        <view class="customer-service" wx:if="{{item.adminContent}}">
+          <text class="u">商家回复：</text>
+          <text class="c">{{item.adminContent}}</text>
+        </view>
+      </view>
+    </view>
+  </view>
+  <view class="goods-attr">
+    <view class="t">商品参数</view>
+    <view class="l">
+      <view class="item" wx:for="{{attribute}}" wx:key="name">
+        <text class="left">{{item.attribute}}</text>
+        <text class="right">{{item.value}}</text>
+      </view>
+    </view>
+  </view>
+
+  <view class="detail">
+    <import src="/lib/wxParse/wxParse.wxml" />
+    <template is="wxParse" data="{{wxParseData:goodsDetail.nodes}}" />
+  </view>
+
+  <view class="common-problem">
+    <view class="h">
+      <view class="line"></view>
+      <text class="title">常见问题</text>
+    </view>
+    <view class="b">
+      <view class="item" wx:for="{{issueList}}" wx:key="id">
+        <view class="question-box">
+          <text class="spot"></text>
+          <text class="question">{{item.question}}</text>
+        </view>
+        <view class="answer">
+          {{item.answer}}
+        </view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 大家都在看 -->
+  <view class="related-goods" wx:if="{{relatedGoods.length > 0}}">
+    <view class="h">
+      <view class="line"></view>
+      <text class="title">大家都在看</text>
+    </view>
+    <view class="b">
+      <view class="item" wx:for="{{relatedGoods}}" wx:key="id">
+        <navigator url="/pages/goods/goods?id={{item.id}}">
+          <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
+          <text class="name">{{item.name}}</text>
+          <text class="price">￥{{item.retailPrice}}</text>
+        </navigator>
+      </view>
+    </view>
+  </view>
+</view>
+<!-- 规格选择界面 -->
+<view class="attr-pop-box" hidden="{{!openAttr}}">
+  <view class="attr-pop">
+    <view class="close" bindtap="closeAttr">
+      <van-icon  class="icon" name="cross" />      
+    </view>
+    <view class="img-info">
+      <image class="img" src="{{tmpPicUrl}}"></image>
+      <view class="info">
+        <view class="c">
+          <view class="p">价格：￥{{checkedSpecPrice}}</view>
+          <view class="a">{{tmpSpecText}}</view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 规格列表 -->
+    <view class="spec-con">
+      <view class="spec-item" wx:for="{{specificationList}}" wx:key="name">
+        <view class="name">{{item.name}}</view>
+        <view class="values">
+          <view class="value {{vitem.checked ? 'selected' : ''}}" bindtap="clickSkuValue" wx:for="{{item.valueList}}" wx:for-item="vitem" wx:key="id" data-value-id="{{vitem.id}}" data-name="{{vitem.specification}}">{{vitem.value}}</view>
+        </view>
+      </view>
+
+      <view class="spec-item" wx:if="{{groupon.length > 0}}">
+        <view class="name">团购立减</view>
+        <view class="values">
+          <view class="value {{vitem.checked ? 'selected' : ''}}" bindtap="clickGroupon" wx:for="{{groupon}}" wx:for-item="vitem" wx:key="{{vitem.id}}" data-value-id="{{vitem.id}}" data-name="{{vitem.specification}}">￥{{vitem.discount}} ({{vitem.discountMember}}人)</view>
+        </view>
+      </view>
+
+      <!-- 数量 -->
+      <view class="number-item">
+        <view class="name">数量</view>
+        <view class="selnum">
+          <view class="cut" bindtap="cutNumber">-</view>
+          <input value="{{number}}" class="number" disabled="true" type="number" />
+          <view class="add" bindtap="addNumber">+</view>
+        </view>
+      </view>
+
+    </view>
+  </view>
+</view>
+
+<!-- 底部按钮 -->
+<view class="bottom-btn">
+<view class="l">
+  <button show-message-card send-message-title="{{ goods.name }}" send-message-path="{{ goods.path }}"
+				send-message-img="{{ goods.picUrl }}" open-type="contact"  class="l-contact">
+				<van-icon class="icon" name="/static/images/customer.png" />
+			</button>
+</view>
+  <view class="l l-collect" bindtap="addCollectOrNot" wx:if="{{!isGroupon}}">
+    <van-icon class="icon" name="star" color="#ab956d" wx:if="{{collect}}"/>
+    <van-icon class="icon" name="star-o" wx:else/>
+  </view>
+  <view class="l l-cart" wx:if="{{!isGroupon}}">
+    <view class="box">
+      <text class="cart-count">{{cartGoodsCount}}</text>
+      <van-icon bindtap="openCartPage" class="icon" name="cart-o" />
+    </view>
+  </view>
+  <view class="r" bindtap="addToCart" wx:if="{{!soldout}}" wx:if="{{!isGroupon}}">加入购物车</view>
+  <view class="c" bindtap="addFast" wx:if="{{!soldout}}">{{isGroupon?'参加团购':'立即购买'}}</view>
+  <view class="n" wx:if="{{soldout}}">商品已售空</view>
 </view>
\ No newline at end of file
diff --git a/litemall-wx/pages/goods/goods.wxss b/litemall-wx/pages/goods/goods.wxss
index e580fdc9..9bca313a 100644
--- a/litemall-wx/pages/goods/goods.wxss
+++ b/litemall-wx/pages/goods/goods.wxss
@@ -1,934 +1,934 @@
-.container {
-  margin-bottom: 100rpx;
-}
-
-.goodsimgs {
-  width: 750rpx;
-  height: 750rpx;
-}
-
-.goodsimgs image {
-  width: 750rpx;
-  height: 750rpx;
-}
-
-.commodity_screen {
-  width: 100%;
-  height: 100%;
-  position: fixed;
-  top: 0;
-  left: 0;
-  background: #000;
-  opacity: 0.2;
-  overflow: hidden;
-  z-index: 1000;
-  color: #fff;
-}
-
-.commodity_attr_box {
-  width: 100%;
-  overflow: hidden;
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  z-index: 2000;
-  background: #fff;
-  padding-top: 20rpx;
-}
-
-.goods-info {
-  width: 750rpx;
-  height: 306rpx;
-  overflow: hidden;
-  background: #fff;
-}
-
-.goods-info .c {
-  display: block;
-  width: 718.75rpx;
-  height: 100%;
-  margin-left: 31.25rpx;
-  padding: 38rpx 31.25rpx 38rpx 0;
-  border-bottom: 1px solid #f4f4f4;
-}
-
-.goods-info .c text {
-  display: block;
-  width: 687.5rpx;
-  text-align: left;
-}
-
-.goods_name {
-  height: 86rpx;
-  line-height: 86rpx;
-  border-bottom: 1px solid #fafafa;
-}
-
-.goods_name_left {
-  float: left;
-  height: 86rpx;
-  font-weight: 550;
-  line-height: 86rpx;
-  margin-left: 35rpx;
-  font-size: 38rpx;
-  letter-spacing: 1rpx;
-}
-
-.goods_name_right {
-  float: right;
-  font-weight: 550;
-  margin-top: 28rpx;
-  width: 140rpx;
-  height: 80rpx;
-  line-height: 82rpx;
-  padding: 0;
-  margin: 0;
-  margin-right: 0rpx;
-  text-align: center;
-  font-size: 25rpx;
-  color: #f4f4f4;
-  border-top-left-radius: 50rpx;
-  border-bottom-left-radius: 50rpx;
-  border-top-right-radius: 0rpx;
-  border-bottom-right-radius: 0rpx;
-  letter-spacing: 3rpx;
-  background-image: linear-gradient(to right, #f3d10e 0%, #f48f18 100%)
-}
-
-.goods-info .desc {
-  height: 43rpx;
-  margin-bottom: 41rpx;
-  font-size: 24rpx;
-  line-height: 36rpx;
-  color: #999;
-}
-
-.goods-info .price {
-  height: 70rpx;
-  align-content: center;
-}
-
-.goods-info .counterPrice {
-  float: left;
-  padding-left: 0rpx;
-  text-decoration: line-through;
-  font-size: 30rpx;
-  color: #999;
-}
-
-.goods-info .retailPrice {
-  padding-left: 5%;
-  font-size: 30rpx;
-  color: #a78845;
-}
-
-.goods-info .brand {
-  margin-top: 23rpx;
-  min-height: 40rpx;
-  text-align: left;
-}
-
-.goods-info .brand text {
-  display: inline-block;
-  width: auto;
-  padding: 2px 30rpx 2px 10.5rpx;
-  line-height: 35.5rpx;
-  border: 1px solid #f48f18;
-  font-size: 25rpx;
-  color: #f48f18;
-  border-radius: 4rpx;
-  background-size: 10.75rpx 18.75rpx;
-}
-
-.section-nav {
-  width: 750rpx;
-  height: 108rpx;
-  background: #fff;
-  margin-bottom: 20rpx;
-}
-
-.section-nav .t {
-  float: left;
-  width: 600rpx;
-  height: 108rpx;
-  line-height: 108rpx;
-  font-size: 29rpx;
-  color: #333;
-  margin-left: 31.25rpx;
-}
-
-.section-nav .i {
-  float: right;
-  width: 52rpx;
-  height: 52rpx;
-  margin-right: 16rpx;
-  margin-top: 28rpx;
-}
-
-.section-act .t {
-  float: left;
-  display: flex;
-  align-items: center;
-  width: 600rpx;
-  height: 108rpx;
-  overflow: hidden;
-  line-height: 108rpx;
-  font-size: 29rpx;
-  color: #999;
-  margin-left: 31.25rpx;
-}
-
-.section-act .label {
-  color: #999;
-}
-
-.section-act .tag {
-  display: flex;
-  align-items: center;
-  padding: 0 10rpx;
-  border-radius: 3px;
-  height: 37rpx;
-  width: auto;
-  color: #f48f18;
-  overflow: hidden;
-  border: 1px solid #f48f18;
-  font-size: 25rpx;
-  margin: 0 10rpx;
-}
-
-.section-act .text {
-  display: flex;
-  align-items: center;
-  height: 37rpx;
-  width: auto;
-  overflow: hidden;
-  color: #f48f18;
-  font-size: 29rpx;
-}
-
-.comments {
-  width: 100%;
-  height: auto;
-  padding-left: 30rpx;
-  background: #fff;
-  margin: 20rpx 0;
-}
-
-.comments .h {
-  height: 102.5rpx;
-  line-height: 100.5rpx;
-  width: 718.75rpx;
-  padding-right: 16rpx;
-}
-
-.comments .h .t {
-  display: block;
-  float: left;
-  width: 50%;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.comments .h .i {
-  display: block;
-  float: right;
-  width: 164rpx;
-  height: 100.5rpx;
-  line-height: 100.5rpx;
-  background-size: 52rpx;
-}
-
-.comments .b {
-  height: auto;
-  width: 720rpx;
-}
-
-.comments .item {
-  height: auto;
-  width: 720rpx;
-  overflow: hidden;
-  border-top: 1px solid #d9d9d9;
-}
-
-.comments .info {
-  height: 127rpx;
-  width: 100%;
-  padding: 33rpx 0 27rpx 0;
-}
-
-.comments .user {
-  float: left;
-  width: auto;
-  height: 67rpx;
-  line-height: 67rpx;
-  font-size: 0;
-}
-
-.comments .user image {
-  float: left;
-  width: 67rpx;
-  height: 67rpx;
-  margin-right: 17rpx;
-  border-radius: 50%;
-}
-
-.comments .user text {
-  display: inline-block;
-  width: auto;
-  height: 66rpx;
-  overflow: hidden;
-  font-size: 29rpx;
-  line-height: 66rpx;
-}
-
-.comments .time {
-  display: block;
-  float: right;
-  width: auto;
-  height: 67rpx;
-  line-height: 67rpx;
-  color: #7f7f7f;
-  font-size: 25rpx;
-  margin-right: 30rpx;
-}
-
-.comments .content {
-  width: 720rpx;
-  padding-right: 30rpx;
-  line-height: 45.8rpx;
-  font-size: 29rpx;
-  margin-bottom: 24rpx;
-}
-
-.comments .imgs {
-  width: 720rpx;
-  height: auto;
-  margin-bottom: 25rpx;
-}
-
-.comments .imgs .img {
-  height: 150rpx;
-  width: 150rpx;
-  margin-right: 28rpx;
-}
-
-.comments .spec {
-  width: 720rpx;
-  padding-right: 30rpx;
-  line-height: 30rpx;
-  font-size: 24rpx;
-  color: #999;
-  margin-bottom: 30rpx;
-}
-
-.comments .customer-service {
-  width: 690rpx;
-  height: auto;
-  overflow: hidden;
-  margin-top: 23rpx;
-  margin-bottom: 23rpx;
-  background: rgba(0, 0, 0, 0.03);
-  padding: 21rpx;
-}
-
-.comments .customer-service .u {
-  font-size: 24rpx;
-  color: #333;
-  line-height: 37.5rpx;
-}
-
-.comments .customer-service .c {
-  font-size: 24rpx;
-  color: #999;
-  line-height: 37.5rpx;
-}
-
-.goods-attr {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-  padding: 0 31.25rpx 25rpx 31.25rpx;
-  background: #fff;
-}
-
-.goods-attr .t {
-  width: 687.5rpx;
-  height: 104rpx;
-  line-height: 104rpx;
-  font-size: 38.5rpx;
-}
-
-.goods-attr .item {
-  width: 687.5rpx;
-  height: 68rpx;
-  padding: 11rpx 20rpx;
-  margin-bottom: 11rpx;
-  background: #f7f7f7;
-  font-size: 38.5rpx;
-}
-
-.goods-attr .left {
-  float: left;
-  font-size: 25rpx;
-  width: 134rpx;
-  height: 45rpx;
-  line-height: 45rpx;
-  overflow: hidden;
-  color: #999;
-}
-
-.goods-attr .right {
-  float: left;
-  font-size: 36.5rpx;
-  margin-left: 20rpx;
-  width: 480rpx;
-  height: 45rpx;
-  line-height: 45rpx;
-  overflow: hidden;
-  color: #333;
-}
-
-.detail {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-}
-
-.detail image {
-  width: 750rpx;
-  display: block;
-}
-
-.common-problem {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-}
-
-.common-problem .h {
-  position: relative;
-  height: 145.5rpx;
-  width: 750rpx;
-  padding: 56.25rpx 0;
-  background: #fff;
-  text-align: center;
-}
-
-.common-problem .h .line {
-  display: inline-block;
-  position: absolute;
-  top: 72rpx;
-  left: 0;
-  z-index: 2;
-  height: 1px;
-  margin-left: 225rpx;
-  width: 300rpx;
-  background: #ccc;
-}
-
-.common-problem .h .title {
-  display: inline-block;
-  position: absolute;
-  top: 56.125rpx;
-  left: 0;
-  z-index: 3;
-  height: 33rpx;
-  margin-left: 285rpx;
-  width: 180rpx;
-  background: #fff;
-}
-
-.common-problem .b {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-  padding: 0rpx 30rpx;
-  background: #fff;
-}
-
-.common-problem .item {
-  height: auto;
-  overflow: hidden;
-  padding-bottom: 25rpx;
-}
-
-.common-problem .question-box .spot {
-  float: left;
-  display: block;
-  height: 8rpx;
-  width: 8rpx;
-  background: #b4282d;
-  border-radius: 50%;
-  margin-top: 11rpx;
-}
-
-.common-problem .question-box .question {
-  float: left;
-  line-height: 30rpx;
-  padding-left: 8rpx;
-  display: block;
-  font-size: 26rpx;
-  padding-bottom: 15rpx;
-  color: #303030;
-}
-
-.common-problem .answer {
-  line-height: 36rpx;
-  padding-left: 16rpx;
-  font-size: 26rpx;
-  color: #787878;
-}
-
-.related-goods {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-  padding-bottom: 80rpx;
-}
-
-.related-goods .h {
-  position: relative;
-  height: 145.5rpx;
-  width: 750rpx;
-  padding: 56.25rpx 0;
-  background: #fff;
-  text-align: center;
-  border-bottom: 1px solid #f4f4f4;
-}
-
-.related-goods .h .line {
-  display: inline-block;
-  position: absolute;
-  top: 72rpx;
-  left: 0;
-  z-index: 2;
-  height: 1px;
-  margin-left: 225rpx;
-  width: 300rpx;
-  background: #ccc;
-}
-
-.related-goods .h .title {
-  display: inline-block;
-  position: absolute;
-  top: 56.125rpx;
-  left: 0;
-  z-index: 3;
-  height: 33rpx;
-  margin-left: 285rpx;
-  width: 180rpx;
-  background: #fff;
-}
-
-.related-goods .b {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-}
-
-.related-goods .b .item {
-  float: left;
-  background: #fff;
-  width: 375rpx;
-  height: auto;
-  overflow: hidden;
-  text-align: center;
-  padding: 15rpx 31.25rpx;
-  border-right: 1px solid #f4f4f4;
-  border-bottom: 1px solid #f4f4f4;
-}
-
-.related-goods .item .img {
-  width: 311.45rpx;
-  height: 311.45rpx;
-}
-
-.related-goods .item .name {
-  display: block;
-  width: 311.45rpx;
-  height: 35rpx;
-  margin: 11.5rpx 0 15rpx 0;
-  text-align: center;
-  overflow: hidden;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.related-goods .item .price {
-  display: block;
-  width: 311.45rpx;
-  height: 30rpx;
-  text-align: center;
-  font-size: 30rpx;
-  color: #b4282d;
-}
-
-.bottom-btn {
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  z-index: 10;
-  width: 750rpx;
-  height: 100rpx;
-  display: flex;
-  background: #fff;
-}
-
-.bottom-btn .l {
-  float: left;
-  height: 100rpx;
-  width: 90rpx;
-  border: 1px solid #f4f4f4;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.bottom-btn .l .l-contact {
-  text-align: center;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-wrap: wrap;
-  line-height: 1;
-  background: #fff;
-  border-radius: 0;
-  height: 55rpx;
-}
- 
-.bottom-btn .l .l-contact:after {
-  border: none;
-  border-radius: 0;
-}
-
-.bottom-btn .l.l-collect {
-  border-right: none;
-  border-left: none;
-  text-align: center;
-}
-
-.bottom-btn .l.l-collect .icon {
-  font-size: 44rpx;
-}
-
-.bottom-btn .l.l-kefu {
-  position: relative;
-  height: 54rpx;
-  width: 63rpx;
-}
-
-.bottom-btn .l.l-cart .box {
-  position: relative;
-  height: 60rpx;
-  width: 60rpx;
-}
-
-.bottom-btn .l.l-cart .cart-count {
-  height: 28rpx;
-  width: 28rpx;
-  z-index: 10;
-  position: absolute;
-  top: 0;
-  right: 0;
-  background: #b4282d;
-  text-align: center;
-  font-size: 18rpx;
-  color: #fff;
-  line-height: 28rpx;
-  border-radius: 50%;
-}
-
-.bottom-btn .l.l-cart .icon {
-  position: absolute;
-  top: 10rpx;
-  left: 0;
-  font-size: 44rpx;
-}
-
-.bottom-btn .c {
-  float: left;
-  background: #b4282d;
-  height: 100rpx;
-  line-height: 96rpx;
-  flex: 1;
-  text-align: center;
-  color: #fff;
-}
-
-.bottom-btn .r {
-  border: 1px solid #f48f18;
-  background: #f48f18;
-  float: left;
-  height: 100rpx;
-  line-height: 96rpx;
-  flex: 1;
-  text-align: center;
-  color: #fff;
-}
-
-.bottom-btn .n {
-  float: left;
-  background: #d5d8d8e7;
-  height: 100rpx;
-  line-height: 96rpx;
-  flex: 1;
-  text-align: center;
-  color: rgb(37, 36, 36);
-}
-@import "../../lib/wxParse/wxParse.wxss";
-
-.attr-pop-box {
-  width: 100%;
-  height: 100%;
-  position: fixed;
-  background: rgba(0, 0, 0, 0.5);
-  z-index: 8;
-  bottom: 0;
-  /* display: none; */
-}
-
-.attr-pop {
-  width: 100%;
-  height: auto;
-  max-height: 780rpx;
-  padding: 31.25rpx;
-  background: #fff;
-  position: fixed;
-  z-index: 9;
-  bottom: 100rpx;
-}
-
-.attr-pop .close {
-  position: absolute;
-  width: 48rpx;
-  height: 48rpx;
-  right: 31.25rpx;
-  overflow: hidden;
-  top: 31.25rpx;
-}
-
-.attr-pop .close .icon {
-  width: 48rpx;
-  height: 48rpx;
-}
-
-.attr-pop .img-info {
-  width: 687.5rpx;
-  height: 177rpx;
-  overflow: hidden;
-  margin-bottom: 41.5rpx;
-}
-
-.attr-pop .img {
-  float: left;
-  height: 177rpx;
-  width: 177rpx;
-  background: #f4f4f4;
-  margin-right: 31.25rpx;
-}
-
-.attr-pop .info {
-  float: left;
-  height: 177rpx;
-  display: flex;
-  align-items: center;
-}
-
-.attr-pop .p {
-  font-size: 33rpx;
-  color: #333;
-  height: 33rpx;
-  line-height: 33rpx;
-  margin-bottom: 10rpx;
-}
-
-.attr-pop .a {
-  font-size: 29rpx;
-  color: #333;
-  height: 40rpx;
-  line-height: 40rpx;
-}
-
-.spec-con {
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-}
-
-.spec-con .name {
-  margin-bottom: 6rpx;
-  font-size: 29rpx;
-  color: #333;
-}
-
-.spec-con .values {
-  height: auto;
-  margin-bottom: 10rpx;
-  font-size: 0;
-}
-
-.spec-con .value {
-  display: inline-block;
-  height: 62rpx;
-  padding: 0 35rpx;
-  line-height: 56rpx;
-  text-align: center;
-  margin-right: 25rpx;
-  margin-bottom: 16.5rpx;
-  border: 1px solid #333;
-  font-size: 25rpx;
-  color: #333;
-}
-
-.spec-con .value.disable {
-  border: 1px solid #ccc;
-  color: #ccc;
-}
-
-.spec-con .value.selected {
-  border: 1px solid #b4282d;
-  color: #b4282d;
-}
-
-.number-item .selnum {
-  width: 322rpx;
-  height: 71rpx;
-  border: 1px solid #ccc;
-  display: flex;
-}
-
-.number-item .cut {
-  width: 93.75rpx;
-  height: 100%;
-  text-align: center;
-  line-height: 65rpx;
-}
-
-.number-item .number {
-  flex: 1;
-  height: 100%;
-  text-align: center;
-  line-height: 68.75rpx;
-  border-left: 1px solid #ccc;
-  border-right: 1px solid #ccc;
-  float: left;
-}
-
-.number-item .add {
-  width: 93.75rpx;
-  height: 100%;
-  text-align: center;
-  line-height: 65rpx;
-}
-
-.share-pop-box {
-  width: 100%;
-  height: 100%;
-  position: fixed;
-  background: rgba(0, 0, 0, 0.5);
-  z-index: 8;
-  bottom: 0;
-  /* display: none; */
-}
-
-.share-pop {
-  width: 100%;
-  height: auto;
-  max-height: 780rpx;
-  padding: 31.25rpx;
-  background: #fff;
-  position: fixed;
-  z-index: 9;
-  bottom: 100rpx;
-}
-
-.share-pop .close {
-  position: absolute;
-  width: 48rpx;
-  height: 48rpx;
-  right: 31.25rpx;
-  top: 31.25rpx;
-}
-
-.share-pop .close .icon {
-  width: 48rpx;
-  height: 48rpx;
-}
-
-.share-pop .share-info {
-  width: 100%;
-  height: 225rpx;
-  overflow: hidden;
-  margin-bottom: 41.5rpx;
-}
-
-.sharebtn {
-  top: 75rpx;
-  background: none !important;
-  font-size: 32rpx;
-  color: #fff !important;
-  border-radius: 0%;
-  width: 175rpx;
-  height: 150rpx;
-  text-align: center;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-wrap: wrap;
-  float: left;
-  background: #fff;
-  border-bottom: 0px solid #fafafa;
-  margin-left: 15%;
-}
-
-.sharebtn::after {
-  border: none;
-  border-radius: 0%;
-}
-
-.savesharebtn {
-  top: 75rpx;
-  background: none !important;
-  font-size: 32rpx;
-  color: #fff !important;
-  border-radius: 0%;
-  width: 175rpx;
-  height: 150rpx;
-  text-align: center;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-wrap: wrap;
-  float: right;
-  background: #fff;
-  border-bottom: 0px solid #fafafa;
-  margin-right: 15%;
-}
-
-.savesharebtn::after {
-  border: none;
-  border-radius: 0%;
-}
-
-.sharebtn_image {
-  /* border: 1px solid #757575; */
-  width: 128rpx;
-  height: 128rpx;
-  margin-top: 0rpx;
-}
-
-.sharebtn_text {
-  /* border: 1px solid #757575; */
-  width: 150rpx;
-  margin-bottom: 2rpx;
-  height: 20rpx;
-  line-height: 20rpx;
-  font-size: 20rpx;
-  color: #555;
-}
-
-.separate {
-  background: #e0e3da;
-  width: 100%;
-  height: 6rpx;
-}
+.container {
+  margin-bottom: 100rpx;
+}
+
+.goodsimgs {
+  width: 750rpx;
+  height: 750rpx;
+}
+
+.goodsimgs image {
+  width: 750rpx;
+  height: 750rpx;
+}
+
+.commodity_screen {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000;
+  opacity: 0.2;
+  overflow: hidden;
+  z-index: 1000;
+  color: #fff;
+}
+
+.commodity_attr_box {
+  width: 100%;
+  overflow: hidden;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  z-index: 2000;
+  background: #fff;
+  padding-top: 20rpx;
+}
+
+.goods-info {
+  width: 750rpx;
+  height: 306rpx;
+  overflow: hidden;
+  background: #fff;
+}
+
+.goods-info .c {
+  display: block;
+  width: 718.75rpx;
+  height: 100%;
+  margin-left: 31.25rpx;
+  padding: 38rpx 31.25rpx 38rpx 0;
+  border-bottom: 1px solid #f4f4f4;
+}
+
+.goods-info .c text {
+  display: block;
+  width: 687.5rpx;
+  text-align: left;
+}
+
+.goods_name {
+  height: 86rpx;
+  line-height: 86rpx;
+  border-bottom: 1px solid #fafafa;
+}
+
+.goods_name_left {
+  float: left;
+  height: 86rpx;
+  font-weight: 550;
+  line-height: 86rpx;
+  margin-left: 35rpx;
+  font-size: 38rpx;
+  letter-spacing: 1rpx;
+}
+
+.goods_name_right {
+  float: right;
+  font-weight: 550;
+  margin-top: 28rpx;
+  width: 140rpx;
+  height: 80rpx;
+  line-height: 82rpx;
+  padding: 0;
+  margin: 0;
+  margin-right: 0rpx;
+  text-align: center;
+  font-size: 25rpx;
+  color: #f4f4f4;
+  border-top-left-radius: 50rpx;
+  border-bottom-left-radius: 50rpx;
+  border-top-right-radius: 0rpx;
+  border-bottom-right-radius: 0rpx;
+  letter-spacing: 3rpx;
+  background-image: linear-gradient(to right, #f3d10e 0%, #f48f18 100%)
+}
+
+.goods-info .desc {
+  height: 43rpx;
+  margin-bottom: 41rpx;
+  font-size: 24rpx;
+  line-height: 36rpx;
+  color: #999;
+}
+
+.goods-info .price {
+  height: 70rpx;
+  align-content: center;
+}
+
+.goods-info .counterPrice {
+  float: left;
+  padding-left: 0rpx;
+  text-decoration: line-through;
+  font-size: 30rpx;
+  color: #999;
+}
+
+.goods-info .retailPrice {
+  padding-left: 5%;
+  font-size: 30rpx;
+  color: #a78845;
+}
+
+.goods-info .brand {
+  margin-top: 23rpx;
+  min-height: 40rpx;
+  text-align: left;
+}
+
+.goods-info .brand text {
+  display: inline-block;
+  width: auto;
+  padding: 2px 30rpx 2px 10.5rpx;
+  line-height: 35.5rpx;
+  border: 1px solid #f48f18;
+  font-size: 25rpx;
+  color: #f48f18;
+  border-radius: 4rpx;
+  background-size: 10.75rpx 18.75rpx;
+}
+
+.section-nav {
+  width: 750rpx;
+  height: 108rpx;
+  background: #fff;
+  margin-bottom: 20rpx;
+}
+
+.section-nav .t {
+  float: left;
+  width: 600rpx;
+  height: 108rpx;
+  line-height: 108rpx;
+  font-size: 29rpx;
+  color: #333;
+  margin-left: 31.25rpx;
+}
+
+.section-nav .i {
+  float: right;
+  width: 52rpx;
+  height: 52rpx;
+  margin-right: 16rpx;
+  margin-top: 28rpx;
+}
+
+.section-act .t {
+  float: left;
+  display: flex;
+  align-items: center;
+  width: 600rpx;
+  height: 108rpx;
+  overflow: hidden;
+  line-height: 108rpx;
+  font-size: 29rpx;
+  color: #999;
+  margin-left: 31.25rpx;
+}
+
+.section-act .label {
+  color: #999;
+}
+
+.section-act .tag {
+  display: flex;
+  align-items: center;
+  padding: 0 10rpx;
+  border-radius: 3px;
+  height: 37rpx;
+  width: auto;
+  color: #f48f18;
+  overflow: hidden;
+  border: 1px solid #f48f18;
+  font-size: 25rpx;
+  margin: 0 10rpx;
+}
+
+.section-act .text {
+  display: flex;
+  align-items: center;
+  height: 37rpx;
+  width: auto;
+  overflow: hidden;
+  color: #f48f18;
+  font-size: 29rpx;
+}
+
+.comments {
+  width: 100%;
+  height: auto;
+  padding-left: 30rpx;
+  background: #fff;
+  margin: 20rpx 0;
+}
+
+.comments .h {
+  height: 102.5rpx;
+  line-height: 100.5rpx;
+  width: 718.75rpx;
+  padding-right: 16rpx;
+}
+
+.comments .h .t {
+  display: block;
+  float: left;
+  width: 50%;
+  font-size: 30rpx;
+  color: #333;
+}
+
+.comments .h .i {
+  display: block;
+  float: right;
+  width: 164rpx;
+  height: 100.5rpx;
+  line-height: 100.5rpx;
+  background-size: 52rpx;
+}
+
+.comments .b {
+  height: auto;
+  width: 720rpx;
+}
+
+.comments .item {
+  height: auto;
+  width: 720rpx;
+  overflow: hidden;
+  border-top: 1px solid #d9d9d9;
+}
+
+.comments .info {
+  height: 127rpx;
+  width: 100%;
+  padding: 33rpx 0 27rpx 0;
+}
+
+.comments .user {
+  float: left;
+  width: auto;
+  height: 67rpx;
+  line-height: 67rpx;
+  font-size: 0;
+}
+
+.comments .user image {
+  float: left;
+  width: 67rpx;
+  height: 67rpx;
+  margin-right: 17rpx;
+  border-radius: 50%;
+}
+
+.comments .user text {
+  display: inline-block;
+  width: auto;
+  height: 66rpx;
+  overflow: hidden;
+  font-size: 29rpx;
+  line-height: 66rpx;
+}
+
+.comments .time {
+  display: block;
+  float: right;
+  width: auto;
+  height: 67rpx;
+  line-height: 67rpx;
+  color: #7f7f7f;
+  font-size: 25rpx;
+  margin-right: 30rpx;
+}
+
+.comments .content {
+  width: 720rpx;
+  padding-right: 30rpx;
+  line-height: 45.8rpx;
+  font-size: 29rpx;
+  margin-bottom: 24rpx;
+}
+
+.comments .imgs {
+  width: 720rpx;
+  height: auto;
+  margin-bottom: 25rpx;
+}
+
+.comments .imgs .img {
+  height: 150rpx;
+  width: 150rpx;
+  margin-right: 28rpx;
+}
+
+.comments .spec {
+  width: 720rpx;
+  padding-right: 30rpx;
+  line-height: 30rpx;
+  font-size: 24rpx;
+  color: #999;
+  margin-bottom: 30rpx;
+}
+
+.comments .customer-service {
+  width: 690rpx;
+  height: auto;
+  overflow: hidden;
+  margin-top: 23rpx;
+  margin-bottom: 23rpx;
+  background: rgba(0, 0, 0, 0.03);
+  padding: 21rpx;
+}
+
+.comments .customer-service .u {
+  font-size: 24rpx;
+  color: #333;
+  line-height: 37.5rpx;
+}
+
+.comments .customer-service .c {
+  font-size: 24rpx;
+  color: #999;
+  line-height: 37.5rpx;
+}
+
+.goods-attr {
+  width: 750rpx;
+  height: auto;
+  overflow: hidden;
+  padding: 0 31.25rpx 25rpx 31.25rpx;
+  background: #fff;
+}
+
+.goods-attr .t {
+  width: 687.5rpx;
+  height: 104rpx;
+  line-height: 104rpx;
+  font-size: 38.5rpx;
+}
+
+.goods-attr .item {
+  width: 687.5rpx;
+  height: 68rpx;
+  padding: 11rpx 20rpx;
+  margin-bottom: 11rpx;
+  background: #f7f7f7;
+  font-size: 38.5rpx;
+}
+
+.goods-attr .left {
+  float: left;
+  font-size: 25rpx;
+  width: 134rpx;
+  height: 45rpx;
+  line-height: 45rpx;
+  overflow: hidden;
+  color: #999;
+}
+
+.goods-attr .right {
+  float: left;
+  font-size: 36.5rpx;
+  margin-left: 20rpx;
+  width: 480rpx;
+  height: 45rpx;
+  line-height: 45rpx;
+  overflow: hidden;
+  color: #333;
+}
+
+.detail {
+  width: 750rpx;
+  height: auto;
+  overflow: hidden;
+}
+
+.detail image {
+  width: 750rpx;
+  display: block;
+}
+
+.common-problem {
+  width: 750rpx;
+  height: auto;
+  overflow: hidden;
+}
+
+.common-problem .h {
+  position: relative;
+  height: 145.5rpx;
+  width: 750rpx;
+  padding: 56.25rpx 0;
+  background: #fff;
+  text-align: center;
+}
+
+.common-problem .h .line {
+  display: inline-block;
+  position: absolute;
+  top: 72rpx;
+  left: 0;
+  z-index: 2;
+  height: 1px;
+  margin-left: 225rpx;
+  width: 300rpx;
+  background: #ccc;
+}
+
+.common-problem .h .title {
+  display: inline-block;
+  position: absolute;
+  top: 56.125rpx;
+  left: 0;
+  z-index: 3;
+  height: 33rpx;
+  margin-left: 285rpx;
+  width: 180rpx;
+  background: #fff;
+}
+
+.common-problem .b {
+  width: 750rpx;
+  height: auto;
+  overflow: hidden;
+  padding: 0rpx 30rpx;
+  background: #fff;
+}
+
+.common-problem .item {
+  height: auto;
+  overflow: hidden;
+  padding-bottom: 25rpx;
+}
+
+.common-problem .question-box .spot {
+  float: left;
+  display: block;
+  height: 8rpx;
+  width: 8rpx;
+  background: #b4282d;
+  border-radius: 50%;
+  margin-top: 11rpx;
+}
+
+.common-problem .question-box .question {
+  float: left;
+  line-height: 30rpx;
+  padding-left: 8rpx;
+  display: block;
+  font-size: 26rpx;
+  padding-bottom: 15rpx;
+  color: #303030;
+}
+
+.common-problem .answer {
+  line-height: 36rpx;
+  padding-left: 16rpx;
+  font-size: 26rpx;
+  color: #787878;
+}
+
+.related-goods {
+  width: 750rpx;
+  height: auto;
+  overflow: hidden;
+  padding-bottom: 80rpx;
+}
+
+.related-goods .h {
+  position: relative;
+  height: 145.5rpx;
+  width: 750rpx;
+  padding: 56.25rpx 0;
+  background: #fff;
+  text-align: center;
+  border-bottom: 1px solid #f4f4f4;
+}
+
+.related-goods .h .line {
+  display: inline-block;
+  position: absolute;
+  top: 72rpx;
+  left: 0;
+  z-index: 2;
+  height: 1px;
+  margin-left: 225rpx;
+  width: 300rpx;
+  background: #ccc;
+}
+
+.related-goods .h .title {
+  display: inline-block;
+  position: absolute;
+  top: 56.125rpx;
+  left: 0;
+  z-index: 3;
+  height: 33rpx;
+  margin-left: 285rpx;
+  width: 180rpx;
+  background: #fff;
+}
+
+.related-goods .b {
+  width: 750rpx;
+  height: auto;
+  overflow: hidden;
+}
+
+.related-goods .b .item {
+  float: left;
+  background: #fff;
+  width: 375rpx;
+  height: auto;
+  overflow: hidden;
+  text-align: center;
+  padding: 15rpx 31.25rpx;
+  border-right: 1px solid #f4f4f4;
+  border-bottom: 1px solid #f4f4f4;
+}
+
+.related-goods .item .img {
+  width: 311.45rpx;
+  height: 311.45rpx;
+}
+
+.related-goods .item .name {
+  display: block;
+  width: 311.45rpx;
+  height: 35rpx;
+  margin: 11.5rpx 0 15rpx 0;
+  text-align: center;
+  overflow: hidden;
+  font-size: 30rpx;
+  color: #333;
+}
+
+.related-goods .item .price {
+  display: block;
+  width: 311.45rpx;
+  height: 30rpx;
+  text-align: center;
+  font-size: 30rpx;
+  color: #b4282d;
+}
+
+.bottom-btn {
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  z-index: 10;
+  width: 750rpx;
+  height: 100rpx;
+  display: flex;
+  background: #fff;
+}
+
+.bottom-btn .l {
+  float: left;
+  height: 100rpx;
+  width: 90rpx;
+  border: 1px solid #f4f4f4;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.bottom-btn .l .l-contact {
+  text-align: center;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-wrap: wrap;
+  line-height: 1;
+  background: #fff;
+  border-radius: 0;
+  height: 55rpx;
+}
+ 
+.bottom-btn .l .l-contact:after {
+  border: none;
+  border-radius: 0;
+}
+
+.bottom-btn .l.l-collect {
+  border-right: none;
+  border-left: none;
+  text-align: center;
+}
+
+.bottom-btn .l.l-collect .icon {
+  font-size: 44rpx;
+}
+
+.bottom-btn .l.l-kefu {
+  position: relative;
+  height: 54rpx;
+  width: 63rpx;
+}
+
+.bottom-btn .l.l-cart .box {
+  position: relative;
+  height: 60rpx;
+  width: 60rpx;
+}
+
+.bottom-btn .l.l-cart .cart-count {
+  height: 28rpx;
+  width: 28rpx;
+  z-index: 10;
+  position: absolute;
+  top: 0;
+  right: 0;
+  background: #b4282d;
+  text-align: center;
+  font-size: 18rpx;
+  color: #fff;
+  line-height: 28rpx;
+  border-radius: 50%;
+}
+
+.bottom-btn .l.l-cart .icon {
+  position: absolute;
+  top: 10rpx;
+  left: 0;
+  font-size: 44rpx;
+}
+
+.bottom-btn .c {
+  float: left;
+  background: #b4282d;
+  height: 100rpx;
+  line-height: 96rpx;
+  flex: 1;
+  text-align: center;
+  color: #fff;
+}
+
+.bottom-btn .r {
+  border: 1px solid #f48f18;
+  background: #f48f18;
+  float: left;
+  height: 100rpx;
+  line-height: 96rpx;
+  flex: 1;
+  text-align: center;
+  color: #fff;
+}
+
+.bottom-btn .n {
+  float: left;
+  background: #d5d8d8e7;
+  height: 100rpx;
+  line-height: 96rpx;
+  flex: 1;
+  text-align: center;
+  color: rgb(37, 36, 36);
+}
+@import "../../lib/wxParse/wxParse.wxss";
+
+.attr-pop-box {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 8;
+  bottom: 0;
+  /* display: none; */
+}
+
+.attr-pop {
+  width: 100%;
+  height: auto;
+  max-height: 780rpx;
+  padding: 31.25rpx;
+  background: #fff;
+  position: fixed;
+  z-index: 9;
+  bottom: 100rpx;
+}
+
+.attr-pop .close {
+  position: absolute;
+  width: 48rpx;
+  height: 48rpx;
+  right: 31.25rpx;
+  overflow: hidden;
+  top: 31.25rpx;
+}
+
+.attr-pop .close .icon {
+  width: 48rpx;
+  height: 48rpx;
+}
+
+.attr-pop .img-info {
+  width: 687.5rpx;
+  height: 177rpx;
+  overflow: hidden;
+  margin-bottom: 41.5rpx;
+}
+
+.attr-pop .img {
+  float: left;
+  height: 177rpx;
+  width: 177rpx;
+  background: #f4f4f4;
+  margin-right: 31.25rpx;
+}
+
+.attr-pop .info {
+  float: left;
+  height: 177rpx;
+  display: flex;
+  align-items: center;
+}
+
+.attr-pop .p {
+  font-size: 33rpx;
+  color: #333;
+  height: 33rpx;
+  line-height: 33rpx;
+  margin-bottom: 10rpx;
+}
+
+.attr-pop .a {
+  font-size: 29rpx;
+  color: #333;
+  height: 40rpx;
+  line-height: 40rpx;
+}
+
+.spec-con {
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+
+.spec-con .name {
+  margin-bottom: 6rpx;
+  font-size: 29rpx;
+  color: #333;
+}
+
+.spec-con .values {
+  height: auto;
+  margin-bottom: 10rpx;
+  font-size: 0;
+}
+
+.spec-con .value {
+  display: inline-block;
+  height: 62rpx;
+  padding: 0 35rpx;
+  line-height: 56rpx;
+  text-align: center;
+  margin-right: 25rpx;
+  margin-bottom: 16.5rpx;
+  border: 1px solid #333;
+  font-size: 25rpx;
+  color: #333;
+}
+
+.spec-con .value.disable {
+  border: 1px solid #ccc;
+  color: #ccc;
+}
+
+.spec-con .value.selected {
+  border: 1px solid #b4282d;
+  color: #b4282d;
+}
+
+.number-item .selnum {
+  width: 322rpx;
+  height: 71rpx;
+  border: 1px solid #ccc;
+  display: flex;
+}
+
+.number-item .cut {
+  width: 93.75rpx;
+  height: 100%;
+  text-align: center;
+  line-height: 65rpx;
+}
+
+.number-item .number {
+  flex: 1;
+  height: 100%;
+  text-align: center;
+  line-height: 68.75rpx;
+  border-left: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+  float: left;
+}
+
+.number-item .add {
+  width: 93.75rpx;
+  height: 100%;
+  text-align: center;
+  line-height: 65rpx;
+}
+
+.share-pop-box {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 8;
+  bottom: 0;
+  /* display: none; */
+}
+
+.share-pop {
+  width: 100%;
+  height: auto;
+  max-height: 780rpx;
+  padding: 31.25rpx;
+  background: #fff;
+  position: fixed;
+  z-index: 9;
+  bottom: 100rpx;
+}
+
+.share-pop .close {
+  position: absolute;
+  width: 48rpx;
+  height: 48rpx;
+  right: 31.25rpx;
+  top: 31.25rpx;
+}
+
+.share-pop .close .icon {
+  width: 48rpx;
+  height: 48rpx;
+}
+
+.share-pop .share-info {
+  width: 100%;
+  height: 225rpx;
+  overflow: hidden;
+  margin-bottom: 41.5rpx;
+}
+
+.sharebtn {
+  top: 75rpx;
+  background: none !important;
+  font-size: 32rpx;
+  color: #fff !important;
+  border-radius: 0%;
+  width: 175rpx;
+  height: 150rpx;
+  text-align: center;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-wrap: wrap;
+  float: left;
+  background: #fff;
+  border-bottom: 0px solid #fafafa;
+  margin-left: 15%;
+}
+
+.sharebtn::after {
+  border: none;
+  border-radius: 0%;
+}
+
+.savesharebtn {
+  top: 75rpx;
+  background: none !important;
+  font-size: 32rpx;
+  color: #fff !important;
+  border-radius: 0%;
+  width: 175rpx;
+  height: 150rpx;
+  text-align: center;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-wrap: wrap;
+  float: right;
+  background: #fff;
+  border-bottom: 0px solid #fafafa;
+  margin-right: 15%;
+}
+
+.savesharebtn::after {
+  border: none;
+  border-radius: 0%;
+}
+
+.sharebtn_image {
+  /* border: 1px solid #757575; */
+  width: 128rpx;
+  height: 128rpx;
+  margin-top: 0rpx;
+}
+
+.sharebtn_text {
+  /* border: 1px solid #757575; */
+  width: 150rpx;
+  margin-bottom: 2rpx;
+  height: 20rpx;
+  line-height: 20rpx;
+  font-size: 20rpx;
+  color: #555;
+}
+
+.separate {
+  background: #e0e3da;
+  width: 100%;
+  height: 6rpx;
+}
diff --git a/litemall-wx/pages/groupon/grouponDetail/grouponDetail.js b/litemall-wx/pages/groupon/grouponDetail/grouponDetail.js
deleted file mode 100644
index 358ecce9..00000000
--- a/litemall-wx/pages/groupon/grouponDetail/grouponDetail.js
+++ /dev/null
@@ -1,95 +0,0 @@
-var util = require('../../../utils/util.js');
-var api = require('../../../config/api.js');
-
-Page({
-  data: {
-    id: 0,
-    groupon: {},
-    joiners: [],
-    orderInfo: {},
-    orderGoods: [],
-    rules: {},
-    active: 0,
-    steps: [],
-    activeIcon: '',
-    activeColor: ''
-  },
-
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    this.setData({
-      id: options.id
-    });
-    this.getOrderDetail();
-  },
-
-  // 页面分享
-  onShareAppMessage: function() {
-    let that = this;
-    return {
-      title: '邀请团购',
-      desc: '唯爱与美食不可辜负',
-      path: '/pages/index/index?grouponId=' + this.data.id
-    }
-  },
-  getOrderDetail: function() {
-    let that = this;
-    util.request(api.GroupOnDetail, {
-      grouponId: that.data.id
-    }).then(function(res) {
-      if (res.errno === 0) {
-        let _steps = [{
-            text: '已开团'
-          },
-          {
-            text: '开团中'
-          },
-          {
-            text: '开团成功'
-          }
-        ]
-        let _active = res.data.groupon.status
-        let _activeIcon = 'success'
-        let _activeColor = '#07c160'
-        if (res.data.groupon.status === 3) {
-          _steps = [{
-              text: '已开团'
-            },
-            {
-              text: '开团中'
-            },
-            {
-              text: '开团失败'
-            }
-          ]
-          _active = 2
-          _activeIcon = 'fail'
-          _activeColor = '#EE0A24'
-        }
-        that.setData({
-          joiners: res.data.joiners,
-          groupon: res.data.groupon,
-          orderInfo: res.data.orderInfo,
-          orderGoods: res.data.orderGoods,
-          rules: res.data.rules,
-          active: _active,
-          steps: _steps,
-          activeIcon: _activeIcon,
-          activeColor: _activeColor
-        });
-      }
-    });
-  },
-  onReady: function() {
-    // 页面渲染完成
-  },
-  onShow: function() {
-    // 页面显示
-  },
-  onHide: function() {
-    // 页面隐藏
-  },
-  onUnload: function() {
-    // 页面关闭
-  }
-});
\ No newline at end of file
diff --git a/litemall-wx/pages/groupon/grouponDetail/grouponDetail.json b/litemall-wx/pages/groupon/grouponDetail/grouponDetail.json
deleted file mode 100644
index fc91041f..00000000
--- a/litemall-wx/pages/groupon/grouponDetail/grouponDetail.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "团购详情"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/groupon/grouponDetail/grouponDetail.wxml b/litemall-wx/pages/groupon/grouponDetail/grouponDetail.wxml
deleted file mode 100644
index 55022ebb..00000000
--- a/litemall-wx/pages/groupon/grouponDetail/grouponDetail.wxml
+++ /dev/null
@@ -1,67 +0,0 @@
-<view class="container">
-  <view class="progress">
-    <view class="item-a">
-      <van-steps steps="{{ steps }}" active="{{ active }}" active-icon="{{ activeIcon }}"
-  active-color="{{ activeColor }}" />
-    </view>
-    <view class="item-c" wx:if="{{groupon.status === 1}}">
-      <view class="l">
-        开团还缺
-        <van-tag type="danger">{{rules.discountMember - joiners.length}}</van-tag>
-        人
-      </view>
-      <view class="r">
-        <button class="btn active" open-type="share">邀请参团</button>
-      </view>
-    </view>
-  </view>
-
-  <view class="menu-list-pro">
-    <view class="h">
-      <view class="label">参与团购 ( {{joiners.length}}人)</view>
-      <view class="status">查看全部</view>
-    </view>
-    <view class="menu-list-item" wx:for-items="{{joiners}}" wx:key="id" data-id="{{item.id}}">
-      <image class="icon" src="{{item.avatar}}"></image>
-      <text class="txt">{{item.nickname}}</text>
-    </view>
-  </view>
-
-  <view class="order-goods">
-    <view class="h">
-      <view class="label">商品信息</view>
-    </view>
-    <view class="goods">
-      <view class="item" wx:for="{{orderGoods}}" wx:key="id">
-        <view class="img">
-          <image src="{{item.picUrl}}"></image>
-        </view>
-        <view class="info">
-          <view class="t">
-            <text class="name">{{item.goodsName}}</text>
-            <text class="number">x{{item.number}}</text>
-          </view>
-          <view class="attr">{{item.goodsSpecificationValues}}</view>
-          <view class="price">￥{{item.retailPrice}}</view>
-        </view>
-      </view>
-    </view>
-
-    <view class="order-bottom">
-      <view class="total">
-        <view class="t">
-          <text class="label">商品合计：</text>
-          <text class="txt">￥{{orderInfo.goodsPrice}}</text>
-        </view>
-        <view class="t">
-          <text class="label">商品运费：</text>
-          <text class="txt">￥{{orderInfo.freightPrice}}</text>
-        </view>
-      </view>
-      <view class="pay-fee">
-        <text class="label">商品实付：</text>
-        <text class="txt">￥{{orderInfo.actualPrice}}</text>
-      </view>
-    </view>
-  </view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/groupon/grouponDetail/grouponDetail.wxss b/litemall-wx/pages/groupon/grouponDetail/grouponDetail.wxss
deleted file mode 100644
index f0f939c0..00000000
--- a/litemall-wx/pages/groupon/grouponDetail/grouponDetail.wxss
+++ /dev/null
@@ -1,304 +0,0 @@
-page {
-  height: 100%;
-  width: 100%;
-  background: #f4f4f4;
-}
-
-.progress {
-  padding-top: 25rpx;
-  background: #fff;
-  height: auto;
-  overflow: hidden;
-}
-
-.item-a {
-  padding: 0 21.25rpx;
-}
-
-.item-c {
-  margin-left: 31.25rpx;
-  height: 103rpx;
-  line-height: 103rpx;
-}
-
-.item-c .l {
-  float: left;
-}
-
-.item-c .r {
-  height: 103rpx;
-  float: right;
-  display: flex;
-  align-items: center;
-  padding-right: 16rpx;
-}
-
-.item-c .btn {
-  float: right;
-  line-height: 66rpx;
-  font-size: 30rpx;
-  border-radius: 5rpx;
-  text-align: center;
-  margin: 0 15rpx;
-  padding: 0 20rpx;
-  height: 66rpx;
-}
-
-.item-c .btn.active {
-  background: #a78845;
-  color: #fff;
-}
-
-.order-goods {
-  margin-top: 20rpx;
-  background: #fff;
-}
-
-.order-goods .h {
-  height: 93.75rpx;
-  line-height: 93.75rpx;
-  margin-left: 31.25rpx;
-  border-bottom: 1px solid #f4f4f4;
-  padding-right: 31.25rpx;
-}
-
-.order-goods .h .label {
-  float: left;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.order-goods .h .status {
-  float: right;
-  font-size: 30rpx;
-  color: #b4282d;
-}
-
-.order-goods .item {
-  display: flex;
-  align-items: center;
-  height: 192rpx;
-  margin-left: 31.25rpx;
-  padding-right: 31.25rpx;
-  border-bottom: 1px solid #f4f4f4;
-}
-
-.order-goods .item:last-child {
-  border-bottom: none;
-}
-
-.order-goods .item .img {
-  height: 145.83rpx;
-  width: 145.83rpx;
-  background: #f4f4f4;
-}
-
-.order-goods .item .img image {
-  height: 145.83rpx;
-  width: 145.83rpx;
-}
-
-.order-goods .item .info {
-  flex: 1;
-  height: 145.83rpx;
-  margin-left: 20rpx;
-}
-
-.order-goods .item .t {
-  margin-top: 8rpx;
-  height: 33rpx;
-  line-height: 33rpx;
-  margin-bottom: 10.5rpx;
-}
-
-.order-goods .item .t .name {
-  display: block;
-  float: left;
-  height: 33rpx;
-  line-height: 33rpx;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.order-goods .item .t .number {
-  display: block;
-  float: right;
-  height: 33rpx;
-  text-align: right;
-  line-height: 33rpx;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.order-goods .item .attr {
-  height: 29rpx;
-  line-height: 29rpx;
-  color: #666;
-  margin-bottom: 25rpx;
-  font-size: 25rpx;
-}
-
-.order-goods .item .price {
-  display: block;
-  float: left;
-  height: 30rpx;
-  line-height: 30rpx;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.order-goods .item .btn {
-  height: 50rpx;
-  line-height: 50rpx;
-  border-radius: 5rpx;
-  text-align: center;
-  display: block;
-  float: right;
-  margin: 0 15rpx;
-  padding: 0 20rpx;
-}
-
-.order-goods .item .btn.active {
-  background: #b4282d;
-  color: #fff;
-}
-
-.order-bottom {
-  margin-top: 20rpx;
-  padding-left: 31.25rpx;
-  height: auto;
-  overflow: hidden;
-  background: #fff;
-}
-
-.order-bottom .address {
-  height: 128rpx;
-  padding-top: 25rpx;
-  border-bottom: 1px solid #f4f4f4;
-}
-
-.order-bottom .address .t {
-  height: 35rpx;
-  line-height: 35rpx;
-  margin-bottom: 7.5rpx;
-}
-
-.order-bottom .address .name {
-  display: inline-block;
-  height: 35rpx;
-  width: 140rpx;
-  line-height: 35rpx;
-  font-size: 30rpx;
-}
-
-.order-bottom .address .mobile {
-  display: inline-block;
-  height: 35rpx;
-  line-height: 35rpx;
-  font-size: 30rpx;
-}
-
-.order-bottom .address .b {
-  height: 35rpx;
-  line-height: 35rpx;
-  font-size: 30rpx;
-}
-
-.order-bottom .total {
-  height: 106rpx;
-  padding-top: 20rpx;
-  border-bottom: 1px solid #f4f4f4;
-}
-
-.order-bottom .total .t {
-  height: 30rpx;
-  line-height: 30rpx;
-  margin-bottom: 7.5rpx;
-}
-
-.order-bottom .total .t .label {
-  width: 150rpx;
-  height: 35rpx;
-  line-height: 35rpx;
-  font-size: 30rpx;
-}
-
-.order-bottom .total .t .txt {
-  float: right;
-  height: 35rpx;
-  line-height: 35rpx;
-  font-size: 30rpx;
-  padding-right: 31.25rpx;
-}
-
-.order-bottom .pay-fee {
-  height: 81rpx;
-  line-height: 81rpx;
-}
-
-.order-bottom .pay-fee .label {
-  width: 140rpx;
-}
-
-.order-bottom .pay-fee .txt {
-  float: right;
-  padding-right: 31.25rpx;
-}
-
-.menu-list-pro {
-  margin-top: 20rpx;
-  overflow-x: scroll;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  height: 260rpx;
-  width: 100%;
-  overflow: hidden;
-  border-bottom: 1rpx #cfc9ca;
-  background-color: #fff;
-}
-
-.menu-list-pro .h {
-  height: 93.75rpx;
-  line-height: 93.75rpx;
-  margin-left: 31.25rpx;
-  border-bottom: 1px solid #f4f4f4;
-  padding-right: 31.25rpx;
-}
-
-.menu-list-pro .h .label {
-  float: left;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.menu-list-pro .h .status {
-  float: right;
-  font-size: 30rpx;
-  color: #a78845;
-}
-
-.menu-list-pro  .menu-list-item {
-  display: block;
-  float: left;
-  height: 110rpx;
-  width: 80rpx;
-  margin-top: 30rpx;
-  margin-bottom: 30rpx;
-  margin-left: 40rpx;
-}
-
-.menu-list-pro .icon {
-  height: 80rpx;
-  width: 80rpx;
-  border-radius: 12rpx;
-  box-shadow: 0px 4rpx 4rpx 0px #cfc9ca;
-}
-
-.menu-list-pro .txt {
-  display: block;
-  float: left;
-  width: 80rpx;
-  margin-top: 5rpx;
-  font-size: 22rpx;
-  color: #a78845;
-}
diff --git a/litemall-wx/pages/groupon/grouponList/grouponList.json b/litemall-wx/pages/groupon/grouponList/grouponList.json
deleted file mode 100644
index 264e14a5..00000000
--- a/litemall-wx/pages/groupon/grouponList/grouponList.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "团购专区"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/groupon/grouponList/grouponList.wxml b/litemall-wx/pages/groupon/grouponList/grouponList.wxml
deleted file mode 100644
index e18b8024..00000000
--- a/litemall-wx/pages/groupon/grouponList/grouponList.wxml
+++ /dev/null
@@ -1,31 +0,0 @@
-<view class="container">
-  <scroll-view class="groupon-list" scroll-y="true" scroll-top="{{scrollTop}}">
-
-    <view class="item" wx:for="{{grouponList}}" wx:for-index="index" wx:for-item="item" wx:key="id">
-      <navigator url="/pages/goods/goods?id={{item.id}}">
-        <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
-        <view class="right">
-          <view class="text">
-            <view class="header">
-              <text class="name">{{item.name}}</text>
-              <van-tag type="primary">{{item.grouponMember}}人成团</van-tag>
-            </view>
-            <view class="expire">
-              <van-tag round type="warning">有效期至 {{item.expireTime}}</van-tag>
-            </view>            
-            <text class="desc">{{item.brief}}</text>
-            <view class="price">
-              <view class="counterPrice">现价：￥{{item.retailPrice}}</view>
-              <view class="retailPrice">团购价：￥{{item.grouponPrice}}</view>
-            </view>
-          </view>
-        </view>
-      </navigator>
-    </view>
-
-    <view class="page" wx:if="{{showPage}}">
-      <view class="prev {{ page <= 1 ? 'disabled' : ''}}" bindtap="prevPage">上一页</view>
-      <view class="next {{ (count / limit) < page ? 'disabled' : ''}}" bindtap="nextPage">下一页</view>
-    </view>
-  </scroll-view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/groupon/grouponList/grouponList.wxss b/litemall-wx/pages/groupon/grouponList/grouponList.wxss
deleted file mode 100644
index cc1f48b9..00000000
--- a/litemall-wx/pages/groupon/grouponList/grouponList.wxss
+++ /dev/null
@@ -1,107 +0,0 @@
-page, .container {
-  width: 750rpx;
-  height: 100%;
-  overflow: hidden;
-  background: #f4f4f4;
-}
-
-.groupon-list {
-  width: 750rpx;
-  height: 100%;
-  overflow: hidden;
-  background: #f4f4f4;
-}
-
-.groupon-list .item {
-  height: 244rpx;
-  width: 100%;
-  background: #fff;
-  margin-bottom: 20rpx;
-}
-
-.groupon-list .img {
-  margin-top: 12rpx;
-  margin-right: 12rpx;
-  float: left;
-  width: 220rpx;
-  height: 220rpx;
-}
-
-.groupon-list .right {
-  float: left;
-  height: 244rpx;
-  width: 476rpx;
-  display: flex;
-  flex-flow: row nowrap;
-}
-
-.groupon-list .text {
-  display: flex;
-  flex-wrap: nowrap;
-  flex-direction: column;
-  justify-content: center;
-  overflow: hidden;
-  height: 244rpx;
-  width: 476rpx;
-}
-
-.groupon-list .name {
-  float: left;
-  display: block;
-  color: #333;
-  line-height: 50rpx;
-  font-size: 30rpx;
-}
-
-.groupon-list .desc {
-  width: 476rpx;
-  display: block;
-  color: #999;
-  line-height: 50rpx;
-  font-size: 25rpx;
-}
-
-.groupon-list .price {
-  width: 476rpx;
-  display: flex;
-  color: #ab956d;
-  line-height: 50rpx;
-  font-size: 33rpx;
-}
-
-.groupon-list .counterPrice {
-  text-decoration: line-through;
-  font-size: 28rpx;
-  color: #999;
-}
-
-.groupon-list .retailPrice {
-  margin-left: 30rpx;
-  font-size: 28rpx;
-  color: #a78845;
-}
-
-.page {
-  width: 750rpx;
-  height: 108rpx;
-  background: #fff;
-  margin-bottom: 20rpx;
-}
-
-.page view {
-  height: 108rpx;
-  width: 50%;
-  float: left;
-  font-size: 29rpx;
-  color: #333;
-  text-align: center;
-  line-height: 108rpx;
-}
-
-.page .prev {
-  border-right: 1px solid #d9d9d9;
-}
-
-.page .disabled {
-  color: #ccc;
-}
diff --git a/litemall-wx/pages/groupon/myGroupon/myGroupon.js b/litemall-wx/pages/groupon/myGroupon/myGroupon.js
deleted file mode 100644
index 851e682f..00000000
--- a/litemall-wx/pages/groupon/myGroupon/myGroupon.js
+++ /dev/null
@@ -1,52 +0,0 @@
-var util = require('../../../utils/util.js');
-var api = require('../../../config/api.js');
-
-Page({
-  data: {
-    orderList: [],
-    showType: 0
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-  },
-
-  onPullDownRefresh() {
-    wx.showNavigationBarLoading() //在标题栏中显示加载
-    this.getOrderList();
-    wx.hideNavigationBarLoading() //完成停止加载
-    wx.stopPullDownRefresh() //停止下拉刷新
-  },
-
-  getOrderList() {
-    let that = this;
-    util.request(api.GroupOnMy, {
-      showType: that.data.showType
-    }).then(function(res) {
-      if (res.errno === 0) {
-        that.setData({
-          orderList: res.data.list
-        });
-      }
-    });
-  },
-  switchTab: function(event) {
-    let showType = event.currentTarget.dataset.index;
-    this.setData({
-      showType: showType
-    });
-    this.getOrderList();
-  },
-  onReady: function() {
-    // 页面渲染完成
-  },
-  onShow: function() {
-    // 页面显示
-    this.getOrderList();
-  },
-  onHide: function() {
-    // 页面隐藏
-  },
-  onUnload: function() {
-    // 页面关闭
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/groupon/myGroupon/myGroupon.json b/litemall-wx/pages/groupon/myGroupon/myGroupon.json
deleted file mode 100644
index 51e6af06..00000000
--- a/litemall-wx/pages/groupon/myGroupon/myGroupon.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "我的团购"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/groupon/myGroupon/myGroupon.wxml b/litemall-wx/pages/groupon/myGroupon/myGroupon.wxml
deleted file mode 100644
index 89a1269a..00000000
--- a/litemall-wx/pages/groupon/myGroupon/myGroupon.wxml
+++ /dev/null
@@ -1,51 +0,0 @@
-<view class="container">
-  <view class="orders-switch">
-    <view class="item {{ showType == 0 ? 'active' : ''}}" bindtap="switchTab" data-index='0'>
-      <view class="txt">发起的团购</view>
-    </view>
-    <view class="item {{ showType == 1 ? 'active' : ''}}" bindtap="switchTab" data-index='1'>
-      <view class="txt">参加的团购</view>
-    </view>
-  </view>
-  <view class="no-order" wx:if="{{orderList.length <= 0}}">
-    <view class="c">
-      <text>尚未参加任何团购</text>
-    </view>
-  </view>
-
-  <view class="orders">
-    <navigator url="../grouponDetail/grouponDetail?id={{item.id}}" class="order" open-type="navigate" wx:for="{{orderList}}" wx:key="id">
-      <view class="h">
-        <van-tag type="primary" wx:if="{{item.groupon.status === 1}}">开团中</van-tag>
-        <van-tag type="success" wx:if="{{item.groupon.status === 2}}">开团成功</van-tag>
-        <van-tag type="danger" wx:if="{{item.groupon.status === 3}}">开团失败</van-tag>
-        <van-tag round type="warning" wx:if="{{!item.isCreator}}">{{item.creator}}发起</van-tag>
-      </view>
-      <view class="h">
-        <view class="l">订单编号：{{item.orderSn}}</view>
-        <view class="r">{{item.orderStatusText}}</view>
-      </view>
-      <view class="j">
-        <view class="l">团购立减：￥{{item.rules.discount}}</view>
-        <view class="r">参与时间：{{item.groupon.addTime}}</view>
-      </view>
-      <view class="i">
-        <view class="l">团购要求：{{item.rules.discountMember}}人</view>
-        <view class="r">当前参团：{{item.joinerCount}}人</view>
-      </view>
-      <view class="goods" wx:for="{{item.goodsList}}" wx:key="id" wx:for-item="gitem">
-        <view class="img">
-          <image src="{{gitem.picUrl}}"></image>
-        </view>
-        <view class="info">
-          <text class="name">{{gitem.goodsName}}</text>
-          <text class="number">共{{gitem.number}}件商品</text>
-        </view>
-        <view class="status"></view>
-      </view>
-      <view class="b">
-        <view class="l">实付：￥{{item.actualPrice}}</view>
-      </view>
-    </navigator>
-  </view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/groupon/myGroupon/myGroupon.wxss b/litemall-wx/pages/groupon/myGroupon/myGroupon.wxss
deleted file mode 100644
index f73efa37..00000000
--- a/litemall-wx/pages/groupon/myGroupon/myGroupon.wxss
+++ /dev/null
@@ -1,213 +0,0 @@
-page {
-  height: 100%;
-  width: 100%;
-  background: #f4f4f4;
-}
-
-.orders-switch {
-  width: 100%;
-  background: #fff;
-  height: 84rpx;
-  border-bottom: 1px solid #a78845;
-}
-
-.orders-switch .item {
-  display: inline-block;
-  height: 82rpx;
-  width: 50%;
-  padding: 0 15rpx;
-  text-align: center;
-}
-
-.orders-switch .item .txt {
-  display: inline-block;
-  height: 82rpx;
-  padding: 0 20rpx;
-  line-height: 82rpx;
-  color: #333;
-  font-size: 30rpx;
-  width: 100%;
-}
-
-.orders-switch .item.active .txt {
-  color: #a78845;
-  border-bottom: 4rpx solid #a78845;
-}
-
-.no-order {
-  width: 100%;
-  height: auto;
-  margin: 0 auto;
-}
-
-.no-order .c {
-  width: 100%;
-  height: auto;
-  margin-top: 400rpx;
-}
-
-.no-order .c image {
-  margin: 0 auto;
-  display: block;
-  text-align: center;
-  width: 258rpx;
-  height: 258rpx;
-}
-
-.no-order .c text {
-  margin: 0 auto;
-  display: block;
-  width: 258rpx;
-  height: 29rpx;
-  line-height: 29rpx;
-  text-align: center;
-  font-size: 29rpx;
-  color: #999;
-}
-
-.orders {
-  height: auto;
-  width: 100%;
-  overflow: hidden;
-}
-
-.order {
-  margin-top: 20rpx;
-  background: #fff;
-}
-
-.order .h {
-  height: 83.3rpx;
-  line-height: 83.3rpx;
-  margin-left: 31.25rpx;
-  padding-right: 31.25rpx;
-  border-bottom: 1px solid #f4f4f4;
-}
-
-.order .h .l {
-  float: left;
-  color: #a78845;
-  font-size: 26rpx;
-}
-
-.order .h .r {
-  float: right;
-  color: #a78845;
-  font-size: 26rpx;
-}
-
-.order .i {
-  height: 56rpx;
-  line-height: 56rpx;
-  margin-left: 31.25rpx;
-  padding-right: 31.25rpx;
-  border-bottom: 1px solid #f4f4f4;
-}
-
-.order .i .l {
-  float: left;
-  color: #a78845;
-  font-size: 26rpx;
-}
-
-.order .i .r {
-  float: right;
-  color: #a78845;
-  font-size: 26rpx;
-}
-
-.order .j {
-  height: 56rpx;
-  line-height: 56rpx;
-  margin-left: 31.25rpx;
-  padding-right: 31.25rpx;
-}
-
-.order .j .l {
-  float: left;
-  font-size: 26rpx;
-  color: #a78845;
-}
-
-.order .j .r {
-  float: right;
-  color: #a78845;
-  font-size: 26rpx;
-}
-
-.order .goods {
-  display: flex;
-  align-items: center;
-  height: 199rpx;
-  margin-left: 31.25rpx;
-}
-
-.order .goods .img {
-  height: 145.83rpx;
-  width: 145.83rpx;
-  background: #f4f4f4;
-}
-
-.order .goods .img image {
-  height: 145.83rpx;
-  width: 145.83rpx;
-}
-
-.order .goods .info {
-  height: 145.83rpx;
-  flex: 1;
-  padding-left: 20rpx;
-}
-
-.order .goods .name {
-  margin-top: 30rpx;
-  display: block;
-  height: 44rpx;
-  line-height: 44rpx;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.order .goods .number {
-  display: block;
-  height: 37rpx;
-  line-height: 37rpx;
-  color: #666;
-  font-size: 25rpx;
-}
-
-.order .goods .status {
-  width: 105rpx;
-  color: #a78845;
-  font-size: 25rpx;
-}
-
-.order .b {
-  height: 103rpx;
-  line-height: 103rpx;
-  margin-left: 31.25rpx;
-  padding-right: 31.25rpx;
-  border-top: 1px solid #f4f4f4;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.order .b .l {
-  float: left;
-}
-
-.order .b .r {
-  float: right;
-}
-
-.order .b .btn {
-  margin-top: 19rpx;
-  height: 64.5rpx;
-  line-height: 64.5rpx;
-  text-align: center;
-  padding: 0 20rpx;
-  border-radius: 5rpx;
-  font-size: 28rpx;
-  color: #fff;
-  background: #a78845;
-}
diff --git a/litemall-wx/pages/help/help.json b/litemall-wx/pages/help/help.json
deleted file mode 100644
index b546013f..00000000
--- a/litemall-wx/pages/help/help.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "帮助中心"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/help/help.wxml b/litemall-wx/pages/help/help.wxml
deleted file mode 100644
index 614cd8fb..00000000
--- a/litemall-wx/pages/help/help.wxml
+++ /dev/null
@@ -1,20 +0,0 @@
-<view class="container">
-
-  <view class="common-problem">
-    <view class="item" wx:for="{{issueList}}" wx:key="id">
-      <view class="question-box">
-        <text class="spot"></text>
-        <text class="question">{{item.question}}</text>
-      </view>
-      <view class="answer">
-        {{item.answer}}
-      </view>
-    </view>
-  </view>
-
-  <view class="page" wx:if="{{showPage}}">
-    <view class="prev {{ page <= 1 ? 'disabled' : ''}}" bindtap="prevPage">上一页</view>
-    <view class="next {{ (count / limit) < page ? 'disabled' : ''}}" bindtap="nextPage">下一页</view>
-  </view>
-
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/help/help.wxss b/litemall-wx/pages/help/help.wxss
deleted file mode 100644
index d49fc3e7..00000000
--- a/litemall-wx/pages/help/help.wxss
+++ /dev/null
@@ -1,70 +0,0 @@
-.common-problem {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-  padding: 0rpx 30rpx;
-  background: #fff;
-}
-
-.item {
-  height: auto;
-  overflow: hidden;
-  padding-bottom: 25rpx;
-}
-
-.question-box .spot {
-  float: left;
-  display: block;
-  height: 10rpx;
-  width: 10rpx;
-  background: #b4282d;
-  border-radius: 50%;
-  margin-top: 11rpx;
-}
-
-.question-box .question {
-  float: left;
-  line-height: 30rpx;
-  padding-left: 8rpx;
-  display: block;
-  font-size: 26rpx;
-  padding-bottom: 15rpx;
-  color: #303030;
-  width: 680rpx;
-
-}
-
-.answer {
-  line-height: 36rpx;
-  padding-left: 16rpx;
-  font-size: 26rpx;
-  color: #787878;
-  display: block;
-
-}
-
-
-.page{
-    width: 750rpx;
-    height: 108rpx;
-    background: #fff;
-    margin-bottom: 20rpx;
-}
-
-.page view{
-    height: 108rpx;
-    width: 50%;
-    float: left;
-    font-size: 29rpx;
-    color: #333;
-    text-align: center;
-    line-height: 108rpx;
-}
-
-.page .prev{
-    border-right: 1px solid #D9D9D9;
-}
-
-.page .disabled{
-    color: #ccc;
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/hotGoods/hotGoods.js b/litemall-wx/pages/hotGoods/hotGoods.js
deleted file mode 100644
index 867109d0..00000000
--- a/litemall-wx/pages/hotGoods/hotGoods.js
+++ /dev/null
@@ -1,120 +0,0 @@
-var util = require('../../utils/util.js');
-var api = require('../../config/api.js');
-var app = getApp();
-
-Page({
-  data: {
-    bannerInfo: {
-      'imgUrl': '/static/images/hot.png',
-      'name': '大家都在买的'
-    },
-    categoryFilter: false,
-    filterCategory: [],
-    goodsList: [],
-    categoryId: 0,
-    currentSortType: 'default',
-    currentSort: 'add_time',
-    currentSortOrder: 'desc',
-    page: 1,
-    limit: 10
-  },
-  getCategoryList: function() {
-    var that = this;
-
-    util.request(api.GoodsFilter, {
-        isHot: 1
-      })
-      .then(function(res) {
-        if (res.errno === 0) {
-          that.setData({
-            filterCategory: res.data.filterCategoryList,
-          });
-        }
-      });
-  },
-  getGoodsList: function() {
-    var that = this;
-
-    util.request(api.GoodsList, {
-        isHot: true,
-        page: that.data.page,
-        limit: that.data.limit,
-        order: that.data.currentSortOrder,
-        sort: that.data.currentSort,
-        categoryId: that.data.categoryId
-      })
-      .then(function(res) {
-        if (res.errno === 0) {
-          that.setData({
-            goodsList: res.data.list,
-            filterCategory: res.data.filterCategoryList
-          });
-        }
-      });
-
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    this.getGoodsList();
-  },
-  onReady: function() {
-    // 页面渲染完成
-  },
-  onShow: function() {
-    // 页面显示
-
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-
-  },
-  openSortFilter: function(event) {
-    let currentId = event.currentTarget.id;
-    switch (currentId) {
-      case 'categoryFilter':
-        this.setData({
-          categoryFilter: !this.data.categoryFilter,
-          currentSortType: 'category',
-          currentSort: 'add_time',
-          currentSortOrder: 'desc'
-        });
-        break;
-      case 'priceSort':
-        let tmpSortOrder = 'asc';
-        if (this.data.currentSortOrder == 'asc') {
-          tmpSortOrder = 'desc';
-        }
-        this.setData({
-          currentSortType: 'price',
-          currentSort: 'retail_price',
-          currentSortOrder: tmpSortOrder,
-          categoryFilter: false
-        });
-
-        this.getGoodsList();
-        break;
-      default:
-        //综合排序
-        this.setData({
-          currentSortType: 'default',
-          currentSort: 'add_time',
-          currentSortOrder: 'desc',
-          categoryFilter: false,
-          categoryId: 0,
-        });
-        this.getGoodsList();
-    }
-  },
-  selectCategory: function(event) {
-    let currentIndex = event.target.dataset.categoryIndex;
-    this.setData({
-      'categoryFilter': false,
-      'categoryId': this.data.filterCategory[currentIndex].id
-    });
-    this.getGoodsList();
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/hotGoods/hotGoods.json b/litemall-wx/pages/hotGoods/hotGoods.json
deleted file mode 100644
index 3a1bb4ae..00000000
--- a/litemall-wx/pages/hotGoods/hotGoods.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "人气推荐"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/hotGoods/hotGoods.wxml b/litemall-wx/pages/hotGoods/hotGoods.wxml
deleted file mode 100644
index 2ef7f5f0..00000000
--- a/litemall-wx/pages/hotGoods/hotGoods.wxml
+++ /dev/null
@@ -1,42 +0,0 @@
-<view class="container">
-  <view class="brand-info">
-    <view class="name">
-      <image class="img" src="{{bannerInfo.imgUrl}}" background-size="cover"></image>
-      <view class="info-box">
-        <view class="info">
-          <text class="txt">{{bannerInfo.name}}</text>
-          <text class="line"></text>
-        </view>
-      </view>
-    </view>
-  </view>
-  <view class="sort">
-    <view class="sort-box">
-      <view class="item {{currentSortType == 'default' ? 'active' : ''}}" bindtap="openSortFilter" id="defaultSort">
-        <text class="txt">综合</text>
-      </view>
-      <view class="item {{currentSortType == 'price' ? 'active' : ''}}" bindtap="openSortFilter" id="priceSort">
-        <text class="txt">价格</text>
-        <van-icon name="arrow-up" wx:if="{{ currentSortType == 'price' && currentSortOrder == 'asc' }}" />
-        <van-icon name="arrow-down" wx:elif="{{ currentSortType == 'price' && currentSortOrder == 'desc'}}" />
-      </view>
-      <view class="item {{currentSortType == 'category' ? 'active' : ''}}" bindtap="openSortFilter" id="categoryFilter">
-        <text class="txt">分类</text>
-      </view>
-    </view>
-    <view class="sort-box-category" wx-if="{{categoryFilter}}">
-      <view class="item {{item.checked ? 'active' : ''}}" wx:for="{{filterCategory}}" wx:key="id" data-category-index="{{index}}" bindtap="selectCategory">{{item.name}}</view>
-    </view>
-  </view>
-  <view class="cate-item">
-    <view class="b">
-      <block wx:for="{{goodsList}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="id">
-        <navigator class="item {{iindex % 2 == 0 ? 'item-b' : '' }}" url="../goods/goods?id={{iitem.id}}">
-          <image class="img" src="{{iitem.picUrl}}" background-size="cover"></image>
-          <text class="name">{{iitem.name}}</text>
-          <text class="price">￥{{iitem.retailPrice}}</text>
-        </navigator>
-      </block>
-    </view>
-  </view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/hotGoods/hotGoods.wxss b/litemall-wx/pages/hotGoods/hotGoods.wxss
deleted file mode 100644
index 07800d29..00000000
--- a/litemall-wx/pages/hotGoods/hotGoods.wxss
+++ /dev/null
@@ -1,164 +0,0 @@
-page {
-  background: #f4f4f4;
-}
-
-.brand-info .name {
-  width: 100%;
-  height: 278rpx;
-  position: relative;
-}
-
-.brand-info .img {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 278rpx;
-}
-
-.brand-info .info-box {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 278rpx;
-  text-align: center;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.brand-info .info {
-  display: block;
-}
-
-.brand-info .txt {
-  display: block;
-  height: 40rpx;
-  font-size: 37.5rpx;
-  color: #fff;
-}
-
-.brand-info .line {
-  margin: 0 auto;
-  margin-top: 16rpx;
-  display: block;
-  height: 2rpx;
-  width: 145rpx;
-  background: #fff;
-}
-
-.sort {
-  position: relative;
-  background: #fff;
-  width: 100%;
-  height: 78rpx;
-}
-
-.sort-box {
-  background: #fff;
-  width: 100%;
-  height: 78rpx;
-  overflow: hidden;
-  padding: 0 30rpx;
-  display: flex;
-  align-items: center;
-  border-bottom: 1px solid #d9d9d9;
-}
-
-.sort-box .item {
-  height: 78rpx;
-  line-height: 78rpx;
-  text-align: center;
-  flex: 1;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.sort-box .item .txt {
-  color: #333;
-}
-
-.sort-box .item.active .txt {
-  color: #b4282d;
-}
-
-.sort-box .item .van-icon {
-  margin-left: 6rpx;
-}
-
-.sort-box-category {
-  background: #fff;
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-  padding: 40rpx 40rpx 0 0;
-  border-bottom: 1px solid #d9d9d9;
-}
-
-.sort-box-category .item {
-  height: 54rpx;
-  line-height: 54rpx;
-  text-align: center;
-  float: left;
-  padding: 0 16rpx;
-  margin: 0 0 40rpx 40rpx;
-  border: 1px solid #666;
-  color: #333;
-  font-size: 24rpx;
-}
-
-.sort-box-category .item.active {
-  color: #b4282d;
-  border: 1px solid #b4282d;
-}
-
-.cate-item .b {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-  border-top: 1rpx solid #f4f4f4;
-  margin-top: 20rpx;
-}
-
-.cate-item .b .item {
-  float: left;
-  background: #fff;
-  width: 375rpx;
-  padding-bottom: 33.333rpx;
-  border-bottom: 1rpx solid #f4f4f4;
-  height: auto;
-  overflow: hidden;
-  text-align: center;
-}
-
-.cate-item .b .item-b {
-  border-right: 1rpx solid #f4f4f4;
-}
-
-.cate-item .item .img {
-  margin-top: 10rpx;
-  width: 302rpx;
-  height: 302rpx;
-}
-
-.cate-item .item .name {
-  display: block;
-  width: 365.625rpx;
-  height: 35rpx;
-  padding: 0 20rpx;
-  overflow: hidden;
-  margin: 11.5rpx 0 22rpx 0;
-  text-align: center;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.cate-item .item .price {
-  display: block;
-  width: 365.625rpx;
-  height: 30rpx;
-  text-align: center;
-  font-size: 30rpx;
-  color: #b4282d;
-}
diff --git a/litemall-wx/pages/index/assets/fenxiang.png b/litemall-wx/pages/index/assets/fenxiang.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fa2386ba09fe3257dcd247a0c03dea61f603fae
GIT binary patch
literal 5055
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
VC_}oU)*t`?002ovPDHLkV1gSIXjcFL

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/index/assets/mom.png b/litemall-wx/pages/index/assets/mom.png
new file mode 100644
index 0000000000000000000000000000000000000000..b29aba7b24f26ddc74489a025508580854d563b2
GIT binary patch
literal 7035
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
WVSASi;=a448bA%DjjUF*!u%ghoC=%(

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/index/assets/nan.png b/litemall-wx/pages/index/assets/nan.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6801da5307f590ff183b0d0a832e463f3c44cbd
GIT binary patch
literal 4459
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
F{{z9cEPen0

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/index/assets/nv.png b/litemall-wx/pages/index/assets/nv.png
new file mode 100644
index 0000000000000000000000000000000000000000..3dc6d3b92f973372c0513bfd2b38998826eae39a
GIT binary patch
literal 4891
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
Kwv=X5Kkz@^|B%W6

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/index/assets/sex.png b/litemall-wx/pages/index/assets/sex.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a619da42f9f1869f3ac097298f2f5c3ce5c5696
GIT binary patch
literal 11453
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
X!j9E=7f<?J00000NkvXXu0mjfhf1QY

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/index/index.js b/litemall-wx/pages/index/index.js
index 3ba9e883..6fd40c3a 100644
--- a/litemall-wx/pages/index/index.js
+++ b/litemall-wx/pages/index/index.js
@@ -1,141 +1,310 @@
-const util = require('../../utils/util.js');
-const api = require('../../config/api.js');
-const user = require('../../utils/user.js');
-
-//获取应用实例
-const app = getApp();
-
-Page({
-  data: {
-    newGoods: [],
-    hotGoods: [],
-    topics: [],
-    brands: [],
-    groupons: [],
-    floorGoods: [],
-    banner: [],
-    channel: [],
-    coupon: [],
-    goodsCount: 0
-  },
-
-  onShareAppMessage: function() {
-    return {
-      title: 'litemall小程序商场',
-      desc: '开源微信小程序商城',
-      path: '/pages/index/index'
-    }
-  },
-
-  onPullDownRefresh() {
-    wx.showNavigationBarLoading() //在标题栏中显示加载
-    this.getIndexData();
-    wx.hideNavigationBarLoading() //完成停止加载
-    wx.stopPullDownRefresh() //停止下拉刷新
-  },
-
-  getIndexData: function() {
-    let that = this;
-    util.request(api.IndexUrl).then(function(res) {
-      if (res.errno === 0) {
-        that.setData({
-          newGoods: res.data.newGoodsList,
-          hotGoods: res.data.hotGoodsList,
-          topics: res.data.topicList,
-          brands: res.data.brandList,
-          floorGoods: res.data.floorGoodsList,
-          banner: res.data.banner,
-          groupons: res.data.grouponList,
-          channel: res.data.channel,
-          coupon: res.data.couponList
-        });
-      }
-    });
-    util.request(api.GoodsCount).then(function (res) {
-      that.setData({
-        goodsCount: res.data
-      });
-    });
-  },
-  onLoad: function(options) {
-
-    // 页面初始化 options为页面跳转所带来的参数
-    if (options.scene) {
-      //这个scene的值存在则证明首页的开启来源于朋友圈分享的图,同时可以通过获取到的goodId的值跳转导航到对应的详情页
-      var scene = decodeURIComponent(options.scene);
-      console.log("scene:" + scene);
-
-      let info_arr = [];
-      info_arr = scene.split(',');
-      let _type = info_arr[0];
-      let id = info_arr[1];
-
-      if (_type == 'goods') {
-        wx.navigateTo({
-          url: '../goods/goods?id=' + id
-        });
-      } else if (_type == 'groupon') {
-        wx.navigateTo({
-          url: '../goods/goods?grouponId=' + id
-        });
-      } else {
-        wx.navigateTo({
-          url: '../index/index'
-        });
-      }
-    }
-
-    // 页面初始化 options为页面跳转所带来的参数
-    if (options.grouponId) {
-      //这个pageId的值存在则证明首页的开启来源于用户点击来首页,同时可以通过获取到的pageId的值跳转导航到对应的详情页
-      wx.navigateTo({
-        url: '../goods/goods?grouponId=' + options.grouponId
-      });
-    }
-
-    // 页面初始化 options为页面跳转所带来的参数
-    if (options.goodId) {
-      //这个goodId的值存在则证明首页的开启来源于分享,同时可以通过获取到的goodId的值跳转导航到对应的详情页
-      wx.navigateTo({
-        url: '../goods/goods?id=' + options.goodId
-      });
-    }
-
-    // 页面初始化 options为页面跳转所带来的参数
-    if (options.orderId) {
-      //这个orderId的值存在则证明首页的开启来源于订单模版通知,同时可以通过获取到的pageId的值跳转导航到对应的详情页
-      wx.navigateTo({
-        url: '../ucenter/orderDetail/orderDetail?id=' + options.orderId
-      });
-    }
-
-    this.getIndexData();
-  },
-  onReady: function() {
-    // 页面渲染完成
-  },
-  onShow: function() {
-    // 页面显示
-  },
-  onHide: function() {
-    // 页面隐藏
-  },
-  onUnload: function() {
-    // 页面关闭
-  },
-  getCoupon(e) {
-    let couponId = e.currentTarget.dataset.index
-    util.request(api.CouponReceive, {
-      couponId: couponId
-    }, 'POST').then(res => {
-      if (res.errno === 0) {
-        wx.showToast({
-          title: "领取成功"
-        })
-      }
-      else{
-        util.showErrorToast(res.errmsg);
-      }
-    })
-  },
+const util = require('../../utils/util.js');
+const api = require('../../config/api.js');
+const user = require('../../utils/user.js');
+
+//获取应用实例
+const app = getApp();
+
+Page({
+  data: {
+    newGoods: [],
+    hotGoods: [],
+    topics: [],
+    brands: [],
+    groupons: [],
+    floorGoods: [],
+    banner: [],
+    channel: [],
+    coupon: [],
+    goodsCount: 0,
+    menuHeight:0,
+    activeItem:'boss',
+    goodsList:[],
+    fenxiangobj:{},
+    anchorList:[
+      {
+        picUrl: 'https://img1.baidu.com/it/u=935780077,3680298328&fm=253&fmt=auto&app=120&f=JPEG?w=889&h=500',
+        name: '刘德华',
+      },
+      {
+        picUrl: 'https://img2.baidu.com/it/u=2731623673,2354357410&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=375',
+        name: '分提莫',
+      },
+      {
+        picUrl: 'https://img0.baidu.com/it/u=1345453173,4089073679&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=847',
+        name: '分提莫',
+      },
+      {
+        picUrl: 'https://img0.baidu.com/it/u=3982218122,1128343332&fm=253&fmt=auto&app=138&f=JPEG?w=600&h=400',
+        name: '分提莫',
+      },
+      {
+        picUrl: 'https://img2.baidu.com/it/u=916615031,737480735&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=200',
+        name: '分提莫',
+      },
+      {
+        picUrl: 'https://img0.baidu.com/it/u=3613242410,241361968&fm=253&fmt=auto&app=138&f=JPEG?w=386&h=500',
+        name: '分提莫',
+      }
+      
+    ],
+    list:[
+      
+    ],
+    total:0,
+    joblist: [
+      {
+        picUrl: 'https://img1.baidu.com/it/u=3831348730,3487407975&fm=253&fmt=auto&app=138&f=JPEG?w=640&h=433',
+        details: [
+          'https://img1.baidu.com/it/u=3831348730,3487407975&fm=253&fmt=auto&app=138&f=JPEG?w=640&h=433',
+          'https://img0.baidu.com/it/u=4260637539,1726066993&fm=253&fmt=auto&app=138&f=JPEG?w=740&h=416',
+        ],
+        name: '充电宝公司充电宝公司充电宝公司',
+        address: "成都市-双流区",
+        pinlei:['直播','素人直播','带货'],
+      },{
+        picUrl: 'https://img0.baidu.com/it/u=4260637539,1726066993&fm=253&fmt=auto&app=138&f=JPEG?w=740&h=416',
+        name: '商户公司',
+        address: "上海市-黄埔区",
+        pinlei:['直播','双语','电子产品'],
+      },{
+        picUrl: 'https://img2.baidu.com/it/u=4126575332,3611717362&fm=253&fmt=auto&app=138&f=JPEG?w=833&h=500',
+        name: '饿了么',
+        address: "杭州市-余杭区",
+        pinlei:['直播','活泼','家具'],
+      },{
+        picUrl: 'https://img2.baidu.com/it/u=791326700,3259719969&fm=253&fmt=auto&app=138&f=JPEG?w=600&h=465',
+        name: '大渝火锅',
+        address: "成都市-双流区",
+        pinlei:['直播','招主播','日常用品'],
+      },{
+        picUrl: 'https://img2.baidu.com/it/u=3290305656,3957683601&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=281',
+        name: '书店',
+        address: "成都市-双流区",
+        pinlei:['直播'],
+      },{
+        picUrl: 'https://img0.baidu.com/it/u=562300374,2943502356&fm=253&fmt=auto&app=138&f=JPEG?w=496&h=372',
+        name: '婚纱店',
+        address: "成都市-双流区",
+        pinlei:['直播','带货'],
+      },{
+        picUrl: 'https://img2.baidu.com/it/u=1517526491,3305397078&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
+        name: '天猫',
+        address: "成都市-双流区",
+        pinlei:['直播'],
+      },{
+        picUrl: 'https://img2.baidu.com/it/u=506778580,1011630639&fm=253&fmt=auto&app=138&f=JPEG?w=660&h=440',
+        name: '雅迪',
+        address: "成都市-双流区",
+        pinlei:['直播'],
+      },{
+        picUrl: 'https://img1.baidu.com/it/u=1017778406,4235656425&fm=253&fmt=auto&app=120&f=JPEG?w=516&h=264',
+        name: '抖音',
+        address: "成都市-双流区",
+        pinlei:['直播'],
+      },
+
+    ],
+    currlist:[],
+    triggered:false,
+    loading: false,
+    userInfo: {},
+    hasLogin: false,
+    isAuthInfo: false,
+    page: 1,
+    limit:10,
+  },
+  onShareAppMessage: function(e) {
+    let that = this;
+    return {
+      title: that.data.fenxiangobj.name,
+      desc: '',
+      path: '/pages/information/information?id=' + that.data.fenxiangobj.id,
+      imageUrl:that.data.fenxiangobj.gallery[0]
+    }
+  },
+
+  onPullDownRefresh() {
+    wx.showNavigationBarLoading() //在标题栏中显示加载
+    this.getIndexData();
+    wx.hideNavigationBarLoading() //完成停止加载
+    wx.stopPullDownRefresh() //停止下拉刷新
+  },
+  
+  viewDetails(e) {
+    console.log(e)
+    let str = e.currentTarget.dataset.item.id
+    console.log(str,'str')
+    if(this.data.activeItem=='boss'){
+      wx.navigateTo({
+        url: "/pages/information/information?id="+str
+      });
+    }else{
+      wx.navigateTo({
+        url: "/pages/details/details?id="+str
+      });
+    }
+  },
+  fenxiang(e) {
+    let obj = e.currentTarget.dataset.item
+    this.setData({
+      fenxiangobj:obj
+    })
+    return false
+  },
+  getIndexData: function() {
+    let that = this;
+    if(that.data.activeItem=='boss'){
+      util.request(api.GoodsList,{
+        brandId: 0,
+        page: this.data.page,
+        limit: this.data.limit
+      }).then(function(res) {
+        if (res.errno === 0) {
+          that.setData({
+            list: [...that.data.list,...res.data.list],
+            triggered: false,
+            total:res.data.total
+          });
+        }
+      });
+    }else{
+      util.request(api.GoodsList, {
+        page: that.data.page,
+        limit: that.data.limit
+      }).then(function(res) {
+        if (res.errno === 0) {
+          that.setData({
+            list: [...that.data.list,...res.data.list],
+            triggered: false,
+            total:res.data.total
+          });
+        }
+      });
+    }
+      
+    // util.request(api.GoodsCount).then(function (res) {
+    //   that.setData({
+    //     goodsCount: res.data
+    //   });
+    // });
+  },
+  onShow: function(options) {
+    let that=this 
+    if(!!this.data.params){
+      if (app.globalData.hasLogin) {
+        let userInfo = wx.getStorageSync('userInfo');
+        console.log(userInfo)
+        this.setData({
+          userInfo: userInfo,
+          hasLogin: true,
+          isAuthInfo: true,
+          activeItem:userInfo.userType=='CUSTOMER'?'boss':'anchor',
+        });
+      }else{
+        wx.navigateTo({
+          url: "/pages/auth/authorization/authorization"
+        });
+      }
+      if(this.data.params.login){
+        that.getIndexData()
+        this.data.params.login = false
+      }
+    }
+    
+  },
+  changemenu: function(e) {
+    var menu = e.target.dataset.menu;
+    this.setData({
+      activeItem: menu,
+      list:menu == 'boss'?this.data.joblist:this.data.anchorList
+    })
+  },
+  onRefresh: function(e) {
+    this.setData({
+      page: 1,
+      limit: 10,
+      list:[]
+    })
+    this.getIndexData()
+  },
+  // onPullDownRefresh: function() {
+  //   console.log('12313666666666652')
+  // },
+  // onReachBottom: function(e) {
+  //   console.log('1231352')
+  // },
+  loadMore: function(e) {
+    console.log()
+    if(this.data.list.length<this.data.total){
+      this.setData({
+        page: this.data.page+1,
+      })
+      this.getIndexData()
+    }
+  },
+  onReady: function() {
+    // 页面渲染完成
+  },
+  onLoad: function() {
+    // 页面显示
+    let that = this
+    app.getAuthKey()
+    // app.getAuthKey().then(function (res) {
+    //   if (res){
+    //     if (app.globalData.hasLogin) {
+    //       let userInfo = wx.getStorageSync('userInfo');
+    //       console.log(userInfo)
+    //       that.setData({
+    //         userInfo: userInfo,
+    //         hasLogin: true,
+    //         isAuthInfo: true,
+    //         activeItem:userInfo.userType=='CUSTOMER'?'boss':'anchor',
+    //       });
+    //       that.getIndexData();
+    //     }
+    //   }else{
+    //     console.log(res.data);
+    //   }
+    // }).catch(()=>{
+    //     wx.navigateTo({
+    //       url: "/pages/auth/authorization/authorization"
+    //     });
+    // });
+    that.getIndexData();
+    let menuButtonInfo = wx.getMenuButtonBoundingClientRect();
+    
+    // 计算菜单的位置
+    let menuTop = menuButtonInfo.top; // 胶囊按钮顶部位置
+    let menuHeight = menuButtonInfo.height; // 胶囊按钮高度
+    let statusBarHeight = wx.getSystemInfoSync().statusBarHeight; // 状态栏高度
+    let gap = menuTop - statusBarHeight + 5; // 胶囊按钮顶部距离状态栏底部的距离
+
+    // 设置菜单的位置
+    this.setData({
+      menuHeight: gap + menuHeight + 'px',
+      // list:this.data.activeItem == 'boss'?this.data.joblist:this.data.anchorList
+    });
+  },
+  onHide: function() {
+    // 页面隐藏
+  },
+  onUnload: function() {
+    // 页面关闭
+  },
+  getCoupon(e) {
+    let couponId = e.currentTarget.dataset.index
+    util.request(api.CouponReceive, {
+      couponId: couponId
+    }, 'POST').then(res => {
+      if (res.errno === 0) {
+        wx.showToast({
+          title: "领取成功"
+        })
+      }
+      else{
+        util.showErrorToast(res.errmsg);
+      }
+    })
+  },
 })
\ No newline at end of file
diff --git a/litemall-wx/pages/index/index.json b/litemall-wx/pages/index/index.json
index 910c6fb2..4099de1e 100644
--- a/litemall-wx/pages/index/index.json
+++ b/litemall-wx/pages/index/index.json
@@ -1,4 +1,3 @@
-{
-  "navigationBarTitleText": "首页",
-  "enablePullDownRefresh": true
+{
+  "navigationStyle": "custom"
 }
\ No newline at end of file
diff --git a/litemall-wx/pages/index/index.wxml b/litemall-wx/pages/index/index.wxml
index 9aa94141..1999e0aa 100644
--- a/litemall-wx/pages/index/index.wxml
+++ b/litemall-wx/pages/index/index.wxml
@@ -1,198 +1,286 @@
-<!-- index.wxml -->
-<view class="container">
-    <view class="search">
-        <navigator url="/pages/search/search" class="input">
-            <van-icon name="search" />
-            <text class="txt">商品搜索, 共{{goodsCount}}款好物</text>
-        </navigator>
-    </view>
-    <swiper class="banner" indicator-dots="true" autoplay="true" interval="3000" duration="1000">
-        <swiper-item wx:for="{{banner}}" wx:key="id">
-            <block wx:if="{{item.link>0}}">
-                <navigator url="/pages/goods/goods?id={{item.link}}">
-                    <image src="{{item.url}}" background-size="cover"></image>
-                </navigator>
-            </block>
-            <block wx:else>
-                <image src="{{item.url}}" background-size="cover"></image>
-            </block>
-        </swiper-item>
-    </swiper>
-    <view class="m-menu">
-        <navigator class="item" url="/pages/category/category?id={{item.id}}" wx:for="{{channel}}" wx:key="id">
-            <image src="{{item.iconUrl}}" background-size="cover"></image>
-            <text>{{item.name}}</text>
-        </navigator>
-    </view>
-    <view class="a-section a-coupon" wx:if="{{coupon.length > 0}}">
-        <view class="h">
-            <view class="title">
-                <view>
-                    <navigator url="/pages/coupon/coupon">
-                        <text class="txt">优惠券</text>
-                    </navigator>
-                </view>
-            </view>
-        </view>
-        <view wx:if="{{coupon.length>0}}" class="b">
-            <view class="coupon_item" wx:for="{{coupon}}" wx:for-index="index" wx:for-item="item" wx:key="id" bindtap="getCoupon" data-index="{{item.id}}">
-                <view class="coupon_price">
-                    <view>
-                        <!-- <view class="tag"></view> -->
-                        <view class="price">{{item.discount}}元</view>
-                        <view class="p">满{{item.min}}元使用</view>
-                    </view>
-                </view>
-                <view class="coupon_msg">
-                    <view class="coupon_condition">
-                        <view class="coupon_tag">
-                            <view class="coupon_tag_text">{{item.tag}}</view>
-                        </view>
-                        <view class="text">{{item.name}}</view>
-                    </view>
-                    <view class="coupon_instruction">{{item.desc}}</view>
-                    <view class="coupon_date" wx:if="{{item.days != 0}}">{{item.days}}天</view>
-                    <view class="coupon_date" wx:else>{{item.startTime}} - {{item.endTime}}</view>
-                </view>
-            </view>
-        </view>
-    </view>
-    <view class="a-section a-groupon" wx:if="{{groupons.length > 0}}">
-        <view class="h">
-            <view class="title">
-                <view>
-                    <navigator url="/pages/groupon/grouponList/grouponList">
-                        <text class="txt">团购专区</text>
-                    </navigator>
-                </view>
-            </view>
-        </view>
-        <view class="b">
-            <view class="item" wx:for="{{groupons}}" wx:for-index="index" wx:for-item="item" wx:key="id">
-                <navigator url="/pages/goods/goods?id={{item.id}}">
-                    <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
-                    <view class="right">
-                        <view class="text">
-                            <view class="header">
-                                <text class="name">{{item.name}}</text>
-                                <van-tag type="primary">{{item.grouponMember}}人成团</van-tag>
-                            </view>
-                            <view class="expire">
-                                <van-tag round type="warning">有效期至 {{item.expireTime}}</van-tag>
-                            </view>
-                            <text class="desc">{{item.brief}}</text>
-                            <view class="price">
-                                <view class="counterPrice">现价：￥{{item.retailPrice}}</view>
-                                <view class="retailPrice">团购价：￥{{item.grouponPrice}}</view>
-                            </view>
-                        </view>
-                    </view>
-                </navigator>
-            </view>
-        </view>
-    </view>
-    <view class="a-section a-brand">
-        <view class="h">
-            <navigator url="../brand/brand">
-                <text class="txt">品牌制造商直供</text>
-            </navigator>
-        </view>
-        <view class="b">
-            <view class="item item-1" wx:for="{{brands}}" wx:key="id">
-                <navigator url="/pages/brandDetail/brandDetail?id={{item.id}}">
-                    <view class="wrap">
-                        <image class="img" src="{{item.picUrl}}" mode="aspectFill"></image>
-                        <view class="mt">
-                            <text class="brand">{{item.name}}</text>
-                            <text class="price">{{item.floorPrice}}</text>
-                            <text class="unit">元起</text>
-                        </view>
-                    </view>
-                </navigator>
-            </view>
-        </view>
-    </view>
-    <view class="a-section a-new" wx:if="{{newGoods.length > 0}}">
-        <view class="h">
-            <view>
-                <navigator url="../newGoods/newGoods">
-                    <text class="txt">周一周四 · 新品首发</text>
-                </navigator>
-            </view>
-        </view>
-        <view class="b">
-            <view class="item" wx:for="{{newGoods}}" wx:for-index="index" wx:for-item="item" wx:key="id">
-                <navigator url="../goods/goods?id={{item.id}}">
-                    <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
-                    <text class="name">{{item.name}}</text>
-                    <text class="price">￥{{item.retailPrice}}</text>
-                </navigator>
-            </view>
-        </view>
-    </view>
-    <view class="a-section a-popular" wx:if="{{hotGoods.length > 0}}">
-        <view class="h">
-            <view>
-                <navigator url="../hotGoods/hotGoods">
-                    <text class="txt">人气推荐</text>
-                </navigator>
-            </view>
-        </view>
-        <view class="b">
-            <view class="item" wx:for="{{hotGoods}}" wx:for-index="index" wx:for-item="item" wx:key="id">
-                <navigator url="/pages/goods/goods?id={{item.id}}">
-                    <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
-                    <view class="right">
-                        <view class="text">
-                            <text class="name">{{item.name}}</text>
-                            <text class="desc">{{item.brief}}</text>
-                            <text class="price">￥{{item.retailPrice}}</text>
-                        </view>
-                    </view>
-                </navigator>
-            </view>
-        </view>
-    </view>
-    <view class="a-section a-topic" wx:if="topics.length > 0" hidden="{{topics.length <= 0}}">
-        <view class="h">
-            <view>
-                <navigator url="/pages/topic/topic">
-                    <text class="txt">专题精选</text>
-                </navigator>
-            </view>
-        </view>
-        <view class="b">
-            <scroll-view scroll-x class="list">
-                <view class="item" wx:for="{{topics}}" wx:for-index="index" wx:for-item="item" wx:key="id">
-                    <navigator url="../topicDetail/topicDetail?id={{item.id}}">
-                        <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
-                        <view class="np">
-                            <text class="name">{{item.title}}</text>
-                            <text class="price">￥{{item.price}}元起</text>
-                        </view>
-                        <text class="desc">{{item.subtitle}}</text>
-                    </navigator>
-                </view>
-            </scroll-view>
-        </view>
-    </view>
-    <view class="good-grid" wx:for="{{floorGoods}}" wx:key="id">
-        <view class="h" wx:if="{{item.goodsList.length>0}}">
-            <text>{{item.name}}</text>
-        </view>
-        <view class="b">
-            <block wx:for="{{item.goodsList}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="id">
-                <view class="item {{iindex % 2 == 0 ? '' : 'item-b'}}">
-                    <navigator url="../goods/goods?id={{iitem.id}}" class="a">
-                        <image class="img" src="{{iitem.picUrl}}" background-size="cover"></image>
-                        <text class="name">{{iitem.name}}</text>
-                        <text class="price">￥{{iitem.retailPrice}}</text>
-                    </navigator>
-                </view>
-            </block>
-        </view>
-        <navigator url="/pages/category/category?id={{item.id}}" class="t" wx:if="{{item.goodsList.length>0}}">
-            <view class="txt">{{'更多'+item.name+'好物 >'}}</view>
-        </navigator>
-    </view>
-</view>
+<!-- index.wxml -->
+<wxs module="m1">
+  var getinclude = function (name) {
+    return name.substring(0, 1) + "✱✱"
+  }
+  module.exports.getinclude = getinclude;
+</wxs>
+<wxs module="m2">
+  var arrslice = function (list) {
+    return list.slice(0, 3)
+  }
+  module.exports.arrslice = arrslice;
+</wxs>
+<view class="container">
+  <!-- 自定义顶部导航栏 -->
+  <view class="container-tab">
+    <view class="container-menu" style="top:{{menuHeight}};">
+      <view class="activeClass" data-menu="boss" wx:if="{{userInfo.userType=='ZB_EMP'}}">职位推荐</view>
+      <view class="activeClass" data-menu="peo" wx:if="{{userInfo.userType=='CUSTOMER'}}">人才推荐</view>
+    </view>
+  </view>
+
+  <!-- 内容区域，用于展示数据 -->
+  <scroll-view class="content" scroll-y="true" refresher-enabled="{{true}}" refresher-triggered="{{triggered}}" bindrefresherrefresh="onRefresh" bindscrolltolower="loadMore">
+    <grid-view wx:if="{{activeItem=='boss'}}" type="masonry" cross-axis-count="2" style="width:97%;overflow:hidden;padding-bottom:160rpx">
+      <view wx:for="{{list}}">
+        <view class="imgover" data-item="{{item}}" bindtap="viewDetails">
+          <view class='item-main item-main_center'>
+            <view class="center">
+              <image class="sexlog" src="{{item.picUrl}}" mode="widthFix"></image>
+              <view class="displyboth">
+                <view>{{item.name}}</view>
+                <image wx:if="{{item.sex =='1'}}" class="sexlogpng" src="./assets/nan.png"></image>
+                <image wx:else class="sexlogpng" src="./assets/nv.png" ></image>
+              </view>
+              <view class="fenxiang"  data-item="{{item}}" catchtap="fenxiang">
+                <image class="sexlogpng"  src="./assets/fenxiang.png" ></image>
+                <button class="fenxiangbtn" open-type="share">分享</button>
+              </view>
+            </view>
+            <view class="shanchang">
+              <view class="shanchangtext">擅长：<text class="item" wx:for="{{m2.arrslice(item.goodCategory)}}" :key="index">{{ item }}</text></view>
+            </view>
+            <view class="shanchang">
+              <view class="list"><text class="item" wx:for="{{m2.arrslice(item.workStyle)}}" :key="index">{{ item }}</text></view>
+            </view>
+          </view>
+          <image src="{{item.gallery[0]}}" style="width:100%"></image>
+          <!-- <image src="{{item.gallery[0]}}" mode="center"></image> -->
+          
+        </view>
+
+
+      </view>
+    </grid-view>
+    <view wx:else style="width:97%;overflow:hidden;padding-bottom:160rpx">
+      <view wx:for="{{list}}">
+        <view class="imgover imgover1" data-item="{{item}}" bindtap="viewDetails">
+          <!-- <image src="{{item.picUrl}}" style="width:100%"></image> -->
+          <!-- <image src="{{item.picUrl}}" mode="widthFix"></image> -->
+          <view class='item-main item-main1'>
+            <view class="both">
+              <view>{{item.name}}</view>
+              <view class="money" wx:if="{{!!item.counterPrice}}">{{item.counterPrice}}</view>
+              <view class="money" wx:else>{{item.retailPrice}}%</view>
+            </view>
+            <view class="company">{{item.topicInfo.title}}</view>
+            <view class="list">
+              <text class="item" wx:for="{{item.workStyle}}" :key="index">{{ item }}</text>
+            </view>
+            <view class="both">
+              <view>
+                <view class="avgboth">
+                  <image class="avgimg" src="{{item.topicInfo.picUrl}}" mode="" />
+                  <view class="contact">
+                    {{ m1.getinclude(item.topicInfo.contact)}} • {{item.topicInfo.contactPost}}
+                  </view>
+                </view>
+                <view>
+                </view>
+              </view>
+              <view>{{item.currentCity}}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+
+    </view>
+  </scroll-view>
+</view>
+<!-- <view class="search">
+        <navigator url="/pages/search/search" class="input">
+            <van-icon name="search" />
+            <text class="txt">商品搜索, 共{{goodsCount}}款好物</text>
+        </navigator>
+    </view>
+    <swiper class="banner" indicator-dots="true" autoplay="true" interval="3000" duration="1000">
+        <swiper-item wx:for="{{banner}}" wx:key="id">
+            <block wx:if="{{item.link>0}}">
+                <navigator url="/pages/goods/goods?id={{item.link}}">
+                    <image src="{{item.url}}" background-size="cover"></image>
+                </navigator>
+            </block>
+            <block wx:else>
+                <image src="{{item.url}}" background-size="cover"></image>
+            </block>
+        </swiper-item>
+    </swiper>
+    <view class="m-menu">
+        <navigator class="item" url="/pages/category/category?id={{item.id}}" wx:for="{{channel}}" wx:key="id">
+            <image src="{{item.iconUrl}}" background-size="cover"></image>
+            <text>{{item.name}}</text>
+        </navigator>
+    </view>
+    <view class="a-section a-coupon" wx:if="{{coupon.length > 0}}">
+        <view class="h">
+            <view class="title">
+                <view>
+                    <navigator url="/pages/coupon/coupon">
+                        <text class="txt">优惠券</text>
+                    </navigator>
+                </view>
+            </view>
+        </view>
+        <view wx:if="{{coupon.length>0}}" class="b">
+            <view class="coupon_item" wx:for="{{coupon}}" wx:for-index="index" wx:for-item="item" wx:key="id" bindtap="getCoupon" data-index="{{item.id}}">
+                <view class="coupon_price">
+                    <view>
+                        <view class="tag"></view>
+                        <view class="price">{{item.discount}}元</view>
+                        <view class="p">满{{item.min}}元使用</view>
+                    </view>
+                </view>
+                <view class="coupon_msg">
+                    <view class="coupon_condition">
+                        <view class="coupon_tag">
+                            <view class="coupon_tag_text">{{item.tag}}</view>
+                        </view>
+                        <view class="text">{{item.name}}</view>
+                    </view>
+                    <view class="coupon_instruction">{{item.desc}}</view>
+                    <view class="coupon_date" wx:if="{{item.days != 0}}">{{item.days}}天</view>
+                    <view class="coupon_date" wx:else>{{item.startTime}} - {{item.endTime}}</view>
+                </view>
+            </view>
+        </view>
+    </view>
+    <view class="a-section a-groupon" wx:if="{{groupons.length > 0}}">
+        <view class="h">
+            <view class="title">
+                <view>
+                    <navigator url="/pages/groupon/grouponList/grouponList">
+                        <text class="txt">团购专区</text>
+                    </navigator>
+                </view>
+            </view>
+        </view>
+        <view class="b">
+            <view class="item" wx:for="{{groupons}}" wx:for-index="index" wx:for-item="item" wx:key="id">
+                <navigator url="/pages/goods/goods?id={{item.id}}">
+                    <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
+                    <view class="right">
+                        <view class="text">
+                            <view class="header">
+                                <text class="name">{{item.name}}</text>
+                                <van-tag type="primary">{{item.grouponMember}}人成团</van-tag>
+                            </view>
+                            <view class="expire">
+                                <van-tag round type="warning">有效期至 {{item.expireTime}}</van-tag>
+                            </view>
+                            <text class="desc">{{item.brief}}</text>
+                            <view class="price">
+                                <view class="counterPrice">现价：￥{{item.retailPrice}}</view>
+                                <view class="retailPrice">团购价：￥{{item.grouponPrice}}</view>
+                            </view>
+                        </view>
+                    </view>
+                </navigator>
+            </view>
+        </view>
+    </view>
+    <view class="a-section a-brand">
+        <view class="h">
+            <navigator url="../brand/brand">
+                <text class="txt">品牌制造商直供</text>
+            </navigator>
+        </view>
+        <view class="b">
+            <view class="item item-1" wx:for="{{brands}}" wx:key="id">
+                <navigator url="/pages/brandDetail/brandDetail?id={{item.id}}">
+                    <view class="wrap">
+                        <image class="img" src="{{item.picUrl}}" mode="aspectFill"></image>
+                        <view class="mt">
+                            <text class="brand">{{item.name}}</text>
+                            <text class="price">{{item.floorPrice}}</text>
+                            <text class="unit">元起</text>
+                        </view>
+                    </view>
+                </navigator>
+            </view>
+        </view>
+    </view>
+    <view class="a-section a-new" wx:if="{{newGoods.length > 0}}">
+        <view class="h">
+            <view>
+                <navigator url="../newGoods/newGoods">
+                    <text class="txt">周一周四 · 新品首发</text>
+                </navigator>
+            </view>
+        </view>
+        <view class="b">
+            <view class="item" wx:for="{{newGoods}}" wx:for-index="index" wx:for-item="item" wx:key="id">
+                <navigator url="../goods/goods?id={{item.id}}">
+                    <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
+                    <text class="name">{{item.name}}</text>
+                    <text class="price">￥{{item.retailPrice}}</text>
+                </navigator>
+            </view>
+        </view>
+    </view>
+    <view class="a-section a-popular" wx:if="{{hotGoods.length > 0}}">
+        <view class="h">
+            <view>
+                <navigator url="../hotGoods/hotGoods">
+                    <text class="txt">人气推荐</text>
+                </navigator>
+            </view>
+        </view>
+        <view class="b">
+            <view class="item" wx:for="{{hotGoods}}" wx:for-index="index" wx:for-item="item" wx:key="id">
+                <navigator url="/pages/goods/goods?id={{item.id}}">
+                    <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
+                    <view class="right">
+                        <view class="text">
+                            <text class="name">{{item.name}}</text>
+                            <text class="desc">{{item.brief}}</text>
+                            <text class="price">￥{{item.retailPrice}}</text>
+                        </view>
+                    </view>
+                </navigator>
+            </view>
+        </view>
+    </view>
+    <view class="a-section a-topic" wx:if="topics.length > 0" hidden="{{topics.length <= 0}}">
+        <view class="h">
+            <view>
+                <navigator url="/pages/topic/topic">
+                    <text class="txt">专题精选</text>
+                </navigator>
+            </view>
+        </view>
+        <view class="b">
+            <scroll-view scroll-x class="list">
+                <view class="item" wx:for="{{topics}}" wx:for-index="index" wx:for-item="item" wx:key="id">
+                    <navigator url="../topicDetail/topicDetail?id={{item.id}}">
+                        <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
+                        <view class="np">
+                            <text class="name">{{item.title}}</text>
+                            <text class="price">￥{{item.price}}元起</text>
+                        </view>
+                        <text class="desc">{{item.subtitle}}</text>
+                    </navigator>
+                </view>
+            </scroll-view>
+        </view>
+    </view>
+    <view class="good-grid" wx:for="{{floorGoods}}" wx:key="id">
+        <view class="h" wx:if="{{item.goodsList.length>0}}">
+            <text>{{item.name}}</text>
+        </view>
+        <view class="b">
+            <block wx:for="{{item.goodsList}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="id">
+                <view class="item {{iindex % 2 == 0 ? '' : 'item-b'}}">
+                    <navigator url="../goods/goods?id={{iitem.id}}" class="a">
+                        <image class="img" src="{{iitem.picUrl}}" background-size="cover"></image>
+                        <text class="name">{{iitem.name}}</text>
+                        <text class="price">￥{{iitem.retailPrice}}</text>
+                    </navigator>
+                </view>
+            </block>
+        </view>
+        <navigator url="/pages/category/category?id={{item.id}}" class="t" wx:if="{{item.goodsList.length>0}}">
+            <view class="txt">{{'更多'+item.name+'好物 >'}}</view>
+        </navigator>
+    </view> -->
+<!-- </view> -->
\ No newline at end of file
diff --git a/litemall-wx/pages/index/index.wxss b/litemall-wx/pages/index/index.wxss
index 979f29fb..ebb3aa96 100644
--- a/litemall-wx/pages/index/index.wxss
+++ b/litemall-wx/pages/index/index.wxss
@@ -1,565 +1,714 @@
-.banner {
-  width: 750rpx;
-  height: 417rpx;
-}
-
-.banner image {
-  width: 100%;
-  height: 417rpx;
-}
-
-.m-menu {
-  background: #fff;
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  padding-bottom: 0rpx;
-  padding-top: 25rpx;
-}
-
-.m-menu .item {
-  width: 150rpx;
-  height: 126rpx;
-}
-
-.m-menu image {
-  display: block;
-  width: 58rpx;
-  height: 58rpx;
-  margin: 0 auto;
-  margin-bottom: 12rpx;
-}
-
-.m-menu text {
-  display: block;
-  font-size: 24rpx;
-  text-align: center;
-  margin: 0 auto;
-  line-height: 1;
-  color: #333;
-}
-
-.a-section {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-  background: #fff;
-  color: #333;
-  margin-top: 20rpx;
-}
-
-.a-section .h {
-  display: flex;
-  flex-flow: row nowrap;
-  align-items: center;
-  justify-content: center;
-  height: 130rpx;
-}
-
-.a-section .h .txt {
-  padding-right: 30rpx;
-  background-size: 16.656rpx 27rpx;
-  display: inline-block;
-  height: 36rpx;
-  font-size: 33rpx;
-  line-height: 36rpx;
-}
-
-.a-brand .b {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-  position: relative;
-}
-
-.a-brand .wrap {
-  position: relative;
-}
-
-.a-brand .img {
-  position: absolute;
-  left: 0;
-  top: 0;
-}
-
-.a-brand .mt {
-  position: absolute;
-  z-index: 2;
-  padding: 27rpx 31rpx;
-  left: 0;
-  top: 0;
-}
-
-.a-brand .mt .brand {
-  display: block;
-  font-size: 33rpx;
-  height: 43rpx;
-  color: #fff;
-}
-
-.a-brand .mt .price, .a-brand .mt .unit {
-  font-size: 25rpx;
-  color: #fff;
-}
-
-.a-brand .item-1 {
-  float: left;
-  width: 375rpx;
-  height: 252rpx;
-  overflow: hidden;
-  border-top: 1rpx solid #fff;
-  margin-left: 1rpx;
-}
-
-.a-brand .item-1:nth-child(2n+1) {
-  margin-left: 0;
-  width: 374rpx;
-}
-
-.a-brand .item-1 .img {
-  width: 375rpx;
-  height: 253rpx;
-}
-
-.a-coupon {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-}
-
-.a-groupon {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-}
-
-.a-groupon .b .item {
-  border-top: 1px solid #d9d9d9;
-  margin: 0 20rpx;
-  height: 244rpx;
-  width: 710rpx;
-}
-
-.a-groupon .b .img {
-  margin-top: 12rpx;
-  margin-right: 12rpx;
-  float: left;
-  width: 220rpx;
-  height: 220rpx;
-}
-
-.a-groupon .b .right {
-  float: left;
-  height: 244rpx;
-  width: 476rpx;
-  display: flex;
-  flex-flow: row nowrap;
-}
-
-.a-groupon .b .text {
-  display: flex;
-  flex-wrap: nowrap;
-  flex-direction: column;
-  justify-content: center;
-  overflow: hidden;
-  height: 244rpx;
-  width: 476rpx;
-}
-
-.a-groupon .b .name {
-    float: left;
-    display: block;
-    color: #333;
-    line-height: 50rpx;
-    font-size: 30rpx;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.a-groupon .b .desc {
-  width: 476rpx;
-  display: block;
-  color: #999;
-  line-height: 50rpx;
-  font-size: 25rpx;
-}
-
-.a-groupon .b .price {
-  width: 476rpx;
-  display: flex;
-  color: #ab956d;
-  line-height: 50rpx;
-  font-size: 33rpx;
-}
-
-.a-groupon .b .counterPrice {
-  text-decoration: line-through;
-  font-size: 28rpx;
-  color: #999;
-}
-
-.a-groupon .b .retailPrice {
-  margin-left: 30rpx;
-  font-size: 28rpx;
-  color: #a78845;
-}
-
-.a-new .b {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-  padding: 0 31rpx 45rpx 31rpx;
-}
-
-.a-new .b .item {
-  float: left;
-  width: 302rpx;
-  margin-top: 10rpx;
-  margin-left: 21rpx;
-  margin-right: 21rpx;
-}
-
-.a-new .b .item-b {
-  margin-left: 42rpx;
-}
-
-.a-new .b .img {
-  width: 302rpx;
-  height: 302rpx;
-}
-
-.a-new .b .name {
-  text-align: center;
-  display: block;
-  width: 302rpx;
-  height: 35rpx;
-  margin-bottom: 14rpx;
-  overflow: hidden;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.a-new .b .price {
-  display: block;
-  text-align: center;
-  line-height: 30rpx;
-  font-size: 30rpx;
-  color: #ab956d;
-}
-
-.a-popular {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-}
-
-.a-popular .b .item {
-  border-top: 1px solid #d9d9d9;
-  margin: 0 20rpx;
-  height: 264rpx;
-  width: 710rpx;
-}
-
-.a-popular .b .img {
-  margin-top: 12rpx;
-  margin-right: 12rpx;
-  float: left;
-  width: 240rpx;
-  height: 240rpx;
-}
-
-.a-popular .b .right {
-  float: left;
-  height: 264rpx;
-  width: 456rpx;
-  display: flex;
-  flex-flow: row nowrap;
-}
-
-.a-popular .b .text {
-  display: flex;
-  flex-wrap: nowrap;
-  flex-direction: column;
-  justify-content: center;
-  overflow: hidden;
-  height: 264rpx;
-  width: 456rpx;
-}
-
-.a-popular .b .name {
-  width: 456rpx;
-  display: block;
-  color: #333;
-  line-height: 50rpx;
-  font-size: 30rpx;
-}
-
-.a-popular .b .desc {
-  width: 456rpx;
-  display: block;
-  color: #999;
-  line-height: 50rpx;
-  font-size: 25rpx;
-}
-
-.a-popular .b .price {
-  width: 456rpx;
-  display: block;
-  color: #ab956d;
-  line-height: 50rpx;
-  font-size: 33rpx;
-}
-
-.a-topic .b {
-  height: 533rpx;
-  width: 750rpx;
-  padding: 0 0 48rpx 0;
-}
-
-.a-topic .b .list {
-  height: 533rpx;
-  width: 750rpx;
-  white-space: nowrap;
-}
-
-.a-topic .b .item {
-  display: inline-block;
-  height: 533rpx;
-  width: 680.5rpx;
-  margin-left: 30rpx;
-  overflow: hidden;
-}
-
-.a-topic .b .item:last-child {
-  margin-right: 30rpx;
-}
-
-.a-topic .b .img {
-  height: 387.5rpx;
-  width: 680.5rpx;
-  margin-bottom: 30rpx;
-}
-
-.a-topic .b .np {
-  height: 35rpx;
-  margin-bottom: 13.5rpx;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.a-topic .b .np .price {
-  margin-left: 20.8rpx;
-  color: #ab956d;
-}
-
-.a-topic .b .desc {
-  display: block;
-  height: 30rpx;
-  color: #999;
-  font-size: 24rpx;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.good-grid {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-}
-
-.good-grid .h {
-  display: flex;
-  flex-flow: row nowrap;
-  align-items: center;
-  justify-content: center;
-  height: 130rpx;
-  font-size: 33rpx;
-  color: #333;
-}
-
-.good-grid .b {
-  width: 750rpx;
-  padding: 0 6.25rpx;
-  height: auto;
-  overflow: hidden;
-}
-
-.good-grid .b .item {
-  float: left;
-  background: #fff;
-  width: 365rpx;
-  margin-bottom: 6.25rpx;
-  height: 452rpx;
-  overflow: hidden;
-  text-align: center;
-}
-
-.good-grid .b .item .a {
-  height: 452rpx;
-  width: 100%;
-}
-
-.good-grid .b .item-b {
-  margin-left: 6.25rpx;
-}
-
-.good-grid .item .img {
-  margin-top: 20rpx;
-  width: 302rpx;
-  height: 302rpx;
-}
-
-.good-grid .item .name {
-  display: block;
-  width: 365.625rpx;
-  padding: 0 20rpx;
-  overflow: hidden;
-  height: 35rpx;
-  margin: 11.5rpx 0 22rpx 0;
-  text-align: center;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.good-grid .item .price {
-  display: block;
-  width: 365.625rpx;
-  height: 30rpx;
-  text-align: center;
-  font-size: 30rpx;
-  color: #ab956d;
-}
-
-.good-grid .t {
-  height: 100rpx;
-  background: #fff;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.search {
-  height: 88rpx;
-  width: 100%;
-  padding: 0 30rpx;
-  background: #fff;
-  display: flex;
-  align-items: center;
-}
-
-.search .van-icon-search {
-  line-height: 59rpx;
-}
-
-.search .input {
-  width: 690rpx;
-  height: 56rpx;
-  background: #ededed;
-  border-radius: 8rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.search .txt {
-  height: 42rpx;
-  line-height: 42rpx;
-  color: #666;
-  padding-left: 10rpx;
-  font-size: 30rpx;
-}
-
-/* 优惠券 */
-.coupon_item {
-    position: relative;
-    /* background: linear-gradient(to right, #cfa568, #e3bf79); */
-    background: linear-gradient(136deg,#fdda96 0,#e3ad61 100%);
-    margin: 0 .5rem;
-    margin-bottom: .75rem;
-    display: flex;
-    border-radius: .3rem;
-}
-.coupon_item view {
-    color: #fff;
-}
-
-.coupon_price {
-    display: flex;
-    position: relative;
-    width: 6rem;
-    font-size: .7rem;
-    text-align: center;
-    -webkit-justify-content: center;
-    -ms-flex-pack: center;
-    justify-content: center;
-    -webkit-align-items: center;
-    -ms-flex-align: center;
-    align-items: center;
-    border-radius: .2rem;
-    -webkit-box-shadow: 0 0.1rem 0.4rem 0 rgb(0 0 0 / 5%);
-    box-shadow: 0 0.1rem 0.4rem 0 rgb(0 0 0 / 5%);
-    background: linear-gradient(136deg,#ff8787 0,#fb3636 100%);
-}
-.coupon_price .price{
-    line-height: 1;
-    font-size: 1.8rem;
-}
-.coupon_price .p{
-    margin-top: .25rem;
-    font-size: .6rem;
-    line-height: 1;
-}
-.coupon_msg{
-    flex: 1;
-    overflow: hidden;
-    padding: .3rem 0 0 .35rem;
-}
-.coupon_condition{
-    min-height: 1.8rem;
-    line-height: .95rem;
-    font-size: .6rem;
-    padding-right: .6rem;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    display: -webkit-box;
-    display: -webkit-inline-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-}
-.coupon_condition .text{
-    font-size: 0.8rem;
-    vertical-align: middle;
-    display: inline;
-    user-select: none;
-    white-space: pre-wrap;
-}
-.coupon_tag{
-    display: inline-block;
-    height: .7rem;
-    color: #fff;
-    line-height: .7rem;
-    text-align: center;
-    padding: 0 .25rem;
-    border-radius: .35rem;
-    margin-right: .25rem;
-    border-color: #fe5b5b;
-    background-color: #fe5b5b;
-}
-.coupon_tag_text{
-    font-size: .5rem;
-}
-.coupon_instruction{
-    min-width: 7.5rem;
-    height: .95rem;
-    line-height: .95rem;
-    padding-right: .6rem;
-    text-overflow: ellipsis;
-    overflow: hidden;
-}
-.coupon_date{
-    font-size: .65rem;
-    /* line-height: .5rem; */
-    padding: .5rem 0;
-    padding-right: .5rem;
-    width: 100%;
-}
+page {
+  height: 100%;
+  width: 100%;
+  background: #fcf7f7;
+}
+::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+  color: transparent;
+}
+.container{
+  padding: 0 20rpx;
+  background: #fcf7f7;
+}
+.container-tab{
+ 
+  width: 100%;
+  height: 160rpx;
+  position: fixed;
+  top: 0rpx;
+  padding-left: 20rpx;
+  left: 0;
+  z-index: 999;
+  background: #fff;
+}
+.container-tab .container-menu{
+  display: flex;
+  position: relative;
+}
+.container-tab .activeClass{
+  font-size: 36rpx;
+  line-height: 36rpx;
+  color: #703EDD;
+}
+
+#mg-left{
+  line-height: 36rpx;
+}
+.container .content{
+  margin-left: -10rpx;
+  margin-right: -10rpx;
+  position: fixed;
+  top: 160rpx;
+  overflow: hidden;
+  height: 100vh;
+}
+.container .content .imgover{
+  overflow: hidden;
+  margin: 10rpx;
+  background-color: #fff;
+  border-bottom-left-radius: 6rpx;
+  border-bottom-right-radius: 6rpx;
+}
+.container .content .imgover1{
+  border-radius: 10rpx;
+  margin-bottom: 20rpx;
+}
+
+.container .content .imgover .item-main{
+  padding: 20rpx;
+}
+.container .content .imgover .item-main .both{
+  display: flex;
+  justify-content: space-between;
+  margin-top: 10rpx;
+}
+.container .content .imgover .item-main .money{
+  color: rgb(16, 185, 236);
+}
+.container .content .imgover .item-main .both .avgimg{
+  width: 50rpx;
+  height: 50rpx;
+  border-radius: 50%;
+}
+.container .content .imgover .item-main .both  .avgboth{
+  
+  display: flex;
+  line-height: 50rpx;
+}
+.container .content .imgover .item-main .both  .avgboth .contact{
+  padding-left: 20rpx;
+  font-size: 26rpx;
+}
+.container .content .imgover .item-main .company{
+  margin-top: 10rpx;
+  margin-bottom: 10rpx;
+  font-size: 26rpx;
+}
+.container .content .imgover .item-main .sexlog{
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 20rpx;
+}
+.container .content .imgover .item-main .displyboth{
+  padding-left: 30rpx;
+}
+.container .content .imgover .item-main .fenxiang{
+  width: 60rpx;
+  height: 60rpx;
+  position: absolute;
+  top: 30rpx;
+  right: 10rpx;
+}
+.container .content .imgover .item-main .fenxiang .fenxiangbtn{
+  width: 60rpx;
+  height: 60rpx;
+  border: none !important;
+  background-color: none !important;
+  opacity: 0;
+}
+.container .content .imgover .item-main .fenxiang .sexlogpng{
+  position: absolute;
+  top: 0rpx;
+  width: 40rpx;
+}
+.container .content .imgover .item-main .sexlogpng{
+  padding-top: 5rpx;
+  width: 35rpx;
+  height: 35rpx;
+}
+.container .content .imgover .item-main_center{
+}
+.container .content .imgover .item-main_center .center{
+  display: flex;
+  align-items: center;
+  padding-bottom: 20rpx;
+}
+.container .content .imgover .item-main_center .shanchang .shanchangtext{
+  font-size: 22rpx;
+}
+.container .content .imgover .item-main_center .shanchang .shanchangtext .item{
+  font-size: 20rpx;
+}
+.container .content .imgover .item-main_center .shanchang .list .item{
+  font-size: 20rpx;
+}
+.container .content .imgover .item-main_center text{
+  padding-left: 20rpx;
+}
+.container .content .imgover .item-main .list .item{
+  font-size: 26rpx;
+    display: inline-block;
+    padding: 8rpx 16rpx;
+    line-height: 30rpx;
+    margin: 10rpx;
+    border-radius: 8rpx;
+    background-color: #fcf7f7;
+    margin-left: 0;
+}
+.banner {
+  width: 750rpx;
+  height: 417rpx;
+}
+
+.banner image {
+  width: 100%;
+  height: 417rpx;
+}
+
+.m-menu {
+  background: #fff;
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  padding-bottom: 0rpx;
+  padding-top: 25rpx;
+}
+
+.m-menu .item {
+  width: 150rpx;
+  height: 126rpx;
+}
+
+.m-menu image {
+  display: block;
+  width: 58rpx;
+  height: 58rpx;
+  margin: 0 auto;
+  margin-bottom: 12rpx;
+}
+
+.m-menu text {
+  display: block;
+  font-size: 24rpx;
+  text-align: center;
+  margin: 0 auto;
+  line-height: 1;
+  color: #333;
+}
+
+.a-section {
+  width: 750rpx;
+  height: auto;
+  overflow: hidden;
+  background: #fff;
+  color: #333;
+  margin-top: 20rpx;
+}
+
+.a-section .h {
+  display: flex;
+  flex-flow: row nowrap;
+  align-items: center;
+  justify-content: center;
+  height: 130rpx;
+}
+
+.a-section .h .txt {
+  padding-right: 30rpx;
+  background-size: 16.656rpx 27rpx;
+  display: inline-block;
+  height: 36rpx;
+  font-size: 33rpx;
+  line-height: 36rpx;
+}
+
+.a-brand .b {
+  width: 750rpx;
+  height: auto;
+  overflow: hidden;
+  position: relative;
+}
+
+.a-brand .wrap {
+  position: relative;
+}
+
+.a-brand .img {
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+
+.a-brand .mt {
+  position: absolute;
+  z-index: 2;
+  padding: 27rpx 31rpx;
+  left: 0;
+  top: 0;
+}
+
+.a-brand .mt .brand {
+  display: block;
+  font-size: 33rpx;
+  height: 43rpx;
+  color: #fff;
+}
+
+.a-brand .mt .price, .a-brand .mt .unit {
+  font-size: 25rpx;
+  color: #fff;
+}
+
+.a-brand .item-1 {
+  float: left;
+  width: 375rpx;
+  height: 252rpx;
+  overflow: hidden;
+  border-top: 1rpx solid #fff;
+  margin-left: 1rpx;
+}
+
+.a-brand .item-1:nth-child(2n+1) {
+  margin-left: 0;
+  width: 374rpx;
+}
+
+.a-brand .item-1 .img {
+  width: 375rpx;
+  height: 253rpx;
+}
+
+.a-coupon {
+  width: 750rpx;
+  height: auto;
+  overflow: hidden;
+}
+
+.a-groupon {
+  width: 750rpx;
+  height: auto;
+  overflow: hidden;
+}
+
+.a-groupon .b .item {
+  border-top: 1px solid #d9d9d9;
+  margin: 0 20rpx;
+  height: 244rpx;
+  width: 710rpx;
+}
+
+.a-groupon .b .img {
+  margin-top: 12rpx;
+  margin-right: 12rpx;
+  float: left;
+  width: 220rpx;
+  height: 220rpx;
+}
+
+.a-groupon .b .right {
+  float: left;
+  height: 244rpx;
+  width: 476rpx;
+  display: flex;
+  flex-flow: row nowrap;
+}
+
+.a-groupon .b .text {
+  display: flex;
+  flex-wrap: nowrap;
+  flex-direction: column;
+  justify-content: center;
+  overflow: hidden;
+  height: 244rpx;
+  width: 476rpx;
+}
+
+.a-groupon .b .name {
+    float: left;
+    display: block;
+    color: #333;
+    line-height: 50rpx;
+    font-size: 30rpx;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.a-groupon .b .desc {
+  width: 476rpx;
+  display: block;
+  color: #999;
+  line-height: 50rpx;
+  font-size: 25rpx;
+}
+
+.a-groupon .b .price {
+  width: 476rpx;
+  display: flex;
+  color: #ab956d;
+  line-height: 50rpx;
+  font-size: 33rpx;
+}
+
+.a-groupon .b .counterPrice {
+  text-decoration: line-through;
+  font-size: 28rpx;
+  color: #999;
+}
+
+.a-groupon .b .retailPrice {
+  margin-left: 30rpx;
+  font-size: 28rpx;
+  color: #a78845;
+}
+
+.a-new .b {
+  width: 750rpx;
+  height: auto;
+  overflow: hidden;
+  padding: 0 31rpx 45rpx 31rpx;
+}
+
+.a-new .b .item {
+  float: left;
+  width: 302rpx;
+  margin-top: 10rpx;
+  margin-left: 21rpx;
+  margin-right: 21rpx;
+}
+
+.a-new .b .item-b {
+  margin-left: 42rpx;
+}
+
+.a-new .b .img {
+  width: 302rpx;
+  height: 302rpx;
+}
+
+.a-new .b .name {
+  text-align: center;
+  display: block;
+  width: 302rpx;
+  height: 35rpx;
+  margin-bottom: 14rpx;
+  overflow: hidden;
+  font-size: 30rpx;
+  color: #333;
+}
+
+.a-new .b .price {
+  display: block;
+  text-align: center;
+  line-height: 30rpx;
+  font-size: 30rpx;
+  color: #ab956d;
+}
+
+.a-popular {
+  width: 750rpx;
+  height: auto;
+  overflow: hidden;
+}
+
+.a-popular .b .item {
+  border-top: 1px solid #d9d9d9;
+  margin: 0 20rpx;
+  height: 264rpx;
+  width: 710rpx;
+}
+
+.a-popular .b .img {
+  margin-top: 12rpx;
+  margin-right: 12rpx;
+  float: left;
+  width: 240rpx;
+  height: 240rpx;
+}
+
+.a-popular .b .right {
+  float: left;
+  height: 264rpx;
+  width: 456rpx;
+  display: flex;
+  flex-flow: row nowrap;
+}
+
+.a-popular .b .text {
+  display: flex;
+  flex-wrap: nowrap;
+  flex-direction: column;
+  justify-content: center;
+  overflow: hidden;
+  height: 264rpx;
+  width: 456rpx;
+}
+
+.a-popular .b .name {
+  width: 456rpx;
+  display: block;
+  color: #333;
+  line-height: 50rpx;
+  font-size: 30rpx;
+}
+
+.a-popular .b .desc {
+  width: 456rpx;
+  display: block;
+  color: #999;
+  line-height: 50rpx;
+  font-size: 25rpx;
+}
+
+.a-popular .b .price {
+  width: 456rpx;
+  display: block;
+  color: #ab956d;
+  line-height: 50rpx;
+  font-size: 33rpx;
+}
+
+.a-topic .b {
+  height: 533rpx;
+  width: 750rpx;
+  padding: 0 0 48rpx 0;
+}
+
+.a-topic .b .list {
+  height: 533rpx;
+  width: 750rpx;
+  white-space: nowrap;
+}
+
+.a-topic .b .item {
+  display: inline-block;
+  height: 533rpx;
+  width: 680.5rpx;
+  margin-left: 30rpx;
+  overflow: hidden;
+}
+
+.a-topic .b .item:last-child {
+  margin-right: 30rpx;
+}
+
+.a-topic .b .img {
+  height: 387.5rpx;
+  width: 680.5rpx;
+  margin-bottom: 30rpx;
+}
+
+.a-topic .b .np {
+  height: 35rpx;
+  margin-bottom: 13.5rpx;
+  color: #333;
+  font-size: 30rpx;
+}
+
+.a-topic .b .np .price {
+  margin-left: 20.8rpx;
+  color: #ab956d;
+}
+
+.a-topic .b .desc {
+  display: block;
+  height: 30rpx;
+  color: #999;
+  font-size: 24rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.good-grid {
+  width: 750rpx;
+  height: auto;
+  overflow: hidden;
+}
+
+.good-grid .h {
+  display: flex;
+  flex-flow: row nowrap;
+  align-items: center;
+  justify-content: center;
+  height: 130rpx;
+  font-size: 33rpx;
+  color: #333;
+}
+
+.good-grid .b {
+  width: 750rpx;
+  padding: 0 6.25rpx;
+  height: auto;
+  overflow: hidden;
+}
+
+.good-grid .b .item {
+  float: left;
+  background: #fff;
+  width: 365rpx;
+  margin-bottom: 6.25rpx;
+  height: 452rpx;
+  overflow: hidden;
+  text-align: center;
+}
+
+.good-grid .b .item .a {
+  height: 452rpx;
+  width: 100%;
+}
+
+.good-grid .b .item-b {
+  margin-left: 6.25rpx;
+}
+
+.good-grid .item .img {
+  margin-top: 20rpx;
+  width: 302rpx;
+  height: 302rpx;
+}
+
+.good-grid .item .name {
+  display: block;
+  width: 365.625rpx;
+  padding: 0 20rpx;
+  overflow: hidden;
+  height: 35rpx;
+  margin: 11.5rpx 0 22rpx 0;
+  text-align: center;
+  font-size: 30rpx;
+  color: #333;
+}
+
+.good-grid .item .price {
+  display: block;
+  width: 365.625rpx;
+  height: 30rpx;
+  text-align: center;
+  font-size: 30rpx;
+  color: #ab956d;
+}
+
+.good-grid .t {
+  height: 100rpx;
+  background: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.search {
+  height: 88rpx;
+  width: 100%;
+  padding: 0 30rpx;
+  background: #fff;
+  display: flex;
+  align-items: center;
+}
+
+.search .van-icon-search {
+  line-height: 59rpx;
+}
+
+.search .input {
+  width: 690rpx;
+  height: 56rpx;
+  background: #ededed;
+  border-radius: 8rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.search .txt {
+  height: 42rpx;
+  line-height: 42rpx;
+  color: #666;
+  padding-left: 10rpx;
+  font-size: 30rpx;
+}
+
+/* 优惠券 */
+.coupon_item {
+    position: relative;
+    /* background: linear-gradient(to right, #cfa568, #e3bf79); */
+    background: linear-gradient(136deg,#fdda96 0,#e3ad61 100%);
+    margin: 0 .5rem;
+    margin-bottom: .75rem;
+    display: flex;
+    border-radius: .3rem;
+}
+.coupon_item view {
+    color: #fff;
+}
+
+.coupon_price {
+    display: flex;
+    position: relative;
+    width: 6rem;
+    font-size: .7rem;
+    text-align: center;
+    -webkit-justify-content: center;
+    -ms-flex-pack: center;
+    justify-content: center;
+    -webkit-align-items: center;
+    -ms-flex-align: center;
+    align-items: center;
+    border-radius: .2rem;
+    -webkit-box-shadow: 0 0.1rem 0.4rem 0 rgb(0 0 0 / 5%);
+    box-shadow: 0 0.1rem 0.4rem 0 rgb(0 0 0 / 5%);
+    background: linear-gradient(136deg,#ff8787 0,#fb3636 100%);
+}
+.coupon_price .price{
+    line-height: 1;
+    font-size: 1.8rem;
+}
+.coupon_price .p{
+    margin-top: .25rem;
+    font-size: .6rem;
+    line-height: 1;
+}
+.coupon_msg{
+    flex: 1;
+    overflow: hidden;
+    padding: .3rem 0 0 .35rem;
+}
+.coupon_condition{
+    min-height: 1.8rem;
+    line-height: .95rem;
+    font-size: .6rem;
+    padding-right: .6rem;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    display: -webkit-box;
+    display: -webkit-inline-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+}
+.coupon_condition .text{
+    font-size: 0.8rem;
+    vertical-align: middle;
+    display: inline;
+    user-select: none;
+    white-space: pre-wrap;
+}
+.coupon_tag{
+    display: inline-block;
+    height: .7rem;
+    color: #fff;
+    line-height: .7rem;
+    text-align: center;
+    padding: 0 .25rem;
+    border-radius: .35rem;
+    margin-right: .25rem;
+    border-color: #fe5b5b;
+    background-color: #fe5b5b;
+}
+.coupon_tag_text{
+    font-size: .5rem;
+}
+.coupon_instruction{
+    min-width: 7.5rem;
+    height: .95rem;
+    line-height: .95rem;
+    padding-right: .6rem;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+.coupon_date{
+    font-size: .65rem;
+    /* line-height: .5rem; */
+    padding: .5rem 0;
+    padding-right: .5rem;
+    width: 100%;
+}
diff --git a/litemall-wx/pages/information/assets/mom.png b/litemall-wx/pages/information/assets/mom.png
new file mode 100644
index 0000000000000000000000000000000000000000..b29aba7b24f26ddc74489a025508580854d563b2
GIT binary patch
literal 7035
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
WVSASi;=a448bA%DjjUF*!u%ghoC=%(

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/information/assets/sex.png b/litemall-wx/pages/information/assets/sex.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a619da42f9f1869f3ac097298f2f5c3ce5c5696
GIT binary patch
literal 11453
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
X!j9E=7f<?J00000NkvXXu0mjfhf1QY

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/information/information.js b/litemall-wx/pages/information/information.js
new file mode 100644
index 00000000..7bed8321
--- /dev/null
+++ b/litemall-wx/pages/information/information.js
@@ -0,0 +1,149 @@
+// pages/information/information.js
+const util = require('../../utils/util.js');
+const api = require('../../config/api.js');
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    data:{},
+    age:'',
+    userHasCollect:0,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function(options) {
+    console.log('options',options)
+    // 页面初始化 options为页面跳转所带来的参数
+    var that = this;
+    that.setData({
+      id: options.id
+    });
+    this.getdetial()
+    // util.request(api.TopicRelated, {
+    //   id: that.data.id
+    // }).then(function(res) {
+    //   if (res.errno === 0) {
+    //     that.setData({
+    //       topicList: res.data.list
+    //     });
+    //   }
+    // });
+  },
+  getdetial: function () {
+    var that = this;
+    util.request(api.GoodsDetail, {
+      id: that.data.id
+    }).then(function(res) {
+      if (res.errno === 0) {
+        that.setData({
+          data: res.data.info,
+          userHasCollect: res.data.userHasCollect
+        });
+        that.calculateAge(res.data.info.birthday)
+      }
+    });
+  },
+  imgPreview: function (e) {
+    console.log(e)
+    var current = e.target.dataset.src;
+    wx.previewImage({
+      current: current, // 当前显示图片的http链接
+      urls: this.data.data.gallery // 需要预览的图片http链接列表
+    })
+  },
+  calculateAge(birthdate) {
+      const today = new Date();
+      const birthDate = new Date(birthdate);
+      let age = today.getFullYear() - birthDate.getFullYear();
+      const monthDiff = today.getMonth() - birthDate.getMonth();
+
+      // 如果当前月份小于出生月份，或者当前月份等于出生月份但是日期小于出生日期，则年龄减一
+      if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < birthDate.getDate())) {
+          age--;
+      }
+      this.setData({
+        age:age||'无'
+      });
+  },
+  addCollectOrNot: function() {
+    let that = this;
+    util.request(api.CollectAddOrDelete, {
+        type: 0,
+        valueId: this.data.id
+      }, "POST")
+      .then(function(res) {
+        if (that.data.userHasCollect == 1) {
+          that.setData({
+            userHasCollect: 0
+          });
+        } else {
+          that.setData({
+            userHasCollect: 1
+          });
+        }
+
+      });
+
+  },
+  viewdevi(){
+    let str = ''
+    wx.navigateTo({
+      url: "/pages/represent/represent?data="+encodeURIComponent(str)
+    });
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+    console.log(this.data.id)
+    if (!!this.data.id) {
+      this.getdetial()
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/litemall-wx/pages/information/information.json b/litemall-wx/pages/information/information.json
new file mode 100644
index 00000000..8835af06
--- /dev/null
+++ b/litemall-wx/pages/information/information.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/information/information.wxml b/litemall-wx/pages/information/information.wxml
new file mode 100644
index 00000000..8a1b2cff
--- /dev/null
+++ b/litemall-wx/pages/information/information.wxml
@@ -0,0 +1,70 @@
+
+<view class="con">
+    <view class="login"></view>
+    <view class="blg">
+      <view class="login-form">
+        <view class="moon">
+          <image class="img" src="{{data.picUrl}}" alt="" />
+          <text>{{data.name}}</text>
+        </view>
+        <view class="main">
+          <view class="accounts">
+            <view>{{age}}</view>
+            <view>{{data.sex =='1'?'男':'女'}}</view>
+            <view>{{data.workWay}}</view>
+          </view>
+          <view class="chine">
+            <view>年龄</view>
+            <view>性别</view>
+            <view>工作方式</view>
+          </view>
+        </view>
+      </view>
+      <view class="login-form">
+        <view class="main1">
+          <view class="title">
+            个人优势
+          </view>
+          <view class="list">
+            <view class="item" wx:for="{{ data.goodCategory }}" wx:key="index" wx:for-item="item">{{item}}</view>
+          </view>
+        </view>
+      </view>
+      <view class="login-form">
+        <view class="main1">
+          <view class="title">
+            个人介绍
+          </view>
+          <view class="lei">
+            图片
+          </view>
+          <view class="pic" >
+             <view class="u-col-5 imgitem picimg" wx:for="{{ data.gallery }}"  wx:for-item="item" >
+              <!-- <video style="width: 100%; height: 100%;" controls object-fit='cover' :key="index" src="{{item}}" :poster="item.thumbTempFilePath" enable-play-gesture="true"></video> -->
+              <image class="picimg1" src="{{item}}" data-src="{{item}}" bindtap="imgPreview" />
+            </view>
+          </view>
+          <view class="lei">
+            视频
+          </view>
+          <view class="pic" >
+            <!-- bindtap="viewdevi" -->
+            <view class="u-col-5 imgitem picimg" wx:for="{{ data.videoUrl }}"  wx:for-item="item" >
+              <video style="width: 100%; height: 100%;" controls object-fit='cover' :key="index" src="{{item}}" :poster="item.thumbTempFilePath" enable-play-gesture="true"></video>
+            </view>
+            <!-- <image class="picimg" src="https://img0.baidu.com/it/u=2262081063,1117742187&fm=253&fmt=auto&app=120&f=JPEG?w=608&h=356" mode="center"/>
+            <view class="play"></view>
+            <van-icon name="play" size="32" color='#FFF' custom-class="customicon" /> -->
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <view class="bottombtn">
+    <view class="right_btn">
+      <van-icon name="star" size="32" color="{{userHasCollect==1?'#703EDD':''}}" bindtap="addCollectOrNot" />
+        <!-- <view class="btn">
+            立即沟通
+        </view> -->
+    </view>
+</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/information/information.wxss b/litemall-wx/pages/information/information.wxss
new file mode 100644
index 00000000..4ec681c7
--- /dev/null
+++ b/litemall-wx/pages/information/information.wxss
@@ -0,0 +1,349 @@
+.con {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  top: 0;
+  right: 0;
+  background: #703EDD;
+  padding-top: 200rpx;
+}
+
+.con .login {
+  text-align: center;
+  font-size: 60rpx;
+  color: #fff;
+}
+
+.blg {
+  margin-top: 80rpx;
+  padding-bottom: 100rpx;
+  background-color: #eeecec;
+  border-top-left-radius: 80rpx;
+  border-top-right-radius: 80rpx;
+}
+
+image {
+  
+}
+
+.login-form {
+  width: 90%;
+  padding-bottom: 60rpx;
+  margin: 0 auto;
+  border-radius: 40rpx;
+  position: relative;
+  top: -50rpx;
+  background-color: #fff;
+  margin-bottom: 30rpx;
+}
+.login-form .main1{
+  padding: 30rpx;
+}
+.login-form .main1 .lei{
+  padding: 30rpx 0;
+  font-weight: 600;
+}
+.login-form .main1 .pic{
+  /* width: 240rpx;
+  height: 340rpx; */
+  position: relative;
+  display: flex;
+  justify-content: flex-start;
+}
+.login-form .main1 .pic .play{
+  position: absolute;
+  left: 50%;
+  top:50%;
+  transform: translate(-50%,-50%);
+  width: 60rpx;
+  height: 60rpx;
+  background-color: #000;
+  opacity: 0.2;
+  color: #FFF;
+  border-radius: 50% ;
+}
+
+.login-form .main1 .pic  .van-icon-play{
+  position: absolute;
+  left: 50%;
+  top:50%;
+  transform: translate(-50%,-50%);
+}
+
+.login-form .main1 .pic .picimg{
+  width: 240rpx;
+  height: 340rpx;
+  margin: 0 10rpx;
+}
+.login-form .main1 .pic .picimg1{
+  width: 100%;
+  height: 100%;
+}
+.login-form .main1 .list {
+  display: flex;
+  margin-top: 30rpx;
+  flex-wrap: wrap;
+}
+.login-form .main1 .list .item{
+  width: 100rpx;
+  height: 100rpx;
+  margin-right: 50rpx;
+  min-width: 100rpx;
+  background-color: #00aaff;
+  border-radius: 50%;
+  text-align: center;
+  font-size: 18rpx;
+  color: #fff;
+  line-height: 100rpx;
+}
+.login-form .main1 .title{
+  padding-bottom: 20rpx;
+  border-bottom: 2rpx rgb(247, 242, 242) solid;
+}
+.login-form .moon{
+  display: flex;
+  justify-self: start;
+  padding: 40rpx;
+  padding-bottom: 0;
+}
+.login-form .moon .img{
+  display: block;
+  width: 130rpx;
+  height: 130rpx;
+  border-radius: 50%;
+  width: 150rpx;
+  height: 150rpx;
+  margin-bottom: 8%;
+}
+.login-form .moon text{
+  padding-left: 30rpx;
+  padding-top: 20rpx;
+}
+.login-form .main{
+  padding: 0 60rpx;
+}
+.login-form .main .chine{
+  display: flex;
+  justify-content: space-between;
+  line-height: 40rpx;
+}
+.login-form .main .accounts{
+  display: flex;
+  justify-content: space-between;
+  line-height: 60rpx;
+  font-weight: 600;
+}
+
+
+.active {
+  display:inline-block;
+  margin-top: 20rpx;
+  font-size: 26rpx;
+  width: 100rpx;
+  height: 46rpx;
+  line-height: 46rpx;
+  border-radius: 32rpx;
+  color: #703EDD;
+  border: 1px solid #703EDD !important;
+}
+
+.authorized-btn {
+  width: 90%;
+  margin: 0 auto;
+  border-radius: 40rpx;
+  text-align: center;
+  background-color: #703EDD;
+  border: 1rpx solid #703EDD;
+  color: #fff;
+  font-size: 26rpx;
+  padding: 8rpx;
+  margin-top: 80rpx;
+}
+
+.to-idx-btn {
+  width: 90%;
+  margin: 0 auto;
+  text-align: center;
+  background-color: #eeeeee;
+  color: #333;
+  border-radius: 6rpx;
+  font-size: 26rpx;
+  padding: 8rpx;
+  margin-top: 30rpx;
+}
+
+.form-title {
+  width: 100%;
+  margin-bottom: 50rpx;
+  font-size: 32rpx;
+  text-align: center;
+  color: #00a0e9;
+  margin-bottom: 50rpx;
+  font-size: 32rpx;
+}
+
+.item {
+  display: block;
+  margin-bottom: 30rpx;
+  margin-bottom: 30rpx;
+}
+
+.account {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  background: #f8f8f8;
+  padding: 15rpx;
+  box-sizing: border-box;
+  font-size: 26rpx;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+  align-items: center;
+}
+
+.account input {
+  padding-left: 20rpx;
+  width: 75%;
+  padding-left: 20rpx;
+}
+
+button::after {
+  border: 0 !important;
+}
+
+.operate {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+  justify-content: space-between;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+  align-items: center;
+}
+
+.to-register {
+  font-size: 28rpx;
+  color: #00aaff;
+  font-size: 28rpx;
+}
+
+.error .error-text {
+  display: block;
+  width: 100%;
+  font-size: 28rpx;
+  color: #e43130;
+  text-align: left;
+  margin-top: 10rpx;
+  font-size: 28rpx;
+  margin-top: 10rpx;
+}
+
+.error .error-text .warning-icon {
+  display: inline-block;
+  color: #fff;
+  width: 26rpx;
+  height: 26rpx;
+  line-height: 26rpx;
+  background: #e43130;
+  border-radius: 50%;
+  text-align: center;
+  margin-right: 12rpx;
+  font-size: 22rpx;
+  width: 26rpx;
+  height: 26rpx;
+  line-height: 26rpx;
+  margin-right: 12rpx;
+  font-size: 22rpx;
+}
+.login-box {
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+  padding: 0 40rpx;
+  margin-top: 200rpx;
+  background: #fff;
+}
+
+.wx-login-btn {
+  margin: 60rpx 0 40rpx 0;
+  height: 96rpx;
+  line-height: 96rpx;
+  font-size: 30rpx;
+  border-radius: 6rpx;
+  width: 90%;
+  color: #fff;
+  right: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: flex;
+  bottom: 0;
+  left: 0;
+  padding: 0;
+  margin-left: 5%;
+  text-align: center;
+  /* padding-left: -5rpx; */
+  border-top-left-radius: 50rpx;
+  border-bottom-left-radius: 50rpx;
+  border-top-right-radius: 50rpx;
+  border-bottom-right-radius: 50rpx;
+  letter-spacing: 3rpx;
+}
+
+.account-login-btn {
+  width: 90%;
+  margin: 0 auto;
+  color: #fff;
+  font-size: 30rpx;
+  height: 96rpx;
+  line-height: 96rpx;
+  right: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: flex;
+  bottom: 0;
+  left: 0;
+  border-radius: 0;
+  padding: 0;
+  margin-left: 5%;
+  text-align: center;
+  /* padding-left: -5rpx; */
+  border-top-left-radius: 50rpx;
+  border-bottom-left-radius: 50rpx;
+  border-top-right-radius: 50rpx;
+  border-bottom-right-radius: 50rpx;
+  letter-spacing: 3rpx;
+  background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
+}
+.bottombtn{
+  width: 100%;
+  height: 120rpx;
+  background: #fff;
+  position: fixed;
+  bottom: 0;
+  
+}
+.bottombtn .right_btn{
+display: flex;
+align-items: inherit;
+  justify-content: flex-end;
+  padding-right: 30rpx;
+}
+.bottombtn .right_btn .btn{
+  width: 200rpx;
+  margin-top: 30rpx;
+  height:70rpx;
+  line-height: 70rpx;
+  text-align: center;
+  background-color: #703EDD;
+  color: #fff;
+  border-radius: 30rpx;
+}
+.bottombtn .right_btn .van-icon{
+  color: #ccc;
+  padding-right: 60rpx !important;
+  padding-top: 20rpx;
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/brand/brand.js b/litemall-wx/pages/jobManagement/jobManagement.js
similarity index 41%
rename from litemall-wx/pages/brand/brand.js
rename to litemall-wx/pages/jobManagement/jobManagement.js
index 849bf6f3..b064834f 100644
--- a/litemall-wx/pages/brand/brand.js
+++ b/litemall-wx/pages/jobManagement/jobManagement.js
@@ -1,59 +1,87 @@
-var util = require('../../utils/util.js');
-var api = require('../../config/api.js');
-var app = getApp();
-Page({
-  data: {
-    brandList: [],
-    page: 1,
-    limit: 10,
-    totalPages: 1
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    this.getBrandList();
-  },
-  getBrandList: function() {
-    wx.showLoading({
-      title: '加载中...',
-    });
-    let that = this;
-    util.request(api.BrandList, {
-      page: that.data.page,
-      limit: that.data.limit
-    }).then(function(res) {
-      if (res.errno === 0) {
-        that.setData({
-          brandList: that.data.brandList.concat(res.data.list),
-          totalPages: res.data.pages
-        });
-      }
-      wx.hideLoading();
-    });
-  },
-  onReachBottom() {
-    if (this.data.totalPages > this.data.page) {
-      this.setData({
-        page: this.data.page + 1
-      });
-    } else {
-      return false;
-    }
-
-    this.getBrandList();
-  },
-  onReady: function() {
-
-  },
-  onShow: function() {
-    // 页面显示
-
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-
-  }
+var util = require('../../utils/util.js');
+var api = require('../../config/api.js');
+var app = getApp();
+Page({
+  data: {
+    active:0,
+    page:1,
+    limit:10,
+    list:[],
+  },
+  onLoad: function(options) {
+    // 页面初始化 options为页面跳转所带来的参数
+    
+  },
+  onReady: function() {
+
+  },
+  onShow: function () {
+    this.setData({
+      page:1,
+      list:[]
+    });
+    // 页面显示
+    this.getTopic()
+  },
+  getTopic: function() {
+    let that = this;
+    // let userInfo = wx.getStorageSync('userInfo');
+    util.request(api.GoodsTopicDetail, {
+      page: that.data.page,
+      limit: that.data.limit,
+      expireStatus:that.data.active=='0'?'':+that.data.active-1
+    }).then(function(res) {
+      if (res.errno === 0) {
+        let f1 = that.data.list;
+        let f2 = res.data.list;
+        that.setData({
+          list: f1.concat(f2),
+          totalPages: res.data.pages
+        });
+      }
+    });
+  },
+  viewDetails(e) {
+    console.log(e)
+    let str = e.currentTarget.dataset.item.id
+    wx.navigateTo({
+      url: "/pages/details/details?id="+str
+    });
+  },
+  gopostPosition(){
+    wx.navigateTo({
+      url: "/pages/postPosition/postPosition"
+    });
+  },
+  onReachBottom() {
+    if (this.data.totalPages > this.data.page) {
+      this.setData({
+        page: this.data.page + 1
+      });
+      this.getTopic();
+    } else {
+      wx.showToast({
+        title: '没有更多用户足迹了',
+        icon: 'none',
+        duration: 2000
+      });
+      return false;
+    }
+  },
+  onChange(e){
+    this.setData({
+      active: e.detail.index,
+      page:1,
+      list:[]
+    });
+    this.getTopic()
+  },
+  onHide: function() {
+    // 页面隐藏
+
+  },
+  onUnload: function() {
+    // 页面关闭
+
+  }
 })
\ No newline at end of file
diff --git a/litemall-wx/pages/jobManagement/jobManagement.json b/litemall-wx/pages/jobManagement/jobManagement.json
new file mode 100644
index 00000000..0d40b99a
--- /dev/null
+++ b/litemall-wx/pages/jobManagement/jobManagement.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "职位管理"
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/jobManagement/jobManagement.wxml b/litemall-wx/pages/jobManagement/jobManagement.wxml
new file mode 100644
index 00000000..6532eb0f
--- /dev/null
+++ b/litemall-wx/pages/jobManagement/jobManagement.wxml
@@ -0,0 +1,49 @@
+<!-- index.wxml -->
+
+<view class="container">
+  <view class="main">
+    <van-tabs active="{{ active }}"  bind:change="onChange">
+    <van-tab title="全部">
+      <view class="list"  wx:for="{{list}}" wx:for-index="index" wx:for-item="item" data-item="{{item}}" wx:key="id" bindtap="viewDetails">
+        <view class="both">
+          <text class="title">{{item.name}}</text>
+          <text class="status" wx:if="{{!!item.counterPrice}}">底薪：{{item.counterPrice}}</text>
+          <text class="status" wx:else>提成：{{item.retailPrice}}%</text>
+        </view>
+        <view class="both1">
+          <text class="text">{{item.countyCode}} | {{item.workWay}}</text>
+        </view>
+      </view>
+    </van-tab>
+    <van-tab  title="进行中">
+      <view class="list"  wx:for="{{list}}" wx:for-index="index" wx:for-item="item" data-item="{{item}}" wx:key="id" bindtap="viewDetails">
+        <view class="both">
+          <text class="title">{{item.name}}</text>
+          <text class="status" wx:if="{{!!item.counterPrice}}">底薪：{{item.counterPrice}}</text>
+          <text class="status" wx:else>提成：{{item.retailPrice}}%</text>
+        </view>
+        <view class="both1">
+          <text class="text">{{item.countyCode}} | {{item.workWay}}</text>
+        </view>
+      </view>
+      </van-tab>
+    <van-tab title="已关闭">
+      <view class="list"  wx:for="{{list}}" wx:for-index="index" wx:for-item="item" data-item="{{item}}" wx:key="id" bindtap="viewDetails">
+        <view class="both">
+          <text class="title">{{item.name}}</text>
+          <text class="status" wx:if="{{!!item.counterPrice}}">底薪：{{item.counterPrice}}</text>
+          <text class="status" wx:else>提成：{{item.retailPrice}}%</text>
+        </view>
+        <view class="both1">
+          <text class="text">{{item.countyCode}} | {{item.workWay}}</text>
+        </view>
+      </view>
+    </van-tab>
+  </van-tabs>
+</view>
+  
+  <view  class="addbtn">
+    <van-button custom-class="btn" color="#703EDD" size="large" bindtap="gopostPosition">发布新职位</van-button>
+  </view>
+</view>
+
diff --git a/litemall-wx/pages/jobManagement/jobManagement.wxss b/litemall-wx/pages/jobManagement/jobManagement.wxss
new file mode 100644
index 00000000..fc23b0b9
--- /dev/null
+++ b/litemall-wx/pages/jobManagement/jobManagement.wxss
@@ -0,0 +1,60 @@
+page {
+  height: 100%;
+  width: 100%;
+  background: #fff;
+}
+.van-tabs__line{
+  background-color: #703EDD !important;
+}
+.main{
+  padding-bottom: 120rpx;
+  background-color: #fff;
+}
+.van-tabs__wrap {
+  position: fixed;
+  top: 0;
+}
+.main .list{
+  background-color: #fff;
+  padding:0 20rpx;
+}
+.main .list .both{
+  padding: 30rpx 20rpx;
+  padding-left: 0;
+  display: flex;
+  justify-content: space-between;
+}
+.both1{
+  color: rgb(61, 60, 60);
+  padding-bottom: 20rpx;
+  border-bottom: 2rpx solid rgb(230, 230, 230);
+}
+.both1 .text{
+  font-size: 23rpx;
+  color: rgb(61, 60, 60);
+}
+.title{
+  font-size: 28rpx;
+  font-weight: 600;
+}
+.status{
+  font-size: 22rpx;
+  color: #703EDD;
+}
+.addbtn{
+  position: fixed;
+  bottom: 0rpx;
+  width: 100%;
+  padding: 0 20rpx;
+  height: 110rpx;
+  background-color: #fff;
+}
+.addbtn .btn{
+  position: fixed;
+  bottom: 30rpx;
+  width: calc(100% - 40rpx);
+  height: 80rpx;
+}
+.van-button__text{
+  color: #FFF;
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/newGoods/newGoods.js b/litemall-wx/pages/newGoods/newGoods.js
deleted file mode 100644
index ed1d4734..00000000
--- a/litemall-wx/pages/newGoods/newGoods.js
+++ /dev/null
@@ -1,106 +0,0 @@
-var util = require('../../utils/util.js');
-var api = require('../../config/api.js');
-var app = getApp();
-
-Page({
-  data: {
-    bannerInfo: {
-      'imgUrl': '/static/images/new.png',
-      'name': '大家都在买的'
-    },
-    categoryFilter: false,
-    filterCategory: [],
-    goodsList: [],
-    categoryId: 0,
-    currentSortType: 'default',
-    currentSort: 'add_time',
-    currentSortOrder: 'desc',
-    page: 1,
-    limit: 10
-  },
-  getGoodsList: function() {
-    var that = this;
-
-    util.request(api.GoodsList, {
-        isNew: true,
-        page: that.data.page,
-        limit: that.data.limit,
-        order: that.data.currentSortOrder,
-        sort: that.data.currentSort,
-        categoryId: that.data.categoryId
-      })
-      .then(function(res) {
-        if (res.errno === 0) {
-          that.setData({
-            goodsList: res.data.list,
-            filterCategory: res.data.filterCategoryList
-          });
-        }
-      });
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    this.getGoodsList();
-  },
-  onReady: function() {
-    // 页面渲染完成
-  },
-  onShow: function() {
-    // 页面显示
-
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-
-  },
-  openSortFilter: function(event) {
-    let currentId = event.currentTarget.id;
-    switch (currentId) {
-      case 'categoryFilter':
-        this.setData({
-          categoryFilter: !this.data.categoryFilter,
-          currentSortType: 'category',
-          currentSort: 'add_time',
-          currentSortOrder: 'desc'
-        });
-        break;
-      case 'priceSort':
-        let tmpSortOrder = 'asc';
-        if (this.data.currentSortOrder == 'asc') {
-          tmpSortOrder = 'desc';
-        }
-        this.setData({
-          currentSortType: 'price',
-          currentSort: 'retail_price',
-          currentSortOrder: tmpSortOrder,
-          categoryFilter: false
-        });
-
-        this.getGoodsList();
-        break;
-      default:
-        //综合排序
-        this.setData({
-          currentSortType: 'default',
-          currentSort: 'add_time',
-          currentSortOrder: 'desc',
-          categoryFilter: false,
-          categoryId: 0
-        });
-        this.getGoodsList();
-    }
-  },
-  selectCategory: function(event) {
-    let currentIndex = event.target.dataset.categoryIndex;
-    this.setData({
-      'categoryFilter': false,
-      'categoryId': this.data.filterCategory[currentIndex].id
-    });
-    this.getGoodsList();
-
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/newGoods/newGoods.json b/litemall-wx/pages/newGoods/newGoods.json
deleted file mode 100644
index 0e9a78d1..00000000
--- a/litemall-wx/pages/newGoods/newGoods.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "新品首发"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/newGoods/newGoods.wxml b/litemall-wx/pages/newGoods/newGoods.wxml
deleted file mode 100644
index 2ef7f5f0..00000000
--- a/litemall-wx/pages/newGoods/newGoods.wxml
+++ /dev/null
@@ -1,42 +0,0 @@
-<view class="container">
-  <view class="brand-info">
-    <view class="name">
-      <image class="img" src="{{bannerInfo.imgUrl}}" background-size="cover"></image>
-      <view class="info-box">
-        <view class="info">
-          <text class="txt">{{bannerInfo.name}}</text>
-          <text class="line"></text>
-        </view>
-      </view>
-    </view>
-  </view>
-  <view class="sort">
-    <view class="sort-box">
-      <view class="item {{currentSortType == 'default' ? 'active' : ''}}" bindtap="openSortFilter" id="defaultSort">
-        <text class="txt">综合</text>
-      </view>
-      <view class="item {{currentSortType == 'price' ? 'active' : ''}}" bindtap="openSortFilter" id="priceSort">
-        <text class="txt">价格</text>
-        <van-icon name="arrow-up" wx:if="{{ currentSortType == 'price' && currentSortOrder == 'asc' }}" />
-        <van-icon name="arrow-down" wx:elif="{{ currentSortType == 'price' && currentSortOrder == 'desc'}}" />
-      </view>
-      <view class="item {{currentSortType == 'category' ? 'active' : ''}}" bindtap="openSortFilter" id="categoryFilter">
-        <text class="txt">分类</text>
-      </view>
-    </view>
-    <view class="sort-box-category" wx-if="{{categoryFilter}}">
-      <view class="item {{item.checked ? 'active' : ''}}" wx:for="{{filterCategory}}" wx:key="id" data-category-index="{{index}}" bindtap="selectCategory">{{item.name}}</view>
-    </view>
-  </view>
-  <view class="cate-item">
-    <view class="b">
-      <block wx:for="{{goodsList}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="id">
-        <navigator class="item {{iindex % 2 == 0 ? 'item-b' : '' }}" url="../goods/goods?id={{iitem.id}}">
-          <image class="img" src="{{iitem.picUrl}}" background-size="cover"></image>
-          <text class="name">{{iitem.name}}</text>
-          <text class="price">￥{{iitem.retailPrice}}</text>
-        </navigator>
-      </block>
-    </view>
-  </view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/newGoods/newGoods.wxss b/litemall-wx/pages/newGoods/newGoods.wxss
deleted file mode 100644
index b21d5e3e..00000000
--- a/litemall-wx/pages/newGoods/newGoods.wxss
+++ /dev/null
@@ -1,163 +0,0 @@
-page {
-  background: #f4f4f4;
-}
-
-.brand-info .name {
-  width: 100%;
-  height: 278rpx;
-  position: relative;
-}
-
-.brand-info .img {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 278rpx;
-}
-
-.brand-info .info-box {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 278rpx;
-  text-align: center;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.brand-info .info {
-  display: block;
-}
-
-.brand-info .txt {
-  display: block;
-  height: 40rpx;
-  font-size: 37.5rpx;
-  color: #fff;
-}
-
-.brand-info .line {
-  margin: 0 auto;
-  margin-top: 16rpx;
-  display: block;
-  height: 2rpx;
-  width: 145rpx;
-  background: #fff;
-}
-
-.sort {
-  position: relative;
-  background: #fff;
-  width: 100%;
-  height: 78rpx;
-}
-
-.sort-box {
-  background: #fff;
-  width: 100%;
-  height: 78rpx;
-  overflow: hidden;
-  padding: 0 30rpx;
-  display: flex;
-  border-bottom: 1px solid #d9d9d9;
-}
-
-.sort-box .item {
-  height: 78rpx;
-  line-height: 78rpx;
-  text-align: center;
-  flex: 1;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.sort-box .item .txt {
-  color: #333;
-}
-
-.sort-box .item.active .txt {
-  color: #b4282d;
-}
-
-.sort-box .item .van-icon {
-  margin-left: 6rpx;
-}
-
-.sort-box-category {
-  background: #fff;
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-  padding: 40rpx 40rpx 0 0;
-  border-bottom: 1px solid #d9d9d9;
-}
-
-.sort-box-category .item {
-  height: 54rpx;
-  line-height: 54rpx;
-  text-align: center;
-  float: left;
-  padding: 0 16rpx;
-  margin: 0 0 40rpx 40rpx;
-  border: 1px solid #666;
-  color: #333;
-  font-size: 24rpx;
-}
-
-.sort-box-category .item.active {
-  color: #b4282d;
-  border: 1px solid #b4282d;
-}
-
-.cate-item .b {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-  border-top: 1rpx solid #f4f4f4;
-  margin-top: 20rpx;
-}
-
-.cate-item .b .item {
-  float: left;
-  background: #fff;
-  width: 375rpx;
-  padding-bottom: 33.333rpx;
-  border-bottom: 1rpx solid #f4f4f4;
-  height: auto;
-  overflow: hidden;
-  text-align: center;
-}
-
-.cate-item .b .item-b {
-  border-right: 1rpx solid #f4f4f4;
-}
-
-.cate-item .item .img {
-  margin-top: 10rpx;
-  width: 302rpx;
-  height: 302rpx;
-}
-
-.cate-item .item .name {
-  display: block;
-  width: 365.625rpx;
-  height: 35rpx;
-  padding: 0 20rpx;
-  overflow: hidden;
-  margin: 11.5rpx 0 22rpx 0;
-  text-align: center;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.cate-item .item .price {
-  display: block;
-  width: 365.625rpx;
-  height: 30rpx;
-  text-align: center;
-  font-size: 30rpx;
-  color: #b4282d;
-}
diff --git a/litemall-wx/pages/groupon/grouponList/grouponList.js b/litemall-wx/pages/news/news.js
similarity index 38%
rename from litemall-wx/pages/groupon/grouponList/grouponList.js
rename to litemall-wx/pages/news/news.js
index 7a1bbc30..a19bc372 100644
--- a/litemall-wx/pages/groupon/grouponList/grouponList.js
+++ b/litemall-wx/pages/news/news.js
@@ -1,132 +1,119 @@
-// pages/groupon/grouponList/grouponList.js
-var util = require('../../../utils/util.js');
-var api = require('../../../config/api.js');
-var app = getApp();
-
+// pages/news/news.js
+var util = require('../../utils/util.js');
+var api = require('../../config/api.js');
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    grouponList: [],
+    list:[
+    ],
     page: 1,
     limit: 10,
-    count: 0,
-    scrollTop: 0,
-    showPage: false
+    totalPages: 1
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function(options) {
-    this.getGrouponList();
+  onLoad(options) {
+    this.getFootprintList();
   },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function() {
+  onReady() {
 
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function() {
-
+  onShow() {
+    
+  },
+  getFootprintList() {
+    wx.showLoading({
+      title: '加载中...',
+    });
+    let that = this;
+    let sessuserInfo = wx.getStorageSync('userInfo');
+    util.request(api.NoticeLsnotice,{
+      userType:sessuserInfo.userType,
+      page: that.data.page,
+      limit: that.data.limit,
+    }).then(function(res) {
+      if (res.errno === 0) {
+        let f1 = that.data.list;
+        let f2 = res.data.list;
+        that.setData({
+          list: f1.concat(f2),
+          totalPages: res.data.pages
+        });
+      }
+      wx.hideLoading();
+      wx.hideNavigationBarLoading() //完成停止加载
+      wx.stopPullDownRefresh() //停止下拉刷新
+    });
+  },
+  viewDetails(e) {
+    let str = e.currentTarget.dataset.item.noticeId
+    wx.navigateTo({
+      url: "/pages/MessageDetails/MessageDetails?id="+str
+    });
   },
-
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function() {
+  onHide() {
 
   },
 
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload: function() {
+  onUnload() {
 
   },
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh: function() {
-
+  onPullDownRefresh() {
+    wx.showNavigationBarLoading() //在标题栏中显示加载
+    this.setData({
+      page: 1,
+      list:[]
+    });
+    this.getFootprintList();
+    
   },
 
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function() {
-
+  onReachBottom() {
+    if (this.data.totalPages > this.data.page) {
+      this.setData({
+        page: this.data.page + 1
+      });
+      this.getFootprintList();
+    } else {
+      wx.showToast({
+        title: '没有更多了',
+        icon: 'none',
+        duration: 2000
+      });
+      return false;
+    }
   },
 
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function() {
-
-  },
-  getGrouponList: function() {
+  onShareAppMessage() {
 
-    let that = this;
-    that.setData({
-      scrollTop: 0,
-      showPage: false,
-      grouponList: []
-    });
-    // 页面渲染完成
-    wx.showToast({
-      title: '加载中...',
-      icon: 'loading',
-      duration: 2000
-    });
-
-    util.request(api.GroupOnList, {
-      page: that.data.page,
-      limit: that.data.limit
-    }).then(function(res) {
-      if (res.errno === 0) {
-
-        that.setData({
-          scrollTop: 0,
-          grouponList: res.data.list,
-          showPage: true,
-          count: res.data.total
-        });
-      }
-      wx.hideToast();
-    });
-
-  },
-  nextPage: function(event) {
-    var that = this;
-    if (this.data.page > that.data.count / that.data.limit) {
-      return true;
-    }
-
-
-    that.setData({
-      page: that.data.page + 1
-    });
-
-    this.getGrouponList();
-
-  },
-  prevPage: function(event) {
-    if (this.data.page <= 1) {
-      return false;
-    }
-
-    var that = this;
-    that.setData({
-      page: that.data.page - 1
-    });
-    this.getGrouponList();
   }
 })
\ No newline at end of file
diff --git a/litemall-wx/pages/news/news.json b/litemall-wx/pages/news/news.json
new file mode 100644
index 00000000..d376adee
--- /dev/null
+++ b/litemall-wx/pages/news/news.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "公告",
+  "enablePullDownRefresh": true
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/news/news.wxml b/litemall-wx/pages/news/news.wxml
new file mode 100644
index 00000000..4c9b30ac
--- /dev/null
+++ b/litemall-wx/pages/news/news.wxml
@@ -0,0 +1,15 @@
+<!--pages/news/news.wxml-->
+<view class="news">
+  <view wx:for="{{list}}">
+    <view class="imgover" data-item="{{item}}" bindtap="viewDetails">
+      <view class='item-main'>
+         <view class="both">
+          <text class="{{!!item.readTime?'name':'activename'}}">{{item.noticeTitle}}</text>
+         </view>
+         <view class="both news-main">
+          <text class="time">{{item.updateTime}}</text>
+         </view>
+      </view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/news/news.wxss b/litemall-wx/pages/news/news.wxss
new file mode 100644
index 00000000..f694694d
--- /dev/null
+++ b/litemall-wx/pages/news/news.wxss
@@ -0,0 +1,35 @@
+/* pages/news/news.wxss */
+page{
+  height: 100%;
+  width: 100%;
+  background: #fcf7f7;
+}
+.news{
+  padding: 20rpx;
+}
+.imgover{
+  background-color: #fff;
+  border-radius: 20rpx;
+  margin-top: 20rpx;
+}
+.imgover .item-main .both{
+  padding: 20rpx 30rpx;
+  display: flex;
+  justify-content: space-between;
+}
+.imgover .item-main .both .name{
+  font-size: 30rpx;
+  font-weight: 600;
+  color: rgb(114, 112, 112);
+}
+.imgover .item-main .both .activename{
+  font-size: 30rpx;
+  font-weight: 600;
+}
+.imgover .item-main .news-main{
+  padding: 20rpx 30rpx;
+  padding-bottom: 40rpx;
+}
+.imgover .item-main .news-main .time{
+ color: rgb(77, 77, 77);
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/payResult/payResult.js b/litemall-wx/pages/payResult/payResult.js
deleted file mode 100644
index 9ced6f79..00000000
--- a/litemall-wx/pages/payResult/payResult.js
+++ /dev/null
@@ -1,63 +0,0 @@
-var util = require('../../utils/util.js');
-var api = require('../../config/api.js');
-
-var app = getApp();
-Page({
-  data: {
-    status: false,
-    orderId: 0
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    this.setData({
-      orderId: options.orderId,
-      status: options.status === '1' ? true : false
-    })
-  },
-  onReady: function() {
-
-  },
-  onShow: function() {
-    // 页面显示
-
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-
-  },
-  payOrder() {
-    let that = this;
-    util.request(api.OrderPrepay, {
-      orderId: that.data.orderId
-    }, 'POST').then(function(res) {
-      if (res.errno === 0) {
-        const payParam = res.data;
-        console.log("支付过程开始")
-        wx.requestPayment({
-          'timeStamp': payParam.timeStamp,
-          'nonceStr': payParam.nonceStr,
-          'package': payParam.packageValue,
-          'signType': payParam.signType,
-          'paySign': payParam.paySign,
-          'success': function(res) {
-            console.log("支付过程成功")
-            that.setData({
-              status: true
-            });
-          },
-          'fail': function(res) {
-            console.log("支付过程失败")
-            util.showErrorToast('支付失败');
-          },
-          'complete': function(res) {
-            console.log("支付过程结束")
-          }
-        });
-      }
-    });
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/payResult/payResult.json b/litemall-wx/pages/payResult/payResult.json
deleted file mode 100644
index d4125d77..00000000
--- a/litemall-wx/pages/payResult/payResult.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "付款结果",
-  "navigationBarBackgroundColor": "#fafafa"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/payResult/payResult.wxml b/litemall-wx/pages/payResult/payResult.wxml
deleted file mode 100644
index ab27c180..00000000
--- a/litemall-wx/pages/payResult/payResult.wxml
+++ /dev/null
@@ -1,24 +0,0 @@
-<view class="container">
-  <view class="pay-result">
-    <view class="success" wx:if="{{status}}">
-      <view class="msg">付款成功</view>
-      <view class="btns">
-        <navigator class="btn" url="/pages/ucenter/order/order" open-type="redirect">查看订单</navigator>
-        <navigator class="btn" url="/pages/index/index" open-type="switchTab">继续逛</navigator>
-      </view>
-    </view>
-    <view class="error" wx:if="{{!status}}">
-      <view class="msg">付款失败</view>
-      <view class="tips">
-        <view class="p">请在
-          <text class="time">半小时</text> 内完成付款</view>
-        <view class="p">否则订单将会被系统取消</view>
-      </view>
-      <view class="btns">
-        <navigator class="btn" url="/pages/ucenter/order/order" open-type="redirect">查看订单</navigator>
-        <view class="btn" bindtap='payOrder'>重新付款</view>
-      </view>
-    </view>
-  </view>
-
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/payResult/payResult.wxss b/litemall-wx/pages/payResult/payResult.wxss
deleted file mode 100644
index 3811ad40..00000000
--- a/litemall-wx/pages/payResult/payResult.wxss
+++ /dev/null
@@ -1,59 +0,0 @@
-page {
-  min-height: 100%;
-  width: 100%;
-  background: #fff;
-}
-
-.container {
-  height: 100%;
-  background: #fff;
-}
-
-.pay-result {
-  background: #fff;
-}
-
-.pay-result .msg {
-  text-align: center;
-  margin: 100rpx auto;
-  color: #2bab25;
-  font-size: 36rpx;
-}
-
-.pay-result .btns {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.pay-result .btn {
-  text-align: center;
-  height: 80rpx;
-  margin: 0 20rpx;
-  width: 200rpx;
-  line-height: 78rpx;
-  border: 1px solid #868686;
-  color: #000;
-  border-radius: 5rpx;
-}
-
-.pay-result .error .msg {
-  color: #b4282d;
-  margin-bottom: 60rpx;
-}
-
-.pay-result .error .tips {
-  color: #7f7f7f;
-  margin-bottom: 70rpx;
-}
-
-.pay-result .error .tips .p {
-  font-size: 24rpx;
-  line-height: 42rpx;
-  text-align: center;
-}
-
-.pay-result .error .tips .p {
-  line-height: 42rpx;
-  text-align: center;
-}
diff --git a/litemall-wx/pages/postPosition/assets/iconfont.wxss b/litemall-wx/pages/postPosition/assets/iconfont.wxss
new file mode 100644
index 00000000..9ff2f5ca
--- /dev/null
+++ b/litemall-wx/pages/postPosition/assets/iconfont.wxss
@@ -0,0 +1,240 @@
+@font-face {font-family: "iconfont";
+  src: url('//at.alicdn.com/t/font_945958_zfsfjju1dim.eot?t=1547618146468'); /* IE9 */
+  src: url('//at.alicdn.com/t/font_945958_zfsfjju1dim.eot?t=1547618146468#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
+  url('//at.alicdn.com/t/font_945958_zfsfjju1dim.woff?t=1547618146468') format('woff'),
+  url('//at.alicdn.com/t/font_945958_zfsfjju1dim.ttf?t=1547618146468') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+  url('//at.alicdn.com/t/font_945958_zfsfjju1dim.svg?t=1547618146468#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-redo:before {
+  content: "\e627";
+}
+
+.icon-undo:before {
+  content: "\e633";
+}
+
+.icon-indent:before {
+  content: "\eb28";
+}
+
+.icon-outdent:before {
+  content: "\e6e8";
+}
+
+.icon-fontsize:before {
+  content: "\e6fd";
+}
+
+.icon-format-header-1:before {
+  content: "\e860";
+}
+
+.icon-format-header-4:before {
+  content: "\e863";
+}
+
+.icon-format-header-5:before {
+  content: "\e864";
+}
+
+.icon-format-header-6:before {
+  content: "\e865";
+}
+
+.icon-clearup:before {
+  content: "\e64d";
+}
+
+.icon-preview:before {
+  content: "\e631";
+}
+
+.icon-date:before {
+  content: "\e63e";
+}
+
+.icon-fontbgcolor:before {
+  content: "\e678";
+}
+
+.icon-clearedformat:before {
+  content: "\e67e";
+}
+
+.icon-font:before {
+  content: "\e684";
+}
+
+.icon-723bianjiqi_duanhouju:before {
+  content: "\e65f";
+}
+
+.icon-722bianjiqi_duanqianju:before {
+  content: "\e660";
+}
+
+.icon-text_color:before {
+  content: "\e72c";
+}
+
+.icon-format-header-2:before {
+  content: "\e75c";
+}
+
+.icon-format-header-3:before {
+  content: "\e75d";
+}
+
+.icon--checklist:before {
+  content: "\e664";
+}
+
+.icon-baocun:before {
+  content: "\ec09";
+}
+
+.icon-line-height:before {
+  content: "\e7f8";
+}
+
+.icon-quanping:before {
+  content: "\ec13";
+}
+
+.icon-direction-rtl:before {
+  content: "\e66e";
+}
+
+.icon-direction-ltr:before {
+  content: "\e66d";
+}
+
+.icon-selectall:before {
+  content: "\e62b";
+}
+
+.icon-fuzhi:before {
+  content: "\ec7a";
+}
+
+.icon-shanchu:before {
+  content: "\ec7b";
+}
+
+.icon-bianjisekuai:before {
+  content: "\ec7c";
+}
+
+.icon-fengexian:before {
+  content: "\ec7f";
+}
+
+.icon-dianzan:before {
+  content: "\ec80";
+}
+
+.icon-charulianjie:before {
+  content: "\ec81";
+}
+
+.icon-charutupian:before {
+  content: "\ec82";
+}
+
+.icon-wuxupailie:before {
+  content: "\ec83";
+}
+
+.icon-juzhongduiqi:before {
+  content: "\ec84";
+}
+
+.icon-yinyong:before {
+  content: "\ec85";
+}
+
+.icon-youxupailie:before {
+  content: "\ec86";
+}
+
+.icon-youduiqi:before {
+  content: "\ec87";
+}
+
+.icon-zitidaima:before {
+  content: "\ec88";
+}
+
+.icon-xiaolian:before {
+  content: "\ec89";
+}
+
+.icon-zitijiacu:before {
+  content: "\ec8a";
+}
+
+.icon-zitishanchuxian:before {
+  content: "\ec8b";
+}
+
+.icon-zitishangbiao:before {
+  content: "\ec8c";
+}
+
+.icon-zitibiaoti:before {
+  content: "\ec8d";
+}
+
+.icon-zitixiahuaxian:before {
+  content: "\ec8e";
+}
+
+.icon-zitixieti:before {
+  content: "\ec8f";
+}
+
+.icon-zitiyanse:before {
+  content: "\ec90";
+}
+
+.icon-zuoduiqi:before {
+  content: "\ec91";
+}
+
+.icon-zitiyulan:before {
+  content: "\ec92";
+}
+
+.icon-zitixiabiao:before {
+  content: "\ec93";
+}
+
+.icon-zuoyouduiqi:before {
+  content: "\ec94";
+}
+
+.icon-duigoux:before {
+  content: "\ec9e";
+}
+
+.icon-guanbi:before {
+  content: "\eca0";
+}
+
+.icon-shengyin_shiti:before {
+  content: "\eca5";
+}
+
+.icon-Character-Spacing:before {
+  content: "\e964";
+}
diff --git a/litemall-wx/pages/postPosition/assets/mom.png b/litemall-wx/pages/postPosition/assets/mom.png
new file mode 100644
index 0000000000000000000000000000000000000000..b29aba7b24f26ddc74489a025508580854d563b2
GIT binary patch
literal 7035
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
WVSASi;=a448bA%DjjUF*!u%ghoC=%(

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/postPosition/postPosition.js b/litemall-wx/pages/postPosition/postPosition.js
new file mode 100644
index 00000000..b2033bc4
--- /dev/null
+++ b/litemall-wx/pages/postPosition/postPosition.js
@@ -0,0 +1,720 @@
+var util = require('../../utils/util.js');
+var api = require('../../config/api.js');
+import {areaList} from '../../utils/area.js';
+import WxValidate from "../../utils/WxValidate.js";
+Page({
+  data: {
+    isEdit:false,
+    show:false,
+      form: {
+        id:'',
+        name:'',
+        workWay:"",
+        province:'',
+        city:'',
+        county:'',
+        provinceCode:'',
+        cityCode:'',
+        countyCode:'',
+        address:'',
+        radio:"1",
+        counterPrice:'',
+        retailPrice:'',
+        workCategory:[],
+        workStyle:[],
+        currentProvince:'',
+        currentCity:'',
+        currentProvinceCode:'',
+        currentCityCode:'',
+        contact:'',
+        contactMobile:'',
+        contactPost: '',
+        picUrl:'',
+        expireTime:'',
+        detail:'',
+        expireTimetext:''
+      },
+      formats: {},
+      readOnly: false,
+      placeholder: '开始输入...',
+      editorHeight: 150,
+      keyboardHeight: 0,
+      isIOS: false,
+      workWayindex:0,
+      companyindex:0,
+      areashow:false,
+      areashow2: false,
+      btnDisabled: false,
+      fileList:[
+      ],
+      WORK_TIME:[],
+      ZB_TYPE:[],
+      gallery:[],
+      COMPANY_POST:[],
+      video:[],
+      videoList:[],
+      worktimeShow: false,
+      areaList: {
+        province_list: areaList.province_list, //省
+        city_list: areaList.city_list,  //市
+        county_list: areaList.county_list //区
+      },
+      postShow:false,
+      areaList1: {
+        province_list: areaList.province_list, //省
+        city_list: areaList.city_list,  //市
+      },
+      minDate: new Date().getTime(),
+      maxDate: new Date().getTime() + (365 * 24 * 60 * 60 * 1000),
+  },
+  onShow: function(options) {
+    let that = this;
+    if(!!this.data.params){
+      let params = this.data.params.data;
+      let type = this.data.params.type;
+      if (type == 'ZB_STYLE') {
+        this.setData({
+          'form.workStyle': params
+        })
+      } else if (type == 'ZB_TYPE') {
+        this.setData({
+          'form.workCategory': params
+        })
+      }
+    }
+  },
+    initValidate() {
+    const rules = {
+      name: { //用户名
+        required: true,
+      },
+      currentCity: {
+        required: true,
+      },
+      expireTime: {
+        required: true,
+      },
+      detail: {
+        required: true,
+      },
+      workCategory: {
+        required: true,
+      },
+      workStyle: {
+        required: true,
+      },
+      workWay: {
+        required: true,
+      },
+    }
+    const messages = { //提示信息
+      name: {
+        required: '请填写职位名称',
+      },
+      
+      currentCity: {
+        required: '请选择需求城市',
+      },
+      expireTime: {
+        required: '请选择到期时间',
+      },
+      detail: {
+        required: '请填写职位要求',
+      },
+      workCategory: {
+        required: '请选择直播品类',
+      },
+      workStyle: {
+        required: '请选择标签',
+      },
+      workWay: {
+        required: '请选择工作方式',
+      },
+    }
+    // 创造飙到验证实例
+    this.WxValidate = new WxValidate(rules, messages)
+    console.log(this.WxValidate);
+  },
+  formSubmit: function (e) {
+    var that = this
+    const params = this.data.form
+    //校验表单
+    if (!this.WxValidate.checkForm(params)) {
+      console.log(this.WxValidate.errorList)
+      const error = this.WxValidate.errorList[0]
+      wx.showToast({
+        title: error.msg,
+        icon: 'none'
+      })
+      return false
+    }
+    this.setData({
+      btnDisabled:true
+    })
+    wx.showLoading({
+      title: '加载中...',
+    });
+    let str=''
+    if(!this.data.isEdit){
+      str = api.TopicCreateGoods
+    }else{
+      str = api.TopicUpdateGoods
+    }
+    util.request(str, {...this.data.form,gallery:this.data.gallery,videoUrl:this.data.video}, 'POST').then(function(res) {
+      that.setData({
+        btnDisabled:false
+      })
+      wx.hideLoading();
+      wx.showToast({
+        title: res.errmsg,
+      })
+      if (res.errno === 0) {
+        wx.navigateBack({
+          delta: 1
+        })
+      }
+    });
+  },
+  getGoodsInfo: function() {
+    let that = this;
+    
+    util.request(api.TopicInfo).then(function(res) {
+      if (res.errno === 0) {
+        if(!!res.data){
+        const date = new Date(res.data.expireTime);
+        const year = date.getFullYear();
+        const month = String(date.getMonth() + 1).padStart(2, "0");
+        const day = String(date.getDate()).padStart(2, "0");
+        const formattedDate = `${year}-${month}-${day}`;
+        that.setData({
+          "form.id":res.data.topic.id,
+          "form.expireTime":res.data.topic.expireTime,
+          "form.expireTimetext":formattedDate,
+          "form.workWay":res.data.topic.workWay,
+          "form.address":res.data.topic.address,
+          "form.radio":!!res.data.topic.counterPrice?'1':'2',
+          "form.counterPrice":res.data.topic.counterPrice,
+          "form.retailPrice":res.data.topic.retailPrice,
+          "form.workCategory":res.data.topic.workCategory,
+          "form.workStyle":res.data.topic.workStyle,
+          "form.currentProvince":res.data.topic.currentProvince,
+          "form.currentCity":res.data.topic.currentCity,
+          "form.currentProvinceCode":res.data.topic.currentProvinceCode,
+          "form.currentCityCode":res.data.topic.currentCityCode,
+          "form.picUrl": res.data.topic.picUrl,
+          fileList:res.data.topic.picUrl||[],
+          gallery:res.data.topic.picUrl||[],
+          isEdit:true
+        });
+        // setTimeout(() => {
+        //   that.setData(
+        //     {
+        //       workWayindex:that.data.WORK_TIME.findIndex(item => { return item.text == that.data.form.workWay }),
+        //       companyindex:that.data.COMPANY_POST.findIndex(item => { return item.text == that.data.form.contactPost }),
+        //     }
+        //   )
+        // }, 1000);
+        }else{
+          that.setData(
+            {
+              isEdit:false
+            }
+          )
+        }
+        
+      }
+    });
+  },
+  getlocation(){
+    wx.getLocation({
+      type: 'wgs84',
+      success (res) {
+        console.log(res)
+        const latitude = res.latitude
+        const longitude = res.longitude
+        const speed = res.speed
+        const accuracy = res.accuracy
+      },
+      fail: function(res) {
+        console.log('获取位置信息失败', res);
+      }
+     })
+  },
+  getByCategory() {
+    let that = this;
+    let userInfo = wx.getStorageSync('userInfo');
+    that.setData(
+      {
+        "form.picUrl": userInfo.avatar,
+      }
+    )
+    util.request(api.getByCategory,{categoryList:['DEGREE','LANGRAGE','WORK_TIME','ZB_TYPE','ZB_ACCOUNT_TYPE','ZB_STYLE','GOOD_CATEGORY','COMPANY_POST']},'POST').then(function(res) {
+      if (res.errno === 0) {
+        that.setData({
+          WORK_TIME:res.data.list.filter((item)=>{ return item.category == 'WORK_TIME' }).map(deg => ({ text: deg.name, value: deg.name })),
+          ZB_TYPE:res.data.list.filter((item)=>{ return item.category == 'ZB_TYPE' }).map(deg => ({ text: deg.name, value: deg.name })),
+          ZB_STYLE:res.data.list.filter((item)=>{ return item.category == 'ZB_STYLE' }).map(deg => ({ text: deg.name, value: deg.name })),
+          COMPANY_POST:res.data.list.filter((item)=>{ return item.category == 'COMPANY_POST' }).map(deg => ({ text: deg.name, value: deg.name })),
+        })
+        // that.getGoodsInfo()
+      }
+    });
+  },
+  datatrue: function() {
+    this.setData({
+      show: !this.data.show
+    })
+  },
+  cancel: function() {
+    this.setData({
+      show:false
+    })
+  },
+  datetimeConfirm: function(e) {
+    console.log(e.detail)
+    const date = new Date(e.detail);
+    // 获取年、月、日
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份是从 0 开始的，需要加 1
+    const day = String(date.getDate()).padStart(2, '0');
+    date.setHours(0);
+    date.setMinutes(0);
+    date.setSeconds(0);
+    date.setMilliseconds(0);
+    const timestamp = date.getTime();
+    // 组合成 YYYY-MM-DD 格式的日期字符串
+    const formattedDate = `${year}-${month}-${day}`;
+    this.setData({
+      'form.expireTime':timestamp,
+      'form.expireTimetext':formattedDate 
+    })
+    this.cancel()
+  },
+  changeradio(e){
+    this.setData({
+      "form.radio": e.detail,
+      "form.counterPrice":'',
+      "form.retailPrice":""
+    });
+  },
+ 
+  worktimeCancel: function() {
+    this.setData({
+      worktimeShow: false
+    })
+  },
+  postCancel: function() {
+    this.setData({
+      postShow: false
+    })
+  },
+  postConfirm(e) {
+    let text = e.detail.value.text
+    this.setData({
+      'form.contactPost':text
+    })
+    this.postCancel()
+  },
+  worktimeConfirm(e) {
+    let text = e.detail.value.text
+    this.setData({
+      'form.workWay':text
+    })
+    this.worktimeCancel()
+  },
+  worktimeChange: function() {
+    this.setData({
+      worktimeShow: true,
+      workWayindex:this.data.WORK_TIME.findIndex(item => { return item.text == this.data.form.workWay }),
+    })
+  },
+  postChange: function() {
+    this.setData({
+      postShow: true,
+      companyindex:this.data.COMPANY_POST.findIndex(item => { return item.text == this.data.form.contactPost })
+    })
+  },
+  reginCalendar: function() {
+    let that = this;
+    this.setData({
+      areashow: !that.data.areashow,
+      "form.county":this.data.form.county
+    })
+  },
+  reginCalendar2: function() {
+    let that = this;
+    this.setData({
+      areashow2: !that.data.areashow2,
+      "form.countyCode":this.data.form.countyCode
+    })
+  },
+  regin2Calendar(){
+    this.reginCalendar2()
+  },
+  regin2Confirm(e) {
+    console.log(e.detail)
+    let data = e.detail.values
+    let code = e.detail.values.map((item) => { return item.code})
+    this.setData({
+      // 'form.changzhudiname':name,
+      // 'form.changzhudivalue': code,
+      'form.currentProvince': data[0].name,  
+      'form.currentCity': data[1].name,  
+      'form.currentProvinceCode':data[0].code,  
+      'form.currentCityCode': data[1].code,  
+    })
+    this.reginCalendar2()
+  },
+  reginConfirm(e) {
+    console.log(e.detail)
+    let data = e.detail.values
+    // let name = e.detail.values.map((item) => { return item.name}).join('-')
+    // let code = e.detail.values.map((item) => { return item.code})
+    this.setData({
+      // 'form.hujidiname':name,
+      // 'form.hujidinamevalue': code
+      'form.province': data[0].name, 
+      'form.city': data[1].name, 
+      'form.county': data[2].name, 
+      'form.provinceCode': data[0].code, 
+      'form.cityCode': data[1].code, 
+      'form.countyCode': data[2].code, 
+    })
+    this.reginCalendar()
+  },
+  imgUpload: function() {
+    let that = this;
+    wx.chooseImage({
+      count: 1, // 一次只能选择一张图片
+      sizeType: ['compressed'], // 压缩图片
+      sourceType: ['album', 'camera'], // 从相册选择
+      success: function (res) {
+        const tempFilePaths = res.tempFilePaths;
+        const tempFilePath = tempFilePaths[0];
+        // 检查图片大小
+        wx.getFileInfo({
+          filePath: tempFilePath,
+          success: function (fileRes) {
+            const size = fileRes.size; // 图片大小，单位B
+            const maxSize = 5 * 1024 * 1024; // 20MB
+            if (size > maxSize) {
+              wx.showToast({
+                title: '图片过大，请重新选择',
+                icon: 'none'
+              });
+              return;
+            }
+            // 图片大小符合要求，继续上传逻辑
+          }
+        });
+        that.upload(res);
+        // 将图片上传到服务器
+        // uni.uploadFile({
+        //   url: 'https://example.com/upload', // 上传的服务器地址
+        //   filePath: res.tempFilePaths[0], // 图片的本地地址
+        //   name: 'file', // 服务端用于接收文件的参数名
+        //   success: function (res) {
+        //     // 上传成功，做一些处理
+        //   }
+        // })
+      }
+    })
+  },
+  chooseMedia: function() {
+    let that = this;
+    wx.chooseImage({
+      count: 1, // 一次只能选择一张图片
+      sizeType: ['compressed'], // 压缩图片
+      sourceType: ['album', 'camera'], // 从相册选择
+      success: function (res) {
+        const tempFilePaths = res.tempFilePaths;
+        const tempFilePath = tempFilePaths[0];
+        // 检查图片大小
+        wx.getFileInfo({
+          filePath: tempFilePath,
+          success: function (fileRes) {
+            const size = fileRes.size; // 图片大小，单位B
+            const maxSize = 5 * 1024 * 1024; // 20MB
+            if (size > maxSize) {
+              wx.showToast({
+                title: '图片过大，请重新选择',
+                icon: 'none'
+              });
+              return;
+            }
+            wx.cropImage({
+              src: tempFilePath, // 图片路径
+              cropScale: '1:1', // 裁剪比例
+              success: function (res1) {
+                const uploadTask = wx.uploadFile({
+                  url: api.StorageUpload,
+                  filePath: res1.tempFilePath,
+                  name: 'file',
+                  success: function(res2) {
+                    var _res = JSON.parse(res2.data);
+                    if (_res.errno === 0) {
+                      var url = _res.data.url
+                      that.setData({
+                        picUrl: url
+                      })
+                    }
+                  },
+                  fail: function(e) {
+                    wx.showModal({
+                      title: '错误',
+                      content: '上传失败',
+                      showCancel: false
+                    })
+                  },
+                })
+              }
+    
+            })
+            
+            // 图片大小符合要求，继续上传逻辑
+          }
+        });
+        
+      }
+    })
+  },
+  upload: function(res) {
+    var that = this;
+    const uploadTask = wx.uploadFile({
+      url: api.StorageUpload,
+      filePath: res.tempFilePaths[0],
+      name: 'file',
+      success: function(res) {
+        var _res = JSON.parse(res.data);
+        if (_res.errno === 0) {
+          var url = _res.data.url
+          that.data.fileList.push(url)
+          that.setData({
+            gallery: that.data.fileList
+          })
+        }
+      },
+      fail: function(e) {
+        wx.showModal({
+          title: '错误',
+          content: '上传失败',
+          showCancel: false
+        })
+      },
+    })
+
+    uploadTask.onProgressUpdate((res) => {
+      console.log('上传进度', res.progress)
+      console.log('已经上传的数据长度', res.totalBytesSent)
+      console.log('预期需要上传的数据总长度', res.totalBytesExpectedToSend)
+    })
+
+  },
+  bindchangevalue(e){
+    let html = e.detail.html
+    this.setData({
+      'form.detail' : html
+    })
+  },
+  handleChange(e) {
+    console.log('富文本内容变化', e.detail)
+    // 这里可以通过正则等方法从 e.detail.html 中提取出您需要的内容
+    // 假设您想要提取 <div> 标签中的内容
+    const regex = /<div[^>]*>(.*?)<\/div>/g;
+    const match = regex.exec(e.detail.html);
+    if (match) {
+      this.setData({
+        content: match[1]
+      });
+    }
+  },
+  delImage(e){
+    console.log(e)
+    let index =e.currentTarget.dataset.index
+    this.data.gallery.splice(index,1)
+    this.setData({
+      gallery:this.data.gallery.splice(index,1)
+    })
+  },
+  imgPreview: function(e) {
+    console.log(e)
+    var current = e.target.dataset.src;
+    wx.previewImage({
+      current: current, // 当前显示图片的http链接
+      urls: [current] // 需要预览的图片http链接列表
+    })
+  },
+  selectData(e){
+    var current = e.currentTarget.dataset.type;
+    let str = JSON.stringify(this.data[current])
+    let arr ={
+      ZB_STYLE:"workStyle",
+      ZB_TYPE: "workCategory",
+    }
+    let name = arr[current]
+    let cdata = JSON.stringify(this.data.form[name])
+    wx.navigateTo({
+      url: "/pages/ucenter/categorys/categorys?data="+str+'&type='+current+'&cData='+cdata
+    });
+  },
+  videoUpload: function() {
+    const that = this;
+    //   选择视频
+    wx.chooseVideo({
+      sourceType: ['album', 'camera'], // 类型[相册,照相机]
+      compressed: true, // 是否压缩上传的视频
+      camera: 'back',
+      success: async function(res) {
+        console.log('__res', res);
+        that.uploadVideo(res)
+      },
+    });
+  },
+  uploadVideo: function(data) {
+    var that = this;
+    const uploadTask = wx.uploadFile({
+      url: api.StorageUploadVideo,
+      filePath: data.tempFilePath,
+      name: 'file',
+      success: function(res) {
+        var _res = JSON.parse(res.data);
+        if (_res.errno === 0) {
+          var url = _res.data.url
+          that.data.videoList.push(url)
+          that.setData({
+            video: that.data.videoList
+          })
+        }
+      },
+      fail: function(e) {
+        wx.showModal({
+          title: '错误',
+          content: '上传失败',
+          showCancel: false
+        })
+      },
+    })
+
+
+  },
+  inputEvent(e) { // 输入框双向绑定
+    this.setData({
+        ['form.' + e.currentTarget.dataset.type]: e.detail
+    })
+  },
+  readOnlyChange() {
+    this.setData({
+      readOnly: !this.data.readOnly
+    })
+  },
+  onLoad() {
+    this.getByCategory()
+    this.initValidate()
+    const platform = wx.getSystemInfoSync().platform
+    const isIOS = platform === 'ios'
+    this.setData({ isIOS})
+    const that = this
+    this.updatePosition(0)
+    let keyboardHeight = 0
+    wx.onKeyboardHeightChange(res => {
+      if (res.height === keyboardHeight) return
+      const duration = res.height > 0 ? res.duration * 1000 : 0
+      keyboardHeight = res.height
+      setTimeout(() => {
+        wx.pageScrollTo({
+          scrollTop: 0,
+          success() {
+            that.updatePosition(keyboardHeight)
+            that.editorCtx.scrollIntoView()
+          }
+        })
+      }, duration)
+
+    })
+  },
+  updatePosition(keyboardHeight) {
+    const toolbarHeight = 50
+    const { windowHeight, platform } = wx.getSystemInfoSync()
+    let editorHeight = keyboardHeight > 0 ? (windowHeight - keyboardHeight - toolbarHeight) : windowHeight
+    this.setData({ editorHeight, keyboardHeight })
+  },
+  calNavigationBarAndStatusBar() {
+    const systemInfo = wx.getSystemInfoSync()
+    const { statusBarHeight, platform } = systemInfo
+    const isIOS = platform === 'ios'
+    const navigationBarHeight = isIOS ? 44 : 48
+    return statusBarHeight + navigationBarHeight
+  },
+  onEditorReady() {
+    const that = this
+    wx.createSelectorQuery().select('#editor').context(function (res) {
+      that.editorCtx = res.context
+    }).exec()
+  },
+  blur() {
+    this.editorCtx.blur()
+  },
+  format(e) {
+    let { name, value } = e.target.dataset
+    if (!name) return
+    // console.log('format', name, value)
+    this.editorCtx.format(name, value)
+
+  },
+  onStatusChange(e) {
+    const formats = e.detail
+    this.setData({ formats })
+  },
+  insertDivider() {
+    this.editorCtx.insertDivider({
+      success: function () {
+        console.log('insert divider success')
+      }
+    })
+  },
+  clear() {
+    this.editorCtx.clear({
+      success: function (res) {
+        console.log("clear success")
+      }
+    })
+  },
+  removeFormat() {
+    this.editorCtx.removeFormat()
+  },
+  insertDate() {
+    const date = new Date()
+    const formatDate = `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`
+    this.editorCtx.insertText({
+      text: formatDate
+    })
+  },
+  insertImage() {
+    const that = this
+    wx.chooseImage({
+      count: 1,
+      success: function (res) {
+        that.editorCtx.insertImage({
+          src: res.tempFilePaths[0],
+          data: {
+            id: 'abcd',
+            role: 'god'
+          },
+          width: '80%',
+          success: function () {
+            console.log('insert image success')
+          }
+        })
+      }
+    })
+  },
+  onReady: function() {
+    // 页面渲染完成
+  },
+  onHide: function() {
+    // 页面隐藏
+  },
+  onUnload: function() {
+    // 页面关闭
+  }
+})
\ No newline at end of file
diff --git a/litemall-wx/pages/postPosition/postPosition.json b/litemall-wx/pages/postPosition/postPosition.json
new file mode 100644
index 00000000..f5a61bfc
--- /dev/null
+++ b/litemall-wx/pages/postPosition/postPosition.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "职位发布"
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/postPosition/postPosition.wxml b/litemall-wx/pages/postPosition/postPosition.wxml
new file mode 100644
index 00000000..f51d6d95
--- /dev/null
+++ b/litemall-wx/pages/postPosition/postPosition.wxml
@@ -0,0 +1,158 @@
+<view class="contentmain">
+  <view class="myposts">
+    <view class="bg">
+      <view class="main">
+        <view class="main-top">
+          <view class="myposts-img">
+            <image class="img" src="{{form.picUrl}}" bindtap="chooseMedia" alt="" />
+            <view class="ggg">
+              <view class="myposts-main">
+                <view class="fabu">
+                  <text class="textcol">{{isEdit?form.title:"未发布用户"}}</text>
+                </view>
+                <view class="yuyue">
+                  <text class="textcol">{{isEdit?"已发布":"未发布"}}</text>
+                </view>
+              </view>
+              <!-- <view class="myposts-main myposts-main1">
+                <view class="fabu">
+                  <text class="textcol">未发布用户</text>
+                </view>
+                <view class="yuyue">
+                  <text class="textcol">匹配预约 </text>
+                </view>
+              </view> -->
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="formData">
+      <view class="formbg">
+        <view class="form-item">
+          <van-cell-group is-link>
+            <van-field model:value="{{ form.name }}" left-icon="../../../static/images/icon/gongsidizhiicon.png" label="职位名称" input-align="right" data-type="name" bind:change="inputEvent" placeholder="职位名称" clearable :label-width="100" />
+          </van-cell-group>
+          <van-cell title="需求城市" icon="../../../static/images/icon/hujichangzhudizhi.png" bindtap="reginCalendar2" is-link>
+            <view wx:if='{{form.currentCity}}'>
+              {{form.currentCity}}
+            </view>
+          </van-cell>
+          <van-cell-group is-link bindtap="datatrue">
+            <van-field model:value="{{ form.expireTimetext }}" left-icon="../../../static/images/icon/chushengriqi.png" label="到期时间" input-align="right" readonly placeholder="到期时间" is-link clearable :label-width="100" />
+          </van-cell-group>
+
+        </view>
+        <view class="form-item">
+          <van-cell title="薪酬待遇" title-class="vancell__title" icon="../../../static/images/icon/yly_qianzhuang.png">
+            <view class="list">
+              <van-radio-group value="{{ form.radio }}" custom-class='custom-radio' bind:change="changeradio">
+                <view class="flex">
+                  <van-radio name="1" checked-color="#703EDD"></van-radio>
+                  <van-field model:value="{{ form.counterPrice }}" disabled="{{ form.radio =='2'}}" border="false" custom-class="custom-label" input-align="right" data-type="counterPrice" bind:change="inputEvent" placeholder="底薪" clearable :label-width="100">
+                    <view slot="label" style="width: 100rpx;">底薪</view>
+                  </van-field>
+                  <text>元</text>
+                </view>
+                <view class="flex">
+                  <van-radio name="2" checked-color="#703EDD"></van-radio>
+                  <van-field model:value="{{ form.retailPrice }}" disabled="{{ form.radio =='1'}}" border="false" input-align="right" placeholder="计提" clearable data-type="retailPrice" bind:change="inputEvent" :label-width="100">
+                    <view slot="label" style="width: 100rpx;">计提</view>
+                  </van-field>
+                  <text>%</text>
+                </view>
+              </van-radio-group>
+            </view>
+          </van-cell>
+          <van-cell title="职位要求"></van-cell>
+          <view class="container" style="height:{{editorHeight}}px;">
+            <editor id="editor" class="ql-container" placeholder="{{placeholder}}" bindstatuschange="onStatusChange" bindblur="bindchangevalue" bindready="onEditorReady">
+            </editor>
+          </view>
+          <view class="toolbar" catchtouchend="format" hidden="{{keyboardHeight > 0 ? false : true}}" style="bottom: {{isIOS ? keyboardHeight : 0}}px">
+            <!-- <i class="iconfont icon-charutupian" catchtouchend="insertImage"></i> -->
+            <i class="iconfont icon-format-header-2 {{formats.header === 2 ? 'ql-active' : ''}}" data-name="header" data-value="{{2}}"></i>
+            <i class="iconfont icon-format-header-3 {{formats.header === 3 ? 'ql-active' : ''}}" data-name="header" data-value="{{3}}"></i>
+            <i class="iconfont icon-zitijiacu {{formats.bold ? 'ql-active' : ''}}" data-name="bold"></i>
+            <i class="iconfont icon-zitixieti {{formats.italic ? 'ql-active' : ''}}" data-name="italic"></i>
+            <i class="iconfont icon-zitixiahuaxian {{formats.underline ? 'ql-active' : ''}}" data-name="underline"></i>
+            <i class="iconfont icon--checklist" data-name="list" data-value="check"></i>
+            <i class="iconfont icon-youxupailie {{formats.list === 'ordered' ? 'ql-active' : ''}}" data-name="list" data-value="ordered"></i>
+            <i class="iconfont icon-wuxupailie {{formats.list === 'bullet' ? 'ql-active' : ''}}" data-name="list" data-value="bullet"></i>
+          </view>
+          <van-cell title="上传照片" icon="../../../static/images/icon/tupian.png" border="{{false}}">
+          </van-cell>
+          <view class="row">
+            <view class="u-col-5 imgitem" wx:for="{{ gallery }}" wx:key="index" wx:for-item="item">
+              <van-icon class="closeicon" name="cross" data-index="{{index}}" bindtap="delImage" />
+              <image class="imgscr" style="width: 100%; height: 100%;" src="{{ item }}" data-src="{{item}}" bindtap="imgPreview"></image>
+            </view>
+            <van-col class="u-col-5" wx:if="{{ gallery.length < 2 }}">
+              <view class="upload-item_i" bindtap="imgUpload">
+                <view class="upicon">
+                  <van-icon name="plus" />
+                </view>
+                <view class="uptext">上传照片</view>
+                <view class="upmain">(仅支持图片格式)</view>
+                <view class="upmain">(大小不超过5m)</view>
+              </view>
+            </van-col>
+          </view>
+        </view>
+
+        <view class="form-item">
+          <van-cell title="直播品类" title-class="vancell__title" icon="../../../static/images/icon/pinlei.png" data-type="ZB_TYPE" bindtap="selectData" is-link>
+              <view class="list">
+                <text class="item" wx:for="{{form.workCategory}}" :key="index">{{ item }}</text>
+              </view>
+            </van-cell>
+          <van-cell title="选择标签" title-class="vancell__title" icon="../../../static/images/icon/pinlei.png" data-type="ZB_STYLE" bindtap="selectData" is-link>
+            <view class="list">
+              <text class="item" wx:for="{{form.workStyle}}" :key="index">{{ item }}</text>
+            </view>
+          </van-cell>
+          <van-cell title="工作方式" icon="../../../static/images/icon/gongzuofangshipx.png" bindtap="worktimeChange" is-link>
+            {{ form.workWay }}
+          </van-cell>
+          <!-- <van-cell title="上传视频" icon="../../../static/images/icon/shipin.png" border="{{false}}">
+          </van-cell>
+          <view class="row">
+            <view class="u-col-5 imgitem" wx:for="{{ video }}" wx:for-item="item">
+              <video style="width: 100%; height: 100%;" controls object-fit='cover' :key="index" src="{{item.tempFilePath}}" :poster="item.thumbTempFilePath" enable-play-gesture="true"></video>
+            </view>
+            <van-col class="u-col-5" wx:if="{{ video.length < 2 }}">
+              <view class="upload-item_i" bindtap="videoUpload">
+                <view class="upicon">
+                  <van-icon name="plus" />
+                </view>
+                <view class="uptext">上传视频</view>
+                <view class="upmain">(仅支持视频格式)</view>
+              </view>
+            </van-col>
+          </view> -->
+        </view>
+        <view class="btn">
+          <van-button type="primary" color="#703EDD" bindtap="formSubmit" disabled="{{btnDisabled}}" block>提交发布</van-button>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  <!-- <u-calendar v-model="show" :mode="mode" @change="change"></u-calendar>
+    <u-picker class="region" mode="region" v-model="pickerShow" @confirm="confirm"></u-picker> -->
+</view>
+<van-popup show="{{ worktimeShow }}" round position="bottom" bind:close="worktimeCancel">
+  <van-picker wx:if="{{ worktimeShow }}" columns="{{ WORK_TIME }}" default-index="{{workWayindex}}" show-toolbar bind:cancel="worktimeCancel" bind:confirm="worktimeConfirm" />
+</van-popup>
+<van-popup show="{{ postShow }}" round position="bottom" bind:close="postCancel">
+  <van-picker wx:if="{{ postShow }}" columns="{{ COMPANY_POST }}" default-index="{{companyindex}}" show-toolbar bind:cancel="postCancel" bind:confirm="postConfirm" />
+</van-popup>
+<van-popup show="{{ areashow }}" round position="bottom" bind:close="reginCalendar">
+  <van-area wx:if="{{ areashow }}" area-list="{{areaList}}" value="{{form.countyCode}}" bind:cancel="reginCalendar" bind:confirm="reginConfirm" />
+</van-popup>
+<van-popup show="{{ areashow2 }}" round position="bottom" bind:close="regin2Calendar">
+  <van-area wx:if="{{ areashow2 }}" area-list="{{areaList}}" value="{{form.demandCityCode}}" columns-num='2' bind:cancel="regin2Calendar" bind:confirm="regin2Confirm" />
+</van-popup>
+<van-popup show="{{show}}" round overlay position="bottom" bind:close="cancel">
+  <van-datetime-picker bind:cancel="cancel" bind:confirm="datetimeConfirm" model:value="{{form.birthdayvalue}}" type="date" min-date="{{ minDate }}" max-date="{{ maxDate }}" />
+</van-popup>
\ No newline at end of file
diff --git a/litemall-wx/pages/postPosition/postPosition.wxss b/litemall-wx/pages/postPosition/postPosition.wxss
new file mode 100644
index 00000000..d22cb07c
--- /dev/null
+++ b/litemall-wx/pages/postPosition/postPosition.wxss
@@ -0,0 +1,304 @@
+page {
+  height: 100%;
+  width: 100%;
+  background: #f4f4f4;
+}
+
+.contentmain {
+  height: 100%;
+  background: #f0f0f0;
+}
+
+.myposts {
+  height: auto;
+}
+
+.myposts .bg {
+  height: 500rpx;
+  border-bottom-left-radius: 160rpx;
+  border-bottom-right-radius: 140rpx;
+  background-color: #703EDD;
+}
+
+.myposts .bg .main .main-top {
+  padding: 20rpx;
+  padding-bottom: 40rpx;
+}
+
+.myposts .bg .main .main-top .myposts-img {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+}
+
+.myposts .bg .main .main-top .myposts-img .img {
+  width: 120rpx;
+  height: 120rpx;
+}
+
+.myposts .bg .main .main-top .myposts-img .myposts-main {
+  padding: 0 10rpx;
+  
+}
+
+.myposts .bg .main .main-top .myposts-img .myposts-main .fabu {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+  justify-content: space-between;
+  line-height: 50rpx;
+  color: #fff;
+}
+.myposts .bg .main .main-top .myposts-img .myposts-main .fabu .textcol{
+  color: #fff;
+}
+.myposts .bg .main .main-top .myposts-img .myposts-main .yuyue {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+  justify-content: space-between;
+  line-height: 50rpx;
+  
+}
+.myposts .bg .main .main-top .myposts-img .myposts-main .yuyue .textcol{
+  color: #fff;
+}
+.myposts .bg .main .main-top .myposts-img .ggg {
+  width: 100%;
+  padding-left: 20rpx;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+  justify-content: space-between;
+}
+
+.myposts .bg .main .sex {
+  padding: 0 20rpx;
+}
+
+.myposts .bg .main .sex .sex-main {
+  background-color: #fff;
+  border-radius: 20rpx;
+  padding-left: 20rpx;
+  padding-right: 20rpx;
+}
+.myposts .bg .main .sex .sex-main .custom-class .title-class{
+  width: 200rpx !important;
+}
+.myposts .bg .main .sex .sex-main .sec-radio .value-class{
+  text-align: left;
+}
+.myposts .bg .main .sex .sex-main .group-list {
+  width: 50% !important;
+}
+
+.myposts .formData {
+  margin-top: -342rpx;
+  padding: 20rpx;
+}
+
+.myposts .formData .formbg .btn {
+  padding: 20rpx 0;
+ 
+}
+.myposts .formData .formbg .btn .van-button .van-button__text{
+  color: #fff;
+}
+.myposts .formData .formbg .iconarrow {
+  position: absolute;
+  top: 40rpx;
+  right: 20rpx;
+}
+
+.myposts .formData .formbg .form-item {
+  background-color: #fff;
+  border-radius: 20rpx;
+  margin: 20rpx 0;
+  width: 100%;
+  padding-left: 20rpx;
+  padding-right: 20rpx;
+  padding-bottom: 30rpx;
+}
+.myposts .formData .formbg .form-item .customitem{
+  position: relative;
+}
+.myposts .formData .formbg .form-item .customitem .custom-icon {
+  width: 32rpx;
+  height: 32rpx;
+  position: absolute;
+  left: 0px;
+  top: 50%;
+  transform: translateY(-50%);
+}
+.myposts .formData .formbg .form-item .upitem {
+  width: 40%;
+  border: 1px solid #ccc;
+  height: 400rpx;
+  margin-right: 20rpx;
+}
+
+.myposts .formData .formbg .form-item .upload-item {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  text-align: center;
+}
+
+.myposts .formData .formbg .form-item .upload-item_img {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+}
+.myposts .formData .formbg .form-item .row .u-col-5 .upload-item_i  {
+  width: 100%;
+  text-align: center;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%,-50%);
+}
+
+.myposts .formData .formbg .form-item .upload-item_i .uptext {
+  padding: 0;
+}
+.myposts .formData .formbg .form-item .cell-border{
+  border-top: 1px solid #ccc;
+  margin-top: 10rpx;
+}
+.myposts .formData .formbg .form-item .upload-item_i .upmain {
+  padding: 0;
+}
+.myposts .formData .formbg .form-item .row{
+  display: flex;
+  width: calc ( 100% - 60rpx);
+  height: 100%;
+  margin:0 30rpx;
+}
+.myposts .formData .formbg .form-item .row .u-col-5 {
+  width: 100%;
+  max-width: 300rpx;
+  text-align: center;
+  border: 1px solid #ccc;
+  height: 400rpx;
+  margin-right: 20rpx;
+  position: relative;
+
+}
+.myposts .formData .formbg .form-item .row .u-col-5 .imgscr {
+  width: 100%;
+  height: 100%;
+}
+.myposts .formData .formbg .form-item .list {
+  display: flex;
+  flex-wrap: wrap;
+}
+.myposts .formData .formbg .form-item .list .flex{
+  display: flex;
+}
+.myposts .formData .formbg .form-item .list .flex .custom-label .title-class{
+  width: 40rpx !important;
+  max-width:42px !important;
+}
+.myposts .formData .formbg .form-item .list .flex text{
+  position: relative;
+  top: 20rpx;
+}
+.myposts .formData .formbg .form-item .list .flex {
+  position: relative;
+}
+.myposts .formData .formbg .form-item .list .flex .van-radio .van-radio__icon-wrap .van-radio__icon {
+  position: absolute;
+  top: 26rpx;
+  z-index: 99;
+}
+.van-cell__value{
+  color: #323233 !important;
+}
+.myposts .formData .formbg .form-item .list .item {
+  font-size: 26rpx;
+  display: inline-block;
+  padding: 0rpx 24rpx;
+  line-height: 48rpx;
+  margin: 10rpx;
+  border-radius: 12rpx;
+  border: 2rpx solid #703EDD;
+  color: #703EDD;
+}
+.myposts .formData .formbg .form-item .row .u-col-5 .closeicon {
+  position: absolute;
+  right: 10rpx;
+  font-size: 30rpx;
+  width: 46rpx;
+  height: 46rpx;
+  border-radius: 46rpx;
+  background-color: #fff;
+  text-align: center;
+  color: red;
+
+}
+.myposts .formData .formbg .form-item .row .u-col-5 .closeicon .uicon-close::before {
+  margin-left: 8rpx;
+}
+.van-icon__image{
+  position: relative;
+  /* top: 0rpx; */
+}
+.myposts .formData .formbg .form-item .vancell__title{
+  flex: none;
+  width: 180rpx !important;
+}
+.van-cell{
+  padding-left: 5rpx !important;
+}
+.van-icon-success:before{
+  color: #fff;
+}
+@import "../../lib/weui.wxss";
+@import "./assets/iconfont.wxss";
+
+
+.ql-container {
+  box-sizing: border-box;
+  width: 100%;
+  height: 100%;
+  font-size: 16px;
+  line-height: 1.5;
+  overflow: auto;
+  padding: 10px 10px 20px 10px;
+  border: 1px solid #ECECEC;
+}
+
+.ql-active {
+  color: #22C704;
+}
+
+.iconfont {
+  display: inline-block;
+  width: 30px;
+  height: 30px;
+  cursor: pointer;
+  font-size: 20px;
+}
+
+.toolbar {
+  box-sizing: border-box;
+  padding: 0 10px;
+  height: 50px;
+  width: 100%;
+  position: fixed;
+  left: 0;
+  right: 100%;
+  bottom: 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border: 1px solid #ECECEC;
+  border-left: none;
+  border-right: none;
+}
diff --git a/litemall-wx/pages/search/search.js b/litemall-wx/pages/search/search.js
deleted file mode 100644
index 5336055c..00000000
--- a/litemall-wx/pages/search/search.js
+++ /dev/null
@@ -1,195 +0,0 @@
-var util = require('../../utils/util.js');
-var api = require('../../config/api.js');
-
-var app = getApp()
-Page({
-  data: {
-    keywrod: '',
-    searchStatus: false,
-    goodsList: [],
-    helpKeyword: [],
-    historyKeyword: [],
-    categoryFilter: false,
-    currentSort: 'name',
-    currentSortType: 'default',
-    currentSortOrder: 'desc',
-    filterCategory: [],
-    defaultKeyword: {},
-    hotKeyword: [],
-    page: 1,
-    limit: 20,
-    categoryId: 0
-  },
-  //事件处理函数
-  closeSearch: function() {
-    wx.navigateBack()
-  },
-  clearKeyword: function() {
-    this.setData({
-      keyword: '',
-      searchStatus: false
-    });
-  },
-  onLoad: function() {
-
-    this.getSearchKeyword();
-  },
-
-  getSearchKeyword() {
-    let that = this;
-    util.request(api.SearchIndex).then(function(res) {
-      if (res.errno === 0) {
-        that.setData({
-          historyKeyword: res.data.historyKeywordList,
-          defaultKeyword: res.data.defaultKeyword,
-          hotKeyword: res.data.hotKeywordList
-        });
-      }
-    });
-  },
-
-  inputChange: function(e) {
-    this.setData({
-      keyword: e.detail.value,
-      searchStatus: false
-    });
-
-    if (e.detail.value) {
-      this.getHelpKeyword();
-    }
-  },
-  getHelpKeyword: function() {
-    let that = this;
-    util.request(api.SearchHelper, {
-      keyword: that.data.keyword
-    }).then(function(res) {
-      if (res.errno === 0) {
-        that.setData({
-          helpKeyword: res.data
-        });
-      }
-    });
-  },
-  inputFocus: function() {
-    this.setData({
-      searchStatus: false,
-      goodsList: []
-    });
-
-    if (this.data.keyword) {
-      this.getHelpKeyword();
-    }
-  },
-  clearHistory: function() {
-    this.setData({
-      historyKeyword: []
-    })
-
-    util.request(api.SearchClearHistory, {}, 'POST')
-      .then(function(res) {
-        console.log('清除成功');
-      });
-  },
-  getGoodsList: function() {
-    let that = this;
-    util.request(api.GoodsList, {
-      keyword: that.data.keyword,
-      page: that.data.page,
-      limit: that.data.limit,
-      sort: that.data.currentSort,
-      order: that.data.currentSortOrder,
-      categoryId: that.data.categoryId
-    }).then(function(res) {
-      if (res.errno === 0) {
-        that.setData({
-          searchStatus: true,
-          categoryFilter: false,
-          goodsList: res.data.list,
-          filterCategory: res.data.filterCategoryList
-        });
-      }
-
-      //重新获取关键词
-      that.getSearchKeyword();
-    });
-  },
-  onKeywordTap: function(event) {
-
-    this.getSearchResult(event.target.dataset.keyword);
-
-  },
-  getSearchResult(keyword) {
-    if (keyword === '') {
-      keyword = this.data.defaultKeyword.keyword;
-    }
-    this.setData({
-      keyword: keyword,
-      page: 1,
-      categoryId: 0,
-      goodsList: []
-    });
-
-    this.getGoodsList();
-  },
-  openSortFilter: function(event) {
-    let currentId = event.currentTarget.id;
-    switch (currentId) {
-      case 'categoryFilter':
-        this.setData({
-          categoryFilter: !this.data.categoryFilter,
-          currentSortType: 'category',
-          currentSort: 'add_time',
-          currentSortOrder: 'desc'
-        });
-        break;
-      case 'priceSort':
-        let tmpSortOrder = 'asc';
-        if (this.data.currentSortOrder == 'asc') {
-          tmpSortOrder = 'desc';
-        }
-        this.setData({
-          currentSortType: 'price',
-          currentSort: 'retail_price',
-          currentSortOrder: tmpSortOrder,
-          categoryFilter: false
-        });
-
-        this.getGoodsList();
-        break;
-      default:
-        //综合排序
-        this.setData({
-          currentSortType: 'default',
-          currentSort: 'name',
-          currentSortOrder: 'desc',
-          categoryFilter: false,
-          categoryId: 0,
-        });
-        this.getGoodsList();
-    }
-  },
-  selectCategory: function(event) {
-    let currentIndex = event.target.dataset.categoryIndex;
-    let filterCategory = this.data.filterCategory;
-    let currentCategory = null;
-    for (let key in filterCategory) {
-      if (key == currentIndex) {
-        filterCategory[key].selected = true;
-        currentCategory = filterCategory[key];
-      } else {
-        filterCategory[key].selected = false;
-      }
-    }
-    this.setData({
-      filterCategory: filterCategory,
-      categoryFilter: false,
-      categoryId: currentCategory.id,
-      page: 1,
-      goodsList: []
-    });
-    this.getGoodsList();
-  },
-  onKeywordConfirm(event) {
-    this.getSearchResult(event.detail.value);
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/search/search.json b/litemall-wx/pages/search/search.json
deleted file mode 100644
index 73932cd8..00000000
--- a/litemall-wx/pages/search/search.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "搜索"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/search/search.wxml b/litemall-wx/pages/search/search.wxml
deleted file mode 100644
index da0d6184..00000000
--- a/litemall-wx/pages/search/search.wxml
+++ /dev/null
@@ -1,66 +0,0 @@
-<scroll-view class="container" style="height: 100%;">
-  <view class="search-header">
-    <view class="input-box">
-      <van-icon name="search"/>
-      <input name="input" class="keywrod" focus="true" value="{{keyword}}" confirm-type="search" bindinput="inputChange" bindfocus="inputFocus" bindconfirm="onKeywordConfirm" placeholder="{{defaultKeyword.keyword}}" />
-      <van-icon class="del" wx:if="{{keyword}}" bindtap="clearKeyword" name="cross" />
-    </view>
-    <view class="right" bindtap="closeSearch">取消</view>
-  </view>
-  <view class="no-search" wx:if="{{ !searchStatus}}">
-    <view class="search-keywords search-history" wx:if="{{!keyword  && historyKeyword.length}}">
-      <view class="h">
-        <text class="title">历史记录</text>
-        <van-icon bindtap="clearHistory" name="delete" class="icon"/>
-      </view>
-      <view class="b">
-        <view class="item" bindtap="onKeywordTap" data-keyword="{{item.keyword}}" wx:for="{{historyKeyword}}" wx:key="keyword" hover-class="navigator-hover">{{item.keyword}}</view>
-      </view>
-    </view>
-    <view class="search-keywords search-hot" wx:if="{{!keyword && hotKeyword.length}}">
-      <view class="h">
-        <text class="title">热门搜索</text>
-      </view>
-      <view class="b">
-        <view class="item {{item.is_hot === 1 ? 'active' : ''}}" hover-class="navigator-hover" bindtap="onKeywordTap" data-keyword="{{item.keyword}}" wx:for="{{hotKeyword}}" wx:key="id">{{item.keyword}}</view>
-      </view>
-    </view>
-    <view class="shelper-list" wx:if="{{keyword}}">
-      <view class="item" hover-class="navigator-hover" wx:for="{{helpKeyword}}" wx:key="id" bindtap="onKeywordTap" data-keyword="{{item}}">{{item}}</view>
-    </view>
-  </view>
-
-  <view class="search-result" wx:if="{{ searchStatus && goodsList.length}}">
-    <view class="sort">
-      <view class="sort-box">
-        <view class="item {{currentSortType == 'default' ? 'active' : ''}}" bindtap="openSortFilter" id="defaultSort">
-          <text class="txt">综合</text>
-        </view>
-        <view class="item {{currentSortType == 'price' ? 'active' : ''}}" bindtap="openSortFilter" id="priceSort">
-          <text class="txt">价格</text>
-          <van-icon name="arrow-up" wx:if="{{ currentSortType == 'price' && currentSortOrder == 'asc' }}" />
-          <van-icon name="arrow-down" wx:elif="{{ currentSortType == 'price' && currentSortOrder == 'desc'}}" />
-        </view>
-        <view class="item {{currentSortType == 'category' ? 'active' : ''}}" bindtap="openSortFilter" id="categoryFilter">
-          <text class="txt">分类</text>
-        </view>
-      </view>
-      <view class="sort-box-category" wx-if="{{categoryFilter}}">
-        <view class="item {{item.checked ? 'active' : ''}}" wx:for="{{filterCategory}}" wx:key="id" data-category-index="{{index}}" bindtap="selectCategory">{{item.name}}</view>
-      </view>
-    </view>
-    <view class="cate-item">
-      <view class="b">
-        <navigator class="item {{(iindex + 1) % 2 == 0 ? 'item-b' : ''}}" url="/pages/goods/goods?id={{iitem.id}}" wx:for="{{goodsList}}" wx:key="id" wx:for-item="iitem" wx:for-index="iindex">
-          <image class="img" src="{{iitem.picUrl}}" background-size="cover"></image>
-          <text class="name">{{iitem.name}}</text>
-          <text class="price">￥{{iitem.retailPrice}}</text>
-        </navigator>
-      </view>
-    </view>
-  </view>
-
-  <view class="search-result-empty" wx:if="{{!goodsList.length && searchStatus}}">
-    <text class="text">您寻找的商品还未上架</text>
-  </view>
-</scroll-view>
\ No newline at end of file
diff --git a/litemall-wx/pages/search/search.wxss b/litemall-wx/pages/search/search.wxss
deleted file mode 100644
index ece655f9..00000000
--- a/litemall-wx/pages/search/search.wxss
+++ /dev/null
@@ -1,318 +0,0 @@
-page {
-  min-height: 100%;
-  background-color: #f4f4f4;
-}
-
-.container {
-  min-height: 100%;
-  background-color: #f4f4f4;
-}
-
-.search-header {
-  position: fixed;
-  top: 0;
-  width: 750rpx;
-  height: 91rpx;
-  display: flex;
-  background: #fff;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.15);
-  padding: 0 31.25rpx;
-  font-size: 29rpx;
-  color: #333;
-}
-
-.search-header .van-icon-search {
-  line-height: 59rpx;
-}
-
-.search-header .input-box {
-  position: relative;
-  margin-top: 16rpx;
-  float: left;
-  width: 0;
-  flex: 1;
-  height: 59rpx;
-  line-height: 59rpx;
-  padding: 0 20rpx;
-  background: #f4f4f4;
-}
-
-.search-header .icon {
-  position: absolute;
-  top: 14rpx;
-  left: 20rpx;
-  width: 31rpx;
-  height: 31rpx;
-}
-
-.search-header .del {
-  position: absolute;
-  top: 3rpx;
-  right: 10rpx;
-  width: 53rpx;
-  height: 53rpx;
-  z-index: 10;
-}
-
-.search-header .keywrod {
-  position: absolute;
-  top: 0;
-  left: 40rpx;
-  width: 506rpx;
-  height: 59rpx;
-  padding-left: 30rpx;
-}
-
-.search-header .right {
-  margin-top: 24rpx;
-  margin-left: 31rpx;
-  margin-right: 6rpx;
-  width: 58rpx;
-  height: 43rpx;
-  line-height: 43rpx;
-  float: right;
-}
-
-.no-search {
-  height: auto;
-  overflow: hidden;
-  margin-top: 91rpx;
-}
-
-.search-keywords {
-  background: #fff;
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-  margin-bottom: 20rpx;
-}
-
-.search-keywords .h {
-  padding: 0 31.25rpx;
-  height: 93rpx;
-  line-height: 93rpx;
-  width: 100%;
-  color: #999;
-  font-size: 29rpx;
-}
-
-.search-keywords .title {
-  display: block;
-  width: 120rpx;
-  float: left;
-}
-
-.search-keywords .icon {
-  margin-top: 19rpx;
-  float: right;
-  display: block;
-  margin-left: 511rpx;
-  height: 55rpx;
-  width: 55rpx;
-}
-
-.search-keywords .b {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-  padding-left: 31.25rpx;
-}
-
-.search-keywords .item {
-  display: inline-block;
-  width: auto;
-  height: 48rpx;
-  line-height: 48rpx;
-  padding: 0 15rpx;
-  border: 1px solid #999;
-  margin: 0 31.25rpx 31.25rpx 0;
-  font-size: 24rpx;
-  color: #333;
-}
-
-.search-keywords .item.active {
-  color: #b4282d;
-  border: 1px solid #b4282d;
-}
-
-.shelper-list {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-  background: #fff;
-  padding: 0 31.25rpx;
-}
-
-.shelper-list .item {
-  height: 93rpx;
-  width: 687.5rpx;
-  line-height: 93rpx;
-  font-size: 24rpx;
-  color: #333;
-  border-bottom: 1px solid #f4f4f4;
-}
-
-.sort {
-  position: fixed;
-  top: 91rpx;
-  background: #fff;
-  width: 100%;
-  height: 78rpx;
-}
-
-.sort-box {
-  background: #fff;
-  width: 100%;
-  height: 78rpx;
-  overflow: hidden;
-  padding: 0 30rpx;
-  display: flex;
-  border-bottom: 1px solid #d9d9d9;
-}
-
-.sort-box .item {
-  height: 78rpx;
-  line-height: 78rpx;
-  text-align: center;
-  flex: 1;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.sort-box .item .txt {
-  color: #333;
-}
-
-.sort-box .item.active .txt {
-  color: #b4282d;
-}
-
-.sort-box .item .van-icon {
-  margin-left: 6rpx;
-}
-
-.sort-box-category {
-  background: #fff;
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-  padding: 40rpx 40rpx 0 0;
-  border-bottom: 1px solid #d9d9d9;
-}
-
-.sort-box-category .item {
-  height: 54rpx;
-  line-height: 54rpx;
-  text-align: center;
-  float: left;
-  padding: 0 16rpx;
-  margin: 0 0 40rpx 40rpx;
-  border: 1px solid #666;
-  color: #333;
-  font-size: 24rpx;
-}
-
-.sort-box-category .item.active {
-  color: #b4282d;
-  border: 1px solid #b4282d;
-}
-
-.cate-item {
-  margin-top: 175rpx;
-  height: auto;
-  overflow: hidden;
-}
-
-.cate-item .h {
-  height: 145rpx;
-  width: 750rpx;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-
-.cate-item .h .name {
-  display: block;
-  height: 35rpx;
-  margin-bottom: 18rpx;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.cate-item .h .desc {
-  display: block;
-  height: 24rpx;
-  font-size: 24rpx;
-  color: #999;
-}
-
-.cate-item .b {
-  width: 750rpx;
-  padding: 0 6.25rpx;
-  height: auto;
-  overflow: hidden;
-}
-
-.cate-item .list-filter {
-  height: 80rpx;
-  width: 100%;
-  background: #fff;
-  margin-bottom: 6.25rpx;
-}
-
-.cate-item .b .item {
-  float: left;
-  background: #fff;
-  width: 365rpx;
-  margin-bottom: 6.25rpx;
-  padding-bottom: 33.333rpx;
-  height: auto;
-  overflow: hidden;
-  text-align: center;
-}
-
-.cate-item .b .item-b {
-  margin-left: 6.25rpx;
-}
-
-.cate-item .item .img {
-  width: 302rpx;
-  height: 302rpx;
-}
-
-.cate-item .item .name {
-  display: block;
-  width: 365.625rpx;
-  height: 35rpx;
-  margin: 11.5rpx 0 22rpx 0;
-  text-align: center;
-  overflow: hidden;
-  padding: 0 20rpx;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.cate-item .item .price {
-  display: block;
-  width: 365.625rpx;
-  height: 30rpx;
-  text-align: center;
-  font-size: 30rpx;
-  color: #b4282d;
-}
-
-.search-result-empty {
-  width: 100%;
-  height: 100%;
-  padding-top: 600rpx;
-}
-
-.search-result-empty .text {
-  display: block;
-  width: 100%;
-  height: 40rpx;
-  font-size: 28rpx;
-  text-align: center;
-  color: #999;
-}
diff --git a/litemall-wx/pages/topic/topic.js b/litemall-wx/pages/topic/topic.js
deleted file mode 100644
index 809a9cc8..00000000
--- a/litemall-wx/pages/topic/topic.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var util = require('../../utils/util.js');
-var api = require('../../config/api.js');
-var app = getApp()
-Page({
-  data: {
-    topicList: [],
-    page: 1,
-    limit: 10,
-    count: 0,
-    scrollTop: 0,
-    showPage: false
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    this.getTopic();
-  },
-  onReady: function() {
-    // 页面渲染完成
-  },
-  onShow: function() {
-    // 页面显示
-  },
-  onHide: function() {
-    // 页面隐藏
-  },
-  onUnload: function() {
-    // 页面关闭
-  },
-  nextPage: function(event) {
-    var that = this;
-    if (this.data.page > that.data.count / that.data.limit) {
-      return true;
-    }
-
-
-    that.setData({
-      page: that.data.page + 1
-    });
-
-    this.getTopic();
-
-  },
-  getTopic: function() {
-
-    let that = this;
-    that.setData({
-      scrollTop: 0,
-      showPage: false,
-      topicList: []
-    });
-    // 页面渲染完成
-    wx.showToast({
-      title: '加载中...',
-      icon: 'loading',
-      duration: 2000
-    });
-
-    util.request(api.TopicList, {
-      page: that.data.page,
-      limit: that.data.limit
-    }).then(function(res) {
-      if (res.errno === 0) {
-
-        that.setData({
-          scrollTop: 0,
-          topicList: res.data.list,
-          showPage: true,
-          count: res.data.total
-        });
-      }
-      wx.hideToast();
-    });
-
-  },
-  prevPage: function(event) {
-    if (this.data.page <= 1) {
-      return false;
-    }
-
-    var that = this;
-    that.setData({
-      page: that.data.page - 1
-    });
-    this.getTopic();
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/topic/topic.json b/litemall-wx/pages/topic/topic.json
deleted file mode 100644
index d498a047..00000000
--- a/litemall-wx/pages/topic/topic.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "专题"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/topic/topic.wxml b/litemall-wx/pages/topic/topic.wxml
deleted file mode 100644
index b0eb6cd0..00000000
--- a/litemall-wx/pages/topic/topic.wxml
+++ /dev/null
@@ -1,16 +0,0 @@
-<view class="container">
-  <scroll-view class="topic-list" scroll-y="true" scroll-top="{{scrollTop}}">
-    <navigator class="item" wx:for="{{topicList}}" wx:key="id" url="../topicDetail/topicDetail?id={{item.id}}">
-      <image class="img" src="{{item.picUrl}}"></image>
-      <view class="info">
-        <text class="title">{{item.title}}</text>
-        <text class="desc">{{item.subtitle}}</text>
-        <text class="price">{{item.price}}元起</text>
-      </view>
-    </navigator>
-    <view class="page" wx:if="{{showPage}}">
-      <view class="prev {{ page <= 1 ? 'disabled' : ''}}" bindtap="prevPage">上一页</view>
-      <view class="next {{ (count / size) < page ? 'disabled' : ''}}" bindtap="nextPage">下一页</view>
-    </view>
-  </scroll-view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/topic/topic.wxss b/litemall-wx/pages/topic/topic.wxss
deleted file mode 100644
index 00f4debe..00000000
--- a/litemall-wx/pages/topic/topic.wxss
+++ /dev/null
@@ -1,94 +0,0 @@
-page ,.container{
-   width: 750rpx;
-    height: 100%;
-    overflow: hidden;
-    background: #f4f4f4;
-}
-.topic-list{
-    width: 750rpx;
-    height: 100%;
-    overflow: hidden;
-    background: #f4f4f4;
-}
-
-.topic-list .item{
-    width: 100%;
-    height: 625rpx;
-    overflow: hidden;
-    background: #fff;
-    margin-bottom: 20rpx;
-}
-
-.topic-list .img{
-    width: 100%;
-    height: 415rpx;
-}
-
-.topic-list .info{
-    width: 100%;
-    height: 210rpx;
-    overflow: hidden;
-}
-
-.topic-list .title{
-    display: block;
-    text-align: center;
-    width: 100%;
-    height: 33rpx;
-    line-height: 35rpx;
-    color: #333;
-    overflow: hidden;
-    font-size: 35rpx;
-    margin-top: 30rpx;
-}
-
-.topic-list .desc{
-    display: block;
-    text-align: center;
-    position: relative;
-    width: auto;
-    height: 24rpx;
-    line-height: 24rpx;
-    overflow: hidden;
-    color: #999;
-    font-size: 24rpx;
-    margin-top: 16rpx;
-    margin-bottom: 30rpx;
-}
-
-.topic-list .price{
-    display: block;
-    text-align: center;
-    width: 100%;
-    height: 27rpx;
-    line-height: 27rpx;
-    overflow: hidden;
-    color: #b4282d;
-    font-size: 27rpx;
-}
-
-
-.page{
-    width: 750rpx;
-    height: 108rpx;
-    background: #fff;
-    margin-bottom: 20rpx;
-}
-
-.page view{
-    height: 108rpx;
-    width: 50%;
-    float: left;
-    font-size: 29rpx;
-    color: #333;
-    text-align: center;
-    line-height: 108rpx;
-}
-
-.page .prev{
-    border-right: 1px solid #D9D9D9;
-}
-
-.page .disabled{
-    color: #ccc;
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/topicComment/topicComment.js b/litemall-wx/pages/topicComment/topicComment.js
deleted file mode 100644
index 5fc4ce42..00000000
--- a/litemall-wx/pages/topicComment/topicComment.js
+++ /dev/null
@@ -1,131 +0,0 @@
-var app = getApp();
-var util = require('../../utils/util.js');
-
-var api = require('../../config/api.js');
-
-Page({
-  data: {
-    comments: [],
-    allCommentList: [],
-    picCommentList: [],
-    type: 0,
-    valueId: 0,
-    showType: 0,
-    allCount: 0,
-    hasPicCount: 0,
-    allPage: 1,
-    picPage: 1,
-    limit: 20
-  },
-  getCommentCount: function() {
-    let that = this;
-    util.request(api.CommentCount, {
-      valueId: that.data.valueId,
-      type: that.data.type
-    }).then(function(res) {
-      if (res.errno === 0) {
-
-        that.setData({
-          allCount: res.data.allCount,
-          hasPicCount: res.data.hasPicCount
-        });
-      }
-    });
-  },
-  getCommentList: function() {
-    let that = this;
-    util.request(api.CommentList, {
-      valueId: that.data.valueId,
-      type: that.data.type,
-      limit: that.data.limit,
-      page: (that.data.showType == 0 ? that.data.allPage : that.data.picPage),
-      showType: that.data.showType
-    }).then(function(res) {
-      if (res.errno === 0) {
-
-        if (that.data.showType == 0) {
-          that.setData({
-            allCommentList: that.data.allCommentList.concat(res.data.list),
-            allPage: res.data.page,
-            comments: that.data.allCommentList.concat(res.data.list)
-          });
-        } else {
-          that.setData({
-            picCommentList: that.data.picCommentList.concat(res.data.list),
-            picPage: res.data.page,
-            comments: that.data.picCommentList.concat(res.data.list)
-          });
-        }
-      }
-    });
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    this.setData({
-      type: options.type,
-      valueId: options.valueId
-    });
-    this.getCommentCount();
-    this.getCommentList();
-  },
-  onPullDownRefresh() {
-    wx.showNavigationBarLoading() //在标题栏中显示加载
-    this.getCommentCount();
-    this.getCommentList();
-    wx.hideNavigationBarLoading() //完成停止加载
-    wx.stopPullDownRefresh() //停止下拉刷新
-  },
-  onReady: function() {
-    // 页面渲染完成
-
-  },
-  onShow: function() {
-    // 页面显示
-
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-
-  },
-  switchTab: function () {
-    let that = this;
-    if (that.data.showType == 0) {
-      that.setData({
-        allCommentList: [],
-        allPage: 1,
-        comments: [],
-        showType: 1
-      });
-    } else {
-      that.setData({
-        picCommentList: [],
-        picPage: 1,
-        comments: [],
-        showType: 0
-      });
-    }
-    this.getCommentList();
-  },
-  onReachBottom: function() {
-    if (this.data.showType == 0) {
-      if (this.data.allCount / this.data.limit < this.data.allPage) {
-        return false;
-      }
-      this.setData({
-        allPage: this.data.allPage + 1
-      });
-    } else {
-      if (this.data.hasPicCount / this.data.limit < this.data.picPage) {
-        return false;
-      }
-      this.setData({
-        picPage: this.data.picPage + 1
-      });
-    }
-    this.getCommentList();
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/topicComment/topicComment.json b/litemall-wx/pages/topicComment/topicComment.json
deleted file mode 100644
index 7541072f..00000000
--- a/litemall-wx/pages/topicComment/topicComment.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "enablePullDownRefresh": true,
-  "navigationBarTitleText": "评论"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/topicComment/topicComment.wxml b/litemall-wx/pages/topicComment/topicComment.wxml
deleted file mode 100644
index c4744eed..00000000
--- a/litemall-wx/pages/topicComment/topicComment.wxml
+++ /dev/null
@@ -1,26 +0,0 @@
-<view class="comments">
-  <view class="h">
-    <view class="item {{ showType == 0 ? 'active' : ''}}" bindtap="switchTab">
-      <view class="txt">全部({{allCount}})</view>
-    </view>
-    <view class="item {{ showType == 0 ? '' : 'active'}}" bindtap="switchTab">
-      <view class="txt">有图({{hasPicCount}})</view>
-    </view>
-  </view>
-  <view class="b">
-    <view class="item" wx:for="{{comments}}" wx:key="id">
-      <view class="info">
-        <view class="user">
-          <image src="{{item.userInfo.avatarUrl}}"></image>
-          <text>{{item.userInfo.nickName}}</text>
-        </view>
-        <view class="time">{{item.addTime}}</view>
-      </view>
-      <view class="comment">{{item.content}}</view>
-      <view class="imgs" wx:if="{{item.picList.length > 0}}">
-        <image class="img" wx:for="{{item.picList}}" wx:key="*this" wx:for-item="pitem" src="{{pitem}}"></image>
-      </view>
-    </view>
-
-  </view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/topicComment/topicComment.wxss b/litemall-wx/pages/topicComment/topicComment.wxss
deleted file mode 100644
index 33446aca..00000000
--- a/litemall-wx/pages/topicComment/topicComment.wxss
+++ /dev/null
@@ -1,144 +0,0 @@
-.comments {
-  width: 100%;
-  height: auto;
-  padding-left: 30rpx;
-  background: #fff;
-  margin: 20rpx 0;
-}
-
-
-.comments .h {
-  position: fixed;
-  left: 0;
-  top: 0;
-  z-index: 1000;
-  width: 100%;
-  display: flex;
-  background: #fff;
-  height: 84rpx;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.15);
-}
-
-.comments .h .item {
-  display: inline-block;
-  height: 82rpx;
-  width: 50%;
-  padding: 0 15rpx;
-  text-align: center;
-}
-
-.comments .h .item .txt {
-  display: inline-block;
-  height: 82rpx;
-  padding: 0 20rpx;
-  line-height: 82rpx;
-  color: #333;
-  font-size: 30rpx;
-  width: 170rpx;
-}
-
-.comments .h .item.active .txt {
-  color: #ab2b2b;
-  border-bottom: 4rpx solid #ab2b2b;
-}
-
-.comments .b {
-  margin-top: 85rpx;
-  height: auto;
-  width: 720rpx;
-}
-
-.comments .b.no-h {
-  margin-top: 0;
-}
-
-.comments .item {
-  height: auto;
-  width: 720rpx;
-  overflow: hidden;
-  border-bottom: 1px solid #d9d9d9;
-  padding-bottom: 25rpx;
-}
-
-.comments .info {
-  height: 127rpx;
-  width: 100%;
-  padding: 33rpx 0 27rpx 0;
-}
-
-.comments .user {
-  float: left;
-  width: auto;
-  height: 67rpx;
-  line-height: 67rpx;
-  font-size: 0;
-}
-
-.comments .user image {
-  float: left;
-  width: 67rpx;
-  height: 67rpx;
-  margin-right: 17rpx;
-  border-radius: 50%;
-}
-
-.comments .user text {
-  display: inline-block;
-  width: auto;
-  height: 66rpx;
-  overflow: hidden;
-  font-size: 29rpx;
-  line-height: 66rpx;
-}
-
-.comments .time {
-  display: block;
-  float: right;
-  width: auto;
-  height: 67rpx;
-  line-height: 67rpx;
-  color: #7f7f7f;
-  font-size: 25rpx;
-  margin-right: 30rpx;
-}
-
-.comments .comment {
-  width: 720rpx;
-  padding-right: 30rpx;
-  line-height: 45.8rpx;
-  font-size: 29rpx;
-  margin-bottom: 16rpx;
-}
-
-.comments .imgs {
-  width: 720rpx;
-  height: 150rpx;
-  margin-bottom: 25rpx;
-}
-
-.comments .imgs .img {
-  height: 150rpx;
-  width: 150rpx;
-  margin-right: 28rpx;
-}
-
-.comments .customer-service {
-  width: 690rpx;
-  height: auto;
-  overflow: hidden;
-  margin-top: 23rpx;
-  background: rgba(0, 0, 0, 0.03);
-  padding: 21rpx;
-}
-
-.comments .customer-service .u {
-  font-size: 24rpx;
-  color: #333;
-  line-height: 37.5rpx;
-}
-
-.comments .customer-service .c {
-  font-size: 24rpx;
-  color: #999;
-  line-height: 37.5rpx;
-}
diff --git a/litemall-wx/pages/topicCommentPost/topicCommentPost.js b/litemall-wx/pages/topicCommentPost/topicCommentPost.js
deleted file mode 100644
index 78ad3ae4..00000000
--- a/litemall-wx/pages/topicCommentPost/topicCommentPost.js
+++ /dev/null
@@ -1,177 +0,0 @@
-// 上传组件 基于https://github.com/Tencent/weui-wxss/tree/master/src/example/uploader
-var app = getApp();
-var util = require('../../utils/util.js');
-var api = require('../../config/api.js');
-Page({
-  data: {
-    valueId: 0,
-    topic: {},
-    content: '',
-    stars: [0, 1, 2, 3, 4],
-    star: 5,
-    starText: '十分满意',
-    hasPicture: false,
-    picUrls: [],
-    files: []
-  },
-  chooseImage: function(e) {
-    if (this.data.files.length >= 5) {
-      util.showErrorToast('只能上传五张图片')
-      return false;
-    }
-
-    var that = this;
-    wx.chooseImage({
-      count: 1,
-      sizeType: ['original', 'compressed'],
-      sourceType: ['album', 'camera'],
-      success: function(res) {
-        that.setData({
-          files: that.data.files.concat(res.tempFilePaths)
-        });
-        that.upload(res);
-      }
-    })
-  },
-  upload: function(res) {
-    var that = this;
-    const uploadTask = wx.uploadFile({
-      url: api.StorageUpload,
-      filePath: res.tempFilePaths[0],
-      name: 'file',
-      success: function(res) {
-        var _res = JSON.parse(res.data);
-        if (_res.errno === 0) {
-          var url = _res.data.url
-          that.data.picUrls.push(url)
-          that.setData({
-            hasPicture: true,
-            picUrls: that.data.picUrls
-          })
-        }
-      },
-      fail: function(e) {
-        wx.showModal({
-          title: '错误',
-          content: '上传失败',
-          showCancel: false
-        })
-      },
-    })
-
-    uploadTask.onProgressUpdate((res) => {
-      console.log('上传进度', res.progress)
-      console.log('已经上传的数据长度', res.totalBytesSent)
-      console.log('预期需要上传的数据总长度', res.totalBytesExpectedToSend)
-    })
-
-  },
-  previewImage: function(e) {
-    wx.previewImage({
-      current: e.currentTarget.id, // 当前显示图片的http链接
-      urls: this.data.files // 需要预览的图片http链接列表
-    })
-  },
-  selectRater: function(e) {
-    var star = e.currentTarget.dataset.star + 1;
-    var starText;
-    if (star == 1) {
-      starText = '很差';
-    } else if (star == 2) {
-      starText = '不太满意';
-    } else if (star == 3) {
-      starText = '满意';
-    } else if (star == 4) {
-      starText = '比较满意';
-    } else {
-      starText = '十分满意'
-    }
-    this.setData({
-      star: star,
-      starText: starText
-    })
-
-  },
-  onLoad: function(options) {
-    if (parseInt(options.type) !== 1) {
-      return;
-    }
-
-    var that = this;
-    that.setData({
-      valueId: options.valueId
-    });
-    this.getTopic();
-  },
-  getTopic: function() {
-    let that = this;
-    util.request(api.TopicDetail, {
-      id: that.data.valueId
-    }).then(function(res) {
-      if (res.errno === 0) {
-
-        that.setData({
-          topic: res.data.topic
-        });
-
-      }
-    });
-  },
-  onClose: function() {
-    wx.navigateBack();
-  },
-  onPost: function() {
-    let that = this;
-
-    if (!this.data.content) {
-      util.showErrorToast('请填写评论')
-      return false;
-    }
-
-    util.request(api.CommentPost, {
-      type: 1,
-      valueId: that.data.valueId,
-      content: that.data.content,
-      star: that.data.star,
-      hasPicture: that.data.hasPicture,
-      picUrls: that.data.picUrls
-    }, 'POST').then(function(res) {
-      if (res.errno === 0) {
-        wx.showToast({
-          title: '评论成功',
-          complete: function() {
-            wx.navigateBack();
-          }
-        })
-      }
-    });
-  },
-  bindInputValue(event) {
-
-    let value = event.detail.value;
-
-    //判断是否超过140个字符
-    if (value && value.length > 140) {
-      return false;
-    }
-
-    this.setData({
-      content: event.detail.value,
-    })
-  },
-  onReady: function() {
-
-  },
-  onShow: function() {
-    // 页面显示
-
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/topicCommentPost/topicCommentPost.json b/litemall-wx/pages/topicCommentPost/topicCommentPost.json
deleted file mode 100644
index eee523f9..00000000
--- a/litemall-wx/pages/topicCommentPost/topicCommentPost.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "评论"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/topicCommentPost/topicCommentPost.wxml b/litemall-wx/pages/topicCommentPost/topicCommentPost.wxml
deleted file mode 100644
index 08c1562e..00000000
--- a/litemall-wx/pages/topicCommentPost/topicCommentPost.wxml
+++ /dev/null
@@ -1,51 +0,0 @@
-<view class="container">
-  <view class="post-comment">
-    <view class="goods">
-      <view class="img">
-        <image src="{{topic.picUrl}}"></image>
-      </view>
-      <view class="info">
-        <view class="t">
-          <text class="name">{{topic.title}}</text>
-        </view>
-        <view class="attr">{{topic.subtitle}}</view>
-      </view>
-    </view>
-    <view class="rater">
-      <text class="rater-title">评分</text>
-      <block wx:for="{{stars}}" wx:key="*this" wx:for-item="item">
-        <van-icon name="star" bindtap="selectRater" color="#ab956d" data-star="{{item}}" wx:if="{{item < star}}"/>
-        <van-icon name="star-o" bindtap="selectRater" data-star="{{item}}" wx:else/>
-      </block>
-      <text class="rater-desc">{{starText}}</text>
-    </view>
-    <view class="input-box">
-      <textarea class="content" focus="true" bindinput="bindInputValue" maxlength="140" placeholder="留言经过筛选后，对所有人可见" />
-      <text class="count">{{140 - content.length}}</text>
-    </view>
-
-    <view class="weui-uploader">
-      <view class="weui-uploader__hd">
-        <view class="weui-uploader__title">图片上传</view>
-        <view class="weui-uploader__info">{{picUrls.length}}/{{files.length}}</view>
-      </view>
-      <view class="weui-uploader__bd">
-        <view class="weui-uploader__files" id="uploaderFiles">
-          <block wx:for="{{files}}" wx:key="*this">
-            <view class="weui-uploader__file" bindtap="previewImage" id="{{item}}">
-              <image class="weui-uploader__img" src="{{item}}" mode="aspectFill" />
-            </view>
-          </block>
-          <view class="weui-uploader__input-box">
-            <view class="weui-uploader__input" bindtap="chooseImage"></view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <view class="btns">
-      <view class="close" bindtap="onClose">取消</view>
-      <view class="post" bindtap="onPost">发表</view>
-    </view>
-  </view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/topicCommentPost/topicCommentPost.wxss b/litemall-wx/pages/topicCommentPost/topicCommentPost.wxss
deleted file mode 100644
index dae5457a..00000000
--- a/litemall-wx/pages/topicCommentPost/topicCommentPost.wxss
+++ /dev/null
@@ -1,246 +0,0 @@
-page, .container {
-  height: 100%;
-  background: #f4f4f4;
-}
-
-.post-comment {
-  width: 750rpx;
-  height: auto;
-  overflow: hidden;
-  padding: 30rpx;
-  background: #fff;
-}
-
-.post-comment .goods {
-  display: flex;
-  align-items: center;
-  height: 199rpx;
-  margin-left: 31.25rpx;
-}
-
-.post-comment .goods .img {
-  height: 145.83rpx;
-  width: 145.83rpx;
-  background: #f4f4f4;
-}
-
-.post-comment .goods .img image {
-  height: 145.83rpx;
-  width: 145.83rpx;
-}
-
-.post-comment .goods .info {
-  height: 145.83rpx;
-  flex: 1;
-  padding-left: 20rpx;
-}
-
-.post-comment .goods .name {
-  margin-top: 30rpx;
-  display: block;
-  height: 44rpx;
-  line-height: 44rpx;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.post-comment .goods .number {
-  display: block;
-  height: 37rpx;
-  line-height: 37rpx;
-  color: #666;
-  font-size: 25rpx;
-}
-
-.post-comment .goods .status {
-  width: 105rpx;
-  color: #b4282d;
-  font-size: 25rpx;
-}
-
-.post-comment .rater {
-  display: flex;
-  flex-direction: row;
-  height: 55rpx;
-}
-
-.post-comment .rater .rater-title {
-  font-size: 29rpx;
-  padding-right: 10rpx;
-}
-
-.post-comment .rater image {
-  padding-left: 5rpx;
-  height: 50rpx;
-  width: 50rpx;
-}
-
-.post-comment .rater .rater-desc {
-  font-size: 29rpx;
-  padding-left: 10rpx;
-}
-
-.post-comment .input-box {
-  height: 337.5rpx;
-  width: 690rpx;
-  position: relative;
-  background: #fff;
-}
-
-.post-comment .input-box .content {
-  position: absolute;
-  top: 0;
-  left: 0;
-  display: block;
-  background: #fff;
-  font-size: 29rpx;
-  border: 5px solid #f4f4f4;
-  height: 300rpx;
-  width: 650rpx;
-  padding: 20rpx;
-}
-
-.post-comment .input-box .count {
-  position: absolute;
-  bottom: 20rpx;
-  right: 20rpx;
-  display: block;
-  height: 30rpx;
-  width: 50rpx;
-  font-size: 29rpx;
-  color: #999;
-}
-
-.post-comment .btns {
-  height: 108rpx;
-}
-
-.post-comment .close {
-  float: left;
-  height: 108rpx;
-  line-height: 108rpx;
-  text-align: left;
-  color: #666;
-  padding: 0 30rpx;
-}
-
-.post-comment .post {
-  float: right;
-  height: 108rpx;
-  line-height: 108rpx;
-  text-align: right;
-  padding: 0 30rpx;
-}
-
-.weui-uploader {
-  margin-top: 50rpx;
-}
-
-.weui-uploader__hd {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  padding-bottom: 10px;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-  align-items: center;
-}
-
-.weui-uploader__title {
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-  flex: 1;
-}
-
-.weui-uploader__info {
-  color: #b2b2b2;
-}
-
-.weui-uploader__bd {
-  margin-bottom: -4px;
-  margin-right: -9px;
-  overflow: hidden;
-}
-
-.weui-uploader__file {
-  float: left;
-  margin-right: 9px;
-  margin-bottom: 9px;
-}
-
-.weui-uploader__img {
-  display: block;
-  width: 79px;
-  height: 79px;
-}
-
-.weui-uploader__file_status {
-  position: relative;
-}
-
-.weui-uploader__file_status:before {
-  content: " ";
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-.weui-uploader__file-content {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  -webkit-transform: translate(-50%, -50%);
-  transform: translate(-50%, -50%);
-  color: #fff;
-}
-
-.weui-uploader__input-box {
-  float: left;
-  position: relative;
-  margin-right: 9px;
-  margin-bottom: 9px;
-  width: 77px;
-  height: 77px;
-  border: 1px solid #d9d9d9;
-}
-
-.weui-uploader__input-box:after, .weui-uploader__input-box:before {
-  content: " ";
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  -webkit-transform: translate(-50%, -50%);
-  transform: translate(-50%, -50%);
-  background-color: #d9d9d9;
-}
-
-.weui-uploader__input-box:before {
-  width: 2px;
-  height: 39.5px;
-}
-
-.weui-uploader__input-box:after {
-  width: 39.5px;
-  height: 2px;
-}
-
-.weui-uploader__input-box:active {
-  border-color: #999;
-}
-
-.weui-uploader__input-box:active:after, .weui-uploader__input-box:active:before {
-  background-color: #999;
-}
-
-.weui-uploader__input {
-  position: absolute;
-  z-index: 1;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  opacity: 0;
-}
diff --git a/litemall-wx/pages/topicDetail/topicDetail.json b/litemall-wx/pages/topicDetail/topicDetail.json
deleted file mode 100644
index 69d3b20f..00000000
--- a/litemall-wx/pages/topicDetail/topicDetail.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "专题详情"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/topicDetail/topicDetail.wxml b/litemall-wx/pages/topicDetail/topicDetail.wxml
deleted file mode 100644
index cd1eef89..00000000
--- a/litemall-wx/pages/topicDetail/topicDetail.wxml
+++ /dev/null
@@ -1,68 +0,0 @@
-<scroll-view class="container">
-  <scroll-view class="content">
-    <import src="../../lib/wxParse/wxParse.wxml" />
-    <template is="wxParse" data="{{wxParseData:topicDetail.nodes}}" />
-  </scroll-view>
-  <scroll-view class="sv-goods" wx:if="{{topicGoods.length > 0 }}">
-    <view class="topic-goods">
-      <view class="h">
-        <text class="t">专题商品</text>     
-        <van-icon class="i" bindtap="addCollectOrNot" name="star" wx:if="{{collect}}" color="#ab956d"/>
-        <van-icon class="i" bindtap="addCollectOrNot" name="star-o" wx:else/>
-      </view>
-      <view class="b">
-        <view class="item" wx:for="{{topicGoods}}" wx:for-index="index" wx:for-item="item" wx:key="id">
-          <navigator url="/pages/goods/goods?id={{item.id}}">
-            <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
-            <view class="right">
-              <view class="text">
-                <text class="name">{{item.name}}</text>
-                <text class="desc">{{item.brief}}</text>
-                <text class="price">￥{{item.retailPrice}}</text>
-              </view>
-            </view>
-          </navigator>
-        </view>
-      </view>
-    </view>
-  </scroll-view>
-  <scroll-view class="comments">
-    <view class="h">
-      <text class="t">精选留言</text>
-      <van-icon bindtap="postComment" class="i" name="comment-o" />      
-    </view>
-    <view class="has-comments" wx:if="{{commentList.length > 0 }}">
-      <view class="b">
-        <view class="item" wx:for="{{commentList}}" wx:key="id">
-          <view class="info">
-            <view class="user">
-              <image class="avatar" src="{{item.userInfo.avatarUrl}}"></image>
-              <text class="nickname">{{item.userInfo.nickName}}</text>
-            </view>
-            <view class="time">{{item.addTime}}</view>
-          </view>
-          <view class="comment">
-            {{item.content}}
-          </view>
-        </view>
-      </view>
-      <view class="load" wx:if="{{commentCount > 5}}">
-        <navigator url="/pages/topicComment/topicComment?valueId={{topic.id}}&type=1">查看更多</navigator>
-      </view>
-    </view>
-    <view class="no-comments" wx:if="{{commentList.length <= 0}}">
-      <text class="txt">等你来留言</text>
-    </view>
-  </scroll-view>
-  <scroll-view class="rec-box">
-    <view class="h">
-      <text class="txt">专题推荐</text>
-    </view>
-    <view class="b">
-      <navigator class="item" wx:for="{{topicList}}" wx:key="id" url="../topicDetail/topicDetail?id={{item.id}}">
-        <image class="img" src="{{item.picUrl}}"></image>
-        <text class="title">{{item.title}}</text>
-      </navigator>
-    </view>
-  </scroll-view>
-</scroll-view>
\ No newline at end of file
diff --git a/litemall-wx/pages/topicDetail/topicDetail.wxss b/litemall-wx/pages/topicDetail/topicDetail.wxss
deleted file mode 100644
index a7a10b03..00000000
--- a/litemall-wx/pages/topicDetail/topicDetail.wxss
+++ /dev/null
@@ -1,268 +0,0 @@
-.content {
-  width: 100%;
-  height: auto;
-  font-size: 0;
-}
-
-.content image {
-  display: inline-block;
-  width: 100%;
-}
-
-.comments {
-  width: 100%;
-  height: auto;
-  padding-left: 30rpx;
-  background: #fff;
-  margin-top: 20rpx;
-}
-
-.comments .h {
-  height: 93rpx;
-  line-height: 93rpx;
-  width: 720rpx;
-  padding-right: 30rpx;
-  border-bottom: 1px solid #d9d9d9;
-}
-
-.comments .h .t {
-  display: block;
-  float: left;
-  width: 50%;
-  font-size: 29rpx;
-  color: #333;
-}
-
-.comments .h .i {
-  display: block;
-  float: right;
-  width: 33rpx;
-  height: 33rpx;
-}
-
-.comments .b {
-  height: auto;
-  width: 720rpx;
-}
-
-.comments .item {
-  height: auto;
-  width: 720rpx;
-  overflow: hidden;
-  border-bottom: 1px solid #d9d9d9;
-}
-
-.comments .info {
-  height: 127rpx;
-  width: 100%;
-  padding: 33rpx 0 27rpx 0;
-}
-
-.comments .user {
-  float: left;
-  width: auto;
-  height: 67rpx;
-  line-height: 67rpx;
-  font-size: 0;
-}
-
-.comments .user .avatar {
-  display: block;
-  float: left;
-  width: 67rpx;
-  height: 67rpx;
-  margin-right: 17rpx;
-  border-radius: 50%;
-}
-
-.comments .user .nickname {
-  display: block;
-  width: auto;
-  float: left;
-  height: 66rpx;
-  overflow: hidden;
-  font-size: 29rpx;
-  line-height: 66rpx;
-}
-
-.comments .time {
-  display: block;
-  float: right;
-  width: auto;
-  height: 67rpx;
-  line-height: 67rpx;
-  color: #7f7f7f;
-  font-size: 25rpx;
-  margin-right: 30rpx;
-}
-
-.comments .comment {
-  width: 720rpx;
-  padding-right: 30rpx;
-  line-height: 45.8rpx;
-  margin-bottom: 30rpx;
-  font-size: 29rpx;
-  color: #333;
-}
-
-.comments .load {
-  width: 720rpx;
-  height: 108rpx;
-  line-height: 108rpx;
-  text-align: center;
-  font-size: 38.5rpx;
-}
-
-.no-comments {
-  height: 297rpx;
-}
-
-.no-comments .txt {
-  height: 43rpx;
-  line-height: 43rpx;
-  display: block;
-  width: 100%;
-  text-align: center;
-  font-size: 29rpx;
-  color: #7f7f7f;
-  padding-top: 150rpx;
-}
-
-.sv-goods {
-  width: 100%;
-  height: auto;
-  padding-left: 30rpx;
-  background: #fff;
-  margin-top: 20rpx;
-}
-
-.topic-goods .h {
-  height: 93rpx;
-  line-height: 93rpx;
-  width: 720rpx;
-  padding-right: 30rpx;
-  border-bottom: 1px solid #d9d9d9;
-}
-
-.topic-goods .h .i {
-  display: block;
-  float: right;
-  width: 33rpx;
-  height: 33rpx;
-}
-
-.topic-goods .h .t {
-  display: block;
-  float: left;
-  width: 50%;
-  font-size: 29rpx;
-  color: #333;
-}
-
-.topic-goods .b .item {
-  border-top: 1px solid #d9d9d9;
-  margin: 0 20rpx;
-  height: 244rpx;
-  width: 710rpx;
-}
-
-.topic-goods .b .img {
-  margin-top: 12rpx;
-  margin-right: 12rpx;
-  float: left;
-  width: 220rpx;
-  height: 220rpx;
-}
-
-.topic-goods .b .right {
-  float: left;
-  height: 244rpx;
-  width: 476rpx;
-  display: flex;
-  flex-flow: row nowrap;
-}
-
-.topic-goods .b .text {
-  display: flex;
-  flex-wrap: nowrap;
-  flex-direction: column;
-  justify-content: center;
-  overflow: hidden;
-  height: 244rpx;
-  width: 476rpx;
-}
-
-.topic-goods .b .name {
-  float: left;
-  width: 330rpx;
-  display: block;
-  color: #333;
-  line-height: 50rpx;
-  font-size: 30rpx;
-}
-
-.topic-goods .b .desc {
-  width: 476rpx;
-  display: block;
-  color: #999;
-  line-height: 50rpx;
-  font-size: 25rpx;
-}
-
-.topic-goods .b .price {
-  width: 476rpx;
-  display: flex;
-  color: #b4282d;
-  line-height: 50rpx;
-  font-size: 33rpx;
-}
-
-.rec-box {
-  width: 690rpx;
-  height: auto;
-  margin: 0 30rpx;
-}
-
-.rec-box .h {
-  position: relative;
-  width: 690rpx;
-  height: 96rpx;
-  /*border-bottom: 1px solid #d0d0d0;*/
-  margin-bottom: 32rpx;
-}
-
-.rec-box .h .txt {
-  display: inline-block;
-  position: absolute;
-  background: #f4f4f4;
-  top: 59rpx;
-  left: 200rpx;
-  width: 290rpx;
-  height: 45rpx;
-  line-height: 45rpx;
-  font-size: 30rpx;
-  color: #999;
-  text-align: center;
-}
-
-.rec-box .b .item {
-  width: 690rpx;
-  height: 397rpx;
-  padding: 24rpx 24rpx 30rpx 24rpx;
-  background: #fff;
-  margin-bottom: 30rpx;
-}
-
-.rec-box .b .item .img {
-  height: 278rpx;
-  width: 642rpx;
-}
-
-.rec-box .b .item .title {
-  display: block;
-  margin-top: 30rpx;
-  height: 30rpx;
-  width: 642rpx;
-  font-size: 28rpx;
-}
-@import "../../lib/wxParse/wxParse.wxss";
diff --git a/litemall-wx/pages/ucenter/address/address.js b/litemall-wx/pages/ucenter/address/address.js
deleted file mode 100644
index 5eb4b9c6..00000000
--- a/litemall-wx/pages/ucenter/address/address.js
+++ /dev/null
@@ -1,93 +0,0 @@
-var util = require('../../../utils/util.js');
-var api = require('../../../config/api.js');
-var app = getApp();
-
-Page({
-  data: {
-    addressList: [],
-    total: 0
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-  },
-  onReady: function() {
-    // 页面渲染完成
-  },
-  onShow: function() {
-    // 页面显示
-    this.getAddressList();
-  },
-  getAddressList() {
-    let that = this;
-    util.request(api.AddressList).then(function(res) {
-      if (res.errno === 0) {
-        that.setData({
-          addressList: res.data.list,
-          total: res.data.total
-        });
-      }
-    });
-  },
-  addressAddOrUpdate(event) {
-    console.log(event)
-
-    //返回之前，先取出上一页对象，并设置addressId
-    var pages = getCurrentPages();
-    var prevPage = pages[pages.length - 2];
-
-    if (prevPage.route == "pages/checkout/checkout") {
-      try {
-        wx.setStorageSync('addressId', event.currentTarget.dataset.addressId);
-      } catch (e) {
-
-      }
-
-      let addressId = event.currentTarget.dataset.addressId;
-      if (addressId && addressId != 0) {
-        wx.navigateBack();
-      } else {
-        wx.navigateTo({
-          url: '/pages/ucenter/addressAdd/addressAdd?id=' + addressId
-        })
-      }
-
-    } else {
-      wx.navigateTo({
-        url: '/pages/ucenter/addressAdd/addressAdd?id=' + event.currentTarget.dataset.addressId
-      })
-    }
-  },
-  deleteAddress(event) {
-    console.log(event.target)
-    let that = this;
-    wx.showModal({
-      title: '',
-      content: '确定要删除地址？',
-      success: function(res) {
-        if (res.confirm) {
-          let addressId = event.target.dataset.addressId;
-          util.request(api.AddressDelete, {
-            id: addressId
-          }, 'POST').then(function(res) {
-            if (res.errno === 0) {
-              that.getAddressList();
-              wx.removeStorage({
-                key: 'addressId',
-                success: function(res) {},
-              })
-            }
-          });
-          console.log('用户点击确定')
-        }
-      }
-    })
-    return false;
-
-  },
-  onHide: function() {
-    // 页面隐藏
-  },
-  onUnload: function() {
-    // 页面关闭
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/address/address.json b/litemall-wx/pages/ucenter/address/address.json
deleted file mode 100644
index 6f023c3b..00000000
--- a/litemall-wx/pages/ucenter/address/address.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "地址管理"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/address/address.wxml b/litemall-wx/pages/ucenter/address/address.wxml
deleted file mode 100644
index 318e1f81..00000000
--- a/litemall-wx/pages/ucenter/address/address.wxml
+++ /dev/null
@@ -1,21 +0,0 @@
-<view class="container">
-  <view class="address-list" wx:if="{{ addressList.length > 0 }}">
-    <view class="item" wx:for="{{addressList}}" wx:key="id" bindtap="addressAddOrUpdate" data-address-id="{{item.id}}">
-      <view class="l">
-        <view class="name">{{item.name}}</view>
-        <view class="default" wx:if="{{item.isDefault}}">默认</view>
-      </view>
-      <view class="c">
-        <view class="mobile">{{item.tel}}</view>
-        <view class="address">{{item.addressDetail}}</view>
-      </view>
-      <view class="r">
-        <van-icon catchtap="deleteAddress" data-address-id="{{item.id}}" class="del" name="delete"/>
-      </view>
-    </view>
-  </view>
-  <view class="empty-view" wx:if="{{ addressList.length <= 0 }}">
-    <text class="text">收货地址还没有~~~</text>
-  </view>
-  <view class="add-address" bindtap="addressAddOrUpdate" data-address-id="0">新建</view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/address/address.wxss b/litemall-wx/pages/ucenter/address/address.wxss
deleted file mode 100644
index 374b36fb..00000000
--- a/litemall-wx/pages/ucenter/address/address.wxss
+++ /dev/null
@@ -1,132 +0,0 @@
-page {
-  height: 100%;
-  width: 100%;
-  background: #f4f4f4;
-}
-
-.container {
-  height: 100%;
-  width: 100%;
-}
-
-.address-list {
-  padding-left: 31.25rpx;
-  background: #fff;
-  background-size: auto 10.5rpx;
-  margin-bottom: 90rpx;
-}
-
-.address-list .item {
-  height: 156.55rpx;
-  align-items: center;
-  display: flex;
-  border-bottom: 1rpx solid #dcd9d9;
-}
-
-.address-list .l {
-  width: 125rpx;
-  height: 80rpx;
-  overflow: hidden;
-}
-
-.address-list .name {
-  width: 125rpx;
-  height: 43rpx;
-  font-size: 29rpx;
-  color: #333;
-  margin-bottom: 5.2rpx;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-}
-
-.address-list .default {
-  width: 62.5rpx;
-  height: 33rpx;
-  line-height: 28rpx;
-  text-align: center;
-  font-size: 20rpx;
-  color: #b4282d;
-  border: 1rpx solid #b4282d;
-  visibility: visible;
-}
-
-.address-list .c {
-  flex: 1;
-  height: auto;
-  overflow: hidden;
-}
-
-.address-list .mobile {
-  height: 29rpx;
-  font-size: 29rpx;
-  line-height: 29rpx;
-  overflow: hidden;
-  color: #333;
-  margin-bottom: 6.25rpx;
-}
-
-.address-list .address {
-  height: 37rpx;
-  font-size: 25rpx;
-  line-height: 37rpx;
-  overflow: hidden;
-  color: #666;
-}
-
-.address-list .r {
-  width: 52rpx;
-  height: auto;
-  overflow: hidden;
-  margin-right: 16.5rpx;
-}
-
-.address-list .del {
-  display: block;
-  width: 52rpx;
-  height: 52rpx;
-}
-
-.add-address {
-  border: none;
-  right: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 90%;
-  height: 90rpx;
-  line-height: 98rpx;
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  border-radius: 0;
-  padding: 0;
-  margin: 0;
-  margin-left: 5%;
-  text-align: center;
-  /* padding-left: -5rpx; */
-  font-size: 25rpx;
-  color: #f4f4f4;
-  border-top-left-radius: 50rpx;
-  border-bottom-left-radius: 50rpx;
-  border-top-right-radius: 50rpx;
-  border-bottom-right-radius: 50rpx;
-  letter-spacing: 3rpx;
-  background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
-}
-
-.empty-view {
-  height: 100%;
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-
-.empty-view .text {
-  width: auto;
-  font-size: 28rpx;
-  line-height: 35rpx;
-  color: #999;
-}
diff --git a/litemall-wx/pages/ucenter/addressAdd/addressAdd.js b/litemall-wx/pages/ucenter/addressAdd/addressAdd.js
deleted file mode 100644
index 4522ed9b..00000000
--- a/litemall-wx/pages/ucenter/addressAdd/addressAdd.js
+++ /dev/null
@@ -1,370 +0,0 @@
-var util = require('../../../utils/util.js');
-var api = require('../../../config/api.js');
-var check = require('../../../utils/check.js');
-var area = require('../../../utils/area.js');
-
-var app = getApp();
-Page({
-  data: {
-    address: {
-      id: 0,
-      areaCode: 0,
-      address: '',
-      name: '',
-      tel: '',
-      isDefault: 0,
-      province: '',
-      city: '',
-      county: ''
-    },
-    addressId: 0,
-    openSelectRegion: false,
-    selectRegionList: [{
-        code: 0,
-        name: '省份'
-      },
-      {
-        code: 0,
-        name: '城市'
-      },
-      {
-        code: 0,
-        name: '区县'
-      }
-    ],
-    regionType: 1,
-    regionList: [],
-    selectRegionDone: false
-  },
-  bindinputMobile(event) {
-    let address = this.data.address;
-    address.tel = event.detail.value;
-    this.setData({
-      address: address
-    });
-  },
-  bindinputName(event) {
-    let address = this.data.address;
-    address.name = event.detail.value;
-    this.setData({
-      address: address
-    });
-  },
-  bindinputAddress(event) {
-    let address = this.data.address;
-    address.addressDetail = event.detail.value;
-    this.setData({
-      address: address
-    });
-  },
-  bindIsDefault() {
-    let address = this.data.address;
-    address.isDefault = !address.isDefault;
-    this.setData({
-      address: address
-    });
-  },
-  getAddressDetail() {
-    let that = this;
-    util.request(api.AddressDetail, {
-      id: that.data.addressId
-    }).then(function(res) {
-      if (res.errno === 0) {
-        if (res.data) {
-          that.setData({
-            address: res.data
-          });
-        }
-      }
-    });
-  },
-  setRegionDoneStatus() {
-    let that = this;
-    let doneStatus = that.data.selectRegionList.every(item => {
-      return item.code != 0;
-    });
-
-    that.setData({
-      selectRegionDone: doneStatus
-    })
-
-  },
-  chooseRegion() {
-    let that = this;
-    this.setData({
-      openSelectRegion: !this.data.openSelectRegion
-    });
-
-    //设置区域选择数据
-    let address = this.data.address;
-    if (address.areaCode > 0) {
-      let selectRegionList = this.data.selectRegionList;
-      selectRegionList[0].code = address.areaCode.slice(0, 2) + '0000';
-      selectRegionList[0].name = address.province;
-
-      selectRegionList[1].code = address.areaCode.slice(0, 4) + '00';
-      selectRegionList[1].name = address.city;
-
-      selectRegionList[2].code = address.areaCode;
-      selectRegionList[2].name = address.county;
-
-      let regionList = area.getList('county', address.areaCode.slice(0, 4));
-      regionList = regionList.map(item => {
-        //标记已选择的
-        if (address.areaCode === item.code) {
-          item.selected = true;
-        } else {
-          item.selected = false;
-        }
-        return item;
-      })
-
-      this.setData({
-        selectRegionList: selectRegionList,
-        regionType: 3,
-        regionList: regionList
-      });
-
-    } else {
-      let selectRegionList = [{
-            code: 0,
-            name: '省份',
-          },
-          {
-            code: 0,
-            name: '城市',
-          },
-          {
-            code: 0,
-            name: '区县',
-          }
-        ];
-
-      this.setData({
-        selectRegionList: selectRegionList,
-        regionType: 1,
-        regionList: area.getList('province')
-      });
-    }
-
-    this.setRegionDoneStatus();
-
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    console.log(options)
-    if (options.id && options.id != 0) {
-      this.setData({
-        addressId: options.id
-      });
-      this.getAddressDetail();
-    }
-  },
-  onReady: function() {
-
-  },
-  selectRegionType(event) {
-    let that = this;
-    let regionTypeIndex = event.target.dataset.regionTypeIndex;
-    let selectRegionList = that.data.selectRegionList;
-
-    //判断是否可点击
-    if (regionTypeIndex + 1 == this.data.regionType || (regionTypeIndex - 1 >= 0 && selectRegionList[regionTypeIndex - 1].code <= 0)) {
-      return false;
-    }
-
-    let selectRegionItem = selectRegionList[regionTypeIndex];
-    let code = selectRegionItem.code;
-    let regionList;
-    if (regionTypeIndex === 0) {
-      // 点击省级，取省级
-      regionList = area.getList('province');
-    }
-    else if (regionTypeIndex === 1) {
-      // 点击市级，取市级
-      regionList = area.getList('city', code.slice(0, 2)); 
-    }
-    else{
-      // 点击县级，取县级
-      regionList = area.getList('county', code.slice(0, 4)); 
-    }
-
-    regionList = regionList.map(item => {
-      //标记已选择的
-      if (that.data.selectRegionList[regionTypeIndex].code == item.code) {
-        item.selected = true;
-      } else {
-        item.selected = false;
-      }
-      return item;
-    })
-
-    this.setData({
-      regionList: regionList,
-      regionType: regionTypeIndex + 1
-    })
-
-    this.setRegionDoneStatus();
-  },
-  selectRegion(event) {
-    let that = this;
-    let regionIndex = event.target.dataset.regionIndex;
-    let regionItem = this.data.regionList[regionIndex];
-    let regionType = this.data.regionType;
-    let selectRegionList = this.data.selectRegionList;
-    selectRegionList[regionType - 1] = regionItem;
-
-    if (regionType == 3) {
-      this.setData({
-        selectRegionList: selectRegionList
-      })
-
-      let regionList = that.data.regionList.map(item => {
-        //标记已选择的
-        if (that.data.selectRegionList[that.data.regionType - 1].code == item.code) {
-          item.selected = true;
-        } else {
-          item.selected = false;
-        }
-        return item;
-      })
-
-      this.setData({
-        regionList: regionList
-      })
-
-      this.setRegionDoneStatus();
-      return
-    }
-
-    //重置下级区域为空
-    selectRegionList.map((item, index) => {
-      if (index > regionType - 1) {
-        item.code = 0;
-        item.name = index == 1 ? '城市' : '区县';
-      }
-      return item;
-    });
-
-    this.setData({
-      selectRegionList: selectRegionList,
-      regionType: regionType + 1
-    })
-    
-    let code = regionItem.code;
-    let regionList = [];
-    if (regionType === 1) {
-      // 点击省级，取市级
-      regionList= area.getList('city', code.slice(0, 2))
-    }
-    else {
-      // 点击市级，取县级
-      regionList= area.getList('county', code.slice(0, 4))
-    }
-
-    this.setData({
-      regionList: regionList
-    })
-
-    this.setRegionDoneStatus();
-  },
-  doneSelectRegion() {
-    if (this.data.selectRegionDone === false) {
-      return false;
-    }
-
-    let address = this.data.address;
-    let selectRegionList = this.data.selectRegionList;
-    address.province = selectRegionList[0].name;
-    address.city = selectRegionList[1].name;
-    address.county = selectRegionList[2].name;
-    address.areaCode = selectRegionList[2].code;
-
-    this.setData({
-      address: address,
-      openSelectRegion: false
-    });
-
-  },
-  cancelSelectRegion() {
-    this.setData({
-      openSelectRegion: false,
-      regionType: this.data.regionDoneStatus ? 3 : 1
-    });
-
-  },
-  cancelAddress() {
-    wx.navigateBack();
-  },
-  saveAddress() {
-    console.log(this.data.address)
-    let address = this.data.address;
-
-    if (address.name == '') {
-      util.showErrorToast('请输入姓名');
-
-      return false;
-    }
-
-    if (address.tel == '') {
-      util.showErrorToast('请输入手机号码');
-      return false;
-    }
-
-
-    if (address.areaCode == 0) {
-      util.showErrorToast('请输入省市区');
-      return false;
-    }
-
-    if (address.addressDetail == '') {
-      util.showErrorToast('请输入详细地址');
-      return false;
-    }
-
-    let that = this;
-    util.request(api.AddressSave, {
-      id: address.id,
-      name: address.name,
-      tel: address.tel,
-      province: address.province,
-      city: address.city,
-      county: address.county,
-      areaCode: address.areaCode,
-      addressDetail: address.addressDetail,
-      isDefault: address.isDefault
-    }, 'POST').then(function(res) {
-      if (res.errno === 0) {
-        //返回之前，先取出上一页对象，并设置addressId
-        var pages = getCurrentPages();
-        var prevPage = pages[pages.length - 2];
-        console.log(prevPage);
-        if (prevPage.route == "pages/checkout/checkout") {
-          prevPage.setData({
-            addressId: res.data
-          })
-
-          try {
-            wx.setStorageSync('addressId', res.data);
-          } catch (e) {
-
-          }
-          console.log("set address");
-        }
-        wx.navigateBack();
-      }
-    });
-
-  },
-  onShow: function() {
-    // 页面显示
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/addressAdd/addressAdd.json b/litemall-wx/pages/ucenter/addressAdd/addressAdd.json
deleted file mode 100644
index 5aecd0b1..00000000
--- a/litemall-wx/pages/ucenter/addressAdd/addressAdd.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "编辑地址"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/addressAdd/addressAdd.wxml b/litemall-wx/pages/ucenter/addressAdd/addressAdd.wxml
deleted file mode 100644
index 07a06d22..00000000
--- a/litemall-wx/pages/ucenter/addressAdd/addressAdd.wxml
+++ /dev/null
@@ -1,39 +0,0 @@
-<view class="add-address">
-  <view class="add-form">
-    <view class="form-item">
-      <input class="input" bindinput="bindinputName" placeholder="姓名" value="{{address.name}}" auto-focus/>
-    </view>
-    <view class="form-item">
-      <input class="input" bindinput="bindinputMobile" value="{{address.tel}}" placeholder="手机号码" />
-    </view>
-    <view class="form-item">
-      <input class="input" value="{{address.province + address.city + address.county}}" disabled="true" bindtap="chooseRegion" placeholder="省份、城市、区县" />
-    </view>
-    <view class="form-item">
-      <input class="input" bindinput="bindinputAddress" value="{{address.addressDetail}}" placeholder="详细地址, 如街道、楼盘号等" />
-    </view>
-    <view class="form-default">
-      <van-checkbox value="{{ address.isDefault == 1 }}" bind:change="bindIsDefault">设为默认地址</van-checkbox>
-    </view>
-  </view>
-
-  <view class="btns">
-    <button class="cannel" bindtap="cancelAddress">取消</button>
-    <button class="save" bindtap="saveAddress">保存</button>
-  </view>
-
-  <view class="region-select" wx:if="{{openSelectRegion}}">
-    <view class="hd">
-      <view class="region-selected">
-        <view class="item {{item.code == 0 ? 'disabled' : ''}} {{(regionType -1) === index ? 'selected' : ''}}" bindtap="selectRegionType" data-region-type-index="{{index}}" wx:for="{{selectRegionList}}" wx:key="code">{{item.name}}</view>
-      </view>
-      <view class="done {{selectRegionDone ? '' : 'disabled'}}" bindtap="doneSelectRegion">确定</view>
-    </view>
-    <view class="bd">
-      <scroll-view scroll-y class="region-list">
-        <view class="item {{item.selected ? 'selected' : ''}}" bindtap="selectRegion" data-region-index="{{index}}" wx:for="{{regionList}}" wx:key="code">{{item.name}}</view>
-      </scroll-view>
-    </view>
-  </view>
-</view>
-<view class="bg-mask" bindtap="cancelSelectRegion" wx:if="{{openSelectRegion}}"></view>
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/addressAdd/addressAdd.wxss b/litemall-wx/pages/ucenter/addressAdd/addressAdd.wxss
deleted file mode 100644
index cd31b96a..00000000
--- a/litemall-wx/pages/ucenter/addressAdd/addressAdd.wxss
+++ /dev/null
@@ -1,162 +0,0 @@
-page {
-  height: 100%;
-  background: #f4f4f4;
-}
-
-.add-address .add-form {
-  background: #fff;
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-}
-
-.add-address .form-item {
-  height: 116rpx;
-  padding-left: 31.25rpx;
-  border-bottom: 1px solid #d9d9d9;
-  display: flex;
-  align-items: center;
-  padding-right: 31.25rpx;
-}
-
-.add-address .input {
-  flex: 1;
-  height: 44rpx;
-  line-height: 44rpx;
-  overflow: hidden;
-}
-
-.add-address .form-default {
-  border-bottom: 1px solid #d9d9d9;
-  height: 96rpx;
-  background: #fff;
-  padding-top: 28rpx;
-  font-size: 28rpx;
-  padding-left: 31.25rpx;
-}
-
-.add-address .form-default .van-checkbox .van-icon {
-  color: #fff;
-}
-
-.add-address .btns {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  overflow: hidden;
-  display: flex;
-  height: 100rpx;
-  width: 100%;
-}
-
-.add-address .cannel, .add-address .save {
-  flex: 1;
-  height: 100rpx;
-  text-align: center;
-  line-height: 100rpx;
-  font-size: 28rpx;
-  color: #fff;
-  border: none;
-  border-radius: 0;
-}
-
-.add-address .cannel {
-  background: #333;
-}
-
-.add-address .save {
-  background: #b4282d;
-}
-
-.region-select {
-  width: 100%;
-  height: 600rpx;
-  background: #fff;
-  position: fixed;
-  z-index: 10;
-  left: 0;
-  bottom: 0;
-}
-
-.region-select .hd {
-  height: 108rpx;
-  width: 100%;
-  border-bottom: 1px solid #f4f4f4;
-  padding: 46rpx 30rpx 0 30rpx;
-}
-
-.region-select .region-selected {
-  float: left;
-  height: 60rpx;
-  display: flex;
-}
-
-.region-select .region-selected .item {
-  max-width: 140rpx;
-  margin-right: 30rpx;
-  text-align: left;
-  line-height: 60rpx;
-  height: 100%;
-  color: #333;
-  font-size: 28rpx;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.region-select .region-selected .item.disabled {
-  color: #999;
-}
-
-.region-select .region-selected .item.selected {
-  color: #b4282d;
-}
-
-.region-select .done {
-  float: right;
-  height: 60rpx;
-  width: 60rpx;
-  border: none;
-  background: #fff;
-  line-height: 60rpx;
-  text-align: center;
-  color: #333;
-  font-size: 28rpx;
-}
-
-.region-select .done.disabled {
-  color: #999;
-}
-
-.region-select .bd {
-  height: 492rpx;
-  width: 100%;
-  padding: 0 30rpx;
-}
-
-.region-select .region-list {
-  height: 492rpx;
-}
-
-.region-select .region-list .item {
-  width: 100%;
-  height: 104rpx;
-  line-height: 104rpx;
-  text-align: left;
-  color: #333;
-  font-size: 28rpx;
-}
-
-.region-select .region-list .item.selected {
-  color: #b4282d;
-}
-
-.bg-mask {
-  height: 100%;
-  width: 100%;
-  background: rgba(0, 0, 0, 0.4);
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 8;
-}
diff --git a/litemall-wx/pages/ucenter/aftersale/aftersale.js b/litemall-wx/pages/ucenter/aftersale/aftersale.js
deleted file mode 100644
index 6f9eaa36..00000000
--- a/litemall-wx/pages/ucenter/aftersale/aftersale.js
+++ /dev/null
@@ -1,171 +0,0 @@
-var util = require('../../../utils/util.js');
-var api = require('../../../config/api.js');
-
-Page({
-  data: {
-    orderId: 0,
-    orderInfo: {},
-    orderGoods: [],
-    aftersale: {
-      pictures: []
-    },
-    columns: ['未收货退款', '不退货退款', '退货退款'],
-    contentLength: 0,
-    fileList: []
-  },
-  onLoad: function (options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    this.setData({
-      orderId: options.id
-    });
-    this.getOrderDetail();
-  },
-  getOrderDetail: function () {
-    wx.showLoading({
-      title: '加载中',
-    });
-
-    setTimeout(function () {
-      wx.hideLoading()
-    }, 2000);
-
-    let that = this;
-    util.request(api.OrderDetail, {
-      orderId: that.data.orderId
-    }).then(function (res) {
-      if (res.errno === 0) {
-        console.log(res.data);
-        that.setData({
-          orderInfo: res.data.orderInfo,
-          orderGoods: res.data.orderGoods,
-          'aftersale.orderId': that.data.orderId,
-          'aftersale.amount': res.data.orderInfo.actualPrice - res.data.orderInfo.freightPrice
-        });
-      }
-
-      wx.hideLoading();
-    });
-  },
-  deleteImage (event) {
-    const { fileList = [] } = this.data;
-    fileList.splice(event.detail.index, 1)
-    this.setData({
-      fileList: fileList
-    })
-  },
-  afterRead(event) {
-    const { file } = event.detail
-    let that = this
-    const uploadTask = wx.uploadFile({
-      url: api.StorageUpload,
-      filePath: file.path,
-      name: 'file',
-      success: function (res) {
-        var _res = JSON.parse(res.data);
-        if (_res.errno === 0) {
-          var url = _res.data.url
-          that.data.aftersale.pictures.push(url)
-          const { fileList = [] } = that.data;
-          fileList.push({ ...file, url: url });
-          that.setData({
-            fileList: fileList
-          })
-        }
-      },
-      fail: function (e) {
-        wx.showModal({
-          title: '错误',
-          content: '上传失败',
-          showCancel: false
-        })
-      },
-    })
-  },
-  previewImage: function (e) {
-    wx.previewImage({
-      current: e.currentTarget.id, // 当前显示图片的http链接
-      urls: this.data.files // 需要预览的图片http链接列表
-    })
-  },
-  contentInput: function (e) {
-    this.setData({
-      contentLength: e.detail.cursor,
-      'aftersale.comment': e.detail.value,
-    });
-  },
-  onReasonChange: function (e) {
-    this.setData({
-      'aftersale.reason': e.detail,
-    });
-  },
-  showTypePicker: function () {
-    this.setData({
-      showPicker: true,
-    });
-  },
-
-  onCancel: function () {
-    this.setData({
-      showPicker: false,
-    });
-  },
-  onConfirm: function (event) {
-    this.setData({
-      'aftersale.type': event.detail.index,
-      'aftersale.typeDesc': event.detail.value,
-      showPicker: false,
-    });
-  },
-  submit: function () {
-    let that = this;
-    if (that.data.aftersale.type == undefined) {
-      util.showErrorToast('请选择退款类型');
-      return false;
-    }
-
-    if (that.data.reason == '') {
-      util.showErrorToast('请输入退款原因');
-      return false;
-    }
-
-    wx.showLoading({
-      title: '提交中...',
-      mask: true,
-      success: function () {
-
-      }
-    });
-
-    util.request(api.AftersaleSubmit, that.data.aftersale, 'POST').then(function (res) {
-      wx.hideLoading();
-
-      if (res.errno === 0) {
-        wx.showToast({
-          title: '申请售后成功',
-          icon: 'success',
-          duration: 2000,
-          complete: function () {
-            wx.switchTab({
-              url: '/pages/ucenter/index/index'
-            });
-          }
-        });
-      } else {
-        util.showErrorToast(res.errmsg);
-      }
-
-    });
-  },
-  onReady: function () {
-    // 页面渲染完成
-  },
-  onShow: function () {
-    // 页面显示
-  },
-  onHide: function () {
-    // 页面隐藏
-  },
-  onUnload: function () {
-    // 页面关闭
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/aftersale/aftersale.json b/litemall-wx/pages/ucenter/aftersale/aftersale.json
deleted file mode 100644
index 4cfefd01..00000000
--- a/litemall-wx/pages/ucenter/aftersale/aftersale.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "售后"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/aftersale/aftersale.wxml b/litemall-wx/pages/ucenter/aftersale/aftersale.wxml
deleted file mode 100644
index 20bb87bc..00000000
--- a/litemall-wx/pages/ucenter/aftersale/aftersale.wxml
+++ /dev/null
@@ -1,45 +0,0 @@
-<view class="container">
-  <view class="order-goods">
-    <view class="h">
-      退款商品
-    </view>
-    <view class="goods">
-      <view class="item" wx:for="{{orderGoods}}" wx:key="id">
-        <view class="img">
-          <image src="{{item.picUrl}}"></image>
-        </view>
-        <view class="info">
-          <view class="t">
-            <text class="name">{{item.goodsName}}</text>
-            <text class="number">x{{item.number}}</text>
-          </view>
-          <view class="attr">{{item.specifications}}</view>
-          <view class="price">￥{{item.price}}</view>
-        </view>
-      </view>
-    </view>
-  </view>
-
-  <van-cell-group title="订单明细">
-    <van-cell title="商品总价" value=" ￥{{orderInfo.goodsPrice}}元" />
-    <van-cell title="    运费" value=" ￥{{orderInfo.freightPrice}}元" />
-    <van-cell title="    优惠" value="-￥{{orderInfo.couponPrice}}元" />
-    <van-cell title="订单实付" value=" ￥{{orderInfo.actualPrice}}元" />
-  </van-cell-group>
-
-  <van-cell-group title="操作">
-    <van-field value="{{ aftersale.typeDesc }}" label="退款类型" placeholder="请选择" input-align="right" required clickable bind:tap="showTypePicker" />
-    <van-field value="{{ aftersale.reason }}" label="退款原因" placeholder="请输入" bind:change="onReasonChange" input-align="right" required clearable />
-    <van-cell title="退款金额" value="￥{{ aftersale.amount }}元" label="不可修改，即订单实付- 运费" required/>
-    <van-field label="退款说明" value="{{ aftersale.comment }}" placeholder="请输入" type="textarea" input-align="right" autosize/>
-    <van-cell title="上传凭证" label="最多上传三张">
-      <van-uploader file-list="{{ fileList }}" bind:after-read="afterRead" bind:delete="deleteImage" max-count="3" preview-size="50px"/>
-    </van-cell>    
-  </van-cell-group>
-
-  <van-button type="danger" bind:click="submit" block>申请售后</van-button>
-
-  <van-popup show="{{showPicker}}" position="bottom">
-    <van-picker show-toolbar columns="{{columns}}" bind:cancel="onCancel" bind:confirm="onConfirm" />
-  </van-popup>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/aftersale/aftersale.wxss b/litemall-wx/pages/ucenter/aftersale/aftersale.wxss
deleted file mode 100644
index 2673c47c..00000000
--- a/litemall-wx/pages/ucenter/aftersale/aftersale.wxss
+++ /dev/null
@@ -1,103 +0,0 @@
-page {
-  height: 100%;
-  width: 100%;
-  background: #f4f4f4;
-}
-
-.order-goods {
-  margin-top: 20rpx;
-  background: #fff;
-}
-
-.order-goods .h {
-  height: 93.75rpx;
-  line-height: 93.75rpx;
-  margin-left: 31.25rpx;
-  border-bottom: 1px solid #f4f4f4;
-  padding-right: 31.25rpx;
-}
-
-.order-goods .h .label {
-  float: left;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.order-goods .h .status {
-  float: right;
-  font-size: 30rpx;
-  color: #b4282d;
-}
-
-.order-goods .item {
-  display: flex;
-  align-items: center;
-  height: 192rpx;
-  margin-left: 31.25rpx;
-  padding-right: 31.25rpx;
-  border-bottom: 1px solid #f4f4f4;
-}
-
-.order-goods .item:last-child {
-  border-bottom: none;
-}
-
-.order-goods .item .img {
-  height: 145.83rpx;
-  width: 145.83rpx;
-  background: #f4f4f4;
-}
-
-.order-goods .item .img image {
-  height: 145.83rpx;
-  width: 145.83rpx;
-}
-
-.order-goods .item .info {
-  flex: 1;
-  height: 145.83rpx;
-  margin-left: 20rpx;
-}
-
-.order-goods .item .t {
-  margin-top: 8rpx;
-  height: 33rpx;
-  line-height: 33rpx;
-  margin-bottom: 10.5rpx;
-}
-
-.order-goods .item .t .name {
-  display: block;
-  float: left;
-  height: 33rpx;
-  line-height: 33rpx;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.order-goods .item .t .number {
-  display: block;
-  float: right;
-  height: 33rpx;
-  text-align: right;
-  line-height: 33rpx;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.order-goods .item .attr {
-  height: 29rpx;
-  line-height: 29rpx;
-  color: #666;
-  margin-bottom: 25rpx;
-  font-size: 25rpx;
-}
-
-.order-goods .item .price {
-  display: block;
-  float: left;
-  height: 30rpx;
-  line-height: 30rpx;
-  color: #333;
-  font-size: 30rpx;
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/aftersaleDetail/aftersaleDetail.js b/litemall-wx/pages/ucenter/aftersaleDetail/aftersaleDetail.js
deleted file mode 100644
index fd7fbc0c..00000000
--- a/litemall-wx/pages/ucenter/aftersaleDetail/aftersaleDetail.js
+++ /dev/null
@@ -1,65 +0,0 @@
-var util = require('../../../utils/util.js');
-var api = require('../../../config/api.js');
-
-Page({
-  data: {
-    orderId: 0,
-    order: {},
-    orderGoods: [],
-    aftersale: {},
-    statusColumns: ['未申请', '已申请，待审核', '审核通过，待退款', '退款成功', '审核不通过，已拒绝'],
-    typeColumns: ['未收货退款', '不退货退款', '退货退款'],
-    fileList: []
-  },
-  onLoad: function (options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    this.setData({
-      orderId: options.id
-    });
-    this.getAftersaleDetail();
-  },
-  getAftersaleDetail: function () {
-    wx.showLoading({
-      title: '加载中',
-    });
-
-    setTimeout(function () {
-      wx.hideLoading()
-    }, 2000);
-
-    let that = this;
-    util.request(api.AftersaleDetail, {
-      orderId: that.data.orderId
-    }).then(function (res) {
-      if (res.errno === 0) {
-        let _fileList = []
-        res.data.aftersale.pictures.forEach(function (v) {
-          _fileList.push({
-            url: v
-          })
-        });
-
-        that.setData({
-          order: res.data.order,
-          orderGoods: res.data.orderGoods,
-          aftersale: res.data.aftersale,
-          fileList: _fileList
-        });
-      }
-
-      wx.hideLoading();
-    });
-  },
-  onReady: function () {
-    // 页面渲染完成
-  },
-  onShow: function () {
-    // 页面显示
-  },
-  onHide: function () {
-    // 页面隐藏
-  },
-  onUnload: function () {
-    // 页面关闭
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/aftersaleDetail/aftersaleDetail.json b/litemall-wx/pages/ucenter/aftersaleDetail/aftersaleDetail.json
deleted file mode 100644
index b339c88f..00000000
--- a/litemall-wx/pages/ucenter/aftersaleDetail/aftersaleDetail.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "售后详情"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/aftersaleDetail/aftersaleDetail.wxml b/litemall-wx/pages/ucenter/aftersaleDetail/aftersaleDetail.wxml
deleted file mode 100644
index de4e2a8a..00000000
--- a/litemall-wx/pages/ucenter/aftersaleDetail/aftersaleDetail.wxml
+++ /dev/null
@@ -1,42 +0,0 @@
-<view class="container">
-  <van-cell-group title="退款明细">
-    <van-cell value="{{ statusColumns[aftersale.status] }}" title="售后状态" required/>
-    <van-cell value="{{ aftersale.addTime }}" title="申请时间" required/>
-    <van-cell value="{{ aftersale.aftersaleSn }}" title="服务编号" required/>
-    <van-cell value="{{ typeColumns[aftersale.type] }}" title="退款类型" required/>
-    <van-cell value="{{ aftersale.reason }}" title="退款原因" required/>
-    <van-cell title="退款金额" value="￥{{ aftersale.amount }}元" label="即订单实付- 运费" required/>
-    <van-field label="退款说明" value="{{ aftersale.comment }}" type="textarea" autosize disabled/>
-    <van-cell title="上传凭证" >
-      <van-uploader file-list="{{ fileList }}" disabled deletable="{{false}}" max-count="0" preview-size="50px"/>
-    </van-cell>
-  </van-cell-group>
-
-  <view class="order-goods">
-    <view class="h">
-      退款商品
-    </view>
-    <view class="goods">
-      <view class="item" wx:for="{{orderGoods}}" wx:key="id">
-        <view class="img">
-          <image src="{{item.picUrl}}"></image>
-        </view>
-        <view class="info">
-          <view class="t">
-            <text class="name">{{item.goodsName}}</text>
-            <text class="number">x{{item.number}}</text>
-          </view>
-          <view class="attr">{{item.specifications}}</view>
-          <view class="price">￥{{item.price}}</view>
-        </view>
-      </view>
-    </view>
-  </view>
-
-  <van-cell-group title="订单明细">
-    <van-cell title="商品总价" value=" ￥{{order.goodsPrice}}元" />
-    <van-cell title="    运费" value=" ￥{{order.freightPrice}}元" />
-    <van-cell title="    优惠" value="-￥{{order.couponPrice}}元" />
-    <van-cell title="订单实付" value=" ￥{{order.actualPrice}}元" />
-  </van-cell-group>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/aftersaleDetail/aftersaleDetail.wxss b/litemall-wx/pages/ucenter/aftersaleDetail/aftersaleDetail.wxss
deleted file mode 100644
index 0a454a2b..00000000
--- a/litemall-wx/pages/ucenter/aftersaleDetail/aftersaleDetail.wxss
+++ /dev/null
@@ -1,187 +0,0 @@
-page {
-  height: 100%;
-  width: 100%;
-  background: #f4f4f4;
-}
-
-.order-goods {
-  margin-top: 20rpx;
-  background: #fff;
-}
-
-.order-goods .h {
-  height: 93.75rpx;
-  line-height: 93.75rpx;
-  margin-left: 31.25rpx;
-  border-bottom: 1px solid #f4f4f4;
-  padding-right: 31.25rpx;
-}
-
-.order-goods .h .label {
-  float: left;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.order-goods .h .status {
-  float: right;
-  font-size: 30rpx;
-  color: #b4282d;
-}
-
-.order-goods .item {
-  display: flex;
-  align-items: center;
-  height: 192rpx;
-  margin-left: 31.25rpx;
-  padding-right: 31.25rpx;
-  border-bottom: 1px solid #f4f4f4;
-}
-
-.order-goods .item:last-child {
-  border-bottom: none;
-}
-
-.order-goods .item .img {
-  height: 145.83rpx;
-  width: 145.83rpx;
-  background: #f4f4f4;
-}
-
-.order-goods .item .img image {
-  height: 145.83rpx;
-  width: 145.83rpx;
-}
-
-.order-goods .item .info {
-  flex: 1;
-  height: 145.83rpx;
-  margin-left: 20rpx;
-}
-
-.order-goods .item .t {
-  margin-top: 8rpx;
-  height: 33rpx;
-  line-height: 33rpx;
-  margin-bottom: 10.5rpx;
-}
-
-.order-goods .item .t .name {
-  display: block;
-  float: left;
-  height: 33rpx;
-  line-height: 33rpx;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.order-goods .item .t .number {
-  display: block;
-  float: right;
-  height: 33rpx;
-  text-align: right;
-  line-height: 33rpx;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.order-goods .item .attr {
-  height: 29rpx;
-  line-height: 29rpx;
-  color: #666;
-  margin-bottom: 25rpx;
-  font-size: 25rpx;
-}
-
-.order-goods .item .price {
-  display: block;
-  float: left;
-  height: 30rpx;
-  line-height: 30rpx;
-  color: #333;
-  font-size: 30rpx;
-}
-
-
-.fb-body {
-  width: 100%;
-  background: #fff;
-  height: 300rpx;
-  padding: 30rpx;
-}
-
-.fb-body .content {
-  width: 100%;
-  height: 200rpx;
-  color: #333;
-}
-
-.weui-uploader__files {
-  width: 100%;
-}
-
-.weui-uploader__file {
-  float: left;
-  margin-right: 9px;
-  margin-bottom: 9px;
-}
-
-.weui-uploader__img {
-  display: block;
-  width: 30px;
-  height: 30px;
-}
-
-.weui-uploader__input-box {
-  float: left;
-  position: relative;
-  margin-right: 9px;
-  margin-bottom: 9px;
-  width: 30px;
-  height: 30px;
-  border: 1px solid #d9d9d9;
-}
-
-.weui-uploader__input-box:after, .weui-uploader__input-box:before {
-  content: " ";
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  -webkit-transform: translate(-50%, -50%);
-  transform: translate(-50%, -50%);
-  background-color: #d9d9d9;
-}
-
-.weui-uploader__input-box:before {
-  width: 2px;
-  height: 30px;
-}
-
-.weui-uploader__input-box:after {
-  width: 30px;
-  height: 2px;
-}
-
-.weui-uploader__input-box:active {
-  border-color: #999;
-}
-
-.weui-uploader__input-box:active:after, .weui-uploader__input-box:active:before {
-  background-color: #999;
-}
-
-.weui-uploader__input {
-  position: absolute;
-  z-index: 1;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  opacity: 0;
-}
-.fb-body .text-count {
-  float: right;
-  color: #666;
-  font-size: 24rpx;
-  line-height: 30rpx;
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/aftersaleList/aftersaleList.js b/litemall-wx/pages/ucenter/aftersaleList/aftersaleList.js
deleted file mode 100644
index bc1d2037..00000000
--- a/litemall-wx/pages/ucenter/aftersaleList/aftersaleList.js
+++ /dev/null
@@ -1,69 +0,0 @@
-var util = require('../../../utils/util.js');
-var api = require('../../../config/api.js');
-
-Page({
-  data: {
-    aftersaleList: [],
-    showType: 1,
-    page: 1,
-    limit: 10,
-    totalPages: 1
-  },
-  onLoad: function (options) {
-  },
-  getAftersaleList() {
-    let that = this;
-    util.request(api.AftersaleList, {
-      status: that.data.showType,
-      page: that.data.page,
-      limit: that.data.limit
-    }).then(function (res) {
-      if (res.errno === 0) {
-        console.log(res.data);
-        that.setData({
-          aftersaleList: that.data.aftersaleList.concat(res.data.list),
-          totalPages: res.data.pages
-        });
-      }
-    });
-  },
-  onReachBottom() {
-    if (this.data.totalPages > this.data.page) {
-      this.setData({
-        page: this.data.page + 1
-      });
-      this.getAftersaleList();
-    } else {
-      wx.showToast({
-        title: '没有更多售后了',
-        icon: 'none',
-        duration: 2000
-      });
-      return false;
-    }
-  },
-  switchTab: function (event) {
-    let showType = event.currentTarget.dataset.index;
-    this.setData({
-      aftersaleList: [],
-      showType: showType,
-      page: 1,
-      limit: 10,
-      totalPages: 1
-    });
-    this.getAftersaleList();
-  },
-  onReady: function () {
-    // 页面渲染完成
-  },
-  onShow: function () {
-    // 页面显示
-    this.getAftersaleList();
-  },
-  onHide: function () {
-    // 页面隐藏
-  },
-  onUnload: function () {
-    // 页面关闭
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/aftersaleList/aftersaleList.json b/litemall-wx/pages/ucenter/aftersaleList/aftersaleList.json
deleted file mode 100644
index 3cd39d6a..00000000
--- a/litemall-wx/pages/ucenter/aftersaleList/aftersaleList.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "我的售后"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/aftersaleList/aftersaleList.wxml b/litemall-wx/pages/ucenter/aftersaleList/aftersaleList.wxml
deleted file mode 100644
index 80fdd1e9..00000000
--- a/litemall-wx/pages/ucenter/aftersaleList/aftersaleList.wxml
+++ /dev/null
@@ -1,42 +0,0 @@
-<view class="container">
-  <view class="aftersales-switch">
-    <view class="item {{ showType == 1 ? 'active' : ''}}" bindtap="switchTab" data-index='1'>
-      <view class="txt">申请中</view>
-    </view>
-    <view class="item {{ showType == 2 ? 'active' : ''}}" bindtap="switchTab" data-index='2'>
-      <view class="txt">处理中</view>
-    </view>
-    <view class="item {{ showType == 3 ? 'active' : ''}}" bindtap="switchTab" data-index='3'>
-      <view class="txt">已完成</view>
-    </view>
-    <view class="item {{ showType == 4 ? 'active' : ''}}" bindtap="switchTab" data-index='4'>
-      <view class="txt">已拒绝</view>
-    </view>
-  </view>
-  <view class="no-aftersale" wx:if="{{aftersaleList.length <= 0}}">
-    <view class="c">
-      <text>还没有呢</text>
-    </view>
-  </view>
-
-  <view class="aftersales">
-    <navigator url="../aftersaleDetail/aftersaleDetail?id={{item.aftersale.orderId}}" class="aftersale" open-type="redirect" wx:for="{{aftersaleList}}" wx:key="id">
-      <view class="h">
-        <view class="l">售后编号：{{item.aftersale.aftersaleSn}}</view>
-      </view>
-      <view class="goods" wx:for="{{item.goodsList}}" wx:key="id" wx:for-item="gitem">
-        <view class="img">
-          <image src="{{gitem.picUrl}}"></image>
-        </view>
-        <view class="info">
-          <text class="name">{{gitem.goodsName}}</text>
-          <text class="number">{{gitem.number}}件商品</text>
-        </view>
-        <view class="status"></view>
-      </view>
-      <view class="b">
-        <view class="l">申请退款金额：￥{{item.aftersale.amount}}元</view>
-      </view>
-    </navigator>
-  </view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/aftersaleList/aftersaleList.wxss b/litemall-wx/pages/ucenter/aftersaleList/aftersaleList.wxss
deleted file mode 100644
index 1888ed82..00000000
--- a/litemall-wx/pages/ucenter/aftersaleList/aftersaleList.wxss
+++ /dev/null
@@ -1,165 +0,0 @@
-page {
-  height: 100%;
-  width: 100%;
-  background: #f4f4f4;
-}
-
-.aftersales-switch {
-  width: 100%;
-  background: #fff;
-  height: 84rpx;
-}
-
-.aftersales-switch .item {
-  display: inline-block;
-  height: 82rpx;
-  width: 18%;
-  padding: 0 15rpx;
-  text-align: center;
-}
-
-.aftersales-switch .item .txt {
-  display: inline-block;
-  height: 82rpx;
-  padding: 0 20rpx;
-  line-height: 82rpx;
-  color: #9a9ba1;
-  font-size: 30rpx;
-  width: 170rpx;
-}
-
-.aftersales-switch .item.active .txt {
-  color: #ab956d;
-  border-bottom: 4rpx solid #ab956d;
-}
-
-.no-aftersale {
-  width: 100%;
-  height: auto;
-  margin: 0 auto;
-}
-
-.no-aftersale .c {
-  width: 100%;
-  height: auto;
-  margin-top: 400rpx;
-}
-
-.no-aftersale .c text {
-  margin: 0 auto;
-  display: block;
-  width: 258rpx;
-  height: 29rpx;
-  line-height: 29rpx;
-  text-align: center;
-  font-size: 29rpx;
-  color: #999;
-}
-
-.aftersales {
-  height: auto;
-  width: 100%;
-  overflow: hidden;
-}
-
-.aftersale {
-  margin-top: 20rpx;
-  background: #fff;
-}
-
-.aftersale .h {
-  height: 83.3rpx;
-  line-height: 83.3rpx;
-  margin-left: 31.25rpx;
-  padding-right: 31.25rpx;
-  border-bottom: 1px solid #f4f4f4;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.aftersale .h .l {
-  float: left;
-}
-
-.aftersale .h .r {
-  float: right;
-  color: #b4282d;
-  font-size: 24rpx;
-}
-
-.aftersale .goods {
-  display: flex;
-  align-items: center;
-  height: 199rpx;
-  margin-left: 31.25rpx;
-}
-
-.aftersale .goods .img {
-  height: 145.83rpx;
-  width: 145.83rpx;
-  background: #f4f4f4;
-}
-
-.aftersale .goods .img image {
-  height: 145.83rpx;
-  width: 145.83rpx;
-}
-
-.aftersale .goods .info {
-  height: 145.83rpx;
-  flex: 1;
-  padding-left: 20rpx;
-}
-
-.aftersale .goods .name {
-  margin-top: 30rpx;
-  display: block;
-  height: 44rpx;
-  line-height: 44rpx;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.aftersale .goods .number {
-  display: block;
-  height: 37rpx;
-  line-height: 37rpx;
-  color: #666;
-  font-size: 25rpx;
-}
-
-.aftersale .goods .status {
-  width: 105rpx;
-  color: #b4282d;
-  font-size: 25rpx;
-}
-
-.aftersale .b {
-  height: 103rpx;
-  line-height: 103rpx;
-  margin-left: 31.25rpx;
-  padding-right: 31.25rpx;
-  border-top: 1px solid #f4f4f4;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.aftersale .b .l {
-  float: left;
-}
-
-.aftersale .b .r {
-  float: right;
-}
-
-.aftersale .b .btn {
-  margin-top: 19rpx;
-  height: 64.5rpx;
-  line-height: 64.5rpx;
-  text-align: center;
-  padding: 0 20rpx;
-  border-radius: 5rpx;
-  font-size: 28rpx;
-  color: #fff;
-  background: #b4282d;
-}
diff --git a/litemall-wx/pages/ucenter/business/assets/mom.png b/litemall-wx/pages/ucenter/business/assets/mom.png
new file mode 100644
index 0000000000000000000000000000000000000000..b29aba7b24f26ddc74489a025508580854d563b2
GIT binary patch
literal 7035
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
WVSASi;=a448bA%DjjUF*!u%ghoC=%(

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/ucenter/business/business.js b/litemall-wx/pages/ucenter/business/business.js
new file mode 100644
index 00000000..57a40ebc
--- /dev/null
+++ b/litemall-wx/pages/ucenter/business/business.js
@@ -0,0 +1,571 @@
+var util = require('../../../utils/util.js');
+var api = require('../../../config/api.js');
+import {areaList} from '../../../utils/area.js';
+import WxValidate from "../../../utils/WxValidate.js";
+Page({
+  data: {
+    isEdit:false,
+    btnDisabled:false,
+      form: {
+        id:'',
+        title:'',
+        workWay:"",
+        province:'',
+        city:'',
+        county:'',
+        provinceCode:'',
+        cityCode:'',
+        countyCode:'',
+        address:'',
+        radio:"1",
+        salary:'',
+        commission:'',
+        subtitle:'',
+        workStyle:[],
+        demandProvince:'',
+        demandCity:'',
+        demandProvinceCode:'',
+        demandCityCode:'',
+        contact:'',
+        contactMobile:'',
+        contactPost: '',
+        picUrl:''
+      },
+      workWayindex:0,
+      companyindex:0,
+      areashow:false,
+      areashow2:false,
+      fileList:[
+      ],
+      WORK_TIME:[],
+      ZB_TYPE:[],
+      gallery:[],
+      COMPANY_POST:[],
+      video:[],
+      videoList:[],
+      worktimeShow: false,
+      areaList: {
+        province_list: areaList.province_list, //省
+        city_list: areaList.city_list,  //市
+        county_list: areaList.county_list //区
+      },
+      postShow:false,
+      areaList1: {
+        province_list: areaList.province_list, //省
+        city_list: areaList.city_list,  //市
+      },
+  },
+  onShow: function(options) {
+    let that = this;
+    if(!!this.data.params){
+      let params = this.data.params.data;
+      let type = this.data.params.type;
+      if (type == 'ZB_STYLE') {
+        this.setData({
+          'form.workStyle': params
+        })
+      }
+    }
+  },
+  onLoad(options) {
+    this.getByCategory()
+    // this.getlocation()
+    this.initValidate()
+    
+  },
+    initValidate() {
+    const rules = {
+      title: { //用户名
+        required: true,
+      },
+      province: {
+        required: true,
+      },
+      address: {
+        required: true,
+      },
+      // demandCity: {
+      //   required: true,
+      // },
+      subtitle: {
+        required: true,
+      },
+      contact: {
+        required: true,
+      },
+      contactPost: {
+        required: true,
+      },
+      contactMobile: {
+        required: true,
+      },
+      // workStyle: {
+      //   required: true,
+      // },
+      // workWay: {
+      //   required: true,
+      // },
+    }
+    const messages = { //提示信息
+      title: {
+        required: '请填写公司名称',
+      },
+      province: {
+        required: '请选择公司省市区',
+      },
+      address: {
+        required: '请输入公司地址',
+      },
+      demandCity: {
+        required: '请选择需求城市',
+      },
+      subtitle: {
+        required: '请输入主营',
+      },
+      contact: {
+        required: '请输入联系人',
+      },
+      contactPost: {
+        required: '请选择联系人职位',
+      },
+      contactMobile: {
+        required: '请输入电话号码',
+      },
+      workStyle: {
+        required: '请选择标签',
+      },
+      workWay: {
+        required: '请选择工作方式',
+      },
+    }
+    // 创造飙到验证实例
+    this.WxValidate = new WxValidate(rules, messages)
+    console.log(this.WxValidate);
+  },
+  formSubmit: function (e) {
+    var that = this
+    const params = this.data.form
+    //校验表单
+    if (!this.WxValidate.checkForm(params)) {
+      console.log(this.WxValidate.errorList)
+      const error = this.WxValidate.errorList[0]
+      wx.showToast({
+        title: error.msg,
+        icon: 'none'
+      })
+      return false
+    }else if(this.data.gallery.length ==0){
+      wx.showToast({
+        title: "请至少上传一张图片",
+        icon: 'none'
+      })
+      return false
+    }
+    this.setData({
+      btnDisabled:true
+    })
+    wx.showLoading({
+      title: '加载中...',
+    });
+    let str=''
+    if(!this.data.isEdit){
+      str = api.TopicCreate
+    }else{
+      str = api.TopicUpdate
+    }
+    util.request(str, {...this.data.form,gallery:this.data.gallery,videoUrl:this.data.video}, 'POST').then(function(res) {
+      that.setData({
+        btnDisabled:false
+      })
+      wx.hideLoading();
+      wx.showToast({
+        title: res.errmsg,
+      })
+      if (res.errno === 0) {
+        wx.navigateBack({
+          delta: 1
+        })
+      }
+    });
+  },
+  getGoodsInfo: function() {
+    let that = this;
+    util.request(api.TopicInfo).then(function(res) {
+      if (res.errno === 0) {
+        if(!!res.data){
+          that.setData({
+            "form.id":res.data.topic.id,
+            "form.title":res.data.topic.title,
+            "form.workWay":res.data.topic.workWay,
+            "form.province":res.data.topic.province,
+            "form.city":res.data.topic.city,
+            "form.county":res.data.topic.county,
+            "form.provinceCode":res.data.topic.provinceCode,
+            "form.cityCode":res.data.topic.cityCode,
+            "form.countyCode":res.data.topic.countyCode,
+            "form.address":res.data.topic.address,
+            "form.radio":!!res.data.topic.salary?'1':'2',
+            "form.salary":res.data.topic.salary,
+            "form.commission":res.data.topic.commission,
+            "form.subtitle":res.data.topic.subtitle,
+            "form.workStyle":res.data.topic.workStyle,
+            "form.demandProvince":res.data.topic.demandProvince,
+            "form.demandCity":res.data.topic.demandCity,
+            "form.demandProvinceCode":res.data.topic.demandProvinceCode,
+            "form.demandCityCode":res.data.topic.demandCityCode,
+            "form.contact":res.data.topic.contact,
+            "form.contactMobile":res.data.topic.contactMobile,
+            "form.contactPost": res.data.topic.contactPost,
+            "form.picUrl": res.data.topic.picUrl,
+            fileList:res.data.topic.gallery||[],
+            gallery:res.data.topic.gallery||[],
+            isEdit:true
+          });
+        }else{
+          that.setData(
+            {
+              isEdit:false,
+            }
+          )
+        }
+      }
+    });
+  },
+  getlocation(){
+    wx.getLocation({
+      type: 'wgs84',
+      success (res) {
+        console.log(res)
+        const latitude = res.latitude
+        const longitude = res.longitude
+        const speed = res.speed
+        const accuracy = res.accuracy
+      },
+      fail: function(res) {
+        console.log('获取位置信息失败', res);
+      }
+     })
+  },
+  getByCategory() {
+    let that = this;
+    let userInfo = wx.getStorageSync('userInfo');
+    that.setData(
+      {
+        "form.picUrl": userInfo.avatar,
+      }
+    )
+    util.request(api.getByCategory,{categoryList:['DEGREE','LANGRAGE','WORK_TIME','ZB_TYPE','ZB_ACCOUNT_TYPE','ZB_STYLE','GOOD_CATEGORY','COMPANY_POST']},'POST').then(function(res) {
+      if (res.errno === 0) {
+        that.setData({
+          WORK_TIME:res.data.list.filter((item)=>{ return item.category == 'WORK_TIME' }).map(deg => ({ text: deg.name, value: deg.name })),
+          ZB_TYPE:res.data.list.filter((item)=>{ return item.category == 'ZB_TYPE' }).map(deg => ({ text: deg.name, value: deg.name })),
+          ZB_STYLE:res.data.list.filter((item)=>{ return item.category == 'ZB_STYLE' }).map(deg => ({ text: deg.name, value: deg.name })),
+          COMPANY_POST:res.data.list.filter((item)=>{ return item.category == 'COMPANY_POST' }).map(deg => ({ text: deg.name, value: deg.name })),
+        })
+        that.getGoodsInfo()
+      }
+    });
+  },
+  changeradio(e){
+    this.setData({
+      "form.radio": e.detail,
+      "form.salary":'',
+      "form.commission":""
+    });
+  },
+ 
+  worktimeCancel: function() {
+    this.setData({
+      worktimeShow: false
+    })
+  },
+  postCancel: function() {
+    this.setData({
+      postShow: false
+    })
+  },
+  postConfirm(e) {
+    let text = e.detail.value.text
+    this.setData({
+      'form.contactPost':text
+    })
+    this.postCancel()
+  },
+  worktimeConfirm(e) {
+    let text = e.detail.value.text
+    this.setData({
+      'form.workWay':text
+    })
+    this.worktimeCancel()
+  },
+  worktimeChange: function() {
+    this.setData({
+      worktimeShow: true,
+      workWayindex:this.data.WORK_TIME.findIndex(item => { return item.text == this.data.form.workWay }),
+    })
+  },
+  postChange: function() {
+    this.setData({
+      postShow: true,
+      companyindex:this.data.COMPANY_POST.findIndex(item => { return item.text == this.data.form.contactPost })
+    })
+  },
+  reginCalendar: function() {
+    let that = this;
+    this.setData({
+      areashow: !that.data.areashow,
+      "form.county":this.data.form.county
+    })
+  },
+  reginCalendar2: function() {
+    let that = this;
+    this.setData({
+      areashow2: !that.data.areashow2,
+      "form.countyCode":this.data.form.countyCode
+    })
+  },
+  regin2Calendar(){
+    this.reginCalendar2()
+  },
+  regin2Confirm(e) {
+    console.log(e.detail)
+    let data = e.detail.values
+    let code = e.detail.values.map((item) => { return item.code})
+    this.setData({
+      // 'form.changzhudiname':name,
+      // 'form.changzhudivalue': code,
+      'form.demandProvince': data[0].name,  
+      'form.demandCity': data[1].name,  
+      'form.demandProvinceCode':data[0].code,  
+      'form.demandCityCode': data[1].code,  
+    })
+    this.reginCalendar2()
+  },
+  reginConfirm(e) {
+    console.log(e.detail)
+    let data = e.detail.values
+    // let name = e.detail.values.map((item) => { return item.name}).join('-')
+    // let code = e.detail.values.map((item) => { return item.code})
+    this.setData({
+      // 'form.hujidiname':name,
+      // 'form.hujidinamevalue': code
+      'form.province': data[0].name, 
+      'form.city': data[1].name, 
+      'form.county': data[2].name, 
+      'form.provinceCode': data[0].code, 
+      'form.cityCode': data[1].code, 
+      'form.countyCode': data[2].code, 
+    })
+    this.reginCalendar()
+  },
+  imgUpload: function() {
+    let that = this;
+    wx.chooseImage({
+      count: 1, // 一次只能选择一张图片
+      sizeType: ['compressed'], // 压缩图片
+      sourceType: ['album', 'camera'], // 从相册选择
+      success: function (res) {
+        const tempFilePaths = res.tempFilePaths;
+        const tempFilePath = tempFilePaths[0];
+        // 检查图片大小
+        wx.getFileSystemManager().getFileInfo({
+          filePath: tempFilePath,
+          success: function (fileRes) {
+            const size = fileRes.size; // 图片大小，单位B
+            const maxSize = 5 * 1024 * 1024; // 20MB
+            if (size > maxSize) {
+              wx.showToast({
+                title: '图片过大，请重新选择',
+                icon: 'none'
+              });
+              return;
+            }
+            // 图片大小符合要求，继续上传逻辑
+          }
+        });
+        that.upload(res);
+        // 将图片上传到服务器
+        // uni.uploadFile({
+        //   url: 'https://example.com/upload', // 上传的服务器地址
+        //   filePath: res.tempFilePaths[0], // 图片的本地地址
+        //   name: 'file', // 服务端用于接收文件的参数名
+        //   success: function (res) {
+        //     // 上传成功，做一些处理
+        //   }
+        // })
+      }
+    })
+  },
+  chooseMedia: function() {
+    let that = this;
+    wx.chooseImage({
+      count: 1, // 一次只能选择一张图片
+      sizeType: ['compressed'], // 压缩图片
+      sourceType: ['album', 'camera'], // 从相册选择
+      success: function (res) {
+        const tempFilePaths = res.tempFilePaths;
+        const tempFilePath = tempFilePaths[0];
+        // 检查图片大小
+        wx.getFileSystemManager().getFileInfo({
+          filePath: tempFilePath,
+          success: function (fileRes) {
+            const size = fileRes.size; // 图片大小，单位B
+            const maxSize = 5 * 1024 * 1024; // 20MB
+            if (size > maxSize) {
+              wx.showToast({
+                title: '图片过大，请重新选择',
+                icon: 'none'
+              });
+              return;
+            }
+            wx.cropImage({
+              src: tempFilePath, // 图片路径
+              cropScale: '1:1', // 裁剪比例
+              success: function (res1) {
+                const uploadTask = wx.uploadFile({
+                  url: api.StorageUpload,
+                  filePath: res1.tempFilePath,
+                  name: 'file',
+                  success: function(res2) {
+                    var _res = JSON.parse(res2.data);
+                    if (_res.errno === 0) {
+                      var url = _res.data.url
+                      that.setData({
+                        'form.picUrl': url
+                      })
+                    }
+                  },
+                  fail: function(e) {
+                    wx.showModal({
+                      title: '错误',
+                      content: '上传失败',
+                      showCancel: false
+                    })
+                  },
+                })
+              }
+    
+            })
+            
+            // 图片大小符合要求，继续上传逻辑
+          }
+        });
+        
+      }
+    })
+  },
+  upload: function(res) {
+    var that = this;
+    const uploadTask = wx.uploadFile({
+      url: api.StorageUpload,
+      filePath: res.tempFilePaths[0],
+      name: 'file',
+      success: function(res) {
+        var _res = JSON.parse(res.data);
+        if (_res.errno === 0) {
+          var url = _res.data.url
+          that.data.fileList.push(url)
+          that.setData({
+            gallery: that.data.fileList
+          })
+        }
+      },
+      fail: function(e) {
+        wx.showModal({
+          title: '错误',
+          content: '上传失败',
+          showCancel: false
+        })
+      },
+    })
+
+    uploadTask.onProgressUpdate((res) => {
+      console.log('上传进度', res.progress)
+      console.log('已经上传的数据长度', res.totalBytesSent)
+      console.log('预期需要上传的数据总长度', res.totalBytesExpectedToSend)
+    })
+
+  },
+  delImage(e){
+    console.log(e)
+    let index =e.currentTarget.dataset.index
+    this.data.gallery.splice(index,1)
+    this.setData({
+      gallery:this.data.gallery.splice(index,1)
+    })
+  },
+  imgPreview: function(e) {
+    console.log(e)
+    var current = e.target.dataset.src;
+    wx.previewImage({
+      current: current, // 当前显示图片的http链接
+      urls: [current] // 需要预览的图片http链接列表
+    })
+  },
+  selectData(e){
+    var current = e.currentTarget.dataset.type;
+    let str = JSON.stringify(this.data[current])
+    let arr ={
+      ZB_STYLE:"workStyle",
+    }
+    let name = arr[current]
+    let cdata = JSON.stringify(this.data.form[name])
+    wx.navigateTo({
+      url: "/pages/ucenter/categorys/categorys?data="+str+'&type='+current+'&cData='+cdata
+    });
+  },
+  videoUpload: function() {
+    const that = this;
+    //   选择视频
+    wx.chooseVideo({
+      sourceType: ['album', 'camera'], // 类型[相册,照相机]
+      compressed: true, // 是否压缩上传的视频
+      camera: 'back',
+      success: async function(res) {
+        console.log('__res', res);
+        that.uploadVideo(res)
+      },
+    });
+  },
+  uploadVideo: function(data) {
+    var that = this;
+    const uploadTask = wx.uploadFile({
+      url: api.StorageUploadVideo,
+      filePath: data.tempFilePath,
+      name: 'file',
+      success: function(res) {
+        var _res = JSON.parse(res.data);
+        if (_res.errno === 0) {
+          var url = _res.data.url
+          that.data.videoList.push(url)
+          that.setData({
+            video: that.data.videoList
+          })
+        }
+      },
+      fail: function(e) {
+        wx.showModal({
+          title: '错误',
+          content: '上传失败',
+          showCancel: false
+        })
+      },
+    })
+
+
+  },
+  inputEvent(e) { // 输入框双向绑定
+    this.setData({
+        ['form.' + e.currentTarget.dataset.type]: e.detail
+    })
+  },
+  onReady: function() {
+    // 页面渲染完成
+  },
+  onHide: function() {
+    // 页面隐藏
+  },
+  onUnload: function() {
+    // 页面关闭
+  }
+})
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/business/business.json b/litemall-wx/pages/ucenter/business/business.json
new file mode 100644
index 00000000..99ad0456
--- /dev/null
+++ b/litemall-wx/pages/ucenter/business/business.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "商家信息"
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/business/business.wxml b/litemall-wx/pages/ucenter/business/business.wxml
new file mode 100644
index 00000000..5662b2b7
--- /dev/null
+++ b/litemall-wx/pages/ucenter/business/business.wxml
@@ -0,0 +1,153 @@
+<view class="contentmain">
+  <view class="myposts">
+    <view class="bg">
+      <view class="main">
+        <view class="main-top">
+          <view class="myposts-img">
+            <image class="img" src="{{form.picUrl}}" bindtap="chooseMedia" alt="" />
+            <view class="ggg">
+              <view class="myposts-main">
+                <view class="fabu">
+                  <text class="textcol">{{isEdit?form.title:"未发布用户"}}</text>
+                </view>
+                <view class="yuyue">
+                  <text class="textcol">{{isEdit?"已发布":"未发布"}}</text>
+                </view>
+              </view>
+              <!-- <view class="myposts-main myposts-main1">
+                <view class="fabu">
+                  <text class="textcol">未发布用户</text>
+                </view>
+                <view class="yuyue">
+                  <text class="textcol">匹配预约 </text>
+                </view>
+              </view> -->
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="formData">
+      <view class="formbg">
+        <view class="form-item">
+          <van-cell-group>
+            <van-field model:value="{{ form.title }}" left-icon="../../../static/images/icon/gongsimingcheng.png" label="公司名称" border="false" input-align="right" data-type="title" bind:change="inputEvent" placeholder="公司名称" clearable :label-width="100" />
+          </van-cell-group>
+          <van-cell title="公司省市区" icon="../../../static/images/icon/hujidi.png" bindtap="reginCalendar" is-link>
+              <view wx:if='{{form.province}}'>
+                {{form.province}}-{{form.city}}-{{form.county}} 
+              </view>
+            </van-cell>
+          <van-cell-group is-link bindtap="datatrue">
+            <van-field model:value="{{ form.address }}" left-icon="../../../static/images/icon/gongsidizhiicon.png" label="公司地址" input-align="right" data-type="address" bind:change="inputEvent"  placeholder="公司地址"clearable :label-width="100" />
+          </van-cell-group>
+          <!-- <van-cell title="需求城市" icon="../../../static/images/icon/hujichangzhudizhi.png" bindtap="reginCalendar2" is-link>
+              <view wx:if='{{form.demandCity}}'>
+                {{form.demandCity}}
+              </view>
+            </van-cell> -->
+          <van-cell-group is-link bindtap="datatrue">
+            <van-field model:value="{{ form.subtitle }}" left-icon="../../../static/images/icon/gongsidizhiicon.png" label="主营" input-align="right" data-type="subtitle" bind:change="inputEvent"  placeholder="主营"clearable :label-width="100" />
+          </van-cell-group>
+          <van-cell-group>
+            <van-field model:value="{{ form.contact }}" left-icon="../../../static/images/icon/lianxiren.png" label="联系人" border="false" input-align="right" data-type="contact" bind:change="inputEvent" placeholder="联系人" clearable :label-width="100" />
+          </van-cell-group>
+          <van-cell title="联系人职位" icon="../../../static/images/icon/gongzuofangshipx.png" bindtap="postChange" is-link>
+            {{ form.contactPost }}
+          </van-cell>
+          <van-cell-group>
+            <van-field model:value="{{ form.contactMobile }}" left-icon="../../../static/images/icon/dianhuahaoma.png" label="电话号码" type='number' data-type="contactMobile" bind:change="inputEvent" border="false" input-align="right" placeholder="电话号码" clearable :label-width="100" />
+          </van-cell-group>
+        </view>
+        <view class="form-item">
+          <!-- <van-cell title="薪酬待遇" title-class="vancell__title" icon="../../../static/images/icon/yly_qianzhuang.png">
+            <view class="list">
+              <van-radio-group value="{{ form.radio }}" custom-class='custom-radio' bind:change="changeradio">
+                <view class="flex">
+                  <van-radio name="1"  checked-color="#703EDD"></van-radio>
+                  <van-field model:value="{{ form.salary }}"  disabled="{{ form.radio =='2'}}" border="false" custom-class="custom-label" input-align="right" data-type="salary" bind:change="inputEvent" placeholder="底薪" clearable :label-width="100">
+                    <view slot="label" style="width: 100rpx;">底薪</view>
+                  </van-field>
+                  <text>元</text>
+                </view>
+                <view class="flex">
+                  <van-radio name="2" checked-color="#703EDD"></van-radio>
+                  <van-field model:value="{{ form.commission }}" disabled="{{ form.radio =='1'}}" border="false" input-align="right" placeholder="计提" clearable data-type="commission" bind:change="inputEvent" :label-width="100">
+                    <view slot="label" style="width: 100rpx;">计提</view>
+                  </van-field>
+                  <text>%</text>
+                </view>
+              </van-radio-group>
+
+
+            </view>
+          </van-cell> -->
+          <van-cell title="营业执照" icon="../../../static/images/icon/tupian.png" border="{{false}}">
+          </van-cell>
+          <view class="row">
+            <view class="u-col-5 imgitem" wx:for="{{ gallery }}" wx:key="index" wx:for-item="item">
+              <van-icon class="closeicon" name="cross" data-index="{{index}}" bindtap="delImage" />
+              <image class="imgscr" style="width: 100%; height: 100%;" src="{{ item }}" data-src="{{item}}" bindtap="imgPreview"></image>
+            </view>
+            <van-col class="u-col-5" wx:if="{{ gallery.length < 2 }}">
+              <view class="upload-item_i" bindtap="imgUpload">
+                <view class="upicon">
+                  <van-icon name="plus" />
+                </view>
+                <view class="uptext">上传照片</view>
+                <view class="upmain">(仅支持图片格式)</view>
+                <view class="upmain">(大小不超过5m)</view>
+              </view>
+            </van-col>
+          </view>
+        </view>
+
+        <!-- <view class="form-item"> -->
+          <!-- <van-cell title="选择标签" title-class="vancell__title" icon="../../../static/images/icon/pinlei.png" data-type="ZB_STYLE" bindtap="selectData" is-link>
+            <view class="list">
+              <text class="item" wx:for="{{form.workStyle}}" :key="index">{{ item }}</text>
+            </view>
+          </van-cell> -->
+          <!-- <van-cell title="工作方式" icon="../../../static/images/icon/gongzuofangshipx.png" bindtap="worktimeChange" is-link>
+            {{ form.workWay }}
+          </van-cell> -->
+          <!-- <van-cell title="上传视频" icon="../../../static/images/icon/shipin.png" border="{{false}}">
+          </van-cell>
+          <view class="row">
+            <view class="u-col-5 imgitem" wx:for="{{ video }}" wx:for-item="item">
+              <video style="width: 100%; height: 100%;" controls object-fit='cover' :key="index" src="{{item.tempFilePath}}" :poster="item.thumbTempFilePath" enable-play-gesture="true"></video>
+            </view>
+            <van-col class="u-col-5" wx:if="{{ video.length < 2 }}">
+              <view class="upload-item_i" bindtap="videoUpload">
+                <view class="upicon">
+                  <van-icon name="plus" />
+                </view>
+                <view class="uptext">上传视频</view>
+                <view class="upmain">(仅支持视频格式)</view>
+              </view>
+            </van-col>
+          </view> -->
+        <!-- </view> -->
+        <view class="btn">
+          <van-button type="primary" color="#703EDD" bindtap="formSubmit" disabled="btnDisabled" block>提交发布</van-button>
+        </view>
+      </view>
+    </view>
+
+  </view>
+
+  <!-- <u-calendar v-model="show" :mode="mode" @change="change"></u-calendar>
+    <u-picker class="region" mode="region" v-model="pickerShow" @confirm="confirm"></u-picker> -->
+</view>
+<van-popup  show="{{ worktimeShow }}" round position="bottom" bind:close="worktimeCancel">
+  <van-picker wx:if="{{ worktimeShow }}" columns="{{ WORK_TIME }}"   default-index="{{workWayindex}}" show-toolbar bind:cancel="worktimeCancel" bind:confirm="worktimeConfirm" />
+</van-popup>
+<van-popup show="{{ postShow }}" round position="bottom" bind:close="postCancel">
+  <van-picker wx:if="{{ postShow }}" columns="{{ COMPANY_POST }}"   default-index="{{companyindex}}" show-toolbar bind:cancel="postCancel" bind:confirm="postConfirm" />
+</van-popup>
+<van-popup  show="{{ areashow }}" round  position="bottom" bind:close="reginCalendar" >
+  <van-area wx:if="{{ areashow }}" area-list="{{areaList}}" value="{{form.countyCode}}" bind:cancel="reginCalendar" bind:confirm="reginConfirm" />
+</van-popup>
+<van-popup  show="{{ areashow2 }}" round position="bottom" bind:close="regin2Calendar">
+  <van-area wx:if="{{ areashow2 }}" area-list="{{areaList}}" value="{{form.demandCityCode}}" columns-num='2' bind:cancel="regin2Calendar" bind:confirm="regin2Confirm" />
+</van-popup>
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/business/business.wxss b/litemall-wx/pages/ucenter/business/business.wxss
new file mode 100644
index 00000000..e398d601
--- /dev/null
+++ b/litemall-wx/pages/ucenter/business/business.wxss
@@ -0,0 +1,262 @@
+page {
+  height: 100%;
+  width: 100%;
+  background: #f4f4f4;
+}
+
+.contentmain {
+  height: 100%;
+  background: #f0f0f0;
+}
+
+.myposts {
+  height: auto;
+}
+
+.myposts .bg {
+  height: 500rpx;
+  border-bottom-left-radius: 160rpx;
+  border-bottom-right-radius: 140rpx;
+  background-color: #703EDD;
+}
+
+.myposts .bg .main .main-top {
+  padding: 20rpx;
+  padding-bottom: 40rpx;
+}
+
+.myposts .bg .main .main-top .myposts-img {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+}
+
+.myposts .bg .main .main-top .myposts-img .img {
+  width: 140rpx;
+  height: 120rpx;
+}
+
+.myposts .bg .main .main-top .myposts-img .myposts-main {
+  padding: 0 10rpx;
+  
+}
+
+.myposts .bg .main .main-top .myposts-img .myposts-main .fabu {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+  justify-content: space-between;
+  line-height: 50rpx;
+  color: #fff;
+}
+.myposts .bg .main .main-top .myposts-img .myposts-main .fabu .textcol{
+  color: #fff;
+}
+.myposts .bg .main .main-top .myposts-img .myposts-main .yuyue {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+  justify-content: space-between;
+  line-height: 50rpx;
+  
+}
+.myposts .bg .main .main-top .myposts-img .myposts-main .yuyue .textcol{
+  color: #fff;
+}
+.myposts .bg .main .main-top .myposts-img .ggg {
+  width: 100%;
+  padding-left: 20rpx;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+  justify-content: space-between;
+}
+
+.myposts .bg .main .sex {
+  padding: 0 20rpx;
+}
+
+.myposts .bg .main .sex .sex-main {
+  background-color: #fff;
+  border-radius: 20rpx;
+  padding-left: 20rpx;
+  padding-right: 20rpx;
+}
+.myposts .bg .main .sex .sex-main .custom-class .title-class{
+  width: 200rpx !important;
+}
+.myposts .bg .main .sex .sex-main .sec-radio .value-class{
+  text-align: left;
+}
+.myposts .bg .main .sex .sex-main .group-list {
+  width: 50% !important;
+}
+
+.myposts .formData {
+  margin-top: -342rpx;
+  padding: 20rpx;
+}
+
+.myposts .formData .formbg .btn {
+  padding: 20rpx 0;
+ 
+}
+.myposts .formData .formbg .btn .van-button .van-button__text{
+  color: #fff;
+}
+.myposts .formData .formbg .iconarrow {
+  position: absolute;
+  top: 40rpx;
+  right: 20rpx;
+}
+
+.myposts .formData .formbg .form-item {
+  background-color: #fff;
+  border-radius: 20rpx;
+  margin: 20rpx 0;
+  width: 100%;
+  padding-left: 20rpx;
+  padding-right: 20rpx;
+}
+.myposts .formData .formbg .form-item .customitem{
+  position: relative;
+}
+.myposts .formData .formbg .form-item .customitem .custom-icon {
+  width: 32rpx;
+  height: 32rpx;
+  position: absolute;
+  left: 0px;
+  top: 50%;
+  transform: translateY(-50%);
+}
+.myposts .formData .formbg .form-item .upitem {
+  width: 40%;
+  border: 1px solid #ccc;
+  height: 400rpx;
+  margin-right: 20rpx;
+}
+
+.myposts .formData .formbg .form-item .upload-item {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  text-align: center;
+}
+
+.myposts .formData .formbg .form-item .upload-item_img {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+}
+.myposts .formData .formbg .form-item .row .u-col-5 .upload-item_i  {
+  width: 100%;
+  text-align: center;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%,-50%);
+}
+
+.myposts .formData .formbg .form-item .upload-item_i .uptext {
+  padding: 0;
+}
+.myposts .formData .formbg .form-item .cell-border{
+  border-top: 1px solid #ccc;
+  margin-top: 10rpx;
+}
+.myposts .formData .formbg .form-item .upload-item_i .upmain {
+  padding: 0;
+}
+.myposts .formData .formbg .form-item .row{
+  display: flex;
+  width: calc ( 100% - 60rpx);
+  height: 100%;
+  margin:0 30rpx;
+}
+.myposts .formData .formbg .form-item .row .u-col-5 {
+  width: 100%;
+  max-width: 300rpx;
+  text-align: center;
+  border: 1px solid #ccc;
+  height: 400rpx;
+  margin-right: 20rpx;
+  position: relative;
+
+}
+.myposts .formData .formbg .form-item .row .u-col-5 .imgscr {
+  width: 100%;
+  height: 100%;
+}
+.myposts .formData .formbg .form-item .list {
+  display: flex;
+  flex-wrap: wrap;
+}
+.myposts .formData .formbg .form-item .list .flex{
+  display: flex;
+}
+.myposts .formData .formbg .form-item .list .flex .custom-label .title-class{
+  width: 40rpx !important;
+  max-width:42px !important;
+}
+.myposts .formData .formbg .form-item .list .flex text{
+  position: relative;
+  top: 20rpx;
+}
+.myposts .formData .formbg .form-item .list .flex {
+  position: relative;
+}
+.myposts .formData .formbg .form-item .list .flex .van-radio .van-radio__icon-wrap .van-radio__icon {
+  position: absolute;
+  top: 26rpx;
+  z-index: 99;
+}
+.van-cell__value{
+  color: #323233 !important;
+}
+.myposts .formData .formbg .form-item .list .item {
+  font-size: 26rpx;
+  display: inline-block;
+  padding: 0rpx 24rpx;
+  line-height: 48rpx;
+  margin: 10rpx;
+  border-radius: 12rpx;
+  border: 2rpx solid #703EDD;
+  color: #703EDD;
+}
+
+.myposts .formData .formbg .form-item .row .u-col-5 .closeicon {
+  position: absolute;
+  right: 10rpx;
+  
+  font-size: 30rpx;
+  width: 46rpx;
+  height: 46rpx;
+  border-radius: 46rpx;
+  background-color: #fff;
+  text-align: center;
+  color: red;
+
+}
+.myposts .formData .formbg .form-item .row .u-col-5 .closeicon .uicon-close::before {
+  margin-left: 8rpx;
+}
+.van-icon__image{
+  position: relative;
+  /* top: 0rpx; */
+}
+.myposts .formData .formbg .form-item .vancell__title{
+  flex: none;
+  width: 180rpx !important;
+}
+.van-cell{
+  padding-left: 5rpx !important;
+}
+.van-icon-success:before{
+  color: #fff;
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/categorys/categorys.js b/litemall-wx/pages/ucenter/categorys/categorys.js
new file mode 100644
index 00000000..40f44c17
--- /dev/null
+++ b/litemall-wx/pages/ucenter/categorys/categorys.js
@@ -0,0 +1,110 @@
+// pages/ucenter/category.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+      list:[
+    ],
+    type:'',
+    activeList:[],
+    activeData:[],
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    console.log(options)
+    let list = JSON.parse(options.data)
+    let type = options.type
+    let cData = JSON.parse(options.cData)
+    this.setData({
+      list: list,
+      type: type,
+      activeList : cData,
+      activeData: cData,
+    })
+  },
+  changeData: function (e) {
+    let current = e.target.dataset.item.text;
+    if(this.data.activeList.length<3){
+
+    }else{
+
+    }
+    if(this.data.activeList.includes(current)){
+      let index = this.data.activeList.indexOf(current)
+      this.data.activeData.splice(index,1)
+    }else{
+      this.data.activeData.push(current)
+    }
+    this.setData({
+      activeList: this.data.activeData,
+    })
+  },
+  goback(){
+    var pages = getCurrentPages();   //当前页面
+    var prevPage = pages[pages.length - 2];   //上个页面
+    // 赋值给上一个页面赋值
+    let parmasData = {
+      data:this.data.activeList,
+      type:this.data.type
+    }
+    prevPage.setData({
+      params: parmasData,
+    });
+    wx.navigateBack({
+      delta: 1
+    })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow(options) {
+    
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/categorys/categorys.json b/litemall-wx/pages/ucenter/categorys/categorys.json
new file mode 100644
index 00000000..59548009
--- /dev/null
+++ b/litemall-wx/pages/ucenter/categorys/categorys.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "选择"
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/categorys/categorys.wxml b/litemall-wx/pages/ucenter/categorys/categorys.wxml
new file mode 100644
index 00000000..17f80f1b
--- /dev/null
+++ b/litemall-wx/pages/ucenter/categorys/categorys.wxml
@@ -0,0 +1,15 @@
+<wxs module="m1">
+      var getinclude = function (array,text) {
+           return array.indexOf(text) !== -1
+      }
+     module.exports.getinclude = getinclude;
+</wxs>
+<view class="category">
+  <view class="title">请选择</view>
+  <view class="list">
+    <view wx:for="{{list}}" data-item="{{item}}" class="item {{m1.getinclude(activeList,item.text)?'activeClass':''}}"  bindtap="changeData">{{ item.text }}</view>
+  </view>
+  <view class="btn">
+    <van-button type="primary" bindtap="goback" color="#703EDD" >确认</van-button>
+  </view>
+</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/categorys/categorys.wxss b/litemall-wx/pages/ucenter/categorys/categorys.wxss
new file mode 100644
index 00000000..9e5f55b9
--- /dev/null
+++ b/litemall-wx/pages/ucenter/categorys/categorys.wxss
@@ -0,0 +1,48 @@
+/* pages/ucenter/category.wxss */
+.category {
+  padding-bottom: 130rpx;
+}
+.category .title {
+  font-size: 38rpx;
+  text-align: center;
+  font-weight: 600;
+  padding: 40rpx 0;
+}
+.category .list {
+  display: flex;
+  flex-wrap: wrap;
+  padding: 0 20rpx;
+}
+.category .list .item {
+  font-size: 26rpx;
+  display: inline-block;
+  padding: 14rpx 26rpx;
+  border: 1px solid #ccc;
+  margin-right: 20rpx;
+  margin-top: 30rpx;
+  border-radius: 6rpx;
+}
+.category .list .activeClass {
+  font-size: 26rpx;
+  display: inline-block;
+  padding: 14rpx 26rpx;
+  border: 1px solid #ccc;
+  margin-right: 20rpx;
+  margin-top: 30rpx;
+  border-radius: 6rpx;
+  background-color: #703EDD;
+  color: #fff;
+  border: #703EDD !important;
+}
+.category .btn {
+  width: 100%;
+  position: fixed;
+  bottom: 40rpx;
+  padding: 0 20rpx;
+}
+.category .btn .van-button{
+  width: 100%;
+}
+.category .btn .van-button .van-button__text{
+  color: #fff;
+}
diff --git a/litemall-wx/pages/ucenter/collect/collect.js b/litemall-wx/pages/ucenter/collect/collect.js
index 25b591a8..30863146 100644
--- a/litemall-wx/pages/ucenter/collect/collect.js
+++ b/litemall-wx/pages/ucenter/collect/collect.js
@@ -1,134 +1,134 @@
-var util = require('../../../utils/util.js');
-var api = require('../../../config/api.js');
-
-var app = getApp();
-
-Page({
-  data: {
-    type: 0,
-    collectList: [],
-    page: 1,
-    limit: 10,
-    totalPages: 1
-  },
-  getCollectList() {
-    wx.showLoading({
-      title: '加载中...',
-    });
-    let that = this;
-    util.request(api.CollectList, {
-      type: that.data.type,
-      page: that.data.page,
-      limit: that.data.limit
-    }).then(function(res) {
-      if (res.errno === 0) {
-        that.setData({
-          collectList: that.data.collectList.concat(res.data.list),
-          totalPages: res.data.pages
-        });
-      }
-    }).finally(() => {
-      wx.hideLoading();
-    });
-  },
-  switchTab: function(event) {
-    let type = event.currentTarget.dataset.index;
-    this.setData({
-      collectList: [],
-      type,
-      page: 1,
-      limit: 10,
-      totalPages: 1
-    });
-    this.getCollectList();
-  },
-  onLoad: function(options) {
-    this.getCollectList();
-  },
-  onReachBottom() {
-    if (this.data.totalPages > this.data.page) {
-      this.setData({
-        page: this.data.page + 1
-      });
-      this.getCollectList();
-    } else {
-      wx.showToast({
-        title: '没有更多用户收藏了',
-        icon: 'none',
-        duration: 2000
-      });
-      return false;
-    }
-  },
-  onReady: function() {
-
-  },
-  onShow: function() {
-
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-  },
-  openCollect(event) {
-    let that = this;
-    let index = event.currentTarget.dataset.index;
-    let valueId = this.data.collectList[index].valueId;
-
-    //触摸时间距离页面打开的毫秒数  
-    var touchTime = that.data.touchEnd - that.data.touchStart;
-    //如果按下时间大于350为长按  
-    if (touchTime > 350) {
-      wx.showModal({
-        title: '',
-        content: '确定删除吗？',
-        success: function(res) {
-          if (res.confirm) {
-
-            util.request(api.CollectAddOrDelete, {
-              type: that.data.type,
-              valueId: valueId
-            }, 'POST').then(function(res) {
-              if (res.errno === 0) {
-                wx.showToast({
-                  title: '删除成功',
-                  icon: 'success',
-                  duration: 2000
-                });
-                that.data.collectList.splice(index, 1)
-                that.setData({
-                  collectList: that.data.collectList
-                });
-              }
-            });
-          }
-        }
-      })
-    } else {
-      var prefix = '/pages/goods/goods?id='
-      if(this.data.type == 1){
-        prefix = "/pages/topicDetail/topicDetail?id="
-      }
-      wx.navigateTo({
-        url: prefix + valueId,
-      });
-    }
-  },
-  //按下事件开始  
-  touchStart: function(e) {
-    let that = this;
-    that.setData({
-      touchStart: e.timeStamp
-    })
-  },
-  //按下事件结束  
-  touchEnd: function(e) {
-    let that = this;
-    that.setData({
-      touchEnd: e.timeStamp
-    })
-  },
+var util = require('../../../utils/util.js');
+var api = require('../../../config/api.js');
+
+var app = getApp();
+
+Page({
+  data: {
+    type: 0,
+    collectList: [],
+    page: 1,
+    limit: 10,
+    totalPages: 1
+  },
+  getCollectList() {
+    wx.showLoading({
+      title: '加载中...',
+    });
+    let that = this;
+    util.request(api.CollectList, {
+      type: that.data.type,
+      page: that.data.page,
+      limit: that.data.limit
+    }).then(function(res) {
+      if (res.errno === 0) {
+        that.setData({
+          collectList: that.data.collectList.concat(res.data.list),
+          totalPages: res.data.pages
+        });
+      }
+    }).finally(() => {
+      wx.hideLoading();
+    });
+  },
+  switchTab: function(event) {
+    let type = event.currentTarget.dataset.index;
+    this.setData({
+      collectList: [],
+      type,
+      page: 1,
+      limit: 10,
+      totalPages: 1
+    });
+    this.getCollectList();
+  },
+  onLoad: function(options) {
+    this.getCollectList();
+  },
+  onReachBottom() {
+    if (this.data.totalPages > this.data.page) {
+      this.setData({
+        page: this.data.page + 1
+      });
+      this.getCollectList();
+    } else {
+      wx.showToast({
+        title: '没有更多用户收藏了',
+        icon: 'none',
+        duration: 2000
+      });
+      return false;
+    }
+  },
+  onReady: function() {
+
+  },
+  onShow: function() {
+
+  },
+  onHide: function() {
+    // 页面隐藏
+
+  },
+  onUnload: function() {
+    // 页面关闭
+  },
+  openCollect(event) {
+    let that = this;
+    let index = event.currentTarget.dataset.index;
+    let valueId = this.data.collectList[index].valueId;
+
+    //触摸时间距离页面打开的毫秒数  
+    var touchTime = that.data.touchEnd - that.data.touchStart;
+    //如果按下时间大于350为长按  
+    if (touchTime > 350) {
+      wx.showModal({
+        title: '',
+        content: '确定删除吗？',
+        success: function(res) {
+          if (res.confirm) {
+
+            util.request(api.CollectAddOrDelete, {
+              type: that.data.type,
+              valueId: valueId
+            }, 'POST').then(function(res) {
+              if (res.errno === 0) {
+                wx.showToast({
+                  title: '删除成功',
+                  icon: 'success',
+                  duration: 2000
+                });
+                that.data.collectList.splice(index, 1)
+                that.setData({
+                  collectList: that.data.collectList
+                });
+              }
+            });
+          }
+        }
+      })
+    } else {
+      var prefix = '/pages/goods/goods?id='
+      if(this.data.type == 1){
+        prefix = "/pages/topicDetail/topicDetail?id="
+      }
+      wx.navigateTo({
+        url: prefix + valueId,
+      });
+    }
+  },
+  //按下事件开始  
+  touchStart: function(e) {
+    let that = this;
+    that.setData({
+      touchStart: e.timeStamp
+    })
+  },
+  //按下事件结束  
+  touchEnd: function(e) {
+    let that = this;
+    that.setData({
+      touchEnd: e.timeStamp
+    })
+  },
 })
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/collect/collect.json b/litemall-wx/pages/ucenter/collect/collect.json
index cff24535..70113c47 100644
--- a/litemall-wx/pages/ucenter/collect/collect.json
+++ b/litemall-wx/pages/ucenter/collect/collect.json
@@ -1,3 +1,3 @@
-{
-  "navigationBarTitleText": "我的收藏"
+{
+  "navigationBarTitleText": "我的收藏"
 }
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/collect/collect.wxml b/litemall-wx/pages/ucenter/collect/collect.wxml
index 1daf6bf0..229fe444 100644
--- a/litemall-wx/pages/ucenter/collect/collect.wxml
+++ b/litemall-wx/pages/ucenter/collect/collect.wxml
@@ -1,31 +1,31 @@
-<view class="container">
-  <view class="collect-switch">
-    <view class="item {{ type == 0 ? 'active' : ''}}" bindtap="switchTab" data-index='0'>
-      <view class="txt">商品收藏</view>
-    </view>
-    <view class="item {{ type == 1 ? 'active' : ''}}" bindtap="switchTab" data-index='1'>
-      <view class="txt">专题收藏</view>
-    </view>
-  </view>
-  <view class="no-collect" wx:if="{{collectList.length <= 0}}">
-    <view class="c">
-      <text>还没有收藏</text>
-    </view>
-  </view>
-  <view class="{{type==0 ? 'goods-list' : 'topic-list'}}" wx:else>
-    <view class="item" bindtap="openCollect" bindtouchstart="touchStart" bindtouchend="touchEnd" wx:for="{{collectList}}" wx:key="id" data-index="{{index}}">
-      <image class="img" src="{{item.picUrl}}"></image>
-      <view class="info" wx:if="{{type==0}}" >
-        <view class="name">{{item.name}}</view>
-        <view class="subtitle">{{item.brief}}</view>
-        <view class="price">￥{{item.retailPrice}}</view>
-      </view>
-      <view class="info" wx:if="{{type==1}}">
-        <text class="title">{{item.title}}</text>
-        <text class="desc">{{item.subtitle}}</text>
-        <text class="price">{{item.price}}元起</text>
-      </view>
-    </view>
-  </view>
-
+<view class="container">
+  <!-- <view class="collect-switch">
+    <view class="item {{ type == 0 ? 'active' : ''}}" bindtap="switchTab" data-index='0'>
+      <view class="txt">商品收藏</view>
+    </view>
+    <view class="item {{ type == 1 ? 'active' : ''}}" bindtap="switchTab" data-index='1'>
+      <view class="txt">专题收藏</view>
+    </view>
+  </view> -->
+  <view class="no-collect" wx:if="{{collectList.length <= 0}}">
+    <view class="c">
+      <text>还没有收藏</text>
+    </view>
+  </view>
+  <view class="{{type==0 ? 'goods-list' : 'topic-list'}}" wx:else>
+    <view class="item" bindtap="openCollect" bindtouchstart="touchStart" bindtouchend="touchEnd" wx:for="{{collectList}}" wx:key="id" data-index="{{index}}">
+      <image class="img" src="{{item.picUrl}}"></image>
+      <view class="info" wx:if="{{type==0}}" >
+        <view class="name">{{item.name}}</view>
+        <view class="subtitle">{{item.brief}}</view>
+        <view class="price">￥{{item.retailPrice}}</view>
+      </view>
+      <view class="info" wx:if="{{type==1}}">
+        <text class="title">{{item.title}}</text>
+        <text class="desc">{{item.subtitle}}</text>
+        <text class="price">{{item.price}}元起</text>
+      </view>
+    </view>
+  </view>
+
 </view>
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/collect/collect.wxss b/litemall-wx/pages/ucenter/collect/collect.wxss
index 6a5c6af7..a61bd355 100644
--- a/litemall-wx/pages/ucenter/collect/collect.wxss
+++ b/litemall-wx/pages/ucenter/collect/collect.wxss
@@ -1,186 +1,186 @@
-page {
-  background: #f4f4f4;
-  min-height: 100%;
-}
-
-.container {
-  background: #f4f4f4;
-  min-height: 100%;
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-}
-.collect-switch {
-  width: 100%;
-  background: #fff;
-  height: 84rpx;
-}
-
-.collect-switch .item {
-  display: inline-block;
-  height: 82rpx;
-  width: 50%;
-  padding: 0 15rpx;
-  text-align: center;
-}
-
-.collect-switch .item .txt {
-  display: inline-block;
-  height: 82rpx;
-  padding: 0 20rpx;
-  line-height: 82rpx;
-  color: #9a9ba1;
-  font-size: 30rpx;
-  width: 170rpx;
-}
-
-.collect-switch .item.active .txt {
-  color: #ab956d;
-  border-bottom: 4rpx solid #ab956d;
-}
-
-.no-collect {
-  width: 100%;
-  height: auto;
-  margin: 0 auto;
-}
-
-.no-collect .c {
-  width: 100%;
-  height: auto;
-  margin-top: 400rpx;
-}
-
-.no-collect .c text {
-  margin: 0 auto;
-  display: block;
-  width: 258rpx;
-  height: 29rpx;
-  line-height: 29rpx;
-  text-align: center;
-  font-size: 29rpx;
-  color: #999;
-}
-
-/*商品收藏列表样式*/
-.goods-list {
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-  background: #fff;
-  padding-left: 30rpx;
-  border-top: 1px solid #e1e1e1;
-}
-
-.goods-list .item {
-  height: 212rpx;
-  width: 720rpx;
-  background: #fff;
-  padding: 30rpx 30rpx 30rpx 0;
-  border-bottom: 1px solid #e1e1e1;
-}
-
-.goods-list .item:last-child {
-  border-bottom: 1px solid #fff;
-}
-
-.goods-list .item .img {
-  float: left;
-  width: 150rpx;
-  height: 150rpx;
-}
-
-.goods-list .item .info {
-  float: right;
-  width: 540rpx;
-  height: 150rpx;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  padding-left: 20rpx;
-}
-
-.goods-list .item .info .name {
-  font-size: 28rpx;
-  color: #333;
-  line-height: 40rpx;
-}
-
-.goods-list .item .info .subtitle {
-  margin-top: 8rpx;
-  font-size: 24rpx;
-  color: #888;
-  line-height: 40rpx;
-}
-
-.goods-list .item .info .price {
-  margin-top: 8rpx;
-  font-size: 28rpx;
-  color: #333;
-  line-height: 40rpx;
-}
-
-/*专题收藏列表样式*/
-
-.topic-list{
-  width: 750rpx;
-  height: 100%;
-  overflow: hidden;
-  background: #f4f4f4;
-}
-
-.topic-list .item{
-  width: 100%;
-  height: 625rpx;
-  overflow: hidden;
-  background: #fff;
-  margin-bottom: 20rpx;
-}
-
-.topic-list .img{
-  width: 100%;
-  height: 415rpx;
-}
-
-.topic-list .info{
-  width: 100%;
-  height: 210rpx;
-  overflow: hidden;
-}
-
-.topic-list .title{
-  display: block;
-  text-align: center;
-  width: 100%;
-  height: 33rpx;
-  line-height: 35rpx;
-  color: #333;
-  overflow: hidden;
-  font-size: 35rpx;
-  margin-top: 30rpx;
-}
-
-.topic-list .desc{
-  display: block;
-  text-align: center;
-  position: relative;
-  width: auto;
-  height: 24rpx;
-  line-height: 24rpx;
-  overflow: hidden;
-  color: #999;
-  font-size: 24rpx;
-  margin-top: 16rpx;
-  margin-bottom: 30rpx;
-}
-
-.topic-list .price{
-  display: block;
-  text-align: center;
-  width: 100%;
-  height: 27rpx;
-  line-height: 27rpx;
-  overflow: hidden;
-  color: #b4282d;
-  font-size: 27rpx;
+page {
+  background: #f4f4f4;
+  min-height: 100%;
+}
+
+.container {
+  background: #f4f4f4;
+  min-height: 100%;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+.collect-switch {
+  width: 100%;
+  background: #fff;
+  height: 84rpx;
+}
+
+.collect-switch .item {
+  display: inline-block;
+  height: 82rpx;
+  width: 50%;
+  padding: 0 15rpx;
+  text-align: center;
+}
+
+.collect-switch .item .txt {
+  display: inline-block;
+  height: 82rpx;
+  padding: 0 20rpx;
+  line-height: 82rpx;
+  color: #9a9ba1;
+  font-size: 30rpx;
+  width: 170rpx;
+}
+
+.collect-switch .item.active .txt {
+  color: #ab956d;
+  border-bottom: 4rpx solid #ab956d;
+}
+
+.no-collect {
+  width: 100%;
+  height: auto;
+  margin: 0 auto;
+}
+
+.no-collect .c {
+  width: 100%;
+  height: auto;
+  margin-top: 400rpx;
+}
+
+.no-collect .c text {
+  margin: 0 auto;
+  display: block;
+  width: 258rpx;
+  height: 29rpx;
+  line-height: 29rpx;
+  text-align: center;
+  font-size: 29rpx;
+  color: #999;
+}
+
+/*商品收藏列表样式*/
+.goods-list {
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+  background: #fff;
+  padding-left: 30rpx;
+  border-top: 1px solid #e1e1e1;
+}
+
+.goods-list .item {
+  height: 212rpx;
+  width: 720rpx;
+  background: #fff;
+  padding: 30rpx 30rpx 30rpx 0;
+  border-bottom: 1px solid #e1e1e1;
+}
+
+.goods-list .item:last-child {
+  border-bottom: 1px solid #fff;
+}
+
+.goods-list .item .img {
+  float: left;
+  width: 150rpx;
+  height: 150rpx;
+}
+
+.goods-list .item .info {
+  float: right;
+  width: 540rpx;
+  height: 150rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  padding-left: 20rpx;
+}
+
+.goods-list .item .info .name {
+  font-size: 28rpx;
+  color: #333;
+  line-height: 40rpx;
+}
+
+.goods-list .item .info .subtitle {
+  margin-top: 8rpx;
+  font-size: 24rpx;
+  color: #888;
+  line-height: 40rpx;
+}
+
+.goods-list .item .info .price {
+  margin-top: 8rpx;
+  font-size: 28rpx;
+  color: #333;
+  line-height: 40rpx;
+}
+
+/*专题收藏列表样式*/
+
+.topic-list{
+  width: 750rpx;
+  height: 100%;
+  overflow: hidden;
+  background: #f4f4f4;
+}
+
+.topic-list .item{
+  width: 100%;
+  height: 625rpx;
+  overflow: hidden;
+  background: #fff;
+  margin-bottom: 20rpx;
+}
+
+.topic-list .img{
+  width: 100%;
+  height: 415rpx;
+}
+
+.topic-list .info{
+  width: 100%;
+  height: 210rpx;
+  overflow: hidden;
+}
+
+.topic-list .title{
+  display: block;
+  text-align: center;
+  width: 100%;
+  height: 33rpx;
+  line-height: 35rpx;
+  color: #333;
+  overflow: hidden;
+  font-size: 35rpx;
+  margin-top: 30rpx;
+}
+
+.topic-list .desc{
+  display: block;
+  text-align: center;
+  position: relative;
+  width: auto;
+  height: 24rpx;
+  line-height: 24rpx;
+  overflow: hidden;
+  color: #999;
+  font-size: 24rpx;
+  margin-top: 16rpx;
+  margin-bottom: 30rpx;
+}
+
+.topic-list .price{
+  display: block;
+  text-align: center;
+  width: 100%;
+  height: 27rpx;
+  line-height: 27rpx;
+  overflow: hidden;
+  color: #b4282d;
+  font-size: 27rpx;
 }
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/couponList/couponList.js b/litemall-wx/pages/ucenter/couponList/couponList.js
deleted file mode 100644
index e37773b6..00000000
--- a/litemall-wx/pages/ucenter/couponList/couponList.js
+++ /dev/null
@@ -1,173 +0,0 @@
-var util = require('../../../utils/util.js');
-var api = require('../../../config/api.js');
-
-var app = getApp();
-
-Page({
-  data: {
-    couponList: [],
-    code: '',
-    status: 0,
-    page: 1,
-    limit: 10,
-    count: 0,
-    scrollTop: 0,
-    showPage: false
-  },
-
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function(options) {
-    this.getCouponList();
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-    wx.showNavigationBarLoading() //在标题栏中显示加载
-    this.getCouponList();
-    wx.hideNavigationBarLoading() //完成停止加载
-    wx.stopPullDownRefresh() //停止下拉刷新
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function() {
-
-  },
-  getCouponList: function() {
-
-    let that = this;
-    that.setData({
-      scrollTop: 0,
-      showPage: false,
-      couponList: []
-    });
-    util.request(api.CouponMyList, {
-      status: that.data.status,
-      page: that.data.page,
-      limit: that.data.limit
-    }).then(function(res) {
-      if (res.errno === 0) {
-
-        that.setData({
-          scrollTop: 0,
-          couponList: res.data.list,
-          showPage: res.data.total > that.data.limit,
-          count: res.data.total
-        });
-      }
-    });
-
-  },
-  bindExchange: function (e) {
-    this.setData({
-      code: e.detail.value
-    });
-  },
-  clearExchange: function () {
-    this.setData({
-      code: ''
-    });
-  },
-  goExchange: function() {
-    if (this.data.code.length === 0) {
-      util.showErrorToast("请输入兑换码");
-      return;
-    }
-
-    let that = this;
-    util.request(api.CouponExchange, {
-      code: that.data.code
-    }, 'POST').then(function (res) {
-      if (res.errno === 0) {
-        that.getCouponList();
-        that.clearExchange();
-        wx.showToast({
-          title: "领取成功",
-          duration: 2000
-        })
-      }
-      else{
-        util.showErrorToast(res.errmsg);
-      }
-    });
-  },
-  nextPage: function(event) {
-    var that = this;
-    if (this.data.page > that.data.count / that.data.limit) {
-      return true;
-    }
-
-    that.setData({
-      page: that.data.page + 1
-    });
-
-    this.getCouponList();
-
-  },
-  prevPage: function(event) {
-    if (this.data.page <= 1) {
-      return false;
-    }
-
-    var that = this;
-    that.setData({
-      page: that.data.page - 1
-    });
-    this.getCouponList();
-  },
-  switchTab: function(e) {
-
-    this.setData({
-      couponList: [],
-      status: e.currentTarget.dataset.index,
-      page: 1,
-      limit: 10,
-      count: 0,
-      scrollTop: 0,
-      showPage: false
-    });
-
-    this.getCouponList();
-  },
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/couponList/couponList.json b/litemall-wx/pages/ucenter/couponList/couponList.json
deleted file mode 100644
index 91a15805..00000000
--- a/litemall-wx/pages/ucenter/couponList/couponList.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "enablePullDownRefresh": true,
-  "navigationBarTitleText": "我的优惠券"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/couponList/couponList.wxml b/litemall-wx/pages/ucenter/couponList/couponList.wxml
deleted file mode 100644
index 7f9c2822..00000000
--- a/litemall-wx/pages/ucenter/couponList/couponList.wxml
+++ /dev/null
@@ -1,56 +0,0 @@
-<view class="container">
-
-  <view class="h">
-    <view class="item {{ status == 0 ? 'active' : ''}}" bindtap="switchTab" data-index="0">
-      <view class="txt">未使用</view>
-    </view>
-    <view class="item {{ status == 1 ? 'active' : ''}}" bindtap="switchTab" data-index="1">
-      <view class="txt">已使用</view>
-    </view>
-    <view class="item {{ status == 2 ? 'active' : ''}}" bindtap="switchTab" data-index="2">
-      <view class="txt">已过期</view>
-    </view>
-  </view>
-
-  <view class="b">
-
-    <view class="coupon-form" wx:if="{{status == 0}}">
-      <view class="input-box">
-        <input class="coupon-sn" placeholder="请输入优惠码" value="{{code}}" bindinput="bindExchange"/>
-        <van-icon name="close" class="clear-icon" wx:if="{{ code.length > 0 }}" catchtap="clearExchange"/>        
-      </view>
-      <view class="add-btn" bindtap='goExchange'>兑换</view>
-    </view>
-
-    <view class="help" wx:if="{{status == 0}}">
-      <van-icon name="question-o" />
-      使用说明
-    </view>
-
-    <scroll-view class="coupon-list" scroll-y="true" scroll-top="{{scrollTop}}">
-
-      <view class="item {{ status == 0 ? 'active' : ''}}" wx:for="{{couponList}}" wx:for-index="index" wx:for-item="item" wx:key="id">
-        <view class="tag">{{item.tag}}</view>
-        <view class="content">
-          <view class="left">
-            <view class="discount">{{item.discount}}元</view>
-            <view class="min"> 满{{item.min}}元使用</view>
-          </view>
-          <view class="right">
-            <view class="name">{{item.name}}</view>
-            <view class="time"> 有效期：{{item.startTime}} - {{item.endTime}}</view>
-          </view>
-        </view>
-        <view class="condition">
-          <text class="txt">{{item.desc}}</text>
-          <image src="{{item.pic}}" class="icon"></image>
-        </view>
-      </view>
-
-      <view class="page" wx:if="{{showPage}}">
-        <view class="prev {{ page <= 1 ? 'disabled' : ''}}" bindtap="prevPage">上一页</view>
-        <view class="next {{ (count / size) < page ? 'disabled' : ''}}" bindtap="nextPage">下一页</view>
-      </view>
-    </scroll-view>
-  </view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/couponList/couponList.wxss b/litemall-wx/pages/ucenter/couponList/couponList.wxss
deleted file mode 100644
index efb8e0cd..00000000
--- a/litemall-wx/pages/ucenter/couponList/couponList.wxss
+++ /dev/null
@@ -1,242 +0,0 @@
-page {
-  background: #f4f4f4;
-  min-height: 100%;
-}
-
-.container {
-  background: #f4f4f4;
-  min-height: 100%;
-  padding-top: 30rpx;
-}
-
-.container .h {
-  position: fixed;
-  left: 0;
-  top: 0;
-  z-index: 1000;
-  width: 100%;
-  display: flex;
-  background: #fff;
-  height: 84rpx;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.15);
-}
-
-.container .h .item {
-  display: inline-block;
-  height: 82rpx;
-  width: 50%;
-  padding: 0 15rpx;
-  text-align: center;
-}
-
-.container .h .item .txt {
-  display: inline-block;
-  height: 82rpx;
-  padding: 0 20rpx;
-  line-height: 82rpx;
-  color: #333;
-  font-size: 30rpx;
-  width: 170rpx;
-}
-
-.container .h .item.active .txt {
-  color: #ab2b2b;
-  border-bottom: 4rpx solid #ab2b2b;
-}
-
-.container .b {
-  margin-top: 85rpx;
-  height: auto;
-}
-
-.container .b .coupon-form {
-  height: 110rpx;
-  width: 100%;
-  background: #fff;
-  padding-left: 30rpx;
-  padding-right: 30rpx;
-  padding-top: 20rpx;
-  display: flex;
-}
-
-.container .b .input-box {
-  flex: 1;
-  height: 70rpx;
-  color: #333;
-  font-size: 24rpx;
-  background: #fff;
-  position: relative;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  border-radius: 4rpx;
-  margin-right: 30rpx;
-}
-
-.container .b .input-box .coupon-sn {
-  position: absolute;
-  top: 10rpx;
-  left: 30rpx;
-  height: 50rpx;
-  width: 100%;
-  color: #000;
-  line-height: 50rpx;
-  font-size: 24rpx;
-}
-
-.container .b .clear-icon {
-  position: absolute;
-  top: 25rpx;
-  right: 18rpx;
-  z-index: 2;
-  display: block;
-  background: #fff;
-}
-
-.container .b .add-btn {
-  height: 70rpx;
-  border: none;
-  width: 168rpx;
-  background: #b4282d;
-  border-radius: 0;
-  line-height: 70rpx;
-  color: #fff;
-  font-size: 28rpx;
-  text-align: center;
-}
-
-.container .b .add-btn.disabled {
-  background: #ccc;
-}
-
-.container .b .help {
-  height: 72rpx;
-  line-height: 72rpx;
-  text-align: right;
-  padding-right: 30rpx;
-  background-size: 28rpx;
-  color: #999;
-  font-size: 24rpx;
-}
-
-.container .b .coupon-list {
-  width: 750rpx;
-  height: 100%;
-  overflow: hidden;
-}
-
-.container .b .item {
-  position: relative;
-  height: 290rpx;
-  background: #ccc7c7;
-  margin-bottom: 30rpx;
-  margin-left: 30rpx;
-  margin-right: 30rpx;
-  padding-top: 52rpx;
-}
-
-.container .b .item.active {
-  background: linear-gradient(to right, #cfa568, #e3bf79);
-}
-
-.container .b .tag {
-  height: 32rpx;
-  background: #a48143;
-  padding-left: 16rpx;
-  padding-right: 16rpx;
-  position: absolute;
-  left: 20rpx;
-  color: #fff;
-  top: 20rpx;
-  font-size: 20rpx;
-  text-align: center;
-  line-height: 32rpx;
-}
-
-.container .b .content {
-  margin-top: 24rpx;
-  margin-left: 40rpx;
-  display: flex;
-  margin-right: 40rpx;
-  flex-direction: row;
-}
-
-.container .b .content .left {
-  flex: 1;
-}
-
-.container .b .discount {
-  font-size: 50rpx;
-  color: #b4282d;
-}
-
-.container .b .min {
-  color: #fff;
-}
-
-.container .b .content .right {
-  width: 400rpx;
-}
-
-.container .b .name {
-  font-size: 44rpx;
-  color: #fff;
-  margin-bottom: 14rpx;
-}
-
-.container .b .time {
-  font-size: 24rpx;
-  color: #fff;
-  line-height: 30rpx;
-}
-
-.container .b .condition {
-  position: absolute;
-  width: 100%;
-  bottom: 0;
-  left: 0;
-  height: 78rpx;
-  background: rgba(0, 0, 0, 0.08);
-  padding: 24rpx 40rpx;
-  display: flex;
-  flex-direction: row;
-}
-
-.container .b .condition .txt {
-  display: block;
-  height: 30rpx;
-  flex: 1;
-  overflow: hidden;
-  font-size: 24rpx;
-  line-height: 30rpx;
-  color: #fff;
-}
-
-.container .b .condition .icon {
-  margin-left: 30rpx;
-  width: 24rpx;
-  height: 24rpx;
-}
-
-.container .b .page {
-  width: 750rpx;
-  height: 108rpx;
-  background: #fff;
-  margin-bottom: 20rpx;
-}
-
-.container .b .page view {
-  height: 108rpx;
-  width: 50%;
-  float: left;
-  font-size: 29rpx;
-  color: #333;
-  text-align: center;
-  line-height: 108rpx;
-}
-
-.container .b .page .prev {
-  border-right: 1px solid #d9d9d9;
-}
-
-.container .b .page .disabled {
-  color: #ccc;
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/couponSelect/couponSelect.js b/litemall-wx/pages/ucenter/couponSelect/couponSelect.js
deleted file mode 100644
index 3885d722..00000000
--- a/litemall-wx/pages/ucenter/couponSelect/couponSelect.js
+++ /dev/null
@@ -1,162 +0,0 @@
-var util = require('../../../utils/util.js');
-var api = require('../../../config/api.js');
-
-var app = getApp();
-
-Page({
-  data: {
-    couponList: [],
-    cartId: 0,
-    couponId: 0,
-    userCouponId: 0,
-    grouponLinkId: 0,
-    scrollTop: 0
-  },
-
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-    // 页面显示
-    wx.showLoading({
-      title: '加载中...',
-    });
-
-    try {
-      var cartId = wx.getStorageSync('cartId');
-      if (!cartId) {
-        cartId = 0;
-      }
-
-      var couponId = wx.getStorageSync('couponId');
-      if (!couponId) {
-        couponId = 0;
-      }
-
-      var userCouponId = wx.getStorageSync('userCouponId');
-      if (!userCouponId) {
-        userCouponId = 0;
-      }
-
-      var grouponRulesId = wx.getStorageSync('grouponRulesId');
-      if (!grouponRulesId) {
-        grouponRulesId = 0;
-      }
-
-      this.setData({
-        cartId: cartId,
-        couponId: couponId,
-        userCouponId: userCouponId,
-        grouponRulesId: grouponRulesId
-      });
-
-    } catch (e) {
-      // Do something when catch error
-      console.log(e);
-    }
-
-    this.getCouponList();
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  },
-  getCouponList: function () {
-
-    let that = this;
-    that.setData({
-      couponList: []
-    });
-    // 页面渲染完成
-    wx.showToast({
-      title: '加载中...',
-      icon: 'loading',
-      duration: 2000
-    });
-
-    util.request(api.CouponSelectList, {
-      cartId: that.data.cartId,
-      grouponRulesId: that.data.grouponRulesId,
-    }).then(function (res) {
-      if (res.errno === 0) {
-        let list = [];
-        for (var i = 0; i < res.data.list.length; i++) {
-          if (res.data.list[i].available) {
-            list.push(res.data.list[i]);
-          }
-        }
-        that.setData({
-          couponList: list
-        });
-      }
-      wx.hideToast();
-    });
-
-  },
-  selectCoupon: function (e) {
-    try {
-      wx.setStorageSync('couponId', e.currentTarget.dataset.cid);
-      wx.setStorageSync('userCouponId', e.currentTarget.dataset.id);
-    } catch (error) {
-
-    }
-    
-    wx.navigateBack();
-  },
-  unselectCoupon: function() {
-    // 如果优惠券ID设置-1，则表示订单不使用优惠券
-    try {
-      wx.setStorageSync('couponId', -1);
-      wx.setStorageSync('userCouponId', -1);
-    } catch (error) {
-
-    }
-
-    wx.navigateBack();
-  }
-
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/couponSelect/couponSelect.json b/litemall-wx/pages/ucenter/couponSelect/couponSelect.json
deleted file mode 100644
index b4825df5..00000000
--- a/litemall-wx/pages/ucenter/couponSelect/couponSelect.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "选择优惠券"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/couponSelect/couponSelect.wxml b/litemall-wx/pages/ucenter/couponSelect/couponSelect.wxml
deleted file mode 100644
index 3dc18956..00000000
--- a/litemall-wx/pages/ucenter/couponSelect/couponSelect.wxml
+++ /dev/null
@@ -1,26 +0,0 @@
-<view class="container">
-
-  <scroll-view class="coupon-list" scroll-y="true" scroll-top="{{scrollTop}}">
-
-    <view class="unselect" bindtap='unselectCoupon'>不选择优惠券</view>
-
-    <view class="item" wx:for="{{couponList}}" wx:for-index="index" wx:for-item="item" wx:key="id" bindtap="selectCoupon" data-id="{{item.id}}" data-cid="{{item.cid}}">
-      <view class="tag">{{item.tag}}</view>
-      <view class="content">
-        <view class="left">
-          <view class="discount">{{item.discount}}元</view>
-          <view class="min"> 满{{item.min}}元使用</view>
-        </view>
-        <view class="right">
-          <view class="name">{{item.name}}</view>
-          <view class="time"> 有效期：{{item.startTime}} - {{item.endTime}}</view>
-        </view>
-      </view>
-      <view class="condition">
-        <text class="txt">{{item.desc}}</text>
-        <image src="{{item.pic}}" class="icon"></image>
-      </view>
-    </view>
-
-  </scroll-view>
-</view>  
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/couponSelect/couponSelect.wxss b/litemall-wx/pages/ucenter/couponSelect/couponSelect.wxss
deleted file mode 100644
index d9681786..00000000
--- a/litemall-wx/pages/ucenter/couponSelect/couponSelect.wxss
+++ /dev/null
@@ -1,120 +0,0 @@
-page {
-  background: #f4f4f4;
-  min-height: 100%;
-}
-
-.container {
-  background: #f4f4f4;
-  min-height: 100%;
-  padding-top: 30rpx;
-}
-
-.coupon-list {
-  width: 750rpx;
-  height: 100%;
-  overflow: hidden;
-}
-
-.unselect {
-  height: 80rpx;
-  border: none;
-  width: 700rpx;
-  background: #28b43b;
-  color: #fff;
-  font-size: 40rpx;
-  text-align: center;
-  margin-bottom: 30rpx;
-  margin-left: 30rpx;
-  margin-right: 30rpx;
-  line-height: 80rpx;
-}
-
-.item {
-  position: relative;
-  height: 290rpx;
-  width: 700rpx;
-  background: linear-gradient(to right, #cfa568, #e3bf79);
-  margin-bottom: 30rpx;
-  margin-left: 30rpx;
-  margin-right: 30rpx;
-  padding-top: 52rpx;
-}
-
-.tag {
-  height: 32rpx;
-  background: #a48143;
-  padding-left: 16rpx;
-  padding-right: 16rpx;
-  position: absolute;
-  left: 20rpx;
-  color: #fff;
-  top: 20rpx;
-  font-size: 20rpx;
-  text-align: center;
-  line-height: 32rpx;
-}
-
-.content {
-  margin-top: 24rpx;
-  margin-left: 40rpx;
-  display: flex;
-  margin-right: 40rpx;
-  flex-direction: row;
-}
-
-.content .left {
-  flex: 1;
-}
-
-.discount {
-  font-size: 50rpx;
-  color: #b4282d;
-}
-
-.min {
-  color: #fff;
-}
-
-.content .right {
-  width: 400rpx;
-}
-
-.name {
-  font-size: 44rpx;
-  color: #fff;
-  margin-bottom: 14rpx;
-}
-
-.time {
-  font-size: 24rpx;
-  color: #fff;
-  line-height: 30rpx;
-}
-
-.condition {
-  position: absolute;
-  width: 100%;
-  bottom: 0;
-  left: 0;
-  height: 78rpx;
-  background: rgba(0, 0, 0, 0.08);
-  padding: 24rpx 40rpx;
-  display: flex;
-  flex-direction: row;
-}
-
-.condition .txt {
-  display: block;
-  height: 30rpx;
-  flex: 1;
-  overflow: hidden;
-  font-size: 24rpx;
-  line-height: 30rpx;
-  color: #fff;
-}
-
-.condition .icon {
-  margin-left: 30rpx;
-  width: 24rpx;
-  height: 24rpx;
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/feedback/feedback.js b/litemall-wx/pages/ucenter/feedback/feedback.js
index aae9f5d6..4046de72 100644
--- a/litemall-wx/pages/ucenter/feedback/feedback.js
+++ b/litemall-wx/pages/ucenter/feedback/feedback.js
@@ -1,176 +1,176 @@
-var util = require('../../../utils/util.js');
-var check = require('../../../utils/check.js');
-var api = require('../../../config/api.js');
-
-var app = getApp();
-
-Page({
-  data: {
-    array: ['请选择反馈类型', '商品相关', '功能异常', '优化建议', '其他'],
-    index: 0,
-    content: '',
-    contentLength: 0,
-    mobile: '',
-    hasPicture: false,
-    picUrls: [],
-    files: []
-  },
-  chooseImage: function(e) {
-    if (this.data.files.length >= 5) {
-      util.showErrorToast('只能上传五张图片')
-      return false;
-    }
-
-    var that = this;
-    wx.chooseImage({
-      count: 1,
-      sizeType: ['original', 'compressed'],
-      sourceType: ['album', 'camera'],
-      success: function(res) {
-        that.setData({
-          files: that.data.files.concat(res.tempFilePaths)
-        });
-        that.upload(res);
-      }
-    })
-  },
-  upload: function(res) {
-    var that = this;
-    const uploadTask = wx.uploadFile({
-      url: api.StorageUpload,
-      filePath: res.tempFilePaths[0],
-      name: 'file',
-      success: function(res) {
-        var _res = JSON.parse(res.data);
-        if (_res.errno === 0) {
-          var url = _res.data.url
-          that.data.picUrls.push(url)
-          that.setData({
-            hasPicture: true,
-            picUrls: that.data.picUrls
-          })
-        }
-      },
-      fail: function(e) {
-        wx.showModal({
-          title: '错误',
-          content: '上传失败',
-          showCancel: false
-        })
-      },
-    })
-
-    uploadTask.onProgressUpdate((res) => {
-      console.log('上传进度', res.progress)
-      console.log('已经上传的数据长度', res.totalBytesSent)
-      console.log('预期需要上传的数据总长度', res.totalBytesExpectedToSend)
-    })
-
-  },
-  previewImage: function(e) {
-    wx.previewImage({
-      current: e.currentTarget.id, // 当前显示图片的http链接
-      urls: this.data.files // 需要预览的图片http链接列表
-    })
-  },
-  bindPickerChange: function(e) {
-    this.setData({
-      index: e.detail.value
-    });
-  },
-  mobileInput: function(e) {
-    this.setData({
-      mobile: e.detail.value
-    });
-  },
-  contentInput: function(e) {
-    this.setData({
-      contentLength: e.detail.cursor,
-      content: e.detail.value,
-    });
-  },
-  clearMobile: function(e) {
-    this.setData({
-      mobile: ''
-    });
-  },
-  submitFeedback: function(e) {
-    if (!app.globalData.hasLogin) {
-      wx.navigateTo({
-        url: "/pages/auth/login/login"
-      });
-    }
-
-    let that = this;
-    if (that.data.index == 0) {
-      util.showErrorToast('请选择反馈类型');
-      return false;
-    }
-
-    if (that.data.content == '') {
-      util.showErrorToast('请输入反馈内容');
-      return false;
-    }
-
-    if (that.data.mobile == '') {
-      util.showErrorToast('请输入手机号码');
-      return false;
-    }
-
-    wx.showLoading({
-      title: '提交中...',
-      mask: true,
-      success: function() {
-
-      }
-    });
-
-    util.request(api.FeedbackAdd, {
-      mobile: that.data.mobile,
-      feedType: that.data.array[that.data.index],
-      content: that.data.content,
-      hasPicture: that.data.hasPicture,
-      picUrls: that.data.picUrls
-    }, 'POST').then(function(res) {
-      wx.hideLoading();
-
-      if (res.errno === 0) {
-        wx.showToast({
-          title: '感谢您的反馈！',
-          icon: 'success',
-          duration: 2000,
-          complete: function() {
-            that.setData({
-              index: 0,
-              content: '',
-              contentLength: 0,
-              mobile: '',
-              hasPicture: false,
-              picUrls: [],
-              files: []
-            });
-          }
-        });
-      } else {
-        util.showErrorToast(res.errmsg);
-      }
-
-    });
-  },
-  onLoad: function(options) {
-
-  },
-  onReady: function() {
-
-  },
-  onShow: function() {
-
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-  }
+var util = require('../../../utils/util.js');
+var check = require('../../../utils/check.js');
+var api = require('../../../config/api.js');
+
+var app = getApp();
+
+Page({
+  data: {
+    array: ['请选择反馈类型', '商品相关', '功能异常', '优化建议', '其他'],
+    index: 0,
+    content: '',
+    contentLength: 0,
+    mobile: '',
+    hasPicture: false,
+    picUrls: [],
+    files: []
+  },
+  chooseImage: function(e) {
+    if (this.data.files.length >= 5) {
+      util.showErrorToast('只能上传五张图片')
+      return false;
+    }
+
+    var that = this;
+    wx.chooseImage({
+      count: 1,
+      sizeType: ['original', 'compressed'],
+      sourceType: ['album', 'camera'],
+      success: function(res) {
+        that.setData({
+          files: that.data.files.concat(res.tempFilePaths)
+        });
+        that.upload(res);
+      }
+    })
+  },
+  upload: function(res) {
+    var that = this;
+    const uploadTask = wx.uploadFile({
+      url: api.StorageUpload,
+      filePath: res.tempFilePaths[0],
+      name: 'file',
+      success: function(res) {
+        var _res = JSON.parse(res.data);
+        if (_res.errno === 0) {
+          var url = _res.data.url
+          that.data.picUrls.push(url)
+          that.setData({
+            hasPicture: true,
+            picUrls: that.data.picUrls
+          })
+        }
+      },
+      fail: function(e) {
+        wx.showModal({
+          title: '错误',
+          content: '上传失败',
+          showCancel: false
+        })
+      },
+    })
+
+    uploadTask.onProgressUpdate((res) => {
+      console.log('上传进度', res.progress)
+      console.log('已经上传的数据长度', res.totalBytesSent)
+      console.log('预期需要上传的数据总长度', res.totalBytesExpectedToSend)
+    })
+
+  },
+  previewImage: function(e) {
+    wx.previewImage({
+      current: e.currentTarget.id, // 当前显示图片的http链接
+      urls: this.data.files // 需要预览的图片http链接列表
+    })
+  },
+  bindPickerChange: function(e) {
+    this.setData({
+      index: e.detail.value
+    });
+  },
+  mobileInput: function(e) {
+    this.setData({
+      mobile: e.detail.value
+    });
+  },
+  contentInput: function(e) {
+    this.setData({
+      contentLength: e.detail.cursor,
+      content: e.detail.value,
+    });
+  },
+  clearMobile: function(e) {
+    this.setData({
+      mobile: ''
+    });
+  },
+  submitFeedback: function(e) {
+    if (!app.globalData.hasLogin) {
+      wx.navigateTo({
+        url: "/pages/auth/authorization/authorization"
+      });
+    }
+
+    let that = this;
+    if (that.data.index == 0) {
+      util.showErrorToast('请选择反馈类型');
+      return false;
+    }
+
+    if (that.data.content == '') {
+      util.showErrorToast('请输入反馈内容');
+      return false;
+    }
+
+    if (that.data.mobile == '') {
+      util.showErrorToast('请输入手机号码');
+      return false;
+    }
+
+    wx.showLoading({
+      title: '提交中...',
+      mask: true,
+      success: function() {
+
+      }
+    });
+
+    util.request(api.FeedbackAdd, {
+      mobile: that.data.mobile,
+      feedType: that.data.array[that.data.index],
+      content: that.data.content,
+      hasPicture: that.data.hasPicture,
+      picUrls: that.data.picUrls
+    }, 'POST').then(function(res) {
+      wx.hideLoading();
+
+      if (res.errno === 0) {
+        wx.showToast({
+          title: '感谢您的反馈！',
+          icon: 'success',
+          duration: 2000,
+          complete: function() {
+            that.setData({
+              index: 0,
+              content: '',
+              contentLength: 0,
+              mobile: '',
+              hasPicture: false,
+              picUrls: [],
+              files: []
+            });
+          }
+        });
+      } else {
+        util.showErrorToast(res.errmsg);
+      }
+
+    });
+  },
+  onLoad: function(options) {
+
+  },
+  onReady: function() {
+
+  },
+  onShow: function() {
+
+  },
+  onHide: function() {
+    // 页面隐藏
+
+  },
+  onUnload: function() {
+    // 页面关闭
+  }
 })
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/feedback/feedback.json b/litemall-wx/pages/ucenter/feedback/feedback.json
index fc30db1c..38eb51e0 100644
--- a/litemall-wx/pages/ucenter/feedback/feedback.json
+++ b/litemall-wx/pages/ucenter/feedback/feedback.json
@@ -1,3 +1,3 @@
-{
-  "navigationBarTitleText": "意见反馈"
+{
+  "navigationBarTitleText": "意见反馈"
 }
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/feedback/feedback.wxml b/litemall-wx/pages/ucenter/feedback/feedback.wxml
index 526635a4..3ec9dc5c 100644
--- a/litemall-wx/pages/ucenter/feedback/feedback.wxml
+++ b/litemall-wx/pages/ucenter/feedback/feedback.wxml
@@ -1,34 +1,34 @@
-<view class="container">
-
-  <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
-    <view class="picker">
-      <view class="fb-type">
-        <view class="type-label">{{array[index]}}</view>
-        <van-icon class="type-icon" name="arrow-down" />        
-      </view>
-    </view>
-  </picker>
-  <view class="fb-body">
-    <textarea class="content" placeholder="对我们网站、商品、服务，你还有什么建议吗？你还希望在商城上买到什么？请告诉我们..." bindinput="contentInput" maxlength="500" auto-focus="true" value="{{content}}" />
-    <view class="weui-uploader__files" id="uploaderFiles">
-      <block wx:for="{{files}}" wx:key="*this">
-        <view class="weui-uploader__file" bindtap="previewImage" id="{{item}}">
-          <image class="weui-uploader__img" src="{{item}}" mode="aspectFill" />
-        </view>
-      </block>
-      <view class="weui-uploader__input-box" wx:if="{{ files.length < 5 }}">
-        <view class="weui-uploader__input" bindtap="chooseImage"></view>
-      </view>
-    </view>
-    <view class="text-count">{{contentLength}}/500</view>
-  </view>
-  <view class="fb-mobile">
-    <view class="label">手机号码</view>
-    <view class="mobile-box">
-      <input class="mobile" maxlength="11" type="number" placeholder="方便我们与你联系" bindinput="mobileInput" value="{{mobile}}" />
-      <van-icon class="clear-icon" name="close" wx:if="{{ mobile.length > 0 }}" catchtap="clearMobile"/>
-    </view>
-  </view>
-
-  <view class="fb-btn" bindtap="submitFeedback">提交</view>
+<view class="container">
+
+  <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
+    <view class="picker">
+      <view class="fb-type">
+        <view class="type-label">{{array[index]}}</view>
+        <van-icon class="type-icon" name="arrow-down" />        
+      </view>
+    </view>
+  </picker>
+  <view class="fb-body">
+    <textarea class="content" placeholder="对我们网站、商品、服务，你还有什么建议吗？你还希望在商城上买到什么？请告诉我们..." bindinput="contentInput" maxlength="500" auto-focus="true" value="{{content}}" />
+    <view class="weui-uploader__files" id="uploaderFiles">
+      <block wx:for="{{files}}" wx:key="*this">
+        <view class="weui-uploader__file" bindtap="previewImage" id="{{item}}">
+          <image class="weui-uploader__img" src="{{item}}" mode="aspectFill" />
+        </view>
+      </block>
+      <view class="weui-uploader__input-box" wx:if="{{ files.length < 5 }}">
+        <view class="weui-uploader__input" bindtap="chooseImage"></view>
+      </view>
+    </view>
+    <view class="text-count">{{contentLength}}/500</view>
+  </view>
+  <view class="fb-mobile">
+    <view class="label">手机号码</view>
+    <view class="mobile-box">
+      <input class="mobile" maxlength="11" type="number" placeholder="方便我们与你联系" bindinput="mobileInput" value="{{mobile}}" />
+      <van-icon class="clear-icon" name="close" wx:if="{{ mobile.length > 0 }}" catchtap="clearMobile"/>
+    </view>
+  </view>
+
+  <view class="fb-btn" bindtap="submitFeedback">提交</view>
 </view>
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/feedback/feedback.wxss b/litemall-wx/pages/ucenter/feedback/feedback.wxss
index 2cce0110..d02bc76d 100644
--- a/litemall-wx/pages/ucenter/feedback/feedback.wxss
+++ b/litemall-wx/pages/ucenter/feedback/feedback.wxss
@@ -1,195 +1,195 @@
-page {
-  background: #f4f4f4;
-  min-height: 100%;
-}
-
-.container {
-  background: #f4f4f4;
-  min-height: 100%;
-  padding-top: 30rpx;
-}
-
-.fb-type {
-  height: 104rpx;
-  width: 100%;
-  background: #fff;
-  margin-bottom: 20rpx;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  padding-left: 30rpx;
-  padding-right: 30rpx;
-}
-
-.fb-type .type-label {
-  height: 36rpx;
-  flex: 1;
-  color: #333;
-  font-size: 28rpx;
-}
-
-.fb-type .type-icon {
-  height: 36rpx;
-  width: 36rpx;
-}
-
-.fb-body {
-  width: 100%;
-  background: #fff;
-  height: 600rpx;
-  padding: 18rpx 30rpx 64rpx 30rpx;
-}
-
-.fb-body .content {
-  width: 100%;
-  height: 400rpx;
-  color: #333;
-  line-height: 40rpx;
-  font-size: 28rpx;
-}
-
-.weui-uploader__files {
-  width: 100%;
-}
-
-.weui-uploader__file {
-  float: left;
-  margin-right: 9px;
-  margin-bottom: 9px;
-}
-
-.weui-uploader__img {
-  display: block;
-  width: 50px;
-  height: 50px;
-}
-
-.weui-uploader__input-box {
-  float: left;
-  position: relative;
-  margin-right: 9px;
-  margin-bottom: 9px;
-  width: 50px;
-  height: 50px;
-  border: 1px solid #d9d9d9;
-}
-
-.weui-uploader__input-box:after, .weui-uploader__input-box:before {
-  content: " ";
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  -webkit-transform: translate(-50%, -50%);
-  transform: translate(-50%, -50%);
-  background-color: #d9d9d9;
-}
-
-.weui-uploader__input-box:before {
-  width: 2px;
-  height: 39.5px;
-}
-
-.weui-uploader__input-box:after {
-  width: 39.5px;
-  height: 2px;
-}
-
-.weui-uploader__input-box:active {
-  border-color: #999;
-}
-
-.weui-uploader__input-box:active:after, .weui-uploader__input-box:active:before {
-  background-color: #999;
-}
-
-.weui-uploader__input {
-  position: absolute;
-  z-index: 1;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  opacity: 0;
-}
-
-.fb-body .text-count {
-  line-height: 30rpx;
-  float: right;
-  color: #666;
-  font-size: 24rpx;
-}
-
-.fb-mobile {
-  height: 162rpx;
-  width: 100%;
-}
-
-.fb-mobile .label {
-  height: 58rpx;
-  width: 100%;
-  padding-top: 14rpx;
-  padding-bottom: 11rpx;
-  color: #7f7f7f;
-  font-size: 24rpx;
-  padding-left: 30rpx;
-  padding-right: 30rpx;
-  line-height: 33rpx;
-}
-
-.fb-mobile .mobile-box {
-  height: 104rpx;
-  width: 100%;
-  color: #333;
-  padding-left: 30rpx;
-  padding-right: 30rpx;
-  font-size: 24rpx;
-  background: #fff;
-  position: relative;
-}
-
-.fb-mobile .mobile {
-  position: absolute;
-  top: 27rpx;
-  left: 30rpx;
-  height: 50rpx;
-  width: 100%;
-  color: #333;
-  line-height: 50rpx;
-  font-size: 24rpx;
-}
-
-.fb-mobile .clear-icon {
-  position: absolute;
-  top: 27rpx;
-  right: 30rpx;
-  width: 48rpx;
-  height: 48rpx;
-  z-index: 2;
-}
-
-.fb-btn {
-  right: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 80%;
-  height: 90rpx;
-  line-height: 98rpx;
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  border-radius: 0;
-  padding: 0;
-  margin: 0;
-  margin-left: 10%;
-  text-align: center;
-  /* padding-left: -5rpx; */
-  font-size: 25rpx;
-  color: #f4f4f4;
-  border-top-left-radius: 50rpx;
-  border-bottom-left-radius: 50rpx;
-  border-top-right-radius: 50rpx;
-  border-bottom-right-radius: 50rpx;
-  letter-spacing: 3rpx;
-  background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
-}
+page {
+  background: #f4f4f4;
+  min-height: 100%;
+}
+
+.container {
+  background: #f4f4f4;
+  min-height: 100%;
+  padding-top: 30rpx;
+}
+
+.fb-type {
+  height: 104rpx;
+  width: 100%;
+  background: #fff;
+  margin-bottom: 20rpx;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+}
+
+.fb-type .type-label {
+  height: 36rpx;
+  flex: 1;
+  color: #333;
+  font-size: 28rpx;
+}
+
+.fb-type .type-icon {
+  height: 36rpx;
+  width: 36rpx;
+}
+
+.fb-body {
+  width: 100%;
+  background: #fff;
+  height: 600rpx;
+  padding: 18rpx 30rpx 64rpx 30rpx;
+}
+
+.fb-body .content {
+  width: 100%;
+  height: 400rpx;
+  color: #333;
+  line-height: 40rpx;
+  font-size: 28rpx;
+}
+
+.weui-uploader__files {
+  width: 100%;
+}
+
+.weui-uploader__file {
+  float: left;
+  margin-right: 9px;
+  margin-bottom: 9px;
+}
+
+.weui-uploader__img {
+  display: block;
+  width: 50px;
+  height: 50px;
+}
+
+.weui-uploader__input-box {
+  float: left;
+  position: relative;
+  margin-right: 9px;
+  margin-bottom: 9px;
+  width: 50px;
+  height: 50px;
+  border: 1px solid #d9d9d9;
+}
+
+.weui-uploader__input-box:after, .weui-uploader__input-box:before {
+  content: " ";
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  -webkit-transform: translate(-50%, -50%);
+  transform: translate(-50%, -50%);
+  background-color: #d9d9d9;
+}
+
+.weui-uploader__input-box:before {
+  width: 2px;
+  height: 39.5px;
+}
+
+.weui-uploader__input-box:after {
+  width: 39.5px;
+  height: 2px;
+}
+
+.weui-uploader__input-box:active {
+  border-color: #999;
+}
+
+.weui-uploader__input-box:active:after, .weui-uploader__input-box:active:before {
+  background-color: #999;
+}
+
+.weui-uploader__input {
+  position: absolute;
+  z-index: 1;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  opacity: 0;
+}
+
+.fb-body .text-count {
+  line-height: 30rpx;
+  float: right;
+  color: #666;
+  font-size: 24rpx;
+}
+
+.fb-mobile {
+  height: 162rpx;
+  width: 100%;
+}
+
+.fb-mobile .label {
+  height: 58rpx;
+  width: 100%;
+  padding-top: 14rpx;
+  padding-bottom: 11rpx;
+  color: #7f7f7f;
+  font-size: 24rpx;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  line-height: 33rpx;
+}
+
+.fb-mobile .mobile-box {
+  height: 104rpx;
+  width: 100%;
+  color: #333;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  font-size: 24rpx;
+  background: #fff;
+  position: relative;
+}
+
+.fb-mobile .mobile {
+  position: absolute;
+  top: 27rpx;
+  left: 30rpx;
+  height: 50rpx;
+  width: 100%;
+  color: #333;
+  line-height: 50rpx;
+  font-size: 24rpx;
+}
+
+.fb-mobile .clear-icon {
+  position: absolute;
+  top: 27rpx;
+  right: 30rpx;
+  width: 48rpx;
+  height: 48rpx;
+  z-index: 2;
+}
+
+.fb-btn {
+  right: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 80%;
+  height: 90rpx;
+  line-height: 98rpx;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  border-radius: 0;
+  padding: 0;
+  margin: 0;
+  margin-left: 10%;
+  text-align: center;
+  /* padding-left: -5rpx; */
+  font-size: 25rpx;
+  color: #f4f4f4;
+  border-top-left-radius: 50rpx;
+  border-bottom-left-radius: 50rpx;
+  border-top-right-radius: 50rpx;
+  border-bottom-right-radius: 50rpx;
+  letter-spacing: 3rpx;
+  background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
+}
diff --git a/litemall-wx/pages/ucenter/footprint/footprint.js b/litemall-wx/pages/ucenter/footprint/footprint.js
index 1e9a5f61..a64e64f0 100644
--- a/litemall-wx/pages/ucenter/footprint/footprint.js
+++ b/litemall-wx/pages/ucenter/footprint/footprint.js
@@ -1,135 +1,136 @@
-var util = require('../../../utils/util.js');
-var api = require('../../../config/api.js');
-
-var app = getApp();
-
-Page({
-  data: {
-    footprintList: [],
-    page: 1,
-    limit: 10,
-    totalPages: 1
-  },
-  getFootprintList() {
-    wx.showLoading({
-      title: '加载中...',
-    });
-    let that = this;
-    util.request(api.FootprintList, {
-      page: that.data.page,
-      limit: that.data.limit
-    }).then(function(res) {
-      if (res.errno === 0) {
-        let f1 = that.data.footprintList;
-        let f2 = res.data.list;
-        for (let i = 0; i < f2.length; i++) {
-          f2[i].addDate = f2[i].addTime.substring(0, 10)
-          let last = f1.length - 1;
-          if (last >= 0 && f1[last][0].addDate === f2[i].addDate) {
-            f1[last].push(f2[i]);
-          } else {
-            let tmp = [];
-            tmp.push(f2[i])
-            f1.push(tmp);
-          }
-        }
-
-        that.setData({
-          footprintList: f1,
-          totalPages: res.data.pages
-        });
-      }
-      wx.hideLoading();
-    });
-  },
-  deleteItem(event) {
-    let that = this;
-    let index = event.currentTarget.dataset.index;
-    let iindex = event.currentTarget.dataset.iindex;
-    let footprintId = this.data.footprintList[index][iindex].id;
-    let goodsId = this.data.footprintList[index][iindex].goodsId;
-    var touchTime = that.data.touchEnd - that.data.touchStart;
-    console.log(touchTime);
-    //如果按下时间大于350为长按  
-    if (touchTime > 350) {
-      wx.showModal({
-        title: '',
-        content: '要删除所选足迹？',
-        success: function(res) {
-          if (res.confirm) {
-            util.request(api.FootprintDelete, {
-              id: footprintId
-            }, 'POST').then(function(res) {
-              if (res.errno === 0) {
-                wx.showToast({
-                  title: '删除成功',
-                  icon: 'success',
-                  duration: 2000
-                });
-                that.data.footprintList[index].splice(iindex, 1)
-                if (that.data.footprintList[index].length == 0) {
-                  that.data.footprintList.splice(index, 1)
-                }
-                that.setData({
-                  footprintList: that.data.footprintList
-                });
-              }
-            });
-          }
-        }
-      });
-    } else {
-      wx.navigateTo({
-        url: '/pages/goods/goods?id=' + goodsId,
-      });
-    }
-
-  },
-  onLoad: function(options) {
-    this.getFootprintList();
-  },
-  onReachBottom() {
-    if (this.data.totalPages > this.data.page) {
-      this.setData({
-        page: this.data.page + 1
-      });
-      this.getFootprintList();
-    } else {
-      wx.showToast({
-        title: '没有更多用户足迹了',
-        icon: 'none',
-        duration: 2000
-      });
-      return false;
-    }
-  },
-  onReady: function() {
-
-  },
-  onShow: function() {
-
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-  },
-  //按下事件开始  
-  touchStart: function(e) {
-    let that = this;
-    that.setData({
-      touchStart: e.timeStamp
-    })
-    console.log(e.timeStamp + '- touchStart')
-  },
-  //按下事件结束  
-  touchEnd: function(e) {
-    let that = this;
-    that.setData({
-      touchEnd: e.timeStamp
-    })
-    console.log(e.timeStamp + '- touchEnd')
-  },
+var util = require('../../../utils/util.js');
+var api = require('../../../config/api.js');
+
+var app = getApp();
+
+Page({
+  data: {
+    footprintList: [],
+    page: 1,
+    limit: 10,
+    totalPages: 1
+  },
+  getFootprintList() {
+    wx.showLoading({
+      title: '加载中...',
+    });
+    let that = this;
+    util.request(api.FootprintList, {
+      page: that.data.page,
+      limit: that.data.limit,
+      isMe:'1'
+    }).then(function(res) {
+      if (res.errno === 0) {
+        let f1 = that.data.footprintList;
+        let f2 = res.data.list;
+        for (let i = 0; i < f2.length; i++) {
+          f2[i].addDate = f2[i].addTime.substring(0, 10)
+          let last = f1.length - 1;
+          if (last >= 0 && f1[last][0].addDate === f2[i].addDate) {
+            f1[last].push(f2[i]);
+          } else {
+            let tmp = [];
+            tmp.push(f2[i])
+            f1.push(tmp);
+          }
+        }
+
+        that.setData({
+          footprintList: f1,
+          totalPages: res.data.pages
+        });
+      }
+      wx.hideLoading();
+    });
+  },
+  deleteItem(event) {
+    let that = this;
+    let index = event.currentTarget.dataset.index;
+    let iindex = event.currentTarget.dataset.iindex;
+    let footprintId = this.data.footprintList[index][iindex].id;
+    let goodsId = this.data.footprintList[index][iindex].goodsId;
+    var touchTime = that.data.touchEnd - that.data.touchStart;
+    console.log(touchTime);
+    //如果按下时间大于350为长按  
+    if (touchTime > 350) {
+      wx.showModal({
+        title: '',
+        content: '要删除所选足迹？',
+        success: function(res) {
+          if (res.confirm) {
+            util.request(api.FootprintDelete, {
+              id: footprintId
+            }, 'POST').then(function(res) {
+              if (res.errno === 0) {
+                wx.showToast({
+                  title: '删除成功',
+                  icon: 'success',
+                  duration: 2000
+                });
+                that.data.footprintList[index].splice(iindex, 1)
+                if (that.data.footprintList[index].length == 0) {
+                  that.data.footprintList.splice(index, 1)
+                }
+                that.setData({
+                  footprintList: that.data.footprintList
+                });
+              }
+            });
+          }
+        }
+      });
+    } else {
+        wx.navigateTo({
+          url: "/pages/information/information?id="+goodsId
+        });
+    }
+
+  },
+  onLoad: function(options) {
+    this.getFootprintList();
+  },
+  onReachBottom() {
+    if (this.data.totalPages > this.data.page) {
+      this.setData({
+        page: this.data.page + 1
+      });
+      this.getFootprintList();
+    } else {
+      wx.showToast({
+        title: '没有更多用户足迹了',
+        icon: 'none',
+        duration: 2000
+      });
+      return false;
+    }
+  },
+  onReady: function() {
+
+  },
+  onShow: function() {
+
+  },
+  onHide: function() {
+    // 页面隐藏
+
+  },
+  onUnload: function() {
+    // 页面关闭
+  },
+  //按下事件开始  
+  touchStart: function(e) {
+    let that = this;
+    that.setData({
+      touchStart: e.timeStamp
+    })
+    console.log(e.timeStamp + '- touchStart')
+  },
+  //按下事件结束  
+  touchEnd: function(e) {
+    let that = this;
+    that.setData({
+      touchEnd: e.timeStamp
+    })
+    console.log(e.timeStamp + '- touchEnd')
+  },
 })
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/footprint/footprint.json b/litemall-wx/pages/ucenter/footprint/footprint.json
index 947fa332..b3bfc928 100644
--- a/litemall-wx/pages/ucenter/footprint/footprint.json
+++ b/litemall-wx/pages/ucenter/footprint/footprint.json
@@ -1,3 +1,3 @@
-{
-  "navigationBarTitleText": "我的足迹"
+{
+  "navigationBarTitleText": "我的足迹"
 }
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/footprint/footprint.wxml b/litemall-wx/pages/ucenter/footprint/footprint.wxml
index 678c8368..2d8d0399 100644
--- a/litemall-wx/pages/ucenter/footprint/footprint.wxml
+++ b/litemall-wx/pages/ucenter/footprint/footprint.wxml
@@ -1,22 +1,36 @@
-<view class="container">
-  <view class="no-footprint" wx:if="{{footprintList.length <= 0}}">
-    <view class="c">
-      <text>没有浏览足迹</text>
-    </view>
-  </view>
-  <view class="footprint" wx:if="{{footprintList.length > 0}}">
-    <view class="day-item" wx:for="{{footprintList}}" wx:key="*this" wx:for-index="index">
-      <view class="day-hd" wx:if="{{item.length > 0}}">{{item[0].addDate}}</view>
-      <view class="day-list" wx:if="{{item.length > 0}}">
-        <view class="item" data-index="{{index}}" data-iindex="{{iindex}}" bindtouchstart="touchStart" bindtouchend="touchEnd" bindtap="deleteItem" wx:for="{{item}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="id">
-          <image class="img" src="{{iitem.picUrl}}"></image>
-          <view class="info">
-            <view class="name">{{iitem.name}}</view>
-            <view class="subtitle">{{iitem.brief}}</view>
-            <view class="price">￥{{iitem.retailPrice}}</view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
+<view class="container">
+  <view class="no-footprint" wx:if="{{footprintList.length <= 0}}">
+    <view class="c">
+      <text>没有浏览足迹</text>
+    </view>
+  </view>
+  <view class="footprint" wx:if="{{footprintList.length > 0}}">
+    <view class="day-item" wx:for="{{footprintList}}" wx:key="*this" wx:for-index="index">
+      <view class="day-hd" wx:if="{{item.length > 0}}">{{item[0].addDate}}</view>
+      <view class="day-list" wx:if="{{item.length > 0}}">
+        <view class="item" data-index="{{index}}" data-iindex="{{iindex}}" bindtouchstart="touchStart" bindtouchend="touchEnd" bindtap="deleteItem" wx:for="{{item}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="id">
+          <view class="info">
+            <view class="both">
+              <view>{{iitem.goodsInfo.name}}</view>
+              <!-- <view>{{iitem.name}}</view> -->
+            </view>
+            <view class="company">{{iitem.topicInfo.title}}</view>
+            <view class="both">
+              <view>
+                <view class="avgboth">
+                  <!-- <image class="avgimg" src="{{iitem.goodsInfo.picUrl}}" mode=""/> -->
+                  <view class="contact">
+                  {{iitem.topicInfo.contact}} | {{iitem.topicInfo.contactPost}}
+                  </view>
+                </view>
+                <view>
+                </view>
+              </view>
+              <!-- <view class="time">{{iitem.addTime}}</view> -->
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
 </view>
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/footprint/footprint.wxss b/litemall-wx/pages/ucenter/footprint/footprint.wxss
index 81eac666..f5ef59c6 100644
--- a/litemall-wx/pages/ucenter/footprint/footprint.wxss
+++ b/litemall-wx/pages/ucenter/footprint/footprint.wxss
@@ -1,116 +1,149 @@
-page {
-  background: #f4f4f4;
-  min-height: 100%;
-}
-
-.container {
-  background: #f4f4f4;
-  min-height: 100%;
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-}
-
-.no-footprint {
-  width: 100%;
-  height: auto;
-  margin: 0 auto;
-}
-
-.no-footprint .c {
-  width: 100%;
-  height: auto;
-  margin-top: 400rpx;
-}
-
-.no-footprint .c text {
-  margin: 0 auto;
-  display: block;
-  width: 258rpx;
-  height: 29rpx;
-  line-height: 29rpx;
-  text-align: center;
-  font-size: 29rpx;
-  color: #999;
-}
-
-.footprint {
-  height: auto;
-  overflow: hidden;
-  width: 100%;
-  border-top: 1px solid #e1e1e1;
-}
-
-.day-item {
-  height: auto;
-  overflow: hidden;
-  width: 100%;
-  margin-bottom: 20rpx;
-}
-
-.day-hd {
-  height: 94rpx;
-  width: 100%;
-  line-height: 94rpx;
-  background: #fff;
-  padding-left: 30rpx;
-  color: #333;
-  font-size: 28rpx;
-}
-
-.day-list {
-  width: 100%;
-  height: auto;
-  overflow: hidden;
-  background: #fff;
-  padding-left: 30rpx;
-  border-top: 1px solid #e1e1e1;
-}
-
-.item {
-  height: 212rpx;
-  width: 720rpx;
-  background: #fff;
-  padding: 30rpx 30rpx 30rpx 0;
-  border-bottom: 1px solid #e1e1e1;
-}
-
-.item:last-child {
-  border-bottom: 1px solid #fff;
-}
-
-.item .img {
-  float: left;
-  width: 150rpx;
-  height: 150rpx;
-}
-
-.item .info {
-  float: right;
-  width: 540rpx;
-  height: 150rpx;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  padding-left: 20rpx;
-}
-
-.item .info .name {
-  font-size: 28rpx;
-  color: #333;
-  line-height: 40rpx;
-}
-
-.item .info .subtitle {
-  margin-top: 8rpx;
-  font-size: 24rpx;
-  color: #888;
-  line-height: 40rpx;
-}
-
-.item .info .price {
-  margin-top: 8rpx;
-  font-size: 28rpx;
-  color: #333;
-  line-height: 40rpx;
-}
+page {
+  background: #f4f4f4;
+  min-height: 100%;
+}
+
+.container {
+  background: #f4f4f4;
+  min-height: 100%;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+
+.no-footprint {
+  width: 100%;
+  height: auto;
+  margin: 0 auto;
+}
+
+.no-footprint .c {
+  width: 100%;
+  height: auto;
+  margin-top: 400rpx;
+}
+
+.no-footprint .c text {
+  margin: 0 auto;
+  display: block;
+  width: 258rpx;
+  height: 29rpx;
+  line-height: 29rpx;
+  text-align: center;
+  font-size: 29rpx;
+  color: #999;
+}
+
+.footprint {
+  height: auto;
+  overflow: hidden;
+  width: 100%;
+}
+
+.day-item {
+  height: auto;
+  overflow: hidden;
+  width: 100%;
+  margin-bottom: 20rpx;
+  padding: 0 20rpx;
+}
+
+.day-hd {
+  height: 94rpx;
+  width: 100%;
+  line-height: 94rpx;
+  padding-left: 30rpx;
+  color: #333;
+  font-size: 30rpx;
+  font-weight: 600;
+}
+
+.day-list {
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+  padding-left: 0 30rpx;
+}
+
+.item {
+  height: 212rpx;
+  width: 720rpx;
+  background: #fff;
+  border-radius: 20rpx;
+}
+
+.item:not(:first-child) {
+  border-bottom: 1px solid #fff;
+  margin-top: 20rpx;
+}
+
+.item .img {
+  float: left;
+  width: 150rpx;
+  height: 150rpx;
+}
+
+.item .info {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  padding-left: 20rpx;
+}
+
+.item .info .name {
+  font-size: 28rpx;
+  color: #333;
+  line-height: 40rpx;
+}
+
+.item .info .subtitle {
+  margin-top: 8rpx;
+  font-size: 24rpx;
+  color: #888;
+  line-height: 40rpx;
+}
+
+.item .info .price {
+  margin-top: 8rpx;
+  font-size: 28rpx;
+  color: #333;
+  line-height: 40rpx;
+}
+.item .info .both{
+  display: flex;
+  justify-content: space-between;
+  padding: 0 30rpx;
+  font-size: 36rpx;
+  padding-top: 30rpx;
+  font-weight: 600;
+}
+.item .info .both .avgimg{
+  width: 50rpx;
+  height: 50rpx;
+  border-radius: 50%;
+}
+.item .info .both  .avgboth{
+  
+  display: flex;
+  line-height: 30rpx;
+}
+.item .info .both  .avgboth .contact{
+  /* padding-left: 20rpx; */
+  font-weight: 500;
+  font-size: 26rpx;
+}
+.item .info .both .time{
+  font-weight: 500;
+  font-size: 26rpx;
+  line-height: 46rpx;
+}
+.item .info .company{
+  margin-top: 10rpx;
+  margin-bottom: 10rpx;
+  font-size: 26rpx;
+  padding-left: 30rpx;
+}
+.item .info .sexlog{
+  width: 40rpx;
+  height: 40rpx;
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/index/assets/fangke.png b/litemall-wx/pages/ucenter/index/assets/fangke.png
new file mode 100644
index 0000000000000000000000000000000000000000..5975cf7010dc1739b16145fd9ac0c2ccbcd3180e
GIT binary patch
literal 5568
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
Qt}=_Kp{lD=t7IMdKi3Xy3jhEB

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/ucenter/index/assets/mom.png b/litemall-wx/pages/ucenter/index/assets/mom.png
new file mode 100644
index 0000000000000000000000000000000000000000..b29aba7b24f26ddc74489a025508580854d563b2
GIT binary patch
literal 7035
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
WVSASi;=a448bA%DjjUF*!u%ghoC=%(

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/ucenter/index/assets/shangjia.png b/litemall-wx/pages/ucenter/index/assets/shangjia.png
new file mode 100644
index 0000000000000000000000000000000000000000..22723a62a83d94a332870794692cdff5a8f0f4f1
GIT binary patch
literal 4917
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
WyH_AruaUpQDD<_BwW>6npZyOcm>fs|

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/ucenter/index/assets/shezhi.png b/litemall-wx/pages/ucenter/index/assets/shezhi.png
new file mode 100644
index 0000000000000000000000000000000000000000..6756f411d6d98c971672d4ba18abc3adb9db5a97
GIT binary patch
literal 7338
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
O0F@W&3e|GvVgCm-_S_%<

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/ucenter/index/assets/zhiwei.png b/litemall-wx/pages/ucenter/index/assets/zhiwei.png
new file mode 100644
index 0000000000000000000000000000000000000000..74b82da6a9b1a4c83ce8ff6b2b6d4478c33ef301
GIT binary patch
literal 5159
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/ucenter/index/assets/zhubo.png b/litemall-wx/pages/ucenter/index/assets/zhubo.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1201f996370387c7120f0b0d9ce1c5e10d152e2
GIT binary patch
literal 8104
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/ucenter/index/assets/zuji.png b/litemall-wx/pages/ucenter/index/assets/zuji.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e94af5c38ba0d8b8ccf31d46b309d2bff213850
GIT binary patch
literal 10053
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
Kp+XM+@&5ptvpwPf

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/ucenter/index/index.js b/litemall-wx/pages/ucenter/index/index.js
index cc48dd7a..cbd674c9 100644
--- a/litemall-wx/pages/ucenter/index/index.js
+++ b/litemall-wx/pages/ucenter/index/index.js
@@ -1,234 +1,358 @@
-var util = require('../../../utils/util.js');
-var api = require('../../../config/api.js');
-var user = require('../../../utils/user.js');
-var app = getApp();
-
-Page({
-  data: {
-    userInfo: {
-      nickName: '点击登录',
-      avatarUrl: '/static/images/my.png'
-    },
-    order: {
-      unpaid: 0,
-      unship: 0,
-      unrecv: 0,
-      uncomment: 0
-    },
-    hasLogin: false
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-  },
-  onReady: function() {
-
-  },
-  onShow: function() {
-
-    //获取用户的登录信息
-    if (app.globalData.hasLogin) {
-      let userInfo = wx.getStorageSync('userInfo');
-      this.setData({
-        userInfo: userInfo,
-        hasLogin: true
-      });
-
-      let that = this;
-      util.request(api.UserIndex).then(function(res) {
-        if (res.errno === 0) {
-          that.setData({
-            order: res.data.order
-          });
-        }
-      });
-    }
-
-  },
-  onHide: function() {
-    // 页面隐藏
-
-  },
-  onUnload: function() {
-    // 页面关闭
-  },
-  goLogin() {
-    if (!this.data.hasLogin) {
-      wx.navigateTo({
-        url: "/pages/auth/login/login"
-      });
-    }
-  },
-  goOrder() {
-    if (this.data.hasLogin) {
-      try {
-        wx.setStorageSync('tab', 0);
-      } catch (e) {
-
-      }
-      wx.navigateTo({
-        url: "/pages/ucenter/order/order"
-      });
-    } else {
-      wx.navigateTo({
-        url: "/pages/auth/login/login"
-      });
-    }
-  },
-  goOrderIndex(e) {
-    if (this.data.hasLogin) {
-      let tab = e.currentTarget.dataset.index
-      let route = e.currentTarget.dataset.route
-      try {
-        wx.setStorageSync('tab', tab);
-      } catch (e) {
-
-      }
-      wx.navigateTo({
-        url: route,
-        success: function(res) {},
-        fail: function(res) {},
-        complete: function(res) {},
-      })
-    } else {
-      wx.navigateTo({
-        url: "/pages/auth/login/login"
-      });
-    };
-  },
-  goCoupon() {
-    if (this.data.hasLogin) {
-      wx.navigateTo({
-        url: "/pages/ucenter/couponList/couponList"
-      });
-    } else {
-      wx.navigateTo({
-        url: "/pages/auth/login/login"
-      });
-    };
-  },
-  goGroupon() {
-    if (this.data.hasLogin) {
-      wx.navigateTo({
-        url: "/pages/groupon/myGroupon/myGroupon"
-      });
-    } else {
-      wx.navigateTo({
-        url: "/pages/auth/login/login"
-      });
-    };
-  },
-  goCollect() {
-    if (this.data.hasLogin) {
-      wx.navigateTo({
-        url: "/pages/ucenter/collect/collect"
-      });
-    } else {
-      wx.navigateTo({
-        url: "/pages/auth/login/login"
-      });
-    };
-  },
-  goFeedback(e) {
-    if (this.data.hasLogin) {
-      wx.navigateTo({
-        url: "/pages/ucenter/feedback/feedback"
-      });
-    } else {
-      wx.navigateTo({
-        url: "/pages/auth/login/login"
-      });
-    };
-  },
-  goFootprint() {
-    if (this.data.hasLogin) {
-      wx.navigateTo({
-        url: "/pages/ucenter/footprint/footprint"
-      });
-    } else {
-      wx.navigateTo({
-        url: "/pages/auth/login/login"
-      });
-    };
-  },
-  goAddress() {
-    if (this.data.hasLogin) {
-      wx.navigateTo({
-        url: "/pages/ucenter/address/address"
-      });
-    } else {
-      wx.navigateTo({
-        url: "/pages/auth/login/login"
-      });
-    };
-  },
-  bindPhoneNumber: function(e) {
-    if (e.detail.errMsg !== "getPhoneNumber:ok") {
-      // 拒绝授权
-      return;
-    }
-
-    if (!this.data.hasLogin) {
-      wx.showToast({
-        title: '绑定失败：请先登录',
-        icon: 'none',
-        duration: 2000
-      });
-      return;
-    }
-
-    util.request(api.AuthBindPhone, {
-      iv: e.detail.iv,
-      encryptedData: e.detail.encryptedData
-    }, 'POST').then(function(res) {
-      if (res.errno === 0) {
-        wx.showToast({
-          title: '绑定手机号码成功',
-          icon: 'success',
-          duration: 2000
-        });
-      }
-    });
-  },
-  goAfterSale: function() {
-    if (this.data.hasLogin) {
-      wx.navigateTo({
-        url: "/pages/ucenter/aftersaleList/aftersaleList"
-      });
-    } else {
-      wx.navigateTo({
-        url: "/pages/auth/login/login"
-      });
-    };
-  },
-  aboutUs: function() {
-    wx.navigateTo({
-      url: '/pages/about/about'
-    });
-  },
-  goHelp: function () {
-    wx.navigateTo({
-      url: '/pages/help/help'
-    });
-  },  
-  exitLogin: function() {
-    wx.showModal({
-      title: '',
-      confirmColor: '#b4282d',
-      content: '退出登录？',
-      success: function(res) {
-        if (!res.confirm) {
-          return;
-        }
-
-        util.request(api.AuthLogout, {}, 'POST');
-        app.globalData.hasLogin = false;
-        wx.removeStorageSync('token');
-        wx.removeStorageSync('userInfo');
-        wx.reLaunch({
-          url: '/pages/index/index'
-        });
-      }
-    })
-
-  }
+var util = require('../../../utils/util.js');
+var api = require('../../../config/api.js');
+var user = require('../../../utils/user.js');
+var app = getApp();
+
+Page({
+  data: {
+    userInfo: {
+      nickName: '点击登录',
+      avatarUrl: ''
+    },
+    isAuthInfo:false,
+    order: {
+      unpaid: 0,
+      unship: 0,
+      unrecv: 0,
+      uncomment: 0
+    },
+    avatarUrl:'',
+    statusText:'',
+    status:0,
+    isEdit: false,
+    hasLogin: false
+  },
+  onLoad: function (options) {
+    // 页面初始化 options为页面跳转所带来的参数
+    let userInfo = wx.getStorageSync('userInfo');
+    this.setData({
+      avatarUrl:userInfo.avatar,
+    });
+  },
+  onReady: function() {
+
+  },
+  onShow: function (options) {
+    
+    //获取用户的登录信息
+    let that = this
+    if (app.globalData.hasLogin) {
+      let userInfo = wx.getStorageSync('userInfo');
+      console.log(userInfo)
+      this.setData({
+        userInfo: userInfo,
+        hasLogin: true,
+        isAuthInfo: true,
+      });
+    }
+    util.request(api.AuthInfo).then(function (res) {
+      let userInfoData = res.data
+      let sessuserInfo = wx.getStorageSync('userInfo');
+      if(userInfoData.userInfo.avatar!=sessuserInfo.avatar){
+        that.setData({
+          avatarUrl:userInfoData.userInfo.avatar,
+        });
+        sessuserInfo.avatar = userInfoData.userInfo.avatar
+        wx.setStorageSync('userInfo',sessuserInfo)
+      }
+      if(userInfoData.userInfo.userType=='ZB_EMP'){
+        that.setData({
+          statusText: userInfoData.status === 0 ? '未发布' : '已发布',
+          status: userInfoData.status
+        });
+      }else{
+        that.setData({
+          statusText: userInfoData.status === 0 ? '未发布' : userInfoData.status === 1 ? '已发布' : '已审核',
+          status: userInfoData.status
+        });
+      }
+    });
+  },
+  onHide: function() {
+    // 页面隐藏
+
+  },
+  onUnload: function() {
+    // 页面关闭
+  },
+  onChooseAvatar(e) {
+    const { avatarUrl } = e.detail 
+      var that = this;
+      const uploadTask = wx.uploadFile({
+        url: api.StorageUpload,
+        filePath: avatarUrl,
+        name: 'file',
+        success: function (res) {
+          var _res = JSON.parse(res.data);
+          if (_res.errno === 0) {
+            var url = _res.data.url
+            util.request(api.UserUpdate,{id:that.data.userInfo.id,avatar:url},'POST').then(function (res1) {
+              that.setData({
+                'userInfo.avatarUrl':url,
+                'userInfo.avatar':url,
+              })
+              if (res1.errno == 0) {
+                wx.setStorageSync('userInfo', that.data.userInfo);
+              }
+            });
+          }
+        },
+        fail: function (e) {
+          wx.showModal({
+            title: '错误',
+            content: '上传失败',
+            showCancel: false
+          })
+        },
+      })
+  
+      uploadTask.onProgressUpdate((res) => {
+        console.log('上传进度', res.progress)
+        console.log('已经上传的数据长度', res.totalBytesSent)
+        console.log('预期需要上传的数据总长度', res.totalBytesExpectedToSend)
+      })
+  
+    
+  },
+  goLogin() {
+    if (!this.data.hasLogin) {
+      wx.navigateTo({
+        url: "/pages/auth/authorization/authorization"
+      });
+    }
+  },
+  goOrder() {
+    if (this.data.hasLogin) {
+      try {
+        wx.setStorageSync('tab', 0);
+      } catch (e) {
+
+      }
+      wx.navigateTo({
+        url: "/pages/ucenter/order/order"
+      });
+    } else {
+      wx.navigateTo({
+        url: "/pages/auth/authorization/authorization"
+      });
+    }
+  },
+  goOrderIndex(e) {
+    if (this.data.hasLogin) {
+      let tab = e.currentTarget.dataset.index
+      let route = e.currentTarget.dataset.route
+      try {
+        wx.setStorageSync('tab', tab);
+      } catch (e) {
+
+      }
+      wx.navigateTo({
+        url: route,
+        success: function(res) {},
+        fail: function(res) {},
+        complete: function(res) {},
+      })
+    } else {
+      wx.navigateTo({
+        url: "/pages/auth/authorization/authorization"
+      });
+    };
+  },
+  goCoupon() {
+    if (this.data.hasLogin) {
+      wx.navigateTo({
+        url: "/pages/ucenter/myposts/myposts"
+      });
+    } else {
+      wx.navigateTo({
+        url: "/pages/auth/authorization/authorization"
+      });
+    };
+  },
+  gosetUp() {
+    if (this.data.hasLogin) {
+      wx.navigateTo({
+        url: "/pages/ucenter/setup/setup"
+      });
+    } else {
+      wx.navigateTo({
+        url: "/pages/auth/authorization/authorization"
+      });
+    };
+  },
+  goBusiness() {
+    if (this.data.hasLogin) {
+      wx.navigateTo({
+        url: "/pages/ucenter/business/business"
+      });
+    } else {
+      wx.navigateTo({
+        url: "/pages/auth/authorization/authorization"
+      });
+    };
+  },
+  goGroupon() {
+    if (this.data.hasLogin) {
+      wx.navigateTo({
+        url: "/pages/groupon/myGroupon/myGroupon"
+      });
+    } else {
+      wx.navigateTo({
+        url: "/pages/auth/authorization/authorization"
+      });
+    };
+  },
+  goCollect() {
+    if (this.data.hasLogin) {
+      wx.navigateTo({
+        url: "/pages/ucenter/collect/collect"
+      });
+    } else {
+      wx.navigateTo({
+        url: "/pages/auth/authorization/authorization"
+      });
+    };
+  },
+  goFeedback(e) {
+    if (this.data.hasLogin) {
+      wx.navigateTo({
+        url: "/pages/ucenter/feedback/feedback"
+      });
+    } else {
+      wx.navigateTo({
+        url: "/pages/auth/authorization/authorization"
+      });
+    };
+  },
+  goFootprint() {
+    if (this.data.hasLogin) {
+      wx.navigateTo({
+        url: "/pages/ucenter/footprint/footprint"
+      });
+    } else {
+      wx.navigateTo({
+        url: "/pages/auth/authorization/authorization"
+      });
+    };
+  },
+  gozbFootprint(){
+    if (this.data.hasLogin) {
+      wx.navigateTo({
+        url: "/pages/ucenter/zbFootprint/zbFootprint"
+      });
+    } else {
+      wx.navigateTo({
+        url: "/pages/auth/authorization/authorization"
+      });
+    };
+  },
+  govisitor() {
+    if (this.data.hasLogin) {
+      wx.navigateTo({
+        url: "/pages/ucenter/visitor/visitor"
+      });
+    } else {
+      wx.navigateTo({
+        url: "/pages/auth/authorization/authorization"
+      });
+    };
+  },
+  gozbvisitor() {
+    if (this.data.hasLogin) {
+      wx.navigateTo({
+        url: "/pages/ucenter/zbVisitor/zbVisitor"
+      });
+    } else {
+      wx.navigateTo({
+        url: "/pages/auth/authorization/authorization"
+      });
+    };
+  },
+  goJobManagement() {
+    let that = this
+    if (this.data.hasLogin) {
+      if(that.data.status!='2'){
+        wx.showToast({
+          title: '该公司未审核，不允许发布招聘信息',
+          icon: 'none',
+          duration: 2000
+        });
+        return
+      }else if(that.data.status=='0'){
+        wx.showToast({
+          title: '请先填写商家信息',
+          icon: 'none',
+          duration: 2000
+        });
+        return
+      }
+      wx.navigateTo({
+        url: "/pages/jobManagement/jobManagement"
+      });
+    } else {
+      wx.navigateTo({
+        url: "/pages/auth/authorization/authorization"
+      });
+    };
+  },
+  goAddress() {
+    if (this.data.hasLogin) {
+      wx.navigateTo({
+        url: "/pages/ucenter/address/address"
+      });
+    } else {
+      wx.navigateTo({
+        url: "/pages/auth/authorization/authorization"
+      });
+    };
+  },
+  bindPhoneNumber: function(e) {
+    if (e.detail.errMsg !== "getPhoneNumber:ok") {
+      // 拒绝授权
+      return;
+    }
+
+    if (!this.data.hasLogin) {
+      wx.showToast({
+        title: '绑定失败：请先登录',
+        icon: 'none',
+        duration: 2000
+      });
+      return;
+    }
+
+    util.request(api.AuthBindPhone, {
+      iv: e.detail.iv,
+      encryptedData: e.detail.encryptedData
+    }, 'POST').then(function(res) {
+      if (res.errno === 0) {
+        wx.showToast({
+          title: '绑定手机号码成功',
+          icon: 'success',
+          duration: 2000
+        });
+      }
+    });
+  },
+  goAfterSale: function() {
+    if (this.data.hasLogin) {
+      wx.navigateTo({
+        url: "/pages/ucenter/aftersaleList/aftersaleList"
+      });
+    } else {
+      wx.navigateTo({
+        url: "/pages/auth/authorization/authorization"
+      });
+    };
+  },
+  aboutUs: function() {
+    wx.navigateTo({
+      url: '/pages/about/about'
+    });
+  },
+  goHelp: function () {
+    wx.navigateTo({
+      url: '/pages/help/help'
+    });
+  },
 })
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/index/index.json b/litemall-wx/pages/ucenter/index/index.json
index 490dec68..0d4f073c 100644
--- a/litemall-wx/pages/ucenter/index/index.json
+++ b/litemall-wx/pages/ucenter/index/index.json
@@ -1,5 +1,5 @@
-{
-  "backgroundColor": "#f4f4f4",
-  "navigationBarTitleText": "个人中心",
-  "enablePullDownRefresh": false
+{
+  "backgroundColor": "#f4f4f4",
+  "navigationBarTitleText": "个人中心",
+  "enablePullDownRefresh": false
 }
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/index/index.wxml b/litemall-wx/pages/ucenter/index/index.wxml
index d6eeb69c..01485687 100644
--- a/litemall-wx/pages/ucenter/index/index.wxml
+++ b/litemall-wx/pages/ucenter/index/index.wxml
@@ -1,107 +1,116 @@
-<view class="container">
-  <view class="profile-info" bindtap="goLogin">
-    <image class="avatar" src="{{userInfo.avatarUrl}}"></image>
-    <view class="info">
-      <text class="name">{{userInfo.nickName}}</text>
-    </view>
-  </view>
-
-  <view class='separate'></view>
-
-  <view class='user_area'>
-    <view class='user_row' bindtap='goOrder'>
-      <view class='user_row_left'>我的订单</view>
-      <van-icon class='user_row_right' name="arrow" />      
-    </view>
-    <view class='user_column'>
-      <view class='user_column_item' bindtap='goOrderIndex' data-index='1' data-route='/pages/ucenter/order/order'>
-        <text class="user_column_item_badge" wx:if="{{order.unpaid != 0}}">{{order.unpaid}}</text>
-        <image class='user_column_item_image' src='/static/images/pendpay.png'>
-        </image>
-        <view class='user_column_item_text'>待付款</view>
-      </view>
-      <view class='user_column_item' bindtap='goOrderIndex' data-index='2' data-route='/pages/ucenter/order/order'>
-        <text class="user_column_item_badge" wx:if="{{order.unship != 0}}">{{order.unship}}</text>
-        <image class='user_column_item_image' src='/static/images/send.png'></image>
-        <view class='user_column_item_text'>待发货</view>
-      </view>
-      <view class='user_column_item' bindtap='goOrderIndex' data-index='3' data-route='/pages/ucenter/order/order'>
-        <text class="user_column_item_badge" wx:if="{{order.unrecv != 0}}">{{order.unrecv}}</text>
-        <image class='user_column_item_image' src='/static/images/receive.png'></image>
-        <view class='user_column_item_text'>待收货</view>
-      </view>
-      <view class='user_column_item' bindtap='goOrderIndex' data-index='4' data-route='/pages/ucenter/order/order'>
-        <text class="user_column_item_badge" wx:if="{{order.uncomment != 0}}">{{order.uncomment}}</text>
-        <image class='user_column_item_image' src='/static/images/comment.png'></image>
-        <view class='user_column_item_text'>待评价</view>
-      </view>
-      <view class='user_column_item' bindtap='goAfterSale'>
-        <image class='user_column_item_image' src='/static/images/aftersale.png'></image>
-        <view class='user_column_item_text'>售后</view>
-      </view>
-    </view>
-  </view>
-
-  <view class='separate'></view>
-
-  <view class='user_row'>
-    <view class='user_row_left'>核心服务</view>
-  </view>
-  <view class='user_column'>
-
-    <view class='user_column_item' bindtap='goCoupon'>
-      <image class='user_column_item_image' src='/static/images/coupon.png'></image>
-      <view class='user_column_item_text'>优惠卷</view>
-    </view>
-    <view class='user_column_item' bindtap='goCollect'>
-      <image class='user_column_item_image' src='/static/images/collect.png'></image>
-      <view class='user_column_item_text'>收藏夹</view>
-    </view>
-    <view class='user_column_item' bindtap='goFootprint'>
-      <image class='user_column_item_image' src='/static/images/footprint.png'></image>
-      <view class='user_column_item_text'>浏览足迹</view>
-    </view>
-    <view class='user_column_item' bindtap='goGroupon'>
-      <image class='user_column_item_image' src='/static/images/group.png'></image>
-      <view class='user_column_item_text'>我的拼团</view>
-    </view>
-
-    <view class='user_column_item' bindtap='goAddress'>
-      <image class='user_column_item_image' src='/static/images/address.png'></image>
-      <view class='user_column_item_text'>地址管理</view>
-    </view>
-  </view>
-  <view class='separate'></view>
-
-  <view class='user_row'>
-    <view class='user_row_left'>必备工具</view>
-  </view>
-  <view class='user_column'>
-
-    <button class="user_column_item_phone" open-type="getPhoneNumber" bindgetphonenumber="bindPhoneNumber">
-      <image class='user_column_item_image' src='/static/images/mobile.png'></image>
-      <view class='user_column_item_text'>绑定手机</view>
-    </button>
-    <view class='user_column_item' bindtap='goHelp'>
-      <image class='user_column_item_image' src='/static/images/help.png'></image>
-      <view class='user_column_item_text'>帮助中心</view>
-    </view>
-    <view class='user_column_item' bindtap='goFeedback'>
-      <image class='user_column_item_image' src='/static/images/feedback.png'></image>
-      <view class='user_column_item_text'>意见反馈</view>
-    </view>
-    <view class='user_column_item'>
-      <contact-button style="opacity:0;position:absolute;" type="default-dark" session-from="weapp" size="27">
-      </contact-button>
-      <image class='user_column_item_image' src='/static/images/customer.png'></image>
-      <view class='user_column_item_text'>联系客服</view>
-    </view>
-    <view class='user_column_item' bindtap='aboutUs'>
-      <image class='user_column_item_image' src='/static/images/about.png'></image>
-      <view class='user_column_item_text'>关于我们</view>
-    </view>
-  </view>
-  <view class='separate'></view>
-
-  <view class="logout" wx:if="{{hasLogin}}" bindtap="exitLogin">退出登录</view>
-</view>
\ No newline at end of file
+<view>
+    <view class="container">
+      <!-- 用户信息 -->
+      <view wx:if="{{isAuthInfo}}" class="userinfo-none">
+        <view class="default-pic" bindtap="goLogin">
+          <image src="{{avatarUrl}}" />
+          <!-- <button class="avatarbtn" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar"></button> -->
+        </view>
+        <view class="none-login" bindtap="goLogin">
+          <button class="unlogin">
+            {{ userInfo.nickname ? userInfo.nickname : '用户昵称' }}
+          </button>
+          <button class="click-login">
+            {{statusText}}
+          </button>
+        </view>
+      </view>
+      <view wx:if="{{!isAuthInfo}}" class="userinfo-none">
+        <view class="default-pic" bindtap="goLogin">
+          <image src="../../../static/images/icon/sex.png" />
+        </view>
+        <view class="none-login" bindtap="goLogin">
+          <button class="unlogin">
+            未登录用户
+          </button>
+          <button class="click-login">
+            登录注册
+          </button>
+        </view>
+      </view>
+      <!-- end 用户信息 -->
+
+      <view class="list-cont">
+        <van-row custom-class="my-menu">
+          
+          <van-col span="6" class="memu-item" bindtap="goCoupon" wx:if="{{userInfo.userType=='ZB_EMP'}}">
+            <view class="i-name">
+              <image src="./assets/zhubo.png" />
+              <text>主播信息</text>
+            </view>
+          </van-col >
+          <van-col span="6"  class="memu-item" bindtap="goBusiness" wx:if="{{userInfo.userType=='CUSTOMER'&&userInfo.managerFlag=='0'}}">
+            <view class="i-name">
+              <image src="./assets/shangjia.png" />
+              <text>商家信息</text>
+            </view>
+          </van-col>
+          <van-col span="6"  class="memu-item" wx:if="{{userInfo.userType=='CUSTOMER'&&userInfo.managerFlag=='0'}}" bindtap="goJobManagement">
+            <view class="i-name">
+              <image src="./assets/zhiwei.png" />
+              <text>职位管理</text>
+            </view>
+          </van-col>
+          <van-col span="6"  class="memu-item" wx:if="{{userInfo.userType=='CUSTOMER'}}" bindtap="goFootprint">
+            <view class="i-name">
+              <image src="./assets/zuji.png" />
+              <text>我的足迹</text>
+            </view>
+          </van-col>
+          <van-col span="6"  class="memu-item" wx:if="{{userInfo.userType=='ZB_EMP'}}"  bindtap="gozbFootprint">
+            <view class="i-name">
+              <image src="./assets/zuji.png" />
+              <text>我的足迹</text>
+            </view>
+          </van-col>
+          <van-col span="6"  class="memu-item" wx:if="{{userInfo.userType=='CUSTOMER'}}" bindtap="govisitor">
+            <view class="i-name">
+              <image src="./assets/fangke.png" />
+              <text>访客记录</text>
+            </view>
+          </van-col>
+          
+          <van-col span="6"  class="memu-item" wx:if="{{userInfo.userType=='ZB_EMP'}}" bindtap="gozbvisitor">
+            <view class="i-name">
+              <image src="./assets/fangke.png" />
+              <text>访客记录</text>
+            </view>
+          </van-col>
+          <van-col span="6" class="memu-item" bindtap="gosetUp">
+            <view class="i-name">
+              <image src="./assets/shezhi.png" />
+              <text>设置</text>
+            </view>
+          </van-col >
+          <!-- <view class="memu-item" bindtap="goCollect">
+            <view class="i-name">
+              <image src="@/static/images/icon/promotion.png" />
+              <text>我的收藏</text>
+            </view>
+            <view class="arrowhead" />
+          </view> -->
+          <!-- <view class="memu-item" >
+            <view class="i-name">
+              <image src="@/static/images/icon/getCoupon.png" />
+              <text>我的券包和积分</text>
+            </view>
+            <view class="arrowhead" />
+          </view>
+          <view class="memu-item" >
+            <view class="i-name">
+              <image src="@/static/images/icon/myCoupon.png" />
+              <text>我试播过的商家</text>
+            </view>
+            <view class="arrowhead" />
+          </view>
+          <view class="memu-item" >
+            <view class="i-name">
+              <image src="@/static/images/icon/myAddr.png" />
+              <text>我的专属客服</text>
+            </view>
+            <view class="arrowhead" />
+          </view>-->
+        </van-row> 
+      </view>
+    </view>
+  </view>
diff --git a/litemall-wx/pages/ucenter/index/index.wxss b/litemall-wx/pages/ucenter/index/index.wxss
index 26b14492..0eaf52d6 100644
--- a/litemall-wx/pages/ucenter/index/index.wxss
+++ b/litemall-wx/pages/ucenter/index/index.wxss
@@ -1,165 +1,295 @@
-page {
-  height: 100%;
-  width: 100%;
-  background: #f4f4f4;
-}
-
-.container {
-  background: #f4f4f4;
-  height: auto;
-  overflow: hidden;
-  width: 100%;
-}
-
-.profile-info {
-  background-color: #ab956d;
-  color: #f4f4f4;
-  display: flex;
-  align-items: center;
-  padding: 30rpx;
-  font-size: 28rpx;
-}
-
-.profile-info .avatar {
-  height: 148rpx;
-  width: 148rpx;
-  border-radius: 50%;
-}
-
-.profile-info .info {
-  flex: 1;
-  height: 85rpx;
-  padding-left: 31.25rpx;
-}
-
-.profile-info .name {
-  display: block;
-  height: 45rpx;
-  line-height: 45rpx;
-  color: #fff;
-  font-size: 37.5rpx;
-  margin-bottom: 10rpx;
-}
-
-.profile-info .level {
-  display: block;
-  height: 30rpx;
-  line-height: 30rpx;
-  margin-bottom: 10rpx;
-  color: #7f7f7f;
-  font-size: 30rpx;
-}
-
-.user_area {
-  /* border: 1px solid black; */
-  width: 100%;
-  height: 226rpx;
-  /* margin: 0 auto; */
-  margin-top: -8rpx;
-  background: #fff;
-  /* border-top: 1px solid #f4f4f4; */
-}
-
-.user_row {
-  /* border: 1px solid black; */
-  height: 86rpx;
-  line-height: 86rpx;
-  border-bottom: 1px solid #fafafa;
-}
-
-.user_row_left {
-  /* border: 1px solid #757575; */
-  float: left;
-  height: 86rpx;
-  font-weight: 550;
-  line-height: 86rpx;
-  margin-left: 35rpx;
-  font-size: 26rpx;
-  letter-spacing: 1rpx;
-}
-
-.user_row_right {
-  /* border: 1px solid #757575; */
-  float: right;
-  height: 40rpx;
-  width: 40rpx;
-  font-weight: 550;
-  line-height: 86rpx;
-  margin-top: 28rpx;
-  margin-right: 30rpx;
-}
-
-.user_column {
-  /* border: 1px solid black; */
-  height: 140rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.user_column_item {
-  width: 30%;
-  height: 140rpx;
-  background: #fff;
-  text-align: center;
-  position: relative;
-}
-
-.user_column_item_badge {
-  height: 28rpx;
-  width: 28rpx;
-  position: absolute;
-  background: #b4282d;
-  color: #fff;
-  border-radius: 50%;
-  margin-top: 20rpx;
-  margin-left: 40rpx;
-}
-
-.user_column_item_image {
-  width: 50rpx;
-  height: 50rpx;
-  margin-top: 30rpx;
-}
-
-.user_column_item_text {
-  /* border: 1px solid black; */
-  margin-top: 5rpx;
-  font-size: 24rpx;
-  color: #555;
-}
-
-.separate {
-  background: #e0e3da;
-  width: 100%;
-  height: 6rpx;
-}
-
-.user_column_item_phone {
-  width: 30%;
-  height: 140rpx;
-  text-align: center;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-wrap: wrap;
-  float: left;
-  background: #fff;
-  border-radius: 0;
-}
-
-.user_column_item_phone::after {
-  border: none;
-  border-radius: 0;
-}
-
-.logout {
-  margin-top: 30rpx;
-  height: 100rpx;
-  width: 100%;
-  line-height: 100rpx;
-  text-align: center;
-  background: #fff;
-  color: red;
-  font-size: 30rpx;
-}
+page {
+  height: 100%;
+  width: 100%;
+  background: #f4f4f4;
+}
+
+.container {
+  background-color: #f7f7f7;
+  padding-bottom: 60rpx;
+}
+
+.userinfo {
+  position: relative;
+  width: 100%;
+  background: #f7f7f7;
+  text-align: center;
+  padding: 30rpx 0;
+}
+
+.userinfo .userinfo-con {
+  width: 240rpx;
+  margin: auto;
+}
+
+.userinfo .userinfo-con .userinfo-avatar {
+  overflow: hidden;
+  display: block;
+  width: 160rpx;
+  height: 160rpx;
+  border-radius: 50%;
+  box-shadow: 3px 3px 10px rgba(0, 0, 0, 0.2);
+  margin: auto;
+}
+
+.userinfo .userinfo-con .userinfo-avatar image {
+  width: 160rpx;
+  height: 160rpx;
+}
+
+.userinfo .userinfo-con .userinfo-name {
+  font-size: 30rpx;
+  font-weight: bold;
+  margin-top: 20rpx;
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
+  text-overflow: ellipsis;
+  word-break: break-all;
+}
+
+.userinfo-none {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  padding: 30rpx;
+  background: #fff;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+  align-items: center;
+}
+
+.userinfo-none .default-pic {
+  padding-right: 30rpx;
+  position: relative;
+}
+
+.userinfo-none .default-pic image {
+  width: 160rpx;
+  height: 160rpx;
+}
+.userinfo-none .default-pic .avatarbtn{
+  width: 160rpx;
+  height: 160rpx;
+  position: absolute;
+  top: 0;
+  opacity: 0;
+}
+
+.none-login button {
+  background: #fff;
+}
+
+.none-login button::after {
+  border: 0;
+}
+
+.none-login .unlogin {
+  font-size: 30rpx;
+  text-align: left;
+  padding: 0;
+}
+
+.none-login .click-login {
+  font-size: 26rpx;
+  color: #777;
+  text-align: left;
+  padding: 0;
+}
+
+.binding-phone {
+  position: relative;
+  background: #fff;
+  height: 80rpx;
+  line-height: 80rpx;
+  padding: 0 30rpx;
+}
+
+.binding-phone .show-tip {
+  font-size: 26rpx;
+}
+
+.binding-phone .gotobinding {
+  border-radius: 8rpx;
+  font-size: 28rpx;
+  color: #e24b4b;
+  font-weight: bold;
+}
+
+.list-cont {
+  width: 100%;
+  margin-top: 20rpx;
+  padding: 0 20rpx;
+  border-radius: 30rpx;
+}
+
+.list-cont .total-order {
+  background: #fff;
+}
+
+.list-cont .total-order .order-tit {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+  justify-content: space-between;
+  height: 80rpx;
+  line-height: 80rpx;
+  font-size: 30rpx;
+  border-bottom: 1px solid #f7f7f7;
+  padding: 0 30rpx;
+}
+
+.list-cont .total-order .order-tit .checkmore {
+  font-size: 22rpx;
+  color: #80848f;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+  align-items: center;
+}
+
+.list-cont .total-order .procedure {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-justify-content: space-around;
+  justify-content: space-around;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+  align-items: center;
+  font-size: 25rpx;
+  height: 160rpx;
+}
+
+.list-cont .total-order .procedure .items {
+  position: relative;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -webkit-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+  align-items: center;
+}
+
+.list-cont .total-order .procedure .items image {
+  width: 70rpx;
+  height: 70rpx;
+  margin-bottom: 20rpx;
+}
+
+.list-cont .total-order .procedure .items .num-badge {
+  position: absolute;
+  top: -15rpx;
+  right: -12rpx;
+  color: #eb2444;
+  border: 3rpx solid #eb2444;
+  border-radius: 50rpx;
+  background: #fff;
+  min-width: 30rpx;
+  height: 30rpx;
+  line-height: 30rpx;
+  text-align: center;
+  padding: 2rpx;
+  display: block;
+}
+
+.list-cont .my-menu {
+  background-color: #fff;
+  border-radius: 30rpx;
+  padding: 30rpx 10rpx;
+  /* display: flex; */
+  /* padding: 30rpx 0; */
+}
+
+.list-cont .my-menu .memu-item {
+  height: 80rpx;
+}
+
+.list-cont .my-menu .memu-item:last-child {
+  border-bottom: none;
+}
+
+.list-cont .my-menu .memu-item text {
+  font-size: 22rpx;
+  display: block;
+  color: rgb(41, 40, 40);
+}
+
+.list-cont .my-menu .memu-item image {
+  width: 50rpx;
+  height: 50rpx;
+}
+
+.list-cont .my-menu .memu-item .i-name {
+  text-align: center;
+  padding: 20rpx 0;
+}
+
+.arrowhead {
+  width: 15rpx;
+  height: 15rpx;
+  border-top: 2rpx solid #999;
+  border-right: 2rpx solid #999;
+  -webkit-transform: rotate(45deg);
+  transform: rotate(45deg);
+  margin-left: 10rpx;
+}
+
+.prod-col {
+  margin-top: 20rpx;
+  background: #fff;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-justify-content: space-around;
+  justify-content: space-around;
+  padding: 30rpx 0 10rpx 0;
+  font-size: 12px;
+}
+
+.prod-col .col-item {
+  text-align: center;
+}
+
+.prod-col .col-item .num {
+  font-size: 16px;
+  font-weight: 700;
+  color: #3a86b9;
+}
+
+.prod-col .col-item .tit {
+  line-height: 34px;
+}
+
+.log-out {
+  padding: 20rpx;
+  text-align: center;
+  margin-top: 20rpx;
+}
+
+.log-out-n {
+  font-size: 30rpx;
+  margin: auto;
+  width: 200rpx;
+  padding: 20rpx;
+  border-radius: 10rpx;
+  background: #e43130;
+  color: #ffffff;
+}
+
+button.memu-btn.memu-item {
+  background-color: #fff;
+}
+
+button.memu-btn.memu-item:after {
+  border: 0;
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/myposts/assets/fangke.png b/litemall-wx/pages/ucenter/myposts/assets/fangke.png
new file mode 100644
index 0000000000000000000000000000000000000000..5975cf7010dc1739b16145fd9ac0c2ccbcd3180e
GIT binary patch
literal 5568
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
Qt}=_Kp{lD=t7IMdKi3Xy3jhEB

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/ucenter/myposts/assets/mom.png b/litemall-wx/pages/ucenter/myposts/assets/mom.png
new file mode 100644
index 0000000000000000000000000000000000000000..b29aba7b24f26ddc74489a025508580854d563b2
GIT binary patch
literal 7035
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
WVSASi;=a448bA%DjjUF*!u%ghoC=%(

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/ucenter/myposts/assets/shangjia.png b/litemall-wx/pages/ucenter/myposts/assets/shangjia.png
new file mode 100644
index 0000000000000000000000000000000000000000..22723a62a83d94a332870794692cdff5a8f0f4f1
GIT binary patch
literal 4917
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
WyH_AruaUpQDD<_BwW>6npZyOcm>fs|

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/ucenter/myposts/assets/zhiwei.png b/litemall-wx/pages/ucenter/myposts/assets/zhiwei.png
new file mode 100644
index 0000000000000000000000000000000000000000..74b82da6a9b1a4c83ce8ff6b2b6d4478c33ef301
GIT binary patch
literal 5159
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/ucenter/myposts/assets/zhubo.png b/litemall-wx/pages/ucenter/myposts/assets/zhubo.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1201f996370387c7120f0b0d9ce1c5e10d152e2
GIT binary patch
literal 8104
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/ucenter/myposts/assets/zuji.png b/litemall-wx/pages/ucenter/myposts/assets/zuji.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e94af5c38ba0d8b8ccf31d46b309d2bff213850
GIT binary patch
literal 10053
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
Kp+XM+@&5ptvpwPf

literal 0
HcmV?d00001

diff --git a/litemall-wx/pages/ucenter/myposts/myposts.js b/litemall-wx/pages/ucenter/myposts/myposts.js
new file mode 100644
index 00000000..75da7708
--- /dev/null
+++ b/litemall-wx/pages/ucenter/myposts/myposts.js
@@ -0,0 +1,779 @@
+var util = require('../../../utils/util.js');
+var api = require('../../../config/api.js');
+import {
+  areaList
+} from '../../../utils/area.js';
+import WxValidate from "../../../utils/WxValidate.js";
+Page({
+  data: {
+    isEdit: false,
+    btnDisabled: false,
+    form: {
+      id: "",
+      sex: '1',
+      name: '',
+      birthday: "",
+      birthdayvalue: '',
+      height: "",
+      weight: "",
+      // 户籍地省市区
+      province: "",
+      city: "",
+      county: "",
+      provinceCode: "",
+      cityCode: "",
+      countyCode: "",
+      // 常住地  
+      currentProvince: "",
+      currentCity: "",
+      currentCounty: "",
+      currentProvinceCode: "",
+      currentCityCode: "",
+      currentCountyCode: "",
+      degree: '',
+      zhiboyuyanvalue: "",
+      language: '',
+      gongzuofangshivalue: '',
+      workWay: '',
+      counterPrice: '',
+      workCategory: [],
+      chanchangpinleivalue: '',
+      goodCategory: [],
+      zhanghaopleixingvalue: '',
+      accountType: [],
+      fengeyaoqiuvalue: '',
+      workStyle: [],
+      birthdaytext:'',
+      brief: '',
+      picUrl: ''
+    },
+    degreeindex: 0,
+    langrageindex: 0,
+    workWayindex: 0,
+    list: [{
+        name: '男',
+        value: '1',
+      },
+      {
+        name: '女',
+        value: '2',
+      }
+    ],
+    fileList: [
+
+    ],
+    videoList: [
+
+    ],
+    DEGREE: [],
+    LANGRAGE: [],
+    WORK_TIME: [],
+    ZB_TYPE: [],
+    GOOD_CATEGORY: [],
+    ZB_ACCOUNT_TY: [],
+    ZB_STYLE: [],
+    gallery: [],
+    video: [],
+    videoList: [],
+    dictList: {},
+    show: false,
+    pickerShow: false,
+    mode: 'date',
+    degreeShow: false,
+    areashow2: false,
+    langrageShow: false,
+    worktimeShow: false,
+    areaList: {
+      province_list: areaList.province_list, //省
+      city_list: areaList.city_list, //市
+      county_list: areaList.county_list //区
+    },
+    areashow: false,
+    minDate: new Date(1970, 0, 1).getTime(),
+    maxDate: new Date().getTime(),
+  },
+  onShow: function (options) {
+    let that = this;
+    if (!!this.data.params) {
+      let params = this.data.params.data;
+      let type = this.data.params.type;
+      if (type == 'ZB_TYPE') {
+        this.setData({
+          'form.workCategory': params
+        })
+      } else if (type == 'GOOD_CATEGORY') {
+        this.setData({
+          'form.goodCategory': params
+        })
+      } else if (type == 'ZB_ACCOUNT_TYPE') {
+        this.setData({
+          'form.accountType': params
+        })
+      } else if (type == 'ZB_STYLE') {
+        this.setData({
+          'form.workStyle': params
+        })
+      }
+    } else {
+
+    }
+  },
+  onLoad(options) {
+    this.getByCategory()
+    this.initValidate()
+
+  },
+  initValidate() {
+    const rules = {
+      name: { //用户名
+        required: true,
+      },
+      birthday: {
+        required: true,
+      },
+      height: {
+        required: true,
+      },
+      weight: {
+        required: true,
+      },
+      weight: {
+        required: true,
+      },
+      province: {
+        required: true,
+      },
+      currentProvince: {
+        required: true,
+      },
+      degree: {
+        required: true,
+      },
+      language: {
+        required: true,
+      },
+      workWay: {
+        required: true,
+      },
+    }
+    const messages = { //提示信息
+      name: {
+        required: '请填写姓名',
+      },
+      birthday: {
+        required: '请选择出生年月',
+      },
+      height: {
+        required: '请填写身高',
+      },
+      weight: {
+        required: '请输入体重',
+      },
+      province: {
+        required: '请选择户籍地省市区',
+      },
+      currentProvince: {
+        required: '请选择常住地',
+      },
+      degree: {
+        required: '请选择学历',
+      },
+      language: {
+        required: '请选择直播语言',
+      },
+      workWay: {
+        required: '请选择工作方式',
+      },
+    }
+    // 创造飙到验证实例
+    this.WxValidate = new WxValidate(rules, messages)
+    console.log(this.WxValidate);
+  },
+  getGoodsInfo: function () {
+    let that = this;
+    util.request(api.Goodsinfo).then(function (res) {
+      if (res.errno === 0) {
+        let userInfo = wx.getStorageSync('userInfo');
+        if (!!res.data) {
+          const timestamp = Date.parse(res.data.birthday)
+          const date = new Date(res.data.birthday);
+          const year = date.getFullYear();
+          const month = String(date.getMonth() + 1).padStart(2, "0");
+          const day = String(date.getDate()).padStart(2, "0");
+          const formattedDate = `${year}-${month}-${day}`;
+          that.setData({
+            "form.id": res.data.id,
+            "form.sex": res.data.sex + '',
+            "form.name": res.data.name,
+            "form.birthday": timestamp,
+            "form.birthdayvalue": date.getTime(),
+            "form.birthdaytext": formattedDate,
+            "form.height": res.data.height,
+            "form.weight": res.data.weight,
+            "form.province": res.data.province,
+            "form.city": res.data.city,
+            "form.county": res.data.county,
+            "form.provinceCode": res.data.provinceCode,
+            "form.cityCode": res.data.cityCode,
+            "form.countyCode": res.data.countyCode,
+            "form.currentProvince": res.data.currentProvince,
+            "form.currentCity": res.data.currentCity,
+            "form.currentCounty": res.data.currentCounty,
+            "form.currentProvinceCode": res.data.currentProvinceCode,
+            "form.currentCityCode": res.data.currentCityCode,
+            "form.currentCountyCode": res.data.currentCountyCode,
+            "form.degree": res.data.degree,
+            "form.language": res.data.language,
+            "form.workWay": res.data.workWay,
+            "form.counterPrice": res.data.counterPrice,
+            "form.workCategory": res.data.workCategory,
+            "form.goodCategory": res.data.goodCategory,
+            "form.accountType": res.data.accountType,
+            "form.workStyle": res.data.workStyle,
+            "form.brief": res.data.brief,
+            "form.picUrl": res.data.picUrl,
+            fileList: res.data.gallery || [],
+            videoList: res.data.videoUrl || [],
+            gallery: res.data.gallery || [],
+            video: res.data.videoUrl || [],
+            isEdit: true
+          });
+        } else {
+          that.setData({
+            'form.birthdayvalue':new Date(2000, 0, 1).getTime(),
+            isEdit: false,
+            "form.picUrl": userInfo.avatar,
+          })
+        }
+
+      }
+    });
+  },
+  formSubmit: function (e) {
+    var that = this
+    const params = this.data.form
+    //校验表单
+    if (!this.WxValidate.checkForm(params)) {
+      console.log(this.WxValidate.errorList)
+      const error = this.WxValidate.errorList[0]
+      wx.showToast({
+        title: error.msg,
+        icon: 'none'
+      })
+      return false
+    }else if(this.data.gallery.length ==0){
+      wx.showToast({
+        title: "请至少上传一张图片",
+        icon: 'none'
+      })
+      return false
+    }else if(this.data.video.length ==0){
+      wx.showToast({
+        title: "请至少上传一张视频",
+        icon: 'none'
+      })
+      return false
+    }
+    this.setData({
+      btnDisabled:true
+    })
+    wx.showLoading({
+      title: '加载中...',
+    });
+    let str = ''
+    if (!this.data.isEdit) {
+      str = api.GoodsCreate
+    } else {
+      str = api.GoodsUpdate
+    }
+    util.request(str, {
+      ...this.data.form,
+      gallery: this.data.gallery,
+      videoUrl: this.data.video
+    }, 'POST').then(function (res) {
+      that.setData({
+        btnDisabled:false
+      })
+      wx.hideLoading();
+      wx.showToast({
+        title: res.errmsg,
+      })
+      if (res.errno === 0) {
+        wx.navigateBack({
+          delta: 1
+        })
+      }
+    });
+  },
+  inputEvent(e) { // 输入框双向绑定
+    this.setData({
+      ['form.' + e.currentTarget.dataset.type]: e.detail
+    })
+  },
+  degreeCancel() {
+    this.setData({
+      degreeShow: false
+    })
+  },
+  degreeConfirm(e) {
+    console.log(e)
+    this.degreeCancel()
+  },
+  degreeShowChange() {
+    this.setData({
+      degreeShow: true,
+      degreeindex: this.data.DEGREE.findIndex(item => {
+        return item.text == this.data.form.degree
+      }),
+    })
+  },
+  onPullDownRefresh() {
+    wx.showNavigationBarLoading() //在标题栏中显示加载
+    this.getOrderDetail();
+    wx.hideNavigationBarLoading() //完成停止加载
+    wx.stopPullDownRefresh() //停止下拉刷新
+  },
+  getByCategory() {
+    let that = this;
+    util.request(api.getByCategory, {
+      categoryList: ['DEGREE', 'LANGRAGE', 'WORK_TIME', 'ZB_TYPE', 'ZB_ACCOUNT_TYPE', 'ZB_STYLE', 'GOOD_CATEGORY']
+    }, 'POST').then(function (res) {
+      if (res.errno === 0) {
+        that.setData({
+          DEGREE: res.data.list.filter((item) => {
+            return item.category == 'DEGREE'
+          }).map(deg => ({
+            text: deg.name,
+            value: deg.name
+          })),
+          LANGRAGE: res.data.list.filter((item) => {
+            return item.category == 'LANGRAGE'
+          }).map(deg => ({
+            text: deg.name,
+            value: deg.name
+          })),
+          WORK_TIME: res.data.list.filter((item) => {
+            return item.category == 'WORK_TIME'
+          }).map(deg => ({
+            text: deg.name,
+            value: deg.name
+          })),
+          ZB_TYPE: res.data.list.filter((item) => {
+            return item.category == 'ZB_TYPE'
+          }).map(deg => ({
+            text: deg.name,
+            value: deg.name
+          })),
+          GOOD_CATEGORY: res.data.list.filter((item) => {
+            return item.category == 'GOOD_CATEGORY'
+          }).map(deg => ({
+            text: deg.name,
+            value: deg.name
+          })),
+          ZB_ACCOUNT_TYPE: res.data.list.filter((item) => {
+            return item.category == 'ZB_ACCOUNT_TYPE'
+          }).map(deg => ({
+            text: deg.name,
+            value: deg.name
+          })),
+          ZB_STYLE: res.data.list.filter((item) => {
+            return item.category == 'ZB_STYLE'
+          }).map(deg => ({
+            text: deg.name,
+            value: deg.name
+          })),
+        })
+        that.getGoodsInfo()
+      }
+    });
+  },
+  expandDetail: function () {
+    let that = this;
+    this.setData({
+      flag: !that.data.flag
+    })
+  },
+  changeCalendar: function () {
+    let that = this;
+    this.setData({
+      flag: !that.data.flag
+    })
+  },
+  datatrue: function () {
+    let that = this;
+    this.setData({
+      show: !that.data.show
+    })
+    console.log(that.data.show)
+  },
+  reginCalendar: function () {
+    let that = this;
+    this.setData({
+      areashow: !that.data.areashow,
+      'form.countyCode': this.data.form.countyCode
+    })
+  },
+  reginCalendar2: function () {
+    let that = this;
+    this.setData({
+      areashow2: !that.data.areashow2,
+      'form.currentCountyCode': this.data.form.currentCountyCode
+    })
+  },
+  regin2Calendar() {
+    this.reginCalendar2()
+  },
+  regin2Confirm(e) {
+    console.log(e.detail)
+    let data = e.detail.values
+    let code = e.detail.values.map((item) => {
+      return item.code
+    })
+    this.setData({
+      // 'form.changzhudiname':name,
+      // 'form.changzhudivalue': code,
+      'form.currentProvince': data[0].name,
+      'form.currentCity': data[1].name,
+      'form.currentCounty': data[2].name,
+      'form.currentProvinceCode': data[0].code,
+      'form.currentCityCode': data[1].code,
+      'form.currentCountyCode': data[2].code,
+    })
+    this.reginCalendar2()
+  },
+
+  reginConfirm(e) {
+    console.log(e.detail)
+    let data = e.detail.values
+    // let name = e.detail.values.map((item) => { return item.name}).join('-')
+    // let code = e.detail.values.map((item) => { return item.code})
+    this.setData({
+      // 'form.hujidiname':name,
+      // 'form.hujidinamevalue': code
+      'form.province': data[0].name,
+      'form.city': data[1].name,
+      'form.county': data[2].name,
+      'form.provinceCode': data[0].code,
+      'form.cityCode': data[1].code,
+      'form.countyCode': data[2].code,
+    })
+    this.reginCalendar()
+  },
+  cancel: function () {
+    let that = this;
+    this.setData({
+      show: false
+    })
+  },
+  datetimeConfirm: function (e) {
+    console.log(e.detail)
+    const date = new Date(e.detail);
+    // 获取年、月、日
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份是从 0 开始的，需要加 1
+    const day = String(date.getDate()).padStart(2, '0');
+    // 组合成 YYYY-MM-DD 格式的日期字符串
+    const formattedDate = `${year}-${month}-${day}`;
+    this.setData({
+      'form.birthday': e.detail,
+      'form.birthdaytext': formattedDate
+    })
+    this.cancel()
+  },
+  degreeConfirm(e) {
+    let text = e.detail.value.text
+    this.setData({
+      'form.degree': text
+    })
+    this.degreeCancel()
+  },
+  langrageCancel: function () {
+    this.setData({
+      langrageShow: false
+    })
+  },
+  langrageConfirm(e) {
+    let text = e.detail.value.text
+    this.setData({
+      'form.language': text
+    })
+    this.langrageCancel()
+  },
+  langrageShowChange: function () {
+    this.setData({
+      langrageShow: true,
+      langrageindex: this.data.LANGRAGE.findIndex(item => {
+        return item.text == this.data.form.language
+      }),
+    })
+  },
+  worktimeCancel: function () {
+    this.setData({
+      worktimeShow: false
+    })
+  },
+  worktimeConfirm(e) {
+    let text = e.detail.value.text
+    this.setData({
+      'form.workWay': text
+    })
+    this.worktimeCancel()
+  },
+  worktimeChange: function () {
+    this.setData({
+      worktimeShow: true,
+      workWayindex: this.data.WORK_TIME.findIndex(item => {
+        return item.text == this.data.form.workWay
+      }),
+    })
+  },
+  chooseMedia: function () {
+    let that = this;
+    wx.chooseImage({
+      count: 1, // 一次只能选择一张图片
+      sizeType: ['compressed'], // 压缩图片
+      sourceType: ['album', 'camera'], // 从相册选择
+      success: function (res) {
+        const tempFilePaths = res.tempFilePaths;
+        const tempFilePath = tempFilePaths[0];
+        // 检查图片大小
+        wx.getFileSystemManager().getFileInfo({
+          filePath: tempFilePath,
+          success: function (fileRes) {
+            const size = fileRes.size; // 图片大小，单位B
+            const maxSize = 5 * 1024 * 1024; // 20MB
+            if (size > maxSize) {
+              wx.showToast({
+                title: '图片过大，请重新选择',
+                icon: 'none'
+              });
+              return;
+            }
+            wx.cropImage({
+              src: tempFilePath, // 图片路径
+              cropScale: '1:1', // 裁剪比例
+              success: function (res1) {
+                const uploadTask = wx.uploadFile({
+                  url: api.StorageUpload,
+                  filePath: res1.tempFilePath,
+                  name: 'file',
+                  success: function (res2) {
+                    var _res = JSON.parse(res2.data);
+                    if (_res.errno === 0) {
+                      var url = _res.data.url
+                      that.setData({
+                        'form.picUrl': url
+                      })
+                    }
+                  },
+                  fail: function (e) {
+                    wx.showModal({
+                      title: '错误',
+                      content: '上传失败',
+                      showCancel: false
+                    })
+                  },
+                })
+              }
+
+            })
+
+            // 图片大小符合要求，继续上传逻辑
+          }
+        });
+
+      }
+    })
+  },
+  imgUpload: function () {
+    let that = this;
+    wx.chooseImage({
+      count: 1, // 一次只能选择一张图片
+      sizeType: ['compressed'], // 压缩图片
+      sourceType: ['album', 'camera'], // 从相册选择
+      success: function (res) {
+        const tempFilePaths = res.tempFilePaths;
+        const tempFilePath = tempFilePaths[0];
+        // 检查图片大小
+        wx.getFileSystemManager().getFileInfo({
+          filePath: tempFilePath,
+          success: function (fileRes) {
+            const size = fileRes.size; // 图片大小，单位B
+            const maxSize = 5 * 1024 * 1024; // 20MB
+            if (size > maxSize) {
+              wx.showToast({
+                title: '图片过大，请重新选择',
+                icon: 'none'
+              });
+              return;
+            }
+            // 图片大小符合要求，继续上传逻辑
+          }
+        });
+
+        that.upload(res);
+        // 将图片上传到服务器
+        // uni.uploadFile({
+        //   url: 'https://example.com/upload', // 上传的服务器地址
+        //   filePath: res.tempFilePaths[0], // 图片的本地地址
+        //   name: 'file', // 服务端用于接收文件的参数名
+        //   success: function (res) {
+        //     // 上传成功，做一些处理
+        //   }
+        // })
+      }
+    })
+  },
+  upload: function (res) {
+    var that = this;
+    const uploadTask = wx.uploadFile({
+      url: api.StorageUpload,
+      filePath: res.tempFilePaths[0],
+      name: 'file',
+      success: function (res) {
+        var _res = JSON.parse(res.data);
+        if (_res.errno === 0) {
+          var url = _res.data.url
+          that.data.fileList.push(url)
+          that.setData({
+            gallery: that.data.fileList
+          })
+        }
+      },
+      fail: function (e) {
+        wx.showModal({
+          title: '错误',
+          content: '上传失败',
+          showCancel: false
+        })
+      },
+    })
+
+    uploadTask.onProgressUpdate((res) => {
+      console.log('上传进度', res.progress)
+      console.log('已经上传的数据长度', res.totalBytesSent)
+      console.log('预期需要上传的数据总长度', res.totalBytesExpectedToSend)
+    })
+
+  },
+  delImage(e) {
+    console.log(e)
+    let index = e.currentTarget.dataset.index
+    this.data.fileList.splice(index, 1)
+    this.setData({
+      gallery: this.data.fileList
+    })
+  },
+  delVideo(e) {
+    console.log(e)
+    let index = e.currentTarget.dataset.index
+    this.data.videoList.splice(index, 1)
+    this.setData({
+      video: this.data.videoList
+    })
+  },
+  imgPreview: function (e) {
+    console.log(e)
+    var current = e.target.dataset.src;
+    wx.previewImage({
+      current: current, // 当前显示图片的http链接
+      urls: [current] // 需要预览的图片http链接列表
+    })
+  },
+  selectData(e) {
+    var current = e.currentTarget.dataset.type;
+    let str = JSON.stringify(this.data[current])
+    let arr = {
+      ZB_TYPE: "workCategory",
+      GOOD_CATEGORY: "goodCategory",
+      ZB_ACCOUNT_TYPE: "accountType",
+      ZB_STYLE: "workStyle",
+    }
+    let name = arr[current]
+    let cdata = JSON.stringify(this.data.form[name])
+    wx.navigateTo({
+      url: "/pages/ucenter/categorys/categorys?data=" + str + '&type=' + current + '&cData=' + cdata
+    });
+  },
+  changeradio(e) {
+    console.log(e)
+    var current = e.target.dataset.item.value;
+    this.setData({
+      'form.sex': current
+    })
+  },
+  videoUpload: function () {
+    const that = this;
+    //   选择视频
+    wx.chooseVideo({
+      sourceType: ['album', 'camera'], // 类型[相册,照相机]
+      compressed: true, // 是否压缩上传的视频
+      camera: 'back',
+      success: async function (res) {
+        console.log('__res', res);
+        const tempFilePath = res.tempFilePath;
+        const duration = res.duration; // 视频时长，单位s
+        // 检查视频大小
+        wx.getFileSystemManager().getFileInfo({
+          filePath: tempFilePath,
+          success: function (fileRes) {
+            const size = fileRes.size; // 视频大小，单位B
+            const maxSize = 20 * 1024 * 1024; // 100MB
+
+            if (size > maxSize) {
+              wx.showToast({
+                title: '视频过大，请重新选择',
+                icon: 'none'
+              });
+              return;
+            }
+            // 视频大小符合要求，继续上传逻辑
+            // wx.uploadFile() 或其他上传方法
+          }
+        });
+        that.uploadVideo(res)
+      },
+    });
+  },
+  uploadVideo: function (data) {
+    var that = this;
+    wx.showLoading({
+      title: '加载中...',
+    });
+    const uploadTask = wx.uploadFile({
+      url: api.StorageUploadVideo,
+      filePath: data.tempFilePath,
+      name: 'file',
+      success: function (res) {
+        console.log(res)
+        var _res = JSON.parse(res.data);
+        wx.hideLoading();
+        if (_res.errno === 0) {
+          var url = _res.data.url
+          that.data.videoList.push(url)
+          that.setData({
+            video: that.data.videoList
+          })
+        }
+      },
+      fail: function (e) {
+        wx.hideLoading();
+        wx.showModal({
+          title: '错误',
+          content: '上传失败',
+          showCancel: false
+        })
+      },
+    })
+
+  },
+  onReady: function () {
+    // 页面渲染完成
+  },
+  onHide: function () {
+    // 页面隐藏
+  },
+  onUnload: function () {
+    // 页面关闭
+  }
+})
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/myposts/myposts.json b/litemall-wx/pages/ucenter/myposts/myposts.json
new file mode 100644
index 00000000..d202b1ed
--- /dev/null
+++ b/litemall-wx/pages/ucenter/myposts/myposts.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "个人信息"
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/myposts/myposts.wxml b/litemall-wx/pages/ucenter/myposts/myposts.wxml
new file mode 100644
index 00000000..32495d01
--- /dev/null
+++ b/litemall-wx/pages/ucenter/myposts/myposts.wxml
@@ -0,0 +1,199 @@
+<view class="contentmain">
+  <view class="myposts">
+    <view class="bg">
+      <view class="main">
+        <view class="main-top">
+          <view class="myposts-img">
+            <image class="img" src="{{form.picUrl}}" bindtap="chooseMedia" alt="" />
+            <view class="ggg">
+              <view class="myposts-main">
+                <view class="fabu">
+                  <text class="textcol">{{isEdit?form.name:"未发布用户"}}</text>
+                </view>
+                <view class="yuyue">
+                  <text class="textcol">{{isEdit?"已发布":"未发布"}}</text>
+                </view>
+              </view>
+              <!-- <view class="myposts-main myposts-main1">
+                <view class="fabu">
+                  <text class="textcol">未发布用户</text>
+                </view>
+                <view class="yuyue">
+                  <text class="textcol">匹配预约 </text>
+                </view>
+              </view> -->
+            </view>
+          </view>
+        </view>
+        <view class="sex">
+          <view class="sex-main">
+            <van-cell title="性别" icon="../../../static/images/icon/icon-boy.png">
+                <van-radio-group model:value="{{form.sex}}" class="sec-radio" >
+                  <van-radio  style="display:inline-block;width: 50%;" wx:for="{{ list }}"  name="{{item.value}}" data-item="{{ item }}" checked-color="#703EDD" bindtap="changeradio">{{ item.name }}</van-radio>
+                </van-radio-group>
+            </van-cell>
+          </view>
+        </view>
+
+      </view>
+    </view>
+    <view class="formData">
+      <view class="formbg">
+          <view class="form-item">
+            <van-cell-group>
+              <van-field model:value="{{form.name}}" left-icon="../../../static/images/icon/xingming.png" label="姓名" border="false" input-align="right" bind:change="inputEvent" data-type="name" placeholder="姓名" clearable :label-width="100" />
+            </van-cell-group>
+            <van-cell-group is-link bindtap="datatrue">
+              <van-field model:value="{{ form.birthdaytext }}" left-icon="../../../static/images/icon/chushengriqi.png" label="出生年月" input-align="right" readonly placeholder="出生年月"  is-link clearable :label-width="100" />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field model:value="{{ form.height }}" left-icon="../../../static/images/icon/ceshengao.png" type='number' label="身高(Cm)" input-align="right" placeholder="身高" bind:change="inputEvent" data-type="height"  clearable :label-width="100" />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field model:value="{{ form.weight }}" left-icon="../../../static/images/icon/weight.png" type='digit' label="体重(Kg)" input-align="right" placeholder="体重" bind:change="inputEvent" data-type="weight" clearable :label-width="100" />
+            </van-cell-group>
+            <van-cell title="户籍地省市区" icon="../../../static/images/icon/hujidi.png" bindtap="reginCalendar" is-link>
+              <view wx:if='{{form.province}}'>
+                {{form.province}}-{{form.city}}-{{form.county}} 
+              </view>
+            </van-cell>
+            <van-cell title="常住地" icon="../../../static/images/icon/hujichangzhudizhi.png" bindtap="reginCalendar2" is-link>
+              <view wx:if='{{form.currentProvince}}'>
+                {{form.currentProvince}}-{{form.currentCity}}-{{form.currentCounty}} 
+              </view>
+            </van-cell>
+            <van-cell title="学历" icon="../../../static/images/icon/xueli-.png" bindtap="degreeShowChange" is-link>
+            {{ form.degree }}
+            </van-cell>
+            <van-cell title="直播语言" icon="../../../static/images/icon/yuyan.png" bindtap="langrageShowChange" is-link>
+            {{ form.language }}
+            </van-cell>
+            <van-cell title="工作方式" icon="../../../static/images/icon/gongzuofangshipx.png" bindtap="worktimeChange" is-link>
+            {{ form.workWay }}
+            </van-cell>
+            <van-cell-group>
+              <van-field model:value="{{form.counterPrice}}" left-icon="../../../static/images/icon/duotianweishangketixing.png" type='digit' label="时薪" input-align="right" placeholder="时薪"  bind:change="inputEvent" data-type="counterPrice" clearable :label-width="100" />
+            </van-cell-group>
+          </view>
+          <view class="form-item">
+            <van-cell title="直播品类" title-class="vancell__title" icon="../../../static/images/icon/pinlei.png" data-type="ZB_TYPE" bindtap="selectData" is-link>
+              <view class="list">
+                <text class="item" wx:for="{{form.workCategory}}" :key="index">{{ item }}</text>
+              </view>
+            </van-cell>
+            <van-cell title="擅长品类" title-class="vancell__title" icon="../../../static/images/icon/pinlei1.png" data-type="GOOD_CATEGORY" bindtap="selectData" is-link>
+              <view class="list">
+                <text class="item" wx:for="{{form.goodCategory}}" :key="index">{{ item }}</text>
+              </view>
+            </van-cell>
+            <van-cell title="账号类型" title-class="vancell__title" icon="../../../static/images/icon/leixing.png" data-type="ZB_ACCOUNT_TYPE" bindtap="selectData" is-link>
+              <view class="list">
+                <text class="item" wx:for="{{form.accountType}}" :key="index">{{ item }}</text>
+              </view>
+            </van-cell>
+            <van-cell title="风格要求" title-class="vancell__title" icon="../../../static/images/icon/fengge.png" data-type="ZB_STYLE" bindtap="selectData" is-link>
+              <view class="list">
+                <text class="item" wx:for="{{form.workStyle}}" :key="index">{{ item }}</text>
+              </view>
+            </van-cell>
+          </view>
+          <view class="form-item">
+              <van-cell title="上传照片" icon="../../../static/images/icon/tupian.png" border="{{false}}">
+              </van-cell>
+              <view class="row">
+                <view class="u-col-5 imgitem" wx:for="{{ gallery }}" wx:key="index" wx:for-item="item">
+                  <van-icon class="closeicon" name="cross" data-index="{{index}}" bindtap="delImage" />
+                  <image class="imgscr" style="width: 100%; height: 100%;" src="{{ item }}" data-src="{{item}}" bindtap="imgPreview"></image>
+                </view>
+                <van-col class="u-col-5"  wx:if="{{ gallery.length < 2 }}">
+                  <view class="upload-item_i" bindtap="imgUpload">
+                    <view class="upicon">
+                      <van-icon name="plus" />
+                    </view>
+                    <view class="uptext">上传照片</view>
+                    <view class="upmain">(仅支持图片格式)</view>
+                    <view class="upmain">(大小不超过5m)</view>
+                  </view>
+                </van-col>
+              </view>
+              <van-cell title="上传视频" icon="../../../static/images/icon/shipin.png" border="{{false}}">
+              </van-cell>
+              <view class="row">
+                <view class="u-col-5 imgitem" wx:for="{{ video }}"  wx:for-item="item">
+                  <van-icon class="closeicon" name="cross" data-index="{{index}}" bindtap="delVideo" />
+                  <video style="width: 100%; height: 100%;" controls object-fit='cover' :key="index" src="{{item}}" :poster="item.thumbTempFilePath" enable-play-gesture="true"></video>
+                </view>
+                <van-col class="u-col-5"  wx:if="{{ video.length < 2 }}">
+                  <view class="upload-item_i" bindtap="videoUpload">
+                    <view class="upicon">
+                      <van-icon name="plus" />
+                    </view>
+                    <view class="uptext">上传视频</view>
+                    <view class="upmain">(仅支持视频格式)</view>
+                    <view class="upmain">(大小不超过50m)</view>
+                  </view>
+                </van-col>
+              </view>
+            <!-- <van-cell title="上传视频" label-position="top" icon="../../../static/images/icon/shipin.png">
+
+              <van-row gutter="16" justify="between">
+                <van-col span="5" wx:for="{{videoList}}" :key="index" class="imgitem">
+                  <video style="width: 100%; height: 100%;" controls object-fit='cover' :key="index" :src="item.tempFilePath" :poster="item.thumbTempFilePath" enable-play-gesture="true"></video>
+                </van-col>
+                <van-col span="5" wx:if="{{ videoList < 2 }}">
+                  <view class="upitem upload-item_i" wx:if="{{ videoList < 2 }}" bindtap="videoUpload">
+                    <view class="upicon">
+                      <u-icon name="plus" size="32" color="#ccc"></u-icon>
+                    </view>
+                    <view class="uptext">上传视频</view>
+                    <view class="upmain">(仅支持视频格式)</view>
+                  </view>
+                </van-col>
+              </van-row>
+            </van-cell> -->
+            <view class="cell-border" border="{{false}}">
+              <van-cell title="链接" icon="../../../static/images/icon/lianjie.png" >
+              </van-cell>
+              <van-cell-group>
+                <van-field model:value="{{ form.brief }}" border="false" auto-height type="textarea" bind:change="inputEvent" data-type="brief" autosize clearable :label-width="100" />
+              </van-cell-group>
+            </view>
+          </view>
+        <view class="btn">
+          <van-button type="primary" color="#703EDD" bindtap="formSubmit" disabled="{{btnDisabled}}" block>提交发布</van-button>
+        </view>
+      </view>
+    </view>
+
+  </view>
+
+    <!-- <u-calendar v-model="show" :mode="mode" @change="change"></u-calendar>
+    <u-picker class="region" mode="region" v-model="pickerShow" @confirm="confirm"></u-picker> -->
+</view>
+<van-popup show="{{show}}" round  overlay position="bottom" bind:close="cancel">
+    <van-datetime-picker
+      bind:cancel="cancel"
+      bind:confirm="datetimeConfirm"
+      model:value="{{form.birthdayvalue}}"
+      type="date"
+      min-date="{{ minDate }}"
+      max-date="{{ maxDate }}"
+    />
+  </van-popup>
+  <van-popup  show="{{areashow}}" round  position="bottom" bind:close="reginCalendar" >
+    <van-area wx:if="{{ areashow }}" area-list="{{areaList}}"  value="{{form.countyCode}}" bind:cancel="reginCalendar" bind:confirm="reginConfirm" />
+  </van-popup>
+  <van-popup  show="{{areashow2}}" round position="bottom" bind:close="regin2Calendar">
+    <van-area wx:if="{{ areashow2 }}" area-list="{{areaList}}" value="{{form.currentCountyCode}}" bind:cancel="regin2Calendar" bind:confirm="regin2Confirm" />
+  </van-popup>
+  <van-popup  show="{{degreeShow}}" round  position="bottom" bind:close="degreeCancel" >
+    <van-picker wx:if="{{ degreeShow }}" columns="{{ DEGREE }}"   default-index="{{ degreeindex }}" show-toolbar bind:cancel="degreeCancel" bind:confirm="degreeConfirm" />
+  </van-popup>
+  
+  <van-popup  show="{{langrageShow}}" round position="bottom" bind:close="langrageCancel">
+    <van-picker wx:if="{{ langrageShow }}" columns="{{ LANGRAGE }}" default-index="{{ langrageindex }}"  show-toolbar bind:cancel="langrageCancel" bind:confirm="langrageConfirm" />
+  </van-popup>
+ 
+  <van-popup  show="{{worktimeShow}}" round position="bottom" bind:close="worktimeCancel">
+    <van-picker  wx:if="{{ worktimeShow }}" columns="{{ WORK_TIME }}"  default-index="{{ workWayindex }}"  show-toolbar bind:cancel="worktimeCancel" bind:confirm="worktimeConfirm" />
+  </van-popup>
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/myposts/myposts.wxss b/litemall-wx/pages/ucenter/myposts/myposts.wxss
new file mode 100644
index 00000000..3a62aacb
--- /dev/null
+++ b/litemall-wx/pages/ucenter/myposts/myposts.wxss
@@ -0,0 +1,249 @@
+page {
+  height: 100%;
+  width: 100%;
+  background: #f4f4f4;
+}
+
+.contentmain {
+  height: 100%;
+  background: #f0f0f0;
+}
+
+.myposts {
+  height: auto;
+}
+
+.myposts .bg {
+  height: 500rpx;
+  border-bottom-left-radius: 160rpx;
+  border-bottom-right-radius: 140rpx;
+  background-color: #703EDD;
+}
+
+.myposts .bg .main .main-top {
+  padding: 20rpx;
+  padding-bottom: 40rpx;
+}
+
+.myposts .bg .main .main-top .myposts-img {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+}
+
+.myposts .bg .main .main-top .myposts-img .img {
+  width: 140rpx;
+  height: 120rpx;
+}
+
+.myposts .bg .main .main-top .myposts-img .myposts-main {
+  padding: 0 10rpx;
+  
+}
+
+.myposts .bg .main .main-top .myposts-img .myposts-main .fabu {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+  justify-content: space-between;
+  line-height: 50rpx;
+  color: #fff;
+}
+.myposts .bg .main .main-top .myposts-img .myposts-main .fabu .textcol{
+  color: #fff;
+}
+.myposts .bg .main .main-top .myposts-img .myposts-main .yuyue {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+  justify-content: space-between;
+  line-height: 50rpx;
+  
+}
+.myposts .bg .main .main-top .myposts-img .myposts-main .yuyue .textcol{
+  color: #fff;
+}
+.myposts .bg .main .main-top .myposts-img .ggg {
+  width: 100%;
+  padding-left: 20rpx;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+  justify-content: space-between;
+}
+
+.myposts .bg .main .sex {
+  padding: 0 20rpx;
+}
+
+.myposts .bg .main .sex .sex-main {
+  background-color: #fff;
+  border-radius: 20rpx;
+  padding-left: 20rpx;
+  padding-right: 20rpx;
+}
+.myposts .bg .main .sex .sex-main .custom-class .title-class{
+  width: 200rpx !important;
+}
+.myposts .bg .main .sex .sex-main .sec-radio .value-class{
+  text-align: left;
+}
+.myposts .bg .main .sex .sex-main .group-list {
+  width: 50% !important;
+}
+
+.myposts .formData {
+  margin-top: -242rpx;
+  padding: 20rpx;
+}
+
+.myposts .formData .formbg .btn {
+  padding: 20rpx 0;
+ 
+}
+.myposts .formData .formbg .btn .van-button .van-button__text{
+  color: #fff;
+}
+.myposts .formData .formbg .iconarrow {
+  position: absolute;
+  top: 40rpx;
+  right: 20rpx;
+}
+
+.myposts .formData .formbg .form-item {
+  background-color: #fff;
+  border-radius: 20rpx;
+  margin: 20rpx 0;
+  width: 100%;
+  padding-left: 20rpx;
+  padding-right: 20rpx;
+}
+.myposts .formData .formbg .form-item .customitem{
+  position: relative;
+}
+.myposts .formData .formbg .form-item .customitem .custom-icon {
+  width: 32rpx;
+  height: 32rpx;
+  position: absolute;
+  left: 0px;
+  top: 50%;
+  transform: translateY(-50%);
+}
+.myposts .formData .formbg .form-item .upitem {
+  width: 40%;
+  border: 1px solid #ccc;
+  height: 400rpx;
+  margin-right: 20rpx;
+}
+
+.myposts .formData .formbg .form-item .upload-item {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  text-align: center;
+}
+
+.myposts .formData .formbg .form-item .upload-item_img {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+}
+.myposts .formData .formbg .form-item .row .u-col-5 .upload-item_i  {
+  width: 100%;
+  text-align: center;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%,-50%);
+}
+
+.myposts .formData .formbg .form-item .upload-item_i .uptext {
+  padding: 0;
+}
+.myposts .formData .formbg .form-item .cell-border{
+  border-top: 1px solid #ccc;
+  margin-top: 10rpx;
+}
+.myposts .formData .formbg .form-item .upload-item_i .upmain {
+  padding: 0;
+}
+.myposts .formData .formbg .form-item .row{
+  display: flex;
+  width: calc ( 100% - 60rpx);
+  height: 100%;
+  margin:0 30rpx;
+}
+.myposts .formData .formbg .form-item .row .u-col-5 {
+  width: 100%;
+  max-width: 300rpx;
+  text-align: center;
+  border: 1px solid #ccc;
+  height: 400rpx;
+  margin-right: 20rpx;
+  position: relative;
+
+}
+.myposts .formData .formbg .form-item .row .u-col-5 .imgscr {
+  width: 100%;
+  height: 100%;
+}
+.myposts .formData .formbg .form-item .list {
+  display: flex;
+  flex-wrap: wrap;
+}
+.myposts .formData .formbg .form-item .list .item {
+  font-size: 26rpx;
+  display: inline-block;
+  padding: 0rpx 24rpx;
+  line-height: 48rpx;
+  margin: 10rpx;
+  border-radius: 12rpx;
+  border: 2rpx solid #703EDD;
+  color: #703EDD;
+}
+.myposts .formData .formbg .form-item .row .u-col-5 .closeicon {
+  position: absolute;
+  right: 10rpx;
+  font-size: 30rpx;
+  width: 46rpx;
+  height: 46rpx;
+  border-radius: 46rpx;
+  background-color: #fff;
+  text-align: center;
+  color: red;
+  z-index: 9;
+}
+.myposts .formData .formbg .form-item .row .u-col-5 .closeicon .uicon-close::before {
+  margin-left: 8rpx;
+}
+.van-icon__image{
+  position: relative;
+  /* top: 0rpx; */
+}
+.myposts .formData .formbg .form-item .vancell__title{
+  flex: none;
+  width: 180rpx !important;
+}
+.van-cell{
+  padding-left: 5rpx !important;
+}
+.van-cell__value{
+  color: #323233 !important;
+}
+.van-icon-success:before{
+  color: #fff;
+}
+
+.van-field__input--textarea{
+  min-height:62px !important;
+	/* 设置 min-height 是为了设置 textarea 的高度 */
+	/* 因为行内样式优先级比较高，所以曲线救国 */
+	font-size:16px;
+	line-height:16px
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/order/order.js b/litemall-wx/pages/ucenter/order/order.js
deleted file mode 100644
index 7490148f..00000000
--- a/litemall-wx/pages/ucenter/order/order.js
+++ /dev/null
@@ -1,79 +0,0 @@
-var util = require('../../../utils/util.js');
-var api = require('../../../config/api.js');
-
-Page({
-  data: {
-    orderList: [],
-    showType: 0,
-    page: 1,
-    limit: 10,
-    totalPages: 1
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    let that = this
-    try {
-      var tab = wx.getStorageSync('tab');
-
-      this.setData({
-        showType: tab
-      });
-    } catch (e) {}
-
-  },
-  getOrderList() {
-    let that = this;
-    util.request(api.OrderList, {
-      showType: that.data.showType,
-      page: that.data.page,
-      limit: that.data.limit
-    }).then(function(res) {
-      if (res.errno === 0) {
-        console.log(res.data);
-        that.setData({
-          orderList: that.data.orderList.concat(res.data.list),
-          totalPages: res.data.pages
-        });
-      }
-    });
-  },
-  onReachBottom() {
-    if (this.data.totalPages > this.data.page) {
-      this.setData({
-        page: this.data.page + 1
-      });
-      this.getOrderList();
-    } else {
-      wx.showToast({
-        title: '没有更多订单了',
-        icon: 'none',
-        duration: 2000
-      });
-      return false;
-    }
-  },
-  switchTab: function(event) {
-    let showType = event.currentTarget.dataset.index;
-    this.setData({
-      orderList: [],
-      showType: showType,
-      page: 1,
-      limit: 10,
-      totalPages: 1
-    });
-    this.getOrderList();
-  },
-  onReady: function() {
-    // 页面渲染完成
-  },
-  onShow: function() {
-    // 页面显示
-    this.getOrderList();
-  },
-  onHide: function() {
-    // 页面隐藏
-  },
-  onUnload: function() {
-    // 页面关闭
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/order/order.json b/litemall-wx/pages/ucenter/order/order.json
deleted file mode 100644
index 544e7bbf..00000000
--- a/litemall-wx/pages/ucenter/order/order.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "我的订单"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/order/order.wxml b/litemall-wx/pages/ucenter/order/order.wxml
deleted file mode 100644
index bfd12557..00000000
--- a/litemall-wx/pages/ucenter/order/order.wxml
+++ /dev/null
@@ -1,46 +0,0 @@
-<view class="container">
-  <view class="orders-switch">
-    <view class="item {{ showType == 0 ? 'active' : ''}}" bindtap="switchTab" data-index='0'>
-      <view class="txt">全部</view>
-    </view>
-    <view class="item {{ showType == 1 ? 'active' : ''}}" bindtap="switchTab" data-index='1'>
-      <view class="txt">待付款</view>
-    </view>
-    <view class="item {{ showType == 2 ? 'active' : ''}}" bindtap="switchTab" data-index='2'>
-      <view class="txt">待发货</view>
-    </view>
-    <view class="item {{ showType == 3 ? 'active' : ''}}" bindtap="switchTab" data-index='3'>
-      <view class="txt">待收货</view>
-    </view>
-    <view class="item {{ showType == 4 ? 'active' : ''}}" bindtap="switchTab" data-index='4'>
-      <view class="txt">待评价</view>
-    </view>
-  </view>
-  <view class="no-order" wx:if="{{orderList.length <= 0}}">
-    <view class="c">
-      <text>还没有任何订单呢</text>
-    </view>
-  </view>
-
-  <view class="orders">
-    <navigator url="../orderDetail/orderDetail?id={{item.id}}" class="order" open-type="redirect" wx:for="{{orderList}}" wx:key="id">
-      <view class="h">
-        <view class="l">订单编号：{{item.orderSn}}</view>
-        <view class="r">{{item.orderStatusText}}</view>
-      </view>
-      <view class="goods" wx:for="{{item.goodsList}}" wx:key="id" wx:for-item="gitem">
-        <view class="img">
-          <image src="{{gitem.picUrl}}"></image>
-        </view>
-        <view class="info">
-          <text class="name">{{gitem.goodsName}}</text>
-          <text class="number">共{{gitem.number}}件商品</text>
-        </view>
-        <view class="status"></view>
-      </view>
-      <view class="b">
-        <view class="l">实付：￥{{item.actualPrice}}</view>
-      </view>
-    </navigator>
-  </view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/order/order.wxss b/litemall-wx/pages/ucenter/order/order.wxss
deleted file mode 100644
index c13456be..00000000
--- a/litemall-wx/pages/ucenter/order/order.wxss
+++ /dev/null
@@ -1,166 +0,0 @@
-page {
-  height: 100%;
-  width: 100%;
-  background: #f4f4f4;
-}
-
-.orders-switch {
-  width: 100%;
-  background: #fff;
-  height: 84rpx;
-  /* border-bottom: 1px solid rgba(0,0,0,.15); */
-}
-
-.orders-switch .item {
-  display: inline-block;
-  height: 82rpx;
-  width: 18%;
-  padding: 0 15rpx;
-  text-align: center;
-}
-
-.orders-switch .item .txt {
-  display: inline-block;
-  height: 82rpx;
-  padding: 0 20rpx;
-  line-height: 82rpx;
-  color: #9a9ba1;
-  font-size: 30rpx;
-  width: 170rpx;
-}
-
-.orders-switch .item.active .txt {
-  color: #ab956d;
-  border-bottom: 4rpx solid #ab956d;
-}
-
-.no-order {
-  width: 100%;
-  height: auto;
-  margin: 0 auto;
-}
-
-.no-order .c {
-  width: 100%;
-  height: auto;
-  margin-top: 400rpx;
-}
-
-.no-order .c text {
-  margin: 0 auto;
-  display: block;
-  width: 258rpx;
-  height: 29rpx;
-  line-height: 29rpx;
-  text-align: center;
-  font-size: 29rpx;
-  color: #999;
-}
-
-.orders {
-  height: auto;
-  width: 100%;
-  overflow: hidden;
-}
-
-.order {
-  margin-top: 20rpx;
-  background: #fff;
-}
-
-.order .h {
-  height: 83.3rpx;
-  line-height: 83.3rpx;
-  margin-left: 31.25rpx;
-  padding-right: 31.25rpx;
-  border-bottom: 1px solid #f4f4f4;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.order .h .l {
-  float: left;
-}
-
-.order .h .r {
-  float: right;
-  color: #b4282d;
-  font-size: 24rpx;
-}
-
-.order .goods {
-  display: flex;
-  align-items: center;
-  height: 199rpx;
-  margin-left: 31.25rpx;
-}
-
-.order .goods .img {
-  height: 145.83rpx;
-  width: 145.83rpx;
-  background: #f4f4f4;
-}
-
-.order .goods .img image {
-  height: 145.83rpx;
-  width: 145.83rpx;
-}
-
-.order .goods .info {
-  height: 145.83rpx;
-  flex: 1;
-  padding-left: 20rpx;
-}
-
-.order .goods .name {
-  margin-top: 30rpx;
-  display: block;
-  height: 44rpx;
-  line-height: 44rpx;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.order .goods .number {
-  display: block;
-  height: 37rpx;
-  line-height: 37rpx;
-  color: #666;
-  font-size: 25rpx;
-}
-
-.order .goods .status {
-  width: 105rpx;
-  color: #b4282d;
-  font-size: 25rpx;
-}
-
-.order .b {
-  height: 103rpx;
-  line-height: 103rpx;
-  margin-left: 31.25rpx;
-  padding-right: 31.25rpx;
-  border-top: 1px solid #f4f4f4;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.order .b .l {
-  float: left;
-}
-
-.order .b .r {
-  float: right;
-}
-
-.order .b .btn {
-  margin-top: 19rpx;
-  height: 64.5rpx;
-  line-height: 64.5rpx;
-  text-align: center;
-  padding: 0 20rpx;
-  border-radius: 5rpx;
-  font-size: 28rpx;
-  color: #fff;
-  background: #b4282d;
-}
diff --git a/litemall-wx/pages/ucenter/orderDetail/orderDetail.js b/litemall-wx/pages/ucenter/orderDetail/orderDetail.js
deleted file mode 100644
index feea3934..00000000
--- a/litemall-wx/pages/ucenter/orderDetail/orderDetail.js
+++ /dev/null
@@ -1,214 +0,0 @@
-var util = require('../../../utils/util.js');
-var api = require('../../../config/api.js');
-
-Page({
-  data: {
-    orderId: 0,
-    orderInfo: {},
-    orderGoods: [],
-    expressInfo: {},
-    flag: false,
-    handleOption: {}
-  },
-  onLoad: function(options) {
-    // 页面初始化 options为页面跳转所带来的参数
-    this.setData({
-      orderId: options.id
-    });
-    this.getOrderDetail();
-  },
-  onPullDownRefresh() {
-    wx.showNavigationBarLoading() //在标题栏中显示加载
-    this.getOrderDetail();
-    wx.hideNavigationBarLoading() //完成停止加载
-    wx.stopPullDownRefresh() //停止下拉刷新
-  },
-  expandDetail: function() {
-    let that = this;
-    this.setData({
-      flag: !that.data.flag
-    })
-  },
-  getOrderDetail: function() {
-    wx.showLoading({
-      title: '加载中',
-    });
-
-    setTimeout(function() {
-      wx.hideLoading()
-    }, 2000);
-
-    let that = this;
-    util.request(api.OrderDetail, {
-      orderId: that.data.orderId
-    }).then(function(res) {
-      if (res.errno === 0) {
-        console.log(res.data);
-        that.setData({
-          orderInfo: res.data.orderInfo,
-          orderGoods: res.data.orderGoods,
-          handleOption: res.data.orderInfo.handleOption,
-          expressInfo: res.data.expressInfo
-        });
-      }
-
-      wx.hideLoading();
-    });
-  },
-  // “去付款”按钮点击效果
-  payOrder: function() {
-    let that = this;
-    util.request(api.OrderPrepay, {
-      orderId: that.data.orderId
-    }, 'POST').then(function(res) {
-      if (res.errno === 0) {
-        const payParam = res.data;
-        console.log("支付过程开始");
-        wx.requestPayment({
-          'timeStamp': payParam.timeStamp,
-          'nonceStr': payParam.nonceStr,
-          'package': payParam.packageValue,
-          'signType': payParam.signType,
-          'paySign': payParam.paySign,
-          'success': function(res) {
-            console.log("支付过程成功");
-            util.redirect('/pages/ucenter/order/order');
-          },
-          'fail': function(res) {
-            console.log("支付过程失败");
-            util.showErrorToast('支付失败');
-          },
-          'complete': function(res) {
-            console.log("支付过程结束")
-          }
-        });
-      }
-    });
-
-  },
-  // “取消订单”点击效果
-  cancelOrder: function() {
-    let that = this;
-    let orderInfo = that.data.orderInfo;
-
-    wx.showModal({
-      title: '',
-      content: '确定要取消此订单？',
-      success: function(res) {
-        if (res.confirm) {
-          util.request(api.OrderCancel, {
-            orderId: orderInfo.id
-          }, 'POST').then(function(res) {
-            if (res.errno === 0) {
-              wx.showToast({
-                title: '取消订单成功'
-              });
-              util.redirect('/pages/ucenter/order/order');
-            } else {
-              util.showErrorToast(res.errmsg);
-            }
-          });
-        }
-      }
-    });
-  },
-  // “取消订单并退款”点击效果
-  refundOrder: function() {
-    let that = this;
-    let orderInfo = that.data.orderInfo;
-
-    wx.showModal({
-      title: '',
-      content: '确定要取消此订单？',
-      success: function(res) {
-        if (res.confirm) {
-          util.request(api.OrderRefund, {
-            orderId: orderInfo.id
-          }, 'POST').then(function(res) {
-            if (res.errno === 0) {
-              wx.showToast({
-                title: '取消订单成功'
-              });
-              util.redirect('/pages/ucenter/order/order');
-            } else {
-              util.showErrorToast(res.errmsg);
-            }
-          });
-        }
-      }
-    });
-  },
-  // “删除”点击效果
-  deleteOrder: function() {
-    let that = this;
-    let orderInfo = that.data.orderInfo;
-
-    wx.showModal({
-      title: '',
-      content: '确定要删除此订单？',
-      success: function(res) {
-        if (res.confirm) {
-          util.request(api.OrderDelete, {
-            orderId: orderInfo.id
-          }, 'POST').then(function(res) {
-            if (res.errno === 0) {
-              wx.showToast({
-                title: '删除订单成功'
-              });
-              util.redirect('/pages/ucenter/order/order');
-            } else {
-              util.showErrorToast(res.errmsg);
-            }
-          });
-        }
-      }
-    });
-  },
-  // “确认收货”点击效果
-  confirmOrder: function() {
-    let that = this;
-    let orderInfo = that.data.orderInfo;
-
-    wx.showModal({
-      title: '',
-      content: '确认收货？',
-      success: function(res) {
-        if (res.confirm) {
-          util.request(api.OrderConfirm, {
-            orderId: orderInfo.id
-          }, 'POST').then(function(res) {
-            if (res.errno === 0) {
-              wx.showToast({
-                title: '确认收货成功！'
-              });
-              util.redirect('/pages/ucenter/order/order');
-            } else {
-              util.showErrorToast(res.errmsg);
-            }
-          });
-        }
-      }
-    });
-  },
-  // “申请售后”点击效果
-  aftersaleOrder: function () {
-    if(this.data.orderInfo.aftersaleStatus === 0){
-      util.redirect('/pages/ucenter/aftersale/aftersale?id=' + this.data.orderId );
-    }
-    else{
-      util.redirect('/pages/ucenter/aftersaleDetail/aftersaleDetail?id=' + this.data.orderId);
-    }
-  },
-  onReady: function() {
-    // 页面渲染完成
-  },
-  onShow: function() {
-    // 页面显示
-  },
-  onHide: function() {
-    // 页面隐藏
-  },
-  onUnload: function() {
-    // 页面关闭
-  }
-})
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/orderDetail/orderDetail.json b/litemall-wx/pages/ucenter/orderDetail/orderDetail.json
deleted file mode 100644
index 73b7bb40..00000000
--- a/litemall-wx/pages/ucenter/orderDetail/orderDetail.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "订单详情"
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/orderDetail/orderDetail.wxml b/litemall-wx/pages/ucenter/orderDetail/orderDetail.wxml
deleted file mode 100644
index 83fa3471..00000000
--- a/litemall-wx/pages/ucenter/orderDetail/orderDetail.wxml
+++ /dev/null
@@ -1,98 +0,0 @@
-<view class="container">
-  <view class="order-info">
-    <view class="item">
-      <view class="label">下单时间：</view>
-      <view class="txt">{{orderInfo.addTime}}</view>
-    </view>
-    <view class="item">
-      <view class="label">订单编号：</view>
-      <view class="txt">{{orderInfo.orderSn}}</view>
-    </view>
-    <view class="item">
-      <view class="label">订单留言：</view>
-      <view class="txt">{{orderInfo.message}}</view>
-    </view>
-    <view class="item-c">
-      <view class="r">
-        <view class="btn active" bindtap="cancelOrder" wx:if="{{handleOption.cancel}}">取消订单</view>
-        <view class="btn active" bindtap="payOrder" wx:if="{{handleOption.pay}}">去付款</view>
-        <view class="btn active" bindtap="confirmOrder" wx:if="{{handleOption.confirm}}">确认收货</view>
-        <view class="btn active" bindtap="deleteOrder" wx:if="{{handleOption.delete}}">删除订单</view>
-        <view class="btn active" bindtap="refundOrder" wx:if="{{handleOption.refund}}">申请退款</view>
-        <view class="btn active" bindtap="aftersaleOrder" wx:if="{{handleOption.aftersale}}">申请售后</view>
-      </view>
-    </view>
-  </view>
-
-  <view class="order-goods">
-    <view class="h">
-      <view class="label">商品信息</view>
-      <view class="status">{{orderInfo.orderStatusText}}</view>
-    </view>
-    <view class="goods">
-      <view class="item" wx:for="{{orderGoods}}" wx:key="id">
-        <view class="img">
-          <image src="{{item.picUrl}}"></image>
-        </view>
-        <view class="info">
-          <view class="t">
-            <text class="name">{{item.goodsName}}</text>
-            <text class="number">x{{item.number}}</text>
-          </view>
-          <view class="attr">{{item.specifications}}</view>
-          <view class="price">￥{{item.price}}</view>
-          <view class="btn active" wx:if="{{handleOption.comment && (item.comment == 0)}}">
-            <navigator url="../../commentPost/commentPost?ogid={{item.id}}">去评价</navigator>
-          </view>
-          <view class="btn active" wx:if="{{handleOption.rebuy}}">
-            <navigator url="../../goods/goods?id={{item.goodsId}}">再次购买</navigator>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <view class="order-bottom">
-      <view class="address">
-        <view class="t">
-          <text class="name">{{orderInfo.consignee}}</text>
-          <text class="mobile">{{orderInfo.mobile}}</text>
-        </view>
-        <view class="b">{{orderInfo.address}}</view>
-      </view>
-      <view class="total">
-        <view class="t">
-          <text class="label">商品合计：</text>
-          <text class="txt">￥{{orderInfo.goodsPrice}}元</text>
-        </view>
-        <view class="t">
-          <text class="label">订单运费：</text>
-          <text class="txt">￥{{orderInfo.freightPrice}}元</text>
-        </view>
-        <view class="t">
-          <text class="label">订单优惠：</text>
-          <text class="txt">-￥{{orderInfo.couponPrice}}元</text>
-        </view>
-        <view class="t">
-          <text class="label">订单实付：</text>
-          <text class="txt">￥{{orderInfo.actualPrice}}元</text>
-        </view>        
-      </view>
-    </view>
-  </view>
-
-  <view class="order-express" bindtap="expandDetail" wx:if="{{ orderInfo.expNo }}">
-    <view class="order-express">
-      <view class="title">
-        <view class="t">快递公司：{{orderInfo.expName}}</view>
-        <view class="b">物流单号：{{orderInfo.expNo}}</view>
-      </view>
-      <van-icon class="ti" name="arrow" />      
-    </view>
-    <view class="traces" wx:for="{{expressInfo.Traces}}" wx:key="item" wx:for-item="iitem" wx:if="{{ flag }}">
-      <view class="trace">
-        <view class="acceptStation">{{iitem.AcceptStation}}</view>
-        <view class="acceptTime">{{iitem.AcceptTime}}</view>
-      </view>
-    </view>
-  </view>
-</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/orderDetail/orderDetail.wxss b/litemall-wx/pages/ucenter/orderDetail/orderDetail.wxss
deleted file mode 100644
index 3a29d36f..00000000
--- a/litemall-wx/pages/ucenter/orderDetail/orderDetail.wxss
+++ /dev/null
@@ -1,281 +0,0 @@
-page {
-  height: 100%;
-  width: 100%;
-  background: #f4f4f4;
-}
-
-.order-info {
-  padding-top: 25rpx;
-  background: #fff;
-  height: auto;
-  overflow: hidden;
-}
-
-.order-info .item {
-  height: 80rpx;
-  line-height: 80rpx;
-  display: flex;
-  justify-content: space-between;
-  border-top: 1px solid #f4f4f4;
-  padding: 0 31.25rpx;
-}
-
-.item-c {
-  margin-left: 31.25rpx;
-  border-top: 1px solid #f4f4f4;
-  height: 103rpx;
-  line-height: 103rpx;
-}
-
-.item-c .l {
-  float: left;
-}
-
-.item-c .r {
-  height: 103rpx;
-  float: right;
-  display: flex;
-  align-items: center;
-  padding-right: 16rpx;
-}
-
-.item-c .r .btn {
-  float: right;
-}
-
-.item-c .cost {
-  color: #b4282d;
-}
-
-.item-c .btn {
-  line-height: 66rpx;
-  border-radius: 5rpx;
-  text-align: center;
-  margin: 0 15rpx;
-  padding: 0 20rpx;
-  height: 66rpx;
-}
-
-.item-c .btn.active {
-  background: #b4282d;
-  color: #fff;
-}
-
-.order-goods {
-  margin-top: 20rpx;
-  background: #fff;
-}
-
-.order-goods .h {
-  height: 93.75rpx;
-  line-height: 93.75rpx;
-  margin-left: 31.25rpx;
-  border-bottom: 1px solid #f4f4f4;
-  padding-right: 31.25rpx;
-}
-
-.order-goods .h .label {
-  float: left;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.order-goods .h .status {
-  float: right;
-  font-size: 30rpx;
-  color: #b4282d;
-}
-
-.order-goods .item {
-  display: flex;
-  align-items: center;
-  height: 192rpx;
-  margin-left: 31.25rpx;
-  padding-right: 31.25rpx;
-  border-bottom: 1px solid #f4f4f4;
-}
-
-.order-goods .item:last-child {
-  border-bottom: none;
-}
-
-.order-goods .item .img {
-  height: 145.83rpx;
-  width: 145.83rpx;
-  background: #f4f4f4;
-}
-
-.order-goods .item .img image {
-  height: 145.83rpx;
-  width: 145.83rpx;
-}
-
-.order-goods .item .info {
-  flex: 1;
-  height: 145.83rpx;
-  margin-left: 20rpx;
-}
-
-.order-goods .item .t {
-  margin-top: 8rpx;
-  height: 33rpx;
-  line-height: 33rpx;
-  margin-bottom: 10.5rpx;
-}
-
-.order-goods .item .t .name {
-  display: block;
-  float: left;
-  height: 33rpx;
-  line-height: 33rpx;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.order-goods .item .t .number {
-  display: block;
-  float: right;
-  height: 33rpx;
-  text-align: right;
-  line-height: 33rpx;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.order-goods .item .attr {
-  height: 29rpx;
-  line-height: 29rpx;
-  color: #666;
-  margin-bottom: 25rpx;
-  font-size: 25rpx;
-}
-
-.order-goods .item .price {
-  display: block;
-  float: left;
-  height: 30rpx;
-  line-height: 30rpx;
-  color: #333;
-  font-size: 30rpx;
-}
-
-.order-goods .item .btn {
-  height: 50rpx;
-  line-height: 50rpx;
-  border-radius: 5rpx;
-  text-align: center;
-  display: block;
-  float: right;
-  margin: 0 15rpx;
-  padding: 0 20rpx;
-}
-
-.order-goods .item .btn.active {
-  background: #b4282d;
-  color: #fff;
-}
-
-.order-bottom {
-  margin-top: 20rpx;
-  padding: 0 31.25rpx;
-  height: auto;
-  overflow: hidden;
-  background: #fff;
-}
-
-.order-bottom .address .t {
-  height: 80rpx;
-  line-height: 80rpx;
-  display: flex;
-  justify-content: space-between;
-  border-top: 1px solid #f4f4f4;
-}
-
-.order-bottom .address .b {
-  height: 60rpx;
-  line-height: 60rpx;
-  font-size: 30rpx;
-  border-bottom: 1px solid #f4f4f4;
-  text-align: right;
-}
-
-.order-bottom .total .t {
-  height: 80rpx;
-  line-height: 80rpx;
-  display: flex;
-  justify-content: space-between;
-  border-top: 1px solid #f4f4f4;
-}
-
-.order-bottom .pay-fee {
-  height: 81rpx;
-  line-height: 81rpx;
-}
-
-.order-bottom .pay-fee .label {
-  display: inline-block;
-  width: 140rpx;
-  color: #b4282d;
-}
-
-.order-bottom .pay-fee .txt {
-  display: inline-block;
-  width: 140rpx;
-  color: #b4282d;
-}
-
-.order-express {
-  margin-top: 20rpx;
-  width: 100%;
-  height: 100rpx;
-  background: #fff;
-}
-
-.order-express .title {
-  float: left;
-  margin-bottom: 20rpx;
-  padding: 10rpx;
-}
-
-.order-express .ti {
-  float: right;
-  width: 52rpx;
-  height: 52rpx;
-  margin-right: 16rpx;
-  margin-top: 28rpx;
-}
-
-.order-express .t {
-  font-size: 29rpx;
-  margin-left: 10.25rpx;
-  color: #a78845;
-}
-
-.order-express .b {
-  font-size: 29rpx;
-  margin-left: 10.25rpx;
-  color: #a78845;
-}
-
-.order-express .traces {
-  padding: 17.5rpx;
-  background: #fff;
-  border-bottom: 1rpx solid #f1e6cdcc;
-}
-
-.order-express .trace {
-  padding-bottom: 17.5rpx;
-  padding-top: 17.5rpx;
-  background: #fff;
-}
-
-.order-express .acceptTime {
-  margin-top: 20rpx;
-  margin-right: 40rpx;
-  text-align: right;
-  font-size: 26rpx;
-}
-
-.order-express .acceptStation {
-  font-size: 26rpx;
-}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/setup/setup.js b/litemall-wx/pages/ucenter/setup/setup.js
new file mode 100644
index 00000000..e554edb3
--- /dev/null
+++ b/litemall-wx/pages/ucenter/setup/setup.js
@@ -0,0 +1,111 @@
+// pages/ucenter/setup/setup.js
+var util = require('../../../utils/util.js');
+var api = require('../../../config/api.js');
+var app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    hasLogin:false,
+    info:{}
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.serch()
+  },
+  serch(){
+    let that =this
+    util.request(api.AboutUrl,{
+    }).then(function(res) {
+      if (res.errno === 0) {
+        that.setData({
+          info:res.data
+        })
+      }
+    });
+  },
+  callCustomer(){
+    var that =this
+    wx.makePhoneCall({
+      phoneNumber: that.data.info.phone
+    })
+  },
+  exitLogin: function() {
+    wx.showModal({
+      title: '',
+      confirmColor: '#b4282d',
+      content: '退出登录？',
+      success: function(res) {
+        if (!res.confirm) {
+          return;
+        }
+        util.request(api.AuthLogout, {}, 'POST');
+        app.globalData.hasLogin = false;
+        wx.removeStorageSync('token');
+        wx.removeStorageSync('userInfo');
+        wx.removeStorageSync('status');
+        wx.reLaunch({
+          url: '/pages/index/index'
+        });
+      }
+    })
+
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+    if (app.globalData.hasLogin) {
+      this.setData({
+        hasLogin: true,
+      });
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/setup/setup.json b/litemall-wx/pages/ucenter/setup/setup.json
new file mode 100644
index 00000000..09317df9
--- /dev/null
+++ b/litemall-wx/pages/ucenter/setup/setup.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "账户设置"
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/setup/setup.wxml b/litemall-wx/pages/ucenter/setup/setup.wxml
new file mode 100644
index 00000000..346555d8
--- /dev/null
+++ b/litemall-wx/pages/ucenter/setup/setup.wxml
@@ -0,0 +1,13 @@
+<!--pages/ucenter/setup/setup.wxml-->
+<!-- index.wxml -->
+
+<view class="container">
+  <view class="phonebtn">
+    <view class="btnmain">
+      <van-button  custom-class="btn" icon="phone-o"  bindtap="callCustomer">联系客服</van-button>
+    </view>
+  </view>
+  <view  class="addbtn"  wx:if="{{hasLogin}}">
+    <van-button  custom-class="btn" size="large" bindtap="exitLogin">退出登录</van-button>
+  </view>
+</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/setup/setup.wxss b/litemall-wx/pages/ucenter/setup/setup.wxss
new file mode 100644
index 00000000..025f38cc
--- /dev/null
+++ b/litemall-wx/pages/ucenter/setup/setup.wxss
@@ -0,0 +1,42 @@
+page {
+  height: 100%;
+  width: 100%;
+  background: #fff;
+}
+.phonebtn{
+  
+  padding: 0 20rpx;
+  background-color: #fff;
+  font-size: 36rpx;
+}
+.btnmain{
+  border-radius: 20rpx;
+  height: 70rpx;
+  width: 100%;
+  line-height: 70rpx;
+  padding-top: 60rpx;
+}
+.btnmain .btn{
+  text-align: left;
+  width: 100%;
+  border: 2rpx solid #703EDD;
+}
+.addbtn{
+  position: fixed;
+  bottom: 0rpx;
+  width: 100%;
+  padding: 0 20rpx;
+  height: 110rpx;
+  background-color: #fff;
+}
+.addbtn .btn{
+  position: fixed;
+  bottom: 30rpx;
+  width: calc(100% - 40rpx);
+  height: 80rpx;
+  border-radius: 20rpx;
+  border: 2rpx solid #703EDD;
+}
+.van-button__text{
+  color: #703EDD;
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/visitor/visitor.js b/litemall-wx/pages/ucenter/visitor/visitor.js
new file mode 100644
index 00000000..7348d5c8
--- /dev/null
+++ b/litemall-wx/pages/ucenter/visitor/visitor.js
@@ -0,0 +1,136 @@
+var util = require('../../../utils/util.js');
+var api = require('../../../config/api.js');
+
+var app = getApp();
+
+Page({
+  data: {
+    footprintList: [],
+    page: 1,
+    limit: 10,
+    totalPages: 1
+  },
+  getFootprintList() {
+    wx.showLoading({
+      title: '加载中...',
+    });
+    let that = this;
+    util.request(api.FootprintList, {
+      page: that.data.page,
+      limit: that.data.limit,
+      isMe:'2'
+    }).then(function(res) {
+      if (res.errno === 0) {
+        let f1 = that.data.footprintList;
+        let f2 = res.data.list;
+        for (let i = 0; i < f2.length; i++) {
+          f2[i].addDate = f2[i].addTime.substring(0, 10)
+          let last = f1.length - 1;
+          if (last >= 0 && f1[last][0].addDate === f2[i].addDate) {
+            f1[last].push(f2[i]);
+          } else {
+            let tmp = [];
+            tmp.push(f2[i])
+            f1.push(tmp);
+          }
+        }
+
+        that.setData({
+          footprintList: f1,
+          totalPages: res.data.pages
+        });
+      }
+      wx.hideLoading();
+    });
+  },
+  deleteItem(event) {
+    let that = this;
+    let index = event.currentTarget.dataset.index;
+    let iindex = event.currentTarget.dataset.iindex;
+    let footprintId = this.data.footprintList[index][iindex].id;
+    let goodsId = this.data.footprintList[index][iindex].goodsId;
+    var touchTime = that.data.touchEnd - that.data.touchStart;
+    console.log(touchTime);
+    //如果按下时间大于350为长按  
+    if (touchTime > 350) {
+      wx.showModal({
+        title: '',
+        content: '要删除所选足迹？',
+        success: function(res) {
+          if (res.confirm) {
+            util.request(api.FootprintDelete, {
+              id: footprintId
+            }, 'POST').then(function(res) {
+              if (res.errno === 0) {
+                wx.showToast({
+                  title: '删除成功',
+                  icon: 'success',
+                  duration: 2000
+                });
+                that.data.footprintList[index].splice(iindex, 1)
+                if (that.data.footprintList[index].length == 0) {
+                  that.data.footprintList.splice(index, 1)
+                }
+                that.setData({
+                  footprintList: that.data.footprintList
+                });
+              }
+            });
+          }
+        }
+      });
+    } else {
+      wx.navigateTo({
+        url: "/pages/information/information?id="+goodsId
+      });
+    }
+
+  },
+  onLoad: function(options) {
+    this.getFootprintList();
+  },
+  onReachBottom() {
+    if (this.data.totalPages > this.data.page) {
+      this.setData({
+        page: this.data.page + 1
+      });
+      this.getFootprintList();
+    } else {
+      wx.showToast({
+        title: '没有更多用户足迹了',
+        icon: 'none',
+        duration: 2000
+      });
+      return false;
+    }
+  },
+  onReady: function() {
+
+  },
+  onShow: function() {
+
+  },
+  onHide: function() {
+    // 页面隐藏
+
+  },
+  onUnload: function() {
+    // 页面关闭
+  },
+  //按下事件开始  
+  touchStart: function(e) {
+    let that = this;
+    that.setData({
+      touchStart: e.timeStamp
+    })
+    console.log(e.timeStamp + '- touchStart')
+  },
+  //按下事件结束  
+  touchEnd: function(e) {
+    let that = this;
+    that.setData({
+      touchEnd: e.timeStamp
+    })
+    console.log(e.timeStamp + '- touchEnd')
+  },
+})
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/visitor/visitor.json b/litemall-wx/pages/ucenter/visitor/visitor.json
new file mode 100644
index 00000000..a1b2306c
--- /dev/null
+++ b/litemall-wx/pages/ucenter/visitor/visitor.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "我的访客"
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/visitor/visitor.wxml b/litemall-wx/pages/ucenter/visitor/visitor.wxml
new file mode 100644
index 00000000..7f1e5932
--- /dev/null
+++ b/litemall-wx/pages/ucenter/visitor/visitor.wxml
@@ -0,0 +1,37 @@
+<view class="container">
+  <view class="no-footprint" wx:if="{{footprintList.length <= 0}}">
+    <view class="c">
+      <text>没有浏览足迹</text>
+    </view>
+  </view>
+  <view class="footprint" wx:if="{{footprintList.length > 0}}">
+    <view class="day-item" wx:for="{{footprintList}}" wx:key="*this" wx:for-index="index">
+      <view class="day-hd" wx:if="{{item.length > 0}}">{{item[0].addDate}}</view>
+      <view class="day-list" wx:if="{{item.length > 0}}">
+        <view class="item" data-index="{{index}}" data-iindex="{{iindex}}" bindtouchstart="touchStart" bindtouchend="touchEnd" bindtap="deleteItem" wx:for="{{item}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="id">
+          <view class="info">
+            <view class="both">
+              <view>{{iitem.goodsInfo.name}}</view>
+              <!-- <view>{{iitem.name}}</view> -->
+            </view>
+            <view class="company">{{iitem.goodsInfo.city}}</view>
+            <view class="both">
+              <view>
+                <view class="avgboth">
+                  <!-- <image class="avgimg" src="{{iitem.goodsInfo.picUrl}}" mode=""/> -->
+                  <view class="contact">
+                  <!-- {{iitem.goodsInfo.city}} -->
+                    <text class="text" wx:for="{{iitem.goodsInfo.goodCategory}}" wx:key="*this" wx:for-index="index">{{item}}</text>
+                  </view>
+                </view>
+                <view>
+                </view>
+              </view>
+              <!-- <view class="time">{{iitem.addTime}}</view> -->
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/visitor/visitor.wxss b/litemall-wx/pages/ucenter/visitor/visitor.wxss
new file mode 100644
index 00000000..6f63dd99
--- /dev/null
+++ b/litemall-wx/pages/ucenter/visitor/visitor.wxss
@@ -0,0 +1,153 @@
+/* pages/ucenter/visitor/visitor.wxss */
+page {
+  background: #f4f4f4;
+  min-height: 100%;
+}
+
+.container {
+  background: #f4f4f4;
+  min-height: 100%;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+
+.no-footprint {
+  width: 100%;
+  height: auto;
+  margin: 0 auto;
+}
+
+.no-footprint .c {
+  width: 100%;
+  height: auto;
+  margin-top: 400rpx;
+}
+
+.no-footprint .c text {
+  margin: 0 auto;
+  display: block;
+  width: 258rpx;
+  height: 29rpx;
+  line-height: 29rpx;
+  text-align: center;
+  font-size: 29rpx;
+  color: #999;
+}
+
+.footprint {
+  height: auto;
+  overflow: hidden;
+  width: 100%;
+}
+
+.day-item {
+  height: auto;
+  overflow: hidden;
+  width: 100%;
+  margin-bottom: 20rpx;
+  padding: 0 20rpx;
+}
+
+.day-hd {
+  height: 94rpx;
+  width: 100%;
+  line-height: 94rpx;
+  padding-left: 30rpx;
+  color: #333;
+  font-size: 30rpx;
+  font-weight: 600;
+}
+
+.day-list {
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+  padding-left: 0 30rpx;
+}
+
+.item {
+  height: 212rpx;
+  width: 720rpx;
+  background: #fff;
+  border-radius: 20rpx;
+}
+
+.item:not(:first-child) {
+  border-bottom: 1px solid #fff;
+  margin-top: 20rpx;
+}
+
+.item .img {
+  float: left;
+  width: 150rpx;
+  height: 150rpx;
+}
+
+.item .info {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  padding-left: 20rpx;
+}
+
+.item .info .name {
+  font-size: 28rpx;
+  color: #333;
+  line-height: 40rpx;
+}
+
+.item .info .subtitle {
+  margin-top: 8rpx;
+  font-size: 24rpx;
+  color: #888;
+  line-height: 40rpx;
+}
+
+.item .info .price {
+  margin-top: 8rpx;
+  font-size: 28rpx;
+  color: #333;
+  line-height: 40rpx;
+}
+.item .info .both{
+  display: flex;
+  justify-content: space-between;
+  padding: 0 30rpx;
+  font-size: 36rpx;
+  padding-top: 30rpx;
+  font-weight: 600;
+}
+.item .info .both .avgimg{
+  width: 50rpx;
+  height: 50rpx;
+  border-radius: 50%;
+}
+.item .info .both  .avgboth{
+  
+  display: flex;
+  line-height: 30rpx;
+}
+.item .info .both  .avgboth .contact{
+  /* padding-left: 20rpx; */
+  font-weight: 500;
+  font-size: 26rpx;
+}
+.item .info .both  .avgboth .contact .text{
+  font-size: 26rpx;
+}
+.item .info .both .time{
+  font-weight: 500;
+  font-size: 26rpx;
+  line-height: 46rpx;
+}
+.item .info .company{
+  margin-top: 10rpx;
+  margin-bottom: 10rpx;
+  font-size: 26rpx;
+  padding-left: 30rpx;
+}
+.item .info .sexlog{
+  width: 40rpx;
+  height: 40rpx;
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/zbFootprint/zbFootprint.js b/litemall-wx/pages/ucenter/zbFootprint/zbFootprint.js
new file mode 100644
index 00000000..421b5e0e
--- /dev/null
+++ b/litemall-wx/pages/ucenter/zbFootprint/zbFootprint.js
@@ -0,0 +1,136 @@
+var util = require('../../../utils/util.js');
+var api = require('../../../config/api.js');
+
+var app = getApp();
+
+Page({
+  data: {
+    footprintList: [],
+    page: 1,
+    limit: 10,
+    totalPages: 1
+  },
+  getFootprintList() {
+    wx.showLoading({
+      title: '加载中...',
+    });
+    let that = this;
+    util.request(api.FootprintList, {
+      page: that.data.page,
+      limit: that.data.limit,
+      isMe:'1'
+    }).then(function(res) {
+      if (res.errno === 0) {
+        let f1 = that.data.footprintList;
+        let f2 = res.data.list;
+        for (let i = 0; i < f2.length; i++) {
+          f2[i].addDate = f2[i].addTime.substring(0, 10)
+          let last = f1.length - 1;
+          if (last >= 0 && f1[last][0].addDate === f2[i].addDate) {
+            f1[last].push(f2[i]);
+          } else {
+            let tmp = [];
+            tmp.push(f2[i])
+            f1.push(tmp);
+          }
+        }
+
+        that.setData({
+          footprintList: f1,
+          totalPages: res.data.pages
+        });
+      }
+      wx.hideLoading();
+    });
+  },
+  deleteItem(event) {
+    let that = this;
+    let index = event.currentTarget.dataset.index;
+    let iindex = event.currentTarget.dataset.iindex;
+    let footprintId = this.data.footprintList[index][iindex].id;
+    let goodsId = this.data.footprintList[index][iindex].goodsId;
+    var touchTime = that.data.touchEnd - that.data.touchStart;
+    console.log(touchTime);
+    //如果按下时间大于350为长按  
+    if (touchTime > 350) {
+      wx.showModal({
+        title: '',
+        content: '要删除所选足迹？',
+        success: function(res) {
+          if (res.confirm) {
+            util.request(api.FootprintDelete, {
+              id: footprintId
+            }, 'POST').then(function(res) {
+              if (res.errno === 0) {
+                wx.showToast({
+                  title: '删除成功',
+                  icon: 'success',
+                  duration: 2000
+                });
+                that.data.footprintList[index].splice(iindex, 1)
+                if (that.data.footprintList[index].length == 0) {
+                  that.data.footprintList.splice(index, 1)
+                }
+                that.setData({
+                  footprintList: that.data.footprintList
+                });
+              }
+            });
+          }
+        }
+      });
+    } else {
+        wx.navigateTo({
+          url: "/pages/details/details?id="+goodsId
+        });
+    }
+
+  },
+  onLoad: function(options) {
+    this.getFootprintList();
+  },
+  onReachBottom() {
+    if (this.data.totalPages > this.data.page) {
+      this.setData({
+        page: this.data.page + 1
+      });
+      this.getFootprintList();
+    } else {
+      wx.showToast({
+        title: '没有更多用户足迹了',
+        icon: 'none',
+        duration: 2000
+      });
+      return false;
+    }
+  },
+  onReady: function() {
+
+  },
+  onShow: function() {
+
+  },
+  onHide: function() {
+    // 页面隐藏
+
+  },
+  onUnload: function() {
+    // 页面关闭
+  },
+  //按下事件开始  
+  touchStart: function(e) {
+    let that = this;
+    that.setData({
+      touchStart: e.timeStamp
+    })
+    console.log(e.timeStamp + '- touchStart')
+  },
+  //按下事件结束  
+  touchEnd: function(e) {
+    let that = this;
+    that.setData({
+      touchEnd: e.timeStamp
+    })
+    console.log(e.timeStamp + '- touchEnd')
+  },
+})
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/zbFootprint/zbFootprint.json b/litemall-wx/pages/ucenter/zbFootprint/zbFootprint.json
new file mode 100644
index 00000000..947fa332
--- /dev/null
+++ b/litemall-wx/pages/ucenter/zbFootprint/zbFootprint.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "我的足迹"
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/zbFootprint/zbFootprint.wxml b/litemall-wx/pages/ucenter/zbFootprint/zbFootprint.wxml
new file mode 100644
index 00000000..603033f0
--- /dev/null
+++ b/litemall-wx/pages/ucenter/zbFootprint/zbFootprint.wxml
@@ -0,0 +1,42 @@
+<wxs module="m1">
+  var getinclude = function (name) {
+    return name.substring(0, 1) + "✱✱"
+  }
+  module.exports.getinclude = getinclude;
+</wxs>
+<view class="container">
+  <view class="no-footprint" wx:if="{{footprintList.length <= 0}}">
+    <view class="c">
+      <text>没有浏览足迹</text>
+    </view>
+  </view>
+  <view class="footprint" wx:if="{{footprintList.length > 0}}">
+    <view class="day-item" wx:for="{{footprintList}}" wx:key="*this" wx:for-index="index">
+      <view class="day-hd" wx:if="{{item.length > 0}}">{{item[0].addDate}}</view>
+      <view class="day-list" wx:if="{{item.length > 0}}">
+        <view class="item" data-index="{{index}}" data-iindex="{{iindex}}" bindtouchstart="touchStart" bindtouchend="touchEnd" bindtap="deleteItem" wx:for="{{item}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="id">
+          <view class="info">
+            <view class="both">
+              <view>{{iitem.goodsInfo.name}}</view>
+              <!-- <view>{{iitem.goodsInfo.name}}</view> -->
+            </view>
+            <view class="company">{{iitem.topicInfo.title}}</view>
+            <view class="both">
+              <view>
+                <view class="avgboth">
+                  <image class="avgimg" src="{{iitem.topicInfo.picUrl}}" mode=""/>
+                  <view class="contact">
+                  {{ m1.getinclude(iitem.topicInfo.contact)}}  {{iitem.topicInfo.contactPost}} 
+                  </view>
+                </view>
+                <view>
+                </view>
+              </view>
+              <!-- <view class="time">{{iitem.addTime}}</view> -->
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/zbFootprint/zbFootprint.wxss b/litemall-wx/pages/ucenter/zbFootprint/zbFootprint.wxss
new file mode 100644
index 00000000..5a9e71b1
--- /dev/null
+++ b/litemall-wx/pages/ucenter/zbFootprint/zbFootprint.wxss
@@ -0,0 +1,149 @@
+/* pages/ucenter/zbFootprint/zbFootprint.wxss */page {
+  background: #f4f4f4;
+  min-height: 100%;
+}
+
+.container {
+  background: #f4f4f4;
+  min-height: 100%;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+
+.no-footprint {
+  width: 100%;
+  height: auto;
+  margin: 0 auto;
+}
+
+.no-footprint .c {
+  width: 100%;
+  height: auto;
+  margin-top: 400rpx;
+}
+
+.no-footprint .c text {
+  margin: 0 auto;
+  display: block;
+  width: 258rpx;
+  height: 29rpx;
+  line-height: 29rpx;
+  text-align: center;
+  font-size: 29rpx;
+  color: #999;
+}
+
+.footprint {
+  height: auto;
+  overflow: hidden;
+  width: 100%;
+}
+
+.day-item {
+  height: auto;
+  overflow: hidden;
+  width: 100%;
+  margin-bottom: 20rpx;
+  padding: 0 20rpx;
+}
+
+.day-hd {
+  height: 94rpx;
+  width: 100%;
+  line-height: 94rpx;
+  padding-left: 30rpx;
+  color: #333;
+  font-size: 30rpx;
+  font-weight: 600;
+}
+
+.day-list {
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+  padding-left: 0 30rpx;
+}
+
+.item {
+  height: 212rpx;
+  width: 720rpx;
+  background: #fff;
+  border-radius: 20rpx;
+}
+
+.item:not(:first-child) {
+  border-bottom: 1px solid #fff;
+  margin-top: 20rpx;
+}
+
+.item .img {
+  float: left;
+  width: 150rpx;
+  height: 150rpx;
+}
+
+.item .info {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  padding-left: 20rpx;
+}
+
+.item .info .name {
+  font-size: 28rpx;
+  color: #333;
+  line-height: 40rpx;
+}
+
+.item .info .subtitle {
+  margin-top: 8rpx;
+  font-size: 24rpx;
+  color: #888;
+  line-height: 40rpx;
+}
+
+.item .info .price {
+  margin-top: 8rpx;
+  font-size: 28rpx;
+  color: #333;
+  line-height: 40rpx;
+}
+.item .info .both{
+  display: flex;
+  justify-content: space-between;
+  padding: 0 30rpx;
+  font-size: 36rpx;
+  padding-top: 30rpx;
+  font-weight: 600;
+}
+.item .info .both .avgimg{
+  width: 50rpx;
+  height: 50rpx;
+  border-radius: 50%;
+}
+.item .info .both  .avgboth{
+  
+  display: flex;
+  line-height: 50rpx;
+}
+.item .info .both  .avgboth .contact{
+  /* padding-left: 20rpx; */
+  font-weight: 500;
+  font-size: 26rpx;
+}
+.item .info .both .time{
+  font-weight: 500;
+  font-size: 26rpx;
+  line-height: 46rpx;
+}
+.item .info .company{
+  margin-top: 10rpx;
+  margin-bottom: 10rpx;
+  font-size: 26rpx;
+  padding-left: 30rpx;
+}
+.item .info .sexlog{
+  width: 40rpx;
+  height: 40rpx;
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/zbVisitor/zbVisitor.js b/litemall-wx/pages/ucenter/zbVisitor/zbVisitor.js
new file mode 100644
index 00000000..43160ae3
--- /dev/null
+++ b/litemall-wx/pages/ucenter/zbVisitor/zbVisitor.js
@@ -0,0 +1,137 @@
+var util = require('../../../utils/util.js');
+var api = require('../../../config/api.js');
+
+var app = getApp();
+
+Page({
+  data: {
+    footprintList: [],
+    page: 1,
+    limit: 10,
+    totalPages: 1
+  },
+  getFootprintList() {
+    wx.showLoading({
+      title: '加载中...',
+    });
+    let that = this;
+    util.request(api.FootprintList, {
+      page: that.data.page,
+      limit: that.data.limit,
+      isMe:'2'
+    }).then(function(res) {
+      if (res.errno === 0) {
+        let f1 = that.data.footprintList;
+        let f2 = res.data.list;
+        for (let i = 0; i < f2.length; i++) {
+          f2[i].addDate = f2[i].addTime.substring(0, 10)
+          let last = f1.length - 1;
+          if (last >= 0 && f1[last][0].addDate === f2[i].addDate) {
+            f1[last].push(f2[i]);
+          } else {
+            let tmp = [];
+            tmp.push(f2[i])
+            f1.push(tmp);
+          }
+        }
+
+        that.setData({
+          footprintList: f1,
+          totalPages: res.data.pages
+        });
+      }
+      wx.hideLoading();
+    });
+  },
+  deleteItem(event) {
+    let that = this;
+    let index = event.currentTarget.dataset.index;
+    let iindex = event.currentTarget.dataset.iindex;
+    let footprintId = this.data.footprintList[index][iindex].id;
+    let goodsId = this.data.footprintList[index][iindex].goodsId;
+    let topicInfoid = this.data.footprintList[index][iindex].topicInfo.id;
+    var touchTime = that.data.touchEnd - that.data.touchStart;
+    console.log(touchTime);
+    //如果按下时间大于350为长按  
+    if (touchTime > 350) {
+      wx.showModal({
+        title: '',
+        content: '要删除所选足迹？',
+        success: function(res) {
+          if (res.confirm) {
+            util.request(api.FootprintDelete, {
+              id: footprintId
+            }, 'POST').then(function(res) {
+              if (res.errno === 0) {
+                wx.showToast({
+                  title: '删除成功',
+                  icon: 'success',
+                  duration: 2000
+                });
+                that.data.footprintList[index].splice(iindex, 1)
+                if (that.data.footprintList[index].length == 0) {
+                  that.data.footprintList.splice(index, 1)
+                }
+                that.setData({
+                  footprintList: that.data.footprintList
+                });
+              }
+            });
+          }
+        }
+      });
+    } else {
+      wx.navigateTo({
+        url: "/pages/comDetails/comDetails?id="+topicInfoid
+      });
+    }
+
+  },
+  onLoad: function(options) {
+    this.getFootprintList();
+  },
+  onReachBottom() {
+    if (this.data.totalPages > this.data.page) {
+      this.setData({
+        page: this.data.page + 1
+      });
+      this.getFootprintList();
+    } else {
+      wx.showToast({
+        title: '没有更多用户足迹了',
+        icon: 'none',
+        duration: 2000
+      });
+      return false;
+    }
+  },
+  onReady: function() {
+
+  },
+  onShow: function() {
+
+  },
+  onHide: function() {
+    // 页面隐藏
+
+  },
+  onUnload: function() {
+    // 页面关闭
+  },
+  //按下事件开始  
+  touchStart: function(e) {
+    let that = this;
+    that.setData({
+      touchStart: e.timeStamp
+    })
+    console.log(e.timeStamp + '- touchStart')
+  },
+  //按下事件结束  
+  touchEnd: function(e) {
+    let that = this;
+    that.setData({
+      touchEnd: e.timeStamp
+    })
+    console.log(e.timeStamp + '- touchEnd')
+  },
+})
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/zbVisitor/zbVisitor.json b/litemall-wx/pages/ucenter/zbVisitor/zbVisitor.json
new file mode 100644
index 00000000..a1b2306c
--- /dev/null
+++ b/litemall-wx/pages/ucenter/zbVisitor/zbVisitor.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "我的访客"
+}
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/zbVisitor/zbVisitor.wxml b/litemall-wx/pages/ucenter/zbVisitor/zbVisitor.wxml
new file mode 100644
index 00000000..c5fedf9b
--- /dev/null
+++ b/litemall-wx/pages/ucenter/zbVisitor/zbVisitor.wxml
@@ -0,0 +1,41 @@
+<wxs module="m1">
+  var getinclude = function (name) {
+    return name.substring(0, 1) + "✱✱"
+  }
+  module.exports.getinclude = getinclude;
+</wxs>
+<view class="container">
+  <view class="no-footprint" wx:if="{{footprintList.length <= 0}}">
+    <view class="c">
+      <text>没有浏览足迹</text>
+    </view>
+  </view>
+  <view class="footprint" wx:if="{{footprintList.length > 0}}">
+    <view class="day-item" wx:for="{{footprintList}}" wx:key="*this" wx:for-index="index">
+      <view class="day-hd" wx:if="{{item.length > 0}}">{{item[0].addDate}}</view>
+      <view class="day-list" wx:if="{{item.length > 0}}">
+        <view class="item" data-index="{{index}}" data-iindex="{{iindex}}" bindtouchstart="touchStart" bindtouchend="touchEnd" bindtap="deleteItem" wx:for="{{item}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="id">
+          <view class="info">
+            <view class="both">
+              <view>{{iitem.topicInfo.title}}</view>
+            </view>
+            <view class="company">{{iitem.topicInfo.address}}</view>
+            <view class="both">
+              <view>
+                <view class="avgboth">
+                  <image class="avgimg" src="{{iitem.topicInfo.picUrl}}" mode=""/>
+                  <view class="contact">
+                  {{ m1.getinclude(iitem.topicInfo.contact)}}  {{iitem.topicInfo.contactPost}} 
+                  </view>
+                </view>
+                <view>
+                </view>
+              </view>
+              <!-- <view class="time">{{iitem.addTime}}</view> -->
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/zbVisitor/zbVisitor.wxss b/litemall-wx/pages/ucenter/zbVisitor/zbVisitor.wxss
new file mode 100644
index 00000000..1c5564c0
--- /dev/null
+++ b/litemall-wx/pages/ucenter/zbVisitor/zbVisitor.wxss
@@ -0,0 +1,150 @@
+/* pages/ucenter/visitor/visitor.wxss */
+page {
+  background: #f4f4f4;
+  min-height: 100%;
+}
+
+.container {
+  background: #f4f4f4;
+  min-height: 100%;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+
+.no-footprint {
+  width: 100%;
+  height: auto;
+  margin: 0 auto;
+}
+
+.no-footprint .c {
+  width: 100%;
+  height: auto;
+  margin-top: 400rpx;
+}
+
+.no-footprint .c text {
+  margin: 0 auto;
+  display: block;
+  width: 258rpx;
+  height: 29rpx;
+  line-height: 29rpx;
+  text-align: center;
+  font-size: 29rpx;
+  color: #999;
+}
+
+.footprint {
+  height: auto;
+  overflow: hidden;
+  width: 100%;
+}
+
+.day-item {
+  height: auto;
+  overflow: hidden;
+  width: 100%;
+  margin-bottom: 20rpx;
+  padding: 0 20rpx;
+}
+
+.day-hd {
+  height: 94rpx;
+  width: 100%;
+  line-height: 94rpx;
+  padding-left: 30rpx;
+  color: #333;
+  font-size: 30rpx;
+  font-weight: 600;
+}
+
+.day-list {
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+  padding-left: 0 30rpx;
+}
+
+.item {
+  height: 212rpx;
+  width: 720rpx;
+  background: #fff;
+  border-radius: 20rpx;
+}
+
+.item:not(:first-child) {
+  border-bottom: 1px solid #fff;
+  margin-top: 20rpx;
+}
+
+.item .img {
+  float: left;
+  width: 150rpx;
+  height: 150rpx;
+}
+
+.item .info {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  padding-left: 20rpx;
+}
+
+.item .info .name {
+  font-size: 28rpx;
+  color: #333;
+  line-height: 40rpx;
+}
+
+.item .info .subtitle {
+  margin-top: 8rpx;
+  font-size: 24rpx;
+  color: #888;
+  line-height: 40rpx;
+}
+
+.item .info .price {
+  margin-top: 8rpx;
+  font-size: 28rpx;
+  color: #333;
+  line-height: 40rpx;
+}
+.item .info .both{
+  display: flex;
+  justify-content: space-between;
+  padding: 0 30rpx;
+  font-size: 36rpx;
+  padding-top: 30rpx;
+  font-weight: 600;
+}
+.item .info .both .avgimg{
+  width: 50rpx;
+  height: 50rpx;
+  border-radius: 50%;
+}
+.item .info .both  .avgboth{
+  
+  display: flex;
+  line-height: 30rpx;
+}
+.item .info .both  .avgboth .contact{
+  padding-left: 20rpx;
+  font-weight: 500;
+  font-size: 26rpx;
+}
+.item .info .both .time{
+  font-weight: 500;
+  font-size: 26rpx;
+  line-height: 46rpx;
+}
+.item .info .company{
+  margin-top: 10rpx;
+  margin-bottom: 10rpx;
+  font-size: 26rpx;
+  padding-left: 30rpx;
+}
+.item .info .sexlog{
+  width: 40rpx;
+  height: 40rpx;
+}
\ No newline at end of file
diff --git a/litemall-wx/project.config.json b/litemall-wx/project.config.json
index 62140918..5eaaad29 100644
--- a/litemall-wx/project.config.json
+++ b/litemall-wx/project.config.json
@@ -1,331 +1,339 @@
 {
-    "description": "项目配置文件。",
-    "setting": {
-        "urlCheck": false,
-        "es6": true,
-        "enhance": true,
-        "postcss": true,
-        "preloadBackgroundData": false,
-        "minified": true,
-        "newFeature": true,
-        "coverView": true,
-        "nodeModules": true,
-        "autoAudits": false,
-        "showShadowRootInWxmlPanel": true,
-        "scopeDataCheck": false,
-        "uglifyFileName": true,
-        "checkInvalidKey": true,
-        "checkSiteMap": true,
-        "uploadWithSourceMap": true,
-        "compileHotReLoad": false,
-        "lazyloadPlaceholderEnable": false,
-        "useMultiFrameRuntime": true,
-        "useApiHook": true,
-        "useApiHostProcess": true,
-        "babelSetting": {
-            "ignore": [],
-            "disablePlugins": [],
-            "outputPath": ""
-        },
-        "enableEngineNative": false,
-        "useIsolateContext": true,
-        "userConfirmedBundleSwitch": false,
-        "packNpmManually": false,
-        "packNpmRelationList": [],
-        "minifyWXSS": true,
-        "disableUseStrict": false,
-        "minifyWXML": true,
-        "showES6CompileOption": false,
-        "useCompilerPlugins": false
+  "description": "项目配置文件。",
+  "setting": {
+    "urlCheck": false,
+    "es6": true,
+    "enhance": true,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": true,
+    "coverView": true,
+    "nodeModules": true,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": true,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
     },
-    "compileType": "miniprogram",
-    "libVersion": "2.4.0",
-    "appid": "wxa0e9fb31b14297e2",
-    "projectname": "litemall-wx",
-    "simulatorType": "wechat",
-    "simulatorPluginLibVersion": {},
-    "condition": {
-        "search": {
-            "list": []
-        },
-        "conversation": {
-            "list": []
-        },
-        "plugin": {
-            "list": []
-        },
-        "game": {
-            "list": []
-        },
-        "gamePlugin": {
-            "list": []
-        },
-        "miniprogram": {
-            "list": [
-                {
-                    "id": -1,
-                    "name": "首页",
-                    "pathName": "pages/index/index",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "专题",
-                    "pathName": "pages/topic/topic",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "专题详情",
-                    "pathName": "pages/topicDetail/topicDetail",
-                    "query": "id=314"
-                },
-                {
-                    "id": -1,
-                    "name": "专题评论列表",
-                    "pathName": "pages/topicComment/topicComment",
-                    "query": "valueId=314&type=1"
-                },
-                {
-                    "id": -1,
-                    "name": "专题评论添加",
-                    "pathName": "pages/topicCommentPost/topicCommentPost",
-                    "query": "valueId=314&type=1"
-                },
-                {
-                    "id": -1,
-                    "name": "品牌",
-                    "pathName": "pages/brand/brand",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "品牌详情",
-                    "pathName": "pages/brandDetail/brandDetail",
-                    "query": "id=1001000"
-                },
-                {
-                    "id": -1,
-                    "name": "人气推荐",
-                    "pathName": "pages/hotGoods/hotGoods",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "新品首发",
-                    "pathName": "pages/newGoods/newGoods",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "分类",
-                    "pathName": "pages/catalog/catalog",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "分类详情",
-                    "pathName": "pages/category/category",
-                    "query": "id=1008002"
-                },
-                {
-                    "id": -1,
-                    "name": "查找",
-                    "pathName": "pages/search/search",
-                    "query": ""
-                },
-                {
-                    "id": 12,
-                    "name": "商品",
-                    "pathName": "pages/goods/goods",
-                    "query": "id=1181003"
-                },
-                {
-                    "id": -1,
-                    "name": "商品评论列表",
-                    "pathName": "pages/comment/comment",
-                    "query": "valueId=1181000&type=0"
-                },
-                {
-                    "id": -1,
-                    "name": "购物车",
-                    "pathName": "pages/cart/cart",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "下单",
-                    "pathName": "pages/checkout/checkout",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "支付结果",
-                    "pathName": "pages/payResult/payResult",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "我的",
-                    "pathName": "pages/ucenter/index/index",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "我的订单列表",
-                    "pathName": "pages/ucenter/order/order",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "我的订单详情",
-                    "pathName": "pages/ucenter/orderDetail/orderDetail",
-                    "query": "id=1"
-                },
-                {
-                    "id": 22,
-                    "name": "待评价的订单详情",
-                    "pathName": "pages/ucenter/orderDetail/orderDetail",
-                    "query": "id=1"
-                },
-                {
-                    "id": -1,
-                    "name": "购买商品评价",
-                    "pathName": "pages/commentPost/commentPost",
-                    "query": "orderId=2&type=0&valueId=1116011"
-                },
-                {
-                    "id": 22,
-                    "name": "我的优惠券",
-                    "pathName": "pages/ucenter/couponList/couponList",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "我的收藏",
-                    "pathName": "pages/ucenter/collect/collect",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "我的足迹",
-                    "pathName": "pages/ucenter/footprint/footprint",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "我的地址",
-                    "pathName": "pages/ucenter/address/address",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "我的地址添加",
-                    "pathName": "pages/ucenter/addressAdd/addressAdd",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "登录",
-                    "pathName": "pages/auth/login/login",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "账号登录",
-                    "pathName": "pages/auth/accountLogin/accountLogin",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "注册",
-                    "pathName": "pages/auth/register/register",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "找回密码",
-                    "pathName": "pages/auth/reset/reset",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "关于",
-                    "pathName": "pages/about/about",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "测试更新",
-                    "pathName": "pages/index/index",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "意见反馈",
-                    "pathName": "pages/ucenter/feedback/feedback",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "团购专区",
-                    "pathName": "pages/groupon/grouponList/grouponList",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "选择优惠券",
-                    "pathName": "pages/ucenter/couponSelect/couponSelect",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "我的优惠券列表",
-                    "pathName": "pages/ucenter/couponList/couponList",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "优惠券列表",
-                    "pathName": "pages/coupon/coupon",
-                    "query": ""
-                },
-                {
-                    "id": -1,
-                    "name": "帮助中心",
-                    "pathName": "pages/help/help",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "id": -1,
-                    "name": "我的团购",
-                    "pathName": "pages/groupon/myGroupon/myGroupon",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "id": -1,
-                    "name": "申请售后",
-                    "pathName": "pages/ucenter/aftersale/aftersale",
-                    "query": "id=2",
-                    "scene": null
-                },
-                {
-                    "id": -1,
-                    "name": "售后列表",
-                    "pathName": "pages/ucenter/aftersaleList/aftersaleList",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "id": -1,
-                    "name": "售后详情",
-                    "pathName": "pages/ucenter/aftersaleDetail/aftersaleDetail",
-                    "query": "id=1",
-                    "scene": null
-                }
-            ]
+    "enableEngineNative": false,
+    "useIsolateContext": false,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "disableUseStrict": false,
+    "minifyWXML": true,
+    "showES6CompileOption": false,
+    "useCompilerPlugins": false
+  },
+  "compileType": "miniprogram",
+  "libVersion": "3.3.4",
+  "appid": "wxa0e9fb31b14297e2",
+  "projectname": "litemall-wx",
+  "simulatorType": "wechat",
+  "simulatorPluginLibVersion": {},
+  "condition": {
+    "search": {
+      "list": []
+    },
+    "conversation": {
+      "list": []
+    },
+    "plugin": {
+      "list": []
+    },
+    "game": {
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": [
+        {
+          "id": -1,
+          "name": "首页",
+          "pathName": "pages/index/index",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "专题",
+          "pathName": "pages/topic/topic",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "专题详情",
+          "pathName": "pages/topicDetail/topicDetail",
+          "query": "id=314"
+        },
+        {
+          "id": -1,
+          "name": "专题评论列表",
+          "pathName": "pages/topicComment/topicComment",
+          "query": "valueId=314&type=1"
+        },
+        {
+          "id": -1,
+          "name": "专题评论添加",
+          "pathName": "pages/topicCommentPost/topicCommentPost",
+          "query": "valueId=314&type=1"
+        },
+        {
+          "id": -1,
+          "name": "品牌",
+          "pathName": "pages/brand/brand",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "品牌详情",
+          "pathName": "pages/brandDetail/brandDetail",
+          "query": "id=1001000"
+        },
+        {
+          "id": -1,
+          "name": "人气推荐",
+          "pathName": "pages/hotGoods/hotGoods",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "新品首发",
+          "pathName": "pages/newGoods/newGoods",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "分类",
+          "pathName": "pages/catalog/catalog",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "分类详情",
+          "pathName": "pages/category/category",
+          "query": "id=1008002"
+        },
+        {
+          "id": -1,
+          "name": "查找",
+          "pathName": "pages/search/search",
+          "query": ""
+        },
+        {
+          "id": 12,
+          "name": "商品",
+          "pathName": "pages/goods/goods",
+          "query": "id=1181003"
+        },
+        {
+          "id": -1,
+          "name": "商品评论列表",
+          "pathName": "pages/comment/comment",
+          "query": "valueId=1181000&type=0"
+        },
+        {
+          "id": -1,
+          "name": "购物车",
+          "pathName": "pages/cart/cart",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "下单",
+          "pathName": "pages/checkout/checkout",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "支付结果",
+          "pathName": "pages/payResult/payResult",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "我的",
+          "pathName": "pages/ucenter/index/index",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "我的订单列表",
+          "pathName": "pages/ucenter/order/order",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "我的订单详情",
+          "pathName": "pages/ucenter/orderDetail/orderDetail",
+          "query": "id=1"
+        },
+        {
+          "id": 22,
+          "name": "待评价的订单详情",
+          "pathName": "pages/ucenter/orderDetail/orderDetail",
+          "query": "id=1"
+        },
+        {
+          "id": -1,
+          "name": "购买商品评价",
+          "pathName": "pages/commentPost/commentPost",
+          "query": "orderId=2&type=0&valueId=1116011"
+        },
+        {
+          "id": 22,
+          "name": "我的优惠券",
+          "pathName": "pages/ucenter/couponList/couponList",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "我的收藏",
+          "pathName": "pages/ucenter/collect/collect",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "我的足迹",
+          "pathName": "pages/ucenter/footprint/footprint",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "我的地址",
+          "pathName": "pages/ucenter/address/address",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "我的地址添加",
+          "pathName": "pages/ucenter/addressAdd/addressAdd",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "登录",
+          "pathName": "pages/auth/login/login",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "账号登录",
+          "pathName": "pages/auth/accountLogin/accountLogin",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "注册",
+          "pathName": "pages/auth/register/register",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "找回密码",
+          "pathName": "pages/auth/reset/reset",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "关于",
+          "pathName": "pages/about/about",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "测试更新",
+          "pathName": "pages/index/index",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "意见反馈",
+          "pathName": "pages/ucenter/feedback/feedback",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "团购专区",
+          "pathName": "pages/groupon/grouponList/grouponList",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "选择优惠券",
+          "pathName": "pages/ucenter/couponSelect/couponSelect",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "我的优惠券列表",
+          "pathName": "pages/ucenter/couponList/couponList",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "优惠券列表",
+          "pathName": "pages/coupon/coupon",
+          "query": ""
+        },
+        {
+          "id": -1,
+          "name": "帮助中心",
+          "pathName": "pages/help/help",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "我的团购",
+          "pathName": "pages/groupon/myGroupon/myGroupon",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "申请售后",
+          "pathName": "pages/ucenter/aftersale/aftersale",
+          "query": "id=2",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "售后列表",
+          "pathName": "pages/ucenter/aftersaleList/aftersaleList",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "售后详情",
+          "pathName": "pages/ucenter/aftersaleDetail/aftersaleDetail",
+          "query": "id=1",
+          "scene": null
         }
+      ]
     }
+  },
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
 }
\ No newline at end of file
diff --git a/litemall-wx/project.private.config.json b/litemall-wx/project.private.config.json
index 4a98289a..aaeb64f5 100644
--- a/litemall-wx/project.private.config.json
+++ b/litemall-wx/project.private.config.json
@@ -1,85 +1,179 @@
 {
-  "setting": {},
+  "setting": {
+    "compileHotReLoad": true,
+    "urlCheck": false
+  },
   "condition": {
-    "plugin": {
-      "list": []
-    },
-    "game": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
     "miniprogram": {
       "list": [
         {
-          "id": -1,
+          "name": "pages/news/news",
+          "pathName": "pages/news/news",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/postPosition/postPosition",
+          "pathName": "pages/postPosition/postPosition",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/postPosition/postPosition",
+          "pathName": "pages/postPosition/postPosition",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/jobManagement/jobManagement",
+          "pathName": "pages/jobManagement/jobManagement",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/jobManagement/jobManagement",
+          "pathName": "pages/jobManagement/jobManagement",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/auth/accountLogin/accountLogin",
+          "pathName": "pages/auth/accountLogin/accountLogin",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/auth/authorization/authorization",
+          "pathName": "pages/auth/authorization/authorization",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/represent/represent",
+          "pathName": "pages/represent/represent",
+          "query": "data=",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/information/information",
+          "pathName": "pages/information/information",
+          "query": "data=",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/information/information",
+          "pathName": "pages/information/information",
+          "query": "data=",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/details/details",
+          "pathName": "pages/details/details",
+          "query": "data=%257B%2522picUrl%2522%253A%2522https%253A%252F%252Fimg2.baidu.com%252Fit%252Fu%253D1517526491%252C3305397078%2526fm%253D253%2526fmt%253Dauto%2526app%253D120%2526f%253DJPEG%253Fw%253D750%2526h%253D500%2522%252C%2522name%2522%253A%2522%25E5%25A4%25A9%25E7%258C%25AB%2522%252C%2522address%2522%253A%2522%25E6%2588%2590%25E9%2583%25BD%25E5%25B8%2582-%25E5%258F%258C%25E6%25B5%2581%25E5%258C%25BA%2522%252C%2522pinlei%2522%253A%255B%2522%25E7%259B%25B4%25E6%2592%25AD%2522%255D%257D",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/ucenter/business/business",
+          "pathName": "pages/ucenter/business/business",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/ucenter/categorys/category",
+          "pathName": "pages/ucenter/categorys/category",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/ucenter/index/index",
+          "pathName": "pages/ucenter/index/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/auth/login/login",
+          "pathName": "pages/auth/login/login",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/ucenter/myposts/myposts",
+          "pathName": "pages/ucenter/myposts/myposts",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "首页",
           "pathName": "pages/index/index",
           "query": ""
         },
         {
-          "id": -1,
           "name": "专题",
           "pathName": "pages/topic/topic",
           "query": ""
         },
         {
-          "id": -1,
           "name": "专题详情",
           "pathName": "pages/topicDetail/topicDetail",
           "query": "id=314"
         },
         {
-          "id": -1,
           "name": "专题评论列表",
           "pathName": "pages/topicComment/topicComment",
           "query": "valueId=314&type=1"
         },
         {
-          "id": -1,
           "name": "专题评论添加",
           "pathName": "pages/topicCommentPost/topicCommentPost",
           "query": "valueId=314&type=1"
         },
         {
-          "id": -1,
           "name": "品牌",
           "pathName": "pages/brand/brand",
           "query": ""
         },
         {
-          "id": -1,
           "name": "品牌详情",
           "pathName": "pages/brandDetail/brandDetail",
           "query": "id=1001000"
         },
         {
-          "id": -1,
           "name": "人气推荐",
           "pathName": "pages/hotGoods/hotGoods",
           "query": ""
         },
         {
-          "id": -1,
           "name": "新品首发",
           "pathName": "pages/newGoods/newGoods",
           "query": ""
         },
         {
-          "id": -1,
           "name": "分类",
           "pathName": "pages/catalog/catalog",
           "query": ""
         },
         {
-          "id": -1,
           "name": "分类详情",
           "pathName": "pages/category/category",
           "query": "id=1008002"
         },
         {
-          "id": -1,
           "name": "查找",
           "pathName": "pages/search/search",
           "query": ""
@@ -88,189 +182,159 @@
           "name": "商品",
           "pathName": "pages/goods/goods",
           "query": "id=1181267",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         },
         {
-          "id": -1,
           "name": "商品评论列表",
           "pathName": "pages/comment/comment",
           "query": "valueId=1181000&type=0"
         },
         {
-          "id": -1,
           "name": "购物车",
           "pathName": "pages/cart/cart",
           "query": ""
         },
         {
-          "id": -1,
           "name": "下单",
           "pathName": "pages/checkout/checkout",
           "query": ""
         },
         {
-          "id": -1,
           "name": "支付结果",
           "pathName": "pages/payResult/payResult",
           "query": ""
         },
         {
-          "id": -1,
           "name": "我的",
           "pathName": "pages/ucenter/index/index",
           "query": ""
         },
         {
-          "id": -1,
           "name": "我的订单列表",
           "pathName": "pages/ucenter/order/order",
           "query": ""
         },
         {
-          "id": -1,
           "name": "我的订单详情",
           "pathName": "pages/ucenter/orderDetail/orderDetail",
           "query": "id=1"
         },
         {
-          "id": 22,
           "name": "待评价的订单详情",
           "pathName": "pages/ucenter/orderDetail/orderDetail",
           "query": "id=1"
         },
         {
-          "id": -1,
           "name": "购买商品评价",
           "pathName": "pages/commentPost/commentPost",
           "query": "orderId=2&type=0&valueId=1116011"
         },
         {
-          "id": 22,
           "name": "我的优惠券",
           "pathName": "pages/ucenter/couponList/couponList",
           "query": ""
         },
         {
-          "id": -1,
           "name": "我的收藏",
           "pathName": "pages/ucenter/collect/collect",
           "query": ""
         },
         {
-          "id": -1,
           "name": "我的足迹",
           "pathName": "pages/ucenter/footprint/footprint",
           "query": ""
         },
         {
-          "id": -1,
           "name": "我的地址",
           "pathName": "pages/ucenter/address/address",
           "query": ""
         },
         {
-          "id": -1,
           "name": "我的地址添加",
           "pathName": "pages/ucenter/addressAdd/addressAdd",
           "query": ""
         },
         {
-          "id": -1,
           "name": "登录",
           "pathName": "pages/auth/login/login",
           "query": ""
         },
         {
-          "id": -1,
           "name": "账号登录",
           "pathName": "pages/auth/accountLogin/accountLogin",
           "query": ""
         },
         {
-          "id": -1,
           "name": "注册",
           "pathName": "pages/auth/register/register",
           "query": ""
         },
         {
-          "id": -1,
           "name": "找回密码",
           "pathName": "pages/auth/reset/reset",
           "query": ""
         },
         {
-          "id": -1,
           "name": "关于",
           "pathName": "pages/about/about",
           "query": ""
         },
         {
-          "id": -1,
           "name": "测试更新",
           "pathName": "pages/index/index",
           "query": ""
         },
         {
-          "id": -1,
           "name": "意见反馈",
           "pathName": "pages/ucenter/feedback/feedback",
           "query": ""
         },
         {
-          "id": -1,
           "name": "团购专区",
           "pathName": "pages/groupon/grouponList/grouponList",
           "query": ""
         },
         {
-          "id": -1,
           "name": "选择优惠券",
           "pathName": "pages/ucenter/couponSelect/couponSelect",
           "query": ""
         },
         {
-          "id": -1,
           "name": "我的优惠券列表",
           "pathName": "pages/ucenter/couponList/couponList",
           "query": ""
         },
         {
-          "id": -1,
           "name": "优惠券列表",
           "pathName": "pages/coupon/coupon",
           "query": ""
         },
         {
-          "id": -1,
           "name": "帮助中心",
           "pathName": "pages/help/help",
           "query": "",
           "scene": null
         },
         {
-          "id": -1,
           "name": "我的团购",
           "pathName": "pages/groupon/myGroupon/myGroupon",
           "query": "",
           "scene": null
         },
         {
-          "id": -1,
           "name": "申请售后",
           "pathName": "pages/ucenter/aftersale/aftersale",
           "query": "id=2",
           "scene": null
         },
         {
-          "id": -1,
           "name": "售后列表",
           "pathName": "pages/ucenter/aftersaleList/aftersaleList",
           "query": "",
           "scene": null
         },
         {
-          "id": -1,
           "name": "售后详情",
           "pathName": "pages/ucenter/aftersaleDetail/aftersaleDetail",
           "query": "id=1",
@@ -278,5 +342,8 @@
         }
       ]
     }
-  }
+  },
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "litemall-wx",
+  "libVersion": "3.3.5"
 }
\ No newline at end of file
diff --git a/litemall-wx/sitemap.json b/litemall-wx/sitemap.json
index 940dce46..b8e7f0d9 100644
--- a/litemall-wx/sitemap.json
+++ b/litemall-wx/sitemap.json
@@ -1,21 +1,21 @@
-{
-  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
-  "rules": [
-    {
-      "action": "disallow",
-      "page": "pages/checkout/checkout"
-    },
-    {
-      "action": "disallow",
-      "page": "pages/payResult/payResult"
-    },
-    {
-      "action": "disallow",
-      "page": "pages/ucenter/index/index"
-    },    
-    {
-      "action": "allow",
-      "page": "*"
-    }
-  ]
+{
+  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [
+    {
+      "action": "disallow",
+      "page": "pages/checkout/checkout"
+    },
+    {
+      "action": "disallow",
+      "page": "pages/payResult/payResult"
+    },
+    {
+      "action": "disallow",
+      "page": "pages/ucenter/index/index"
+    },    
+    {
+      "action": "allow",
+      "page": "*"
+    }
+  ]
 }
\ No newline at end of file
diff --git a/litemall-wx/static/fonts/demo.css b/litemall-wx/static/fonts/demo.css
new file mode 100644
index 00000000..a67054a0
--- /dev/null
+++ b/litemall-wx/static/fonts/demo.css
@@ -0,0 +1,539 @@
+/* Logo 字体 */
+@font-face {
+  font-family: "iconfont logo";
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+}
+
+.logo {
+  font-family: "iconfont logo";
+  font-size: 160px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* tabs */
+.nav-tabs {
+  position: relative;
+}
+
+.nav-tabs .nav-more {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  height: 42px;
+  line-height: 42px;
+  color: #666;
+}
+
+#tabs {
+  border-bottom: 1px solid #eee;
+}
+
+#tabs li {
+  cursor: pointer;
+  width: 100px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 16px;
+  border-bottom: 2px solid transparent;
+  position: relative;
+  z-index: 1;
+  margin-bottom: -1px;
+  color: #666;
+}
+
+
+#tabs .active {
+  border-bottom-color: #f00;
+  color: #222;
+}
+
+.tab-container .content {
+  display: none;
+}
+
+/* 页面布局 */
+.main {
+  padding: 30px 100px;
+  width: 960px;
+  margin: 0 auto;
+}
+
+.main .logo {
+  color: #333;
+  text-align: left;
+  margin-bottom: 30px;
+  line-height: 1;
+  height: 110px;
+  margin-top: -50px;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.main .logo a {
+  font-size: 160px;
+  color: #333;
+}
+
+.helps {
+  margin-top: 40px;
+}
+
+.helps pre {
+  padding: 20px;
+  margin: 10px 0;
+  border: solid 1px #e7e1cd;
+  background-color: #fffdef;
+  overflow: auto;
+}
+
+.icon_lists {
+  width: 100% !important;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.icon_lists li {
+  width: 100px;
+  margin-bottom: 10px;
+  margin-right: 20px;
+  text-align: center;
+  list-style: none !important;
+  cursor: default;
+}
+
+.icon_lists li .code-name {
+  line-height: 1.2;
+}
+
+.icon_lists .icon {
+  display: block;
+  height: 100px;
+  line-height: 100px;
+  font-size: 42px;
+  margin: 10px auto;
+  color: #333;
+  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
+  -moz-transition: font-size 0.25s linear, width 0.25s linear;
+  transition: font-size 0.25s linear, width 0.25s linear;
+}
+
+.icon_lists .icon:hover {
+  font-size: 100px;
+}
+
+.icon_lists .svg-icon {
+  /* 通过设置 font-size 来改变图标大小 */
+  width: 1em;
+  /* 图标和文字相邻时，垂直对齐 */
+  vertical-align: -0.15em;
+  /* 通过设置 color 来改变 SVG 的颜色/fill */
+  fill: currentColor;
+  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
+      normalize.css 中也包含这行 */
+  overflow: hidden;
+}
+
+.icon_lists li .name,
+.icon_lists li .code-name {
+  color: #666;
+}
+
+/* markdown 样式 */
+.markdown {
+  color: #666;
+  font-size: 14px;
+  line-height: 1.8;
+}
+
+.highlight {
+  line-height: 1.5;
+}
+
+.markdown img {
+  vertical-align: middle;
+  max-width: 100%;
+}
+
+.markdown h1 {
+  color: #404040;
+  font-weight: 500;
+  line-height: 40px;
+  margin-bottom: 24px;
+}
+
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  color: #404040;
+  margin: 1.6em 0 0.6em 0;
+  font-weight: 500;
+  clear: both;
+}
+
+.markdown h1 {
+  font-size: 28px;
+}
+
+.markdown h2 {
+  font-size: 22px;
+}
+
+.markdown h3 {
+  font-size: 16px;
+}
+
+.markdown h4 {
+  font-size: 14px;
+}
+
+.markdown h5 {
+  font-size: 12px;
+}
+
+.markdown h6 {
+  font-size: 12px;
+}
+
+.markdown hr {
+  height: 1px;
+  border: 0;
+  background: #e9e9e9;
+  margin: 16px 0;
+  clear: both;
+}
+
+.markdown p {
+  margin: 1em 0;
+}
+
+.markdown>p,
+.markdown>blockquote,
+.markdown>.highlight,
+.markdown>ol,
+.markdown>ul {
+  width: 80%;
+}
+
+.markdown ul>li {
+  list-style: circle;
+}
+
+.markdown>ul li,
+.markdown blockquote ul>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown>ul li p,
+.markdown>ol li p {
+  margin: 0.6em 0;
+}
+
+.markdown ol>li {
+  list-style: decimal;
+}
+
+.markdown>ol li,
+.markdown blockquote ol>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown code {
+  margin: 0 3px;
+  padding: 0 5px;
+  background: #eee;
+  border-radius: 3px;
+}
+
+.markdown strong,
+.markdown b {
+  font-weight: 600;
+}
+
+.markdown>table {
+  border-collapse: collapse;
+  border-spacing: 0px;
+  empty-cells: show;
+  border: 1px solid #e9e9e9;
+  width: 95%;
+  margin-bottom: 24px;
+}
+
+.markdown>table th {
+  white-space: nowrap;
+  color: #333;
+  font-weight: 600;
+}
+
+.markdown>table th,
+.markdown>table td {
+  border: 1px solid #e9e9e9;
+  padding: 8px 16px;
+  text-align: left;
+}
+
+.markdown>table th {
+  background: #F7F7F7;
+}
+
+.markdown blockquote {
+  font-size: 90%;
+  color: #999;
+  border-left: 4px solid #e9e9e9;
+  padding-left: 0.8em;
+  margin: 1em 0;
+}
+
+.markdown blockquote p {
+  margin: 0;
+}
+
+.markdown .anchor {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  margin-left: 8px;
+}
+
+.markdown .waiting {
+  color: #ccc;
+}
+
+.markdown h1:hover .anchor,
+.markdown h2:hover .anchor,
+.markdown h3:hover .anchor,
+.markdown h4:hover .anchor,
+.markdown h5:hover .anchor,
+.markdown h6:hover .anchor {
+  opacity: 1;
+  display: inline-block;
+}
+
+.markdown>br,
+.markdown>p>br {
+  clear: both;
+}
+
+
+.hljs {
+  display: block;
+  background: white;
+  padding: 0.5em;
+  color: #333333;
+  overflow-x: auto;
+}
+
+.hljs-comment,
+.hljs-meta {
+  color: #969896;
+}
+
+.hljs-string,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-strong,
+.hljs-emphasis,
+.hljs-quote {
+  color: #df5000;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-type {
+  color: #a71d5d;
+}
+
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-attribute {
+  color: #0086b3;
+}
+
+.hljs-section,
+.hljs-name {
+  color: #63a35c;
+}
+
+.hljs-tag {
+  color: #333333;
+}
+
+.hljs-title,
+.hljs-attr,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #795da3;
+}
+
+.hljs-addition {
+  color: #55a532;
+  background-color: #eaffea;
+}
+
+.hljs-deletion {
+  color: #bd2c00;
+  background-color: #ffecec;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
+
+/* 代码高亮 */
+/* PrismJS 1.15.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  background: none;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+
+  -moz-tab-size: 4;
+  -o-tab-size: 4;
+  tab-size: 4;
+
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+@media print {
+
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: .5em 0;
+  overflow: auto;
+}
+
+:not(pre)>code[class*="language-"],
+pre[class*="language-"] {
+  background: #f5f2f0;
+}
+
+/* Inline code */
+:not(pre)>code[class*="language-"] {
+  padding: .1em;
+  border-radius: .3em;
+  white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+
+.token.punctuation {
+  color: #999;
+}
+
+.namespace {
+  opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+
+.token.function,
+.token.class-name {
+  color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+
+.token.italic {
+  font-style: italic;
+}
+
+.token.entity {
+  cursor: help;
+}
diff --git a/litemall-wx/static/fonts/demo_index.html b/litemall-wx/static/fonts/demo_index.html
new file mode 100644
index 00000000..ed19d50a
--- /dev/null
+++ b/litemall-wx/static/fonts/demo_index.html
@@ -0,0 +1,419 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>iconfont Demo</title>
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg" type="image/x-icon"/>
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg"/>
+  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
+  <link rel="stylesheet" href="demo.css">
+  <link rel="stylesheet" href="iconfont.css">
+  <script src="iconfont.js"></script>
+  <!-- jQuery -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
+  <!-- 代码高亮 -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
+  <style>
+    .main .logo {
+      margin-top: 0;
+      height: auto;
+    }
+
+    .main .logo a {
+      display: flex;
+      align-items: center;
+    }
+
+    .main .logo .sub-title {
+      margin-left: 0.5em;
+      font-size: 22px;
+      color: #fff;
+      background: linear-gradient(-45deg, #3967FF, #B500FE);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  </style>
+</head>
+<body>
+  <div class="main">
+    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
+      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
+      
+    </a></h1>
+    <div class="nav-tabs">
+      <ul id="tabs" class="dib-box">
+        <li class="dib active"><span>Unicode</span></li>
+        <li class="dib"><span>Font class</span></li>
+        <li class="dib"><span>Symbol</span></li>
+      </ul>
+      
+      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=4446498" target="_blank" class="nav-more">查看项目</a>
+      
+    </div>
+    <div class="tab-container">
+      <div class="content unicode" style="display: block;">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+              <span class="icon custom-icon">&#xe6ad;</span>
+                <div class="name">品类</div>
+                <div class="code-name">&amp;#xe6ad;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon custom-icon">&#xe63c;</span>
+                <div class="name">工作方式246px</div>
+                <div class="code-name">&amp;#xe63c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon custom-icon">&#xe622;</span>
+                <div class="name">体重</div>
+                <div class="code-name">&amp;#xe622;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon custom-icon">&#xe60e;</span>
+                <div class="name">学历</div>
+                <div class="code-name">&amp;#xe60e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon custom-icon">&#xe602;</span>
+                <div class="name">户籍地</div>
+                <div class="code-name">&amp;#xe602;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon custom-icon">&#xe92e;</span>
+                <div class="name">测身高</div>
+                <div class="code-name">&amp;#xe92e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon custom-icon">&#xe6bb;</span>
+                <div class="name">户籍常住地址</div>
+                <div class="code-name">&amp;#xe6bb;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon custom-icon">&#xe64d;</span>
+                <div class="name">时薪招聘</div>
+                <div class="code-name">&amp;#xe64d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon custom-icon">&#xf31e;</span>
+                <div class="name">语言</div>
+                <div class="code-name">&amp;#xf31e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon custom-icon">&#xe63f;</span>
+                <div class="name">出生日期</div>
+                <div class="code-name">&amp;#xe63f;</div>
+              </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="unicode-">Unicode 引用</h2>
+          <hr>
+
+          <p>Unicode 是字体在网页端最原始的应用方式，特点是：</p>
+          <ul>
+            <li>支持按字体的方式去动态调整图标大小，颜色等等。</li>
+            <li>默认情况下不支持多色，直接添加多色图标会自动去色。</li>
+          </ul>
+          <blockquote>
+            <p>注意：新版 iconfont 支持两种方式引用多色图标：SVG symbol 引用方式和彩色字体图标模式。（使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。）</p>
+          </blockquote>
+          <p>Unicode 使用步骤如下：</p>
+          <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</code></h3>
+<pre><code class="language-css"
+>@font-face {
+  font-family: 'custom-icon';
+  src: 
+       url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
+       url('iconfont.woff?t=1709261443399') format('woff'),
+       url('iconfont.ttf?t=1709261443399') format('truetype');
+}
+</code></pre>
+          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
+<pre><code class="language-css"
+>.custom-icon {
+  font-family: "custom-icon" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面</h3>
+<pre>
+<code class="language-html"
+>&lt;span class="custom-icon"&gt;&amp;#x33;&lt;/span&gt;
+</code></pre>
+          <blockquote>
+            <p>"custom-icon" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+          </blockquote>
+          </div>
+      </div>
+      <div class="content font-class">
+        <ul class="icon_lists dib-box">
+          
+          <li class="dib">
+            <span class="icon custom-icon custom-icon-pinlei"></span>
+            <div class="name">
+              品类
+            </div>
+            <div class="code-name">.custom-icon-pinlei
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon custom-icon custom-icon-gongzuofangshipx"></span>
+            <div class="name">
+              工作方式246px
+            </div>
+            <div class="code-name">.custom-icon-gongzuofangshipx
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon custom-icon custom-icon-weight"></span>
+            <div class="name">
+              体重
+            </div>
+            <div class="code-name">.custom-icon-weight
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon custom-icon custom-icon-xueli-"></span>
+            <div class="name">
+              学历
+            </div>
+            <div class="code-name">.custom-icon-xueli-
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon custom-icon custom-icon-hujidi"></span>
+            <div class="name">
+              户籍地
+            </div>
+            <div class="code-name">.custom-icon-hujidi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon custom-icon custom-icon-ceshengao"></span>
+            <div class="name">
+              测身高
+            </div>
+            <div class="code-name">.custom-icon-ceshengao
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon custom-icon custom-icon-hujichangzhudizhi"></span>
+            <div class="name">
+              户籍常住地址
+            </div>
+            <div class="code-name">.custom-icon-hujichangzhudizhi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon custom-icon custom-icon-duotianweishangketixing"></span>
+            <div class="name">
+              时薪招聘
+            </div>
+            <div class="code-name">.custom-icon-duotianweishangketixing
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon custom-icon custom-icon-yuyan"></span>
+            <div class="name">
+              语言
+            </div>
+            <div class="code-name">.custom-icon-yuyan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon custom-icon custom-icon-chushengriqi"></span>
+            <div class="name">
+              出生日期
+            </div>
+            <div class="code-name">.custom-icon-chushengriqi
+            </div>
+          </li>
+          
+        </ul>
+        <div class="article markdown">
+        <h2 id="font-class-">font-class 引用</h2>
+        <hr>
+
+        <p>font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。</p>
+        <p>与 Unicode 使用方式相比，具有如下特点：</p>
+        <ul>
+          <li>相比于 Unicode 语意明确，书写更直观。可以很容易分辨这个 icon 是什么。</li>
+          <li>因为使用 class 来定义图标，所以当要替换图标时，只需要修改 class 里面的 Unicode 引用。</li>
+        </ul>
+        <p>使用步骤如下：</p>
+        <h3 id="-fontclass-">第一步：引入项目下面生成的 fontclass 代码：</h3>
+<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
+</code></pre>
+        <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;span class="custom-icon custom-icon-xxx"&gt;&lt;/span&gt;
+</code></pre>
+        <blockquote>
+          <p>"
+            custom-icon" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+        </blockquote>
+      </div>
+      </div>
+      <div class="content symbol">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#custom-icon-pinlei"></use>
+                </svg>
+                <div class="name">品类</div>
+                <div class="code-name">#custom-icon-pinlei</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#custom-icon-gongzuofangshipx"></use>
+                </svg>
+                <div class="name">工作方式246px</div>
+                <div class="code-name">#custom-icon-gongzuofangshipx</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#custom-icon-weight"></use>
+                </svg>
+                <div class="name">体重</div>
+                <div class="code-name">#custom-icon-weight</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#custom-icon-xueli-"></use>
+                </svg>
+                <div class="name">学历</div>
+                <div class="code-name">#custom-icon-xueli-</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#custom-icon-hujidi"></use>
+                </svg>
+                <div class="name">户籍地</div>
+                <div class="code-name">#custom-icon-hujidi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#custom-icon-ceshengao"></use>
+                </svg>
+                <div class="name">测身高</div>
+                <div class="code-name">#custom-icon-ceshengao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#custom-icon-hujichangzhudizhi"></use>
+                </svg>
+                <div class="name">户籍常住地址</div>
+                <div class="code-name">#custom-icon-hujichangzhudizhi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#custom-icon-duotianweishangketixing"></use>
+                </svg>
+                <div class="name">时薪招聘</div>
+                <div class="code-name">#custom-icon-duotianweishangketixing</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#custom-icon-yuyan"></use>
+                </svg>
+                <div class="name">语言</div>
+                <div class="code-name">#custom-icon-yuyan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#custom-icon-chushengriqi"></use>
+                </svg>
+                <div class="name">出生日期</div>
+                <div class="code-name">#custom-icon-chushengriqi</div>
+            </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="symbol-">Symbol 引用</h2>
+          <hr>
+
+          <p>这是一种全新的使用方式，应该说这才是未来的主流，也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
+            这种用法其实是做了一个 SVG 的集合，与另外两种相比具有如下特点：</p>
+          <ul>
+            <li>支持多色图标了，不再受单色限制。</li>
+            <li>通过一些技巧，支持像字体那样，通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
+            <li>兼容性较差，支持 IE9+，及现代浏览器。</li>
+            <li>浏览器渲染 SVG 的性能一般，还不如 png。</li>
+          </ul>
+          <p>使用步骤如下：</p>
+          <h3 id="-symbol-">第一步：引入项目下面生成的 symbol 代码：</h3>
+<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
+</code></pre>
+          <h3 id="-css-">第二步：加入通用 CSS 代码（引入一次就行）：</h3>
+<pre><code class="language-html">&lt;style&gt;
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+&lt;/style&gt;
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
+  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
+&lt;/svg&gt;
+</code></pre>
+          </div>
+      </div>
+
+    </div>
+  </div>
+  <script>
+  $(document).ready(function () {
+      $('.tab-container .content:first').show()
+
+      $('#tabs li').click(function (e) {
+        var tabContent = $('.tab-container .content')
+        var index = $(this).index()
+
+        if ($(this).hasClass('active')) {
+          return
+        } else {
+          $('#tabs li').removeClass('active')
+          $(this).addClass('active')
+
+          tabContent.hide().eq(index).fadeIn()
+        }
+      })
+    })
+  </script>
+</body>
+</html>
diff --git a/litemall-wx/static/fonts/iconfont.css b/litemall-wx/static/fonts/iconfont.css
new file mode 100644
index 00000000..57332cac
--- /dev/null
+++ b/litemall-wx/static/fonts/iconfont.css
@@ -0,0 +1,56 @@
+@font-face {
+  font-family: "custom-icon"; /* Project id 4446498 */
+  src: 
+       url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
+       url('iconfont.woff?t=1709261443399') format('woff'),
+       url('iconfont.ttf?t=1709261443399') format('truetype');
+}
+
+.custom-icon {
+  font-family: "custom-icon" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.custom-icon-pinlei:before {
+  content: "\e6ad";
+}
+
+.custom-icon-gongzuofangshipx:before {
+  content: "\e63c";
+}
+
+.custom-icon-weight:before {
+  content: "\e622";
+}
+
+.custom-icon-xueli-:before {
+  content: "\e60e";
+}
+
+.custom-icon-hujidi:before {
+  content: "\e602";
+}
+
+.custom-icon-ceshengao:before {
+  content: "\e92e";
+}
+
+.custom-icon-hujichangzhudizhi:before {
+  content: "\e6bb";
+}
+
+.custom-icon-duotianweishangketixing:before {
+  content: "\e64d";
+}
+
+.custom-icon-yuyan:before {
+  content: "\f31e";
+}
+
+.custom-icon-chushengriqi:before {
+  content: "\e63f";
+}
+
diff --git a/litemall-wx/static/fonts/iconfont.js b/litemall-wx/static/fonts/iconfont.js
new file mode 100644
index 00000000..29c4b37c
--- /dev/null
+++ b/litemall-wx/static/fonts/iconfont.js
@@ -0,0 +1 @@
+window._iconfont_svg_string_4446498='<svg><symbol id="custom-icon-pinlei" viewBox="0 0 1024 1024"><path d="M87.168 989.952a53.162667 53.162667 0 0 1-53.205333-53.077333V618.24a53.12 53.12 0 0 1 53.205333-53.077333h318.677333a53.077333 53.077333 0 0 1 53.077334 53.077333v318.634667a53.12 53.12 0 0 1-53.077334 53.077333z m0-53.077333V618.24z m504.490667 0a26.538667 26.538667 0 1 1 0-53.077334H750.933333a26.538667 26.538667 0 1 1 0 53.077334z m0-159.36a26.538667 26.538667 0 1 1 0-53.077334h318.677333a26.538667 26.538667 0 1 1 0 53.077334z m0-159.274667a26.538667 26.538667 0 1 1 0-53.077333h371.754666a26.538667 26.538667 0 1 1 0 53.077333z m26.624-159.36a53.162667 53.162667 0 0 1-53.205334-53.077333V87.168A53.12 53.12 0 0 1 618.282667 34.090667h318.634666a53.077333 53.077333 0 0 1 53.077334 53.077333v318.634667a53.12 53.12 0 0 1-53.077334 53.077333z m0-53.077333V87.168zM87.168 458.88A53.162667 53.162667 0 0 1 33.962667 405.802667V87.168A53.12 53.12 0 0 1 87.168 34.090667h318.677333a53.077333 53.077333 0 0 1 53.077334 53.077333v318.634667a53.12 53.12 0 0 1-53.077334 53.077333z m0-53.077333V87.168z" fill="#E92927" ></path></symbol><symbol id="custom-icon-gongzuofangshipx" viewBox="0 0 1024 1024"><path d="M450.982957 817.330087h-209.964522c-27.38087 0-48.684522-21.303652-48.684522-45.634783V260.251826c0-24.353391 24.353391-45.657043 51.734261-45.657043h404.702609c27.38087 0 51.712 21.303652 51.712 45.657043v76.109913c0 9.126957 9.126957 18.253913 18.253913 18.253913s18.253913-9.126957 18.253913-18.253913v-76.109913C733.94087 214.617043 694.405565 178.086957 648.748522 178.086957H241.018435C195.383652 178.086957 155.826087 214.594783 155.826087 260.274087v511.398956c0 45.657043 39.557565 82.18713 85.192348 82.187131h209.964522c9.126957 0 18.253913-9.126957 18.253913-18.253913s-9.126957-18.253913-18.253913-18.253913z" fill="#000000" ></path><path d="M610.259478 307.133217c0-11.954087-9.060174-20.925217-21.147826-20.925217H271.582609c-12.109913 0-21.170087 8.97113-21.170087 20.925217 0 11.954087 9.060174 20.925217 21.147826 20.925218h317.506782c9.082435 0 21.170087-8.97113 21.170087-20.925218z m-338.654608 68.719305c-12.109913 0-21.170087 8.97113-21.170087 20.925217 0 11.954087 9.060174 20.925217 21.147826 20.925218h114.910608c12.109913 0 21.170087-8.97113 21.170087-20.925218 0-11.954087-9.060174-20.925217-21.147826-20.925217H271.582609z m393.082434 14.959304c-136.058435 0-247.941565 110.569739-247.941565 245.047652 0 134.455652 111.88313 245.025391 247.941565 245.025392 136.080696 0 247.941565-110.569739 247.941566-245.025392 3.027478-134.477913-108.855652-245.047652-247.941566-245.047652z m0 457.216c-117.915826 0-214.683826-95.632696-214.683826-212.168348 0-116.557913 96.768-212.190609 214.683826-212.190608 117.938087 0 214.683826 95.632696 214.683826 212.190608 0 116.535652-96.745739 212.146087-214.683826 212.146087z" fill="#000000" ></path><path d="M769.625043 621.501217h-97.903304v-110.970434a20.992 20.992 0 0 0-21.437217-21.593044 20.992 20.992 0 0 0-21.414957 21.593044v132.541217c0 12.332522 9.171478 21.593043 21.414957 21.593043h119.340521c12.243478 0 21.437217-9.260522 21.437218-21.593043a20.992 20.992 0 0 0-21.437218-21.593043z" fill="#000000" ></path></symbol><symbol id="custom-icon-weight" viewBox="0 0 1024 1024"><path d="M712 298.9c-4.3 48.3-25.6 91.7-58 124.1-36.3 36.3-86.6 58.8-142 58.8-55.5 0-105.7-22.5-142.1-58.8-32.4-32.4-53.8-75.8-58.1-124.1h-75.7c-8.2 0-15.7 3.4-21.2 8.8s-8.8 12.9-8.8 21.1v500.8c0 8.2 3.4 15.7 8.8 21.2s12.9 8.8 21.2 8.8h551.7c8.2 0 15.7-3.4 21.1-8.8 5.5-5.5 8.8-12.9 8.8-21.2V328.8c0-8.2-3.4-15.7-8.8-21.1-5.4-5.5-12.9-8.8-21.1-8.8H712zM594.7 198.2c21.2 21.2 34.3 50.4 34.3 82.7 0 32.3-13.1 61.5-34.3 82.7-21.1 21.1-50.4 34.2-82.7 34.2-32.3 0-61.6-13.1-82.7-34.2-21.2-21.2-34.2-50.4-34.2-82.7 0-32.3 13.1-61.5 34.2-82.7 21.1-21.1 50.4-34.2 82.7-34.2 32.3 0 61.5 13.1 82.7 34.2zM360.1 298.9c4.1 35 20.1 66.4 43.7 90.1 27.7 27.7 65.9 44.8 108.2 44.8 42.2 0 80.5-17.1 108.1-44.8 23.7-23.7 39.6-55.1 43.8-90.1h24.2c-4.2 41.6-22.9 79-51 107.1-32 32-76.2 51.8-125.1 51.8-48.9 0-93.1-19.8-125.1-51.8-28-28-46.7-65.4-50.9-107.1h24.1z m-124-36h124c4.1-35 20-66.4 43.7-90.1C431.5 145.1 469.7 128 512 128c42.2 0 80.5 17.1 108.1 44.8 23.7 23.7 39.6 55.1 43.8 90.1h124c18.1 0 34.6 7.4 46.6 19.4 11.9 12 19.4 28.5 19.4 46.6v500.8c0 18.2-7.4 34.7-19.4 46.6-12 12-28.5 19.4-46.6 19.4H236.1c-18.2 0-34.7-7.4-46.6-19.4-11.9-11.9-19.3-28.4-19.3-46.6V328.9c0-18.1 7.4-34.6 19.3-46.6 12-11.9 28.5-19.4 46.6-19.4z" fill="#F08D2C" ></path><path d="M700.9 484.6c18.6 5.5 3.3 42.3-18.8 38-15.8-3-12.1-47.2 18.8-38z m24.8 25.6c-24.3-7.2-27.2 27.6-14.8 29.9 17.4 3.4 29.4-25.6 14.8-29.9z m20.7 23.9c12.8 3.8 2.2 29-12.9 26.1-10.8-2.1-8.3-32.4 12.9-26.1z m11.8 27.5c-18.1-5.4-20.2 20.5-11 22.3 13 2.5 22-19 11-22.3z m-96.7-97c-40.2-11.9-47.3 48.1-26.9 52 28.7 5.5 51.1-44.8 26.9-52z m-338.4 20c-18.6 5.5-3.3 42.3 18.8 38 15.7-3 12.1-47.2-18.8-38z m-24.8 25.6c24.3-7.2 27.2 27.6 14.8 29.9-17.4 3.4-29.5-25.6-14.8-29.9z m-20.8 23.9c-12.7 3.8-2.2 29 12.9 26.1 10.8-2.1 8.3-32.4-12.9-26.1z m-11.7 27.5c18.1-5.4 20.2 20.5 11 22.3-13 2.5-22-19-11-22.3z m96.7-97c40.2-11.9 47.3 48.1 26.9 52-28.7 5.5-51.1-44.8-26.9-52z m11.3 59.8c33.1-3.2 51.2 21.2 48.3 57.9-2.4 30.5-16.2 52.3-11.7 82.6 6 40.3 45.7 70.6 43.1 126-1.7 36.9-42.2 49.9-66.8 33.1-27.3-18.5-36.8-64.8-53-102.5-10.2-23.7-25.3-45.4-36.5-62.9-18.3-28.4-25.6-60.3 2.7-91.9 21.6-24 46.6-39.7 73.9-42.3zM512 269l33.3-57.6c3.3-5.7 10.6-7.7 16.4-4.3 5.7 3.3 7.7 10.6 4.3 16.3L532.8 281c2 3.5 3.2 7.6 3.2 12 0 13.2-10.8 24-24 24-13.3 0-24-10.8-24-24 0-13.3 10.7-24 24-24z m138.2 255.4c-33.1-3.2-51.2 21.2-48.3 57.9 2.4 30.5 16.2 52.3 11.7 82.6-6 40.3-45.7 70.6-43.1 126 1.7 36.9 42.2 49.9 66.8 33.1 27.3-18.5 36.8-64.8 53-102.5 10.2-23.7 25.3-45.4 36.5-62.9 18.3-28.4 25.6-60.3-2.6-91.9-21.8-24-46.7-39.7-74-42.3z" fill="#F08D2C" ></path></symbol><symbol id="custom-icon-xueli-" viewBox="0 0 1024 1024"><path d="M511.9 876.1c-0.7 0-1.4 0-2.2-0.1L96.5 836c-11.5-1.1-20.3-10.8-20.3-22.4V292c0-12.4 10.1-22.5 22.5-22.5s22.5 10.1 22.5 22.5v501.2L511.9 831l390.7-37.8V208.4L514.1 246c-1.4 0.1-2.9 0.1-4.3 0L96.5 206c-12.4-1.2-21.4-12.2-20.2-24.6 1.2-12.4 12.2-21.4 24.6-20.2l411 39.8L923 161.2c6.3-0.6 12.6 1.5 17.3 5.7 4.7 4.3 7.4 10.3 7.4 16.7v630c0 11.6-8.8 21.3-20.3 22.4l-413.2 40c-0.8 0.1-1.6 0.1-2.3 0.1z" fill="#D47900" ></path><path d="M374.3 670.5c-1 0-2-0.1-3-0.2l-149.7-20c-11.2-1.5-19.5-11-19.5-22.3V478.3c0-6.5 2.8-12.7 7.7-16.9 4.9-4.3 11.4-6.2 17.8-5.4l149.7 20c11.2 1.5 19.5 11 19.5 22.3V648c0 6.5-2.8 12.7-7.7 16.9-4.1 3.7-9.3 5.6-14.8 5.6z m-127.1-62.2l104.7 14V518l-104.7-14v104.3zM559 615.2c-11.7 0-21.5-9-22.4-20.8-0.9-12.4 8.4-23.2 20.8-24.1l268.7-20c12.4-0.9 23.2 8.4 24.1 20.8 0.9 12.4-8.4 23.2-20.8 24.1l-268.7 20H559z" fill="#D47900" ></path></symbol><symbol id="custom-icon-hujidi" viewBox="0 0 1024 1024"><path d="M325.12 456.96c-7.68-5.12-8.107-20.48-7.253-22.187 1.28-1.706 1.706-2.133 4.266-2.133 0-25.6 14.507-47.787 44.374-47.787s44.373 22.187 44.373 47.787c2.56 0 3.413 0.427 4.267 2.133 1.28 1.707 0.426 17.067-7.254 22.187-2.133 0.853-4.266 0.853-4.266 0.427-2.134 3.84-7.254 36.693-37.12 36.693-29.867 0-35.414-32.853-37.547-36.693 0 0.426-2.133 0.426-3.84-0.427z m-41.387 135.68h166.4c8.107 0 9.387-6.827 9.387-8.533v-43.094s-0.853-10.24-5.547-15.36c-3.413-5.12-20.906-14.933-49.493-23.466l-37.547 61.44-37.546-61.867c-29.014 8.533-46.08 18.347-49.494 23.467-4.693 5.12-5.546 15.36-5.546 15.36v43.093c0 2.133 1.28 8.96 9.386 8.96z m672-342.613v523.946c0 49.92-40.106 90.027-89.173 90.027H157.44c-49.067 0-89.173-40.107-89.173-90.027V250.027c0-49.92 40.106-90.027 89.173-90.027h709.12c49.067 0 89.173 40.107 89.173 90.027zM153.6 433.92c2.56 3.84 4.267 8.533 7.253 11.947 7.254 8.106 18.774 9.386 28.16 3.413 1.707-1.28 3.414-2.56 6.4-4.267V632.32c0 8.96 2.987 15.36 10.667 18.773h322.133c8.107-3.84 10.667-10.24 10.667-18.773-0.427-59.733 0-119.467 0-179.2v-8.107c7.253 5.974 14.507 9.387 23.04 7.68 9.813-2.133 15.36-9.386 18.773-18.346V423.68c-2.986-9.387-10.666-14.933-17.493-21.333-59.733-52.48-119.467-104.534-179.2-157.014-11.093-9.813-21.76-9.813-32.853 0-62.72 54.614-125.014 109.654-187.734 164.694-3.84 3.413-6.4 8.96-9.386 13.653v10.24z m716.8 323.413c0-15.36-12.373-28.16-27.733-28.16H181.333c-15.36 0-27.733 12.8-27.733 28.16s12.373 28.16 27.733 28.16h661.334c15.36 0 27.733-12.8 27.733-28.16z m0-163.413c0-15.36-12.373-28.16-27.733-28.16H679.68c-15.36 0-27.733 12.8-27.733 28.16s12.373 28.16 27.733 28.16h162.987c15.36-0.427 27.733-12.8 27.733-28.16z m0-163.84c0-15.36-12.373-28.16-27.733-28.16H679.68c-15.36 0-27.733 12.8-27.733 28.16s12.373 28.16 27.733 28.16h162.987c15.36 0 27.733-12.8 27.733-28.16z m0-163.84c0-15.36-12.373-28.16-27.733-28.16H581.12c-15.36 0-27.733 12.8-27.733 28.16s12.373 28.16 27.733 28.16h261.547c15.36 0 27.733-12.8 27.733-28.16z" fill="#1E9EFF" ></path></symbol><symbol id="custom-icon-ceshengao" viewBox="0 0 1024 1024"><path d="M552.96 211.456a42.02496 42.02496 0 1 1-42.09152 41.984A42.10688 42.10688 0 0 1 552.96 211.456m0-63.70816A105.73312 105.73312 0 1 0 658.87232 253.44 105.82016 105.82016 0 0 0 552.96 147.73248z m81.00352 286.56128a8.54528 8.54528 0 0 1 8.54528 8.52992v159.8976h-62.32576V812.544h-54.44608v-209.82272H463.4112v-159.8976a8.54528 8.54528 0 0 1 8.54016-8.52992h162.01216m0-63.70816H471.95648a72.29952 72.29952 0 0 0-72.36096 72.23808v187.4944a36.1472 36.1472 0 0 0 36.17792 36.11648h26.14272v173.7216a36.1472 36.1472 0 0 0 36.18304 36.11648h109.7216a36.1472 36.1472 0 0 0 36.18304-36.11648v-173.7216h26.14272a36.1472 36.1472 0 0 0 36.17792-36.11648v-187.4944a72.29952 72.29952 0 0 0-72.36096-72.23808z" fill="#F79C42" ></path><path d="M844.8 942.08H295.33696C231.296 942.08 179.2 895.37024 179.2 837.95456V186.04544C179.2 128.62976 231.296 81.92 295.33696 81.92H844.8v63.72864H295.33696c-28.3392 0-52.28544 18.49856-52.28544 40.3968v651.90912c0 21.89312 23.94624 40.3968 52.28544 40.3968H844.8V942.08z" fill="#5288F5" ></path></symbol><symbol id="custom-icon-hujichangzhudizhi" viewBox="0 0 1024 1024"><path d="M0 0h1024v1024H0z" fill="#D8D8D8" fill-opacity="0" ></path><path d="M896 64c35.328 0 64 28.672 64 64v832H64V512c0-35.328 28.672-64 64-64h320V128c0-35.328 28.672-64 64-64z m-480 608h-128V896h128v-224zM640 640H576v64h64v-64z m192 0h-64v64h64v-64z m-192-192H576v64h64V448z m192 0h-64v64h64V448z m-192-192H576v64h64V256z m192 0h-64v64h64V256z" fill="#0076E6" opacity=".825" ></path></symbol><symbol id="custom-icon-duotianweishangketixing" viewBox="0 0 1024 1024"><path d="M516.697 6.504C238.476 5.78 7.95 234.14 5.781 512.36c-1.445 273.886 224.745 503.69 497.908 506.58 282.558 2.891 512.362-219.686 514.53-498.63C1020.387 239.198 794.196 7.227 516.697 6.504z m271.718 672.068c-10.117 23.847-38.3 34.687-62.148 24.57L463.22 588.962c-18.066-7.949-28.906-25.292-28.184-44.081V257.265c0-26.016 20.957-46.973 46.973-46.973s46.972 20.957 46.972 46.973v257.264l234.863 101.894c23.847 10.118 34.687 38.301 24.57 62.149z" fill="#19B2ED" ></path></symbol><symbol id="custom-icon-yuyan" viewBox="0 0 1024 1024"><path d="M805.6832 893.184H219.392c-52.5312 0-95.0784-42.5984-95.0784-95.0784v-146.0736h776.4992v146.0736c0 52.48-42.5984 95.0784-95.1296 95.0784z" fill="#ffa115" ></path><path d="M808.192 85.504H218.8288c-73.4208 0-133.12 59.6992-133.12 133.12v572.16c0 73.4208 59.6992 133.12 133.12 133.12h589.3632c73.4208 0 133.12-59.6992 133.12-133.12V218.624c0-73.4208-59.6992-133.12-133.12-133.12z m71.68 705.28c0 39.5264-32.1536 71.68-71.68 71.68H218.8288c-39.5264 0-71.68-32.1536-71.68-71.68V218.624c0-39.5264 32.1536-71.68 71.68-71.68h589.3632c39.5264 0 71.68 32.1536 71.68 71.68v572.16z" fill="#474A54" ></path><path d="M455.0144 414.0544c16.9472 0 30.72-13.7728 30.72-30.72s-13.7728-30.72-30.72-30.72H272.6912c-16.9472 0-30.72 13.7728-30.72 30.72v266.0352c0 16.9472 13.7728 30.72 30.72 30.72h182.3744c16.9472 0 30.72-13.7728 30.72-30.72s-13.7728-30.72-30.72-30.72H303.4112v-69.5808h151.6544c16.9472 0 30.72-13.7728 30.72-30.72s-13.7728-30.72-30.72-30.72H303.4112V414.0544h151.6032zM752.4352 352.6144c-16.9472 0-30.72 13.7728-30.72 30.72v164.864l-124.6208-176.0768a30.76096 30.76096 0 0 0-34.4064-11.52c-12.7488 4.0448-21.4016 15.872-21.4016 29.2864v262.0928c0 16.9472 13.7728 30.72 30.72 30.72s30.72-13.7728 30.72-30.72V486.4512l124.6208 176.0768a30.76096 30.76096 0 0 0 34.4064 11.52c12.7488-4.0448 21.4016-15.872 21.4016-29.2864V383.3344c0-16.9472-13.7728-30.72-30.72-30.72z" fill="#474A54" ></path></symbol><symbol id="custom-icon-chushengriqi" viewBox="0 0 1024 1024"><path d="M301.176471 210.823529a30.117647 30.117647 0 0 0 30.117647-30.117647V60.235294a30.117647 30.117647 0 0 0-60.235294 0v120.470588a30.117647 30.117647 0 0 0 30.117647 30.117647z m572.235294-60.235294h-60.235294v30.117647a90.352941 90.352941 0 0 1-180.705883 0V150.588235h-240.941176v30.117647a90.352941 90.352941 0 0 1-180.705883 0V150.588235H150.588235a120.470588 120.470588 0 0 0-120.470588 120.470589v60.235294h963.764706V271.058824a120.470588 120.470588 0 0 0-120.470588-120.470589z m-150.588236 60.235294a30.117647 30.117647 0 0 0 30.117647-30.117647V60.235294a30.117647 30.117647 0 0 0-60.235294 0v120.470588a30.117647 30.117647 0 0 0 30.117647 30.117647zM30.117647 873.411765a120.470588 120.470588 0 0 0 120.470588 120.470588h722.82353a120.470588 120.470588 0 0 0 120.470588-120.470588V391.529412H30.117647z m662.588235-361.411765h120.470589v120.470588h-120.470589z m0 240.941176h120.470589v120.470589h-120.470589z m-240.941176-240.941176h120.470588v120.470588h-120.470588z m0 240.941176h120.470588v120.470589h-120.470588z m-240.941177-240.941176h120.470589v120.470588H210.823529z m0 240.941176h120.470589v120.470589H210.823529z" fill="#3E6AEB" ></path></symbol></svg>',function(h){var c=(c=document.getElementsByTagName("script"))[c.length-1],t=c.getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var i,a,e,o,l,m=function(c,t){t.parentNode.insertBefore(c,t)};if(t&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(c){console&&console.log(c)}}i=function(){var c,t=document.createElement("div");t.innerHTML=h._iconfont_svg_string_4446498,(t=t.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",t=t,(c=document.body).firstChild?m(t,c.firstChild):c.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),i()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(e=i,o=h.document,l=!1,s(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,n())})}function n(){l||(l=!0,e())}function s(){try{o.documentElement.doScroll("left")}catch(c){return void setTimeout(s,50)}n()}}(window);
\ No newline at end of file
diff --git a/litemall-wx/static/fonts/iconfont.json b/litemall-wx/static/fonts/iconfont.json
new file mode 100644
index 00000000..25f44026
--- /dev/null
+++ b/litemall-wx/static/fonts/iconfont.json
@@ -0,0 +1,79 @@
+{
+  "id": "4446498",
+  "name": "c",
+  "font_family": "custom-icon",
+  "css_prefix_text": "custom-icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "33990514",
+      "name": "品类",
+      "font_class": "pinlei",
+      "unicode": "e6ad",
+      "unicode_decimal": 59053
+    },
+    {
+      "icon_id": "3308770",
+      "name": "工作方式246px",
+      "font_class": "gongzuofangshipx",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "3921673",
+      "name": "体重",
+      "font_class": "weight",
+      "unicode": "e622",
+      "unicode_decimal": 58914
+    },
+    {
+      "icon_id": "5814922",
+      "name": "学历",
+      "font_class": "xueli-",
+      "unicode": "e60e",
+      "unicode_decimal": 58894
+    },
+    {
+      "icon_id": "12662687",
+      "name": "户籍地",
+      "font_class": "hujidi",
+      "unicode": "e602",
+      "unicode_decimal": 58882
+    },
+    {
+      "icon_id": "16198848",
+      "name": "测身高",
+      "font_class": "ceshengao",
+      "unicode": "e92e",
+      "unicode_decimal": 59694
+    },
+    {
+      "icon_id": "17539034",
+      "name": "户籍常住地址",
+      "font_class": "hujichangzhudizhi",
+      "unicode": "e6bb",
+      "unicode_decimal": 59067
+    },
+    {
+      "icon_id": "19552466",
+      "name": "时薪招聘",
+      "font_class": "duotianweishangketixing",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "20417748",
+      "name": "语言",
+      "font_class": "yuyan",
+      "unicode": "f31e",
+      "unicode_decimal": 62238
+    },
+    {
+      "icon_id": "25251131",
+      "name": "出生日期",
+      "font_class": "chushengriqi",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    }
+  ]
+}
diff --git a/litemall-wx/static/fonts/iconfont.ttf b/litemall-wx/static/fonts/iconfont.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..aa1354c05a3fa74e374d7ab28b2b3edce3a9c3ab
GIT binary patch
literal 4988
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/fonts/iconfont.woff b/litemall-wx/static/fonts/iconfont.woff
new file mode 100644
index 0000000000000000000000000000000000000000..b90d24bf7ec32578f5fb749bf3045fa5fe0b2949
GIT binary patch
literal 3224
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/fonts/iconfont.woff2 b/litemall-wx/static/fonts/iconfont.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..6905a00a92da66339a096c08a80448cc784559af
GIT binary patch
literal 2588
zcmV+%3gh*6Pew8T0RR91016xc3jhEB026!w013|k0RR9100000000000000000000
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/about.png b/litemall-wx/static/images/about.png
deleted file mode 100644
index dbc47874543031cfff5a3f62bcfe910c066d41f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9910
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
Z%NE?VC__fEAg~_|(730IsX$wW{Xcduhm-&S

diff --git a/litemall-wx/static/images/address.png b/litemall-wx/static/images/address.png
deleted file mode 100644
index df6e3a93b86a36ff13720a7380db48113364653b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5838
zcmc(j`!`ho_s8*`A|b<DM&)+ga&HW35{V-r6jI1_m=U_XjmRbAQW+UB<T4Cu6iNso
zrBpIa%#0+X<WiYtkV}lnZG2DP_5B0B>$|@1_4(nPv(`ELwb$$H{o2ph<F(U|x!6lf
z?vNA_5s`K{0=hv@K6Ei8HbZxLnZ*tfk?na7;31Doe$yrK*{3@%ru9&U$=2KHNwP43
zw)y5Q7SVsd7$h%78;hl-A&mo5BoOW{k^)D!k6(VKsfI|%sBhjSFNQdJK@zr4Qd`tu
zVv!kkRo6g5PU4{Cp6pv{k0i62Qa=t;a>Go&=^FN3o?(|%uMg|p&z@X!Sz3>?Vlhir
z117()&@K8Xf;T9$uz?gj2Th&9Xe@8q;?m?8x~U*N^cd(D%=-m2+#vb|@J{&p`c4eB
z;@8XS&u)S}&Rq=r`s%80U!`jc5ZOjNg%yVCu<F$Cv8TavMJ6F#(rGGj<JFresESr4
zF=ciB`@2p{K|BF5R21d<#xca^OA8of+j?5~+3{|JcJ7VP_nu;{T@%z|UBF+1mP={<
zz_BdbmzsH<(JtG2mow<^OdU27mhu38Lr8ZtLRopef=HFt{k#aw=lEHkd4H$wq+Z_b
z=FIEKv@MT(*{04}LA>Ji<dShO4TQ5b$jNuS>z<?ePp`9V#Mb2Ix2<u%CLN5Q|Na(3
z9A9gmQrfJPkt9p@&u}6k%dPt<ut9+T;>C;Tj*gBc6TB-fsIah6j$C%Gk!4<1Y#F~8
zE}v_SoBj2;yES2Xegd*`B97l;A4Vc^I>0uh08U42tm-z)0DEd9%}0?0Hgh%RofSrJ
z7ElASNF)-|@*7bjQG8#CZNLyWBJs^>M=+25$(I={CFaDb@mZoQ3-|+v?x7?|#ndxJ
zBd?g17wPAMw%5qYlEZ77a4l{bMRPiPj3W2*+3K`#I$;H&9xet%-f!ZRJxVgfiBY<}
zs{5_H>IT-An6=a;=?;5n<Nzf$AIX~|?gNzM7^k5KsRr|GO{f~)O_U_!fry%teqJDQ
z=&3}oUL}481fF0H?9O1sVH02b1D#A^Lsfd*_=YXZi5CqgyP^a)=f1F*{*F1^mAUcE
z(i%A9s0*QW;L(}B(jeY5@0}~_)oW%Mciko=;a*hDw~p9FTysFU+^PDY&YQPy-|ktd
zjwOy)kzPJ1wz|ABgTgWq?8nA~O-IyF=n_1^1srJJH&Yk_eDjwbRaR13)=rEM&kQZ9
z5LUmw$XrY3$Qhm}!H|~I^7W42L?<8RF0`Mi^?kaC#*S#EDy?KaNZW}~Vci<I5~dEE
zuI^{U$@=M4K2HTe1NOp&3$AO6_q3D>dcZ%cB!p-8kNYKkEx<MXh`+!8Xyc%tJbH9=
zl<;$Wd_0S?+~F+)L>5AUJ(^O(f|-!}&@sjB0p92(#kJ)Ydf}lE)z|4&p4HR6p{6R@
zw30mQbEb6a-KpeDFwrI|D^>1CdT23mZm*r+kIBjXQ8PoW)qh*cURF#FYg(}f8mPoB
z$$hq;&$bM^G-6phjxSi7rX+c@d7XVrAZZ;7OPe-ZptJY$h1ZF-??`GudQ)@7L~_Kw
zWCLzn5v503H4b9~mhPc5U-xL%!``sXjIDo;evQdgJ_H&ya#rFk1H&~S+XN~Fx0`pM
z2QgN+^xE77M#cMU(`I!CH--@Shd@>+46@mkX_>`Qz2CyQpSAn&)Y6sfrlXeYN+&+k
zryd_1<#<=4D`ZhqS9+?rr<)@_JufdWckOihn>_0izTQ6hkxsELs%Sw85<2(9BQQcA
zvb||`k|X=BQ-O+~Uf#^MT>@4l9Np!;s#+h*_15`96&$>{T-HW2$2LF4`2YQ6JloNQ
zKXea_3SSrpR}q-f<6QVza#DNpUbrPEXgR*CaQU~UgV4-8>-0X+Jg6pCifzK#&kV*m
zq^}v<b3;cMs{~8~i>X8}RMnd&ZkBu3wXA@Be&7OgZ`Zn30LOdi)c(zW!E`j=csJ2f
z{p)EAiAOxoeV}vhs1~lt``IbbDD$Nb(Bl&xll2ymw^wuSE5N9hjH{aFX>K`ZDW7Jg
zw+UVTPyq!)XEdG5ZanqlZjm9^<7;?4BC=UIHt{bT_S(lcBq=neO2PCm$mYU-%H~ov
z8UHp%%i>~8jOs|J>DpQIZGV%M2VGF*qLkRb;KM$31LrNK9(HiBAM#Bj<$804ChZS+
z@99<-v5DzK&T=IO-n-&<kGru!==wh2k>?mvm5JZ7Bdj_bTKP|irxoIBf@JH>w`Uv~
zK8TLEaN%d0fr|E>n~j<ABc->C5>&Cg&dkGOD=zVeUB7;hV*A>FqhURfJoBy+dSULP
za$B~c`~uCSvEBats1ioyLjxP|4@LKxTIN#DGsQsBIBE##__RJZ;%uJXoid_P&ni3n
zYF;0Dz!2y$5uB@0H%{n(^7ZT2%ck4puTcZ*MB#I;XI5!V(IKZyiYH%ndDVEj%8{>r
z3fO&Ek>EbA=`ceqG31f}9bi6-xmG|&5N_3;^$CP#HvDDdMEK5oGKeE!Z9S({(L#Zt
z<TR7{)DEgOmxr9%8?$ox1`Sl9%N$`>^V6$!&$|)$pea9V_NmC7cp(MJY<q#gSJt|R
zPrT})R805^jkq<_JWuyu8W?8E$7jjZdhQ5W9xH6rbg1pQ^BLhRsb7g_ZzOyp9H#6k
zUPM!}QBMmTEoR1iPW}1+D-?@wOI1_(2~#eRYPvsr_H0ARLWN7xYWYMZh+768C{uMm
zg|;-}Lwkj`JGbO>#0vz<9%ae6cYA5%0Z|HtpS@J_=vWkbNt<>8eB|5w(W1JTxaNQI
z<Vib0?ZlEqB(}X)m@xb{S4Z_jU*A~IXI7N{BPvVrv?_d<#dJ5(>O-@xfm}rRS!W9^
z#yzdaoog?iT>Oz^z$PTFN?a{yT%KFRfKj6GWu3i>i(xlojGqxdKue^6$D{~;82EW+
zqqbi6nffOg$-8f0|51-S1PkuGuJHY&Uu=lWJ&*lWRXHYtmAGfmpLpn529jdcyE{F*
zVvXUJH@_zg_Bw%%%r*`9@*C&GLZXZoZRQ`uY74kPHW-Mg&cW|WI)B2@EV6m5GBx@|
zG}{@&%iWPlS7Ihy$j4k~7;*;t8Yj1)8v(B*t876@2A66<A=awV9+b*k3??ikXlE4s
z#bu@h9g4GNFB#p$pWC@15{eaO7~~%ZYnwQwC3eOP%BIegg(Rwv-){a;IuMCM5v*IO
zb<U*+Vk<v2;@T^wY_r{+9$LpT(2GHL&kS}jZxFkRLKMikHBFP<O6rwZ1<CxY)Y<j`
zHkuIl@?bmRd!a%G3He4h{!5Ab)`v%88J`Bj(EM{+G<Tos#PfOWk0Ls*Nq<(2<&x{(
zEdE5d;lsui47Q?ud>$qzCtIearIlfMwH&$Pnj##@i^i~Zk#3`fsN;U<^QeM>@Y4Rc
zZ<cu{5f~#6u6pHWzut!I#$O6}HcONC#@n^6GO`}YyI`jh8TLiNa4WjQlZjs13Cy3g
z>WtV3A$>w=Kh{m1rS6E^)NR9lxCzf*mxf<9Gx&95@~m0RR4P?+-Yx_Bpiu2uUAZg>
z>2N!LqM-ZxGrhbne0?lbCbdauhEj8Af7r!R;+m<!FV7|-^TUv%d?Y=`I6x-ynqkr6
zEm>5LOAZ$oSpNKkG#c|(VUIYvV>=7Y-?n)<)#mt4RF88`u$KoyNBwn>J{B5Nvy&?|
zb~S91C_`!Uw#aL9HccraT&YxO)TP_rheRT;y-cMBwjHZc6G3-;ImF)MSLG?2L=F6@
zhC>*8=u23$_gu<GkreMMz@Rq=7)tc5{gPtYC@Gcyv)ejDPh+o!;L4eqnU0;A^rKj-
zW8n1_D*G3+%@N%06@C(Xg`a6&qKP9AHeUXUyKD|$##PVg0LNpza9B9mjJbBCy!UZq
zUES=b2Ze{&Qb+dlT@=aHg|VwrgBOo(g~z54pOZUl)-CMV;wqN{-bn8>A9~F!Qx<>c
z_d)1(FRC7bU1vcGwM!xLzjf5Dd1CyMXAhmZT7nM<2xuXb$@d9IM=pselD|UcQ8}6!
zW@FYao1U3E_XP8HDi}(_708EAo*bZ#jEsnz%Cp^F_*6pCf*!Enx^bK6Cn%-!q(Ahn
zCb;3oP;y`!HxmzZGoRWu@AhC4UYpT>&-Te#%pLg7oKSu5lZmYCoKK;Wx%c}gkw9cj
za9ei$;qu;rfq??LixmznUf8M=Jwrw-DJu^Lj<m(rz2>Upq?$7ARqC)jyvCSartdjY
z>+b0J*tZbnJA!p#vtA0Vqh)*PLn^sfsmKpR2AV%=mX%IYG>a}q@@{^7%h$rycv{@*
z4gIarb9NNuR&xetUrYVjWY69d=zvjC&>WC(uh1Gx^dGmMAZiPE=I5_$aXw@w2ty(~
zu=%+eok~6{wU1w`PQwFZS4rs%GtQtONT;lT8k_hagon!2Y}LJ{#3kK649d?X$)Z##
zns1+x8IhK@yPf+^%SbpEnVuOaEiF~VKq*9ofsZbHeN|f$GqUW^sWAxHvke!I=4h@W
z@fy*aW1r#84^I5f8f)ofTbi^m5ct!<9K!w%<x$L6L*FMK@*TA{LeKYOw1VE8#~ZCw
zja9_*bSukjiz=2-jg!d@H6}~AEl7bnz0lr=)%H{ds-|!r6)#*)KkolK&$b1XcpJ%+
zoKA}Eh61P!bW@hg2QMq>kNz!yVVIUh|EN`78}Ugok|jG8#%@4M%q^pUI39sHs;w$6
z$nQ)2rSrU9xbowqTyFv}XdeC%n2);W;hiKuTHT*v$9<1@0nE2GMK2Xj<(r%-5~{<M
zyP4t&%Q;BEo5d8yyj&$Ajd7h-^4y_E#zKi&;;vcMTzjzH7!VG9{!$aWe@p-_IAQ(J
z7bicgVp&CIazmjg(KbBx5Zuxmc;^t=Z2Fa&p@w5`-9x^XMh&c%{?8TmzoZxczT1Jq
z{`K|s_JL4S>~%&m_{jEJ&1cSa%D~<onI}?HQ~wh1d+KoL3p#IGgF3IzzkByi3RpqF
zr|rS-jLQmGzdq=UQqQs4^$F96WKcv|rq1ht{~M;I(xV?Yx2FOP*_4eDgdli(?j#It
zcO|@Oa1$^u4GbD(tjGCejmq{Kf(w=y=B?(vTo1V@wz4*`L1(((tl4j7^_pp~<<M}{
z;$<5|R?FhtmCC5HTf+tQ^T50ZBtUH=BYwu=3!Bm9z3~39rcb}(hLHkIyJ7(JUsN4f
zU0GR^r<S+KWD8_~{m3}+S1IjkG*=~z`IXL*`_~|lf}~*y0cUwU+U*uaM)LNtt_W`S
z5nid&I*XR=gWJ!M=2Xkd%^6Bpr=^kl;2mL=B09mZK9z*bdLvWXNIj@dE64Cva^=aR
z(+%B57VJVKW}o)9KRS{yux11=QB^VyJ_-s4z2nbJaRoU7;p*&$b?fQGJc?62K8uAE
zkR5V{cIKu*DrMfai~-y(Gc$JW@A<eb6N!86qGpVSVr35zNgak?!}JXxwdz%fLz2>b
z+-0NgD-M9PZ#aaMZgnfCfC}YLwQk^tK0YNe9m)HQ#Mu5(m75h4+X|PrlILjjwb>Xx
zB&f#FIk=A)>O0kDhK4WGnij>8mTG_Wbe38v-^(J;+0ac#%hqK0T9vAw(MvG6@;mHL
z6Q~d38y^?vM^aLZq#qN!;VK%BJg=_)fyN30f-`8Hr4Bj42eIc~yBxrwjR9JB5MPDj
zzP<)SYuwvAx`mD5RT-~d4-{Na96{ipVt-P<4;=<oa9D!M^yBk@36q(Iz^G&@OZ|^B
z#mM&}yUa^e+TS7YSEF-cyFRUju8IQ<32m-T5!Yi=kUSM>6a=XDAgg+(&;b;hW{vhj
ziEIDu1V%L@>1A2>N9OYzb;k{W`O3NJnvvTqQ(1DQ)7|$enhuE-)7#KZu;OJ1hlURy
zKJ21S(*W-<_=B}Nw0`E)wp&9uQY=~nY*mqsTebSF?@q<%6J4}um(5n+Fl|5~b<E#H
z&~?wfa%68f=K<Wg$Jq;lJiCR^bZeb9e6wk<jBW~5xj|Mwa7Q*OB2WEa!-#)h7XCk>
z=YKofI*soS`orQ)cVt2so<xi|NH;n`tTK)$7=54u(DXGLiFQ!WDWfnp68vC4qeV*t
z8tpPK6N&7sk~SiQIX!39XH|V4a}G8?Y-w3~$t#x{J>GSG!@Z~?O}6(>kLTkSb#XB@
z*~8XgDURm@p-Mk=7G+f|6i0ei_veCKd(cBBJTpvIB$*`9c1$l%W_Eh|GIJ^37HTB)
z0u4mUQ<ELAv(_T8ZxRRGjS3F>-SfD13Uurb`=tvETGT4Ksfmbr$;tldV6-#O6sdGG
zGa4dp_(5;yVBj6Ux`CJ={?IQl$}>S<^N<J(q9h=_ps|d|3m)FJ4!QM!xy(gc*??sp
zO@|OLYqfAO|DU7ijS@;0^9gDtSwx~rVi*7Wnk34<HY|0IM3Qv{?8(!oOG~QZF*>x$
zf94NWMD$9*Xj_Pk9T=v{dFqwyiisA=a(M5sEKF3EK@vfgm1w?gDrU=0ZYS?R^{^vg
zredP9653x}^IJHj6RGD*eV#%xuWM^-+alM?9}zCS9EOYhu}}k~vCo+Z{M(A37PXFZ
z1gIIfc*b-G!3MNXC$>jSrM}cq7ZFqY`5Xqm_BUDF3V7=R13uv=+btJ1BJ2}tMT|vy
Qpgy&TgPjXlYZH+2U)h8zNB{r;

diff --git a/litemall-wx/static/images/aftersale.png b/litemall-wx/static/images/aftersale.png
deleted file mode 100644
index ed338acedb0920aa8a60635f4bfc3e7149f87158..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8742
zcmW++2RPLKAOGUw%<iZp>zoxC*)luMI{S>Wvm+%ddvvaRmCPd&B4=bqM)vw4ky*$-
z*?W`dfBo-y?(Vtgx%)o%9-sI7HNMeC23m}C*XRHMVARn@W6AH`|DI54@@vW6(o6tA
z06J)tX@Kp94Q;BmMwQCaHwI-EmVg`zV}icX?c0d^y^^6t0z7nAy?BJ_9=%fvL>gM(
zwT=)3*-3|&yeKZb-ZnCdM*K2Aa*{;kc;HY*#%SZ5oI$?I$>3>!QpT8+k89nk*woQ<
z>F=hKyyh~)j1Rwy&Pz8&Zb4;<&szot228ZHw2r(vTwQ_Gui+?IZ~AczIH5`fgbN^l
z#(?S3_jQlME9d3Y!Q~@ho4w16Yh`66@cv+qh84D`z%2I_;I3=gx&a+oJ7^4<QDp#_
zG&|0s?|Y(^0N}SIe#Hw2NY$YNRH-6pC}z(~OG{755ALt!ld<LxX@_!8ld(!HwLtk*
zAQp&dr<hgUm39Z0w}8hNfyqVrZ=&c=2GE`RnX7k4>h9w7Rz7EEX9vE2|Naa>z`fkG
zU$h;F!_Te&KX^$uSu`<$cjm4oMAG>yp#q*GkOKIZAP!{G=qTmb*Z*LK$Wi6ZQA3ME
zDGf1!;U6v#Of9sSo%-I$B;WE`EM~yXR)NPzU|GoR@3$YtQNXNamsiv9%#11?MA0}5
zeEPzv0V7`8;<u#-$`}k&-cXLvQYzI0Ei&l+lBZ88%2<9DPjn8k{OV-)3{f*Q>|X<B
zOTd74VmC8{wb0Gp982Elh6c-$-9ihk{2}IC+p?{-)AMj%677>}P`T5SGUDYkm|VvX
zqwN?XZ};r%EJf2+a~2q@j?SMwOM1D=G8hU5?4*cVl`5?kyw~(LF1%uvBMmXeh$3>1
zct|~0>_?;jQ_@6puWf9c`Q}fqvt}YNg|1XB8o+iUN9>qZ^s*dy9E|+U33#0Pa4cQ)
za2&d8hx~xoZ57-O@AAroL0YZRlb3-^HMF5-M?UjlDJY-c_i#bC`yw5W%EV%jlWmAS
zZ4QBi@=-x%zP*L1ywoCV0tRryr{?9q^+zIR7rJ@XpemYue2f<_ZYfDhR>%QLNqyG9
zy{zrHt;bJ#a|fWr5VmNL8>VJG{Xx>o#(;;G6gYhf-w^?pAIjVV%45Mts1B=;8M_*f
zaY+?qpZ<r@HN%UzSr}Rg1Y;37OMAUZUKiwm77I1-fs|PO!YaK+yk$wJ+?3s{-M1^q
z10SGP0*d2iU|{%D{%j%7{L)rGFuS}RxACO{Q-dTaT8}pJ7g1W4)W9HY92{>|RaC-g
zkz6yB5!K8IQJ^XivE};N)E#A&cUeMOdOzml$B!)0%Lib$Zl%bO>y6}|`kwNHer1$<
z)lXXVeqoI0{Tj*^Gqi6NVYgF6Q;*9pDDx-;kcY!(QV+e8#W^f$2;QMw6Qx%9lgwzL
z{{$9ZQ?%UhWoJ>3oiPo`D=XW&LC-4Yl(ZA8S2G>77Hd`WD3l(aK@HUBGqiO*gKg<q
zxPBd3NJLawJ`99GJT~LMFYc})pemjlv3YS){d=}dz}D>!4YyZn$U0WQ)&!k&ItfP$
z9T)@JXRLzK-SwB?s)G30Q)s#i>YaJf4(*sCFl#16`JbRoh^tvDfgOiu-zkEBd?OhY
zha^2KT?<oiZsg1s3$YCmLuRI8Ba^pIyB0PALh`B?aEQ6G@BSy9@<fAsp3r7Lj-{N>
zK1*R<t+)%0ZYvw6%9%^b^zgrelPm(9a?NY2t3f*9;eQSHVwZBCm)g`Hy2Z}NKzU@V
zKaenmNo{=rZ!{{{I!=d7@B5w6QxHegfZ6(jNNme5#=z!hS!kHb;rw1WTB+S{sw@|1
zDHa}@_Jj@IL^kO_TjlCyox$5B=BNGSRNz5Hev!o_HE@_^wOizr4|koINe}qriBp##
ztzW39sMcKs4sr><U5+cn8K=VebEJrbKVMx;Uc!tp%4~qj>o(&*GHRem+@2$^WHe&V
zicTeQB4w<Q4QMcgw$_XlHdri59rdNl{e{6#5`~SC$gKR}nWKKorjU~vW}(V7N8Z`M
z=^d~;rBP>+XKHA4^r)?2N=qNvUFWxU$i>b5*BOFUrH+uJ;~BHJSnm)tYuegNUs~!g
z-`$E)NBh1Ycq?X`47izfpb?)+n<(LNF@?DB_^lFCVecK%f8j5RcsD|f)A!Rhp~rm7
zy!Go9Ur%Vb0%i-`G=7xXHGl2y?nWS0zDj$(50QWHRvdqP&$7}o@%LCm65I%rVSr}k
zK{k6vCk6bi{gh0jQEBGA%7q^#^iAGXxs4Xo77EXu_#MyTf&Avln#dP+-`9F@BRCN-
z!Z*zER(n#loJ*{wvnT2yyEkfPR9uJi^#6{yU4n-``u6sgtE`n&h58cthy>9Itjd`S
zC(pBrTJE!E{I*Ct{Fjs0YU<tc$tNdFitDr0!JlQ45z6VZ4<#*BcEo?{V0&bYp?F(*
zPs6%m$_QQSQRQ~ALQ+iS;o^=`93w(JcBN!DGjMNF)Vlm01^1OIe*Jp58Ad<oMu|m{
zCq+xROey=FGTSMc@bf>{0Fl8FIKM0tAh>iUDTF#zKt5=+-MWa2uwz$|(2Vq?j$ozb
z2@v_Dqyfi|U+a4HcYf|c#Y5H@Ora;Aw6A064VzJ$QEyX^r-i&Ng1L^4jv=&-b_@%5
zXnDqXUA~%JLIu3yj#^<!c6D`Z1|m#YJ}r*M&KDP$7hU8Vu&-QXc)I<n-@olKb6!>b
zZRn2eu%6Dsd+2VI^ebxp8`|ia3#iAY#>L9|6RrysO8uvj$R-}@D`l)|)^J|Cb&+8x
zc?7D1wOSspXeF5k{fUIYeb3}~X0i`1QDO@FJ1m^#V@*oTiy}+ZWL_YSx~v5SO7<Az
zln=)wip)zK_TcFXz|+*u58)Rg+ASCKcwZp=c}T6In^|kmU|pYT^{lL!VB1PtlxU@i
za$$B&EiKmKyC2oozI`(~;@c@u?tWOpps0yfO~!gps-`Pkq99&sKKvt|w8%0jmrF>i
zfBFIm<t`HVTz}JT2`@79y8QdL(c4~G!yR&Wl~6~_Ggx`QfRV86N}42N$lS{`3SQ9_
zTC1GgDCcbH{~GR2ugZV3|L&gLXy=lc1Km9v&~O&G;4W-K4=nv;(_kq{1fO|68!Je5
z{I-@yBb?mBV-e^T^E1~j5)>aUvFY@FqWR_OY(wG2Gvp*K;9*gk3@#62G1Vs+WexbR
zHSl<KL>H4cz|7AU_N-?kkc<20;~4)bIev~u&Td!w5jjxiqZFw<184@uM~SXJt)FA#
z@Cr<2z7bP%1-<`udU`r?$kv^FrEvI;s^5(t0=NEqYE{hRm_FcX{1GE08xq=x@+u70
zjwb&jO2AXDz*JFVW2h)&+12`Rd;9SW`Rv&M<z+6$Bj3MQl{YtMZS7)pj3M?jg<Cor
z!7mB0!DrYWA4}7>qIu8$;iE_#qITk4H=`O@YZ#h;nWd^j;Uav-(<r+-`Z-f!{}nas
z=b#r?P*urh^}SFC0lVJ&Hsj3$qICGp_fT(Hr0qMiBw1QG{B-%Z0}SG7Re3Dyr}pyY
zfl{1d)h9K{@}>06&CN(My4upU>?`2^!3J!9%zaVW(_d|6V`C#|R`i|rV!Xv==YvHk
z1(U(*>3Kgqq1|aMmxreV%h@{alml%Orx-U^y%P<N`H<>Mf(NbrbaijMCn)gy`h74H
zgLCo{8*Ft0sI#x*oaP=XKjGZ)7MArT_7)Hv#Irc6?g&oJ*NH`S#5SsCXvW{Xzj((F
z({I@+mS3S+8}K_B+s~7u$T$hjK;Ua7AL+iAT`7VkOdWp`9Um^NM%jV5WNa1yOvTeS
zQ%9VU>KI=jyD{j7Qcmsh1ye;Maoe=)?^|VXFW0`G&H7OI13ONQ_{(5Gq)TgIH2E9u
zMo;j_Cy9(?$RVwd-tX>w#eM|NZz0^1HY;Xo@`!nS_g<SwQL#}=D?or!7B!_z=3hjk
z_k>kyz*fcWKR;LQR<E2q@`P|4m`ap+p<!w8vAwdG=K5<CI)v1wYV@aTut|V&=$A^0
z-H&;GOmp;q;_xYPVo0@{az31l=D4pxP<ew|FRR~TG5P^iPJb&rBzi6eF%zGU+v6DY
zz_cNCHL#KS^4+0cj8OIP5Z!eQx(g%p>TuK;GOh~6b==uEJ~Qt4szNj!N!;T(l;;);
zJ+3sSbESVW;K~dPe?!8r2WR?ULay3UPb2XIl6TUsyI(`O(6+lsL$5u1`RVPOpW4Jr
zWj;r5i91R~)(=*hO@#c!fRGlzRDhIiA%4KHn#6A0zo!@S*=t{TgT{Xt%G^YoDa4R2
zab3g8Kt^`pF>FuZ&1*ZQ?ex5X1gT(JX`Q8&RXJlzUyGzhC}1s$ze}80EYPnrxLTd}
z`(>B{kwCJDWJKyCYpylkH^JC20c8*97Mm}m;+0-r6<=fMx&HP#+`hzoezsEK^pnKQ
zk^gWNWgN2G8W_98N<@n1=k;<mNT~jRMK$VCmtkKV_}mg$q2s}SkuqhOdX{X4NxM4U
zWCGps%IGxUg}T0AbAC}d{S@@{vU$zeLznKrWZhJBli$?3_!W3}EcRw`EfynJ-AAPc
zExD~y2+IZYO{DC(HyHyQOB+9t4tYsF`Yv(NyN=J(Z(8=S#a6bxV1I5p@UvKpxnr*(
z3qi71(1s7P1_cNA3+wKWZ+~m|6_`ybuJz|_uzs^a5c$9!Al}y1n<l{15tw!*zQUV$
zDZO>A)b>-#hXhFBcXz?P7EkP7tVn*|x*}<v7Q4Clr+`Hb9UJ#&<Z+O`Qh)uOVZRks
zJZ$exm9r*5{!9rseET5+Ja60Ks5tyERZMaV=iVC;-f;hgv4hh(kY=BPv6({n6SP+E
zZ~E4_d>levFvjQnI$*tZdLHZ>*X{j%LSOhj!GTJ@Nv1{!{SJg!G>4suk=arB$O;-+
zr-wON9CxCZd$uY)Y1+B1HeecRzwlBUMm@3DPz7F>iI};LPxYjgq^FdK^OY$VZ_+j<
z<9mnxca~9C*D>9GQ*0%pib2%0qV9oi#L!%;KlWuaI7$}0;f0d|Tfxw~P_IQj9H(yl
zc2lIjj$YhdzuV%^^o(iSW^WKTDI%7n*PzHcE6kU;A*6{GGanyKKSyO_YbxW!NDQ@d
ze-V#Em4(*xnSAq7m%wM2rJ^&f3QaSmhm~#fnfYQf%;xXuJbY(~b82t3EIFh^Ui&eq
zGNJw<mRCC_mBsj~6>d4ELAD2vLj9!x8v8z=(5$*b;|rUgMvNgk(Hsm8^-%9y@Q=|U
z0<`cg;o(S;$oi6rXD}^a5mcLUS4aJ>H1(Z&Xrktn>o5-<#z82!^kuJM555!Hcdgw}
z`uL<0hI4(ZQ@AgsO~=0La-6bqiiPKz7l{hyaIgBpkX$QuoBA2r@yKU{;gzo<&KNQ^
z9GTn}!o8>XS&xSew}tt(F$`g~0<Li;xF%rX_^0NWk5OD1@g50_TSP%<<fT1hY$lDj
zx!(<5R4H}D9cii<Fbqk2d&NAP7fR+>S~?uqvAl8kbzan`$s6#&0z$=*S8)8}H_kPg
zd9gng67-0?+9l?Sv7q^bCyPyLAPu{-q60OpPR@aD4(+eYK>T7Tr2nzPX84epzq`+t
z$gnb0uGF^dK``B`I^!)qT={>ch3~7=juU?>gFJyIqIdSX-fcTj+Xfl1s)bbWy2d|7
zyistkga|1qS7$h#aRE;r{J4btT|n5K%Fu&VPrst$4!r>17#AzDjAVWFgxXEEhqr0;
zU`QQp_Zr)j=Sa)Ub>a<lYo7jnxHR+Jyh@_35N3g?(YbhsX@)Ao@y!7M|4t+%{bBa)
z<#M8YE0kSdZO3GR^H47!Kz5Y2=)nMQDICxesRoArYr(10ZJ%Bpx%?Ew0zcTw{6r7>
zQC*9L@2&UACx@Z;VY>0V{|@mm%xh?6M6XhZh)t^`D-@zEGyapz4+QRspn7!4719A7
zr*$&Z*VWZMS=rhO?`3wPv;22OawdaivW!+>c*huN1)dryZSW1hcHlp9stZftj9JT#
z#KTl8rL=Ku_&6%KMAd75^sm*))?AxM9rr&g89-?=j7JUFlA=t|pNudkyt?rah|ZpV
zP{93n4+LGr=^StNb+psgi}=~Rwo!Yi`y~3ZXLR!FZ5jFJdR3EG9ZTXZl=`h=K+A-O
z(aU7Sz%GhfXTWy1a^(*_*A=;gv8aK3ghWgIpiAr8Ye)tIG7J{rJAtnxWH*>^Of$cf
zTP}P!)LzS{@KI+-?2c=1`G2VFc7q#4+Y7+VfSU*~W>S3p-MYk9Ond(Jp+%MD1|xdk
znG@&h@4r>)yE0@q&Tn49pThLRIYCGXrPLpM0~uysss4mT?Xk2>@Qd%z)C^RQV&rwA
z3IK!<rlk+|_t$Hkz9j0WAjoA`xU2TGtsg;NY3&Zd#V&5v(81yBPI4<dvMYTNV#7zy
zi0*4ZK!Rqz5&}Qg&&)?DRNo=I#r$=zp&qt#j}dpBrz3YZ>k0KoDeX!xljm&szR|47
z;%xN3na~2?k!}iN2kM}&^5#`FN2urQ;SwcJM=&|+oV_-%rf%>NxA5-;i`Y)jJTo$z
zR~kDytM{ctb=1_Ap5D@haegY+6N23g6uEqvw?ph>oBcicNP@$*v}}%E0`c0!Lg4f>
zFd)Ss>fqpD<J050w&n@8j!XxA^>^J8gRbm<Foj!`EiYxDyEHr<Ciy+%Y<$xKHdI><
z(S%fl$DOJ>mD7kE8EnscQIyN=55rri9_{$Kxw)o<goM7nZg|*V6i>&ei2p~{Eeq+<
zCbyp?ka{K6hq{eJ5Pz(y7&*qq$NW^187;>kO+}LbHcf`f%8v{%|IbC5YrG#&o;%L`
z5<KT4PRd}uF?TTM5+D|pF8V~WZomx;l%V3>1O!+DMNlFrj1E}^5dga%XvS`z%0YRM
z>Z=yG4n8RSj2b>1V^T2w`lmy%d#ADpKe@n)WXxF>X%2(bUu0lVa(I2W@||-~FZ*Q=
zjeIFfe)2vMgiUb1letmjk?tE=fNf61Zc4GJJfV(OjnsRoIpP7U-aR!C0I{n=z&4G3
zLo**fb*CzuALQ3wNx6$DtN~h<{Gd2ckX!{B#Ykz?SFw+1w=j`ptfd5Pp!RXoUxM@3
zl(Ru{Ku+e6o(h`JD|zWpRyQ{nS@B74#nCdE;ARR|mfAN%!2FFJW5$ZFY}!>RXtR%s
zvfF32#ijVstby-#S8%C#E2@Y%TApbccFh!o#1W#7s_eQqKbfk60kuq<=udi>&p(*a
zRHDOdXm#gobkA*A{~i;%V`DJ;jc*Hii^ujUeECN1VWB>u6zr-L@YuZ)#T^z-gpu$r
z6)A`m1Q7vkJ{u#`cun-%VUK~mBk)*q)USD1@5jGlT!KjW8Z|mkHv}q*-Yvh^%bd$b
znSyZU>23rAB3%6K{=p^Q2d*&P_%;^u>SzRK2x|<-j{~cQ{A`-^Jl_1P8=WDnou#|W
zW^{@TUMQsKL6`_vcY;dZ_3_V`OKyx=3XI|<ZPf9@2lI0Yo}<a+!PLvv@uq%_>7&O2
z0Xst-@p?6d+&W~2b--j3$cy`@!Qv1BjPMJ<HUeIfwUQnE=)x|N)sgz+;^xE6hM>kU
zBN)V=-E`i7rz4ws_nkgDC(|+DYt8G;*+oTb9p~p^valN-6%e6JnX;w8Q63Uz3Z;cE
zOTvbk-3gm`ZmV^d7eiKOXTi?dD21RsK9+X5t$8(2ac|^#XWez;n29pGh&wUoWRa76
zAbXF_vhK@l+Ns6S@jQ`=pAq;;K*-I6>?M&WFc)=1(>P&|Do|)4!tFwFg9d_$GIPl$
z4%Av%<j?WRC9tmc7<S9>llzQ8mi~unNFt1+`=-LY7YU=M=-)F(kQk}cYJN90pH?`3
zJ@<&$@}xG#gt7p(h3`|rbMr#eL#u{>oh;v9B{3Q;WLj$~2cL=qgV}$b)xt;_)VmWJ
zelD;nXf_L`s%&T8bZl|OgUq<LC?a0^8Y6Q0z}hI7!}~{>nzuM{+w=Zmkg^PL`L57{
z-%qyUcN({;o(46Z?<1g_p4HrsOf}Gdd5I&tahJ`W<^6+#;)opkSHC@3d2(iWNtJlm
z`tL!3m$!wX|MHV_)97$?XJ@A|McnROE>bB8oz9FWCS%u8kFf#PuPDVYtG&(Pan%r^
z)Q1;*clUIZO31?{U6>ZaAJ^J*`QRAH+G>N}+7CMfDM^p+pUf6Umf0Q(1Qr)-+!Ll;
z`%y9x91`-!7FhnS5e0_51W%znoql^AmJa$(SWF`q(By!<3O^e<I%`kT^AcFF823ib
z24+_CKBtD*3gc^Kg^-rI#ng%AWp@rw+!IS#)i@jzTYD@a*E%P)C|Z`m6p)%o_%3ZE
zjnsZyC|3OIvl_TJR8anX@D@2fTPUCk4wA_0vTj=6#mo~8`*F#qvSUjyHU;b6{QCvP
zi#{w8^8ESpOa%pnpqiB?xs{KbrqEZkZFB^zWp+v4rNcNfiB(S#v+1!9d{_bP1p)Xi
zvizwGh)6$;1~(^az2;lV!pE-uZl3`AON6?*djC~+_KADm_AKTO>O|}<kAKd@kbA^;
z6BP(qZs9{_x(rDo9k3i?#D=eYc2eVaA+)aW*uuvam6XV)W=-hMi>oIdDNMIp_8QE<
zW6|L}=Ks@ny*-(vIDMG;df>Df7!XpahHR=yKfL-bSy`71yl`2P>7{z$vLLqSg2ikS
zh*<A?<m80UQc{u9TrhyEp&N~2vU^;F6evT~6l7(eq_5<00M(Q&=W1Y7MGFFss#QA(
z3jK?KhPiuxWs}8Em2!yV@A(9!D_ng#fSqSThiEcfl|0MV*NcB#=%<9Vz5L$mrwVp{
zxjJw+uBD`Ax^8~4Fa0u->k1jgZMmB8Xlp0-BS}{J>^kW8z~fv(;%KI<AB=LYKCt@R
zK$zkTaM2D@!40u>a8AMULYwy~fhKMVh5E&mXK|Jv)SwS(?xpcKT&{so2++V8c}P$5
zE-(+;!FFIg5Jmbg(nL*IDSy-qe~u#D>&~#{o{tUMcW+&&<CDI*%C)Dht*s|bTRu+t
zkq!=gmJ84L&2Wz$X=rFJ9)^ZPfyFf0OjqVEFWb4gM;xc@!=&O6cGy)8j>*2GP+Nm7
z_WWb{rV<iCDnZZ>SMCt@>?)+SudY=uPdWm&!!hcoO31aB^*krbwHsfKI3x^<YEj%*
z)ZUKwq&Ta^$MfMro&S5t01xGa&kzm-L>`@as7OJMnQuaITf8JOms>TuHUF_`yFh4<
z`2H}VZ!onpygR!Jm|q!pbnI<4`rtvvL*M^Ivep={v!F1a<sY5%ok;R)%O^FYf@4&2
zS>9~<0~8&DPxc-$*i1;l;KD?)+Z~l8^XFigg6lVqkN<E(*Y^ZIyG6)cPhe&ZGd!u5
z;wKKwuPc49|4WYcrmUwV<e2jD*A!8u2OJr<Sx!|JS&F(?mbD30{16>S0eepLryviH
z^;b8{i;rD%%qM!&kmZl2>drblJAaf9;~^KOhNq@%Z0dYh?8v`*TjdOyd-G3E*GB)5
zMXK<i`obB3qIIGJB}A(C13}>mAm0(OBN47%wYeP{9>`%==O$M|gwVdWib9a|ft#u*
zNBNK~3!P9d{_8U?8Mxa4&8=ZYiA@KeKVu7vd%wP~OJTu#EwDzDX{2qNQ0i-IRkAg9
ztn_EdSJ*Lt*S2ibkQO&f7A#HFI7+>3j?m~|P?yiz4|$+9)<OqP$U18HX%Yg34u?bx
z=MsvNmOlpe!O7KDYB@R+r);6`^)dYF^%O>G6k66X)0lv^mE3I%@*DkgvUlsSdqu}e
z1FcFKVL~Jb7)K>unMgQE#x|mTxsXk~n>(RYkLR;bwAX_ZMHI73AZhpS4!z730(OEI
zr7DB$Q=DBdp=z)%LZ!3lf#5u&nXX%%@7C%(E@XZs(Bp1OW-f730wHbA%vYT?jm8JP
z$QIq_4Hbc2=d!K>Q!)YYs_nliYnYW?O9RZ3QE8;ahv5p5&*ZS=Lu?LZlDdid@g%AJ
zJ+cWz47_#O&7wb#EFM%nAkNEkQ%8)vMQ(?h-*<g|x_$LCvKyTxObjsGg#*hvg;{CW
z?a1z*2^ro|CH@?Nki8BGw66d%&yDK8D{xPL8@br}g6e$>G1@k51|}wz{-d)S^G)oj
z7y7oy%JG+$mfIe>^VR#NFX<M}?!h2S9f2!yR+n#;B7g>K%olqGx+HI1nC49-QF})@
z6;T}-_@FpP*Jr0F&L_1E!>{eg19EQ+9|e-ZuA%Pb<#3^TZ76)=o<!vD`$fGnsB0<K
zy5KT~sk2~8GPG46-BB7<x*@&vb56O_4ehJe+x4)|X!<s~OmufJm<K8;kq!WMe8f##
z@0{1s;44I#ddC(e&?WQbOrT;Mn(@04>n?`ejUFi!+7cJIoLv3dZ}>?bzui@wo^-&*
z&#GVqDIcq}@}eUV)EsMKhBvoY>Q3HlbMrH`R?g1fUxE)NtlQGUv$EP2raivf_e%>x
zdB#2m&Y8?XhsxJUv%;*E6JM?zv~i+yIl2n{{QXB$L@X)_H5RV1viz*$j0C@e_W`)S
zw7Em-Q_e@_6orH#>47|Zos!GqA}E1-be?nlaVy;Nv_Dk^a;_n#7v#T%lA%*9Ur*vM
z#u>Zqix>Kt^*~qtK~~<aWE8By|K7b>If>mx1>HH?p_}g;geKqT+Ec=7hL4{d+cNzk
zBd_=9eL>)!W6!ImE!AqWXL;^HP%}iVyL#N|@_NFLJnwxt83i61%<^;;a2dDFnXFb4
z2_bl^9@A?$Y1p$F-na0scE^`N0gY<CRscXT_wQZ+-CB+lLF9Sm+#UyzN)P-=jrptk
zQR5)mr1t>5{}h>Jup(RMOYVMoJL%ZCxMmu-T^{}O<OeTWUd^psiqcvGO)YVH`&=}U
z9PI4#k8M4_os@ao(oD(&A(do^r+#*JcC=8HXz{&hAL4d5=m1HgMRzy_8kk3<Xp46x
zIGt9-`Bt1+cENJJW`C?5sFRIde?|@!u`d(H%sX>-`m`6Xs?1DG1Z&iX7%$L{#PVr7
z(v<g$$>xx0y_J_;eEv7jV%_DFZF*UQufMof18{mgx|iYOHo{r>s=eA;ekIcE>p#0}
z@MddM-KWJ*D<EkU_GDk(#Fp*+Kkx5ZeoJYq7agO02Cm6w&22lU(Y%u=ah(1oijoc@
zGyHb=jv3GrUjM-9%PS~c83%HdEi57@2vzh(x-j)$YX`rPGe>uT7D=?VQ>wC$7m`Gy
z!x0(D$usGmafdH*l9`Vp%tL_*5QB?er1iN?>G#v3JvFu&0AzQ@BETbF((}yBOva4!
zV_kN%K1vs+|IWALc~sOXc^DrukPW4U4HTN==yV0FRfKPJ$0dUI4UXjtF9PShN|w%*
zNquuIGcGUMT&@Exht?N)N$u!;t1hqOzwNTNFAO|$dH4R(Ac6F&<@c|V@BaXFGz`$C
IYWHye1Ee87H2?qr

diff --git a/litemall-wx/static/images/cart.png b/litemall-wx/static/images/cart.png
deleted file mode 100644
index 3c9a08ce4a9fe378815caeadc1fa419d4c782cad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3030
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
QSJb)etdN!z^Giwp0i7$b*8l(j

diff --git a/litemall-wx/static/images/cart@selected.png b/litemall-wx/static/images/cart@selected.png
deleted file mode 100644
index d46f0de182e0b9e70a3291ca5036c8cc2454f73f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3368
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

diff --git a/litemall-wx/static/images/category.png b/litemall-wx/static/images/category.png
deleted file mode 100644
index 8ffb7c844eb9f51a2f2bf1fd6a78b6793532085b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10859
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

diff --git a/litemall-wx/static/images/category@selected.png b/litemall-wx/static/images/category@selected.png
deleted file mode 100644
index e9e7efc0d386f4ab54fdc034d5dbb965b785a74a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11372
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

diff --git a/litemall-wx/static/images/comment.png b/litemall-wx/static/images/comment.png
deleted file mode 100644
index 9b2722fa84051e3a8b284bff61ec1e37913beb0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6330
zcmV;r7)9raP)<h;3K|Lk000e1NJLTq007ni0077c1^@s6ls_NE000<)Nkl<ZcwX(D
zjg{3l6Ncpq0u=-*$WlR&8^}^YHWg&4AW%V|f)6SPG;p<45K=*w3bLs{-+3?Njq%=V
z&*;aJ?D08!@^fX`9?hc}jYd*u^r~6{hr{8=uInz0G0%-LPmD2l#+c8>nD^FN{8O(A
zCD2v)PP>04=iJZ6m@9&5P96a3jkWgu?uAyF02Hi>8ias)MV3kOX0T${3YbJ>dCMwT
zdF9KhJp!m{{kO)LR|*(Q>{$ybSXsq8U%7J*W2XNxTt4Yr-WX$kvDN}Ky$VP`!73nh
zJkmM$8>~y_$HRKP&io9m{)7Y+td-TmIfv*TtQ4%(8W#c_uwEKLTtnLQ3<YZ?VLRs@
z5m1*aJ#zY(H^!LP)>;HQ^vWy&1uL_F$?d~D)E_HasdHZitMx+1Uilkc!OARS=N#sv
zemBOzVg+B``!Be;>$>lQEBSgOEEZhD50Ulg?K2WkurjF!xqbi&U<F^^`%hihVG{TV
zf^+WDdw<<^-H*YQe!UTOzKpCxZ$Bde1uKJUP#7JqA6&qoi-1B@525o1mvipId;ca9
zFw_m#P{&<Ct#tk-1uL;Yq3|#)p{^fXzOL(#MZt2_$btc|P!|zUS&bT|RRjeqp*&-u
zGRC~6%n6YNA-5BAV!sA{j=~ivxO2BDScwE00~J}Rt8;E2_Z2Zm=DmLxXuT9JuAmv^
z6fB02mWoj150kzjSCExD_aL%fn6pBLe8`1};k%F<^`8GEpkPI6Lnu_<`+vKxyNtC`
zGk_s_2<!D-z$YqP0YV$!qF_Y`kkXS7s1RM=`@aaPtVyyIIRsokh+gn(VMGgA0hEBc
zH-C$Q71+cPV=634MAT0dpa^_T%zI&C8m`?>!a8)!B@~!itO$YOR#H}2D(O7cOKUC0
zKdWEPIYbSSQ7^dw*VDB+0m+NiUREtuKnpqN{tSSs__!r-Jc#^4%yX?`VFQ|@%3BmH
zVY4{r5dCAPDN&H(c`XyL6q5fS3~GF^*1iymYS+aTEJ5>2d;Hp<8a|bR8aG0?u;e87
z!c0MH)Lm4;Vzv*BtN!MuD%A>ABwWvGvAoP?D^^UwVv625hooB8BE{OFih%30we}fP
zWV<d_4Op-U-uoZAuEWxG<GshA`8Z(i`~FkORtlJ}Djuld%8RBA5RBno#a%*jWij#n
zh&D6DyJJr9Q!R@)s{o4{m$Ska!W$-4Z@l+6xuGK$5Q@j$qvEZ#_L{4uHI#GC;eD}o
zjC&yjpM7$h=H4)+fw?&Rai%w_SZ7uoEa}+gOv@uf0BeiTV<p`*MKb?`jEcVRIgQU%
z;MK}G=O9DwB=Qa7?<rr7*05pmCfsd!Eio&ui(Aziz>+j5r!CQw0<r<L;GUHl8v%>O
zi^f$KxqI@(7YQstt~erv-1Mg?cbA@redz%aVB&fNoG&asv0VdL|3vmqOM*r^4-ODG
zxe|BoX6GETB)Dsw(20wmvGnq5{w@r|-&$**O5cy%e#jIs#aN}KM@NCbRQb~HMZpRP
z3M_rk-0#N&1dK5sxmg6xIan)BPukqL>YSj2<1Kb)A~@(Frj5t<7Ig>r1lAyQxCyXg
zfZ?p0h$Zi|W!Y>)lMDES3u`K^$yv|gaQMu03E>Hx%|anp8tcLk9LZ^&PKiUo%Bds^
zbptRY#y-e{6Ab2yx*R!VC-fv9L<lJ$1$VCmP=iPmtQ^WAs1s1ZMT7-A0!E5~vEP!l
z`qKA3$5mXas=D6=9m~A}R|1rRCF~h<E8qPYQ-X0uv1K5+g&}C0J8SJ@8bhIjTHED2
zCknM#3?;$FlE(=`@BKyKW+{xv9E%L&u31a8#j({?K!?NOmMLp=N?C!TRo95RA_&FV
zUqr!TX#6+PCvrJ3|AAeJE}4zbc#NpX?7&@AQ>BFkmOJSeP^UFOgvsb{rZJpzp7B5h
ziy@@hur5WPh8cTq_5kCtvqd%+w3vQvKptVROvxg_l>|t$llltQf|vz<ykx!vF5H#(
z{wlL2%bqV6tfdKWJRA;p!gX8hr;}wu<_+@u*r{j=Rspcak0fw0&l0-F-pMb(2Af-r
z2A&vaA<ZfF0ETa>9a$%=OcpQsSFj3$H9VeNMXY{J0vHY~===V-yk+Z`Bng=z3+zz!
zE;jW`!KwtT31HXcCWdTeIaGzTDAuA!hO$*%BoSBu3MZ!oCqz#?5e;6<X-$qX7Dr1H
zSg@iIC(bvfDkI(JWBgn?iU@nsCjn~IK`K}^f;DQO&@-m?1QuLg(QdyqhQg+#S+f1r
z6|Bq^Joh?u#*}2Ab9R(6mE|Z|4^xq`odWiwM}#lyZcfbiDcbq9lHHzNk-1wj?;+!2
z3NdG0S}wQmREMHqHDa+Q17pmA;e^C<!HwM=7BIKEm^vD`eXAY)qhK`%7G9Zx8^{8<
z&*I2EZYb&Mah^S#8aaumexw5)k_IQ1-bcY|6s(B_!y?926=zAYO8<_Ir=(02tPOxw
zT8Z`f4<(>rDOk!y1_>xw3RVWS(kc}!1xqQ&AOQtS!OEakTBU-eU?~L|B%oj^SQ*qx
zt5mQQETtfW1QaX<D}!2Tl?s-Er4(e4fP$r9Wl$@vQo&NNl!6QrP_PuN3~HrSDp(4Z
zQjkFc3YLPEL9Mh(1xvwF3NlDQ!BVg?sFhZ!U@2HiK?VsZSPE7KwbCjTtYxq+j4^*Q
zRAqNNBQa#M+ad}Uqv=}^65}(p$chqZL1&6?*on4iK}aj=j6RAXffjT|!D2L|7O6`D
z3KpY1S`ZTBGqlJ`5}=Jk|6x3?=(t=h7Ndo<NIeoLb@Y=|0>!~P91fhLI5&Sny|m%>
zT3*3owmb){JsnNT6x(i#DOk*==YVC5`E0Fy#;j6{ZCC=%xocz0?~G4;T5^B+;;ta~
zj9Y7M@pol3rWVO8fmZaTxU#m=17+41t)3|Xj)#LIm-@a(R!_032C%qi+-5)3u~;kU
zgV_>r&LIVE7MdEy<TZfx#2E88L$bfDd1@fzeY8jc3A8frSsX01O)J7Gphx=1kpu*j
z!!ND1IFYm1RRvgw!{Kw+bwA8Wp$79_td;b^M+rFRE{!pNFvL-O*iZ#n&bbfc^M20>
zP9uX1mD+F-=NzoiuZ&N8Y^}Xxl*?A67O=Q;6UBR?Y%QS`FG`@5h#)?s7O=Pr9*g_V
zi><E(vPpnB7JqB4MMquqssb!X;BYwHbzS$}f;2u_YvE_>wKE9_QkklV9#;bvbDVW&
zt$n;Rozl<!8n}36jQNcrjH0Pb!~4|)7I&QW%v$@IAz&@CAqg-ihQIWEk9pDJS507X
z$5~bQ(8XJBM=#)<<0cVQv%IJpumt0*TWjsp9qHBXKUI)VTE+OPnyBEQInKFv#+aWO
znxtWOhLE;WgyRO%w-%qjs&0&h7ZS{@S7Y+GqP(?!hrkW2Dq>ufD@g9(ZP#_*FEq49
z2WurE@p}oPfkiiunSOS4U<uMzs_~~2>ylPCl7Mp#D<5Vfect<j`@Vlvli+FuiyIxh
z!9c4fVd}f2m4I{Z${6!MMy=Hi4XOi6;0~gw1~C{~*J=?#(4s0gu)3(=C_2cUWml`!
zDm4r5%}rsd(G9E_EbfFLzM+Z~mW}FnvCneOIb#gAZCJWqTWiq~S9MkC3PM7HIj!pa
z>#AC~!IyE)vBuf3R$bRUDZTdUl!$8vOJcP&f3QJ-&b_k0T2<SrRtpwcE!N6nV~mcq
zHUbuRY(<}2?J%Hru((^JLC)1hhBl(>t9}M&-iltRT5DBp@M7GOoaNY5{?-@+m$2ww
z2diq~#vUffvcQ*DJ=IdR#Ugi*yE6}pR~aGNnEq$^9LfpAW}J%|6fNx7RXtc}MS;~q
z@oN3<EE>6yN}Y4q){MLDLiKIj1XzL$XQ-K;Owt%^g488^SrZFgn*fVkLhhb&%?Q6S
z{m=5cLKm>wd8?^#S_12l_Z~}1mUeO)zOm}TZ5AzUuu?%jAil1d?eCfai>wxR!x<Du
zbP&F{MhPngPOwDCc<-y(D25}>rof^=#^OHjqYwXJt$o1}gqB%X0>X*l>ci{Jx`M-t
zbMweXAKJuVcU`qE`!s4pB-t*8*6B@~Ys2O&R)9;0TXeN?S(fgfPDk+oD%OdMIGwTU
zy63IA^i6_AF5ykrbw3L9MN^&x!pc!p3KhLWlL^+%f`vvBMhOwbK%`K2(ak{(qfX}>
zmf2&uJ@;xR3fTM@Yy1I%?b3$Z02g{d<Q3|*q6DN+wUD+nC%$Ga)+m@EnK;I6uvoBM
z8irp9Eaw~!Ghnast$6_>S7gnD6*%5fw~(tLk>vs`6|yT3tZ3S0-vn4R-a;^A_8jAh
zjwoD_&@A09g^KFiL<DyeV4*<>E=(RT?V>x@2Zd{ij=<md3>8GS8L$Yh3-3KF7dM{}
zw*fAM;%@?VNN*cSfI{k60>as0X)L>{R|HENc~f8wa2aE;U`~3yvev$q-lXOKlK^E@
zAf(Qk{2j?|Q&4TrVhs%?T;DTh1Dn^t$JdCVu*V>o|1L;VIzFM*%!(!PY|dgOfD3b6
za1EP|N-Z^f%HN%H07`sPJ?5&quDje~N48n8$Su6`-oFu!xdxrPw${E)seoInixw$j
zJSBDgAd1bof8+MuG*}S<jX_2TXuvhpOpQseK$E_(Qrryn%?2t?b(ot6D*;@nLIWG5
zJ+zJru3w0i+PtM2Aln64Be*^Y=efq65v&%h*Dk~I6h=pCl6WjN65?*Qr`ru!1Q#;m
z0heUC$<)#VEGWn>03)D&C7?pwK1BYIrgUYkMbvc{*RH@CMGU2hyQh?4(}1M_Y7|Zf
zRJ)3@?h>p75yLTPn*uBqP$Zy_Sbw#}aQc$j-7Q$7ao0Ox^6ojAVhr|<!pO}<5uI~C
z(@wP9-DuD17P)>1_`oyR<+W?DMy?_EXjZP0!0j0zt2T>+B76f-LF1>XKxonzR;szq
zh1<BCathXeVdN*?dswfSz{V+=1F{=R4*pcqEuvgLd>;~I@s|W98cQKSv1=<eZhQr6
zf`W7I+I#;hFk6GunH@pHN@m)#<F6dB0V41HcUUw?b52P?ntUk6Qpi-<wUtt^7Sx|o
zb>JStO<L;$Y;YUzqi5cG{QFr~vg<lb(hgP!|HOaeh*|t)zpy(kh0%90^&k<bTC5pq
z6#`7senrX>P;mP&j@0Xf1QaZWS}0&&g`_|+l!b~YSbSMw`9EAOr1Y%mA`0FxPf=Pk
z^+qieU%m<!Usm@eX%ZDnQm!L%4+EaO-Yqm2g%l(JwX3X&6jD~OBBe-kLD=1O6IN`n
zPR1CV)KcvnTx7Flzg@vfC}P@~_tJa+yd_IUle(}@fJsB<33NiiN+85jRnT}0kX<H9
znM(GiBR3CWa<xp!B>P`Q3RVW8POGFb83G^2$y)FI#hMn4EE2{^$H{56O8FbTC|I<~
z=Kb!qG~s!NjD+#0_kI5<zbMvy!U(ouk{2me$H`qObg)3f#B$el!(=TWy4_;nVaO^O
zwb&!*4${Vk|JQZhmy#XGDqxXY1b~M0nviAPfDL~~g)zn;?{2fvD(Bo{VsPsxax8Ua
zBfUX~Go)mN>drBZY%RUX0u~A6r%|%!k_=;hhrp2JitVL~Cb`CZ#0mFtS6~g^3*|Nr
z9dNQF;S+6h)EfdVc}i9?uqZnLA!mf1SIJd7qsYhTmNDjI%i-cZSS)gf(E(!(SoAuu
zh>k7!TDoYk2q<haA~~rqLI$E+VfwMyt~toI3f2fF=!<lJcTwX97DoOf_B4r_b_fQm
za-gO%#Y88pShT<b8%uoK*1#I+3oKJk7f&qfGdDy576g`a4!ibX4A6prrgCdykBY5;
zMVTq^Xlk@hOAw+%Mi#$#M`RIL)a&3hi57*_6kx4`)i_Y6bValyG8-(4^tnc@)LhS0
z<u=l-g0(TA#(E<<q>u$x=n*YTcDAzL;Zwh?C6d@0SQM1N*3&fxu~MlT;DU}UF7R9g
zE8?uF2OmS3)58SseTKkPnaMg1<F{d{IcC-|!=8GxmuasAlV5zt)|SAc<YNpGvW>YZ
zEo<1iU`Q4~+ucnQ1x8sd_#ML*WVIlTOmar`9E^+SB+r6H0>d#aL07J1PXh0_(@>_o
zyW$7XwE$MGF*oVWFoBEQ#v~aw1RV5cNRE~qsXJxB&TTV(7Oa>t6)oY${L#BLTq}B4
zEIdRex#V!~xef!pV=?PhJ6NfQ2c$FT(4aF(K$>e@f((FRN3IZ^nH_VT1dAT}x74&#
zPlIi+7Jbkl6UexUdQm`j6)3RjQ_#@AFdm(>NUdO{97~bDKv!0Q>0AS$lL!P1F6pyV
z#^V84BsfI>q{)u&X>Yk|R-M9?rRDRn<1+N1I6gIMHeNzrjbKHd;CTP}HSVE7dXKqT
z%+X4&&(_*!(;H5KwV3=luB3${S`zKDgbo96B~REq)rz%&MPYP|w_^en*w_;juGw8Z
z2^r(E)EQ$(WXbsJ!MR`GfJF)j7m#(4UyQ?<s}<BlXoxK0OyU>|wipp&32&iLO<=`F
zhAE;4pjPRWV&zZky>0|>q0@y+c<<3n!Ga6O%Bmns^<<6UM695u_oMeEz(T{X*tzIs
z>i3#-0*ju*8tbtreJ$wJkd}AKrDZI)0=Tfn!Hb~{@4=FU)(NWTtyrp=LF=OO&cKs3
zs8NH(a?W9HDs;lP`D0N7EZ2Pq{s<Ng-2N1-qrzCD_#|oyi$TH*bq}+_RT`{Ns3<V8
znG+m^ZZNh&cnZB7z{2jXNJrsZ&G$rSf&~&8jH}23S4pr!p`v9u@B%h<aoS?^!N)Q9
z02Trki>rR&GxvSJSguv6(%1`!e@h}l_}t`haT+tn7|S^)KA*XT$Z(8K(s&D7KX4|J
zk5;RbjIE3@vuPYLFJH^Oh>Uvg0hctekrb{HU<uuxW0P&o^_v-wV}T|&z0U$HZV!d!
z?IrgmSdBdzb0Q-E`!PtaWNz}>V1+=1Ef4l|c=zFOKnR{QRr4NTA!xzLvUs{?=7B_;
zbCq?@0WRsD>`CUi)&wgsFZ8{&HZ)?GtI4v~OOxc7l3Kd%0G3}WmBW``dS)%Z2f`KY
zGOq<zU|#6%pc?d%YqeNlQI>bH#M;u31;F)SCSLjtD}u%KScXs7EmRNy*JTD+n2$O;
zmO#X(@B5hiFsV*eSv~-+lgXLfk6Qz*fUx?mp&D7OySd2mG2?_WyPRx5&Q+>f%N-5}
zgj^-j!r(|@Zm_sL@6Z-|9u7?Pk<m6UhIuR`ry|5WjngL?h}Q~=^u1_41Cb#KTtPBq
zG#*0TpZdOM<#vw0m4X#;0a+J?)RDqg&5|J2i)SoEYq*fHb3f-fUXM6U!bNltA$4Tw
z>Txe88iwY%V7a)H$fDhShDYWCOPan$iL@6A)k9?%Rv}Yz1zi98G{42oWHLhEY}JCW
z>+p?dSDKy^LPoGK$tjtS#BzuxmIc+MPzqLHYdGhmxrL&!Y7Vf3SvHVNkQ*B)(oNl_
zU_~_NQbhGc)$HCsHCO@jRT=?|&<zDELU;ke40Z@U16bVDwITmcgB20Fp<qP_54SR=
zE2d9ixr8afl8gzrvWPXZS)*@Pu%bnHgiA8sVr6Bd0!tbN)Nxe;g%}n(rm1S*wQzID
zNJ^N>uyYbi2o`($fzWxeeYgDSuUCteNGk&7w`R9DNCB2)*DZ1ZF<-UX-ie7sUu884
zR>EfCz%Y8;{r(82UV&5Bl7$iGH{ukHpxu}fif}VkDOib{QkYM8cAh8}ETOgftM7Zx
zn!Lo)+HQ3UR^ql5=HZ>SS_#0CWLU80*Ak0sv(+hB8JbqG-2t9{a#3UqSd#GiR(Dp)
z(5#{=6)cgsc!h<#sGiJlhy;tZr9jKO8S`4ATqy-Blk7QQ(4%o8;p6FRaPB`Byx?rN
zK+n^FMW*&wurdi&VzsQbL8rc)0*mVgZheo)OwG!!R>5M6N?wq&O84B>2P;@C&0Lo^
zDf<oui!G|Kf{gI{TWc*+qQ1Ez!J19D)fK^EZ7I1+!IDTTpzK_d?p*L760Aqw`;%KD
zYm#k1BL>`}U<C+GdJD~MA!l#A8`kX6vN2%c{V4esmhiXXeOo&KPAcb`$}3nawgxFX
zG8`~5Je!jj3)b*iqi13*m~IBMQhO^{D+yZq7-rxjXqP7GyJ&g21QaZ}%vQOBnHr_b
z=T~VB`9l;exy)9(gR#a-bNp6o4cUVfESbDkElq2@utDgl1J86GYSq?|Jxsxp$!qn}
w6nwby-XHe@?79v?4{Tk1v-->E1KASzKQ<@7F_B3QApigX07*qoM6N<$g8pQ%e*gdg

diff --git a/litemall-wx/static/images/coupon.png b/litemall-wx/static/images/coupon.png
deleted file mode 100644
index 7efd62bf47c0a9793f7f57bdb6a14a168f7fd6bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7827
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
S=x(Ul4CrVXV#?8WkN*$f*tSyu

diff --git a/litemall-wx/static/images/feedback.png b/litemall-wx/static/images/feedback.png
deleted file mode 100644
index fa80d4f9eef7790818d16d1231ed6f4fce9b0ccf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4132
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
DH<NH2

diff --git a/litemall-wx/static/images/footprint.png b/litemall-wx/static/images/footprint.png
deleted file mode 100644
index 32d24f7a808220d57572d402dd343333b876bc43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11739
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

diff --git a/litemall-wx/static/images/geren.png b/litemall-wx/static/images/geren.png
new file mode 100644
index 0000000000000000000000000000000000000000..a366a07277403a0b853470c2757800ef1d902880
GIT binary patch
literal 8012
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/gerens.png b/litemall-wx/static/images/gerens.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4f68bafd6abec53ed161a434510bb4c454ddd20
GIT binary patch
literal 7879
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/group.png b/litemall-wx/static/images/group.png
deleted file mode 100644
index e8eb0a04d2095c3e3904bc6ca3d0af2376717334..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11386
zcmd5?^;?sFxE>)5Zj{n&bayvQVw4P|LmH$z1VM6$gfJRGVjwA9Qo;y9K)OR(K#@@D
zE1cJJ{)w~e+V;z?XP@nTpZmGvNqDTMK~6$X0s?`^wKU;K;C=YtlZXI#tud`F0D)LR
zT5uJkVCx@N#Mzcl>T5e%#i&@>?3^g^9YUf=ir=Ad1@Au&^j0Ak)Mp1z`AvK$BXBfO
zA)tP9Vd^lociw~#`y|0igd!@Qpz%?81cu{>`~r(IZMX{O<oK_L+6>5DaoUzmv>%?I
zubhQnr3tm_y{+u9x^RCI0o@j$B0ayjkUQHQTc&|rz={<TT!i3ZGN4W(P)AfxD_$f4
zq~=~^1S{<BFC$1^9e!Urxj%y0vNQOk1f`inq}WgRiLN%{*@4ZAs~w@A`}@)$$bJ0C
zXcX#Bfhz$gVLt?P$pO2?1^x83x~R3Qzr0`%-jkPXRsP9Jd<#Pn@nwv>fp6pVilFw{
zhhHF#;oEGRDX4w7Sk-UWD`shpp}^-B8Y~4T0vMekas;rSX`oSQes!FUk0|N=khLE^
z4|l?Gd<hdy_}&}wKELT+k4LfKL@tV$Vx}@sFXB*pq|l!_j*)b|;z6lILS}B^Adn>y
zC|-TPAmjn;nj9twQC)d^wJ{ymyP~4n+54=yBcRLrjuG~PtZea!;mD96E<Ro<;QD*{
zhx<i;UUQByVNZX%)vP1n^DVv1{m9LP&#3)~U@h*LOILn%u~NUEtZ@&z>;_&f9?pO0
zAp!-@xnvCnahv!D1r;_w{e-(Vv*$rcx=k^)U0(0L*f1}he5MOuX=I8}fuFxSzTx6G
zYuN4%oDm{^>r0q}eP!-O49ddmt!5`v7>q^%|6<Q0Y!7&{A9XpeUUK4I^f);1&(Y$9
z@aq2lejtOSdvL;*^eViG0dzzGdj3m59@HuO?e7Eu$dotcvDU$&U?)&@LzfpLsETc*
z3jNH0+SdSiGeB0&c{6Sq<BxlLdlN}w`xp}T1wg-S;SPIR#a8?=nutC2ZC7IE_UPBo
z$r*)ar>7e!AxeyUKfsfr@J?osC$xCE6wOGVhA>1h#h^$NP;VWpvZF1<#Krx6BO-cO
z()E}9Cz#lSGpdYheBGLtl2E~xuUl{UL1;Ny*;>;k7s#DlBkjuW1q5Pa*)4t03-{O7
z*PnP!%WwJ>HB$2SdWQlR#Hfa8zU76z5FQ!jD3%3TuFTE`OeSy@TuyMyryVr<?u>X8
zMBH9YgEpo?bph1f@bdsD{)DEOqMdXQ81&WL1oTd7Gv#|q?cs~I*4B$P?!VIqh80GE
z?8SHZk@p`l+CL`xq>?4pF&0cXX<mp2Dopytx6zq&MjG4q;MD-E5Wm@>%7}O9x_hFL
zZSQT2#~uk(@j;8B+~kA{Ay3w*mmg!ies<r|Hv`ypB>HrI`rFXs8e<#l5A$BCa77r!
zbZ|ld3cNXFE89%vvB09fykFbAmfUy__PG&8Kqi?$zt+U{%ld}xwHc0dYw;pW+;8yx
z^=A)%oBaO$`!AbAPYY||XNprMy=Nq6v<drh<~4z;5fMsWBjr|y$Hzin@}!R4K)-HN
z`)s&kOu-HM7O4}Oga(MWDAasRSoEmEgoXU7eqa>UM_yO~y?O-f`aRm$F<bG6vfLIU
z`!LNNDQvts{3YBUgZ8Z#2(OyHSMf;-)ca9wxWmc8!65~sopo!2Qk*XEACy7OT|Wbv
zKHMC$It*FUD8KnqkLd=k?15>c6S-Hn%++WmWO5ccVpxq@j&V_!(QLO={OXhc(S4l>
z65eWD#WY`A^dRi<r+sclBDy|KuS}%*^4CnSs;TDcXrrpxw}-#4<z&)mAbWVdf8aCy
zcbvsF4+q#loEu{;Po~ZNOfS}qv7nTXwKq$F8bk(&9|@=)VxPkoJ>X3VNy%-smse+d
z5xHsykT)f1^N>j}Op)oouH2H`@b$ZH^r;F%f!TBuIvQWkM-;?gH};9OxB=~(@Y&nk
zEwCj|$N#^4lzQ0udPLc_7B^-s9u<b~K8xCaiyX1g!6GW;z$d~~R!`6Fa6sc-6(msR
z=I`nE#?W#^gv1o&<V=aEE>ti)Mq93hsyy`tCg&3x*`tOH7f1>%0B_=IFSW2vo1YQW
zlr%nMfc!N^wA+ZO)<_(m1@}C_{7prTrz3CqfmXZGsfgyr=z$`&!9L~Lh`%aC^%D;A
zXru;g(?il8Y)~`l(pmlCgBLcg+sdVK_E}KL<c5$`|2ujH81o`okTy?%-<M&R%x{51
zKI7ki{Mg~xKsWLDfH5<FP;K%@kF2OjlSrVlT+eHpZxunE{ZoBhq)=nisTLZu)JJA5
zMhALOZ0RT$hI)(eteY*6t@uguR{l=NntgpvtV3!$a5U+4yGPm2iPH7p=Tba7$yAd9
z7A@|C^8t7BPT$qx7biM1o*EsTH%SWje`@?B1nK>dkf@wLl)L!-yWYd*D;lZv2tFRF
zQ(5EK#xZeLEVvB&{N~>;u2sf%Yo<vaH(3&id>gAn9=O9Dj418dV9E8Hq)l|oXe1Z3
z_y<{N3wU!=i?NgiGNHYc3U6vKt`hiiu&*Enw5=ORQ@$q>b?FqO&$Ba~-ua#oa`J>$
z=m2Np>`y^O<4|^ZRIq^ch>kRym+cT?446ut$R=>n(PFGX;RXk^Fx&U1NE5YR)olI)
z%b(9q1ysBbiag<#L}%PS3QIZc;G#|((BSk*4u_lsWrihj*=B~7DdfyulYurI`0Uw=
z=e2kulps(pkE`woa#;83FgH66B-{)^#|eXN6Wzh|XH}wl+jdaHK@0{A9}<pPVb+I=
z8t@4yEZ$m)E2gb=@qrD`Z({g=LWwV>$nM|w%2V^b9Ytm!9GQ;~LA?@-$tXoArn8BT
z>Fg}LP$=w<93*)QEjEE}GPn=A^xgQWqWpA42SW-fqhqcplT4ye59#+rhkUxXLe|m^
zXp9i6uTUBm=XaUl&2U<Ou{gNfU#roTHx{wrA$1Wl!sNifz*DUS5jZw0V;R1Yeo$fm
zjDiwPurb;mRWk)Y7xy~q`1tX|tHesk7wfQ7TXETVRWt(gq{Vj}Ulub%2zleDkt<mn
z_@rvKCFvszQS$8sA&4SQeB5#?W@+Q*76*g;-pXlKBCkK75?nGrJ?&Sxvm0Ep0{4Gn
zVlwZlRTO2!OG99?r7Uk)BICE~&mmFkTKD}_J`!SX&n5)v5~(=f@@@Z*WXR`|`Uh)X
zee^no5TQ+udZsfk1tkH|OQ;|C#2<<kwTNE$8ryb$odMp|m6Ug;PeLBtN4b#cu)}yT
z+lC`>bMLf27-3gpxHv1up{)dNu}MLR&v;7*;p$pso{oeNh5Y5g{C5m*#sy(!MB)5q
zzy5ZDqeMziTVn62E_mmFVJ9~NH4<zGHclbgSP<0>3G_B~J5gsvrD=|_vbT3)aIjvs
zV9zYRih(Yft&Uts1-qp%@lk~AI7hV#ZTG9KOy%7t%J}}-`}+NYhzc=?Pv7XUz|dAI
zH4n$o1;-p^Kq~7-lKxv+e)djfqBobihYM|p3NHR=)(frcD*K|FCRPCVQcyh&;6KDr
z>^QCe8_lM<dEDNJY*{}VfgvC30*5cg#T1mV>a8JFRJ1OMM!2G|@K-Z#>Nt<<`NQ9f
zVgkPNgMvC#te-7rZS<#;XP*Ta1GFc@v7^sX6_v7l;8Lu;q{7_DW3Vede(M@1OsEm3
zpMxfhghKJ1`E~&c<5FXS*DIg?(rGNW`ENye!AMg@6L4(+(0M%@Dq~e-T;;)Xu@It@
zfMvu6%5oMnV9-P5b_0>$H#RnyyN?+Ty}^?#7<3Cyo9nBUhR)`>h^B;}9K{NyXiG-!
z<}!50w5a=zDHL0yMU<8u?NXye3@Vf&-nqG5!yprq3e15?(2}Q{HnysY!ZV~QC4cBv
zb0zpaiSr47-a<8_9rg8ugoNuGH{Fn*87RRlWPxYe;%<l?g<X0?{_KN~$O=XsxTMCA
zZu$#%vW1`G(C#Hd=a=8y@H$oCJz2<Z!Gxgne_z`!s6HJ^4fiiXr%lcndYHS7GjH?v
zl_lARm!gX{G<4;ce}tg2tNUZXg9@saH!d}F3G0^(h=Z@J5JKXHKd)6{UA@MKUVmtI
z5^l0F?R;&dKg~br6+*fErI(d?gtLh&bG&8LdC2FFZn2X#jKVIYPq|>P-He?*V|2$v
zF1g?Kw2Tgm8n@k?{5jD)mwzb2!#bFKo4nQ8(b}3tRf_aNRP^K>y!CDto;d4<m}J8l
zvAcuKW^2Kg94$u^-vpD?qkS@Ue%L~>d^&KktM<9v^hxRX{`2}pGsIO)f?&d4CYPJ#
z(siQGkoJfQK1{NvQ5W9x2Kkf4<Z0gRXqHgKXMkD`=5CGAL;k8E+G`R#IhE$k{VE9a
zew}3zK?_Fvj3o(GL8(M7W=IM<Dj_PFdd^pq8OZ)joOGeL{Dlf5Z9is)0y&-75j;Cb
z)&3?35#DjFxRiAaazr1S!2<z6)~{P;@2!-Z616IOL7x0#WQ&_KXm~qV^k-u3tJ@63
z&STj1OV=azlqb6OCw?^&T&)rUxNvx32J*#VoQ+s+DdTnt=$B)(@O@&a``1UC2Tk=o
z$X7nr9+j{VRn#Xqfrl7p24a8>mM5R$MFfRqd`-3!t&vbm>s}O&&Ij<6o#gH$Jk1v@
zh@BF5$Vc7sVDhO<o-W^-yXmbrT}6dGBC?Iua+3@E_;vAxL)+2^bb}IK7jVZ)d?JQS
z+VSjU_&6f4DrltfFWK6|Kh%kjs>H|JUb)tUkVx+4_%U~)Pcc42ZmqXCBQUQH4+;@l
zB53vGx2*+U?*AI+(8zDn<KMcvx&}w>()kmliAb%gX6M+7?H>w@9q}xu^JmTntgdqP
z&xz92SrulD?##<2`=unkU}9qOdmvzbUQO;{NpHdGJ0B3lO`9kQS=D_6940Dhx=`9@
ztxix!AuZ^?O9T&}(IdG0*qQt^RBa_luI8E#Bd82#+ogsmaATT2o$A6PFf&;?_cZA|
z3=yAa8|_-znPQ~AcbXM8`A~!cWIXW!zo{_2g)b?A`5_7DJXh1>z$!bqY1t1m(~oNV
z7;8-fjj4N=s7uLz6P$2MiPyLs1C|VSQO}|D1E|Ld>QZ0}1<H9#@ADS|Zz7Qz7B%YY
zQ#V9VI)!9#lx2Hx@WT!=kjCl4c6JoV8sk<^ar({*x7-vxcvb6K=%LjEK}(kmN(K!r
z%nT#E8Ygm$W9~sLSbOXBykNN6yBxBK9I<jaQXP?6c#G2*z22~Blr5kIt#~tDzoC{q
z<`W_O29U9NXfb)rUU>}In1k3I?V?`Nd@BnI>&3=rMWEX3jlWTHhLjzIq}G1%aaZ3U
zhh2A|Pu0wZE77tv5IVjpSGM9pO`f||xbuy?0U@!^+4cSPiwmm;2jW8K@}-fT)5+wm
zg)*B0zL-nPO5A4YGvPX2karWfud>OCu^F$tYo1f80Hw%^`Ohi;Wbi_FMkUG&8|Zi8
z-DMr2W@E#`)?7XpRgqJ~lhlg`sw-=3JX_b3*`Zc+F7(lL8+(6v-*m8!gCtovr#@Pi
zEeNmIO;;!;>$ut6qx|;v1x1}sDaTJ%bGJbuJ4QD9t)_*7f`a}{+$VViQ|2~AphD5f
zlQZ_S9FIXa4tmVYeaHz|J4aNdbjIAT-Ieb=7$&QYaD6h5MGpBN0I(;+vO;@t5dS;$
zuY&71J6YrU<m8DId}X9hI0?|59XUw0@Gs0jXLiB;yJEvH*&1H>`}@ZOBEdJ{gAx4%
z<J-4yZEUx-M{$_%3x-LVPFcL+P>lZdel$~Hc`U$cT(D6_VN)<4?e`kI3FWI`1H0C=
z4=2)0-7D#vf7aZ}F7reKEYm1x?$&MeaiZafUQQEMw4Kf)Ei7D@e%P_Dh9w^Ts5_H#
zKVE*KvE7Ntao&hAhU2UG**zwknZ=f7OZo1{+~~vsyJ8z0T2^*`-XJaNqKP>oLzVJo
zr!WVLU#|>+ZqZ>YOTI{KHczU0V?|v?A_`e$$81L~VlAFg^ri7)Je9E*F>i8Fmkx*N
zs;DPgdmn(7QOAmT>_Cezw0UYWnOfv6l4_9^`CppN+;?EbcW7jRqqdi}Nrh4J@9;Y$
zoGcIbuY<GmUV$r9b?E`?>mLUlKNT{eq!vr3TCff#kS8BC$+{42qVdD}F>6h4Sl?({
z)?%l0ZNc`<t;&xM7UIgtRS(11#2*6zFb#Ee>o;(Lp$t9~&&I$XOKOl4ZkX&6K|^3v
zkfaXWOS>|7B1T&(j|IV)i@-GS4awpt=WmF>U~x2|=sVU;Hu$+_(c?>l1(a^hZv#;8
z?~7`B7AD!`Mw@)|1Y<l$9qeP><gNc`AvN_0kQ2>`v&$04)ixvzsFMkD0g7CG2*QN~
zu@%1+DDL56iYFDi*X;PSj+PVGwo+_3TOLu->WwiUH7pf==1txgYb)i9sPJOj{OC>y
zD^`-APm;ofOgZssQ~Il%=yY4S(1&*on6A^R#+VBdf?hCw{`xj%Wh+=5d=gW4tni8~
z2f)C=NE<lziE~YlsU*os7B*ltyzi+fz$>#P>B$EPDa5K)*ImSuO@ZdKk=0wKonhXF
z7Yl#QpJ=bWc_qwn_D=m;t!1<oOz>9@(#4fj>0sD^rB`x^OgoWF^xgsgS<(z`1owri
zZ%`mAw!kO5sd(g&$$Hn?5VaAiSNTe0z>UuZ`4dw#IhBEoMwyavyvqr;iX6`&R%S{}
z|4c^Nnf)j~?<Gnu`v*7~#@n4Sm+O~lRx9j54S5h!;7lU`j`PWFijI!H5vNZ&HZ@*d
zVkd!E@n9?&jU^dUzt_p*g(`Md_y-0WHw@e90HOdKEST6k6x9f$$1Vu)3L1K+o!$`H
z%p|3M1s+4@e?{wide*;x|9*uJ^94IC1pWGIY~j)Dg`UB$k<h>|H_jvn&H0#qJz8uO
z(mO;+&C<oFJqTOBvs)0#oMhl+Wi1|l#2#JQX}QLCzJ@}*_}1}L<N5RFEXlB-rEmbb
z1e3RZ>0Hd!*^3zQgBZaydNVDxPfgofO1X-i!6)()XZ}+cP8HH9<bfk<SUZbtlh<pp
zFl;@-ufnK7#jh~c(VOL$Av~;pCwnW4HEiWQ;30)*t<1(SMZiJ}Bz7kXZBE1QNDcHT
zWXkhUYeoPnKk491mwJCXz>(w8pR`$d>j#tN`Oa&SAXp#OF_%x2kznx9jTC|bZ|1hm
z)fn-5u@|#wWGGywSsirL79cc;D}_Z|{0yHqbN)dbohCsvL6LYASAy(`gJzY5f8>u(
zOP$i;jHTu^p35%c#<;z5=`E_i`k!Yfis6FF&lLe(KQr{EbY8;>SBKphgA4&EIPPN;
zBZbRe5Qu;wX|SQYyZbI_gv(v28^lrE2s!bvy-6<FdyXlQpSTGjW6ld8x7$$EgdedB
zktENxs$rR7o7(+9(&^n^-*={=oJ_zVKNEcG`Tnb($zid<@q>?5R`jZ!$8g)A1nAc)
zzRlCWQvs{bH8eEt@_+AGzPoRNXwa(5ooRci_+@W2NqsA>R9jb!c2R6X-j4{vL<nMh
z-)jGbW$AIrWU$7ZtwdPr){UZ#>CdrI*|iH$Z+9l@bj)Zs<@@u^%-F;o)*as~<sl#G
zbJo)b4?wrdaGRe;N1dFB_HubF24LoX83FZ35W@>lui>2n9P6X6#8w<18XC$>Od3IL
z+3mA3H3|1Ojmq-2?7jg{oG~}fa6M^YjXTB%nW9iWuc{?M8%9v<tM|AXf#4d6h-T@F
z`Ro;?m)_(s^GEQkQY$)%O4}&*sw!3XqZoSLY}*25c(Sz<e)1j)HAy_5V!zD_oA~mP
zYVxOn-ja?gWRg5d-QIRitXZqJe$V{Sgc4FRmhX^GA`h{FU6-OyNn7lb%M-U*Ee%LO
z#&P75q_|&<FS{cQXd}rD$Qm43^q`zDN8YOptSQ~uhNzQv*=X!uhKaRIgunkeKm5Fy
zu@oMV_LYKi`#yh)H|d@IkdL0ntX#B{()d$XKMz#ckJk~0Me$oJXH@0(F%8I9&PW2h
z6``g%P$8{qn4(V4V?bI~c&{Yj3b8zVbsHxf)l4tYZ~d(10o!K8z@i^y(y0>ac}sG6
zb$Q32-^1Zy%5aa%-I+61_F>?ErTfwQk@~0iY-9E#9}gGI0b<(tR_ozQ)P4$Zk%#$H
z<kCZl(@%&I)@NO$^LB+z9#{Qqr}2fQ`I4Op`^l<B-pGaja@cotavuz3U3E{~YzW)l
z{1+?xsl_rn<DXfUB}JcP6Hk2KIp+17H*cuYhZVJ#>a>0VJ}d=@jO(0WcgQ9vkL4Mq
z{j#)^@bWL)VO_ZYqY9(V6pQ6%8b0GM);%x&HVCVfzaBwyQ(N2c)3(D@rk(r&`I#z)
z+aLV>ktz`%BX4?S&7b@fR_C$YfuZW-&96c5FV)YCsV#mrkU+fDuwFOacT7AxX9kx|
zp@r`(8BNS3Z_Dtkr1=7D(iL8RK_k~26b`mawAWD23xWcw7{p(PeQJ1Bf`939^Hq5C
zi}03%^2e8-t{I1}0*fBEeVZ}Vw|e_2JBQprFl&8Bn!;<tL+$PBor_#qO$_o1gh##X
z@=$sxihqjLV>>~6dVSp{TPfn!2aeTJ>dY5?p|hEs;}c<>=tu7#@N=bIsyxXvC&LrK
z;&=&Qbj*l8kz=5$aJ_2NvI(tgvTF;ex(<goJw~`z`sZc5g{AaQ4u{>)JM<5bNG0&Y
z|1cH8ig%K?jLNqrk27~0__e$18H7~A*Vp|Tj1IJz;BI45DJ_>8d&E$|;oB}wDHxtM
z>!ukFe$tP5E*Tv2NJH<BcOIZNOT=ePX1NC-TCbjU8#TGklR)+IQQoSA#J)oze}tXh
zotzY*MXOfsGdQYEddt(n3Q|z<u?GvcSVou6JFL>d{!0?punQo+iACKk6CMAbmy%^M
zrMJ%ted<%dNJqCQrwg`c*eU+%eH(v#bM!F3F}3xxfcM8O>Amwme{P*R=y*_(ZS$fm
zJDyN1DK4AM1}maM4SW(WIhg(B(EVDEMz`5K{0U$tE_?H7{>9&Ma2Os!q1c@75O6Bk
zBN%LA$>NL!wiL$}n1Cw5?1^sVI<B7L53FGi<Z2HKZ2f{#2R95tmNJtlE_*;-jxfS@
zCdk!H89<w>FzE8^ee)fed0iGdx^HyR^BB)pz9$B}CTiC-d(G0xek^j2keJmd?ky{(
zp~bO_aEhUI2GCjz%JP-Wk90{27M7#^{Y#yyQqF}=jT#A-zrL596{~zP8<uEY53y+9
zSSV<tOT$pjPjVeltDe)gt~Aw;=sZyd3M~?5+(&-uMmUjo>eyw#1K#NjIr~YRw+9LQ
zlCb}w<Djzk+c(?p*}c+|=!fs2h~zE|fBtKK>!6_40*ax2oX4zpwINQPOW>0q1$!Rm
zDjvH;hzdS%{R9>tlt}`WK5oY_2tA;i0g{W1x_9}lK75eXf60Ue?Gx+%kqMme)z#G-
z+2pgp!9mB=J#G-i*r21PF$io{#2DB7DLAy|Hy!AyVfcY86dP6Fo%e5KjXx8o&%anb
z=NoMt8Xg{|sA06Hnc>*BcOKkEJX`!Eq1~3>pJn{P`fmxq`}H6Nl1YaC@o{l$BX1}`
zy-)I9bD=XwMCvY;0nwIYDB@>6LZmXlOQ7hLi#H*o4R88uO7~q?sld0rv)6~wKHxD-
z)&{ZY#b-L_|H*%(=y(2dKK%JBue|n$se2)6TEh9ym@OsdeDaHrZ#vI)@Wo%En9sxS
zVygX?`WKKq0rW6>6GiyB2+t19m*?sK%;9%q{@XG~H@A9PG_Lnc^2t5Cafck+`XZ6~
zgV!(Mo!-9>X6IXFLyMC<IE#t<T-P+<mPXuU*}omsk|`$vZI;Dx?<3Wd)`aU5e)FnX
zW+{xI80$N9+J(=ZFF0-^?DlH!YGKm9<4gjIU%uR8L>f6YzC-EhlVzk5%h%0%W6syT
z-9%;saB#p}rNb74$gomE*7IgQTcydm)r7G0-MlFq3s|*!HL$tGzy#+BkcZKevdSj=
z1$%i3sqMAukUq1jJ7RQXC>Qa)aVCvbl}Msb@WCH#_%L_9j<dmNsG1$ClXBf1VZ`XK
zo+zT4j(_p=ey%L6_?P?#(Op&>Rrp$`?$X1mCq(szeBn<<cTTGyZ`_iP?2y3?dpNRN
z&U;^S3_S;?-@gwX_yI@-3XWnSoZeCUUn5PK@iqAfo<TcL`Y2Vn6oMy(#Sbj#Z^v8E
zW=S+Tli+?&Co0*w3p6)X_UDQ;Zo5|=-q~UOA)@lbhZOzef8J!2#0?#4SnQQY@<3+b
zcJ*L72K~Boky4jumSww9Di3_i6SLp<u5L$`^s~~JLtoO48Lg(d`~!L}`;)*y^E4!V
z`O-{A4gnrJj%I;zzzX*+Y33Ux(cc`!T@Ndwi%ycRMmo>DV(rIMZNFG7J$-w8L#mCL
z;!XEC-4kk3_NM9OjvZw9o^YfAcjVbgt7!26Tb*<gqX5r35>Y`3^PPI$I9Ly7<d(t+
zB>M^XA%OJKq~0{l0g;it8!Z;8(PiC346$J{$j}DdG{aI<XU#_*Oxw!62U#91Upi8m
zVkWBTmg?!g1p!u~X-WZZ(cHB!=+cyW4sPTjPG8PJ&dT&CGjP9O6LvUPv$d&d;0D%f
zPv^$CQ<Ql+5PthbY#6dW8Uto2tjwxHcYq)hNy3UY?k~h`kdNx}A7z0WBeN`vq<*0m
zjziY2X!}c5i<=dhK!OrFWIekIL~7UBo(74kM2e@QoxriWnfJV6p23^wAt^wDOjT*G
z$2fv(xyAtMet@Bsg}nV|E6qd_Ljc33glVXKw)ZDbVCoP~<V%uViQ2~A_K_UPT0c$r
z{G&Feh)6&4C7ejsQ_~7+5Qt3T-!6b*v<4%;=HzalT7EiZ83fineI{Qkl<rE(`>Km|
zAdnP_$})A+;YsK|?kO?i{mZIN-i9_UnY_&TUTUkIBmLzipH&X%Q^SlS=W7hw4%C&`
zj~ga70);WN#%zSf<urf#^r<UseJ@H^mtlg{GNt%CJ<uiFA<WLhj#C5#1cAKNBt413
z9yZIXt6ko*>?aO(!><X6r^tf!Pu~cuQB6(*r0tGhBtP10!n8PvDdvn`M~3RgVdtAl
z0JIj{<gCf|fm+r3O~%-_>3-qQuJ#tJ%GP^JB1KW=GM3#{Rc?3Hec{sgp8NZw`R+e-
z1`EcyBGN(|(Win`jcpUrlz6XSIe$rDQKE(Hj6>!xiT^lr<w$uk&!?I_j1z#Y!Z13W
z;3K%G@Fp>YF0uNQtZ!Op8aKcDn8lDcqnkl}k-O=it$wm89PYPAWM6aSa%B(nTJ5V1
z_Hu2Wt8u>B!I!nkTPt4lfX5Y~jGcc-WSG*AMELk~;DyuZsHQ0FZ5FDc($5?-Y6coG
zq{jFrY@1q8b><!2k9#4Vgt|5NIC_%y-^fRMGtv&(>n@=*5j=DwA{m1yMm9D!M(KxT
z=##eq^lR)goElkc+37?l$*rf03rLH<P}Va)JU9r|&AovD+AS_SIV*la#j_q{pxwNt
zLBu|k1SHZo9UUDMI@6H}e^q_e8N`g|Yprfb6EjAF-7vXbmCd_<4W>nz;7uo-z&3*p
zB(s$mnyj~F<yP|mr#Ax{tR&+$SN(UXrsWaQ-*OHflZw?kTRaVk7&DH1_LvRdpaiMW
zg>J7C^#cdk=9p3AA2ir5z7*r&PYw!}hG&%7j^m%nPqeio%;)lL!bkzN)^%0o-VwyW
zkN_<MlpXVcosaH+lTv%{ns-TeqVrBTibv}$1$)+jand;jOsqgHHXdF~cLFL;xr6^T
zxKg#^UQa%|Jt;nBs_)3z(Cirxrl3)|fFFuCIC~gyD=Jl!@a^XIBY-8kT8m=JlN)1s
z9v=;f-ehstH5-#o^I)of6%LKD$8#pEJ*37sa!-|!Lu`~X(>>)6b{w;T(Lh?i+}o>M
ze%KMAf_=-MQ{!V5G$CGQK6>KUfG;2n1Rq-+KUpC4Luo%seusvCC_N29BUv=yhSVp&
z0C_D5i~%<*oJi~FIyd==ye#b7=(+1N9RBy1@C{)o{saHd7I~(Tqb_0_tu?Y_pV=}0
zy%q=;ldbtJq;qKlKM&{G`DQOR{Kk@ZL0r0=JG9`!kIJfX&$iM;gay`tM6^qfXNRoM
zHAU(guS<W{u$o_OHsx2O(O^(~s0wFbW*8;$^asZUnE~Os+LDy+;GR_%I!&w|CI#@E
z@8$xtWrjJi!vr~>n4-<OBAOTYQ_L!0F<>8^GPL<CR8~%~baJDT$?OvKKvlC-Y03qI
zY%LQra{&v@qC&O;b91EhDmMW{APt$D{7$!Hcfw);7kd23ZVaYUDsmjI3u4zNf=Ui@
zB@=$Q6^6YS=*xWL1`KfmHTLUuwwR45;Se`JQf|zPB$V;7EQNn6@*o^FOjlVJSP$Mj
z8v9>?ZSi4VCgtPw*PG8pMMZD>=Z1(zDCG%2Oq}0?PhG_6Z<<8W-LVuh37C6Lb06+S
zu3Kz#hzt!kqR6+o?*p0O3n0#^r<c@6lhiAjvc}Y%V0Af>2p$6bmU^>pk=A<T^GR+@
zCXhmpX$vl}VdMo~-)mcG-I5;6=Y(AYfRSO}DK*O8G&a4%tqH~YwBTlrI@W%@E*&_+
z@=JZml{j<^sm`bgSdOl>6g-YXbt=_q1wE{tKRmm+zP`1s>e_iiaQys%HjmT*K{xBH
zvD;WShV12f^{P;e@J{OMLIrn0r@{Rm?id#m2WK~QzGtYJvfJ2XbBh^@WlvS1g??#e
zjmn^=yxh6`1hdV_i|0{IqY7V7M>5l>N>gaAtVX?PD=D!b`fg;mpjw`fox=UZ-xq+N
z7pEX12fI!LZ_>0pn9tO1Ym5cwIW~3oszilt_DE{?bNurdKeSH%3#u5EPZm-mtcgxs
z8T#_e6a?O(I|v~9O_Rx}<W%IEt(sdsVMuLbqhFSxo{Zy<;1^WIIoz0sGZ*7pf5-r#
zQBA$^5{<MRIf~}wXj_wpbvMzB2Ie?S6mmJg1jc{@;NuMM!V^)RX~^#7!1K=|PU33c
z@~MAn@H7j-d{5<vzBHPw(ip9Nd-cIsU?E@0qwxe*`~ksp*Z;~#Z)T3RZczw-ls~R|
z$pCTHRHMS1F`|Lm_xnWh9a0-`EIs~!lkbOZUw;ErkZK14Go=A%82z40&vpv<Wc<(U
zHq(^~Z)pMRw%WTSi4*Rhj7}rv#Y`asz@t<m#z#I-__l0xg(;`AtRpRvs_LbAuWA2V
zF=`CjOGkTQhLK&lcFRaBPsG|gG&QqNX8pS@PK`u-i$#Wpw^b`wjU_aX#fv?W7o(>F
zSD$xVLcQ06FJ~b**vLu~Ol~{F`N11B^0ti;_abLT{7QHK+2@R+#u!*JizZKvNcz$q
zSE`#`L*!g89|_~LV!X(ILAm+YSWc}0m8g;S*H>;prd-T{9PxGed`98n1$=kEfe3#_
zg%4;eaKLV|%)BvS-f6<nC-oiufs_Y3fJ^ahW_FTW+v3v`xGMOU>--%0m|;U+3OnMF
zfzUk}mQ1gRvNRsdPg{RT`YrtY9?uS!uD@+z`3|f4<67mfezD*%*YwsETq<*Ao&Z6Z
z^;1#(g-d0sp87pk8KNQIAI~UZha*ooLr(W<oN-3YqZm6cxp*Ak7i&u{m2CoguZL|j
zQ3tp5<(vz>ScGC1e{U}ZVAYdx+dWfLMO|?g*G)|Og6(Y|(^5nB^l9;^jNjyUD+u(S
zgaOgU(=$b$n7VtgCP`y+3Oo2SGIn`$B3tZM!yG4<yBvTL6smAGS_^Y17vL1m<%$HQ
z)CF6tgH<1@eG|CcX7_l8gP9pX1(#`c)fF9czNqj7ywxmdvB%O85EUsk(@2-+$<S^z
zgrSCMzUF4~I49~<*{`LV#kc`Cs9J@Q=v;Myj8c-NA!Y^&@+O6O+Pfy<#e#z@rp(hZ
z4cN^Ne_(CHEHAxU8L5boejXfrx%B>h(j5I>jDW|>e_jVOGqbf0oNRbwiAWnhK?DtT
zKb!UlF6+SB?Ls}Lhek*1#lt>df*>5sCRBsMG9E3o%J9M1wR98(g@KQIN$S54_%vUf
zUC)ugRz(fQQ&wa#?&oB>u?Vax9OWCU%+D~!tOKhCiKvGpI9^Vj)0U&9{JlLw6KC$Q
z7i{D?mC^X`$iukOf^oiTF73Wu8o|xi1}q$k`-xOcgG3dwM5KL>R3RsV+6$Ay4SP*u
z%eW~WwKv!QRwl*AQahsY8UEbI0c9BvJ9LVZXPy;=k_yA$Z%M~H8BoYKvbY0VR`ie_
z=FR<}gLSx|3ZMCg^?X3e2=8Y>F+yU=A0OFZS!rukGy;XAGgGvzpoi7-huZ0tfo>%p
zWfXn5_p(r2(9ICgFHr`lUoM^3OG2<u(OyW;$P#6a+;Dc3%D1og;QsO;?~K)&24h8*
z4*>$o@H;s67`pk}Z*RQI^HbElq>9wQ5k`m321e^T&(#h*NIe5+7gt#dvPg~0A<5gZ
zFSCD1p1dUwSh58^jLyKGWslq_X2yZHIVQT){y5*w^W`P&FcW(>xgUjx`^y!TrOTb&
z%7K5Yq9-2NelGU^_9h2~q)Y_5?*SX1Uj6xM3>K_Gsgf_++n=2Xq{?ZAG3+ufE#S6C
zH=T@*JxTNeYHThG?|mHv%9bYCc-ESS0W~Ps<7DC`TY$12|M~jOZvLxrDfvaFsU9fn
zx|NkzMY|5vz_!|s7bX2G%h0o8+5G?dXqORTMcT==lp`U)PBBR9ksiEO^=Z`q0Ej`F
AF8}}l

diff --git a/litemall-wx/static/images/help.png b/litemall-wx/static/images/help.png
deleted file mode 100644
index 4adc4b80b352757bfe628d4879445fafaa0f1ab5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 388
zcmeAS@N?(olHy`uVBq!ia0vp^_8`o`3?vg8AG`%pP60k4uK)l4PooU%ty`1_G)=4|
z$S;_Ifi3U&=l{~@FR<tS6v{9EQ6_lt%jtcNGU7lLw>@1PLp+YZy?&doSwVm$Ks18Y
z_4V8T^;>^kGI^!5`o<RD8{xKUCscSMzhzJ6ZvWVNsqKNpTCQu;MOl|=Nyf8SPAt7~
z-KF<a#ltvL7t?RERy?hbbzibEe&4&w_nmS#^iOlYz5DCb+PdE#n#5b#sv|QNh_|s-
zB_gQ2s81)==hu8X`G0+UpOf(8-?8=9kK4C$t?>S5y14sO+3oq~e`MyB|NZ;q-_!8F
z$Gz6Cu%9{O(*4a#<JbNzJn&1y<o&&y1@*GASC*ch_Gjt(x#~UrPQ{Oxe$M{Pa!pNo
V?~?Ziih$l^@O1TaS?83{1OR{xvdRDe

diff --git a/litemall-wx/static/images/home.png b/litemall-wx/static/images/home.png
deleted file mode 100644
index 4e3df7884636bb7551563beeb09582844e66e2d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2887
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
RPCjFRsgadot$|0ve*sT&X-EJ7

diff --git a/litemall-wx/static/images/home@selected.png b/litemall-wx/static/images/home@selected.png
deleted file mode 100644
index b1d3723b3b3c2f6d124ff7b37193110adaed9274..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3177
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

diff --git a/litemall-wx/static/images/hot.png b/litemall-wx/static/images/hot.png
deleted file mode 100644
index 3bc7a7266db7034bbbfef83ba386495e602a3bfd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12228
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
I`U5Bb4;h7lj{pDw

diff --git a/litemall-wx/static/images/icon/ceshengao.png b/litemall-wx/static/images/icon/ceshengao.png
new file mode 100644
index 0000000000000000000000000000000000000000..f851c4e2bc37c7ac152a8562133741f82be646ca
GIT binary patch
literal 5340
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/chushengriqi.png b/litemall-wx/static/images/icon/chushengriqi.png
new file mode 100644
index 0000000000000000000000000000000000000000..e404f9a04f4400fcaee5ff1ee40c70f8b8465260
GIT binary patch
literal 5850
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/dianhuahaoma.png b/litemall-wx/static/images/icon/dianhuahaoma.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e28f048e5bc6afd0f99df4fc74a897993424050
GIT binary patch
literal 4723
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/duotianweishangketixing.png b/litemall-wx/static/images/icon/duotianweishangketixing.png
new file mode 100644
index 0000000000000000000000000000000000000000..b98528fdc7158920ef0f46cbe85d585e503051e5
GIT binary patch
literal 6246
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/fengge.png b/litemall-wx/static/images/icon/fengge.png
new file mode 100644
index 0000000000000000000000000000000000000000..585cb5353c4d7b9f8819b9428eeec6a45ff7d69a
GIT binary patch
literal 4385
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
Md3%H%!v;(I4+?(l#Q*>R

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/gongsidizhiicon.png b/litemall-wx/static/images/icon/gongsidizhiicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..72f358b4abdb6d883fa9b804c8bfe285ca08b9f7
GIT binary patch
literal 5363
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
KbmO}a8UF`Q=;>Pk

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/gongsimingcheng.png b/litemall-wx/static/images/icon/gongsimingcheng.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5f27795e50bea6ab83846c16562f86f14107265
GIT binary patch
literal 4456
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/gongzuofangshipx.png b/litemall-wx/static/images/icon/gongzuofangshipx.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9abe7edc9af78a8791216edc4c6fa575013c619
GIT binary patch
literal 6073
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/hujichangzhudizhi.png b/litemall-wx/static/images/icon/hujichangzhudizhi.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cd42d7edf3a7e06a0bc93b4d2edde167f5b98f6
GIT binary patch
literal 2478
zcmeHJX;4#F6pl2Mgf&PFYE^_*EF=PgHX0DiCb9)Y2#JL7$`sI2W37gL^Pzx^79ETT
zA;7q>m<SI9g=m0hOjXueNN@`%76bxFgAo&=HqcJTX@59l+aJ#K$DMoUJLmiEJ!kGY
za}EcQyp8mi>LU;cBcH9F!3e|x{M<r)s6~>}eqbUHXr_;+TS#K@#DiJ}?Z%?aN7SFU
z*y^HmKCsTGpAWff0)$qbwM{~tJFZ0FHfG}Vw%)YeWk?{gZL3cB+CQ{CA408K6`Tp^
z<pz5V_8U$_tvwcP(loQP`_zEm_!MoCPUE2F4p%sM8e!-TWqygmIvBz_*_M=62c*H`
zY+!*1g9jFax`rNaH%=21<Eu1J#6!fjf>6~SmFQIg)7Jyq(9*LZjj3>>^84+h1>|zB
zpE6LjjhGaI?Ge^poCP?hX810K>YElkJ(W@}KAJ2(<g}b!H@$0P>WqbQ@aRIkn%jI@
ztriDYz91X*bqzjN+z@6+Sp;`zWcv1Pc3qL{%%!}r;^t77JFgo_kB}^j_$Q-B9Ro^x
z(eyJVdtYi+6WX~6C4DRhP&{LX6NtV2phV%7yc)J-vUCi|{kq;bLnS93#NeAbPPi`I
zl)oSJg3*2>!#=vtsI0h~q}qMGA_o-nio<JbM=O_2zCLe!aUq`G;3A03Sod6xd~%tR
zN;B>khE?1}Vb|1DpX$`q)FD|?*_q7+lEEw@JRDy!(4opOF;^~#Yk!=>Jd}hl7pV_F
zij=Q2fTKFo!a5lJvsy;OQ2u@8^hh`pR4to~xFE+PS?ggd5HP)Vz}Ym$B{8yBFEuVn
zQy^##vv4R~@-*2TFGaFYpciW1%N@#HNzsO3g~D3C*KlqzoE&64!;sc+!d;sp61p!C
zhrVk}XsG5~NztTJ+1>IJEWp$qy5s=~(AYSzVL2!XfGB4C2@IbBii?2VIRMj4o0~Xi
zB##5sT2t;@Qe<<<yk`uLSyT9EX*`NdfTIHbMG2cMrlRtya9>bPrw~tQt8d&^LF+FW
zMl0I$anZ?f)CwAsg|W#JPiZ&M3kh2t1Wer^lqJOzgLg+^P2X2IeLt+0{i-)~mR7ZW
zeS}@lvmWA9`5ND}$pkxzP2T7)k<ke=Wh72`0AY-fBqTKzGe$Q0SER(&^0(Vn3=B-c
zJ6wfyEH6%pZYI|}WUe?N5^|LC;gf-kKG{AVscF6vh9_6FM3RT5i9?S2A(BTZS*aIW
z8(H%(2Sv7ri*9>+hqc`r%MXsX@57C(q6m?3)(IA+&C1zNWh&Gs7(N|bpXD65r&rXf
zZqx7bf|AkF?CalmqP66Et%O)It3`tT+)~Sv7aNyE*hap7+U$gjSve1!^lquiP%4RV
zIg(cZa7Bu{={ELH`_RMl=4Dp}QFKt^2X&1+8z18pME0VGt>$<~9{kv<nP(iooYfIH
zcjXdUlHySKl2e6%av|So$BNB-T!+uRVZ*npv**E^>aW%k;W0MTME@Uj;&<=ie`neq
z5$~s!kJ7m@&@?@QWO0k{%4;{o&MNl`jhj$d^P5@P%Dk8^d!V>AAxL3JYzjm|9#ck>
zZu*QuTM0^V@)aN9?J$4DWS$Es+XQ;LECWv{Ia-zligmTws+)9!2X##Obm~kQu=fCp
zT*FTZf*QX-^1|k13NN_ga#~*08#m$eETl}&-$nTy$hesQ=tyQsrXAVd%p#c3;@;?5
zN8MD}ZdmSjZk%52VF$7c0XGlG(G0&6MUDY=jo>zasLYa5h{mo%;+$YG8;G{1{Djdy
z&|vBR&VOcuY|<7LdorV#8ZaahT;r^Mml@;D|GA|NSnhHq<kd@sFBc(Ae=aQ;>T>Ru
p*Vn2*U5x+R=ao0L{xa!kEHJj1bK~k`A8Y3@gpU`=v)Ua1e*@+J{80b^

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/hujidi.png b/litemall-wx/static/images/icon/hujidi.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4ea4e89ee9dc54ef52ef3992dc0b763cbf7d445
GIT binary patch
literal 5978
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
S&H!fS3`Pc~`enM9sQ&?@<RbR~

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/icon-boy.png b/litemall-wx/static/images/icon/icon-boy.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf2df819b16b1b11ec5ec3ad0654ad76a4ca7810
GIT binary patch
literal 4917
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
YE8280AAajo>US7GU)MyZPRkYdKlaWQY5)KL

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/leixing.png b/litemall-wx/static/images/icon/leixing.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca725573d06528b16dfee103048da46713446258
GIT binary patch
literal 4961
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/lianjie.png b/litemall-wx/static/images/icon/lianjie.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbfe4edc56309e031294ab61dd6b5f926e3799aa
GIT binary patch
literal 7746
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/lianxiren.png b/litemall-wx/static/images/icon/lianxiren.png
new file mode 100644
index 0000000000000000000000000000000000000000..47bf3da4c0b3185fd37b274a8503bc460fd982eb
GIT binary patch
literal 6143
zcmd5=X*|^3+ZRH12_f0{85Am`NJt3X6~;dHHS5?7H9{)7Q$yKzVQB0OnZ~|GV=wy}
z!;sw|&u`rK^L(E7|2O{^^WvOyUFW*4^P6*hzuy!4z)**Uk&lszii$<|p4LMusxu(U
zkAV)D2}Z>GQ&I7>>1t^_4oY2{aR2-L(8sU8m)0)B=$tY&420^dx}o8tx#e8<)mrq6
zkhR86{$I4!L8VpJ+(iNOFXqh6a=2rQ-+I_R&Th)5rp_-fPtm@@{-9!pn|4rY+HR1x
ziJ4lF#u|H0aiCdY!Yf_zMl5fLCw#BRZ*uRXcx8DYM-YQoUrG(1QhY}BRFZ+4%8MOD
zH7Nw8YS6$?1x3QnY|!DUr&*9^zw*;EJ-z<lWpMoIGch$WX?)05XrT36vnx3<4^F!;
z{C6(_Jf6lZn{HVfwC#zQ0V9pSnl3tcF>2PCYUMMsgX1)W_SCSSR&)hICHv{s=A9nb
z3GKajF8J-!(_e1)^)}6?oGfXHnmc|K1AYhIRgL1(h;uEsKj=y%)PTamdMe0GOtkuG
zFHs%@VRqF{tyy!MY_3C?zdTKzzI|&Cqfee9xUjY*X2EtfQrXKefHTzOsghcCZIMZa
z0n;{z#g3nm<-6`B|0%|&SnZsuJIt^AF^fZv{M)WYRNg&(<<y9lhX_P~Tj?W93{{wv
zbmta$-Ldr=bZZelsDDu{Ta!wVQS4|k=T-YKu|Id8u2`<#Osnw|8&yQ5c2d+ps}%C=
zG#fm+%EB4C1Q^_)FV@J&XMC!jrHH<rasTQelk9aClTSueA;M5P4p627(vclc%_#bx
z51NJ2SRZvd{2Z#=o6Hc86%y}!sm|usR<JF|lCm0FlAufU(-EqVumXF1;k_3Ve<p(+
zeO0fZ;!)mC<d8=1b5}AUwZ>XSj#zWQ|L@=v6Hy5U6W&^0WAD{|&4lEj;zp(Qs*<(M
zRX=42wTCEFe9=z41gsjFoNSI*j%z+FFP|;+0dd;$;bpQ&P=7~O`kcFQLrIgJmyXgv
z=IJ8l3a?<Odx7Yisb)KiPUcfKCMBX@FC&dbKDKFgi=nXEF_S;ZTkke2;!wc;!cg&P
zH5O*1Wh5)TxW}lZtwl<Fw2^{mDs9!$vJ1>=O>+L{REeD{gCB#*xv-7h$tBKr1(x~E
zYEe&05-hOynv$$9eE<F8qA57GxOAl5pAYjV34seymOVMXe{#aAFwS7|c6`#9y)w^#
zRPuVx3ifdKEt9c4zHUi(vsyI|$2-!wYgo6QVho{P6@qH(6<Bz&Qk#`FBgcD++=uTg
zmaTjjD51Z+9GJf|_~!hCX$y@BJ6a@fPY}v^A41d<;GR!>cA#7gcQCSB>`h1weizSZ
zza=mX*f_FYTT4j(jhGDa^UbgB8C@-kNpUm=S!U-nv978}=$jf6IAAn*nTLzl4|luT
zC3wb}SFBmFFy3o!y%NXf(5*%jvjz`jJQY7s!qpga!b7Vx!i;OvF?P&a-9jf|hX*Yh
z`lfTP`=c$M6=|G%Ch57URklqWfo1P6*^!k@1t%yb8ph?C3G)Ykh*<d{8;R7%iE-6T
z6y`Kp2MdGUYf^y^LkD>FWaZcAh8$4~aKE3bu<+d*FBJ`yNkqS&o_pv2cvP{NdaOz@
z>mO76c;Y*Y3cXEzp5+eKz!{f2&d}rF=|<X`rLPx|#?&7dbJq2SM#D!84_NvFZQd!*
zCf)e;TIRsWPs|6;v#mWfibHDC7SqyUe|*sy{UI~cEw2|;scpl8%iL`^qd8<hMtH8Y
zy0=(EbwvZCCpHk|{U%o;+&pH|KHzLIgGuZ!kh^(*@T?=RqElt#wuxzI!O?WAo~!5X
z%9_r7cJz6I3yYhp3$MNg^e#qk6*{NtZ|jyoDm@e*3BMCw-k8vR5eEEiY0_K`m<$6*
ze}B)B-N_4<tdMl<BwPW}*j~oVa0X&B8m5B0ymwV<mi6C_hY!WCJv*{HyjWU;<Y6%R
z=x+o4k(e&6VORaSxOB)X?ndCFEq9!5XX(hk&&~!Dp3lj%PAa?Nb2unMq)s<OuT)eP
zbVz6G_C%^`Df+6To|N=)TJq+(W2ZB{1|lC{s}Vz2)IPa*On(7iM>_U5U_Cw=U6eqf
zvcfhW-C{ew%P|=;aI2QS!jd6TgVsH$_JLJUnVKA9UQvs>muPW?S&e$FJ%2app$O1b
z(3>*OpF)V|M)FyDYW1GMc(pKH?cl>dyDuB=r+$);{tE&wC%ejZfw}QlU%*f?Ohej`
z3O-%_>k2<*=uW2+EvP3UvQtY1i00lWJ?a%NE84!%p031KL3g~9v}zBp#SZtggCZGB
zT%mEsY}v|i+HN7F@l7IdPcT#3vW23|r(1EY{~&H|j`bb<zJ_(L8vblA8m>Soq4>s9
z#5H-F#>vk$8-;@6a7DH1h<W-rO0M55-Rz|N{k9x&LY0H#XY<+AJHm%=Q=EuB6W;cQ
zFTV(S=VFvDU8E$G#v9m#{OPhcrU~ip%C$e#iMUNk#NWv?4K?7h{MEibfNp{Zm3`WD
z`5=J-#uGPj&Zf6MIPRPVizaoCEbR>7T^gRO{@)boKxJKxclDL(*vt%l-G@qcO2_8o
z3v}pVxqjDPWz_z+eJm*_>36~D$8eFuiA*7cY~FkPVDGpapQXY=NsPr{Vm$RAlrE+y
zOT%I8d}7oW4&bzg`^RxY1vWXYRtJsK;m9HWQ`7W%uBG_Tcim5l+G+NDiVeLeB`60~
zanxeJ$dk~ZZ%<Di{WC=?YkeAX!^tu^Nnb8*@uxP%PzS>-0*$;b+Jv8djUG4+Gkp*Q
zoq}Cyh6tPnxEu=oedp9l2QwQ*Ib^!NV|Z$4<K<phFD`{iCzOIl=&aaT6zOB7D$gs}
z&RvSR=G>MF3E`vu?N6Z~2YT|~avN^QC)se6)OZ|YZwGkHRYw22kPW}-%NDOI_nHzQ
zniT(eQB3(SdX9bqsQlNJ#K<Vh-(|R8+tqBpr|5RTnu7|I;WWFn`i7bKh;Cv<;|5eG
zMvflWTy_;f!Ai6uXH-UN^Y@NpQE0OifOTA40vX?Jap4=s-WBg-e+tH~Oihv$a4OgX
z5)t%jZ0IX+G4lq-3N?sjIJV|-9POOsQB=5l3&Q)8f%Sxn-tH0hs&9r?@5cT%ot)#v
zi@-I%p2GOUJn^1??+%%eTUyOJ)_6<WBJg$W;M9uW;)28G1%aTJ-mn7)Zy0ScGhumd
zAoAO{C5N7i^4yY=KUEz&IZ<y9RDwuYw1x9wg%VsJul>enVh9HGAl2c0L#q$TmG@#M
z%?{@{H@iq>kj)IEB?q4eQ_~#i^ZyGmnqJz=_c#UBlpUtrT!7x@g3doH39%mb?{GmZ
zmz3^uZbnKLiB#OIyi{VPN)znFRmR5%py+ZSs~~1m8djFPSKT$czzM&=!ktrPZ;@Fc
zYp47e=&kSo<xhFA(P5yu{uH}O5Sihx-%)Lr+}~C@r>16x?6U#kYu%0wPqHhO;GhX?
zbIEn*co^z-{=u*MhswJi0=v?<-)B3)!IoM%%GpXLonwCDSLUuFzSsPNHj>Ly5Vt;-
zg=l^q(tu{5RK`!(n=ao_F#z$FSKX4ol?E(hjOtKEdf^L<WnyM0RcCUzS_M%gl1jtT
zdXue<2v&T$jYVUAvTx=t=H+{pL3q;RH#V8g$W5;Xxw?9yzk^XL0d+piqdcDR)h3~}
zw_2`FNxrIzoc)@QPb>XUx}xZzFjTwilE)8m<+*}oOlIlXE%C5rZGkaPOR{)j?V6zg
z*KQY+t6BYmhk$kx(?}H0f_`{Q`5|rpt?WuRmos=7!fiYxcu1T)BsI~;SLIv6%IH2>
zkijjNl9}_%Prr3booD5>zTgsegxo9aZCZSNHPE??eu6DAd_e<9S#9(^E5NqkLCF}~
z4EV$~0E^?yD|B((+yyXz@mLo=mg1Crc|ZMp`ZXFqb+K&iq~PW4Lg&P==13Tq^i~QY
zbiw{z-v9vR!zRnv89jk9ZH!j_3c9QJQ+}ApY9rhCxCxNE)c9&wZ@Fb{a>_Wfer_55
zm3oskP&c2q?v2p=j<?)Exv8P)kN+Q^xJx9^wV&<k&2+2J*x`4azcZXU6Jn7R+smhT
zAqI&2<>YHJj9`W^%mG;w`bDp7Iq80D(A9~0a(tkBFxI9gaL_lweB5c2)>z4JIEGH~
zk6jG|3wz-fS_QoT_Vt!PW4SQ-1=L`*SN6KMoG#f)rO{@Mlo-fkIWNMcXN(GOX6KQw
zQ8^(5I9Y1~2Q`RzVAG#CY?}d4mV-Yf2Ts`wcBls8ACiSXnJ_ddee%b^{v?SlA;qBX
zk<LVP9ou-@7uD`tMI#NU^LUwO&l02JQ(PBDN)wKf3v@`kmslR#wK*o#ZibvII>cpo
zFAWEn9b3l5AI(^N3K6xW0hnq(!ZY-5_x_no_|#DtJjmHXV=b8GF2K925Qp_BvTl+f
z?kuUPk4b*_`r|JgrH#OC>{PmJE>SoLhHR(Hr>uFtSpjhC>H;TO1UWAGy02ueI{l3Z
zRQ$cG8rHO^jk`gjn}@}#va`IPjo2X<XpFTWTjf?1-56~I|4R2cxH<=xL>k|j;NK`Q
z_^cn7L4V-LDv+ezE%D)xV9xIN1E)Wllj8;93yX=dvMR~ZFqC;<C1mnA&r7kS8Q0tO
z@`TSBVnTvP@j?LT-BD+8Xy4r@J>fuK{q1VhO-@HyP-7$ax)8=#`SHm_Rfhge8@Yu$
zn63^)h}3e<8&-H{^Sy(iVzc1zfg5E<TN~qTWN^i74eg~D^&9X5!akVe+^~Xox7OQg
z_xYg3e4%@}O<|-|SW}DoK!lP<c%Xvl6G@qQDCB(_F1`P_rg8_DHNmw)dUV^)7<ws3
z8^fGzniRKpH_n&m8F@4Eflk7!VL#%mUoXHXq)2!X6HT6lIkfsq81IE87)P-pPmBuy
zO0#?*JL8*s%UP;tMT!6<@nKFpRKj>#TkA+g{~UO^dG{vZ?TPm-n<YdMVtp$qCX9*o
zQiHwdY+nMBtJk1_6;>I(-1UI6*#$JeXHVz7%NCa$Rc)9Yb_TxxcrFR0YZZs`Sf?g+
ze}2&#vGOAJhhz+GcjgV+?lp_LJfSXGw?nhjaj~bTTsi%^*_>yyd9_lZ=n1f8_GL70
zQaU75pxOBp*R~>D?_ro<`eGh(`b*zP(!Us;V!@|&lzEcDcOJ051XAO=qyn%D?78(l
z&?}(UAz0m9oL3rZgyZhZ`fJ@wg7Nx*zZ>QsCPF3Jw#O2LbbN3jvURm9J_at|y(wLB
z48WZB6=+ZC>PE0UWs@q{mHP7b5i`nBy5Y&2JHaX^6>rH#o9Uk`K!Epq<bt7n?Gmx4
z6zwzO2(F#N^#-0!w@POR90b`b0e*UTyNZd@nn}2h%%O5OzzDU)p`>f6s*PQ~{pIwe
zEn<KG;PM#R8f?0I5b%iNB7?{JSIg16`%_hfS#VS8JC8o(nctQLZLJO5p=6D0ZO#4z
zJ^G+7nLt@)NAq4HEU{$lmI2@CF9z;I(?1)of|LrPU=z30+Y7VP?-fkA=F%2Jog!=(
zxT9cYGo+-0Ku)yX$Kxne$~xYzc|yI>qk$6?8OFxF$3|{X%6WG#QKOOGoi2kt#Cah4
z_BBt;iLNmIYR4YT=MO4^!Q^+(pQf%}V5A!v5vJ1rhQc!x#sM@)1ecv!zJS@*a-e4^
z5%}><-lEV}#X}}l&Sf~UQcI*3GD3iBC<LrJ9GhgAn<orx7tT+rj|=PgEp`0#qI3MR
z*!Bcl-+VazCNcjuz*O0aF9NAYq6}jSTj=AaI!sND?G;Kx62iM*@9zDWAF|4EB*tH{
zPP-8sBnov*aD|Y;x)Mako)3Bm*I__R1_u~Rot*4K5obpM5z^CJBzFAm9X_|Bl#nzT
zG?!#{kTEm_h)tlY3<?wvC#Go_7?d<_f2)r%>d1NZ!4)qDbdZlUG1t1D4~j#!xfQ__
zEhFZ)-x1MK>l3)rA9`}w%(?1{7X$Q`r}Ra5<CKWKO#3hW^}4wI^{|=*BQ{%Bpndk>
z7mXi2@=IeqL{04@=SR>9-Y04Z<s+nD-@6v$5q+SSl8YiNBElbrSAXB8PkkXw(Ql&b
z{@d5<8Go9K2llOrau-cn)+Vss6v5Xv?iG#un@@!VHN;b?Qovxj+8rrmS<;L|w-&{`
zGHGoRhpeQ?7d#MA16JwGSr<*zqz_QCE!hsoBe}Q*;qE(7O$y$RR_eR8?FFw-b&e@&
z$5;O9NPp&J7HV^FJA8jt1$YnuM0nRx^$b{rn2H1B?zk_;eGvsIcOOhPAXi})5hdk8
zW3&QiuAM6Es@yy*B(Hg(7ExSE9)pw@<6r_~q4zJ_c&?;BX}JW5>-^u-mvs$}Dp{HS
zLHyD`$W~@1iauwlj9GAkdgeR+<&Edboh2OtT9=5sAyJ&}9DSBjA{|y-@`Ugz!9u}C
zXSde9?0m$8v%BMIlhFUgfO!Vv>P!>kqb=8uL9CD`YsAMl8sb;IO&cVgd%yoRbvZ;q
z_+upxj^)KU%E9J~u6K|69G9l~>R(Pe`cdGow0U09D`CDTB~SgMX8S@`tF*wG0DwMr
zTyn$e7q!dx+v1u;!3k6Q4bMXZh{ZEYyXf;7CrDbs4D@I6UXM)LHIjo0g9Shw9g^QP
z${O4E4QK5UVt&lew2tdAgaY%-aHA}v+8A~d0Ot5s3H{|&>T1HDR~I+bMzt_{pn)S&
zgr4z`I<a5%q^9~&cv+5~&Qk+`?ZzuNKH|xj028u!us@7Cl6O!Z<;^#d#uCf$0Jr{R
z>xn7j4eo~H?zwW$E!ux&ao#|Cfj&7hg2k=vB<?kzqurOGKjHOCO0=7sBp(7s{k)f=
z9TLWpLkdc}YDF#!wx8uEKlYV-C}1|jc{>Q`A4;F)_*Xcep2{31sZ%NOw22}-{?h>;
zx>saV8$q?7W6y_vua=?(y!8!ovkb$p$W-IWU8$=t72c=78K&8qGHzA}ttvwlq^t2o
z8KJYumTH2rg1mI^`@xWAbK$$K*P%PMG9zPehlQWAiR+jeTGlFb{OZpgrR%meV+eb{
zwvfq5gbj^27c4>?Ygi?J(Y&adcPX^0#T5NTd3sF!Jm|R2qTQIKDO62;4!8GfwrmHY
z1m4B_E)G?x7kjl1L1<@PUU^m;@vyOjhQ6GMxLR-4G_6QJ|Kg2M*e#VJH|#>(F2F_v
z@e(&@#Te#0TRwG#*w`(wqpg8wO)u`Zq1yBEJ7=`MpFxZlcYo!Y{dikYYWi_)llwLp
zYyQ+_G<%@PS<vEf-Gg>(5h#uKp#@>+ih<bMuB9z9^S<cYd#l`?&bisXHAecl#{bsm
c>9{Ex-Z1WFA3CTn@UTy%t8J)NdIyI5ANSzE761SM

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/pinlei.png b/litemall-wx/static/images/icon/pinlei.png
new file mode 100644
index 0000000000000000000000000000000000000000..29b403e514e6449b943844cf84300bdc7988ed22
GIT binary patch
literal 4174
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/pinlei1.png b/litemall-wx/static/images/icon/pinlei1.png
new file mode 100644
index 0000000000000000000000000000000000000000..cedfc6a54e31dd6d132de137f15a0320a5f7dd09
GIT binary patch
literal 6966
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/sex.png b/litemall-wx/static/images/icon/sex.png
new file mode 100644
index 0000000000000000000000000000000000000000..7af7a3b6ea259998b8260c96e6d71c1fdf18563d
GIT binary patch
literal 10604
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
GLSTYCCJKcB

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/shipin.png b/litemall-wx/static/images/icon/shipin.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4ada967a3e5e365ae7a66d4ad523dc8be5730c7
GIT binary patch
literal 2886
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/tupian.png b/litemall-wx/static/images/icon/tupian.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ccf1739b4cd3686ec3044f6d799de931a5223b0
GIT binary patch
literal 7265
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
N)7H?3VASB@{{xw@wBP^$

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/weight.png b/litemall-wx/static/images/icon/weight.png
new file mode 100644
index 0000000000000000000000000000000000000000..b804266cba3619b675b3ee600b1eb25d2d55d038
GIT binary patch
literal 8050
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
Vo4c-51K-jKbTstUD{dph{|_5VAR7Px

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/xingming.png b/litemall-wx/static/images/icon/xingming.png
new file mode 100644
index 0000000000000000000000000000000000000000..87b3ce9e7af6476719e3c56ff39f3764524f2a2c
GIT binary patch
literal 9889
zcmdsdS0J2Q)OL<uM(+e6K@6g0bdf|S`WQo$A$m>pAY`HwM6?hkLxdTFG1}2bPfV2P
zBnU$EUPJiboOAx~>c9RkzKgkeXT9s)d+oK?dY)(Rcw<9tIvQ@8D_5@2>FQ{hUb*s@
z_@5sY1@PqQv*ds)SA<=4HSR%!b2n#bAG03kiR{=NyJ{Il5dv{cRx$byDqc4_d=&Oj
z{=se^mdr0r)tfT<p^teAvwyt-kMkQae@bL;4Y2X@j@0xz|GT_gb1yUK(MD8zP)6dh
z1E=@I&&Ka>zBnN{#W^FR+9$OT0s=|SzgjPuI_?iYP;(A(Zv1(M{#6#CDwD!BYIk{g
zc@b1Etf9fzP7o9vL?D<_U8HbvA7we=8b7!|;(~i13U;Qa6r_o9Dv?M{jr{*TW=p7s
z2E{_RY4=X44ngLIzv*aCO-L@ssn2<O{cZR=0tdf;M_jEmV{&tKG*P(fttXtezS}t+
z!#@l2e7hrKe)Aku`aQv(hmImrnI*o9(N>s48Yk}R=4M%-SFEJ*o-WCiJ!+g$&crj6
zl7hnFegy)t^jyHM$)3|jkeOXDk<m)JrXN(%F*4*DBcz{MIzKDx%Cy0(_+lu*zVvS<
z_3kL+ds4U$)J6j)=yz+3g(PSzwgihAtFwtDBIZ({RrpR+)<*$~aZQd;bLF8NoIcbz
zME~xK<1w@s)L&xyvix^TaJJ|05O{W>JF%eagMOU#`!P4ufS__RZz@cSz}06nNpz_4
zjQ~rFU1W6pp_kTQvCrSsuXGCkWOz5u_=exJ;=<wG2Ml`?l;UNL0L!N*y2Zk{AjQQ+
z{|{_>WA*Ms7!y&@EoHDAt|M*V+?{F?JkV0<W(A!%ge&D4!Yy@ze}Apts6bcRl~a<i
zolRv`(_a6%RK!3bGY?67q9U=1On=W{;AnM6fc<ZQ8|_ELi-?S&T0+n9)=AbIV;EcL
z&^wn}279)9ZnPw8;&Q4loQ2+fu)cg-draZMQ%7D_CV3`Wym#;k&G6$}c8al6)}8d%
zqYoEfCyR7*LUs~V{i4|EbtII0Y+bL1KJ+X5NVpI8lJ%q~H8-B0@Q=NZ^3E-;JM28r
z4)wWs+Zgk7?onmmL#;ciS*u>fBcdBiQZMFz+yaTraaQwMo6E!W$5bJux6-J{4(MWi
z=J>S@MxfvRio&gF?WnvQmWdi0M@UU(;JBcD6UQ^*oazM0cQ+VvbcB~Wk;hJ9o~)q_
zXn}>UBih$%`VNDQh)~{;hxedaBN}s)ZQc<nLqcq9a0v+sFErGhQcs@|>hfhe7Yo1m
zrCcx3?X%-iVn6n7f*4_aaIG$2Z{@pLaI~IKp5CWVkF+JCGhZhg>EMI9U_NEPcApm3
zu9V*D9cr}hCWCQGeX3Y4&%t@n+^eN*!N_U1fTPT>ajLBNx9UZY8D**n*p<>J;*WM(
zPV|Z$<!himVyEXi&aY=_HfeZKW7kaO&t5sYK65@QSv2FM*^(2_XVQQlI^1tjziP$S
z_FE&s<~QV~*IO<a4QZLmB%K7L9@4thyfl>K!5mJb?qRA)#@>M;wXdZsMu&BR=M>A>
zYVBT2=;v!3a#6rejZp!DyL`)a&XS=Yg;}g(g^jamRfn(r+Pi|8;<Q?m-D%kQ5mHtZ
zQ;YgOz#?K;W550}Ak=5pM6K=9Zl%RC4fgQ&T-yA>Qz(?aN7DMPE3cMQYEpjYEc2^Z
z+}s1YJRR}Nkc_aSp<`ri@b1DbrUsS2mY?UF^DkqqSm>9rthED}iq(Vy)MuhK^6(?U
zd6h@?c|u=zgVCK#qdO|dKEbH*$;ASzoVdZjajDLsg`^}DB%{%gIDurVn{2udM|Zy~
z=cMVWsx>gcKYH<7^+An=y}YD5y~od=m+WIMobV-Gi6Bm{JF$J-wL|`4L@CTS8I~QR
zL3N0{!ASklTvZ#3Q}=EF!gAB5-5EsQ)P-7~Yj6s(QGZm%`teaB-)kSa3N1)H(ma2Z
zyPQRvA#t^1*lkp)Jl^I}sV{MgNMb{aMRyT{&-vimRn+?Q+%Yd!EH#alOiNMU{V`d!
z<SsO7cD(G-Nb}a1JHHq=S;2|o^mK<y=5L-?YG;tg#AuK6!{af9uCA?)0jZ@G>mIq{
zpuD}LR^@>xcaOKm?CCV+KJqidW!$ac!Tc>JL`D_zBIwIkeE7K3Axx$kH~NyB9W!q)
zmk~TZRF53{_U&6_Ls?+DB`OHWwldh0mBtqNfbl`Q6ObMT(djbiSfN;ReT4W+Aqm{{
zt}$qQnh}F#)*k1zj`8Xq8tUt_;QKZq8l&>E%`(kd=b&B^`z<cZOC6DS4*@}ara{&+
zA;+%MFO4)=nO{O0wiB9eNiaV9ZT%oz`ao@|r7G&x@#LnH!Fh^w4Q(l&*wSThT6~DV
zU4wt}oAj*XL_{rNkJ%uNuI*X46Kk>4T43+0e~5e^mJ#N{1T(nF`^jZXkM5AK5yLyS
z6l3;Nc7jf(rnz@ZhH|XQv_)JN@{s#yv$ac3!kUwtt5Z>}pWR3UtuMurkRb_e+NO<z
zZy+ObERnFr80$S5w60uxxbJBcg5evBIE!q%3#mW(c=5nBwZ4>Xr<b1pu2Wv)_|V1x
zJ&JNoGX;w3yTv$U0qb)ZZYJ@lF;F5==(%qqIvIPIL3tDqrxW`ip=H0L?^YFcXFF$1
zWSNOG8x@({Rkd)HgyGb&Gx-~N*rs2)`z*}pGa1ZAYv=)`ukXTb@E&v1I^NXhrT$)q
z33SS-!EW4XN9}O-LYY2LhaATX*Wy{uER=~d)tb=FT463r(tFTH74mN)p^ROTBj%fi
zB4694Cc!BZA&lnU);-@10!8M=B(i$*2UNvx+swW~(eYXaA^xJ78yWKCvXP8`F6@P|
zfT-f2uWY1l*cRzJf`|0Tkxqy-wwTCgob+18N(=r9C#ENrKi0ngG<K5D<xbre4kvg}
zs($>0+vy;6*@Y<AV(&@#NSTRt-v5e(%nGNn4$Pv5^oolO$k~;!yC&*^i?#h@Ch-eu
zVqA$VTcM2b@`a(c-!s2b-}Q&u)Jirh`@x1jum3#ym|~<Fo6x+{_2n2l7f#W088&%P
zxRS%MyjVu9{x!_;H}aM!BcvcK{4?CduKcjO(Sm-y7>`iKrK5*rh7O*eE9GTgzI<{3
zJE#eH--RV(S7>F`wvmUA483CH85J}hYjUR=eI%(o*3@`8`6#z-PfCoT^36bBS5vfX
z^xECok+v-au#5Tc{O!Y^yiJw7u3#8a-lgyK*Y-%x=T}B)Y&T_ZH)q!f7$M5?%j#_W
zPuXk-N~PZ$iG9HhZ4!KCBAjZ24i|bW^|nPS-w9UYl~bIYRACjNj?X^e_TdVrKvYqQ
z*r#XF8PcMpnWSQ}c0$A8tS0($n$62Xn@08Q3jH8-OpJp1BvLl&tMT${ZNya5&y2Cz
zG4v0&)8pRot_HCbvq6Z;(+w)H2Mq^YFlisd!Mau_ONCXC6C0ZC&HjZ;rzRpHEW&g3
z^Bmg7t@%CFxW+s@bHFG2ju!m~;|Sy;0Uzo@QPxt%Ul78#Zy_zPt$%(IbmDFxKw9=H
z=&`XMyp!X`u<`XLgM;=q8(z`mmvS$3gLL)FT=6x5C7xX#LQ8>&XN#BR$}AYP+kLnA
zHJj`_E@(@cT6^}rJxVn)Si|s;r%9q_QjPz3i*V|L#{xL1DL(a?$hrQT0j?Ql2uquw
z?%9mCtIGa&v9s69ULnm_WTTgK)T^Bw^E5mHR*lovsL=XIq37EHi=j4ap_3BvzBJ-u
zWz$nldj)B|$qu(XI5QL}GF9tHJsPu-=Jb6+xX%?_xgE0^mr}TIX?BQO-M_UQOVd>`
z*}z||5l&6t8otXxr>cUMj6mYYKiJ?)rPd_GK1byVn^P82qAE!IEtV{EZ2nq-{K_8-
zDV!&s84eq_ZBcBt$UpfmX_7hzcwTHG;P-ao!?vQGgm87Y)kMYCTBE?qhIMBgfRk2Q
ztklbt6n@QY^P8+znOB|=^bjpiHi;)WJh71%-2~s1Z4&)<oK!-8NR8!fgRe>o3X}1}
zOw|OuOvISH?_EBwZ!Z(h<B&^ybp1gc^N(3VELCNcYXS>{#!?>#mzZ>m<3_s&WceX#
zBa#E>run~1IoM8_fDd!$_(0_4wLzV(>gW)d$pLoZ=Dq_vyl*Zx0-X550+sXiH;_6a
zizl3aMoBL&52qGC{M=r`e#toIsiM3R@jo+8XxuqPiG3{=Fph1}T|4R>%-dRWY#Nlt
zed{FPKe;0eEKSaY!t$CyvGsQ<K>xkQ1BX66=YeaH*(ovd<e3Tr!Q_NH_Cz3^Y7%sm
ztt73o;%ZQuO#J1hj@;Z+1cIRK1+94Z3R9}4>zY9Pq3c^FeiP3`J@xB6e_pdgIz>6*
zgNnb!*0FB36?K1^)s8yQ`Ge+3NfSSx05KR05y|mYn<lBTLv@Qhd=hH;-v{lG5TX4Q
z70A_Q?()CNd3L{C*UYp)ls`Mp4^+>>IlHR2zpLA~Acki$7Cb_va$S;-k51i#e7R*K
zqqsVobh7eF(2o`FrLCNE#~^t_PPjl{!AVDBuEyhZFr=&Z-x)!=sq}^auDK=3q>ZdS
z8d6oI0y?KGUG$4zeZH%15|((!0Hr){wxQczE>#sm@B5bL2w+uhWWXXS6y&-5!R>9J
z&6%$}<~4O}r@<#j-&lLc@stM~bkX;DW||+8{#na9()BssUuime!bhmww*qg2o;?Z8
zN*@BaKoDXiMvgYb>fx7>HH}p&AQ(VKJ_2fAt}2$9a=iOt--dcNTZkobh^QAwy2K4%
z>p>od%oKZY7zrB@(eWe0YDae@>u$+VWQOKaz#eG8iu##fVKOc~PUm_}GRa8FNRhR4
zPB8DekrsGGMWf!9XQKfO5(fEsy?f#MnQTzPNw3i{BIR2TkjXL5U%Tz?A80HW*%Zdt
z9VRVF1{I2Pfhe2acNz6RdD~dFs%|lp)exP;E0V_F=T~BvE<d>4&DRhOWVbf5_?z#6
z^1S2l%I&VW(f~NKRLJZ}$I;DJbJK7Jamc~fu>K;&P^fcw_;S|XRi7^#+`y1;-?rQJ
zL!fbgn&vQLX|HYg#na$QmDNb)0?h1ke^Nwl1F`Iv_2{=5$(V4_XGN4dGs6f(LoCwC
z3{9fnZ-Fk^Esew*kNPo<?K8EkEk7+Q{+-aYyy4Y)vRgKM_DQTXAq5y5MW#V9jW`<&
z6Kn2jlzXB-*zblOoNpJ~PScsms>-rK^BuJld>KfIA56(IbF3pgzeJYO7#Va$$nWwS
zXQ)BWtNrjOXo}e*M1!{aKARfFxc+=wj^Cu&&9!z;wcchU#ir_2n44X2eYwCBG#{M!
zCz#7(;k4qljQ&LC>iRT(h^J|1iSPT_OLdD{ml$MVhC5&4za#6W$8OtA-3q$(H(f^4
zAI#u%2<30;Y->ngQ~h_3q9>8H#izQKCdWe1EpW-FAd$|t?9nNs0QMSIPI%flU*oa8
z=k(C6FSot+D=U9nKDg?Dn1XH)rcWy`<SI!gFs5_`ABZj|@|vobyOy6nWypka!3E{{
zTI<a~i(KiUU9a9ay7Crs>F+m$r2wI=B3)1Nu<Nln&XB>4?rgV42YssF=ln%qq9sGC
zHTEge)NZ4nVA@g^dc-B@5+pG<3+6!cMC9uy-(W<{82Y>-5byw0hPy{MTH#ZTB=>@f
z+OqQ0D~Td#fsJP$pg|Y}0u_6>)k1BMw({8{(fpPD$Z^l!Chx)(U<Di~$L%iL?LPi2
z>s+Wa7556J5@Fq2HMc~KXQNNC4z`$1LLZq~iU8hrqK4k!K%n`C+jU;)t`+t#@=7fk
zO8<C(RSD1Vb4^;0Mq2e-G_+VhYIMklA`mv*7u{r+qpn#$LbW-7oB$#Zfa=WbxWKfW
zOUnqy>zIXATfF6k!DgG5`PEMJesId1`qCYWahK8ZQjkQRqAdn<BXxV9?@!u3M4%J%
z?W~T>pj%J<fSfh?p)B9bdV#j)ZKg5bE$yyyPsM)agl~yjB4$puRJAoH>M)eB(yhhQ
zAHkEW=z-O9c6h?q&JG6#%8X5-?JF@1`#W&HLyHlxEfUz_7>_r7D$NeQ9h+JKb|;C)
z5xr!2O5}~8lDqr#Bx)3yZ(FdYHa^Fr5Vdr3Iy-f96%U5F#LBIIGE|KFPk@FiR`KmR
zMEZM(_zx1@A~Vu#j;}?4Hy3(@l-#%0E*_<1{Mch->rkEdrgk@<^s|%B@&byF*(kwu
zs5)Vu!QgueAM;F{uHL%TZ3(M5oas3?Tn`m0)XgpER8+wdc7jpMa952|Juanue10<O
zSDFwBB(!7fnYYq;9;{PJM!+GiD@Y>ZDNEl=VrvOkmCc0r+{<BUHOfpYrV4h;WgaVx
zOYzpKEyiQ>gPE!Xn{`2@ZO+q((;O~>yQsRf@N~&Pv+<jmKHhTcWW=!)mr}x-ce}H`
z8aw~^mCq7Rj}<)yF^ts)uDwK5F)ZkH5PXeHNIV*O7@n1=zw}pN9S(JW@4RB|%Q|0p
z_(aDwrSUGjoV7mW$oLS`w`8T<2KX;2MP^Wo>H3Uld`&Qm+I08`JEybKbkw|y8GmdU
z`3(H`DCS9k!R+T9(-yQsjE?)8_v2R5|4cQ%kUZ1MBjA>zFGU2RvT=tgZJUC`!|zdP
z1y5zKhU03*(pL_|+blg=aj+WDRIjNeXdB>+W|}>~xKSl>Hs?+j4neayA|+{}UjI50
z(r7qMXE4o3pIzXm?x-{3=-~x*Fm*Ul&WPdWqtHm<aNtzn{bLH?z;R)()tU{d#~p0*
zQc+n@y{J?xea$Q<s`9AxS3ubTiGv}Ml<XlEHZK-Sj%o+-_B93_uQQ9Nun;QjoBuH}
zqJ+Kmzm{8PufwUW0Gb!_uXwL3d*cPcDu$q^Lp{I!L-JoonZD9BN{-w%SzBwR8YY>n
zq(or~_UzpdM20M|hd|;oo&S{1KM(B@4ZT7Cuur!KcNiqZ3`XSW>FJN+NCB%yBDmpQ
zYOV-@V>T*)!D+6EU&T1F!rxHR(z1rUwpHKH0ED-i4<oBHH>>X>$~6$(Ceu9ttOz90
z*8*{co|{Q)(QSPGAX#~zfw*8Ju6Gr_=*3K(aHFOal!Seo`>rz7VEUz;TjQ(DSP#3j
z{$No_?woA|{0(Djv1|1;>@P+bQ+l!#?&HgH0?8Or?<n~*jYK&tZKwbe7Z{zaN((qF
zTJO4B*ySG7$2}^I<hGgKsSCXBnmHeu8Ww7O^6Xsu5HBVEvar8*ONgqhda_0kw=k*H
z@n?vn`qIfIvVNAUNT_gWP3Cj5?TULG-8}+UYlIwY`YO7rCbo!mD%<-noW}iBvFmsg
zBT;ZC^wf;=^(V(H>+|o|_&^l@=$7vPKoVU9n?^jTegmgfd7*yF^INYKVKhvz1RqkO
z1Q19wH)Qd0h465;eSy*~W*s!dOufx|&X1&xVG7WLWi!~}93o@NCeDai%)`zu<-XiG
zzm9rjz!Sc8t{SSqv2*jQULyp;-3NPrKpS8^l2no9_2zGPI>Z1t+BPFKQ_djm^iAAc
zoX<}K_5Hle%*;9{xR!KD9C;Vfxx3g~bd%Q}k(!;>yFm&2WvnM`%aw8P<mxhG99i+&
z5%+`E^~vheF5r6?Yk1wD2X#SZU&pSwh0rirapzP<b<PVvsN;u#im02a-(^9fs-tL)
z|BIp6A0Y#4e`_pdu$s@Rm>zq`xyHp@{>(t>Lnh>%cOH$*K_e`tkhzzbe0mEvYCPmQ
z|Bp~YPsaryOhW`0e~Huis=c%pXruo_J=u+eU{dg(RUJV`7g1#iv%yX8o~ZtIs*3iY
z{z9CNvW3a(0rmOMn`q4<=d5L@T9R#MMt2dAlq=@Z<a>(O6*%bnEdau~v*6;Jlt)<T
z9y|g#gae{MU-kFta*x`8O6!C8l&h~I&ixs{+W;>40}d!)fkARJ;5qL`g9`d^`cT13
zm1c{Jtuzbbvgpv-X~LSxxmiS;=-T%23c)P@X@www4*{&(%nb)qwE`Spmab%gSQKgG
zbRU(z^)NWA#_owcrlIBk;+a1F|Li&8n4fqj-K~@#y(Rfs6NBCFCr23{??Y1b-fs~n
ziC&xYp}V!`|AG8O<l%3zuS)~u^{74r@^JvViBAvdldqahoEvkK98SsxT~_gDG>f>B
z|BrV-YoO|EA1nO~Xr<L9p*DFdt&MBor#qOyQ?1SkoXgCwi)}WE2mAISxbsGAy9BVh
zQaEQ100Vss>b5DxCZ=p;aYzfy$%kACjYhrD`>nd1qc1xWTOFMO^42oH*dT*B&#x3P
z3^qQUV|}K3&5uP*pA$aYNystiXK7)*5RI`7n5@>OYySr@MhvuV{vA|}xhTWaw4luo
z?K<b$r+0iB=SQgwL7oHWHq8V>gy__*eiQjUv(9^!);VS%O=|2HIX5;^fkIs$FaNzB
zTW@<rzd>}jSz<(7pJFYjFhV?aHQ+F%r2s-0{RWM+&9cxj*tLR-0{i)s_4&&N>;WqN
zfiXI?!D7bjk=IQHK)&PTkc_fUsw)|qVDIlD^chO@oa^qVQ8AvWmU|ist7#}pSWs5p
zKf7uxntM?drLurJv@pvhg8_#JG^EHeAu1+yM~@kg;rM9?2>T7{iiTJg^w#D6Cg~h<
zQCrho0y5zk&;UCKG9}A3(;Tx-ZfNx?w7_>3{_}~?xREjdPuL@-e#8=T3YT-jYgPm-
zqvov@gMWYHd%ERc`7`FZ>=FxnZB@}UmULv`+ZZcFCct_(Oj;xYp3UdEM(2LTt4mlK
zXUzmRSU~d92ssVUq2w@J3w_!)JNrvRd&E-!1819(SzN;Jhp2^{&#JU>gkIRo<Am$%
zUj5NJoy~~c;<4<c#86K7sY!b=th;Q-*Q2yFCVWliTH8UXGoA(RPNi^kP*S@5A;ikP
zxJd{kzHN_SOI9j6>3>=#yN=$YtCWvDE)+QobY4GH1OxS5>}%ndRVV`eUB>)7;a4Z+
z@g}2s&MW4J5ohOpH*LXyCSZ`k3T$Jd`=}`un}a*v*3v}2A#V%1=kII-1BPm7m^*M#
z*j%$x&A34}{<)#70nW$Hu7GRZ``&8E2LH>ZFtp$ySFgTMF9DA>B~8Tc>mxF*|38`+
zz$;k(rC<Ovjz?-b{~PZvpiurxiyZ)p3E(qMxSTZZBk13~0@RS0e~~;;oMneDD<0hF
zHOYR2nEKBLbK50vtCiVD!tm{>p@`o0n|gBqJooQxeK?0MFQ{i0`jV^125)4C@6YmH
zGPCgS+aLhqAH*HA3+l7JN;!VG{SDt#fvPf(Tb2r+f03(mRm%yGb;MY)wnt|V7pZrp
z=g7xj3+Y>ptR8r$Hz?3!*N<jLE!84Wme)+9xla#r!xT>LfIVIhrs!ZK<H5>h$N<Ng
zdvrW@`!hWLs<_$KRi48n+DmGoFXHO_&*B1UG9Zf&2VC+s-y~)bI*`pJ5i{+uUBzaj
zh$?1y&WA&wr3c2TmmT})P`qddr)y+YRlmOn`~{Kx+&l5@w!z$VMDK-Rdh2o%fd-(&
zi;Igc#?H}%=}3Y*TWo9V_E9I~@X+qAu0NMD%T`}B<-mf6_c#gh(uIm`jy&^)Y&3<O
zqP@<_Nz3Jz*|(P;?88S23U4(2==k{b0GIp@-?I_El@Q|iY$Y`W+5j0Svt_hn;lID?
zk<2jd8zUPnohxdcBqL@sF#!UBy1I~+ZGK;eb7Eqm7!CHnP?E}o9f80e|0BkddsFG+
zTG-74b6l0rCU{-dS3|?;u-;_joj3iSsO(lehU>`k0+QD7Dl6Cnn=1gCwGl(s3P7ja
z3Vk;0>f5xz&m~FAii?XSGW0g@X6ut6Ye5gSE6(~2E{j{;<|FRwI)*AnzU1_sPxZU$
zTNWOc?<%2$5eF%TI{t1KhO*rQIxH?aK8QSRTTJ?tPkWVWkbRi7$%V2UL^)Q}GJ3t$
z7xR3bvSi;0A<D_#BQ0)?lo2C?Ns^SQUtRd2EE*{CHKVFmjcsx9Hf96++0MMr@r+fC
z5=Kel!PA#}A2oz0i&NilN}ZWC2YPi+{hP~U=gxZuY5$4OyIzRsat7M{HK!-H%J2<i
zO)|Xn4qKS2DkW>(7P0PnWbwPKu}E7OfFkxR7vAk;%4QIOgGE*`4rMX+0eWvG{1!sK
zj;(te$#xI1sh$m}Te}FUzbUSF3T#Y&sF1{Zy}4`)Q2o9>n0CwMxbfat8Fxeo9F!~Y
zS+i_RIMgCwDm=HQ_4+!!hA}kPvmnmrT8#r$`Pfar`>uxw*T0#HuTN~YJk|bv{y{Ds
z`q##+mX^dL&WPpa_bG2HM=-x&bXE|IBH|`z>F`5_xmLC0mV_eIX--BWs^nUYoM25z
z7s`BB*$_H0W*hlBOgvA|rK4}aSn9MR?)`!;v?2Sj0_>K$V!eC;4WnqmdLQ8VwA{c2
zL#A09WG_&W?Q6yofuBn5Tn)C<iWx-VogL1|vnL@jebyBXV&x=*Gy_m3BwG(xr=v{v
zUDy8J3Urvd7}O#(ec$rJ@i?U2al7>WEPkAY7=Wto!S$8CiR@cgQp)<lVl{E;yx9Ut
zGPooR?QuLz+jvv0*XrBu3rC|6D}&rJL@wu%U)(>Vt;D>jJFUTM&pU>2lr7l6^vr8D
zA&-w9r=?ZLf+QkNe~eQ4Zhh7UT68tieW0(8>?|D-ng^UH7dBoE4?g<*)?%gymlHKu
z<QpXt8zUVxPP1VJoM;z$`Qi=r=@=ACmYxO1Al>uKY4**X^*KHe1F4gH?7xcx=bw7P
zGBwOp<)@RiAXIV4!?$0)>c!E4Yi_IVun+Quq$u%}ZV?bmc%FcU{w}eix)Ae()*G+5
zXa-E}IUo<spCF47uAJ?{&hj;^Y}SH!w*7}sJS7&DBz#P=zLi!ZosaAFS~5N#lx|RD
zyrvd|e7f_DI#R$zI%#P6_$RFrWHSvTei}8dNzJtSB|tT1et~cF!)P<i+~7BD^UIPj
zv~5NXd{EA=c)0}Xqo=AMIFnTaIe6<`fg6@0%bhTu`E-iexN}wmHva4WI`cuZ!wbgF
z?F>d1x_a?*!^6T~k_!{igP(TZuNNQ5goJaVAVu}J-5o=W!B{A9Vgon)%imzzv9j;m
zs0gg8BhAlBnyjB@gSi1L+a4ZdAdG#yvw1J<5W3eF&~&>dfg>LzQOn)R+oVzP#;Uu*
zex*eBU92kjj1xXm+FiWr-$>aG;cwC)M?ok}QK9P>x^}i>%09MIeTv|poN(DFk<f=W
zROPW%`aj;lij!6>)*^z=^A;HpSv1d)8PSbI()(q!UXZ|e&-T;w*+1vnS5PnP5!qCo
z-Fz0xf${kJI_RGR+FVco7+A9AUj^5pHZ+3E37M{ahEeAJk00Z-KbnKYDLbetq2RFu
z>R&LX_|h20w<!{*S6}EJ7A~9|CzF#PPyPV=$r3@JRqJpH$Vp2x-OEPuuTWXB=<VH%
z8ez1$>eTZ*lJ+|q_y6ZEioGask-;d+5{dVOnwuXAF~<v}S9o}PC%fjz@e3Iwyt8Dc
zBAeAOHtoFmNd(lXpsb+4sqL0MCGB_^JirCFCo`AH4jYzwX}FQe8+Jvt9q~9VLw+qP
z#QK?1-fWDFxQ0J<a*Ke?gnW)_)|X{z)<0^kAMYTy6)cfMau#X8V>Q)5$)P@7dC$_A
zLv3Z|X8cXssPP=nK@VsP*gx<HRr7fRIBH$~QB2C-nM~)b>%(zp<Jk%BI$+q;70)7)
zX|GJHq+;SZUNrS$XgY3aEmhIg)vtqpTu9KU@M*hqn5&KH-QY_KISogW&cDh1=oWMN
z)TyxLR9M6G>JvenZ_B-soeMh8xQ}Ec9$X}10<sFKF^^S_7lOB5DLT?&0a_-PJ2QpE
zZ_Lwqckyhbl61V1N*0)>N!Li9Ipds(a-vs=aZreX71faU?h9WXoVn@pi5s3UqK133
zv;1pkS@0%ppFYw63T{|V$@?7nmUmE*R7|A-D_~WDik7bz;RFTVxNH5Ku+{Z}c01xu
zorXVCa!d83zkqdPRlnZv6n@m$qb1IcZMP7WpCGI#Sag?C3%L36&^P#zy6diIi5aaZ
zXvIwv+Uech`7<06PG8Y8en821Ib(SqBvPdsZ?i{zfLXu@STH-><K!)fkB_H%QD(mU
synu<=TU`v?e*#nfZ@Tf+b4eMuS{>xC@IVB(dUi!u(@>-0KH|my0sAG`Y5)KL

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/xueli-.png b/litemall-wx/static/images/icon/xueli-.png
new file mode 100644
index 0000000000000000000000000000000000000000..64e653f51243fbb0d408b9e38415e0ae755e45a2
GIT binary patch
literal 4481
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/yly_qianzhuang.png b/litemall-wx/static/images/icon/yly_qianzhuang.png
new file mode 100644
index 0000000000000000000000000000000000000000..80d674bea60b6e18f528e5850f3c27b67c6f61c2
GIT binary patch
literal 9419
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
UjlcCUkCd>q)eXRPs?hNN0ibuoEdT%j

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/yuyan.png b/litemall-wx/static/images/icon/yuyan.png
new file mode 100644
index 0000000000000000000000000000000000000000..70d91e38b934748b7a12b73c3b5d3514dc6c14bf
GIT binary patch
literal 6641
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
W%cfUkh~q!yoKaPRfb(u5y#EVyTZm);

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon/zhuyingyewu.png b/litemall-wx/static/images/icon/zhuyingyewu.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f61cccf9dfc6083fd2791e76371cdca5275cf59
GIT binary patch
literal 9710
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/icon_error.png b/litemall-wx/static/images/icon_error.png
deleted file mode 100644
index b13c94ba6c9c11713b10a7d31c6a4364a4cf8a98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1259
zcmV<H1Qh#;P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000ECNkl<ZXhZFq
zja3yv426>llnR6jgbLIOlnR6j)Cz<O)C!aegbIWTgbIWT#0uj1*33J3^JaHvb{G6P
z&N=Tql>N!g+$1*{R2Eof_E1Egi^#T!JoRsWj_X=P_?-LqnX2B-eZ5Y7fE)c%L=Hq`
zcj9v{MdXu+oJ<AN48Y9r>?=1M&o8mq34nZ1Rd%U*H32ZQw<7XdL~_G#oEjZHRF&_I
zWoC(9eDisfT?CN#s(M_DpbCJQL6MIIs+@?(sj8mVzA#>AW-mm94^)f`YVFtT#wY+Y
zgX8Zqub;6KH7}?E=Cpk8i6Gs=ZoE-dsMWg$0l4vaKCK^ktdAl!#tvQMJA%Ov!gYs3
zAbJ55jK6T>XQ#dq5X2WT^tc8@5kSFs(i~K}w`FGRM2rn$Vk6cz0C>QD37o%o<CB*%
z5bXS39(N@GUqiOJP*u|1Z(C+YMoM(LRMov`%o+eQI}#CcJ&S<do?0Q7LhKcv;+6vY
zSXHsJTPpyb%J6<FQqS%x+q8o7?DX01Tcc70KpsXSun<}lm_KHj83Bx7WUY3g1K`{A
zEqH%tsUo$M2b>|;$YK|;@iqZK-%xE?RapnnOT|a+v$Cwz6}SW-W}afcO`i1K;(Ao+
zxvD;!<7G1=Ws~U$RMKQ`q0C~T%Sh@5eRm^nR5foz*6hnN6~CJt?5<7$kk(p;DLKZ>
z0Gd?n767QQN$-r(r%<IQ$4ka*>>b>FkJnhC_W=;I&!BJ$Gy*i+{%LNi4U!r<4k}Lv
z5FLID0EE*MH*PW==EOnEy&3H;06=Q$c(1CX{Xxsi?&?}IGk^9q0MbAHMga03z+KT~
z=(%gG`4=d(Dhx{mu@^@4d)`N&>#vs3Si$Kxi=|O7O7s$AttYCI0akH#G)Bo%8f`9Q
z`Af_UA&4MsSpcB&HVp|fCD0YJCMgjubh@Br;%t;o4lhGZXoG>!iAISYBTnPE1`u3V
zwK7H8NeLdD#2jP6ovJ7O>La3x#c+mQgL1$rz^<o0x7e)r*$@k_h-@V}9UJFSLFJkx
zQtt{cx6mQ;WR)z><TMFkcTz*+qZho-Vz9g0Vtf#VQHPBR$)Sb@8pY0kP$Fmj>0|+z
z$>~A*X4kGJCVfpk6X*Q_9>QD39Njk7#!TtD%&T-{#eg<5rV?q;u-?==r%|NboaQgR
zo^>vgHjk#}^FSjUKs*r#t9ehB?JzuzRq#HP?G8eQ23xDne~yRe-dmWMlm}bEBZH&7
zxdye~pQY*z%JvO+$qtE1w2g<YFJ9t$Gox2e(qxS~>G`$e^?L`A8IQen<MlwLC^7hN
zs6}8mX_wZW=#eMAHKO&13FCR#q(i+iFrM9@O*{picEl8Rf)tjYTLFLrxTZ7Rfx1Ep
zN72TCGMqmcb5_+9!mA)g$8#&}0T@M(Q_JRMW=xwgI`1LSRvaddI;aXj*bNE|1uUK-
z^6T_B5b2<s1Hp}DX3U?`-&3SR?|2<v=b*b-&`Qs20uU-TAn;laq<I(ohR$%G^o@Ew
zzN8sI*bM>=5PWiK)dGPk7!D05Ww*%yqJ^INpai-mQ6v952xNDn8Yvm=Gs)=q?w{IJ
VZ6K4=YefJ6002ovPDHLkV1iEkLX-di

diff --git a/litemall-wx/static/images/mobile.png b/litemall-wx/static/images/mobile.png
deleted file mode 100644
index d48b2bc7a2352886cf012a9794b26f40538d5b10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3916
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

diff --git a/litemall-wx/static/images/my.png b/litemall-wx/static/images/my.png
deleted file mode 100644
index 0a401a8b34707cb5dfe3999f28b2439f4bb4d458..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8065
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
Cn*@sh

diff --git a/litemall-wx/static/images/my@selected.png b/litemall-wx/static/images/my@selected.png
deleted file mode 100644
index 32aa4aada4723fcb8dfe9938689bbc6f5ad71309..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8466
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

diff --git a/litemall-wx/static/images/new.png b/litemall-wx/static/images/new.png
deleted file mode 100644
index e003f91ccdee64998cab25d32178f6130e811f2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32299
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

diff --git a/litemall-wx/static/images/pendpay.png b/litemall-wx/static/images/pendpay.png
deleted file mode 100644
index 0ab0c263a0dbc22aa76e8315e481ff6b4ee849e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12638
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

diff --git a/litemall-wx/static/images/receive.png b/litemall-wx/static/images/receive.png
deleted file mode 100644
index bad66f4c372de5f1ebc14c373db83ee19ee65540..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7397
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

diff --git a/litemall-wx/static/images/send.png b/litemall-wx/static/images/send.png
deleted file mode 100644
index d8e481810b14891407863b1e990b5cb8aa3efb64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7783
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
RZU@K!O;uf$8YR2P{{dLBx4{4a

diff --git a/litemall-wx/static/images/shouye.png b/litemall-wx/static/images/shouye.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2cd02238b56eb924a446f72d09ded0c47cdc202
GIT binary patch
literal 7136
zcmeHMX*`te+qTZwh9QhC4E2~8R8+RYSf)~z${0%w3ZWQM_H8U9HIk)d>@6NMGLwgR
zWEssw^oWEkSq2fZRhDe;J?j7de*Z7;*Z0fw!H3&<U)Oz}$90^?ao%&M*jl3@LUKY}
zTwIV-C(X}sad9I#e*z%jKVea%5H2qHr>D$KFNBi6=EdO$Er(e<WJ#P0f4YXiv$(oX
zLd6%Lg*@$2*k?_r`JbrMT;lrrOh$!N92QOaFD-8!eIyD)Kj*(vTgNpL@cEx_LvIr&
zUNv~11AV<C2xp=?ae{DZ0?0~$E~AS@5m|){2^10p$%c9y@}ZeaoQPao)VXoX>AHvE
zvw!?e9ELZnT!?CPQ<RZh(u`yT!Fq1iCAZ%yX;uivw)4LWt#mJyLyFpafBQIat;W)Y
z=;%XZ`mcEY;I5iJBtraWSyhWk=)$Eq?vtT7gP30H;xM);a0|hm>NKZ$D?grli|KPQ
z7b<2#*ssWprk*GSJ-%e_pRE)KZ@2}rip=08^=PVkRBpx!<F)0GOZGC9^K+WMop4$4
z+)1zt(Gb`>!kua`c*ov4d||6Mp@tWdU6X<G46#}`;=~r!#j*nqVwRFRbuQc+_WO$o
z1D@@Mqq6JDI%aU~K0j)pG0#m=o2M>&hNN0rZQh4SpheAk%*`~*#P4LUWdN6Nd0x+C
zbJLxpnXL3;hJlB)F6PCr!bng^Z+bJfs>_y;&5ZqsG-k6~J8^sA!ip4UOQ2M47&-wo
z+lr%-bL!0?PKS5PNL4i@gqR=1<Ym=GY(Z}W2=Qu>xPXml&Gf%7n`_IKm#6fUFbsHP
zC=MTM%X5LGF=-&b$%B{xdIyQXxx54NV@WDdtR&ZECqKt`g{P!SJva5ZeDDHfMLMr|
z=zH{zR`L`+uHK}!e_0{ig?bwzp%I_%Q(PoH`DAs2{&(V3cmFk`;F2yUxcoj0&v++L
zZrj;~M&N`(UGuVJ%W-uvS>8;RP$#aO&$5U$T(qaX9TIfAId(+&U4>3`LqdKLS%mm>
z3hja<LnMTg5BZc7fhH$RJww{J!$93WDd=K`lir3n;t-~w>wxOPQ8BNbNW!F2x!+)v
zkwPHd_UK8ZWZOtizx;<nawLkhoVMm4I;<&;-0`_XeEJpaf&`F76@AakS~p$Ecs(PX
zA4A~R+2EeMWNs8?JnG@@Lz5P`yg+@6jWS>I93>jdx}pjE8aht(tJ^{_VGjZ`zHkCx
zYS8}f@oGaQb1_^FiQVqH^?f_v`H*=Yu$XVswFkSU{j$0|YhB$2AWEt!p^6I;90^+n
zg=81>4Q~Xub5#WUUACMh_pQmnvMNoBJrH;Widd;d?U$&}H<exvmjgg)R#dfEu>9|q
zO12ID0#PTeNAu-;N84smyd@>*=*bHLkB`$oIb01&>w(;gk&vM(zufL<yWJ}_6IE<1
zD0QU^XD@L1DhIxOq^uGuud71PH1(|ytItLxnrUI-LsKW*s|E-bbgl>c38mO^V<CJO
ze7#L#>gi6LJ>R4eYq%Hyf6px?-imTm>tj|tkl3)pQFhC15JduU*}IP3c2+?HeE|K^
zsr4x<9ykVZ@ie7CI~fRu-}ZHfE@mWwZ0*0gv<S}35Est?B2Wm%9Wf?9Co=i@z0%tJ
z4>J>2h%_gw#{54XAd)~7<xK4c$_&!@esr8?h;Z!@EN!zy>PuA7Mt1^;B9m$D`Gc=j
zo7BtyQx;&HT)B!5?Qo^`fZ+tvxZcgNt92LH+sGJ(g{3Z5w#Wq!v^|HL8uAq9)(`-7
zKdUFlwGPuwRd_SYQj(l9Gvp;lApTcbcNb(=K$DgwS?Lf7aMEE;=LJc$wAqz%yB(hx
za?BYttM*#CM@G9S00fFFGQX+|5KMuC+%SjN4|MPw;xI6Z5MqL`k%t^Xs1?|v!$6zU
z%B$!7{ni(5DM9I+8%zix%80Yxm!qGic}|k*btgtV7{Hm?OvGGO(U+t0nm8JCW2KU3
zJ3Sc7X}!c6k?1B1lrA=<XrDGsI5T&(v}B*E)=J=Ur(c_j-+v`mb20&>0nb$Z4IBT>
z3MHXuRs{ZTA5BFFMg@`hy3C{I1ccK97U7M{8>2x*jBu3=6(-%lqBiW5xK`j2*GiwS
zpO-Pv;I1V<F6m-zaBi`?e5@B*MATe!*7#<hKRo;JxFDogb*%GPmu+fLcf{UJHO7xY
zr<|^Vps(RBM)42{oiSQVdU$H_)C4FmXq1qm_A12aSfvBvm|Qs;kP(o=vfeqRU%28s
z!7lsaXZ!o-j};90*JdBr@}ilt;{t02eM(LByRdtq&-}bETWYx4Xi=2#OI*5Gu}d+f
zBZV9~1{r)vz8n*!-KmqA!Ho~wBBlluGQznwUb(Pu;_ld6)^un}pDD4|l%obT!RLRq
zGI-8_DLWSaf<vc}t99CE#cFDjArh-iV|UDY9HX`B=Uufyef6woovR2nRrdQ0ZrII2
z#@}Gkug=uUO_%UH_V}7@4u%e4mQ3+QUabb;B*6;3=RAK1gMWy?q?+`7XgHv$_j|kh
zv9*0@+sRwpTd_`=xx=%un3nA`E=4gV0KDFu*vg#PXYdCO+TcoGJ*D69`ftJ@(t$EI
z{;O%ZpA{+cAMnZ*fp+@j42~QKceGk<PV4_<u%Wv>8$?h5<C|Eh(U&ebZQE<r<Sa#F
z-=ot$V~e}YEv7piB<FUt4duR=eEWT^>$xdfFu9|D-V;X%S{4jZc*zYDPW;yGnA0Ux
zUB|f2Oe2*jP~(#|Nm+)yud0s<<(F{dZ*LNnq|nE({9-w;eG>!oodBh)SQa6UPoOt_
z^vW3Q!20G6P2>C1b00<f=uNf0bfA99D*F3)BE&#Q?*d>d%fVlM*yr}VS_fk5Xg_m>
zL&l?&DFi6>)g!tDI61f%$7qYpN-p^fj_jd^(^kOKdxNqIhG#`5OFUyf@2XA3<{uM1
zqP^RrktQ4`If6mAZ_n|!8#|>BSFFvI2LX#LJ@?;g)*o`psaXCV{n$G&gusHQsQwVm
z!@6F(J6<RP7;$qL5biRVLN>g1V1dd(qUhZomD9j$liPRY*86#j!z)lZkEq43?(I4N
z_H0V5+0!w_(FHI2k}A{G<X4?J^RBS0^NVEHqTz~BvQ{)rNRj7G)`PQ*ZwAUFiqaD6
z`7}d4bZMmI+83BxW?b;B|LU_T*|s;adezZP*c%UUYN}##8HZ7y>b3F(re5r7>RMm7
z%OH>A1P)I>g7H`iBsp_jMNS;uFSb^U{eZ*A$<ILmQLLz6o%+KZrPr-iy%D;`+xCX2
z_ddD__R0g4D*W3e9Kxq)h<DrmV8FAM#@%U&G$Lcb&Gt?fR&zr~@s|eN)p6az;o;7l
zDGAWO00GD!<{-UU$c?yY%i1qnJeHIh2AgM>XMhCaxq)Gb8aV#~<MmgE-nYilo^xMu
z_^ts?qt=?rY1m12?DPT}mR&hAZvWi0hru%V?HdM@@xc6*SOlK(S`nIjGSD?pST?E>
zQY}vzV$y?LO2uKtLP9I<eqP#svu5@L`$e`7)x1h_jul&)sI;VB>P4$T1kiLcbFC`s
z`Ya|p)BYo+QcJ3?WOYz#s(8%mG~gAkp8KVFj$fhU&_+%y0AgETYV;Tnc?_67f4={v
zq@}l&7Cj{8k?{e)h85wOQ`W?~LPNTab9;=#Cb5*Hw5TE}i{$wom(!pJuIv@Maj7IL
zind~UUxp%o-Llhpj|cx;o#ZZzZiQBk;MCY%!AkL*6bNlf#6qr@F#w-X1(>RnhN)(#
zd^{@WYiq5G@%YhM@oOT`Az`u^DrdawVut=Q)n89A;Mp4p$3TwnD(QQ=qOqR*bz1>?
z<>8xOUekm4^w}r{{_kITBI1H7ANw7TwmmwHgSvXlX~3VKquq2i=o<%n5=425SXqrG
zwP9%n@$z^$N#bW8(Asj)AKz5-$pjH;cUB>1V(D|Zny|Jf{A2(8*;gFxw6ic~pE`8{
zn*elUvBb1zD!=m^pZx$vS7>^er-)<Pf}eR{s7UTl{+#xm9k{Wh{w`Jx{st$0au1{m
zajgDbs1gxsl|XuZ&9!L3&f3!4Vk_1-M@>xHRQH!h+{uE9d5rYn)*IV&RLW++o2QJf
z&;$zqGxr_ffwCVIR_;y!^^Yo@BY5P$BSOb^z14@B5Xy7?1>;#~qusUeorJFN54ffH
z-}WGwE)f2*>ag47mn~Ja-wJL?#ZV`LAeWh8gCO+~h2at=1su9+O)pzTN>_qXVSWAc
zy@^ASC;&H6uKHn)YrX%X7;{kmyK<-<VBnOr=}g!Yx&+%qa&DCh5H+AVHAVZ;??yG3
zo(|)<(Z_jEcR<5|_0PZq*}}h>XO5YU0D^ud7lzZ;>LWvFq037tH?s@eLfPImP!*l;
z4Zvi?L9VnxY00qmCN1<m>?7di!^X>LMv2fXg*&_BDgV!fCBy#0Mn*<RQW0Pcp8L(E
zXuOXBM==bH+qts=(jaA3Mh+E{)WQ;l;p%Y*0KW+XU@e~7CZ#3C$RqPdQ*ySFg2Y?e
zmL@<h0(P?gC<1@Gp;LY1cz5qbLP%1*seUI`kk0in5hR=)@Yisq@Y6N78b4Zf_SCaJ
z8^ka){3?n#<1Q~Z$20jcIc+$?+bysU$8Wg#qGlY+x`|QMO29(>nZ1W^OK&W`i26CW
z)09!$9BrPA^4!mCc2}#u@v-aYw9=aB?9f}+BD27hj!+c<Z)s6yJn-z~(UO=^T%N~*
zt*=&ngRd&H45w{i_|_rJHDcl2SK;lWSn+%&@wnNaHQ#|n7{Q1x$Ddu{^9yUdwHu(>
zq4!b9xvjmc=LO)syt!lkt9@EeLra3EG$H95APNKY{dl-geIHg3FG-Wvl%Bg%5<+mg
zF+MOq+QGQBFLZI(kD8#TE;0AoX706AwA!jDW+Gio5q5aE`rzoP(J*r4>Zh9{JKGxz
z9kFiU=&k;d%4QUCL;rdKJ7(mDl30w1*#3FTmSEyeW5oIl&LVUXRA*vb5`YIv>=chV
zY;+^?t<HzyI+;%XG?<cuz>-wZYD$aYi%;Xn&D_RSZ+V7X9l;S4`NX0<yq-o>Ax@;c
zn;y8~7yjceI8wj}lUi@lrPLf7Ua)vE59(KRsUUO?G<)0TqSp<Nx|<gZx~je^dK*sR
zkCv*3#&LQ>|2DC29_%8(?KgYgo?ua<=Cz{X+vzFOWh}Tpkf0aT`|;@jNMqZ2bnXft
z&q@sx4GD3&Sa7sdsI^x%>6{7k!~-b0&1vI8H}2|J_ZW$FC~zP``$!L}R{ng#_-RZv
zJs=~vrUa~e1Kh;IiC+^r3L@W&fi4q;@fWDIHdP|oIwFq~B4^izG|jDhhtz;qd=1Zk
zqTb^K>4*PcF3ZU~n^VR++gqz6&e8padj_wZbs4lCzc~_hY;)Fa=Vxn0+QTEOR|vN%
zKgR}}Wdnez8d!9YGH_lF)5pC>2S_3vv7C|+?W?B<RT3+*4JJ=d0yCQ%X%R_%ZX-uc
zG`j&TlGfkjrux8fA#HRo%)1%D5_NrY;}OH@;KYiM;jtxK%j+GrYy57SWMOZa(}MJ@
zg$$5i++7Dky;%p-vj$aPF*?$3$VV3AMDe>(_q+Chl%6!o=f<0F5-Wr{h@3P^+c;?`
zw|-&1jkbVD*m#@2+iJ5+4Q7j&9e_Vs27uP&JM0S>S;}=0VhI}^DHVtzyCe3SUufXu
zYGQdv$(s%3>$uh8z>Q{c@<dH;{AJ2=3~oB0To9}ik;ohi{aSDQLaHeYpH!3ywOK!L
zg{GeD?}XeQI<1gD70thT1@E=H<$2DQZSdR&sXFO|rktg<;;~k}SGK25K8XY<rROKQ
zc0d6ETME%TYH;kP334(Rc<&UcWu76Ykoh|9w7`U0UUL#q|4#yGiD$l7Qi6<Dg|{80
zy<0f3eH;+WBoEg%xhkg@ti3QKkEJG5j&q8=$0^ocC}%S%?*W2w#CuA=;iR5n$H7bq
zl>;MBA?h6ud80)p@E%@`a68gebdi#<zA-1tMvSOIFo}23-gS-Rr!&XZI^Ib&=;{4e
ztfhAEe8&pViM@=JoTxNWhF@c+;mGgxiwvR4UBJ@fjMxiv#>JVDsJ%HNYre`9>A{En
zVu<|<Z)POj6fW(a328S?fiOOujbo?Z1UGgTyonTE_NBYoojwu1kf#Y<4&=a$-i0~A
zDE{$YYFc#BWCWtkKOV_}nQ6y?SqPqnQy)QQ_VYP%ASRYX7U*K7P>PHT4UULP!RP<I
z$)AyxwqAQKjd5`L-vrLDdlkL?qji^@3cI*Mmj#|I|AWdodpD88Ej<pm?BNsQXC`wK
z59ccHQWc*GP?dseRejKQO!)FqQ|bT0@L*Pe^uLL6nEEfG|8n%-X8Kp2{tq4Peh8+l
z4hLL~yNjm%H7Vc9E?D!0SGv)qAG1r`=5cxM0f4ZZ5q_xg4S6&cXCkW~O^74E;w*?I
zn{kGG6O(|NuTS4M#L}(k=MRL<*Ed!-UpRynM{V<3ojq82pYQl+Y8>(zP08-G<@KcD
zj25D{VvsMbpsO~A<@R*qeZ)wAymFd!1cAIi30d~>mU_N<0u4PUD}nmJ@?O|Vu{SwO
zkV0;?D8rfE>(d(Rp)TFHyxe|`eF>$h_eFa7UC9qY6jrnaium`M8sW$&>rXG5%I)4N
zz#tQ#A&dPHF&<gAgTRs#(n5B7I6p{W1gjvuoL3J{e8?eir$^Hsf=TEa7?>ZHgPS{Q
zMO|Jk?$N`lc}d4Kt%?Z3+X4yJGF0)3q#2M#vkw5sU1+h0wk$>XrFxkHRiH%b%&~hy
zcJXNq_v9@aAAM%{()_y7X7HeMlW2x>*<Rp|9uJ1D6KX=4l;ueUy*yo}NF`cY5s?>+
zG3hg4jp8l|b|KP(s*)-L+#BKn%y{5^2`68vU2nr)9OS{i#eHfHyol4j3uRw<xgr(y
z^)noK4JZ<mdQth)iZV0uM6u3m-zFFfq$!=$F3TuUN{6y%U!q|m_OwLc_np5J$9!qs
z_2e(f-%#e)Y-yj~MOVm_iM#1iWT@KiP1bMcm^XHUP7+9YdsLJE@v3Zt?~JDzdmKVv
wzpC>2V4)vqW&raV1bi@4`9D6GZ5qFPQL$6@>0vwY<&Nu=g|+!J6fXXM0I0e?NB{r;

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/shouyes.png b/litemall-wx/static/images/shouyes.png
new file mode 100644
index 0000000000000000000000000000000000000000..34e279454ccffb463fd25b4cb73374f5fa3b9a69
GIT binary patch
literal 6036
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
R?6!+IA3N<>ZSVK@{{Z6l#@he@

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/xiaoxi.png b/litemall-wx/static/images/xiaoxi.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec2160e871016830cce263c0a33ba68df0e40732
GIT binary patch
literal 5566
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

literal 0
HcmV?d00001

diff --git a/litemall-wx/static/images/xiaoxis.png b/litemall-wx/static/images/xiaoxis.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ecbf0cffb52155f0448fef1f3aadb746f1a42de
GIT binary patch
literal 5327
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
KwyyjaE&ks!Rls-v

literal 0
HcmV?d00001

diff --git a/litemall-wx/utils/WxValidate.js b/litemall-wx/utils/WxValidate.js
new file mode 100644
index 00000000..f626c75e
--- /dev/null
+++ b/litemall-wx/utils/WxValidate.js
@@ -0,0 +1,418 @@
+/**
+ * 表单验证
+ * 
+ * @param {Object} rules 验证字段的规则
+ * @param {Object} messages 验证字段的提示信息
+ * 
+ */
+class WxValidate {
+    constructor(rules = {}, messages = {}) {
+        Object.assign(this, {
+            data: {},
+            rules,
+            messages,
+        })
+        this.__init()
+    }
+
+    /**
+     * __init
+     */
+    __init() {
+        this.__initMethods()
+        this.__initDefaults()
+        this.__initData()
+    }
+
+    /**
+     * 初始化数据
+     */
+    __initData() {
+        this.form = {}
+        this.errorList = []
+    }
+
+    /**
+     * 初始化默认提示信息
+     */
+    __initDefaults() {
+        this.defaults = {
+            messages: {
+                required: '这是必填字段。',
+                email: '请输入有效的电子邮件地址。',
+                tel: '请输入11位的手机号码。',
+                url: '请输入有效的网址。',
+                date: '请输入有效的日期。',
+                dateISO: '请输入有效的日期（ISO），例如：2009-06-23，1998/01/22。',
+                number: '请输入有效的数字。',
+                digits: '只能输入数字。',
+                idcard: '请输入18位的有效身份证。',
+                equalTo: this.formatTpl('输入值必须和 {0} 相同。'),
+                contains: this.formatTpl('输入值必须包含 {0}。'),
+                minlength: this.formatTpl('最少要输入 {0} 个字符。'),
+                maxlength: this.formatTpl('最多可以输入 {0} 个字符。'),
+                rangelength: this.formatTpl('请输入长度在 {0} 到 {1} 之间的字符。'),
+                min: this.formatTpl('请输入不小于 {0} 的数值。'),
+                max: this.formatTpl('请输入不大于 {0} 的数值。'),
+                range: this.formatTpl('请输入范围在 {0} 到 {1} 之间的数值。'),
+            }
+        }
+    }
+
+    /**
+     * 初始化默认验证方法
+     */
+    __initMethods() {
+        const that = this
+        that.methods = {
+            /**
+             * 验证必填元素
+             */
+            required(value, param) {
+                if (!that.depend(param)) {
+                    return 'dependency-mismatch'
+                } else if (typeof value === 'number') {
+                    value = value.toString()
+                } else if (typeof value === 'boolean') {
+                    return !0
+                }
+
+                return value.length > 0
+            },
+            /**
+             * 验证电子邮箱格式
+             */
+            email(value) {
+                return that.optional(value) || /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(value)
+            },
+            /**
+             * 验证手机格式
+             */
+            tel(value) {
+                return that.optional(value) || /^1[34578]\d{9}$/.test(value)
+            },
+            /**
+             * 验证URL格式
+             */
+            url(value) {
+                return that.optional(value) || /^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})).?)(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(value)
+            },
+            /**
+             * 验证日期格式
+             */
+            date(value) {
+                return that.optional(value) || !/Invalid|NaN/.test(new Date(value).toString())
+            },
+            /**
+             * 验证ISO类型的日期格式
+             */
+            dateISO(value) {
+                return that.optional(value) || /^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(value)
+            },
+            /**
+             * 验证十进制数字
+             */
+            number(value) {
+                return that.optional(value) || /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(value)
+            },
+            /**
+             * 验证整数
+             */
+            digits(value) {
+                return that.optional(value) || /^\d+$/.test(value)
+            },
+            /**
+             * 验证身份证号码
+             */
+            idcard(value) {
+                return that.optional(value) || /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)
+            },
+            /**
+             * 验证两个输入框的内容是否相同
+             */
+            equalTo(value, param) {
+                return that.optional(value) || value === that.data[param]
+            },
+            /**
+             * 验证是否包含某个值
+             */
+            contains(value, param) {
+                return that.optional(value) || value.indexOf(param) >= 0
+            },
+            /**
+             * 验证最小长度
+             */
+            minlength(value, param) {
+                return that.optional(value) || value.length >= param
+            },
+            /**
+             * 验证最大长度
+             */
+            maxlength(value, param) {
+                return that.optional(value) || value.length <= param
+            },
+            /**
+             * 验证一个长度范围[min, max]
+             */
+            rangelength(value, param) {
+                return that.optional(value) || (value.length >= param[0] && value.length <= param[1])
+            },
+            /**
+             * 验证最小值
+             */
+            min(value, param) {
+                return that.optional(value) || value >= param
+            },
+            /**
+             * 验证最大值
+             */
+            max(value, param) {
+                return that.optional(value) || value <= param
+            },
+            /**
+             * 验证一个值范围[min, max]
+             */
+            range(value, param) {
+                return that.optional(value) || (value >= param[0] && value <= param[1])
+            },
+        }
+    }
+
+    /**
+     * 添加自定义验证方法
+     * @param {String} name 方法名
+     * @param {Function} method 函数体，接收两个参数(value, param)，value表示元素的值，param表示参数
+     * @param {String} message 提示信息
+     */
+    addMethod(name, method, message) {
+        this.methods[name] = method
+        this.defaults.messages[name] = message !== undefined ? message : this.defaults.messages[name]
+    }
+
+    /**
+     * 判断验证方法是否存在
+     */
+    isValidMethod(value) {
+        let methods = []
+        for (let method in this.methods) {
+            if (method && typeof this.methods[method] === 'function') {
+                methods.push(method)
+            }
+        }
+        return methods.indexOf(value) !== -1
+    }
+
+    /**
+     * 格式化提示信息模板
+     */
+    formatTpl(source, params) {
+        const that = this
+        if (arguments.length === 1) {
+            return function() {
+                let args = Array.from(arguments)
+                args.unshift(source)
+                return that.formatTpl.apply(this, args)
+            }
+        }
+        if (params === undefined) {
+            return source
+        }
+        if (arguments.length > 2 && params.constructor !== Array) {
+            params = Array.from(arguments).slice(1)
+        }
+        if (params.constructor !== Array) {
+            params = [params]
+        }
+        params.forEach(function(n, i) {
+            source = source.replace(new RegExp("\\{" + i + "\\}", "g"), function() {
+                return n
+            })
+        })
+        return source
+    }
+
+    /**
+     * 判断规则依赖是否存在
+     */
+    depend(param) {
+        switch (typeof param) {
+            case 'boolean':
+                param = param
+                break
+            case 'string':
+                param = !!param.length
+                break
+            case 'function':
+                param = param()
+            default:
+                param = !0
+        }
+        return param
+    }
+
+    /**
+     * 判断输入值是否为空
+     */
+    optional(value) {
+        return !this.methods.required(value) && 'dependency-mismatch'
+    }
+
+    /**
+     * 获取自定义字段的提示信息
+     * @param {String} param 字段名
+     * @param {Object} rule 规则
+     */
+    customMessage(param, rule) {
+        const params = this.messages[param]
+        const isObject = typeof params === 'object'
+        if (params && isObject) return params[rule.method]
+    }
+
+    /**
+     * 获取某个指定字段的提示信息
+     * @param {String} param 字段名
+     * @param {Object} rule 规则
+     */
+    defaultMessage(param, rule) {
+        let message = this.customMessage(param, rule) || this.defaults.messages[rule.method]
+        let type = typeof message
+
+        if (type === 'undefined') {
+            message = `Warning: No message defined for ${rule.method}.`
+        } else if (type === 'function') {
+            message = message.call(this, rule.parameters)
+        }
+
+        return message
+    }
+
+    /**
+     * 缓存错误信息
+     * @param {String} param 字段名
+     * @param {Object} rule 规则
+     * @param {String} value 元素的值
+     */
+    formatTplAndAdd(param, rule, value) {
+        let msg = this.defaultMessage(param, rule)
+
+        this.errorList.push({
+            param: param,
+            msg: msg,
+            value: value,
+        })
+    }
+
+    /**
+     * 验证某个指定字段的规则
+     * @param {String} param 字段名
+     * @param {Object} rules 规则
+     * @param {Object} data 需要验证的数据对象
+     */
+    checkParam(param, rules, data) {
+
+        // 缓存数据对象
+        this.data = data
+
+        // 缓存字段对应的值
+        const value = data[param] !== null && data[param] !== undefined ? data[param] : ''
+
+        // 遍历某个指定字段的所有规则，依次验证规则，否则缓存错误信息
+        for (let method in rules) {
+
+            // 判断验证方法是否存在
+            if (this.isValidMethod(method)) {
+
+                // 缓存规则的属性及值
+                const rule = {
+                    method: method,
+                    parameters: rules[method]
+                }
+
+                // 调用验证方法
+                const result = this.methods[method](value, rule.parameters)
+
+                // 若result返回值为dependency-mismatch，则说明该字段的值为空或非必填字段
+                if (result === 'dependency-mismatch') {
+                    continue
+                }
+
+                this.setValue(param, method, result, value)
+
+                // 判断是否通过验证，否则缓存错误信息，跳出循环
+                if (!result) {
+                    this.formatTplAndAdd(param, rule, value)
+                    break
+                }
+            }
+        }
+    }
+
+    /**
+     * 设置字段的默认验证值
+     * @param {String} param 字段名
+     */
+    setView(param) {
+        this.form[param] = {
+            $name: param,
+            $valid: true,
+            $invalid: false,
+            $error: {},
+            $success: {},
+            $viewValue: ``,
+        }
+    }
+
+    /**
+     * 设置字段的验证值
+     * @param {String} param 字段名
+     * @param {String} method 字段的方法
+     * @param {Boolean} result 是否通过验证
+     * @param {String} value 字段的值
+     */
+    setValue(param, method, result, value) {
+        const params = this.form[param]
+        params.$valid = result
+        params.$invalid = !result
+        params.$error[method] = !result
+        params.$success[method] = result
+        params.$viewValue = value
+    }
+
+    /**
+     * 验证所有字段的规则，返回验证是否通过
+     * @param {Object} data 需要验证数据对象
+     */
+    checkForm(data) {
+        this.__initData()
+
+        for (let param in this.rules) {
+            this.setView(param)
+            this.checkParam(param, this.rules[param], data)
+        }
+
+        return this.valid()
+    }
+
+    /**
+     * 返回验证是否通过
+     */
+    valid() {
+        return this.size() === 0
+    }
+
+    /**
+     * 返回错误信息的个数
+     */
+    size() {
+        return this.errorList.length
+    }
+
+    /**
+     * 返回所有错误信息
+     */
+    validationErrors() {
+        return this.errorList
+    }
+}
+
+export default WxValidate
\ No newline at end of file
diff --git a/litemall-wx/utils/area.js b/litemall-wx/utils/area.js
index 83f41a8d..cf4f2c59 100644
--- a/litemall-wx/utils/area.js
+++ b/litemall-wx/utils/area.js
@@ -1,3296 +1,3751 @@
-var areaList =
-{
-  "province_list": {
-    "110000": "北京市",
-    "120000": "天津市",
-    "130000": "河北省",
-    "140000": "山西省",
-    "150000": "内蒙古自治区",
-    "210000": "辽宁省",
-    "220000": "吉林省",
-    "230000": "黑龙江省",
-    "310000": "上海市",
-    "320000": "江苏省",
-    "330000": "浙江省",
-    "340000": "安徽省",
-    "350000": "福建省",
-    "360000": "江西省",
-    "370000": "山东省",
-    "410000": "河南省",
-    "420000": "湖北省",
-    "430000": "湖南省",
-    "440000": "广东省",
-    "450000": "广西壮族自治区",
-    "460000": "海南省",
-    "500000": "重庆市",
-    "510000": "四川省",
-    "520000": "贵州省",
-    "530000": "云南省",
-    "540000": "西藏自治区",
-    "610000": "陕西省",
-    "620000": "甘肃省",
-    "630000": "青海省",
-    "640000": "宁夏回族自治区",
-    "650000": "新疆维吾尔自治区"
-  },
-  "city_list": {
-    "110100": "市辖区",
-    "120100": "市辖区",
-    "130100": "石家庄市",
-    "130200": "唐山市",
-    "130300": "秦皇岛市",
-    "130400": "邯郸市",
-    "130500": "邢台市",
-    "130600": "保定市",
-    "130700": "张家口市",
-    "130800": "承德市",
-    "130900": "沧州市",
-    "131000": "廊坊市",
-    "131100": "衡水市",
-    "139000": "省直辖县级行政区划",
-    "140100": "太原市",
-    "140200": "大同市",
-    "140300": "阳泉市",
-    "140400": "长治市",
-    "140500": "晋城市",
-    "140600": "朔州市",
-    "140700": "晋中市",
-    "140800": "运城市",
-    "140900": "忻州市",
-    "141000": "临汾市",
-    "141100": "吕梁市",
-    "150100": "呼和浩特市",
-    "150200": "包头市",
-    "150300": "乌海市",
-    "150400": "赤峰市",
-    "150500": "通辽市",
-    "150600": "鄂尔多斯市",
-    "150700": "呼伦贝尔市",
-    "150800": "巴彦淖尔市",
-    "150900": "乌兰察布市",
-    "152200": "兴安盟",
-    "152500": "锡林郭勒盟",
-    "152900": "阿拉善盟",
-    "210100": "沈阳市",
-    "210200": "大连市",
-    "210300": "鞍山市",
-    "210400": "抚顺市",
-    "210500": "本溪市",
-    "210600": "丹东市",
-    "210700": "锦州市",
-    "210800": "营口市",
-    "210900": "阜新市",
-    "211000": "辽阳市",
-    "211100": "盘锦市",
-    "211200": "铁岭市",
-    "211300": "朝阳市",
-    "211400": "葫芦岛市",
-    "220100": "长春市",
-    "220200": "吉林市",
-    "220300": "四平市",
-    "220400": "辽源市",
-    "220500": "通化市",
-    "220600": "白山市",
-    "220700": "松原市",
-    "220800": "白城市",
-    "222400": "延边朝鲜族自治州",
-    "230100": "哈尔滨市",
-    "230200": "齐齐哈尔市",
-    "230300": "鸡西市",
-    "230400": "鹤岗市",
-    "230500": "双鸭山市",
-    "230600": "大庆市",
-    "230700": "伊春市",
-    "230800": "佳木斯市",
-    "230900": "七台河市",
-    "231000": "牡丹江市",
-    "231100": "黑河市",
-    "231200": "绥化市",
-    "232700": "大兴安岭地区",
-    "310100": "市辖区",
-    "320100": "南京市",
-    "320200": "无锡市",
-    "320300": "徐州市",
-    "320400": "常州市",
-    "320500": "苏州市",
-    "320600": "南通市",
-    "320700": "连云港市",
-    "320800": "淮安市",
-    "320900": "盐城市",
-    "321000": "扬州市",
-    "321100": "镇江市",
-    "321200": "泰州市",
-    "321300": "宿迁市",
-    "330100": "杭州市",
-    "330200": "宁波市",
-    "330300": "温州市",
-    "330400": "嘉兴市",
-    "330500": "湖州市",
-    "330600": "绍兴市",
-    "330700": "金华市",
-    "330800": "衢州市",
-    "330900": "舟山市",
-    "331000": "台州市",
-    "331100": "丽水市",
-    "340100": "合肥市",
-    "340200": "芜湖市",
-    "340300": "蚌埠市",
-    "340400": "淮南市",
-    "340500": "马鞍山市",
-    "340600": "淮北市",
-    "340700": "铜陵市",
-    "340800": "安庆市",
-    "341000": "黄山市",
-    "341100": "滁州市",
-    "341200": "阜阳市",
-    "341300": "宿州市",
-    "341500": "六安市",
-    "341600": "亳州市",
-    "341700": "池州市",
-    "341800": "宣城市",
-    "350100": "福州市",
-    "350200": "厦门市",
-    "350300": "莆田市",
-    "350400": "三明市",
-    "350500": "泉州市",
-    "350600": "漳州市",
-    "350700": "南平市",
-    "350800": "龙岩市",
-    "350900": "宁德市",
-    "360100": "南昌市",
-    "360200": "景德镇市",
-    "360300": "萍乡市",
-    "360400": "九江市",
-    "360500": "新余市",
-    "360600": "鹰潭市",
-    "360700": "赣州市",
-    "360800": "吉安市",
-    "360900": "宜春市",
-    "361000": "抚州市",
-    "361100": "上饶市",
-    "370100": "济南市",
-    "370200": "青岛市",
-    "370300": "淄博市",
-    "370400": "枣庄市",
-    "370500": "东营市",
-    "370600": "烟台市",
-    "370700": "潍坊市",
-    "370800": "济宁市",
-    "370900": "泰安市",
-    "371000": "威海市",
-    "371100": "日照市",
-    "371200": "莱芜市",
-    "371300": "临沂市",
-    "371400": "德州市",
-    "371500": "聊城市",
-    "371600": "滨州市",
-    "371700": "菏泽市",
-    "410100": "郑州市",
-    "410200": "开封市",
-    "410300": "洛阳市",
-    "410400": "平顶山市",
-    "410500": "安阳市",
-    "410600": "鹤壁市",
-    "410700": "新乡市",
-    "410800": "焦作市",
-    "410900": "濮阳市",
-    "411000": "许昌市",
-    "411100": "漯河市",
-    "411200": "三门峡市",
-    "411300": "南阳市",
-    "411400": "商丘市",
-    "411500": "信阳市",
-    "411600": "周口市",
-    "411700": "驻马店市",
-    "419000": "省直辖县级行政区划",
-    "420100": "武汉市",
-    "420200": "黄石市",
-    "420300": "十堰市",
-    "420500": "宜昌市",
-    "420600": "襄阳市",
-    "420700": "鄂州市",
-    "420800": "荆门市",
-    "420900": "孝感市",
-    "421000": "荆州市",
-    "421100": "黄冈市",
-    "421200": "咸宁市",
-    "421300": "随州市",
-    "422800": "恩施土家族苗族自治州",
-    "429000": "省直辖县级行政区划",
-    "430100": "长沙市",
-    "430200": "株洲市",
-    "430300": "湘潭市",
-    "430400": "衡阳市",
-    "430500": "邵阳市",
-    "430600": "岳阳市",
-    "430700": "常德市",
-    "430800": "张家界市",
-    "430900": "益阳市",
-    "431000": "郴州市",
-    "431100": "永州市",
-    "431200": "怀化市",
-    "431300": "娄底市",
-    "433100": "湘西土家族苗族自治州",
-    "440100": "广州市",
-    "440200": "韶关市",
-    "440300": "深圳市",
-    "440400": "珠海市",
-    "440500": "汕头市",
-    "440600": "佛山市",
-    "440700": "江门市",
-    "440800": "湛江市",
-    "440900": "茂名市",
-    "441200": "肇庆市",
-    "441300": "惠州市",
-    "441400": "梅州市",
-    "441500": "汕尾市",
-    "441600": "河源市",
-    "441700": "阳江市",
-    "441800": "清远市",
-    "441900": "东莞市",
-    "442000": "中山市",
-    "445100": "潮州市",
-    "445200": "揭阳市",
-    "445300": "云浮市",
-    "450100": "南宁市",
-    "450200": "柳州市",
-    "450300": "桂林市",
-    "450400": "梧州市",
-    "450500": "北海市",
-    "450600": "防城港市",
-    "450700": "钦州市",
-    "450800": "贵港市",
-    "450900": "玉林市",
-    "451000": "百色市",
-    "451100": "贺州市",
-    "451200": "河池市",
-    "451300": "来宾市",
-    "451400": "崇左市",
-    "460100": "海口市",
-    "460200": "三亚市",
-    "460300": "三沙市",
-    "460400": "儋州市",
-    "469000": "省直辖县级行政区划",
-    "500100": "市辖区",
-    "500200": "县",
-    "510100": "成都市",
-    "510300": "自贡市",
-    "510400": "攀枝花市",
-    "510500": "泸州市",
-    "510600": "德阳市",
-    "510700": "绵阳市",
-    "510800": "广元市",
-    "510900": "遂宁市",
-    "511000": "内江市",
-    "511100": "乐山市",
-    "511300": "南充市",
-    "511400": "眉山市",
-    "511500": "宜宾市",
-    "511600": "广安市",
-    "511700": "达州市",
-    "511800": "雅安市",
-    "511900": "巴中市",
-    "512000": "资阳市",
-    "513200": "阿坝藏族羌族自治州",
-    "513300": "甘孜藏族自治州",
-    "513400": "凉山彝族自治州",
-    "520100": "贵阳市",
-    "520200": "六盘水市",
-    "520300": "遵义市",
-    "520400": "安顺市",
-    "520500": "毕节市",
-    "520600": "铜仁市",
-    "522300": "黔西南布依族苗族自治州",
-    "522600": "黔东南苗族侗族自治州",
-    "522700": "黔南布依族苗族自治州",
-    "530100": "昆明市",
-    "530300": "曲靖市",
-    "530400": "玉溪市",
-    "530500": "保山市",
-    "530600": "昭通市",
-    "530700": "丽江市",
-    "530800": "普洱市",
-    "530900": "临沧市",
-    "532300": "楚雄彝族自治州",
-    "532500": "红河哈尼族彝族自治州",
-    "532600": "文山壮族苗族自治州",
-    "532800": "西双版纳傣族自治州",
-    "532900": "大理白族自治州",
-    "533100": "德宏傣族景颇族自治州",
-    "533300": "怒江傈僳族自治州",
-    "533400": "迪庆藏族自治州",
-    "540100": "拉萨市",
-    "540200": "日喀则市",
-    "540300": "昌都市",
-    "540400": "林芝市",
-    "540500": "山南市",
-    "542400": "那曲地区",
-    "542500": "阿里地区",
-    "610100": "西安市",
-    "610200": "铜川市",
-    "610300": "宝鸡市",
-    "610400": "咸阳市",
-    "610500": "渭南市",
-    "610600": "延安市",
-    "610700": "汉中市",
-    "610800": "榆林市",
-    "610900": "安康市",
-    "611000": "商洛市",
-    "620100": "兰州市",
-    "620200": "嘉峪关市",
-    "620300": "金昌市",
-    "620400": "白银市",
-    "620500": "天水市",
-    "620600": "武威市",
-    "620700": "张掖市",
-    "620800": "平凉市",
-    "620900": "酒泉市",
-    "621000": "庆阳市",
-    "621100": "定西市",
-    "621200": "陇南市",
-    "622900": "临夏回族自治州",
-    "623000": "甘南藏族自治州",
-    "630100": "西宁市",
-    "630200": "海东市",
-    "632200": "海北藏族自治州",
-    "632300": "黄南藏族自治州",
-    "632500": "海南藏族自治州",
-    "632600": "果洛藏族自治州",
-    "632700": "玉树藏族自治州",
-    "632800": "海西蒙古族藏族自治州",
-    "640100": "银川市",
-    "640200": "石嘴山市",
-    "640300": "吴忠市",
-    "640400": "固原市",
-    "640500": "中卫市",
-    "650100": "乌鲁木齐市",
-    "650200": "克拉玛依市",
-    "650400": "吐鲁番市",
-    "650500": "哈密市",
-    "652300": "昌吉回族自治州",
-    "652700": "博尔塔拉蒙古自治州",
-    "652800": "巴音郭楞蒙古自治州",
-    "652900": "阿克苏地区",
-    "653000": "克孜勒苏柯尔克孜自治州",
-    "653100": "喀什地区",
-    "653200": "和田地区",
-    "654000": "伊犁哈萨克自治州",
-    "654200": "塔城地区",
-    "654300": "阿勒泰地区",
-    "659000": "自治区直辖县级行政区划"
-  },
-  "county_list": {
-    "110101": "东城区",
-    "110102": "西城区",
-    "110105": "朝阳区",
-    "110106": "丰台区",
-    "110107": "石景山区",
-    "110108": "海淀区",
-    "110109": "门头沟区",
-    "110111": "房山区",
-    "110112": "通州区",
-    "110113": "顺义区",
-    "110114": "昌平区",
-    "110115": "大兴区",
-    "110116": "怀柔区",
-    "110117": "平谷区",
-    "110118": "密云区",
-    "110119": "延庆区",
-    "120101": "和平区",
-    "120102": "河东区",
-    "120103": "河西区",
-    "120104": "南开区",
-    "120105": "河北区",
-    "120106": "红桥区",
-    "120110": "东丽区",
-    "120111": "西青区",
-    "120112": "津南区",
-    "120113": "北辰区",
-    "120114": "武清区",
-    "120115": "宝坻区",
-    "120116": "滨海新区",
-    "120117": "宁河区",
-    "120118": "静海区",
-    "120119": "蓟州区",
-    "130102": "长安区",
-    "130104": "桥西区",
-    "130105": "新华区",
-    "130107": "井陉矿区",
-    "130108": "裕华区",
-    "130109": "藁城区",
-    "130110": "鹿泉区",
-    "130111": "栾城区",
-    "130121": "井陉县",
-    "130123": "正定县",
-    "130125": "行唐县",
-    "130126": "灵寿县",
-    "130127": "高邑县",
-    "130128": "深泽县",
-    "130129": "赞皇县",
-    "130130": "无极县",
-    "130131": "平山县",
-    "130132": "元氏县",
-    "130133": "赵县",
-    "130183": "晋州市",
-    "130184": "新乐市",
-    "130202": "路南区",
-    "130203": "路北区",
-    "130204": "古冶区",
-    "130205": "开平区",
-    "130207": "丰南区",
-    "130208": "丰润区",
-    "130209": "曹妃甸区",
-    "130223": "滦县",
-    "130224": "滦南县",
-    "130225": "乐亭县",
-    "130227": "迁西县",
-    "130229": "玉田县",
-    "130281": "遵化市",
-    "130283": "迁安市",
-    "130302": "海港区",
-    "130303": "山海关区",
-    "130304": "北戴河区",
-    "130306": "抚宁区",
-    "130321": "青龙满族自治县",
-    "130322": "昌黎县",
-    "130324": "卢龙县",
-    "130402": "邯山区",
-    "130403": "丛台区",
-    "130404": "复兴区",
-    "130406": "峰峰矿区",
-    "130421": "邯郸县",
-    "130423": "临漳县",
-    "130424": "成安县",
-    "130425": "大名县",
-    "130426": "涉县",
-    "130427": "磁县",
-    "130428": "肥乡县",
-    "130429": "永年县",
-    "130430": "邱县",
-    "130431": "鸡泽县",
-    "130432": "广平县",
-    "130433": "馆陶县",
-    "130434": "魏县",
-    "130435": "曲周县",
-    "130481": "武安市",
-    "130502": "桥东区",
-    "130503": "桥西区",
-    "130521": "邢台县",
-    "130522": "临城县",
-    "130523": "内丘县",
-    "130524": "柏乡县",
-    "130525": "隆尧县",
-    "130526": "任县",
-    "130527": "南和县",
-    "130528": "宁晋县",
-    "130529": "巨鹿县",
-    "130530": "新河县",
-    "130531": "广宗县",
-    "130532": "平乡县",
-    "130533": "威县",
-    "130534": "清河县",
-    "130535": "临西县",
-    "130581": "南宫市",
-    "130582": "沙河市",
-    "130602": "竞秀区",
-    "130606": "莲池区",
-    "130607": "满城区",
-    "130608": "清苑区",
-    "130609": "徐水区",
-    "130623": "涞水县",
-    "130624": "阜平县",
-    "130626": "定兴县",
-    "130627": "唐县",
-    "130628": "高阳县",
-    "130629": "容城县",
-    "130630": "涞源县",
-    "130631": "望都县",
-    "130632": "安新县",
-    "130633": "易县",
-    "130634": "曲阳县",
-    "130635": "蠡县",
-    "130636": "顺平县",
-    "130637": "博野县",
-    "130638": "雄县",
-    "130681": "涿州市",
-    "130683": "安国市",
-    "130684": "高碑店市",
-    "130702": "桥东区",
-    "130703": "桥西区",
-    "130705": "宣化区",
-    "130706": "下花园区",
-    "130708": "万全区",
-    "130709": "崇礼区",
-    "130722": "张北县",
-    "130723": "康保县",
-    "130724": "沽源县",
-    "130725": "尚义县",
-    "130726": "蔚县",
-    "130727": "阳原县",
-    "130728": "怀安县",
-    "130730": "怀来县",
-    "130731": "涿鹿县",
-    "130732": "赤城县",
-    "130802": "双桥区",
-    "130803": "双滦区",
-    "130804": "鹰手营子矿区",
-    "130821": "承德县",
-    "130822": "兴隆县",
-    "130823": "平泉县",
-    "130824": "滦平县",
-    "130825": "隆化县",
-    "130826": "丰宁满族自治县",
-    "130827": "宽城满族自治县",
-    "130828": "围场满族蒙古族自治县",
-    "130902": "新华区",
-    "130903": "运河区",
-    "130921": "沧县",
-    "130922": "青县",
-    "130923": "东光县",
-    "130924": "海兴县",
-    "130925": "盐山县",
-    "130926": "肃宁县",
-    "130927": "南皮县",
-    "130928": "吴桥县",
-    "130929": "献县",
-    "130930": "孟村回族自治县",
-    "130981": "泊头市",
-    "130982": "任丘市",
-    "130983": "黄骅市",
-    "130984": "河间市",
-    "131002": "安次区",
-    "131003": "广阳区",
-    "131022": "固安县",
-    "131023": "永清县",
-    "131024": "香河县",
-    "131025": "大城县",
-    "131026": "文安县",
-    "131028": "大厂回族自治县",
-    "131081": "霸州市",
-    "131082": "三河市",
-    "131102": "桃城区",
-    "131103": "冀州区",
-    "131121": "枣强县",
-    "131122": "武邑县",
-    "131123": "武强县",
-    "131124": "饶阳县",
-    "131125": "安平县",
-    "131126": "故城县",
-    "131127": "景县",
-    "131128": "阜城县",
-    "131182": "深州市",
-    "139001": "定州市",
-    "139002": "辛集市",
-    "140105": "小店区",
-    "140106": "迎泽区",
-    "140107": "杏花岭区",
-    "140108": "尖草坪区",
-    "140109": "万柏林区",
-    "140110": "晋源区",
-    "140121": "清徐县",
-    "140122": "阳曲县",
-    "140123": "娄烦县",
-    "140181": "古交市",
-    "140202": "城区",
-    "140203": "矿区",
-    "140211": "南郊区",
-    "140212": "新荣区",
-    "140221": "阳高县",
-    "140222": "天镇县",
-    "140223": "广灵县",
-    "140224": "灵丘县",
-    "140225": "浑源县",
-    "140226": "左云县",
-    "140227": "大同县",
-    "140302": "城区",
-    "140303": "矿区",
-    "140311": "郊区",
-    "140321": "平定县",
-    "140322": "盂县",
-    "140402": "城区",
-    "140411": "郊区",
-    "140421": "长治县",
-    "140423": "襄垣县",
-    "140424": "屯留县",
-    "140425": "平顺县",
-    "140426": "黎城县",
-    "140427": "壶关县",
-    "140428": "长子县",
-    "140429": "武乡县",
-    "140430": "沁县",
-    "140431": "沁源县",
-    "140481": "潞城市",
-    "140502": "城区",
-    "140521": "沁水县",
-    "140522": "阳城县",
-    "140524": "陵川县",
-    "140525": "泽州县",
-    "140581": "高平市",
-    "140602": "朔城区",
-    "140603": "平鲁区",
-    "140621": "山阴县",
-    "140622": "应县",
-    "140623": "右玉县",
-    "140624": "怀仁县",
-    "140702": "榆次区",
-    "140721": "榆社县",
-    "140722": "左权县",
-    "140723": "和顺县",
-    "140724": "昔阳县",
-    "140725": "寿阳县",
-    "140726": "太谷县",
-    "140727": "祁县",
-    "140728": "平遥县",
-    "140729": "灵石县",
-    "140781": "介休市",
-    "140802": "盐湖区",
-    "140821": "临猗县",
-    "140822": "万荣县",
-    "140823": "闻喜县",
-    "140824": "稷山县",
-    "140825": "新绛县",
-    "140826": "绛县",
-    "140827": "垣曲县",
-    "140828": "夏县",
-    "140829": "平陆县",
-    "140830": "芮城县",
-    "140881": "永济市",
-    "140882": "河津市",
-    "140902": "忻府区",
-    "140921": "定襄县",
-    "140922": "五台县",
-    "140923": "代县",
-    "140924": "繁峙县",
-    "140925": "宁武县",
-    "140926": "静乐县",
-    "140927": "神池县",
-    "140928": "五寨县",
-    "140929": "岢岚县",
-    "140930": "河曲县",
-    "140931": "保德县",
-    "140932": "偏关县",
-    "140981": "原平市",
-    "141002": "尧都区",
-    "141021": "曲沃县",
-    "141022": "翼城县",
-    "141023": "襄汾县",
-    "141024": "洪洞县",
-    "141025": "古县",
-    "141026": "安泽县",
-    "141027": "浮山县",
-    "141028": "吉县",
-    "141029": "乡宁县",
-    "141030": "大宁县",
-    "141031": "隰县",
-    "141032": "永和县",
-    "141033": "蒲县",
-    "141034": "汾西县",
-    "141081": "侯马市",
-    "141082": "霍州市",
-    "141102": "离石区",
-    "141121": "文水县",
-    "141122": "交城县",
-    "141123": "兴县",
-    "141124": "临县",
-    "141125": "柳林县",
-    "141126": "石楼县",
-    "141127": "岚县",
-    "141128": "方山县",
-    "141129": "中阳县",
-    "141130": "交口县",
-    "141181": "孝义市",
-    "141182": "汾阳市",
-    "150102": "新城区",
-    "150103": "回民区",
-    "150104": "玉泉区",
-    "150105": "赛罕区",
-    "150121": "土默特左旗",
-    "150122": "托克托县",
-    "150123": "和林格尔县",
-    "150124": "清水河县",
-    "150125": "武川县",
-    "150202": "东河区",
-    "150203": "昆都仑区",
-    "150204": "青山区",
-    "150205": "石拐区",
-    "150206": "白云鄂博矿区",
-    "150207": "九原区",
-    "150221": "土默特右旗",
-    "150222": "固阳县",
-    "150223": "达尔罕茂明安联合旗",
-    "150302": "海勃湾区",
-    "150303": "海南区",
-    "150304": "乌达区",
-    "150402": "红山区",
-    "150403": "元宝山区",
-    "150404": "松山区",
-    "150421": "阿鲁科尔沁旗",
-    "150422": "巴林左旗",
-    "150423": "巴林右旗",
-    "150424": "林西县",
-    "150425": "克什克腾旗",
-    "150426": "翁牛特旗",
-    "150428": "喀喇沁旗",
-    "150429": "宁城县",
-    "150430": "敖汉旗",
-    "150502": "科尔沁区",
-    "150521": "科尔沁左翼中旗",
-    "150522": "科尔沁左翼后旗",
-    "150523": "开鲁县",
-    "150524": "库伦旗",
-    "150525": "奈曼旗",
-    "150526": "扎鲁特旗",
-    "150581": "霍林郭勒市",
-    "150602": "东胜区",
-    "150603": "康巴什区",
-    "150621": "达拉特旗",
-    "150622": "准格尔旗",
-    "150623": "鄂托克前旗",
-    "150624": "鄂托克旗",
-    "150625": "杭锦旗",
-    "150626": "乌审旗",
-    "150627": "伊金霍洛旗",
-    "150702": "海拉尔区",
-    "150703": "扎赉诺尔区",
-    "150721": "阿荣旗",
-    "150722": "莫力达瓦达斡尔族自治旗",
-    "150723": "鄂伦春自治旗",
-    "150724": "鄂温克族自治旗",
-    "150725": "陈巴尔虎旗",
-    "150726": "新巴尔虎左旗",
-    "150727": "新巴尔虎右旗",
-    "150781": "满洲里市",
-    "150782": "牙克石市",
-    "150783": "扎兰屯市",
-    "150784": "额尔古纳市",
-    "150785": "根河市",
-    "150802": "临河区",
-    "150821": "五原县",
-    "150822": "磴口县",
-    "150823": "乌拉特前旗",
-    "150824": "乌拉特中旗",
-    "150825": "乌拉特后旗",
-    "150826": "杭锦后旗",
-    "150902": "集宁区",
-    "150921": "卓资县",
-    "150922": "化德县",
-    "150923": "商都县",
-    "150924": "兴和县",
-    "150925": "凉城县",
-    "150926": "察哈尔右翼前旗",
-    "150927": "察哈尔右翼中旗",
-    "150928": "察哈尔右翼后旗",
-    "150929": "四子王旗",
-    "150981": "丰镇市",
-    "152201": "乌兰浩特市",
-    "152202": "阿尔山市",
-    "152221": "科尔沁右翼前旗",
-    "152222": "科尔沁右翼中旗",
-    "152223": "扎赉特旗",
-    "152224": "突泉县",
-    "152501": "二连浩特市",
-    "152502": "锡林浩特市",
-    "152522": "阿巴嘎旗",
-    "152523": "苏尼特左旗",
-    "152524": "苏尼特右旗",
-    "152525": "东乌珠穆沁旗",
-    "152526": "西乌珠穆沁旗",
-    "152527": "太仆寺旗",
-    "152528": "镶黄旗",
-    "152529": "正镶白旗",
-    "152530": "正蓝旗",
-    "152531": "多伦县",
-    "152921": "阿拉善左旗",
-    "152922": "阿拉善右旗",
-    "152923": "额济纳旗",
-    "210102": "和平区",
-    "210103": "沈河区",
-    "210104": "大东区",
-    "210105": "皇姑区",
-    "210106": "铁西区",
-    "210111": "苏家屯区",
-    "210112": "浑南区",
-    "210113": "沈北新区",
-    "210114": "于洪区",
-    "210115": "辽中区",
-    "210123": "康平县",
-    "210124": "法库县",
-    "210181": "新民市",
-    "210202": "中山区",
-    "210203": "西岗区",
-    "210204": "沙河口区",
-    "210211": "甘井子区",
-    "210212": "旅顺口区",
-    "210213": "金州区",
-    "210214": "普兰店区",
-    "210224": "长海县",
-    "210281": "瓦房店市",
-    "210283": "庄河市",
-    "210302": "铁东区",
-    "210303": "铁西区",
-    "210304": "立山区",
-    "210311": "千山区",
-    "210321": "台安县",
-    "210323": "岫岩满族自治县",
-    "210381": "海城市",
-    "210402": "新抚区",
-    "210403": "东洲区",
-    "210404": "望花区",
-    "210411": "顺城区",
-    "210421": "抚顺县",
-    "210422": "新宾满族自治县",
-    "210423": "清原满族自治县",
-    "210502": "平山区",
-    "210503": "溪湖区",
-    "210504": "明山区",
-    "210505": "南芬区",
-    "210521": "本溪满族自治县",
-    "210522": "桓仁满族自治县",
-    "210602": "元宝区",
-    "210603": "振兴区",
-    "210604": "振安区",
-    "210624": "宽甸满族自治县",
-    "210681": "东港市",
-    "210682": "凤城市",
-    "210702": "古塔区",
-    "210703": "凌河区",
-    "210711": "太和区",
-    "210726": "黑山县",
-    "210727": "义县",
-    "210781": "凌海市",
-    "210782": "北镇市",
-    "210802": "站前区",
-    "210803": "西市区",
-    "210804": "鲅鱼圈区",
-    "210811": "老边区",
-    "210881": "盖州市",
-    "210882": "大石桥市",
-    "210902": "海州区",
-    "210903": "新邱区",
-    "210904": "太平区",
-    "210905": "清河门区",
-    "210911": "细河区",
-    "210921": "阜新蒙古族自治县",
-    "210922": "彰武县",
-    "211002": "白塔区",
-    "211003": "文圣区",
-    "211004": "宏伟区",
-    "211005": "弓长岭区",
-    "211011": "太子河区",
-    "211021": "辽阳县",
-    "211081": "灯塔市",
-    "211102": "双台子区",
-    "211103": "兴隆台区",
-    "211104": "大洼区",
-    "211122": "盘山县",
-    "211202": "银州区",
-    "211204": "清河区",
-    "211221": "铁岭县",
-    "211223": "西丰县",
-    "211224": "昌图县",
-    "211281": "调兵山市",
-    "211282": "开原市",
-    "211302": "双塔区",
-    "211303": "龙城区",
-    "211321": "朝阳县",
-    "211322": "建平县",
-    "211324": "喀喇沁左翼蒙古族自治县",
-    "211381": "北票市",
-    "211382": "凌源市",
-    "211402": "连山区",
-    "211403": "龙港区",
-    "211404": "南票区",
-    "211421": "绥中县",
-    "211422": "建昌县",
-    "211481": "兴城市",
-    "220102": "南关区",
-    "220103": "宽城区",
-    "220104": "朝阳区",
-    "220105": "二道区",
-    "220106": "绿园区",
-    "220112": "双阳区",
-    "220113": "九台区",
-    "220122": "农安县",
-    "220182": "榆树市",
-    "220183": "德惠市",
-    "220202": "昌邑区",
-    "220203": "龙潭区",
-    "220204": "船营区",
-    "220211": "丰满区",
-    "220221": "永吉县",
-    "220281": "蛟河市",
-    "220282": "桦甸市",
-    "220283": "舒兰市",
-    "220284": "磐石市",
-    "220302": "铁西区",
-    "220303": "铁东区",
-    "220322": "梨树县",
-    "220323": "伊通满族自治县",
-    "220381": "公主岭市",
-    "220382": "双辽市",
-    "220402": "龙山区",
-    "220403": "西安区",
-    "220421": "东丰县",
-    "220422": "东辽县",
-    "220502": "东昌区",
-    "220503": "二道江区",
-    "220521": "通化县",
-    "220523": "辉南县",
-    "220524": "柳河县",
-    "220581": "梅河口市",
-    "220582": "集安市",
-    "220602": "浑江区",
-    "220605": "江源区",
-    "220621": "抚松县",
-    "220622": "靖宇县",
-    "220623": "长白朝鲜族自治县",
-    "220681": "临江市",
-    "220702": "宁江区",
-    "220721": "前郭尔罗斯蒙古族自治县",
-    "220722": "长岭县",
-    "220723": "乾安县",
-    "220781": "扶余市",
-    "220802": "洮北区",
-    "220821": "镇赉县",
-    "220822": "通榆县",
-    "220881": "洮南市",
-    "220882": "大安市",
-    "222401": "延吉市",
-    "222402": "图们市",
-    "222403": "敦化市",
-    "222404": "珲春市",
-    "222405": "龙井市",
-    "222406": "和龙市",
-    "222424": "汪清县",
-    "222426": "安图县",
-    "230102": "道里区",
-    "230103": "南岗区",
-    "230104": "道外区",
-    "230108": "平房区",
-    "230109": "松北区",
-    "230110": "香坊区",
-    "230111": "呼兰区",
-    "230112": "阿城区",
-    "230113": "双城区",
-    "230123": "依兰县",
-    "230124": "方正县",
-    "230125": "宾县",
-    "230126": "巴彦县",
-    "230127": "木兰县",
-    "230128": "通河县",
-    "230129": "延寿县",
-    "230183": "尚志市",
-    "230184": "五常市",
-    "230202": "龙沙区",
-    "230203": "建华区",
-    "230204": "铁锋区",
-    "230205": "昂昂溪区",
-    "230206": "富拉尔基区",
-    "230207": "碾子山区",
-    "230208": "梅里斯达斡尔族区",
-    "230221": "龙江县",
-    "230223": "依安县",
-    "230224": "泰来县",
-    "230225": "甘南县",
-    "230227": "富裕县",
-    "230229": "克山县",
-    "230230": "克东县",
-    "230231": "拜泉县",
-    "230281": "讷河市",
-    "230302": "鸡冠区",
-    "230303": "恒山区",
-    "230304": "滴道区",
-    "230305": "梨树区",
-    "230306": "城子河区",
-    "230307": "麻山区",
-    "230321": "鸡东县",
-    "230381": "虎林市",
-    "230382": "密山市",
-    "230402": "向阳区",
-    "230403": "工农区",
-    "230404": "南山区",
-    "230405": "兴安区",
-    "230406": "东山区",
-    "230407": "兴山区",
-    "230421": "萝北县",
-    "230422": "绥滨县",
-    "230502": "尖山区",
-    "230503": "岭东区",
-    "230505": "四方台区",
-    "230506": "宝山区",
-    "230521": "集贤县",
-    "230522": "友谊县",
-    "230523": "宝清县",
-    "230524": "饶河县",
-    "230602": "萨尔图区",
-    "230603": "龙凤区",
-    "230604": "让胡路区",
-    "230605": "红岗区",
-    "230606": "大同区",
-    "230621": "肇州县",
-    "230622": "肇源县",
-    "230623": "林甸县",
-    "230624": "杜尔伯特蒙古族自治县",
-    "230702": "伊春区",
-    "230703": "南岔区",
-    "230704": "友好区",
-    "230705": "西林区",
-    "230706": "翠峦区",
-    "230707": "新青区",
-    "230708": "美溪区",
-    "230709": "金山屯区",
-    "230710": "五营区",
-    "230711": "乌马河区",
-    "230712": "汤旺河区",
-    "230713": "带岭区",
-    "230714": "乌伊岭区",
-    "230715": "红星区",
-    "230716": "上甘岭区",
-    "230722": "嘉荫县",
-    "230781": "铁力市",
-    "230803": "向阳区",
-    "230804": "前进区",
-    "230805": "东风区",
-    "230811": "郊区",
-    "230822": "桦南县",
-    "230826": "桦川县",
-    "230828": "汤原县",
-    "230881": "同江市",
-    "230882": "富锦市",
-    "230883": "抚远市",
-    "230902": "新兴区",
-    "230903": "桃山区",
-    "230904": "茄子河区",
-    "230921": "勃利县",
-    "231002": "东安区",
-    "231003": "阳明区",
-    "231004": "爱民区",
-    "231005": "西安区",
-    "231025": "林口县",
-    "231081": "绥芬河市",
-    "231083": "海林市",
-    "231084": "宁安市",
-    "231085": "穆棱市",
-    "231086": "东宁市",
-    "231102": "爱辉区",
-    "231121": "嫩江县",
-    "231123": "逊克县",
-    "231124": "孙吴县",
-    "231181": "北安市",
-    "231182": "五大连池市",
-    "231202": "北林区",
-    "231221": "望奎县",
-    "231222": "兰西县",
-    "231223": "青冈县",
-    "231224": "庆安县",
-    "231225": "明水县",
-    "231226": "绥棱县",
-    "231281": "安达市",
-    "231282": "肇东市",
-    "231283": "海伦市",
-    "232721": "呼玛县",
-    "232722": "塔河县",
-    "232723": "漠河县",
-    "310101": "黄浦区",
-    "310104": "徐汇区",
-    "310105": "长宁区",
-    "310106": "静安区",
-    "310107": "普陀区",
-    "310109": "虹口区",
-    "310110": "杨浦区",
-    "310112": "闵行区",
-    "310113": "宝山区",
-    "310114": "嘉定区",
-    "310115": "浦东新区",
-    "310116": "金山区",
-    "310117": "松江区",
-    "310118": "青浦区",
-    "310120": "奉贤区",
-    "310151": "崇明区",
-    "320102": "玄武区",
-    "320104": "秦淮区",
-    "320105": "建邺区",
-    "320106": "鼓楼区",
-    "320111": "浦口区",
-    "320113": "栖霞区",
-    "320114": "雨花台区",
-    "320115": "江宁区",
-    "320116": "六合区",
-    "320117": "溧水区",
-    "320118": "高淳区",
-    "320205": "锡山区",
-    "320206": "惠山区",
-    "320211": "滨湖区",
-    "320213": "梁溪区",
-    "320214": "新吴区",
-    "320281": "江阴市",
-    "320282": "宜兴市",
-    "320302": "鼓楼区",
-    "320303": "云龙区",
-    "320305": "贾汪区",
-    "320311": "泉山区",
-    "320312": "铜山区",
-    "320321": "丰县",
-    "320322": "沛县",
-    "320324": "睢宁县",
-    "320381": "新沂市",
-    "320382": "邳州市",
-    "320402": "天宁区",
-    "320404": "钟楼区",
-    "320411": "新北区",
-    "320412": "武进区",
-    "320413": "金坛区",
-    "320481": "溧阳市",
-    "320505": "虎丘区",
-    "320506": "吴中区",
-    "320507": "相城区",
-    "320508": "姑苏区",
-    "320509": "吴江区",
-    "320581": "常熟市",
-    "320582": "张家港市",
-    "320583": "昆山市",
-    "320585": "太仓市",
-    "320602": "崇川区",
-    "320611": "港闸区",
-    "320612": "通州区",
-    "320621": "海安县",
-    "320623": "如东县",
-    "320681": "启东市",
-    "320682": "如皋市",
-    "320684": "海门市",
-    "320703": "连云区",
-    "320706": "海州区",
-    "320707": "赣榆区",
-    "320722": "东海县",
-    "320723": "灌云县",
-    "320724": "灌南县",
-    "320803": "淮安区",
-    "320804": "淮阴区",
-    "320812": "清江浦区",
-    "320813": "洪泽区",
-    "320826": "涟水县",
-    "320830": "盱眙县",
-    "320831": "金湖县",
-    "320902": "亭湖区",
-    "320903": "盐都区",
-    "320904": "大丰区",
-    "320921": "响水县",
-    "320922": "滨海县",
-    "320923": "阜宁县",
-    "320924": "射阳县",
-    "320925": "建湖县",
-    "320981": "东台市",
-    "321002": "广陵区",
-    "321003": "邗江区",
-    "321012": "江都区",
-    "321023": "宝应县",
-    "321081": "仪征市",
-    "321084": "高邮市",
-    "321102": "京口区",
-    "321111": "润州区",
-    "321112": "丹徒区",
-    "321181": "丹阳市",
-    "321182": "扬中市",
-    "321183": "句容市",
-    "321202": "海陵区",
-    "321203": "高港区",
-    "321204": "姜堰区",
-    "321281": "兴化市",
-    "321282": "靖江市",
-    "321283": "泰兴市",
-    "321302": "宿城区",
-    "321311": "宿豫区",
-    "321322": "沭阳县",
-    "321323": "泗阳县",
-    "321324": "泗洪县",
-    "330102": "上城区",
-    "330103": "下城区",
-    "330104": "江干区",
-    "330105": "拱墅区",
-    "330106": "西湖区",
-    "330108": "滨江区",
-    "330109": "萧山区",
-    "330110": "余杭区",
-    "330111": "富阳区",
-    "330122": "桐庐县",
-    "330127": "淳安县",
-    "330182": "建德市",
-    "330185": "临安市",
-    "330203": "海曙区",
-    "330204": "江东区",
-    "330205": "江北区",
-    "330206": "北仑区",
-    "330211": "镇海区",
-    "330212": "鄞州区",
-    "330225": "象山县",
-    "330226": "宁海县",
-    "330281": "余姚市",
-    "330282": "慈溪市",
-    "330283": "奉化市",
-    "330302": "鹿城区",
-    "330303": "龙湾区",
-    "330304": "瓯海区",
-    "330305": "洞头区",
-    "330324": "永嘉县",
-    "330326": "平阳县",
-    "330327": "苍南县",
-    "330328": "文成县",
-    "330329": "泰顺县",
-    "330381": "瑞安市",
-    "330382": "乐清市",
-    "330402": "南湖区",
-    "330411": "秀洲区",
-    "330421": "嘉善县",
-    "330424": "海盐县",
-    "330481": "海宁市",
-    "330482": "平湖市",
-    "330483": "桐乡市",
-    "330502": "吴兴区",
-    "330503": "南浔区",
-    "330521": "德清县",
-    "330522": "长兴县",
-    "330523": "安吉县",
-    "330602": "越城区",
-    "330603": "柯桥区",
-    "330604": "上虞区",
-    "330624": "新昌县",
-    "330681": "诸暨市",
-    "330683": "嵊州市",
-    "330702": "婺城区",
-    "330703": "金东区",
-    "330723": "武义县",
-    "330726": "浦江县",
-    "330727": "磐安县",
-    "330781": "兰溪市",
-    "330782": "义乌市",
-    "330783": "东阳市",
-    "330784": "永康市",
-    "330802": "柯城区",
-    "330803": "衢江区",
-    "330822": "常山县",
-    "330824": "开化县",
-    "330825": "龙游县",
-    "330881": "江山市",
-    "330902": "定海区",
-    "330903": "普陀区",
-    "330921": "岱山县",
-    "330922": "嵊泗县",
-    "331002": "椒江区",
-    "331003": "黄岩区",
-    "331004": "路桥区",
-    "331021": "玉环县",
-    "331022": "三门县",
-    "331023": "天台县",
-    "331024": "仙居县",
-    "331081": "温岭市",
-    "331082": "临海市",
-    "331102": "莲都区",
-    "331121": "青田县",
-    "331122": "缙云县",
-    "331123": "遂昌县",
-    "331124": "松阳县",
-    "331125": "云和县",
-    "331126": "庆元县",
-    "331127": "景宁畲族自治县",
-    "331181": "龙泉市",
-    "340102": "瑶海区",
-    "340103": "庐阳区",
-    "340104": "蜀山区",
-    "340111": "包河区",
-    "340121": "长丰县",
-    "340122": "肥东县",
-    "340123": "肥西县",
-    "340124": "庐江县",
-    "340181": "巢湖市",
-    "340202": "镜湖区",
-    "340203": "弋江区",
-    "340207": "鸠江区",
-    "340208": "三山区",
-    "340221": "芜湖县",
-    "340222": "繁昌县",
-    "340223": "南陵县",
-    "340225": "无为县",
-    "340302": "龙子湖区",
-    "340303": "蚌山区",
-    "340304": "禹会区",
-    "340311": "淮上区",
-    "340321": "怀远县",
-    "340322": "五河县",
-    "340323": "固镇县",
-    "340402": "大通区",
-    "340403": "田家庵区",
-    "340404": "谢家集区",
-    "340405": "八公山区",
-    "340406": "潘集区",
-    "340421": "凤台县",
-    "340422": "寿县",
-    "340503": "花山区",
-    "340504": "雨山区",
-    "340506": "博望区",
-    "340521": "当涂县",
-    "340522": "含山县",
-    "340523": "和县",
-    "340602": "杜集区",
-    "340603": "相山区",
-    "340604": "烈山区",
-    "340621": "濉溪县",
-    "340705": "铜官区",
-    "340706": "义安区",
-    "340711": "郊区",
-    "340722": "枞阳县",
-    "340802": "迎江区",
-    "340803": "大观区",
-    "340811": "宜秀区",
-    "340822": "怀宁县",
-    "340824": "潜山县",
-    "340825": "太湖县",
-    "340826": "宿松县",
-    "340827": "望江县",
-    "340828": "岳西县",
-    "340881": "桐城市",
-    "341002": "屯溪区",
-    "341003": "黄山区",
-    "341004": "徽州区",
-    "341021": "歙县",
-    "341022": "休宁县",
-    "341023": "黟县",
-    "341024": "祁门县",
-    "341102": "琅琊区",
-    "341103": "南谯区",
-    "341122": "来安县",
-    "341124": "全椒县",
-    "341125": "定远县",
-    "341126": "凤阳县",
-    "341181": "天长市",
-    "341182": "明光市",
-    "341202": "颍州区",
-    "341203": "颍东区",
-    "341204": "颍泉区",
-    "341221": "临泉县",
-    "341222": "太和县",
-    "341225": "阜南县",
-    "341226": "颍上县",
-    "341282": "界首市",
-    "341302": "埇桥区",
-    "341321": "砀山县",
-    "341322": "萧县",
-    "341323": "灵璧县",
-    "341324": "泗县",
-    "341502": "金安区",
-    "341503": "裕安区",
-    "341504": "叶集区",
-    "341522": "霍邱县",
-    "341523": "舒城县",
-    "341524": "金寨县",
-    "341525": "霍山县",
-    "341602": "谯城区",
-    "341621": "涡阳县",
-    "341622": "蒙城县",
-    "341623": "利辛县",
-    "341702": "贵池区",
-    "341721": "东至县",
-    "341722": "石台县",
-    "341723": "青阳县",
-    "341802": "宣州区",
-    "341821": "郎溪县",
-    "341822": "广德县",
-    "341823": "泾县",
-    "341824": "绩溪县",
-    "341825": "旌德县",
-    "341881": "宁国市",
-    "350102": "鼓楼区",
-    "350103": "台江区",
-    "350104": "仓山区",
-    "350105": "马尾区",
-    "350111": "晋安区",
-    "350121": "闽侯县",
-    "350122": "连江县",
-    "350123": "罗源县",
-    "350124": "闽清县",
-    "350125": "永泰县",
-    "350128": "平潭县",
-    "350181": "福清市",
-    "350182": "长乐市",
-    "350203": "思明区",
-    "350205": "海沧区",
-    "350206": "湖里区",
-    "350211": "集美区",
-    "350212": "同安区",
-    "350213": "翔安区",
-    "350302": "城厢区",
-    "350303": "涵江区",
-    "350304": "荔城区",
-    "350305": "秀屿区",
-    "350322": "仙游县",
-    "350402": "梅列区",
-    "350403": "三元区",
-    "350421": "明溪县",
-    "350423": "清流县",
-    "350424": "宁化县",
-    "350425": "大田县",
-    "350426": "尤溪县",
-    "350427": "沙县",
-    "350428": "将乐县",
-    "350429": "泰宁县",
-    "350430": "建宁县",
-    "350481": "永安市",
-    "350502": "鲤城区",
-    "350503": "丰泽区",
-    "350504": "洛江区",
-    "350505": "泉港区",
-    "350521": "惠安县",
-    "350524": "安溪县",
-    "350525": "永春县",
-    "350526": "德化县",
-    "350527": "金门县",
-    "350581": "石狮市",
-    "350582": "晋江市",
-    "350583": "南安市",
-    "350602": "芗城区",
-    "350603": "龙文区",
-    "350622": "云霄县",
-    "350623": "漳浦县",
-    "350624": "诏安县",
-    "350625": "长泰县",
-    "350626": "东山县",
-    "350627": "南靖县",
-    "350628": "平和县",
-    "350629": "华安县",
-    "350681": "龙海市",
-    "350702": "延平区",
-    "350703": "建阳区",
-    "350721": "顺昌县",
-    "350722": "浦城县",
-    "350723": "光泽县",
-    "350724": "松溪县",
-    "350725": "政和县",
-    "350781": "邵武市",
-    "350782": "武夷山市",
-    "350783": "建瓯市",
-    "350802": "新罗区",
-    "350803": "永定区",
-    "350821": "长汀县",
-    "350823": "上杭县",
-    "350824": "武平县",
-    "350825": "连城县",
-    "350881": "漳平市",
-    "350902": "蕉城区",
-    "350921": "霞浦县",
-    "350922": "古田县",
-    "350923": "屏南县",
-    "350924": "寿宁县",
-    "350925": "周宁县",
-    "350926": "柘荣县",
-    "350981": "福安市",
-    "350982": "福鼎市",
-    "360102": "东湖区",
-    "360103": "西湖区",
-    "360104": "青云谱区",
-    "360105": "湾里区",
-    "360111": "青山湖区",
-    "360112": "新建区",
-    "360121": "南昌县",
-    "360123": "安义县",
-    "360124": "进贤县",
-    "360202": "昌江区",
-    "360203": "珠山区",
-    "360222": "浮梁县",
-    "360281": "乐平市",
-    "360302": "安源区",
-    "360313": "湘东区",
-    "360321": "莲花县",
-    "360322": "上栗县",
-    "360323": "芦溪县",
-    "360402": "濂溪区",
-    "360403": "浔阳区",
-    "360421": "九江县",
-    "360423": "武宁县",
-    "360424": "修水县",
-    "360425": "永修县",
-    "360426": "德安县",
-    "360428": "都昌县",
-    "360429": "湖口县",
-    "360430": "彭泽县",
-    "360481": "瑞昌市",
-    "360482": "共青城市",
-    "360483": "庐山市",
-    "360502": "渝水区",
-    "360521": "分宜县",
-    "360602": "月湖区",
-    "360622": "余江县",
-    "360681": "贵溪市",
-    "360702": "章贡区",
-    "360703": "南康区",
-    "360721": "赣县",
-    "360722": "信丰县",
-    "360723": "大余县",
-    "360724": "上犹县",
-    "360725": "崇义县",
-    "360726": "安远县",
-    "360727": "龙南县",
-    "360728": "定南县",
-    "360729": "全南县",
-    "360730": "宁都县",
-    "360731": "于都县",
-    "360732": "兴国县",
-    "360733": "会昌县",
-    "360734": "寻乌县",
-    "360735": "石城县",
-    "360781": "瑞金市",
-    "360802": "吉州区",
-    "360803": "青原区",
-    "360821": "吉安县",
-    "360822": "吉水县",
-    "360823": "峡江县",
-    "360824": "新干县",
-    "360825": "永丰县",
-    "360826": "泰和县",
-    "360827": "遂川县",
-    "360828": "万安县",
-    "360829": "安福县",
-    "360830": "永新县",
-    "360881": "井冈山市",
-    "360902": "袁州区",
-    "360921": "奉新县",
-    "360922": "万载县",
-    "360923": "上高县",
-    "360924": "宜丰县",
-    "360925": "靖安县",
-    "360926": "铜鼓县",
-    "360981": "丰城市",
-    "360982": "樟树市",
-    "360983": "高安市",
-    "361002": "临川区",
-    "361021": "南城县",
-    "361022": "黎川县",
-    "361023": "南丰县",
-    "361024": "崇仁县",
-    "361025": "乐安县",
-    "361026": "宜黄县",
-    "361027": "金溪县",
-    "361028": "资溪县",
-    "361029": "东乡县",
-    "361030": "广昌县",
-    "361102": "信州区",
-    "361103": "广丰区",
-    "361121": "上饶县",
-    "361123": "玉山县",
-    "361124": "铅山县",
-    "361125": "横峰县",
-    "361126": "弋阳县",
-    "361127": "余干县",
-    "361128": "鄱阳县",
-    "361129": "万年县",
-    "361130": "婺源县",
-    "361181": "德兴市",
-    "370102": "历下区",
-    "370103": "市中区",
-    "370104": "槐荫区",
-    "370105": "天桥区",
-    "370112": "历城区",
-    "370113": "长清区",
-    "370124": "平阴县",
-    "370125": "济阳县",
-    "370126": "商河县",
-    "370181": "章丘市",
-    "370202": "市南区",
-    "370203": "市北区",
-    "370211": "黄岛区",
-    "370212": "崂山区",
-    "370213": "李沧区",
-    "370214": "城阳区",
-    "370281": "胶州市",
-    "370282": "即墨市",
-    "370283": "平度市",
-    "370285": "莱西市",
-    "370302": "淄川区",
-    "370303": "张店区",
-    "370304": "博山区",
-    "370305": "临淄区",
-    "370306": "周村区",
-    "370321": "桓台县",
-    "370322": "高青县",
-    "370323": "沂源县",
-    "370402": "市中区",
-    "370403": "薛城区",
-    "370404": "峄城区",
-    "370405": "台儿庄区",
-    "370406": "山亭区",
-    "370481": "滕州市",
-    "370502": "东营区",
-    "370503": "河口区",
-    "370505": "垦利区",
-    "370522": "利津县",
-    "370523": "广饶县",
-    "370602": "芝罘区",
-    "370611": "福山区",
-    "370612": "牟平区",
-    "370613": "莱山区",
-    "370634": "长岛县",
-    "370681": "龙口市",
-    "370682": "莱阳市",
-    "370683": "莱州市",
-    "370684": "蓬莱市",
-    "370685": "招远市",
-    "370686": "栖霞市",
-    "370687": "海阳市",
-    "370702": "潍城区",
-    "370703": "寒亭区",
-    "370704": "坊子区",
-    "370705": "奎文区",
-    "370724": "临朐县",
-    "370725": "昌乐县",
-    "370781": "青州市",
-    "370782": "诸城市",
-    "370783": "寿光市",
-    "370784": "安丘市",
-    "370785": "高密市",
-    "370786": "昌邑市",
-    "370811": "任城区",
-    "370812": "兖州区",
-    "370826": "微山县",
-    "370827": "鱼台县",
-    "370828": "金乡县",
-    "370829": "嘉祥县",
-    "370830": "汶上县",
-    "370831": "泗水县",
-    "370832": "梁山县",
-    "370881": "曲阜市",
-    "370883": "邹城市",
-    "370902": "泰山区",
-    "370911": "岱岳区",
-    "370921": "宁阳县",
-    "370923": "东平县",
-    "370982": "新泰市",
-    "370983": "肥城市",
-    "371002": "环翠区",
-    "371003": "文登区",
-    "371082": "荣成市",
-    "371083": "乳山市",
-    "371102": "东港区",
-    "371103": "岚山区",
-    "371121": "五莲县",
-    "371122": "莒县",
-    "371202": "莱城区",
-    "371203": "钢城区",
-    "371302": "兰山区",
-    "371311": "罗庄区",
-    "371312": "河东区",
-    "371321": "沂南县",
-    "371322": "郯城县",
-    "371323": "沂水县",
-    "371324": "兰陵县",
-    "371325": "费县",
-    "371326": "平邑县",
-    "371327": "莒南县",
-    "371328": "蒙阴县",
-    "371329": "临沭县",
-    "371402": "德城区",
-    "371403": "陵城区",
-    "371422": "宁津县",
-    "371423": "庆云县",
-    "371424": "临邑县",
-    "371425": "齐河县",
-    "371426": "平原县",
-    "371427": "夏津县",
-    "371428": "武城县",
-    "371481": "乐陵市",
-    "371482": "禹城市",
-    "371502": "东昌府区",
-    "371521": "阳谷县",
-    "371522": "莘县",
-    "371523": "茌平县",
-    "371524": "东阿县",
-    "371525": "冠县",
-    "371526": "高唐县",
-    "371581": "临清市",
-    "371602": "滨城区",
-    "371603": "沾化区",
-    "371621": "惠民县",
-    "371622": "阳信县",
-    "371623": "无棣县",
-    "371625": "博兴县",
-    "371626": "邹平县",
-    "371702": "牡丹区",
-    "371703": "定陶区",
-    "371721": "曹县",
-    "371722": "单县",
-    "371723": "成武县",
-    "371724": "巨野县",
-    "371725": "郓城县",
-    "371726": "鄄城县",
-    "371728": "东明县",
-    "410102": "中原区",
-    "410103": "二七区",
-    "410104": "管城回族区",
-    "410105": "金水区",
-    "410106": "上街区",
-    "410108": "惠济区",
-    "410122": "中牟县",
-    "410181": "巩义市",
-    "410182": "荥阳市",
-    "410183": "新密市",
-    "410184": "新郑市",
-    "410185": "登封市",
-    "410202": "龙亭区",
-    "410203": "顺河回族区",
-    "410204": "鼓楼区",
-    "410205": "禹王台区",
-    "410211": "金明区",
-    "410212": "祥符区",
-    "410221": "杞县",
-    "410222": "通许县",
-    "410223": "尉氏县",
-    "410225": "兰考县",
-    "410302": "老城区",
-    "410303": "西工区",
-    "410304": "瀍河回族区",
-    "410305": "涧西区",
-    "410306": "吉利区",
-    "410311": "洛龙区",
-    "410322": "孟津县",
-    "410323": "新安县",
-    "410324": "栾川县",
-    "410325": "嵩县",
-    "410326": "汝阳县",
-    "410327": "宜阳县",
-    "410328": "洛宁县",
-    "410329": "伊川县",
-    "410381": "偃师市",
-    "410402": "新华区",
-    "410403": "卫东区",
-    "410404": "石龙区",
-    "410411": "湛河区",
-    "410421": "宝丰县",
-    "410422": "叶县",
-    "410423": "鲁山县",
-    "410425": "郏县",
-    "410481": "舞钢市",
-    "410482": "汝州市",
-    "410502": "文峰区",
-    "410503": "北关区",
-    "410505": "殷都区",
-    "410506": "龙安区",
-    "410522": "安阳县",
-    "410523": "汤阴县",
-    "410526": "滑县",
-    "410527": "内黄县",
-    "410581": "林州市",
-    "410602": "鹤山区",
-    "410603": "山城区",
-    "410611": "淇滨区",
-    "410621": "浚县",
-    "410622": "淇县",
-    "410702": "红旗区",
-    "410703": "卫滨区",
-    "410704": "凤泉区",
-    "410711": "牧野区",
-    "410721": "新乡县",
-    "410724": "获嘉县",
-    "410725": "原阳县",
-    "410726": "延津县",
-    "410727": "封丘县",
-    "410728": "长垣县",
-    "410781": "卫辉市",
-    "410782": "辉县市",
-    "410802": "解放区",
-    "410803": "中站区",
-    "410804": "马村区",
-    "410811": "山阳区",
-    "410821": "修武县",
-    "410822": "博爱县",
-    "410823": "武陟县",
-    "410825": "温县",
-    "410882": "沁阳市",
-    "410883": "孟州市",
-    "410902": "华龙区",
-    "410922": "清丰县",
-    "410923": "南乐县",
-    "410926": "范县",
-    "410927": "台前县",
-    "410928": "濮阳县",
-    "411002": "魏都区",
-    "411023": "许昌县",
-    "411024": "鄢陵县",
-    "411025": "襄城县",
-    "411081": "禹州市",
-    "411082": "长葛市",
-    "411102": "源汇区",
-    "411103": "郾城区",
-    "411104": "召陵区",
-    "411121": "舞阳县",
-    "411122": "临颍县",
-    "411202": "湖滨区",
-    "411203": "陕州区",
-    "411221": "渑池县",
-    "411224": "卢氏县",
-    "411281": "义马市",
-    "411282": "灵宝市",
-    "411302": "宛城区",
-    "411303": "卧龙区",
-    "411321": "南召县",
-    "411322": "方城县",
-    "411323": "西峡县",
-    "411324": "镇平县",
-    "411325": "内乡县",
-    "411326": "淅川县",
-    "411327": "社旗县",
-    "411328": "唐河县",
-    "411329": "新野县",
-    "411330": "桐柏县",
-    "411381": "邓州市",
-    "411402": "梁园区",
-    "411403": "睢阳区",
-    "411421": "民权县",
-    "411422": "睢县",
-    "411423": "宁陵县",
-    "411424": "柘城县",
-    "411425": "虞城县",
-    "411426": "夏邑县",
-    "411481": "永城市",
-    "411502": "浉河区",
-    "411503": "平桥区",
-    "411521": "罗山县",
-    "411522": "光山县",
-    "411523": "新县",
-    "411524": "商城县",
-    "411525": "固始县",
-    "411526": "潢川县",
-    "411527": "淮滨县",
-    "411528": "息县",
-    "411602": "川汇区",
-    "411621": "扶沟县",
-    "411622": "西华县",
-    "411623": "商水县",
-    "411624": "沈丘县",
-    "411625": "郸城县",
-    "411626": "淮阳县",
-    "411627": "太康县",
-    "411628": "鹿邑县",
-    "411681": "项城市",
-    "411702": "驿城区",
-    "411721": "西平县",
-    "411722": "上蔡县",
-    "411723": "平舆县",
-    "411724": "正阳县",
-    "411725": "确山县",
-    "411726": "泌阳县",
-    "411727": "汝南县",
-    "411728": "遂平县",
-    "411729": "新蔡县",
-    "419001": "济源市",
-    "420102": "江岸区",
-    "420103": "江汉区",
-    "420104": "硚口区",
-    "420105": "汉阳区",
-    "420106": "武昌区",
-    "420107": "青山区",
-    "420111": "洪山区",
-    "420112": "东西湖区",
-    "420113": "汉南区",
-    "420114": "蔡甸区",
-    "420115": "江夏区",
-    "420116": "黄陂区",
-    "420117": "新洲区",
-    "420202": "黄石港区",
-    "420203": "西塞山区",
-    "420204": "下陆区",
-    "420205": "铁山区",
-    "420222": "阳新县",
-    "420281": "大冶市",
-    "420302": "茅箭区",
-    "420303": "张湾区",
-    "420304": "郧阳区",
-    "420322": "郧西县",
-    "420323": "竹山县",
-    "420324": "竹溪县",
-    "420325": "房县",
-    "420381": "丹江口市",
-    "420502": "西陵区",
-    "420503": "伍家岗区",
-    "420504": "点军区",
-    "420505": "猇亭区",
-    "420506": "夷陵区",
-    "420525": "远安县",
-    "420526": "兴山县",
-    "420527": "秭归县",
-    "420528": "长阳土家族自治县",
-    "420529": "五峰土家族自治县",
-    "420581": "宜都市",
-    "420582": "当阳市",
-    "420583": "枝江市",
-    "420602": "襄城区",
-    "420606": "樊城区",
-    "420607": "襄州区",
-    "420624": "南漳县",
-    "420625": "谷城县",
-    "420626": "保康县",
-    "420682": "老河口市",
-    "420683": "枣阳市",
-    "420684": "宜城市",
-    "420702": "梁子湖区",
-    "420703": "华容区",
-    "420704": "鄂城区",
-    "420802": "东宝区",
-    "420804": "掇刀区",
-    "420821": "京山县",
-    "420822": "沙洋县",
-    "420881": "钟祥市",
-    "420902": "孝南区",
-    "420921": "孝昌县",
-    "420922": "大悟县",
-    "420923": "云梦县",
-    "420981": "应城市",
-    "420982": "安陆市",
-    "420984": "汉川市",
-    "421002": "沙市区",
-    "421003": "荆州区",
-    "421022": "公安县",
-    "421023": "监利县",
-    "421024": "江陵县",
-    "421081": "石首市",
-    "421083": "洪湖市",
-    "421087": "松滋市",
-    "421102": "黄州区",
-    "421121": "团风县",
-    "421122": "红安县",
-    "421123": "罗田县",
-    "421124": "英山县",
-    "421125": "浠水县",
-    "421126": "蕲春县",
-    "421127": "黄梅县",
-    "421181": "麻城市",
-    "421182": "武穴市",
-    "421202": "咸安区",
-    "421221": "嘉鱼县",
-    "421222": "通城县",
-    "421223": "崇阳县",
-    "421224": "通山县",
-    "421281": "赤壁市",
-    "421303": "曾都区",
-    "421321": "随县",
-    "421381": "广水市",
-    "422801": "恩施市",
-    "422802": "利川市",
-    "422822": "建始县",
-    "422823": "巴东县",
-    "422825": "宣恩县",
-    "422826": "咸丰县",
-    "422827": "来凤县",
-    "422828": "鹤峰县",
-    "429004": "仙桃市",
-    "429005": "潜江市",
-    "429006": "天门市",
-    "429021": "神农架林区",
-    "430102": "芙蓉区",
-    "430103": "天心区",
-    "430104": "岳麓区",
-    "430105": "开福区",
-    "430111": "雨花区",
-    "430112": "望城区",
-    "430121": "长沙县",
-    "430124": "宁乡县",
-    "430181": "浏阳市",
-    "430202": "荷塘区",
-    "430203": "芦淞区",
-    "430204": "石峰区",
-    "430211": "天元区",
-    "430221": "株洲县",
-    "430223": "攸县",
-    "430224": "茶陵县",
-    "430225": "炎陵县",
-    "430281": "醴陵市",
-    "430302": "雨湖区",
-    "430304": "岳塘区",
-    "430321": "湘潭县",
-    "430381": "湘乡市",
-    "430382": "韶山市",
-    "430405": "珠晖区",
-    "430406": "雁峰区",
-    "430407": "石鼓区",
-    "430408": "蒸湘区",
-    "430412": "南岳区",
-    "430421": "衡阳县",
-    "430422": "衡南县",
-    "430423": "衡山县",
-    "430424": "衡东县",
-    "430426": "祁东县",
-    "430481": "耒阳市",
-    "430482": "常宁市",
-    "430502": "双清区",
-    "430503": "大祥区",
-    "430511": "北塔区",
-    "430521": "邵东县",
-    "430522": "新邵县",
-    "430523": "邵阳县",
-    "430524": "隆回县",
-    "430525": "洞口县",
-    "430527": "绥宁县",
-    "430528": "新宁县",
-    "430529": "城步苗族自治县",
-    "430581": "武冈市",
-    "430602": "岳阳楼区",
-    "430603": "云溪区",
-    "430611": "君山区",
-    "430621": "岳阳县",
-    "430623": "华容县",
-    "430624": "湘阴县",
-    "430626": "平江县",
-    "430681": "汨罗市",
-    "430682": "临湘市",
-    "430702": "武陵区",
-    "430703": "鼎城区",
-    "430721": "安乡县",
-    "430722": "汉寿县",
-    "430723": "澧县",
-    "430724": "临澧县",
-    "430725": "桃源县",
-    "430726": "石门县",
-    "430781": "津市市",
-    "430802": "永定区",
-    "430811": "武陵源区",
-    "430821": "慈利县",
-    "430822": "桑植县",
-    "430902": "资阳区",
-    "430903": "赫山区",
-    "430921": "南县",
-    "430922": "桃江县",
-    "430923": "安化县",
-    "430981": "沅江市",
-    "431002": "北湖区",
-    "431003": "苏仙区",
-    "431021": "桂阳县",
-    "431022": "宜章县",
-    "431023": "永兴县",
-    "431024": "嘉禾县",
-    "431025": "临武县",
-    "431026": "汝城县",
-    "431027": "桂东县",
-    "431028": "安仁县",
-    "431081": "资兴市",
-    "431102": "零陵区",
-    "431103": "冷水滩区",
-    "431121": "祁阳县",
-    "431122": "东安县",
-    "431123": "双牌县",
-    "431124": "道县",
-    "431125": "江永县",
-    "431126": "宁远县",
-    "431127": "蓝山县",
-    "431128": "新田县",
-    "431129": "江华瑶族自治县",
-    "431202": "鹤城区",
-    "431221": "中方县",
-    "431222": "沅陵县",
-    "431223": "辰溪县",
-    "431224": "溆浦县",
-    "431225": "会同县",
-    "431226": "麻阳苗族自治县",
-    "431227": "新晃侗族自治县",
-    "431228": "芷江侗族自治县",
-    "431229": "靖州苗族侗族自治县",
-    "431230": "通道侗族自治县",
-    "431281": "洪江市",
-    "431302": "娄星区",
-    "431321": "双峰县",
-    "431322": "新化县",
-    "431381": "冷水江市",
-    "431382": "涟源市",
-    "433101": "吉首市",
-    "433122": "泸溪县",
-    "433123": "凤凰县",
-    "433124": "花垣县",
-    "433125": "保靖县",
-    "433126": "古丈县",
-    "433127": "永顺县",
-    "433130": "龙山县",
-    "440103": "荔湾区",
-    "440104": "越秀区",
-    "440105": "海珠区",
-    "440106": "天河区",
-    "440111": "白云区",
-    "440112": "黄埔区",
-    "440113": "番禺区",
-    "440114": "花都区",
-    "440115": "南沙区",
-    "440117": "从化区",
-    "440118": "增城区",
-    "440203": "武江区",
-    "440204": "浈江区",
-    "440205": "曲江区",
-    "440222": "始兴县",
-    "440224": "仁化县",
-    "440229": "翁源县",
-    "440232": "乳源瑶族自治县",
-    "440233": "新丰县",
-    "440281": "乐昌市",
-    "440282": "南雄市",
-    "440303": "罗湖区",
-    "440304": "福田区",
-    "440305": "南山区",
-    "440306": "宝安区",
-    "440307": "龙岗区",
-    "440308": "盐田区",
-    "440402": "香洲区",
-    "440403": "斗门区",
-    "440404": "金湾区",
-    "440507": "龙湖区",
-    "440511": "金平区",
-    "440512": "濠江区",
-    "440513": "潮阳区",
-    "440514": "潮南区",
-    "440515": "澄海区",
-    "440523": "南澳县",
-    "440604": "禅城区",
-    "440605": "南海区",
-    "440606": "顺德区",
-    "440607": "三水区",
-    "440608": "高明区",
-    "440703": "蓬江区",
-    "440704": "江海区",
-    "440705": "新会区",
-    "440781": "台山市",
-    "440783": "开平市",
-    "440784": "鹤山市",
-    "440785": "恩平市",
-    "440802": "赤坎区",
-    "440803": "霞山区",
-    "440804": "坡头区",
-    "440811": "麻章区",
-    "440823": "遂溪县",
-    "440825": "徐闻县",
-    "440881": "廉江市",
-    "440882": "雷州市",
-    "440883": "吴川市",
-    "440902": "茂南区",
-    "440904": "电白区",
-    "440981": "高州市",
-    "440982": "化州市",
-    "440983": "信宜市",
-    "441202": "端州区",
-    "441203": "鼎湖区",
-    "441204": "高要区",
-    "441223": "广宁县",
-    "441224": "怀集县",
-    "441225": "封开县",
-    "441226": "德庆县",
-    "441284": "四会市",
-    "441302": "惠城区",
-    "441303": "惠阳区",
-    "441322": "博罗县",
-    "441323": "惠东县",
-    "441324": "龙门县",
-    "441402": "梅江区",
-    "441403": "梅县区",
-    "441422": "大埔县",
-    "441423": "丰顺县",
-    "441424": "五华县",
-    "441426": "平远县",
-    "441427": "蕉岭县",
-    "441481": "兴宁市",
-    "441502": "城区",
-    "441521": "海丰县",
-    "441523": "陆河县",
-    "441581": "陆丰市",
-    "441602": "源城区",
-    "441621": "紫金县",
-    "441622": "龙川县",
-    "441623": "连平县",
-    "441624": "和平县",
-    "441625": "东源县",
-    "441702": "江城区",
-    "441704": "阳东区",
-    "441721": "阳西县",
-    "441781": "阳春市",
-    "441802": "清城区",
-    "441803": "清新区",
-    "441821": "佛冈县",
-    "441823": "阳山县",
-    "441825": "连山壮族瑶族自治县",
-    "441826": "连南瑶族自治县",
-    "441881": "英德市",
-    "441882": "连州市",
-    "441900": "东莞市",
-    "442000": "中山市",
-    "445102": "湘桥区",
-    "445103": "潮安区",
-    "445122": "饶平县",
-    "445202": "榕城区",
-    "445203": "揭东区",
-    "445222": "揭西县",
-    "445224": "惠来县",
-    "445281": "普宁市",
-    "445302": "云城区",
-    "445303": "云安区",
-    "445321": "新兴县",
-    "445322": "郁南县",
-    "445381": "罗定市",
-    "450102": "兴宁区",
-    "450103": "青秀区",
-    "450105": "江南区",
-    "450107": "西乡塘区",
-    "450108": "良庆区",
-    "450109": "邕宁区",
-    "450110": "武鸣区",
-    "450123": "隆安县",
-    "450124": "马山县",
-    "450125": "上林县",
-    "450126": "宾阳县",
-    "450127": "横县",
-    "450202": "城中区",
-    "450203": "鱼峰区",
-    "450204": "柳南区",
-    "450205": "柳北区",
-    "450206": "柳江区",
-    "450222": "柳城县",
-    "450223": "鹿寨县",
-    "450224": "融安县",
-    "450225": "融水苗族自治县",
-    "450226": "三江侗族自治县",
-    "450302": "秀峰区",
-    "450303": "叠彩区",
-    "450304": "象山区",
-    "450305": "七星区",
-    "450311": "雁山区",
-    "450312": "临桂区",
-    "450321": "阳朔县",
-    "450323": "灵川县",
-    "450324": "全州县",
-    "450325": "兴安县",
-    "450326": "永福县",
-    "450327": "灌阳县",
-    "450328": "龙胜各族自治县",
-    "450329": "资源县",
-    "450330": "平乐县",
-    "450331": "荔浦县",
-    "450332": "恭城瑶族自治县",
-    "450403": "万秀区",
-    "450405": "长洲区",
-    "450406": "龙圩区",
-    "450421": "苍梧县",
-    "450422": "藤县",
-    "450423": "蒙山县",
-    "450481": "岑溪市",
-    "450502": "海城区",
-    "450503": "银海区",
-    "450512": "铁山港区",
-    "450521": "合浦县",
-    "450602": "港口区",
-    "450603": "防城区",
-    "450621": "上思县",
-    "450681": "东兴市",
-    "450702": "钦南区",
-    "450703": "钦北区",
-    "450721": "灵山县",
-    "450722": "浦北县",
-    "450802": "港北区",
-    "450803": "港南区",
-    "450804": "覃塘区",
-    "450821": "平南县",
-    "450881": "桂平市",
-    "450902": "玉州区",
-    "450903": "福绵区",
-    "450921": "容县",
-    "450922": "陆川县",
-    "450923": "博白县",
-    "450924": "兴业县",
-    "450981": "北流市",
-    "451002": "右江区",
-    "451021": "田阳县",
-    "451022": "田东县",
-    "451023": "平果县",
-    "451024": "德保县",
-    "451026": "那坡县",
-    "451027": "凌云县",
-    "451028": "乐业县",
-    "451029": "田林县",
-    "451030": "西林县",
-    "451031": "隆林各族自治县",
-    "451081": "靖西市",
-    "451102": "八步区",
-    "451103": "平桂区",
-    "451121": "昭平县",
-    "451122": "钟山县",
-    "451123": "富川瑶族自治县",
-    "451202": "金城江区",
-    "451221": "南丹县",
-    "451222": "天峨县",
-    "451223": "凤山县",
-    "451224": "东兰县",
-    "451225": "罗城仫佬族自治县",
-    "451226": "环江毛南族自治县",
-    "451227": "巴马瑶族自治县",
-    "451228": "都安瑶族自治县",
-    "451229": "大化瑶族自治县",
-    "451281": "宜州市",
-    "451302": "兴宾区",
-    "451321": "忻城县",
-    "451322": "象州县",
-    "451323": "武宣县",
-    "451324": "金秀瑶族自治县",
-    "451381": "合山市",
-    "451402": "江州区",
-    "451421": "扶绥县",
-    "451422": "宁明县",
-    "451423": "龙州县",
-    "451424": "大新县",
-    "451425": "天等县",
-    "451481": "凭祥市",
-    "460105": "秀英区",
-    "460106": "龙华区",
-    "460107": "琼山区",
-    "460108": "美兰区",
-    "460201": "市辖区",
-    "460202": "海棠区",
-    "460203": "吉阳区",
-    "460204": "天涯区",
-    "460205": "崖州区",
-    "460321": "西沙群岛",
-    "460322": "南沙群岛",
-    "460323": "中沙群岛的岛礁及其海域",
-    "460400": "儋州市",
-    "469001": "五指山市",
-    "469002": "琼海市",
-    "469005": "文昌市",
-    "469006": "万宁市",
-    "469007": "东方市",
-    "469021": "定安县",
-    "469022": "屯昌县",
-    "469023": "澄迈县",
-    "469024": "临高县",
-    "469025": "白沙黎族自治县",
-    "469026": "昌江黎族自治县",
-    "469027": "乐东黎族自治县",
-    "469028": "陵水黎族自治县",
-    "469029": "保亭黎族苗族自治县",
-    "469030": "琼中黎族苗族自治县",
-    "500101": "万州区",
-    "500102": "涪陵区",
-    "500103": "渝中区",
-    "500104": "大渡口区",
-    "500105": "江北区",
-    "500106": "沙坪坝区",
-    "500107": "九龙坡区",
-    "500108": "南岸区",
-    "500109": "北碚区",
-    "500110": "綦江区",
-    "500111": "大足区",
-    "500112": "渝北区",
-    "500113": "巴南区",
-    "500114": "黔江区",
-    "500115": "长寿区",
-    "500116": "江津区",
-    "500117": "合川区",
-    "500118": "永川区",
-    "500119": "南川区",
-    "500120": "璧山区",
-    "500151": "铜梁区",
-    "500152": "潼南区",
-    "500153": "荣昌区",
-    "500154": "开州区",
-    "500228": "梁平县",
-    "500229": "城口县",
-    "500230": "丰都县",
-    "500231": "垫江县",
-    "500232": "武隆县",
-    "500233": "忠县",
-    "500235": "云阳县",
-    "500236": "奉节县",
-    "500237": "巫山县",
-    "500238": "巫溪县",
-    "500240": "石柱土家族自治县",
-    "500241": "秀山土家族苗族自治县",
-    "500242": "酉阳土家族苗族自治县",
-    "500243": "彭水苗族土家族自治县",
-    "510104": "锦江区",
-    "510105": "青羊区",
-    "510106": "金牛区",
-    "510107": "武侯区",
-    "510108": "成华区",
-    "510112": "龙泉驿区",
-    "510113": "青白江区",
-    "510114": "新都区",
-    "510115": "温江区",
-    "510116": "双流区",
-    "510121": "金堂县",
-    "510124": "郫县",
-    "510129": "大邑县",
-    "510131": "蒲江县",
-    "510132": "新津县",
-    "510181": "都江堰市",
-    "510182": "彭州市",
-    "510183": "邛崃市",
-    "510184": "崇州市",
-    "510185": "简阳市",
-    "510302": "自流井区",
-    "510303": "贡井区",
-    "510304": "大安区",
-    "510311": "沿滩区",
-    "510321": "荣县",
-    "510322": "富顺县",
-    "510402": "东区",
-    "510403": "西区",
-    "510411": "仁和区",
-    "510421": "米易县",
-    "510422": "盐边县",
-    "510502": "江阳区",
-    "510503": "纳溪区",
-    "510504": "龙马潭区",
-    "510521": "泸县",
-    "510522": "合江县",
-    "510524": "叙永县",
-    "510525": "古蔺县",
-    "510603": "旌阳区",
-    "510623": "中江县",
-    "510626": "罗江县",
-    "510681": "广汉市",
-    "510682": "什邡市",
-    "510683": "绵竹市",
-    "510703": "涪城区",
-    "510704": "游仙区",
-    "510705": "安州区",
-    "510722": "三台县",
-    "510723": "盐亭县",
-    "510725": "梓潼县",
-    "510726": "北川羌族自治县",
-    "510727": "平武县",
-    "510781": "江油市",
-    "510802": "利州区",
-    "510811": "昭化区",
-    "510812": "朝天区",
-    "510821": "旺苍县",
-    "510822": "青川县",
-    "510823": "剑阁县",
-    "510824": "苍溪县",
-    "510903": "船山区",
-    "510904": "安居区",
-    "510921": "蓬溪县",
-    "510922": "射洪县",
-    "510923": "大英县",
-    "511002": "市中区",
-    "511011": "东兴区",
-    "511024": "威远县",
-    "511025": "资中县",
-    "511028": "隆昌县",
-    "511102": "市中区",
-    "511111": "沙湾区",
-    "511112": "五通桥区",
-    "511113": "金口河区",
-    "511123": "犍为县",
-    "511124": "井研县",
-    "511126": "夹江县",
-    "511129": "沐川县",
-    "511132": "峨边彝族自治县",
-    "511133": "马边彝族自治县",
-    "511181": "峨眉山市",
-    "511302": "顺庆区",
-    "511303": "高坪区",
-    "511304": "嘉陵区",
-    "511321": "南部县",
-    "511322": "营山县",
-    "511323": "蓬安县",
-    "511324": "仪陇县",
-    "511325": "西充县",
-    "511381": "阆中市",
-    "511402": "东坡区",
-    "511403": "彭山区",
-    "511421": "仁寿县",
-    "511423": "洪雅县",
-    "511424": "丹棱县",
-    "511425": "青神县",
-    "511502": "翠屏区",
-    "511503": "南溪区",
-    "511521": "宜宾县",
-    "511523": "江安县",
-    "511524": "长宁县",
-    "511525": "高县",
-    "511526": "珙县",
-    "511527": "筠连县",
-    "511528": "兴文县",
-    "511529": "屏山县",
-    "511602": "广安区",
-    "511603": "前锋区",
-    "511621": "岳池县",
-    "511622": "武胜县",
-    "511623": "邻水县",
-    "511681": "华蓥市",
-    "511702": "通川区",
-    "511703": "达川区",
-    "511722": "宣汉县",
-    "511723": "开江县",
-    "511724": "大竹县",
-    "511725": "渠县",
-    "511781": "万源市",
-    "511802": "雨城区",
-    "511803": "名山区",
-    "511822": "荥经县",
-    "511823": "汉源县",
-    "511824": "石棉县",
-    "511825": "天全县",
-    "511826": "芦山县",
-    "511827": "宝兴县",
-    "511902": "巴州区",
-    "511903": "恩阳区",
-    "511921": "通江县",
-    "511922": "南江县",
-    "511923": "平昌县",
-    "512002": "雁江区",
-    "512021": "安岳县",
-    "512022": "乐至县",
-    "513201": "马尔康市",
-    "513221": "汶川县",
-    "513222": "理县",
-    "513223": "茂县",
-    "513224": "松潘县",
-    "513225": "九寨沟县",
-    "513226": "金川县",
-    "513227": "小金县",
-    "513228": "黑水县",
-    "513230": "壤塘县",
-    "513231": "阿坝县",
-    "513232": "若尔盖县",
-    "513233": "红原县",
-    "513301": "康定市",
-    "513322": "泸定县",
-    "513323": "丹巴县",
-    "513324": "九龙县",
-    "513325": "雅江县",
-    "513326": "道孚县",
-    "513327": "炉霍县",
-    "513328": "甘孜县",
-    "513329": "新龙县",
-    "513330": "德格县",
-    "513331": "白玉县",
-    "513332": "石渠县",
-    "513333": "色达县",
-    "513334": "理塘县",
-    "513335": "巴塘县",
-    "513336": "乡城县",
-    "513337": "稻城县",
-    "513338": "得荣县",
-    "513401": "西昌市",
-    "513422": "木里藏族自治县",
-    "513423": "盐源县",
-    "513424": "德昌县",
-    "513425": "会理县",
-    "513426": "会东县",
-    "513427": "宁南县",
-    "513428": "普格县",
-    "513429": "布拖县",
-    "513430": "金阳县",
-    "513431": "昭觉县",
-    "513432": "喜德县",
-    "513433": "冕宁县",
-    "513434": "越西县",
-    "513435": "甘洛县",
-    "513436": "美姑县",
-    "513437": "雷波县",
-    "520102": "南明区",
-    "520103": "云岩区",
-    "520111": "花溪区",
-    "520112": "乌当区",
-    "520113": "白云区",
-    "520115": "观山湖区",
-    "520121": "开阳县",
-    "520122": "息烽县",
-    "520123": "修文县",
-    "520181": "清镇市",
-    "520201": "钟山区",
-    "520203": "六枝特区",
-    "520221": "水城县",
-    "520222": "盘县",
-    "520302": "红花岗区",
-    "520303": "汇川区",
-    "520304": "播州区",
-    "520322": "桐梓县",
-    "520323": "绥阳县",
-    "520324": "正安县",
-    "520325": "道真仡佬族苗族自治县",
-    "520326": "务川仡佬族苗族自治县",
-    "520327": "凤冈县",
-    "520328": "湄潭县",
-    "520329": "余庆县",
-    "520330": "习水县",
-    "520381": "赤水市",
-    "520382": "仁怀市",
-    "520402": "西秀区",
-    "520403": "平坝区",
-    "520422": "普定县",
-    "520423": "镇宁布依族苗族自治县",
-    "520424": "关岭布依族苗族自治县",
-    "520425": "紫云苗族布依族自治县",
-    "520502": "七星关区",
-    "520521": "大方县",
-    "520522": "黔西县",
-    "520523": "金沙县",
-    "520524": "织金县",
-    "520525": "纳雍县",
-    "520526": "威宁彝族回族苗族自治县",
-    "520527": "赫章县",
-    "520602": "碧江区",
-    "520603": "万山区",
-    "520621": "江口县",
-    "520622": "玉屏侗族自治县",
-    "520623": "石阡县",
-    "520624": "思南县",
-    "520625": "印江土家族苗族自治县",
-    "520626": "德江县",
-    "520627": "沿河土家族自治县",
-    "520628": "松桃苗族自治县",
-    "522301": "兴义市",
-    "522322": "兴仁县",
-    "522323": "普安县",
-    "522324": "晴隆县",
-    "522325": "贞丰县",
-    "522326": "望谟县",
-    "522327": "册亨县",
-    "522328": "安龙县",
-    "522601": "凯里市",
-    "522622": "黄平县",
-    "522623": "施秉县",
-    "522624": "三穗县",
-    "522625": "镇远县",
-    "522626": "岑巩县",
-    "522627": "天柱县",
-    "522628": "锦屏县",
-    "522629": "剑河县",
-    "522630": "台江县",
-    "522631": "黎平县",
-    "522632": "榕江县",
-    "522633": "从江县",
-    "522634": "雷山县",
-    "522635": "麻江县",
-    "522636": "丹寨县",
-    "522701": "都匀市",
-    "522702": "福泉市",
-    "522722": "荔波县",
-    "522723": "贵定县",
-    "522725": "瓮安县",
-    "522726": "独山县",
-    "522727": "平塘县",
-    "522728": "罗甸县",
-    "522729": "长顺县",
-    "522730": "龙里县",
-    "522731": "惠水县",
-    "522732": "三都水族自治县",
-    "530102": "五华区",
-    "530103": "盘龙区",
-    "530111": "官渡区",
-    "530112": "西山区",
-    "530113": "东川区",
-    "530114": "呈贡区",
-    "530122": "晋宁县",
-    "530124": "富民县",
-    "530125": "宜良县",
-    "530126": "石林彝族自治县",
-    "530127": "嵩明县",
-    "530128": "禄劝彝族苗族自治县",
-    "530129": "寻甸回族彝族自治县",
-    "530181": "安宁市",
-    "530302": "麒麟区",
-    "530303": "沾益区",
-    "530321": "马龙县",
-    "530322": "陆良县",
-    "530323": "师宗县",
-    "530324": "罗平县",
-    "530325": "富源县",
-    "530326": "会泽县",
-    "530381": "宣威市",
-    "530402": "红塔区",
-    "530403": "江川区",
-    "530422": "澄江县",
-    "530423": "通海县",
-    "530424": "华宁县",
-    "530425": "易门县",
-    "530426": "峨山彝族自治县",
-    "530427": "新平彝族傣族自治县",
-    "530428": "元江哈尼族彝族傣族自治县",
-    "530502": "隆阳区",
-    "530521": "施甸县",
-    "530523": "龙陵县",
-    "530524": "昌宁县",
-    "530581": "腾冲市",
-    "530602": "昭阳区",
-    "530621": "鲁甸县",
-    "530622": "巧家县",
-    "530623": "盐津县",
-    "530624": "大关县",
-    "530625": "永善县",
-    "530626": "绥江县",
-    "530627": "镇雄县",
-    "530628": "彝良县",
-    "530629": "威信县",
-    "530630": "水富县",
-    "530702": "古城区",
-    "530721": "玉龙纳西族自治县",
-    "530722": "永胜县",
-    "530723": "华坪县",
-    "530724": "宁蒗彝族自治县",
-    "530802": "思茅区",
-    "530821": "宁洱哈尼族彝族自治县",
-    "530822": "墨江哈尼族自治县",
-    "530823": "景东彝族自治县",
-    "530824": "景谷傣族彝族自治县",
-    "530825": "镇沅彝族哈尼族拉祜族自治县",
-    "530826": "江城哈尼族彝族自治县",
-    "530827": "孟连傣族拉祜族佤族自治县",
-    "530828": "澜沧拉祜族自治县",
-    "530829": "西盟佤族自治县",
-    "530902": "临翔区",
-    "530921": "凤庆县",
-    "530922": "云县",
-    "530923": "永德县",
-    "530924": "镇康县",
-    "530925": "双江拉祜族佤族布朗族傣族自治县",
-    "530926": "耿马傣族佤族自治县",
-    "530927": "沧源佤族自治县",
-    "532301": "楚雄市",
-    "532322": "双柏县",
-    "532323": "牟定县",
-    "532324": "南华县",
-    "532325": "姚安县",
-    "532326": "大姚县",
-    "532327": "永仁县",
-    "532328": "元谋县",
-    "532329": "武定县",
-    "532331": "禄丰县",
-    "532501": "个旧市",
-    "532502": "开远市",
-    "532503": "蒙自市",
-    "532504": "弥勒市",
-    "532523": "屏边苗族自治县",
-    "532524": "建水县",
-    "532525": "石屏县",
-    "532527": "泸西县",
-    "532528": "元阳县",
-    "532529": "红河县",
-    "532530": "金平苗族瑶族傣族自治县",
-    "532531": "绿春县",
-    "532532": "河口瑶族自治县",
-    "532601": "文山市",
-    "532622": "砚山县",
-    "532623": "西畴县",
-    "532624": "麻栗坡县",
-    "532625": "马关县",
-    "532626": "丘北县",
-    "532627": "广南县",
-    "532628": "富宁县",
-    "532801": "景洪市",
-    "532822": "勐海县",
-    "532823": "勐腊县",
-    "532901": "大理市",
-    "532922": "漾濞彝族自治县",
-    "532923": "祥云县",
-    "532924": "宾川县",
-    "532925": "弥渡县",
-    "532926": "南涧彝族自治县",
-    "532927": "巍山彝族回族自治县",
-    "532928": "永平县",
-    "532929": "云龙县",
-    "532930": "洱源县",
-    "532931": "剑川县",
-    "532932": "鹤庆县",
-    "533102": "瑞丽市",
-    "533103": "芒市",
-    "533122": "梁河县",
-    "533123": "盈江县",
-    "533124": "陇川县",
-    "533301": "泸水市",
-    "533323": "福贡县",
-    "533324": "贡山独龙族怒族自治县",
-    "533325": "兰坪白族普米族自治县",
-    "533401": "香格里拉市",
-    "533422": "德钦县",
-    "533423": "维西傈僳族自治县",
-    "540102": "城关区",
-    "540103": "堆龙德庆区",
-    "540121": "林周县",
-    "540122": "当雄县",
-    "540123": "尼木县",
-    "540124": "曲水县",
-    "540126": "达孜县",
-    "540127": "墨竹工卡县",
-    "540202": "桑珠孜区",
-    "540221": "南木林县",
-    "540222": "江孜县",
-    "540223": "定日县",
-    "540224": "萨迦县",
-    "540225": "拉孜县",
-    "540226": "昂仁县",
-    "540227": "谢通门县",
-    "540228": "白朗县",
-    "540229": "仁布县",
-    "540230": "康马县",
-    "540231": "定结县",
-    "540232": "仲巴县",
-    "540233": "亚东县",
-    "540234": "吉隆县",
-    "540235": "聂拉木县",
-    "540236": "萨嘎县",
-    "540237": "岗巴县",
-    "540302": "卡若区",
-    "540321": "江达县",
-    "540322": "贡觉县",
-    "540323": "类乌齐县",
-    "540324": "丁青县",
-    "540325": "察雅县",
-    "540326": "八宿县",
-    "540327": "左贡县",
-    "540328": "芒康县",
-    "540329": "洛隆县",
-    "540330": "边坝县",
-    "540402": "巴宜区",
-    "540421": "工布江达县",
-    "540422": "米林县",
-    "540423": "墨脱县",
-    "540424": "波密县",
-    "540425": "察隅县",
-    "540426": "朗县",
-    "540502": "乃东区",
-    "540521": "扎囊县",
-    "540522": "贡嘎县",
-    "540523": "桑日县",
-    "540524": "琼结县",
-    "540525": "曲松县",
-    "540526": "措美县",
-    "540527": "洛扎县",
-    "540528": "加查县",
-    "540529": "隆子县",
-    "540530": "错那县",
-    "540531": "浪卡子县",
-    "542421": "那曲县",
-    "542422": "嘉黎县",
-    "542423": "比如县",
-    "542424": "聂荣县",
-    "542425": "安多县",
-    "542426": "申扎县",
-    "542427": "索县",
-    "542428": "班戈县",
-    "542429": "巴青县",
-    "542430": "尼玛县",
-    "542431": "双湖县",
-    "542521": "普兰县",
-    "542522": "札达县",
-    "542523": "噶尔县",
-    "542524": "日土县",
-    "542525": "革吉县",
-    "542526": "改则县",
-    "542527": "措勤县",
-    "610102": "新城区",
-    "610103": "碑林区",
-    "610104": "莲湖区",
-    "610111": "灞桥区",
-    "610112": "未央区",
-    "610113": "雁塔区",
-    "610114": "阎良区",
-    "610115": "临潼区",
-    "610116": "长安区",
-    "610117": "高陵区",
-    "610122": "蓝田县",
-    "610124": "周至县",
-    "610125": "户县",
-    "610202": "王益区",
-    "610203": "印台区",
-    "610204": "耀州区",
-    "610222": "宜君县",
-    "610302": "渭滨区",
-    "610303": "金台区",
-    "610304": "陈仓区",
-    "610322": "凤翔县",
-    "610323": "岐山县",
-    "610324": "扶风县",
-    "610326": "眉县",
-    "610327": "陇县",
-    "610328": "千阳县",
-    "610329": "麟游县",
-    "610330": "凤县",
-    "610331": "太白县",
-    "610402": "秦都区",
-    "610403": "杨陵区",
-    "610404": "渭城区",
-    "610422": "三原县",
-    "610423": "泾阳县",
-    "610424": "乾县",
-    "610425": "礼泉县",
-    "610426": "永寿县",
-    "610427": "彬县",
-    "610428": "长武县",
-    "610429": "旬邑县",
-    "610430": "淳化县",
-    "610431": "武功县",
-    "610481": "兴平市",
-    "610502": "临渭区",
-    "610503": "华州区",
-    "610522": "潼关县",
-    "610523": "大荔县",
-    "610524": "合阳县",
-    "610525": "澄城县",
-    "610526": "蒲城县",
-    "610527": "白水县",
-    "610528": "富平县",
-    "610581": "韩城市",
-    "610582": "华阴市",
-    "610602": "宝塔区",
-    "610603": "安塞区",
-    "610621": "延长县",
-    "610622": "延川县",
-    "610623": "子长县",
-    "610625": "志丹县",
-    "610626": "吴起县",
-    "610627": "甘泉县",
-    "610628": "富县",
-    "610629": "洛川县",
-    "610630": "宜川县",
-    "610631": "黄龙县",
-    "610632": "黄陵县",
-    "610702": "汉台区",
-    "610721": "南郑县",
-    "610722": "城固县",
-    "610723": "洋县",
-    "610724": "西乡县",
-    "610725": "勉县",
-    "610726": "宁强县",
-    "610727": "略阳县",
-    "610728": "镇巴县",
-    "610729": "留坝县",
-    "610730": "佛坪县",
-    "610802": "榆阳区",
-    "610803": "横山区",
-    "610821": "神木县",
-    "610822": "府谷县",
-    "610824": "靖边县",
-    "610825": "定边县",
-    "610826": "绥德县",
-    "610827": "米脂县",
-    "610828": "佳县",
-    "610829": "吴堡县",
-    "610830": "清涧县",
-    "610831": "子洲县",
-    "610902": "汉滨区",
-    "610921": "汉阴县",
-    "610922": "石泉县",
-    "610923": "宁陕县",
-    "610924": "紫阳县",
-    "610925": "岚皋县",
-    "610926": "平利县",
-    "610927": "镇坪县",
-    "610928": "旬阳县",
-    "610929": "白河县",
-    "611002": "商州区",
-    "611021": "洛南县",
-    "611022": "丹凤县",
-    "611023": "商南县",
-    "611024": "山阳县",
-    "611025": "镇安县",
-    "611026": "柞水县",
-    "620102": "城关区",
-    "620103": "七里河区",
-    "620104": "西固区",
-    "620105": "安宁区",
-    "620111": "红古区",
-    "620121": "永登县",
-    "620122": "皋兰县",
-    "620123": "榆中县",
-    "620201": "嘉峪关市",
-    "620302": "金川区",
-    "620321": "永昌县",
-    "620402": "白银区",
-    "620403": "平川区",
-    "620421": "靖远县",
-    "620422": "会宁县",
-    "620423": "景泰县",
-    "620502": "秦州区",
-    "620503": "麦积区",
-    "620521": "清水县",
-    "620522": "秦安县",
-    "620523": "甘谷县",
-    "620524": "武山县",
-    "620525": "张家川回族自治县",
-    "620602": "凉州区",
-    "620621": "民勤县",
-    "620622": "古浪县",
-    "620623": "天祝藏族自治县",
-    "620702": "甘州区",
-    "620721": "肃南裕固族自治县",
-    "620722": "民乐县",
-    "620723": "临泽县",
-    "620724": "高台县",
-    "620725": "山丹县",
-    "620802": "崆峒区",
-    "620821": "泾川县",
-    "620822": "灵台县",
-    "620823": "崇信县",
-    "620824": "华亭县",
-    "620825": "庄浪县",
-    "620826": "静宁县",
-    "620902": "肃州区",
-    "620921": "金塔县",
-    "620922": "瓜州县",
-    "620923": "肃北蒙古族自治县",
-    "620924": "阿克塞哈萨克族自治县",
-    "620981": "玉门市",
-    "620982": "敦煌市",
-    "621002": "西峰区",
-    "621021": "庆城县",
-    "621022": "环县",
-    "621023": "华池县",
-    "621024": "合水县",
-    "621025": "正宁县",
-    "621026": "宁县",
-    "621027": "镇原县",
-    "621102": "安定区",
-    "621121": "通渭县",
-    "621122": "陇西县",
-    "621123": "渭源县",
-    "621124": "临洮县",
-    "621125": "漳县",
-    "621126": "岷县",
-    "621202": "武都区",
-    "621221": "成县",
-    "621222": "文县",
-    "621223": "宕昌县",
-    "621224": "康县",
-    "621225": "西和县",
-    "621226": "礼县",
-    "621227": "徽县",
-    "621228": "两当县",
-    "622901": "临夏市",
-    "622921": "临夏县",
-    "622922": "康乐县",
-    "622923": "永靖县",
-    "622924": "广河县",
-    "622925": "和政县",
-    "622926": "东乡族自治县",
-    "622927": "积石山保安族东乡族撒拉族自治县",
-    "623001": "合作市",
-    "623021": "临潭县",
-    "623022": "卓尼县",
-    "623023": "舟曲县",
-    "623024": "迭部县",
-    "623025": "玛曲县",
-    "623026": "碌曲县",
-    "623027": "夏河县",
-    "630102": "城东区",
-    "630103": "城中区",
-    "630104": "城西区",
-    "630105": "城北区",
-    "630121": "大通回族土族自治县",
-    "630122": "湟中县",
-    "630123": "湟源县",
-    "630202": "乐都区",
-    "630203": "平安区",
-    "630222": "民和回族土族自治县",
-    "630223": "互助土族自治县",
-    "630224": "化隆回族自治县",
-    "630225": "循化撒拉族自治县",
-    "632221": "门源回族自治县",
-    "632222": "祁连县",
-    "632223": "海晏县",
-    "632224": "刚察县",
-    "632321": "同仁县",
-    "632322": "尖扎县",
-    "632323": "泽库县",
-    "632324": "河南蒙古族自治县",
-    "632521": "共和县",
-    "632522": "同德县",
-    "632523": "贵德县",
-    "632524": "兴海县",
-    "632525": "贵南县",
-    "632621": "玛沁县",
-    "632622": "班玛县",
-    "632623": "甘德县",
-    "632624": "达日县",
-    "632625": "久治县",
-    "632626": "玛多县",
-    "632701": "玉树市",
-    "632722": "杂多县",
-    "632723": "称多县",
-    "632724": "治多县",
-    "632725": "囊谦县",
-    "632726": "曲麻莱县",
-    "632801": "格尔木市",
-    "632802": "德令哈市",
-    "632821": "乌兰县",
-    "632822": "都兰县",
-    "632823": "天峻县",
-    "640104": "兴庆区",
-    "640105": "西夏区",
-    "640106": "金凤区",
-    "640121": "永宁县",
-    "640122": "贺兰县",
-    "640181": "灵武市",
-    "640202": "大武口区",
-    "640205": "惠农区",
-    "640221": "平罗县",
-    "640302": "利通区",
-    "640303": "红寺堡区",
-    "640323": "盐池县",
-    "640324": "同心县",
-    "640381": "青铜峡市",
-    "640402": "原州区",
-    "640422": "西吉县",
-    "640423": "隆德县",
-    "640424": "泾源县",
-    "640425": "彭阳县",
-    "640502": "沙坡头区",
-    "640521": "中宁县",
-    "640522": "海原县",
-    "650102": "天山区",
-    "650103": "沙依巴克区",
-    "650104": "新市区",
-    "650105": "水磨沟区",
-    "650106": "头屯河区",
-    "650107": "达坂城区",
-    "650109": "米东区",
-    "650121": "乌鲁木齐县",
-    "650202": "独山子区",
-    "650203": "克拉玛依区",
-    "650204": "白碱滩区",
-    "650205": "乌尔禾区",
-    "650402": "高昌区",
-    "650421": "鄯善县",
-    "650422": "托克逊县",
-    "650502": "伊州区",
-    "650521": "巴里坤哈萨克自治县",
-    "650522": "伊吾县",
-    "652301": "昌吉市",
-    "652302": "阜康市",
-    "652323": "呼图壁县",
-    "652324": "玛纳斯县",
-    "652325": "奇台县",
-    "652327": "吉木萨尔县",
-    "652328": "木垒哈萨克自治县",
-    "652701": "博乐市",
-    "652702": "阿拉山口市",
-    "652722": "精河县",
-    "652723": "温泉县",
-    "652801": "库尔勒市",
-    "652822": "轮台县",
-    "652823": "尉犁县",
-    "652824": "若羌县",
-    "652825": "且末县",
-    "652826": "焉耆回族自治县",
-    "652827": "和静县",
-    "652828": "和硕县",
-    "652829": "博湖县",
-    "652901": "阿克苏市",
-    "652922": "温宿县",
-    "652923": "库车县",
-    "652924": "沙雅县",
-    "652925": "新和县",
-    "652926": "拜城县",
-    "652927": "乌什县",
-    "652928": "阿瓦提县",
-    "652929": "柯坪县",
-    "653001": "阿图什市",
-    "653022": "阿克陶县",
-    "653023": "阿合奇县",
-    "653024": "乌恰县",
-    "653101": "喀什市",
-    "653121": "疏附县",
-    "653122": "疏勒县",
-    "653123": "英吉沙县",
-    "653124": "泽普县",
-    "653125": "莎车县",
-    "653126": "叶城县",
-    "653127": "麦盖提县",
-    "653128": "岳普湖县",
-    "653129": "伽师县",
-    "653130": "巴楚县",
-    "653131": "塔什库尔干塔吉克自治县",
-    "653201": "和田市",
-    "653221": "和田县",
-    "653222": "墨玉县",
-    "653223": "皮山县",
-    "653224": "洛浦县",
-    "653225": "策勒县",
-    "653226": "于田县",
-    "653227": "民丰县",
-    "654002": "伊宁市",
-    "654003": "奎屯市",
-    "654004": "霍尔果斯市",
-    "654021": "伊宁县",
-    "654022": "察布查尔锡伯自治县",
-    "654023": "霍城县",
-    "654024": "巩留县",
-    "654025": "新源县",
-    "654026": "昭苏县",
-    "654027": "特克斯县",
-    "654028": "尼勒克县",
-    "654201": "塔城市",
-    "654202": "乌苏市",
-    "654221": "额敏县",
-    "654223": "沙湾县",
-    "654224": "托里县",
-    "654225": "裕民县",
-    "654226": "和布克赛尔蒙古自治县",
-    "654301": "阿勒泰市",
-    "654321": "布尔津县",
-    "654322": "富蕴县",
-    "654323": "福海县",
-    "654324": "哈巴河县",
-    "654325": "青河县",
-    "654326": "吉木乃县",
-    "659001": "石河子市",
-    "659002": "阿拉尔市",
-    "659003": "图木舒克市",
-    "659004": "五家渠市",
-    "659006": "铁门关市"
-  }
-}
-
-function getConfig(type) {
-  return (areaList && areaList[`${type}_list`]) || {};
-}
-
-function getList(type, code) {
-  let result = [];
-  if (type !== 'province' && !code) {
-    return result;
-  }
-
-  const list = getConfig(type);
-  result = Object.keys(list).map(code => ({
-    code,
-    name: list[code]
-  }));
-
-  if (code) {
-    // oversea code
-    if (code[0] === '9' && type === 'city') {
-      code = '9';
-    }
-
-    result = result.filter(item => item.code.indexOf(code) === 0);
-  }
-
-  return result;
-}
-
-// get index by code
-function getIndex(type, code) {
-  let compareNum = type === 'province' ? 2 : type === 'city' ? 4 : 6;
-  const list = getList(type, code.slice(0, compareNum - 2));
-
-  // oversea code
-  if (code[0] === '9' && type === 'province') {
-    compareNum = 1;
-  }
-
-  code = code.slice(0, compareNum);
-  for (let i = 0; i < list.length; i++) {
-    if (list[i].code.slice(0, compareNum) === code) {
-      return i;
-    }
-  }
-
-  return 0;
-}
-
-// 参考 https://github.com/youzan/vant-weapp/blob/dev/packages/area/index.ts
-// 定义数据出口
-module.exports = {
-  areaList: areaList,
-  getList: getList,
-  getIndex: getIndex
-}
\ No newline at end of file
+export const areaList = {
+    province_list: {
+		110000: "北京市",
+		120000: "天津市",
+		130000: "河北省",
+		140000: "山西省",
+		150000: "内蒙古自治区",
+		210000: "辽宁省",
+		220000: "吉林省",
+		230000: "黑龙江省",
+		310000: "上海市",
+		320000: "江苏省",
+		330000: "浙江省",
+		340000: "安徽省",
+		350000: "福建省",
+		360000: "江西省",
+		370000: "山东省",
+		410000: "河南省",
+		420000: "湖北省",
+		430000: "湖南省",
+		440000: "广东省",
+		450000: "广西壮族自治区",
+		460000: "海南省",
+		500000: "重庆市",
+		510000: "四川省",
+		520000: "贵州省",
+		530000: "云南省",
+		540000: "西藏自治区",
+		610000: "陕西省",
+		620000: "甘肃省",
+		630000: "青海省",
+		640000: "宁夏回族自治区",
+		650000: "新疆维吾尔自治区",
+		710000: "台湾省",
+		810000: "香港特别行政区",
+		820000: "澳门特别行政区",
+	},
+    city_list: {
+		110100: "北京市",
+		120100: "天津市",
+		130100: "石家庄市",
+		130200: "唐山市",
+		130300: "秦皇岛市",
+		130400: "邯郸市",
+		130500: "邢台市",
+		130600: "保定市",
+		130700: "张家口市",
+		130800: "承德市",
+		130900: "沧州市",
+		131000: "廊坊市",
+		131100: "衡水市",
+		140100: "太原市",
+		140200: "大同市",
+		140300: "阳泉市",
+		140400: "长治市",
+		140500: "晋城市",
+		140600: "朔州市",
+		140700: "晋中市",
+		140800: "运城市",
+		140900: "忻州市",
+		141000: "临汾市",
+		141100: "吕梁市",
+		150100: "呼和浩特市",
+		150200: "包头市",
+		150300: "乌海市",
+		150400: "赤峰市",
+		150500: "通辽市",
+		150600: "鄂尔多斯市",
+		150700: "呼伦贝尔市",
+		150800: "巴彦淖尔市",
+		150900: "乌兰察布市",
+		152200: "兴安盟",
+		152500: "锡林郭勒盟",
+		152900: "阿拉善盟",
+		210100: "沈阳市",
+		210200: "大连市",
+		210300: "鞍山市",
+		210400: "抚顺市",
+		210500: "本溪市",
+		210600: "丹东市",
+		210700: "锦州市",
+		210800: "营口市",
+		210900: "阜新市",
+		211000: "辽阳市",
+		211100: "盘锦市",
+		211200: "铁岭市",
+		211300: "朝阳市",
+		211400: "葫芦岛市",
+		220100: "长春市",
+		220200: "吉林市",
+		220300: "四平市",
+		220400: "辽源市",
+		220500: "通化市",
+		220600: "白山市",
+		220700: "松原市",
+		220800: "白城市",
+		222400: "延边朝鲜族自治州",
+		230100: "哈尔滨市",
+		230200: "齐齐哈尔市",
+		230300: "鸡西市",
+		230400: "鹤岗市",
+		230500: "双鸭山市",
+		230600: "大庆市",
+		230700: "伊春市",
+		230800: "佳木斯市",
+		230900: "七台河市",
+		231000: "牡丹江市",
+		231100: "黑河市",
+		231200: "绥化市",
+		232700: "大兴安岭地区",
+		310100: "上海市",
+		320100: "南京市",
+		320200: "无锡市",
+		320300: "徐州市",
+		320400: "常州市",
+		320500: "苏州市",
+		320600: "南通市",
+		320700: "连云港市",
+		320800: "淮安市",
+		320900: "盐城市",
+		321000: "扬州市",
+		321100: "镇江市",
+		321200: "泰州市",
+		321300: "宿迁市",
+		330100: "杭州市",
+		330200: "宁波市",
+		330300: "温州市",
+		330400: "嘉兴市",
+		330500: "湖州市",
+		330600: "绍兴市",
+		330700: "金华市",
+		330800: "衢州市",
+		330900: "舟山市",
+		331000: "台州市",
+		331100: "丽水市",
+		340100: "合肥市",
+		340200: "芜湖市",
+		340300: "蚌埠市",
+		340400: "淮南市",
+		340500: "马鞍山市",
+		340600: "淮北市",
+		340700: "铜陵市",
+		340800: "安庆市",
+		341000: "黄山市",
+		341100: "滁州市",
+		341200: "阜阳市",
+		341300: "宿州市",
+		341500: "六安市",
+		341600: "亳州市",
+		341700: "池州市",
+		341800: "宣城市",
+		350100: "福州市",
+		350200: "厦门市",
+		350300: "莆田市",
+		350400: "三明市",
+		350500: "泉州市",
+		350600: "漳州市",
+		350700: "南平市",
+		350800: "龙岩市",
+		350900: "宁德市",
+		360100: "南昌市",
+		360200: "景德镇市",
+		360300: "萍乡市",
+		360400: "九江市",
+		360500: "新余市",
+		360600: "鹰潭市",
+		360700: "赣州市",
+		360800: "吉安市",
+		360900: "宜春市",
+		361000: "抚州市",
+		361100: "上饶市",
+		370100: "济南市",
+		370200: "青岛市",
+		370300: "淄博市",
+		370400: "枣庄市",
+		370500: "东营市",
+		370600: "烟台市",
+		370700: "潍坊市",
+		370800: "济宁市",
+		370900: "泰安市",
+		371000: "威海市",
+		371100: "日照市",
+		371300: "临沂市",
+		371400: "德州市",
+		371500: "聊城市",
+		371600: "滨州市",
+		371700: "菏泽市",
+		410100: "郑州市",
+		410200: "开封市",
+		410300: "洛阳市",
+		410400: "平顶山市",
+		410500: "安阳市",
+		410600: "鹤壁市",
+		410700: "新乡市",
+		410800: "焦作市",
+		410900: "濮阳市",
+		411000: "许昌市",
+		411100: "漯河市",
+		411200: "三门峡市",
+		411300: "南阳市",
+		411400: "商丘市",
+		411500: "信阳市",
+		411600: "周口市",
+		411700: "驻马店市",
+		419001: "济源市",
+		420100: "武汉市",
+		420200: "黄石市",
+		420300: "十堰市",
+		420500: "宜昌市",
+		420600: "襄阳市",
+		420700: "鄂州市",
+		420800: "荆门市",
+		420900: "孝感市",
+		421000: "荆州市",
+		421100: "黄冈市",
+		421200: "咸宁市",
+		421300: "随州市",
+		422800: "恩施土家族苗族自治州",
+		429004: "仙桃市",
+		429005: "潜江市",
+		429006: "天门市",
+		429021: "神农架林区",
+		430100: "长沙市",
+		430200: "株洲市",
+		430300: "湘潭市",
+		430400: "衡阳市",
+		430500: "邵阳市",
+		430600: "岳阳市",
+		430700: "常德市",
+		430800: "张家界市",
+		430900: "益阳市",
+		431000: "郴州市",
+		431100: "永州市",
+		431200: "怀化市",
+		431300: "娄底市",
+		433100: "湘西土家族苗族自治州",
+		440100: "广州市",
+		440200: "韶关市",
+		440300: "深圳市",
+		440400: "珠海市",
+		440500: "汕头市",
+		440600: "佛山市",
+		440700: "江门市",
+		440800: "湛江市",
+		440900: "茂名市",
+		441200: "肇庆市",
+		441300: "惠州市",
+		441400: "梅州市",
+		441500: "汕尾市",
+		441600: "河源市",
+		441700: "阳江市",
+		441800: "清远市",
+		441900: "东莞市",
+		442000: "中山市",
+		445100: "潮州市",
+		445200: "揭阳市",
+		445300: "云浮市",
+		450100: "南宁市",
+		450200: "柳州市",
+		450300: "桂林市",
+		450400: "梧州市",
+		450500: "北海市",
+		450600: "防城港市",
+		450700: "钦州市",
+		450800: "贵港市",
+		450900: "玉林市",
+		451000: "百色市",
+		451100: "贺州市",
+		451200: "河池市",
+		451300: "来宾市",
+		451400: "崇左市",
+		460100: "海口市",
+		460200: "三亚市",
+		460300: "三沙市",
+		460400: "儋州市",
+		469001: "五指山市",
+		469002: "琼海市",
+		469005: "文昌市",
+		469006: "万宁市",
+		469007: "东方市",
+		469021: "定安县",
+		469022: "屯昌县",
+		469023: "澄迈县",
+		469024: "临高县",
+		469025: "白沙黎族自治县",
+		469026: "昌江黎族自治县",
+		469027: "乐东黎族自治县",
+		469028: "陵水黎族自治县",
+		469030: "琼中黎族苗族自治县",
+		469035: "保亭黎族苗族自治县",
+		500100: "重庆市",
+		510100: "成都市",
+		510300: "自贡市",
+		510400: "攀枝花市",
+		510500: "泸州市",
+		510600: "德阳市",
+		510700: "绵阳市",
+		510800: "广元市",
+		510900: "遂宁市",
+		511000: "内江市",
+		511100: "乐山市",
+		511300: "南充市",
+		511400: "眉山市",
+		511500: "宜宾市",
+		511600: "广安市",
+		511700: "达州市",
+		511800: "雅安市",
+		511900: "巴中市",
+		512000: "资阳市",
+		513200: "阿坝藏族羌族自治州",
+		513300: "甘孜藏族自治州",
+		513400: "凉山彝族自治州",
+		520100: "贵阳市",
+		520200: "六盘水市",
+		520300: "遵义市",
+		520400: "安顺市",
+		522200: "铜仁市",
+		522300: "黔西南布依族苗族自治州",
+		522400: "毕节市",
+		522600: "黔东南苗族侗族自治州",
+		522700: "黔南布依族苗族自治州",
+		530100: "昆明市",
+		530300: "曲靖市",
+		530400: "玉溪市",
+		530500: "保山市",
+		530600: "昭通市",
+		530700: "丽江市",
+		530800: "普洱市",
+		530900: "临沧市",
+		532300: "楚雄彝族自治州",
+		532500: "红河哈尼族彝族自治州",
+		532600: "文山壮族苗族自治州",
+		532800: "西双版纳傣族自治州",
+		532900: "大理白族自治州",
+		533100: "德宏傣族景颇族自治州",
+		533300: "怒江傈僳族自治州",
+		533400: "迪庆藏族自治州",
+		540100: "拉萨市",
+		540500: "山南市",
+		540600: "那曲市",
+		542100: "昌都市",
+		542300: "日喀则市",
+		542500: "阿里地区",
+		542600: "林芝市",
+		610100: "西安市",
+		610200: "铜川市",
+		610300: "宝鸡市",
+		610400: "咸阳市",
+		610500: "渭南市",
+		610600: "延安市",
+		610700: "汉中市",
+		610800: "榆林市",
+		610900: "安康市",
+		611000: "商洛市",
+		620100: "兰州市",
+		620200: "嘉峪关市",
+		620300: "金昌市",
+		620400: "白银市",
+		620500: "天水市",
+		620600: "武威市",
+		620700: "张掖市",
+		620800: "平凉市",
+		620900: "酒泉市",
+		621000: "庆阳市",
+		621100: "定西市",
+		621200: "陇南市",
+		622900: "临夏回族自治州",
+		623000: "甘南藏族自治州",
+		630100: "西宁市",
+		632100: "海东市",
+		632200: "海北藏族自治州",
+		632300: "黄南藏族自治州",
+		632500: "海南藏族自治州",
+		632600: "果洛藏族自治州",
+		632700: "玉树藏族自治州",
+		632800: "海西蒙古族藏族自治州",
+		640100: "银川市",
+		640200: "石嘴山市",
+		640300: "吴忠市",
+		640400: "固原市",
+		640500: "中卫市",
+		650100: "乌鲁木齐市",
+		650200: "克拉玛依市",
+		650500: "哈密市",
+		652100: "吐鲁番市",
+		652300: "昌吉回族自治州",
+		652700: "博尔塔拉蒙古自治州",
+		652800: "巴音郭楞蒙古自治州",
+		652900: "阿克苏地区",
+		653000: "克孜勒苏柯尔克孜自治州",
+		653100: "喀什地区",
+		653200: "和田地区",
+		654000: "伊犁哈萨克自治州",
+		654200: "塔城地区",
+		654300: "阿勒泰地区",
+		659001: "石河子市",
+		659002: "阿拉尔市",
+		659003: "图木舒克市",
+		659004: "五家渠市",
+		659005: "北屯市",
+		659006: "铁门关市",
+		659007: "双河市",
+		659008: "可克达拉市",
+		659009: "昆玉市",
+		659010: "胡杨河市",
+		659011: "新星市",
+		710100: "台北市",
+		710200: "高雄市",
+		710300: "台南市",
+		710400: "台中市",
+		710500: "金门县",
+		710600: "南投县",
+		710700: "基隆市",
+		710800: "新竹市",
+		710900: "嘉义市",
+		711100: "新北市",
+		711200: "宜兰县",
+		711300: "新竹县",
+		711400: "桃园县",
+		711500: "苗栗县",
+		711700: "彰化县",
+		711900: "嘉义县",
+		712100: "云林县",
+		712400: "屏东县",
+		712500: "台东县",
+		712600: "花莲县",
+		712700: "澎湖县",
+		712800: "连江县",
+		810100: "香港岛",
+		810200: "九龙",
+		810300: "新界",
+		820100: "澳门半岛",
+		820200: "氹仔岛",
+		820300: "路环岛",
+		820400: "非堂区",
+	},
+    county_list: {
+		110101: "东城区",
+		110102: "西城区",
+		110105: "朝阳区",
+		110106: "丰台区",
+		110107: "石景山区",
+		110108: "海淀区",
+		110109: "门头沟区",
+		110111: "房山区",
+		110112: "通州区",
+		110113: "顺义区",
+		110114: "昌平区",
+		110115: "大兴区",
+		110116: "怀柔区",
+		110117: "平谷区",
+		110118: "密云区",
+		110119: "延庆区",
+		120101: "和平区",
+		120102: "河东区",
+		120103: "河西区",
+		120104: "南开区",
+		120105: "河北区",
+		120106: "红桥区",
+		120110: "东丽区",
+		120111: "西青区",
+		120112: "津南区",
+		120113: "北辰区",
+		120114: "武清区",
+		120115: "宝坻区",
+		120116: "滨海新区",
+		120117: "宁河区",
+		120118: "静海区",
+		120119: "蓟州区",
+		130102: "长安区",
+		130104: "桥西区",
+		130105: "新华区",
+		130107: "井陉矿区",
+		130108: "裕华区",
+		130121: "井陉县",
+		130123: "正定县",
+		130124: "栾城区",
+		130125: "行唐县",
+		130126: "灵寿县",
+		130127: "高邑县",
+		130128: "深泽县",
+		130129: "赞皇县",
+		130130: "无极县",
+		130131: "平山县",
+		130132: "元氏县",
+		130133: "赵县",
+		130181: "辛集市",
+		130182: "藁城区",
+		130183: "晋州市",
+		130184: "新乐市",
+		130185: "鹿泉区",
+		130202: "路南区",
+		130203: "路北区",
+		130204: "古冶区",
+		130205: "开平区",
+		130207: "丰南区",
+		130208: "丰润区",
+		130224: "滦南县",
+		130225: "乐亭县",
+		130227: "迁西县",
+		130229: "玉田县",
+		130230: "曹妃甸区",
+		130281: "遵化市",
+		130283: "迁安市",
+		130284: "滦州市",
+		130302: "海港区",
+		130303: "山海关区",
+		130304: "北戴河区",
+		130306: "抚宁区",
+		130321: "青龙满族自治县",
+		130322: "昌黎县",
+		130324: "卢龙县",
+		130402: "邯山区",
+		130403: "丛台区",
+		130404: "复兴区",
+		130406: "峰峰矿区",
+		130407: "肥乡区",
+		130408: "永年区",
+		130423: "临漳县",
+		130424: "成安县",
+		130425: "大名县",
+		130426: "涉县",
+		130427: "磁县",
+		130430: "邱县",
+		130431: "鸡泽县",
+		130432: "广平县",
+		130433: "馆陶县",
+		130434: "魏县",
+		130435: "曲周县",
+		130481: "武安市",
+		130502: "襄都区",
+		130503: "信都区",
+		130522: "临城县",
+		130523: "内丘县",
+		130524: "柏乡县",
+		130525: "隆尧县",
+		130526: "任泽区",
+		130527: "南和区",
+		130528: "宁晋县",
+		130529: "巨鹿县",
+		130530: "新河县",
+		130531: "广宗县",
+		130532: "平乡县",
+		130533: "威县",
+		130534: "清河县",
+		130535: "临西县",
+		130581: "南宫市",
+		130582: "沙河市",
+		130602: "竞秀区",
+		130606: "莲池区",
+		130607: "满城区",
+		130608: "清苑区",
+		130609: "徐水区",
+		130623: "涞水县",
+		130624: "阜平县",
+		130626: "定兴县",
+		130627: "唐县",
+		130628: "高阳县",
+		130629: "容城县",
+		130630: "涞源县",
+		130631: "望都县",
+		130632: "安新县",
+		130633: "易县",
+		130634: "曲阳县",
+		130635: "蠡县",
+		130636: "顺平县",
+		130637: "博野县",
+		130638: "雄县",
+		130681: "涿州市",
+		130682: "定州市",
+		130683: "安国市",
+		130684: "高碑店市",
+		130702: "桥东区",
+		130703: "桥西区",
+		130705: "宣化区",
+		130706: "下花园区",
+		130708: "万全区",
+		130709: "崇礼区",
+		130722: "张北县",
+		130723: "康保县",
+		130724: "沽源县",
+		130725: "尚义县",
+		130726: "蔚县",
+		130727: "阳原县",
+		130728: "怀安县",
+		130730: "怀来县",
+		130731: "涿鹿县",
+		130732: "赤城县",
+		130802: "双桥区",
+		130803: "双滦区",
+		130804: "鹰手营子矿区",
+		130821: "承德县",
+		130822: "兴隆县",
+		130824: "滦平县",
+		130825: "隆化县",
+		130826: "丰宁满族自治县",
+		130827: "宽城满族自治县",
+		130828: "围场满族蒙古族自治县",
+		130881: "平泉市",
+		130902: "新华区",
+		130903: "运河区",
+		130921: "沧县",
+		130922: "青县",
+		130923: "东光县",
+		130924: "海兴县",
+		130925: "盐山县",
+		130926: "肃宁县",
+		130927: "南皮县",
+		130928: "吴桥县",
+		130929: "献县",
+		130930: "孟村回族自治县",
+		130981: "泊头市",
+		130982: "任丘市",
+		130983: "黄骅市",
+		130984: "河间市",
+		131002: "安次区",
+		131003: "广阳区",
+		131022: "固安县",
+		131023: "永清县",
+		131024: "香河县",
+		131025: "大城县",
+		131026: "文安县",
+		131028: "大厂回族自治县",
+		131081: "霸州市",
+		131082: "三河市",
+		131102: "桃城区",
+		131103: "冀州区",
+		131121: "枣强县",
+		131122: "武邑县",
+		131123: "武强县",
+		131124: "饶阳县",
+		131125: "安平县",
+		131126: "故城县",
+		131127: "景县",
+		131128: "阜城县",
+		131182: "深州市",
+		140105: "小店区",
+		140106: "迎泽区",
+		140107: "杏花岭区",
+		140108: "尖草坪区",
+		140109: "万柏林区",
+		140110: "晋源区",
+		140121: "清徐县",
+		140122: "阳曲县",
+		140123: "娄烦县",
+		140181: "古交市",
+		140212: "新荣区",
+		140213: "平城区",
+		140214: "云冈区",
+		140215: "云州区",
+		140221: "阳高县",
+		140222: "天镇县",
+		140223: "广灵县",
+		140224: "灵丘县",
+		140225: "浑源县",
+		140226: "左云县",
+		140302: "城区",
+		140303: "矿区",
+		140311: "郊区",
+		140321: "平定县",
+		140322: "盂县",
+		140403: "潞州区",
+		140404: "上党区",
+		140405: "屯留区",
+		140406: "潞城区",
+		140423: "襄垣县",
+		140425: "平顺县",
+		140426: "黎城县",
+		140427: "壶关县",
+		140428: "长子县",
+		140429: "武乡县",
+		140430: "沁县",
+		140431: "沁源县",
+		140502: "城区",
+		140521: "沁水县",
+		140522: "阳城县",
+		140524: "陵川县",
+		140525: "泽州县",
+		140581: "高平市",
+		140602: "朔城区",
+		140603: "平鲁区",
+		140621: "山阴县",
+		140622: "应县",
+		140623: "右玉县",
+		140681: "怀仁市",
+		140702: "榆次区",
+		140721: "榆社县",
+		140722: "左权县",
+		140723: "和顺县",
+		140724: "昔阳县",
+		140725: "寿阳县",
+		140726: "太谷区",
+		140727: "祁县",
+		140728: "平遥县",
+		140729: "灵石县",
+		140781: "介休市",
+		140802: "盐湖区",
+		140821: "临猗县",
+		140822: "万荣县",
+		140823: "闻喜县",
+		140824: "稷山县",
+		140825: "新绛县",
+		140826: "绛县",
+		140827: "垣曲县",
+		140828: "夏县",
+		140829: "平陆县",
+		140830: "芮城县",
+		140881: "永济市",
+		140882: "河津市",
+		140902: "忻府区",
+		140921: "定襄县",
+		140922: "五台县",
+		140923: "代县",
+		140924: "繁峙县",
+		140925: "宁武县",
+		140926: "静乐县",
+		140927: "神池县",
+		140928: "五寨县",
+		140929: "岢岚县",
+		140930: "河曲县",
+		140931: "保德县",
+		140932: "偏关县",
+		140981: "原平市",
+		141002: "尧都区",
+		141021: "曲沃县",
+		141022: "翼城县",
+		141023: "襄汾县",
+		141024: "洪洞县",
+		141025: "古县",
+		141026: "安泽县",
+		141027: "浮山县",
+		141028: "吉县",
+		141029: "乡宁县",
+		141030: "大宁县",
+		141031: "隰县",
+		141032: "永和县",
+		141033: "蒲县",
+		141034: "汾西县",
+		141081: "侯马市",
+		141082: "霍州市",
+		141102: "离石区",
+		141121: "文水县",
+		141122: "交城县",
+		141123: "兴县",
+		141124: "临县",
+		141125: "柳林县",
+		141126: "石楼县",
+		141127: "岚县",
+		141128: "方山县",
+		141129: "中阳县",
+		141130: "交口县",
+		141181: "孝义市",
+		141182: "汾阳市",
+		150102: "新城区",
+		150103: "回民区",
+		150104: "玉泉区",
+		150105: "赛罕区",
+		150121: "土默特左旗",
+		150122: "托克托县",
+		150123: "和林格尔县",
+		150124: "清水河县",
+		150125: "武川县",
+		150202: "东河区",
+		150203: "昆都仑区",
+		150204: "青山区",
+		150205: "石拐区",
+		150206: "白云鄂博矿区",
+		150207: "九原区",
+		150221: "土默特右旗",
+		150222: "固阳县",
+		150223: "达尔罕茂明安联合旗",
+		150302: "海勃湾区",
+		150303: "海南区",
+		150304: "乌达区",
+		150402: "红山区",
+		150403: "元宝山区",
+		150404: "松山区",
+		150421: "阿鲁科尔沁旗",
+		150422: "巴林左旗",
+		150423: "巴林右旗",
+		150424: "林西县",
+		150425: "克什克腾旗",
+		150426: "翁牛特旗",
+		150428: "喀喇沁旗",
+		150429: "宁城县",
+		150430: "敖汉旗",
+		150502: "科尔沁区",
+		150521: "科尔沁左翼中旗",
+		150522: "科尔沁左翼后旗",
+		150523: "开鲁县",
+		150524: "库伦旗",
+		150525: "奈曼旗",
+		150526: "扎鲁特旗",
+		150581: "霍林郭勒市",
+		150602: "东胜区",
+		150603: "康巴什区",
+		150621: "达拉特旗",
+		150622: "准格尔旗",
+		150623: "鄂托克前旗",
+		150624: "鄂托克旗",
+		150625: "杭锦旗",
+		150626: "乌审旗",
+		150627: "伊金霍洛旗",
+		150702: "海拉尔区",
+		150703: "扎赉诺尔区",
+		150721: "阿荣旗",
+		150722: "莫力达瓦达斡尔族自治旗",
+		150723: "鄂伦春自治旗",
+		150724: "鄂温克族自治旗",
+		150725: "陈巴尔虎旗",
+		150726: "新巴尔虎左旗",
+		150727: "新巴尔虎右旗",
+		150781: "满洲里市",
+		150782: "牙克石市",
+		150783: "扎兰屯市",
+		150784: "额尔古纳市",
+		150785: "根河市",
+		150802: "临河区",
+		150821: "五原县",
+		150822: "磴口县",
+		150823: "乌拉特前旗",
+		150824: "乌拉特中旗",
+		150825: "乌拉特后旗",
+		150826: "杭锦后旗",
+		150902: "集宁区",
+		150921: "卓资县",
+		150922: "化德县",
+		150923: "商都县",
+		150924: "兴和县",
+		150925: "凉城县",
+		150926: "察哈尔右翼前旗",
+		150927: "察哈尔右翼中旗",
+		150928: "察哈尔右翼后旗",
+		150929: "四子王旗",
+		150981: "丰镇市",
+		152201: "乌兰浩特市",
+		152202: "阿尔山市",
+		152221: "科尔沁右翼前旗",
+		152222: "科尔沁右翼中旗",
+		152223: "扎赉特旗",
+		152224: "突泉县",
+		152501: "二连浩特市",
+		152502: "锡林浩特市",
+		152522: "阿巴嘎旗",
+		152523: "苏尼特左旗",
+		152524: "苏尼特右旗",
+		152525: "东乌珠穆沁旗",
+		152526: "西乌珠穆沁旗",
+		152527: "太仆寺旗",
+		152528: "镶黄旗",
+		152529: "正镶白旗",
+		152530: "正蓝旗",
+		152531: "多伦县",
+		152921: "阿拉善左旗",
+		152922: "阿拉善右旗",
+		152923: "额济纳旗",
+		210102: "和平区",
+		210103: "沈河区",
+		210104: "大东区",
+		210105: "皇姑区",
+		210106: "铁西区",
+		210111: "苏家屯区",
+		210112: "浑南区",
+		210114: "于洪区",
+		210115: "辽中区",
+		210123: "康平县",
+		210124: "法库县",
+		210181: "新民市",
+		210184: "沈北新区",
+		210202: "中山区",
+		210203: "西岗区",
+		210204: "沙河口区",
+		210211: "甘井子区",
+		210212: "旅顺口区",
+		210213: "金州区",
+		210214: "普兰店区",
+		210224: "长海县",
+		210281: "瓦房店市",
+		210283: "庄河市",
+		210302: "铁东区",
+		210303: "铁西区",
+		210304: "立山区",
+		210311: "千山区",
+		210321: "台安县",
+		210323: "岫岩满族自治县",
+		210381: "海城市",
+		210402: "新抚区",
+		210403: "东洲区",
+		210404: "望花区",
+		210411: "顺城区",
+		210421: "抚顺县",
+		210422: "新宾满族自治县",
+		210423: "清原满族自治县",
+		210502: "平山区",
+		210503: "溪湖区",
+		210504: "明山区",
+		210505: "南芬区",
+		210521: "本溪满族自治县",
+		210522: "桓仁满族自治县",
+		210602: "元宝区",
+		210603: "振兴区",
+		210604: "振安区",
+		210624: "宽甸满族自治县",
+		210681: "东港市",
+		210682: "凤城市",
+		210702: "古塔区",
+		210703: "凌河区",
+		210711: "太和区",
+		210726: "黑山县",
+		210727: "义县",
+		210781: "凌海市",
+		210782: "北镇市",
+		210802: "站前区",
+		210803: "西市区",
+		210804: "鲅鱼圈区",
+		210811: "老边区",
+		210881: "盖州市",
+		210882: "大石桥市",
+		210902: "海州区",
+		210903: "新邱区",
+		210904: "太平区",
+		210905: "清河门区",
+		210911: "细河区",
+		210921: "阜新蒙古族自治县",
+		210922: "彰武县",
+		211002: "白塔区",
+		211003: "文圣区",
+		211004: "宏伟区",
+		211005: "弓长岭区",
+		211011: "太子河区",
+		211021: "辽阳县",
+		211081: "灯塔市",
+		211102: "双台子区",
+		211103: "兴隆台区",
+		211104: "大洼区",
+		211122: "盘山县",
+		211202: "银州区",
+		211204: "清河区",
+		211221: "铁岭县",
+		211223: "西丰县",
+		211224: "昌图县",
+		211281: "调兵山市",
+		211282: "开原市",
+		211302: "双塔区",
+		211303: "龙城区",
+		211321: "朝阳县",
+		211322: "建平县",
+		211324: "喀喇沁左翼蒙古族自治县",
+		211381: "北票市",
+		211382: "凌源市",
+		211402: "连山区",
+		211403: "龙港区",
+		211404: "南票区",
+		211421: "绥中县",
+		211422: "建昌县",
+		211481: "兴城市",
+		220102: "南关区",
+		220103: "宽城区",
+		220104: "朝阳区",
+		220105: "二道区",
+		220106: "绿园区",
+		220112: "双阳区",
+		220122: "农安县",
+		220181: "九台区",
+		220182: "榆树市",
+		220183: "德惠市",
+		220202: "昌邑区",
+		220203: "龙潭区",
+		220204: "船营区",
+		220211: "丰满区",
+		220221: "永吉县",
+		220281: "蛟河市",
+		220282: "桦甸市",
+		220283: "舒兰市",
+		220284: "磐石市",
+		220302: "铁西区",
+		220303: "铁东区",
+		220322: "梨树县",
+		220323: "伊通满族自治县",
+		220381: "公主岭市",
+		220382: "双辽市",
+		220402: "龙山区",
+		220403: "西安区",
+		220421: "东丰县",
+		220422: "东辽县",
+		220502: "东昌区",
+		220503: "二道江区",
+		220521: "通化县",
+		220523: "辉南县",
+		220524: "柳河县",
+		220581: "梅河口市",
+		220582: "集安市",
+		220602: "浑江区",
+		220621: "抚松县",
+		220622: "靖宇县",
+		220623: "长白朝鲜族自治县",
+		220625: "江源区",
+		220681: "临江市",
+		220702: "宁江区",
+		220721: "前郭尔罗斯蒙古族自治县",
+		220722: "长岭县",
+		220723: "乾安县",
+		220724: "扶余市",
+		220802: "洮北区",
+		220821: "镇赉县",
+		220822: "通榆县",
+		220881: "洮南市",
+		220882: "大安市",
+		222401: "延吉市",
+		222402: "图们市",
+		222403: "敦化市",
+		222404: "珲春市",
+		222405: "龙井市",
+		222406: "和龙市",
+		222424: "汪清县",
+		222426: "安图县",
+		230102: "道里区",
+		230103: "南岗区",
+		230104: "道外区",
+		230106: "香坊区",
+		230108: "平房区",
+		230109: "松北区",
+		230111: "呼兰区",
+		230123: "依兰县",
+		230124: "方正县",
+		230125: "宾县",
+		230126: "巴彦县",
+		230127: "木兰县",
+		230128: "通河县",
+		230129: "延寿县",
+		230181: "阿城区",
+		230182: "双城区",
+		230183: "尚志市",
+		230184: "五常市",
+		230202: "龙沙区",
+		230203: "建华区",
+		230204: "铁锋区",
+		230205: "昂昂溪区",
+		230206: "富拉尔基区",
+		230207: "碾子山区",
+		230208: "梅里斯达斡尔族区",
+		230221: "龙江县",
+		230223: "依安县",
+		230224: "泰来县",
+		230225: "甘南县",
+		230227: "富裕县",
+		230229: "克山县",
+		230230: "克东县",
+		230231: "拜泉县",
+		230281: "讷河市",
+		230302: "鸡冠区",
+		230303: "恒山区",
+		230304: "滴道区",
+		230305: "梨树区",
+		230306: "城子河区",
+		230307: "麻山区",
+		230321: "鸡东县",
+		230381: "虎林市",
+		230382: "密山市",
+		230402: "向阳区",
+		230403: "工农区",
+		230404: "南山区",
+		230405: "兴安区",
+		230406: "东山区",
+		230407: "兴山区",
+		230421: "萝北县",
+		230422: "绥滨县",
+		230502: "尖山区",
+		230503: "岭东区",
+		230505: "四方台区",
+		230506: "宝山区",
+		230521: "集贤县",
+		230522: "友谊县",
+		230523: "宝清县",
+		230524: "饶河县",
+		230602: "萨尔图区",
+		230603: "龙凤区",
+		230604: "让胡路区",
+		230605: "红岗区",
+		230606: "大同区",
+		230621: "肇州县",
+		230622: "肇源县",
+		230623: "林甸县",
+		230624: "杜尔伯特蒙古族自治县",
+		230703: "南岔县",
+		230704: "友好区",
+		230713: "大箐山县",
+		230717: "伊美区",
+		230718: "乌翠区",
+		230722: "嘉荫县",
+		230723: "汤旺县",
+		230724: "丰林县",
+		230751: "金林区",
+		230781: "铁力市",
+		230803: "向阳区",
+		230804: "前进区",
+		230805: "东风区",
+		230811: "郊区",
+		230822: "桦南县",
+		230826: "桦川县",
+		230828: "汤原县",
+		230881: "同江市",
+		230882: "富锦市",
+		230883: "抚远市",
+		230902: "新兴区",
+		230903: "桃山区",
+		230904: "茄子河区",
+		230921: "勃利县",
+		231002: "东安区",
+		231003: "阳明区",
+		231004: "爱民区",
+		231005: "西安区",
+		231025: "林口县",
+		231081: "绥芬河市",
+		231083: "海林市",
+		231084: "宁安市",
+		231085: "穆棱市",
+		231086: "东宁市",
+		231102: "爱辉区",
+		231121: "嫩江市",
+		231123: "逊克县",
+		231124: "孙吴县",
+		231181: "北安市",
+		231182: "五大连池市",
+		231202: "北林区",
+		231221: "望奎县",
+		231222: "兰西县",
+		231223: "青冈县",
+		231224: "庆安县",
+		231225: "明水县",
+		231226: "绥棱县",
+		231281: "安达市",
+		231282: "肇东市",
+		231283: "海伦市",
+		232701: "漠河市",
+		232721: "呼玛县",
+		232722: "塔河县",
+		232724: "加格达奇区",
+		310101: "黄浦区",
+		310104: "徐汇区",
+		310105: "长宁区",
+		310106: "静安区",
+		310107: "普陀区",
+		310109: "虹口区",
+		310110: "杨浦区",
+		310112: "闵行区",
+		310113: "宝山区",
+		310114: "嘉定区",
+		310115: "浦东新区",
+		310116: "金山区",
+		310117: "松江区",
+		310118: "青浦区",
+		310120: "奉贤区",
+		310151: "崇明区",
+		320102: "玄武区",
+		320104: "秦淮区",
+		320105: "建邺区",
+		320106: "鼓楼区",
+		320111: "浦口区",
+		320113: "栖霞区",
+		320114: "雨花台区",
+		320115: "江宁区",
+		320116: "六合区",
+		320124: "溧水区",
+		320125: "高淳区",
+		320205: "锡山区",
+		320206: "惠山区",
+		320211: "滨湖区",
+		320213: "梁溪区",
+		320214: "新吴区",
+		320281: "江阴市",
+		320282: "宜兴市",
+		320302: "鼓楼区",
+		320303: "云龙区",
+		320305: "贾汪区",
+		320311: "泉山区",
+		320321: "丰县",
+		320322: "沛县",
+		320323: "铜山区",
+		320324: "睢宁县",
+		320381: "新沂市",
+		320382: "邳州市",
+		320402: "天宁区",
+		320404: "钟楼区",
+		320411: "新北区",
+		320412: "武进区",
+		320413: "金坛区",
+		320481: "溧阳市",
+		320505: "虎丘区",
+		320506: "吴中区",
+		320507: "相城区",
+		320508: "姑苏区",
+		320581: "常熟市",
+		320582: "张家港市",
+		320583: "昆山市",
+		320584: "吴江区",
+		320585: "太仓市",
+		320602: "崇川区",
+		320611: "港闸区",
+		320612: "通州区",
+		320623: "如东县",
+		320681: "启东市",
+		320682: "如皋市",
+		320684: "海门区",
+		320685: "海安市",
+		320703: "连云区",
+		320706: "海州区",
+		320721: "赣榆区",
+		320722: "东海县",
+		320723: "灌云县",
+		320724: "灌南县",
+		320803: "淮安区",
+		320804: "淮阴区",
+		320812: "清江浦区",
+		320813: "洪泽区",
+		320826: "涟水县",
+		320830: "盱眙县",
+		320831: "金湖县",
+		320902: "亭湖区",
+		320903: "盐都区",
+		320904: "大丰区",
+		320921: "响水县",
+		320922: "滨海县",
+		320923: "阜宁县",
+		320924: "射阳县",
+		320925: "建湖县",
+		320981: "东台市",
+		321002: "广陵区",
+		321003: "邗江区",
+		321023: "宝应县",
+		321081: "仪征市",
+		321084: "高邮市",
+		321088: "江都区",
+		321102: "京口区",
+		321111: "润州区",
+		321112: "丹徒区",
+		321181: "丹阳市",
+		321182: "扬中市",
+		321183: "句容市",
+		321202: "海陵区",
+		321203: "高港区",
+		321281: "兴化市",
+		321282: "靖江市",
+		321283: "泰兴市",
+		321284: "姜堰区",
+		321302: "宿城区",
+		321311: "宿豫区",
+		321322: "沭阳县",
+		321323: "泗阳县",
+		321324: "泗洪县",
+		330102: "上城区",
+		330105: "拱墅区",
+		330106: "西湖区",
+		330108: "滨江区",
+		330109: "萧山区",
+		330110: "余杭区",
+		330112: "临安区",
+		330113: "临平区",
+		330114: "钱塘区",
+		330122: "桐庐县",
+		330127: "淳安县",
+		330182: "建德市",
+		330183: "富阳区",
+		330203: "海曙区",
+		330205: "江北区",
+		330206: "北仑区",
+		330211: "镇海区",
+		330212: "鄞州区",
+		330213: "奉化区",
+		330225: "象山县",
+		330226: "宁海县",
+		330281: "余姚市",
+		330282: "慈溪市",
+		330302: "鹿城区",
+		330303: "龙湾区",
+		330304: "瓯海区",
+		330305: "洞头区",
+		330324: "永嘉县",
+		330326: "平阳县",
+		330327: "苍南县",
+		330328: "文成县",
+		330329: "泰顺县",
+		330381: "瑞安市",
+		330382: "乐清市",
+		330383: "龙港市",
+		330402: "南湖区",
+		330411: "秀洲区",
+		330421: "嘉善县",
+		330424: "海盐县",
+		330481: "海宁市",
+		330482: "平湖市",
+		330483: "桐乡市",
+		330502: "吴兴区",
+		330503: "南浔区",
+		330521: "德清县",
+		330522: "长兴县",
+		330523: "安吉县",
+		330602: "越城区",
+		330621: "柯桥区",
+		330624: "新昌县",
+		330681: "诸暨市",
+		330682: "上虞区",
+		330683: "嵊州市",
+		330702: "婺城区",
+		330703: "金东区",
+		330723: "武义县",
+		330726: "浦江县",
+		330727: "磐安县",
+		330781: "兰溪市",
+		330782: "义乌市",
+		330783: "东阳市",
+		330784: "永康市",
+		330802: "柯城区",
+		330803: "衢江区",
+		330822: "常山县",
+		330824: "开化县",
+		330825: "龙游县",
+		330881: "江山市",
+		330902: "定海区",
+		330903: "普陀区",
+		330921: "岱山县",
+		330922: "嵊泗县",
+		331002: "椒江区",
+		331003: "黄岩区",
+		331004: "路桥区",
+		331022: "三门县",
+		331023: "天台县",
+		331024: "仙居县",
+		331081: "温岭市",
+		331082: "临海市",
+		331083: "玉环市",
+		331102: "莲都区",
+		331121: "青田县",
+		331122: "缙云县",
+		331123: "遂昌县",
+		331124: "松阳县",
+		331125: "云和县",
+		331126: "庆元县",
+		331127: "景宁畲族自治县",
+		331181: "龙泉市",
+		340102: "瑶海区",
+		340103: "庐阳区",
+		340104: "蜀山区",
+		340111: "包河区",
+		340121: "长丰县",
+		340122: "肥东县",
+		340123: "肥西县",
+		340202: "镜湖区",
+		340203: "弋江区",
+		340207: "鸠江区",
+		340221: "湾沚区",
+		340222: "繁昌区",
+		340223: "南陵县",
+		340302: "龙子湖区",
+		340303: "蚌山区",
+		340304: "禹会区",
+		340311: "淮上区",
+		340321: "怀远县",
+		340322: "五河县",
+		340323: "固镇县",
+		340402: "大通区",
+		340403: "田家庵区",
+		340404: "谢家集区",
+		340405: "八公山区",
+		340406: "潘集区",
+		340421: "凤台县",
+		340503: "花山区",
+		340504: "雨山区",
+		340506: "博望区",
+		340521: "当涂县",
+		340602: "杜集区",
+		340603: "相山区",
+		340604: "烈山区",
+		340621: "濉溪县",
+		340705: "铜官区",
+		340706: "义安区",
+		340711: "郊区",
+		340802: "迎江区",
+		340803: "大观区",
+		340811: "宜秀区",
+		340822: "怀宁县",
+		340823: "枞阳县",
+		340824: "潜山市",
+		340825: "太湖县",
+		340826: "宿松县",
+		340827: "望江县",
+		340828: "岳西县",
+		340881: "桐城市",
+		341002: "屯溪区",
+		341003: "黄山区",
+		341004: "徽州区",
+		341021: "歙县",
+		341022: "休宁县",
+		341023: "黟县",
+		341024: "祁门县",
+		341102: "琅琊区",
+		341103: "南谯区",
+		341122: "来安县",
+		341124: "全椒县",
+		341125: "定远县",
+		341126: "凤阳县",
+		341181: "天长市",
+		341182: "明光市",
+		341202: "颍州区",
+		341203: "颍东区",
+		341204: "颍泉区",
+		341221: "临泉县",
+		341222: "太和县",
+		341225: "阜南县",
+		341226: "颍上县",
+		341282: "界首市",
+		341302: "埇桥区",
+		341321: "砀山县",
+		341322: "萧县",
+		341323: "灵璧县",
+		341324: "泗县",
+		341400: "巢湖市",
+		341421: "庐江县",
+		341422: "无为市",
+		341423: "含山县",
+		341424: "和县",
+		341502: "金安区",
+		341503: "裕安区",
+		341504: "叶集区",
+		341521: "寿县",
+		341522: "霍邱县",
+		341523: "舒城县",
+		341524: "金寨县",
+		341525: "霍山县",
+		341602: "谯城区",
+		341621: "涡阳县",
+		341622: "蒙城县",
+		341623: "利辛县",
+		341702: "贵池区",
+		341721: "东至县",
+		341722: "石台县",
+		341723: "青阳县",
+		341802: "宣州区",
+		341821: "郎溪县",
+		341823: "泾县",
+		341824: "绩溪县",
+		341825: "旌德县",
+		341881: "宁国市",
+		341882: "广德市",
+		350102: "鼓楼区",
+		350103: "台江区",
+		350104: "仓山区",
+		350105: "马尾区",
+		350111: "晋安区",
+		350112: "长乐区",
+		350121: "闽侯县",
+		350122: "连江县",
+		350123: "罗源县",
+		350124: "闽清县",
+		350125: "永泰县",
+		350128: "平潭县",
+		350181: "福清市",
+		350203: "思明区",
+		350205: "海沧区",
+		350206: "湖里区",
+		350211: "集美区",
+		350212: "同安区",
+		350213: "翔安区",
+		350302: "城厢区",
+		350303: "涵江区",
+		350304: "荔城区",
+		350305: "秀屿区",
+		350322: "仙游县",
+		350403: "三元区",
+		350421: "明溪县",
+		350423: "清流县",
+		350424: "宁化县",
+		350425: "大田县",
+		350426: "尤溪县",
+		350427: "沙县区",
+		350428: "将乐县",
+		350429: "泰宁县",
+		350430: "建宁县",
+		350481: "永安市",
+		350502: "鲤城区",
+		350503: "丰泽区",
+		350504: "洛江区",
+		350505: "泉港区",
+		350521: "惠安县",
+		350524: "安溪县",
+		350525: "永春县",
+		350526: "德化县",
+		350527: "金门县",
+		350581: "石狮市",
+		350582: "晋江市",
+		350583: "南安市",
+		350602: "芗城区",
+		350603: "龙文区",
+		350622: "云霄县",
+		350623: "漳浦县",
+		350624: "诏安县",
+		350625: "长泰区",
+		350626: "东山县",
+		350627: "南靖县",
+		350628: "平和县",
+		350629: "华安县",
+		350681: "龙海区",
+		350702: "延平区",
+		350721: "顺昌县",
+		350722: "浦城县",
+		350723: "光泽县",
+		350724: "松溪县",
+		350725: "政和县",
+		350781: "邵武市",
+		350782: "武夷山市",
+		350783: "建瓯市",
+		350784: "建阳区",
+		350802: "新罗区",
+		350821: "长汀县",
+		350822: "永定区",
+		350823: "上杭县",
+		350824: "武平县",
+		350825: "连城县",
+		350881: "漳平市",
+		350902: "蕉城区",
+		350921: "霞浦县",
+		350922: "古田县",
+		350923: "屏南县",
+		350924: "寿宁县",
+		350925: "周宁县",
+		350926: "柘荣县",
+		350981: "福安市",
+		350982: "福鼎市",
+		360102: "东湖区",
+		360103: "西湖区",
+		360104: "青云谱区",
+		360111: "青山湖区",
+		360112: "新建区",
+		360113: "红谷滩区",
+		360121: "南昌县",
+		360123: "安义县",
+		360124: "进贤县",
+		360202: "昌江区",
+		360203: "珠山区",
+		360222: "浮梁县",
+		360281: "乐平市",
+		360302: "安源区",
+		360313: "湘东区",
+		360321: "莲花县",
+		360322: "上栗县",
+		360323: "芦溪县",
+		360402: "濂溪区",
+		360403: "浔阳区",
+		360404: "柴桑区",
+		360423: "武宁县",
+		360424: "修水县",
+		360425: "永修县",
+		360426: "德安县",
+		360428: "都昌县",
+		360429: "湖口县",
+		360430: "彭泽县",
+		360481: "瑞昌市",
+		360502: "渝水区",
+		360521: "分宜县",
+		360602: "月湖区",
+		360603: "余江区",
+		360681: "贵溪市",
+		360702: "章贡区",
+		360704: "赣县区",
+		360722: "信丰县",
+		360723: "大余县",
+		360724: "上犹县",
+		360725: "崇义县",
+		360726: "安远县",
+		360727: "龙南市",
+		360728: "定南县",
+		360729: "全南县",
+		360730: "宁都县",
+		360731: "于都县",
+		360732: "兴国县",
+		360733: "会昌县",
+		360734: "寻乌县",
+		360735: "石城县",
+		360781: "瑞金市",
+		360782: "南康区",
+		360802: "吉州区",
+		360803: "青原区",
+		360821: "吉安县",
+		360822: "吉水县",
+		360823: "峡江县",
+		360824: "新干县",
+		360825: "永丰县",
+		360826: "泰和县",
+		360827: "遂川县",
+		360828: "万安县",
+		360829: "安福县",
+		360830: "永新县",
+		360881: "井冈山市",
+		360902: "袁州区",
+		360921: "奉新县",
+		360922: "万载县",
+		360923: "上高县",
+		360924: "宜丰县",
+		360925: "靖安县",
+		360926: "铜鼓县",
+		360981: "丰城市",
+		360982: "樟树市",
+		360983: "高安市",
+		361002: "临川区",
+		361003: "东乡区",
+		361021: "南城县",
+		361022: "黎川县",
+		361023: "南丰县",
+		361024: "崇仁县",
+		361025: "乐安县",
+		361026: "宜黄县",
+		361027: "金溪县",
+		361028: "资溪县",
+		361030: "广昌县",
+		361102: "信州区",
+		361121: "广信区",
+		361122: "广丰区",
+		361123: "玉山县",
+		361124: "铅山县",
+		361125: "横峰县",
+		361126: "弋阳县",
+		361127: "余干县",
+		361128: "鄱阳县",
+		361129: "万年县",
+		361130: "婺源县",
+		361181: "德兴市",
+		370102: "历下区",
+		370103: "市中区",
+		370104: "槐荫区",
+		370105: "天桥区",
+		370112: "历城区",
+		370113: "长清区",
+		370114: "章丘区",
+		370115: "济阳区",
+		370116: "莱芜区",
+		370124: "平阴县",
+		370126: "商河县",
+		370202: "市南区",
+		370203: "市北区",
+		370211: "黄岛区",
+		370212: "崂山区",
+		370213: "李沧区",
+		370214: "城阳区",
+		370215: "即墨区",
+		370281: "胶州市",
+		370283: "平度市",
+		370285: "莱西市",
+		370302: "淄川区",
+		370303: "张店区",
+		370304: "博山区",
+		370305: "临淄区",
+		370306: "周村区",
+		370321: "桓台县",
+		370322: "高青县",
+		370323: "沂源县",
+		370402: "市中区",
+		370403: "薛城区",
+		370404: "峄城区",
+		370405: "台儿庄区",
+		370406: "山亭区",
+		370481: "滕州市",
+		370502: "东营区",
+		370503: "河口区",
+		370505: "垦利区",
+		370522: "利津县",
+		370523: "广饶县",
+		370602: "芝罘区",
+		370611: "福山区",
+		370612: "牟平区",
+		370613: "莱山区",
+		370681: "龙口市",
+		370682: "莱阳市",
+		370683: "莱州市",
+		370684: "蓬莱区",
+		370685: "招远市",
+		370686: "栖霞市",
+		370687: "海阳市",
+		370702: "潍城区",
+		370703: "寒亭区",
+		370704: "坊子区",
+		370705: "奎文区",
+		370724: "临朐县",
+		370725: "昌乐县",
+		370781: "青州市",
+		370782: "诸城市",
+		370783: "寿光市",
+		370784: "安丘市",
+		370785: "高密市",
+		370786: "昌邑市",
+		370811: "任城区",
+		370826: "微山县",
+		370827: "鱼台县",
+		370828: "金乡县",
+		370829: "嘉祥县",
+		370830: "汶上县",
+		370831: "泗水县",
+		370832: "梁山县",
+		370881: "曲阜市",
+		370882: "兖州区",
+		370883: "邹城市",
+		370902: "泰山区",
+		370903: "岱岳区",
+		370921: "宁阳县",
+		370923: "东平县",
+		370982: "新泰市",
+		370983: "肥城市",
+		371002: "环翠区",
+		371081: "文登区",
+		371082: "荣成市",
+		371083: "乳山市",
+		371102: "东港区",
+		371103: "岚山区",
+		371121: "五莲县",
+		371122: "莒县",
+		371203: "钢城区",
+		371302: "兰山区",
+		371311: "罗庄区",
+		371312: "河东区",
+		371321: "沂南县",
+		371322: "郯城县",
+		371323: "沂水县",
+		371324: "兰陵县",
+		371325: "费县",
+		371326: "平邑县",
+		371327: "莒南县",
+		371328: "蒙阴县",
+		371329: "临沭县",
+		371402: "德城区",
+		371421: "陵城区",
+		371422: "宁津县",
+		371423: "庆云县",
+		371424: "临邑县",
+		371425: "齐河县",
+		371426: "平原县",
+		371427: "夏津县",
+		371428: "武城县",
+		371481: "乐陵市",
+		371482: "禹城市",
+		371502: "东昌府区",
+		371521: "阳谷县",
+		371522: "莘县",
+		371523: "茌平区",
+		371524: "东阿县",
+		371525: "冠县",
+		371526: "高唐县",
+		371581: "临清市",
+		371602: "滨城区",
+		371621: "惠民县",
+		371622: "阳信县",
+		371623: "无棣县",
+		371624: "沾化区",
+		371625: "博兴县",
+		371681: "邹平市",
+		371702: "牡丹区",
+		371703: "定陶区",
+		371721: "曹县",
+		371722: "单县",
+		371723: "成武县",
+		371724: "巨野县",
+		371725: "郓城县",
+		371726: "鄄城县",
+		371728: "东明县",
+		410102: "中原区",
+		410103: "二七区",
+		410104: "管城回族区",
+		410105: "金水区",
+		410106: "上街区",
+		410108: "惠济区",
+		410122: "中牟县",
+		410181: "巩义市",
+		410182: "荥阳市",
+		410183: "新密市",
+		410184: "新郑市",
+		410185: "登封市",
+		410202: "龙亭区",
+		410203: "顺河回族区",
+		410204: "鼓楼区",
+		410205: "禹王台区",
+		410221: "杞县",
+		410222: "通许县",
+		410223: "尉氏县",
+		410224: "祥符区",
+		410225: "兰考县",
+		410302: "老城区",
+		410303: "西工区",
+		410304: "瀍河回族区",
+		410305: "涧西区",
+		410307: "洛龙区",
+		410322: "孟津区",
+		410323: "新安县",
+		410324: "栾川县",
+		410325: "嵩县",
+		410326: "汝阳县",
+		410327: "宜阳县",
+		410328: "洛宁县",
+		410329: "伊川县",
+		410381: "偃师区",
+		410402: "新华区",
+		410403: "卫东区",
+		410404: "石龙区",
+		410411: "湛河区",
+		410421: "宝丰县",
+		410422: "叶县",
+		410423: "鲁山县",
+		410425: "郏县",
+		410481: "舞钢市",
+		410482: "汝州市",
+		410502: "文峰区",
+		410503: "北关区",
+		410505: "殷都区",
+		410506: "龙安区",
+		410522: "安阳县",
+		410523: "汤阴县",
+		410526: "滑县",
+		410527: "内黄县",
+		410581: "林州市",
+		410602: "鹤山区",
+		410603: "山城区",
+		410611: "淇滨区",
+		410621: "浚县",
+		410622: "淇县",
+		410702: "红旗区",
+		410703: "卫滨区",
+		410704: "凤泉区",
+		410711: "牧野区",
+		410721: "新乡县",
+		410724: "获嘉县",
+		410725: "原阳县",
+		410726: "延津县",
+		410727: "封丘县",
+		410728: "长垣市",
+		410781: "卫辉市",
+		410782: "辉县市",
+		410802: "解放区",
+		410803: "中站区",
+		410804: "马村区",
+		410811: "山阳区",
+		410821: "修武县",
+		410822: "博爱县",
+		410823: "武陟县",
+		410825: "温县",
+		410882: "沁阳市",
+		410883: "孟州市",
+		410902: "华龙区",
+		410922: "清丰县",
+		410923: "南乐县",
+		410926: "范县",
+		410927: "台前县",
+		410928: "濮阳县",
+		411002: "魏都区",
+		411003: "建安区",
+		411024: "鄢陵县",
+		411025: "襄城县",
+		411081: "禹州市",
+		411082: "长葛市",
+		411102: "源汇区",
+		411103: "郾城区",
+		411104: "召陵区",
+		411121: "舞阳县",
+		411122: "临颍县",
+		411202: "湖滨区",
+		411221: "渑池县",
+		411222: "陕州区",
+		411224: "卢氏县",
+		411281: "义马市",
+		411282: "灵宝市",
+		411302: "宛城区",
+		411303: "卧龙区",
+		411321: "南召县",
+		411322: "方城县",
+		411323: "西峡县",
+		411324: "镇平县",
+		411325: "内乡县",
+		411326: "淅川县",
+		411327: "社旗县",
+		411328: "唐河县",
+		411329: "新野县",
+		411330: "桐柏县",
+		411381: "邓州市",
+		411402: "梁园区",
+		411403: "睢阳区",
+		411421: "民权县",
+		411422: "睢县",
+		411423: "宁陵县",
+		411424: "柘城县",
+		411425: "虞城县",
+		411426: "夏邑县",
+		411481: "永城市",
+		411502: "浉河区",
+		411503: "平桥区",
+		411521: "罗山县",
+		411522: "光山县",
+		411523: "新县",
+		411524: "商城县",
+		411525: "固始县",
+		411526: "潢川县",
+		411527: "淮滨县",
+		411528: "息县",
+		411602: "川汇区",
+		411621: "扶沟县",
+		411622: "西华县",
+		411623: "商水县",
+		411624: "沈丘县",
+		411625: "郸城县",
+		411626: "淮阳区",
+		411627: "太康县",
+		411628: "鹿邑县",
+		411681: "项城市",
+		411702: "驿城区",
+		411721: "西平县",
+		411722: "上蔡县",
+		411723: "平舆县",
+		411724: "正阳县",
+		411725: "确山县",
+		411726: "泌阳县",
+		411727: "汝南县",
+		411728: "遂平县",
+		411729: "新蔡县",
+		419001: "济源市",
+		420102: "江岸区",
+		420103: "江汉区",
+		420104: "硚口区",
+		420105: "汉阳区",
+		420106: "武昌区",
+		420107: "青山区",
+		420111: "洪山区",
+		420112: "东西湖区",
+		420113: "汉南区",
+		420114: "蔡甸区",
+		420115: "江夏区",
+		420116: "黄陂区",
+		420117: "新洲区",
+		420202: "黄石港区",
+		420203: "西塞山区",
+		420204: "下陆区",
+		420205: "铁山区",
+		420222: "阳新县",
+		420281: "大冶市",
+		420302: "茅箭区",
+		420303: "张湾区",
+		420321: "郧阳区",
+		420322: "郧西县",
+		420323: "竹山县",
+		420324: "竹溪县",
+		420325: "房县",
+		420381: "丹江口市",
+		420502: "西陵区",
+		420503: "伍家岗区",
+		420504: "点军区",
+		420505: "猇亭区",
+		420506: "夷陵区",
+		420525: "远安县",
+		420526: "兴山县",
+		420527: "秭归县",
+		420528: "长阳土家族自治县",
+		420529: "五峰土家族自治县",
+		420581: "宜都市",
+		420582: "当阳市",
+		420583: "枝江市",
+		420602: "襄城区",
+		420606: "樊城区",
+		420607: "襄州区",
+		420624: "南漳县",
+		420625: "谷城县",
+		420626: "保康县",
+		420682: "老河口市",
+		420683: "枣阳市",
+		420684: "宜城市",
+		420702: "梁子湖区",
+		420703: "华容区",
+		420704: "鄂城区",
+		420802: "东宝区",
+		420804: "掇刀区",
+		420822: "沙洋县",
+		420881: "钟祥市",
+		420882: "京山市",
+		420902: "孝南区",
+		420921: "孝昌县",
+		420922: "大悟县",
+		420923: "云梦县",
+		420981: "应城市",
+		420982: "安陆市",
+		420984: "汉川市",
+		421002: "沙市区",
+		421003: "荆州区",
+		421022: "公安县",
+		421023: "监利市",
+		421024: "江陵县",
+		421081: "石首市",
+		421083: "洪湖市",
+		421087: "松滋市",
+		421102: "黄州区",
+		421121: "团风县",
+		421122: "红安县",
+		421123: "罗田县",
+		421124: "英山县",
+		421125: "浠水县",
+		421126: "蕲春县",
+		421127: "黄梅县",
+		421181: "麻城市",
+		421182: "武穴市",
+		421202: "咸安区",
+		421221: "嘉鱼县",
+		421222: "通城县",
+		421223: "崇阳县",
+		421224: "通山县",
+		421281: "赤壁市",
+		421302: "曾都区",
+		421321: "随县",
+		421381: "广水市",
+		422801: "恩施市",
+		422802: "利川市",
+		422822: "建始县",
+		422823: "巴东县",
+		422825: "宣恩县",
+		422826: "咸丰县",
+		422827: "来凤县",
+		422828: "鹤峰县",
+		429004: "仙桃市",
+		429005: "潜江市",
+		429006: "天门市",
+		429021: "神农架林区",
+		430102: "芙蓉区",
+		430103: "天心区",
+		430104: "岳麓区",
+		430105: "开福区",
+		430111: "雨花区",
+		430121: "长沙县",
+		430122: "望城区",
+		430181: "浏阳市",
+		430182: "宁乡市",
+		430202: "荷塘区",
+		430203: "芦淞区",
+		430204: "石峰区",
+		430211: "天元区",
+		430212: "渌口区",
+		430223: "攸县",
+		430224: "茶陵县",
+		430225: "炎陵县",
+		430281: "醴陵市",
+		430302: "雨湖区",
+		430304: "岳塘区",
+		430321: "湘潭县",
+		430381: "湘乡市",
+		430382: "韶山市",
+		430405: "珠晖区",
+		430406: "雁峰区",
+		430407: "石鼓区",
+		430408: "蒸湘区",
+		430412: "南岳区",
+		430421: "衡阳县",
+		430422: "衡南县",
+		430423: "衡山县",
+		430424: "衡东县",
+		430426: "祁东县",
+		430481: "耒阳市",
+		430482: "常宁市",
+		430502: "双清区",
+		430503: "大祥区",
+		430511: "北塔区",
+		430521: "祁阳市",
+		430522: "新邵县",
+		430523: "邵阳县",
+		430524: "隆回县",
+		430525: "洞口县",
+		430527: "绥宁县",
+		430528: "新宁县",
+		430529: "城步苗族自治县",
+		430581: "武冈市",
+		430602: "岳阳楼区",
+		430603: "云溪区",
+		430611: "君山区",
+		430621: "岳阳县",
+		430623: "华容县",
+		430624: "湘阴县",
+		430626: "平江县",
+		430681: "汨罗市",
+		430682: "临湘市",
+		430702: "武陵区",
+		430703: "鼎城区",
+		430721: "安乡县",
+		430722: "汉寿县",
+		430723: "澧县",
+		430724: "临澧县",
+		430725: "桃源县",
+		430726: "石门县",
+		430781: "津市市",
+		430802: "永定区",
+		430811: "武陵源区",
+		430821: "慈利县",
+		430822: "桑植县",
+		430902: "资阳区",
+		430903: "赫山区",
+		430921: "南县",
+		430922: "桃江县",
+		430923: "安化县",
+		430981: "沅江市",
+		431002: "北湖区",
+		431003: "苏仙区",
+		431021: "桂阳县",
+		431022: "宜章县",
+		431023: "永兴县",
+		431024: "嘉禾县",
+		431025: "临武县",
+		431026: "汝城县",
+		431027: "桂东县",
+		431028: "安仁县",
+		431081: "资兴市",
+		431102: "零陵区",
+		431103: "冷水滩区",
+		431121: "邵东市",
+		431122: "东安县",
+		431123: "双牌县",
+		431124: "道县",
+		431125: "江永县",
+		431126: "宁远县",
+		431127: "蓝山县",
+		431128: "新田县",
+		431129: "江华瑶族自治县",
+		431202: "鹤城区",
+		431221: "中方县",
+		431222: "沅陵县",
+		431223: "辰溪县",
+		431224: "溆浦县",
+		431225: "会同县",
+		431226: "麻阳苗族自治县",
+		431227: "新晃侗族自治县",
+		431228: "芷江侗族自治县",
+		431229: "靖州苗族侗族自治县",
+		431230: "通道侗族自治县",
+		431281: "洪江市",
+		431302: "娄星区",
+		431321: "双峰县",
+		431322: "新化县",
+		431381: "冷水江市",
+		431382: "涟源市",
+		433101: "吉首市",
+		433122: "泸溪县",
+		433123: "凤凰县",
+		433124: "花垣县",
+		433125: "保靖县",
+		433126: "古丈县",
+		433127: "永顺县",
+		433130: "龙山县",
+		440103: "荔湾区",
+		440104: "越秀区",
+		440105: "海珠区",
+		440106: "天河区",
+		440111: "白云区",
+		440112: "黄埔区",
+		440113: "番禺区",
+		440114: "花都区",
+		440115: "南沙区",
+		440183: "增城区",
+		440184: "从化区",
+		440203: "武江区",
+		440204: "浈江区",
+		440205: "曲江区",
+		440222: "始兴县",
+		440224: "仁化县",
+		440229: "翁源县",
+		440232: "乳源瑶族自治县",
+		440233: "新丰县",
+		440281: "乐昌市",
+		440282: "南雄市",
+		440303: "罗湖区",
+		440304: "福田区",
+		440305: "南山区",
+		440306: "宝安区",
+		440307: "龙岗区",
+		440308: "盐田区",
+		440309: "龙华区",
+		440310: "坪山区",
+		440311: "光明区",
+		440402: "香洲区",
+		440403: "斗门区",
+		440404: "金湾区",
+		440507: "龙湖区",
+		440511: "金平区",
+		440512: "濠江区",
+		440513: "潮阳区",
+		440514: "潮南区",
+		440515: "澄海区",
+		440523: "南澳县",
+		440604: "禅城区",
+		440605: "南海区",
+		440606: "顺德区",
+		440607: "三水区",
+		440608: "高明区",
+		440703: "蓬江区",
+		440704: "江海区",
+		440705: "新会区",
+		440781: "台山市",
+		440783: "开平市",
+		440784: "鹤山市",
+		440785: "恩平市",
+		440802: "赤坎区",
+		440803: "霞山区",
+		440804: "坡头区",
+		440811: "麻章区",
+		440823: "遂溪县",
+		440825: "徐闻县",
+		440881: "廉江市",
+		440882: "雷州市",
+		440883: "吴川市",
+		440902: "茂南区",
+		440903: "电白区",
+		440981: "高州市",
+		440982: "化州市",
+		440983: "信宜市",
+		441202: "端州区",
+		441203: "鼎湖区",
+		441204: "高要区",
+		441223: "广宁县",
+		441224: "怀集县",
+		441225: "封开县",
+		441226: "德庆县",
+		441284: "四会市",
+		441302: "惠城区",
+		441303: "惠阳区",
+		441322: "博罗县",
+		441323: "惠东县",
+		441324: "龙门县",
+		441402: "梅江区",
+		441421: "梅县区",
+		441422: "大埔县",
+		441423: "丰顺县",
+		441424: "五华县",
+		441426: "平远县",
+		441427: "蕉岭县",
+		441481: "兴宁市",
+		441502: "城区",
+		441521: "海丰县",
+		441523: "陆河县",
+		441581: "陆丰市",
+		441602: "源城区",
+		441621: "紫金县",
+		441622: "龙川县",
+		441623: "连平县",
+		441624: "和平县",
+		441625: "东源县",
+		441702: "江城区",
+		441721: "阳西县",
+		441723: "阳东区",
+		441781: "阳春市",
+		441802: "清城区",
+		441821: "佛冈县",
+		441823: "阳山县",
+		441825: "连山壮族瑶族自治县",
+		441826: "连南瑶族自治县",
+		441827: "清新区",
+		441881: "英德市",
+		441882: "连州市",
+		441902: "虎门镇",
+		441903: "长安镇",
+		441904: "厚街镇",
+		441905: "莞城街道",
+		441906: "南城街道",
+		441907: "东城街道",
+		441908: "万江街道",
+		441909: "石龙镇",
+		441910: "石排镇",
+		441911: "茶山镇",
+		441912: "企石镇",
+		441913: "桥头镇",
+		441914: "东坑镇",
+		441915: "横沥镇",
+		441916: "常平镇",
+		441917: "沙田镇",
+		441918: "寮步镇",
+		441919: "大岭山镇",
+		441920: "大朗镇",
+		441921: "黄江镇",
+		441922: "樟木头镇",
+		441923: "谢岗镇",
+		441924: "塘厦镇",
+		441925: "清溪镇",
+		441926: "凤岗镇",
+		441927: "麻涌镇",
+		441928: "中堂镇",
+		441929: "高埗镇",
+		441930: "石碣镇",
+		441931: "望牛墩镇",
+		441933: "道滘镇",
+		442003: "东区街道",
+		442004: "西区街道",
+		442005: "南区街道",
+		442006: "五桂山街道",
+		442008: "黄圃镇",
+		442009: "南头镇",
+		442010: "东凤镇",
+		442011: "阜沙镇",
+		442012: "小榄镇",
+		442013: "东升镇",
+		442014: "古镇镇",
+		442015: "横栏镇",
+		442016: "三角镇",
+		442017: "民众街道",
+		442018: "南朗街道",
+		442019: "港口镇",
+		442020: "大涌镇",
+		442021: "沙溪镇",
+		442022: "三乡镇",
+		442023: "板芙镇",
+		442024: "神湾镇",
+		442025: "坦洲镇",
+		445102: "湘桥区",
+		445121: "潮安区",
+		445122: "饶平县",
+		445202: "榕城区",
+		445221: "揭东区",
+		445222: "揭西县",
+		445224: "惠来县",
+		445281: "普宁市",
+		445302: "云城区",
+		445321: "新兴县",
+		445322: "郁南县",
+		445323: "云安区",
+		445381: "罗定市",
+		450102: "兴宁区",
+		450103: "青秀区",
+		450105: "江南区",
+		450107: "西乡塘区",
+		450108: "良庆区",
+		450109: "邕宁区",
+		450122: "武鸣区",
+		450123: "隆安县",
+		450124: "马山县",
+		450125: "上林县",
+		450126: "宾阳县",
+		450127: "横州市",
+		450202: "城中区",
+		450203: "鱼峰区",
+		450204: "柳南区",
+		450205: "柳北区",
+		450206: "柳江区",
+		450222: "柳城县",
+		450223: "鹿寨县",
+		450224: "融安县",
+		450225: "融水苗族自治县",
+		450226: "三江侗族自治县",
+		450302: "秀峰区",
+		450303: "叠彩区",
+		450304: "象山区",
+		450305: "七星区",
+		450311: "雁山区",
+		450321: "阳朔县",
+		450322: "临桂区",
+		450323: "灵川县",
+		450324: "全州县",
+		450325: "兴安县",
+		450326: "永福县",
+		450327: "灌阳县",
+		450328: "龙胜各族自治县",
+		450329: "资源县",
+		450330: "平乐县",
+		450332: "恭城瑶族自治县",
+		450381: "荔浦市",
+		450403: "万秀区",
+		450405: "长洲区",
+		450406: "龙圩区",
+		450421: "苍梧县",
+		450422: "藤县",
+		450423: "蒙山县",
+		450481: "岑溪市",
+		450502: "海城区",
+		450503: "银海区",
+		450512: "铁山港区",
+		450521: "合浦县",
+		450602: "港口区",
+		450603: "防城区",
+		450621: "上思县",
+		450681: "东兴市",
+		450702: "钦南区",
+		450703: "钦北区",
+		450721: "灵山县",
+		450722: "浦北县",
+		450802: "港北区",
+		450803: "港南区",
+		450804: "覃塘区",
+		450821: "平南县",
+		450881: "桂平市",
+		450902: "玉州区",
+		450903: "福绵区",
+		450921: "容县",
+		450922: "陆川县",
+		450923: "博白县",
+		450924: "兴业县",
+		450981: "北流市",
+		451002: "右江区",
+		451021: "田阳区",
+		451022: "田东县",
+		451023: "平果市",
+		451024: "德保县",
+		451026: "那坡县",
+		451027: "凌云县",
+		451028: "乐业县",
+		451029: "田林县",
+		451030: "西林县",
+		451031: "隆林各族自治县",
+		451081: "靖西市",
+		451102: "八步区",
+		451103: "平桂区",
+		451121: "昭平县",
+		451122: "钟山县",
+		451123: "富川瑶族自治县",
+		451202: "金城江区",
+		451203: "宜州区",
+		451221: "南丹县",
+		451222: "天峨县",
+		451223: "凤山县",
+		451224: "东兰县",
+		451225: "罗城仫佬族自治县",
+		451226: "环江毛南族自治县",
+		451227: "巴马瑶族自治县",
+		451228: "都安瑶族自治县",
+		451229: "大化瑶族自治县",
+		451302: "兴宾区",
+		451321: "忻城县",
+		451322: "象州县",
+		451323: "武宣县",
+		451324: "金秀瑶族自治县",
+		451381: "合山市",
+		451402: "江州区",
+		451421: "扶绥县",
+		451422: "宁明县",
+		451423: "龙州县",
+		451424: "大新县",
+		451425: "天等县",
+		451481: "凭祥市",
+		460105: "秀英区",
+		460106: "龙华区",
+		460107: "琼山区",
+		460108: "美兰区",
+		460202: "海棠区",
+		460203: "吉阳区",
+		460204: "天涯区",
+		460205: "崖州区",
+		460301: "西沙区",
+		469001: "五指山市",
+		469002: "琼海市",
+		469005: "文昌市",
+		469006: "万宁市",
+		469007: "东方市",
+		469022: "屯昌县",
+		469026: "昌江黎族自治县",
+		469027: "乐东黎族自治县",
+		500101: "万州区",
+		500102: "涪陵区",
+		500103: "渝中区",
+		500104: "大渡口区",
+		500105: "江北区",
+		500106: "沙坪坝区",
+		500107: "九龙坡区",
+		500108: "南岸区",
+		500109: "北碚区",
+		500112: "渝北区",
+		500113: "巴南区",
+		500114: "黔江区",
+		500115: "长寿区",
+		500152: "潼南区",
+		500153: "荣昌区",
+		500154: "开州区",
+		500155: "梁平区",
+		500156: "武隆区",
+		500222: "綦江区",
+		500224: "铜梁区",
+		500225: "大足区",
+		500227: "璧山区",
+		500229: "城口县",
+		500230: "丰都县",
+		500231: "垫江县",
+		500233: "忠县",
+		500235: "云阳县",
+		500236: "奉节县",
+		500237: "巫山县",
+		500238: "巫溪县",
+		500240: "石柱土家族自治县",
+		500241: "秀山土家族苗族自治县",
+		500242: "酉阳土家族苗族自治县",
+		500243: "彭水苗族土家族自治县",
+		500381: "江津区",
+		500382: "合川区",
+		500383: "永川区",
+		500384: "南川区",
+		510104: "锦江区",
+		510105: "青羊区",
+		510106: "金牛区",
+		510107: "武侯区",
+		510108: "成华区",
+		510112: "龙泉驿区",
+		510113: "青白江区",
+		510114: "新都区",
+		510115: "温江区",
+		510116: "双流区",
+		510117: "郫都区",
+		510121: "金堂县",
+		510129: "大邑县",
+		510131: "蒲江县",
+		510132: "新津区",
+		510181: "都江堰市",
+		510182: "彭州市",
+		510183: "邛崃市",
+		510184: "崇州市",
+		510302: "自流井区",
+		510303: "贡井区",
+		510304: "大安区",
+		510311: "沿滩区",
+		510321: "荣县",
+		510322: "富顺县",
+		510402: "东区",
+		510403: "西区",
+		510411: "仁和区",
+		510421: "米易县",
+		510422: "盐边县",
+		510502: "江阳区",
+		510503: "纳溪区",
+		510504: "龙马潭区",
+		510521: "泸县",
+		510522: "合江县",
+		510524: "叙永县",
+		510525: "古蔺县",
+		510603: "旌阳区",
+		510604: "罗江区",
+		510623: "中江县",
+		510681: "广汉市",
+		510682: "什邡市",
+		510683: "绵竹市",
+		510703: "涪城区",
+		510704: "游仙区",
+		510705: "安州区",
+		510722: "三台县",
+		510723: "盐亭县",
+		510725: "梓潼县",
+		510726: "北川羌族自治县",
+		510727: "平武县",
+		510781: "江油市",
+		510802: "利州区",
+		510811: "昭化区",
+		510812: "朝天区",
+		510821: "旺苍县",
+		510822: "青川县",
+		510823: "剑阁县",
+		510824: "苍溪县",
+		510903: "船山区",
+		510904: "安居区",
+		510921: "蓬溪县",
+		510922: "射洪市",
+		510923: "大英县",
+		511002: "市中区",
+		511011: "东兴区",
+		511024: "威远县",
+		511025: "资中县",
+		511083: "隆昌市",
+		511102: "市中区",
+		511111: "沙湾区",
+		511112: "五通桥区",
+		511113: "金口河区",
+		511123: "犍为县",
+		511124: "井研县",
+		511126: "夹江县",
+		511129: "沐川县",
+		511132: "峨边彝族自治县",
+		511133: "马边彝族自治县",
+		511181: "峨眉山市",
+		511302: "顺庆区",
+		511303: "高坪区",
+		511304: "嘉陵区",
+		511321: "南部县",
+		511322: "营山县",
+		511323: "蓬安县",
+		511324: "仪陇县",
+		511325: "西充县",
+		511381: "阆中市",
+		511402: "东坡区",
+		511421: "仁寿县",
+		511422: "彭山区",
+		511423: "洪雅县",
+		511424: "丹棱县",
+		511425: "青神县",
+		511502: "翠屏区",
+		511504: "叙州区",
+		511522: "南溪区",
+		511523: "江安县",
+		511524: "长宁县",
+		511525: "高县",
+		511526: "珙县",
+		511527: "筠连县",
+		511528: "兴文县",
+		511529: "屏山县",
+		511602: "广安区",
+		511603: "前锋区",
+		511621: "岳池县",
+		511622: "武胜县",
+		511623: "邻水县",
+		511681: "华蓥市",
+		511702: "通川区",
+		511721: "达川区",
+		511722: "宣汉县",
+		511723: "开江县",
+		511724: "大竹县",
+		511725: "渠县",
+		511781: "万源市",
+		511802: "雨城区",
+		511821: "名山区",
+		511822: "荥经县",
+		511823: "汉源县",
+		511824: "石棉县",
+		511825: "天全县",
+		511826: "芦山县",
+		511827: "宝兴县",
+		511902: "巴州区",
+		511903: "恩阳区",
+		511921: "通江县",
+		511922: "南江县",
+		511923: "平昌县",
+		512002: "雁江区",
+		512021: "安岳县",
+		512022: "乐至县",
+		512081: "简阳市",
+		513201: "马尔康市",
+		513221: "汶川县",
+		513222: "理县",
+		513223: "茂县",
+		513224: "松潘县",
+		513225: "九寨沟县",
+		513226: "金川县",
+		513227: "小金县",
+		513228: "黑水县",
+		513230: "壤塘县",
+		513231: "阿坝县",
+		513232: "若尔盖县",
+		513233: "红原县",
+		513321: "康定市",
+		513322: "泸定县",
+		513323: "丹巴县",
+		513324: "九龙县",
+		513325: "雅江县",
+		513326: "道孚县",
+		513327: "炉霍县",
+		513328: "甘孜县",
+		513329: "新龙县",
+		513330: "德格县",
+		513331: "白玉县",
+		513332: "石渠县",
+		513333: "色达县",
+		513334: "理塘县",
+		513335: "巴塘县",
+		513336: "乡城县",
+		513337: "稻城县",
+		513338: "得荣县",
+		513401: "西昌市",
+		513422: "木里藏族自治县",
+		513423: "盐源县",
+		513424: "德昌县",
+		513425: "会理市",
+		513426: "会东县",
+		513427: "宁南县",
+		513428: "普格县",
+		513429: "布拖县",
+		513430: "金阳县",
+		513431: "昭觉县",
+		513432: "喜德县",
+		513433: "冕宁县",
+		513434: "越西县",
+		513435: "甘洛县",
+		513436: "美姑县",
+		513437: "雷波县",
+		520102: "南明区",
+		520103: "云岩区",
+		520111: "花溪区",
+		520112: "乌当区",
+		520113: "白云区",
+		520121: "开阳县",
+		520122: "息烽县",
+		520123: "修文县",
+		520151: "观山湖区",
+		520181: "清镇市",
+		520201: "钟山区",
+		520203: "六枝特区",
+		520221: "水城区",
+		520281: "盘州市",
+		520302: "红花岗区",
+		520303: "汇川区",
+		520304: "播州区",
+		520322: "桐梓县",
+		520323: "绥阳县",
+		520324: "正安县",
+		520325: "道真仡佬族苗族自治县",
+		520326: "务川仡佬族苗族自治县",
+		520327: "凤冈县",
+		520328: "湄潭县",
+		520329: "余庆县",
+		520330: "习水县",
+		520381: "赤水市",
+		520382: "仁怀市",
+		520402: "西秀区",
+		520421: "平坝区",
+		520422: "普定县",
+		520423: "镇宁布依族苗族自治县",
+		520424: "关岭布依族苗族自治县",
+		520425: "紫云苗族布依族自治县",
+		522201: "碧江区",
+		522222: "江口县",
+		522223: "玉屏侗族自治县",
+		522224: "石阡县",
+		522225: "思南县",
+		522226: "印江土家族苗族自治县",
+		522227: "德江县",
+		522228: "沿河土家族自治县",
+		522229: "松桃苗族自治县",
+		522230: "万山区",
+		522301: "兴义市",
+		522302: "兴仁市",
+		522323: "普安县",
+		522324: "晴隆县",
+		522325: "贞丰县",
+		522326: "望谟县",
+		522327: "册亨县",
+		522328: "安龙县",
+		522401: "七星关区",
+		522422: "大方县",
+		522423: "黔西市",
+		522424: "金沙县",
+		522425: "织金县",
+		522426: "纳雍县",
+		522427: "威宁彝族回族苗族自治县",
+		522428: "赫章县",
+		522601: "凯里市",
+		522622: "黄平县",
+		522623: "施秉县",
+		522624: "三穗县",
+		522625: "镇远县",
+		522626: "岑巩县",
+		522627: "天柱县",
+		522628: "锦屏县",
+		522629: "剑河县",
+		522630: "台江县",
+		522631: "黎平县",
+		522632: "榕江县",
+		522633: "从江县",
+		522634: "雷山县",
+		522635: "麻江县",
+		522636: "丹寨县",
+		522701: "都匀市",
+		522702: "福泉市",
+		522722: "荔波县",
+		522723: "贵定县",
+		522725: "瓮安县",
+		522726: "独山县",
+		522727: "平塘县",
+		522728: "罗甸县",
+		522729: "长顺县",
+		522730: "龙里县",
+		522731: "惠水县",
+		522732: "三都水族自治县",
+		530102: "五华区",
+		530103: "盘龙区",
+		530111: "官渡区",
+		530112: "西山区",
+		530113: "东川区",
+		530115: "晋宁区",
+		530121: "呈贡区",
+		530124: "富民县",
+		530125: "宜良县",
+		530126: "石林彝族自治县",
+		530127: "嵩明县",
+		530128: "禄劝彝族苗族自治县",
+		530129: "寻甸回族彝族自治县",
+		530181: "安宁市",
+		530302: "麒麟区",
+		530303: "沾益区",
+		530304: "马龙区",
+		530322: "陆良县",
+		530323: "师宗县",
+		530324: "罗平县",
+		530325: "富源县",
+		530326: "会泽县",
+		530381: "宣威市",
+		530402: "红塔区",
+		530403: "江川区",
+		530423: "通海县",
+		530424: "华宁县",
+		530425: "易门县",
+		530426: "峨山彝族自治县",
+		530427: "新平彝族傣族自治县",
+		530428: "元江哈尼族彝族傣族自治县",
+		530481: "澄江市",
+		530502: "隆阳区",
+		530521: "施甸县",
+		530523: "龙陵县",
+		530524: "昌宁县",
+		530581: "腾冲市",
+		530602: "昭阳区",
+		530621: "鲁甸县",
+		530622: "巧家县",
+		530623: "盐津县",
+		530624: "大关县",
+		530625: "永善县",
+		530626: "绥江县",
+		530627: "镇雄县",
+		530628: "彝良县",
+		530629: "威信县",
+		530681: "水富市",
+		530702: "古城区",
+		530721: "玉龙纳西族自治县",
+		530722: "永胜县",
+		530723: "华坪县",
+		530724: "宁蒗彝族自治县",
+		530802: "思茅区",
+		530821: "宁洱哈尼族彝族自治县",
+		530822: "墨江哈尼族自治县",
+		530823: "景东彝族自治县",
+		530824: "景谷傣族彝族自治县",
+		530825: "镇沅彝族哈尼族拉祜族自治县",
+		530826: "江城哈尼族彝族自治县",
+		530827: "孟连傣族拉祜族佤族自治县",
+		530828: "澜沧拉祜族自治县",
+		530829: "西盟佤族自治县",
+		530902: "临翔区",
+		530921: "凤庆县",
+		530922: "云县",
+		530923: "永德县",
+		530924: "镇康县",
+		530925: "双江拉祜族佤族布朗族傣族自治县",
+		530926: "耿马傣族佤族自治县",
+		530927: "沧源佤族自治县",
+		532301: "楚雄市",
+		532322: "双柏县",
+		532323: "牟定县",
+		532324: "南华县",
+		532325: "姚安县",
+		532326: "大姚县",
+		532327: "永仁县",
+		532328: "元谋县",
+		532329: "武定县",
+		532331: "禄丰市",
+		532501: "个旧市",
+		532502: "开远市",
+		532522: "蒙自市",
+		532523: "屏边苗族自治县",
+		532524: "建水县",
+		532525: "石屏县",
+		532526: "弥勒市",
+		532527: "泸西县",
+		532528: "元阳县",
+		532529: "红河县",
+		532530: "金平苗族瑶族傣族自治县",
+		532531: "绿春县",
+		532532: "河口瑶族自治县",
+		532621: "文山市",
+		532622: "砚山县",
+		532623: "西畴县",
+		532624: "麻栗坡县",
+		532625: "马关县",
+		532626: "丘北县",
+		532627: "广南县",
+		532628: "富宁县",
+		532801: "景洪市",
+		532822: "勐海县",
+		532823: "勐腊县",
+		532901: "大理市",
+		532922: "漾濞彝族自治县",
+		532923: "祥云县",
+		532924: "宾川县",
+		532925: "弥渡县",
+		532926: "南涧彝族自治县",
+		532927: "巍山彝族回族自治县",
+		532928: "永平县",
+		532929: "云龙县",
+		532930: "洱源县",
+		532931: "剑川县",
+		532932: "鹤庆县",
+		533102: "瑞丽市",
+		533103: "芒市",
+		533122: "梁河县",
+		533123: "盈江县",
+		533124: "陇川县",
+		533301: "泸水市",
+		533323: "福贡县",
+		533324: "贡山独龙族怒族自治县",
+		533325: "兰坪白族普米族自治县",
+		533421: "香格里拉市",
+		533422: "德钦县",
+		533423: "维西傈僳族自治县",
+		540102: "城关区",
+		540103: "堆龙德庆区",
+		540104: "达孜区",
+		540121: "林周县",
+		540122: "当雄县",
+		540123: "尼木县",
+		540124: "曲水县",
+		540127: "墨竹工卡县",
+		540502: "乃东区",
+		540602: "色尼区",
+		542121: "卡若区",
+		542122: "江达县",
+		542123: "贡觉县",
+		542124: "类乌齐县",
+		542125: "丁青县",
+		542126: "察雅县",
+		542127: "八宿县",
+		542128: "左贡县",
+		542129: "芒康县",
+		542132: "洛隆县",
+		542133: "边坝县",
+		542222: "扎囊县",
+		542223: "贡嘎县",
+		542224: "桑日县",
+		542225: "琼结县",
+		542226: "曲松县",
+		542227: "措美县",
+		542228: "洛扎县",
+		542229: "加查县",
+		542231: "隆子县",
+		542232: "错那县",
+		542233: "浪卡子县",
+		542301: "桑珠孜区",
+		542322: "南木林县",
+		542323: "江孜县",
+		542324: "定日县",
+		542325: "萨迦县",
+		542326: "拉孜县",
+		542327: "昂仁县",
+		542328: "谢通门县",
+		542329: "白朗县",
+		542330: "仁布县",
+		542331: "康马县",
+		542332: "定结县",
+		542333: "仲巴县",
+		542334: "亚东县",
+		542335: "吉隆县",
+		542336: "聂拉木县",
+		542337: "萨嘎县",
+		542338: "岗巴县",
+		542422: "嘉黎县",
+		542423: "比如县",
+		542424: "聂荣县",
+		542425: "安多县",
+		542426: "申扎县",
+		542427: "索县",
+		542428: "班戈县",
+		542429: "巴青县",
+		542430: "尼玛县",
+		542432: "双湖县",
+		542521: "普兰县",
+		542522: "札达县",
+		542523: "噶尔县",
+		542524: "日土县",
+		542525: "革吉县",
+		542526: "改则县",
+		542527: "措勤县",
+		542621: "巴宜区",
+		542622: "工布江达县",
+		542623: "米林县",
+		542624: "墨脱县",
+		542625: "波密县",
+		542626: "察隅县",
+		542627: "朗县",
+		610102: "新城区",
+		610103: "碑林区",
+		610104: "莲湖区",
+		610111: "灞桥区",
+		610112: "未央区",
+		610113: "雁塔区",
+		610114: "阎良区",
+		610115: "临潼区",
+		610116: "长安区",
+		610118: "鄠邑区",
+		610122: "蓝田县",
+		610124: "周至县",
+		610126: "高陵区",
+		610202: "王益区",
+		610203: "印台区",
+		610204: "耀州区",
+		610222: "宜君县",
+		610302: "渭滨区",
+		610303: "金台区",
+		610304: "陈仓区",
+		610322: "凤翔区",
+		610323: "岐山县",
+		610324: "扶风县",
+		610326: "眉县",
+		610327: "陇县",
+		610328: "千阳县",
+		610329: "麟游县",
+		610330: "凤县",
+		610331: "太白县",
+		610402: "秦都区",
+		610403: "杨陵区",
+		610404: "渭城区",
+		610422: "三原县",
+		610423: "泾阳县",
+		610424: "乾县",
+		610425: "礼泉县",
+		610426: "永寿县",
+		610428: "长武县",
+		610429: "旬邑县",
+		610430: "淳化县",
+		610431: "武功县",
+		610481: "兴平市",
+		610482: "彬州市",
+		610502: "临渭区",
+		610503: "华州区",
+		610522: "潼关县",
+		610523: "大荔县",
+		610524: "合阳县",
+		610525: "澄城县",
+		610526: "蒲城县",
+		610527: "白水县",
+		610528: "富平县",
+		610581: "韩城市",
+		610582: "华阴市",
+		610602: "宝塔区",
+		610603: "安塞区",
+		610621: "延长县",
+		610622: "延川县",
+		610623: "子长市",
+		610625: "志丹县",
+		610626: "吴起县",
+		610627: "甘泉县",
+		610628: "富县",
+		610629: "洛川县",
+		610630: "宜川县",
+		610631: "黄龙县",
+		610632: "黄陵县",
+		610702: "汉台区",
+		610703: "南郑区",
+		610722: "城固县",
+		610723: "洋县",
+		610724: "西乡县",
+		610725: "勉县",
+		610726: "宁强县",
+		610727: "略阳县",
+		610728: "镇巴县",
+		610729: "留坝县",
+		610730: "佛坪县",
+		610802: "榆阳区",
+		610803: "横山区",
+		610822: "府谷县",
+		610824: "靖边县",
+		610825: "定边县",
+		610826: "绥德县",
+		610827: "米脂县",
+		610828: "佳县",
+		610829: "吴堡县",
+		610830: "清涧县",
+		610831: "子洲县",
+		610881: "神木市",
+		610902: "汉滨区",
+		610921: "汉阴县",
+		610922: "石泉县",
+		610923: "宁陕县",
+		610924: "紫阳县",
+		610925: "岚皋县",
+		610926: "平利县",
+		610927: "镇坪县",
+		610928: "旬阳市",
+		610929: "白河县",
+		611002: "商州区",
+		611021: "洛南县",
+		611022: "丹凤县",
+		611023: "商南县",
+		611024: "山阳县",
+		611025: "镇安县",
+		611026: "柞水县",
+		620102: "城关区",
+		620103: "七里河区",
+		620104: "西固区",
+		620105: "安宁区",
+		620111: "红古区",
+		620121: "永登县",
+		620122: "皋兰县",
+		620123: "榆中县",
+		620302: "金川区",
+		620321: "永昌县",
+		620402: "白银区",
+		620403: "平川区",
+		620421: "靖远县",
+		620422: "会宁县",
+		620423: "景泰县",
+		620502: "秦州区",
+		620503: "麦积区",
+		620521: "清水县",
+		620522: "秦安县",
+		620523: "甘谷县",
+		620524: "武山县",
+		620525: "张家川回族自治县",
+		620602: "凉州区",
+		620621: "民勤县",
+		620622: "古浪县",
+		620623: "天祝藏族自治县",
+		620702: "甘州区",
+		620721: "肃南裕固族自治县",
+		620722: "民乐县",
+		620723: "临泽县",
+		620724: "高台县",
+		620725: "山丹县",
+		620802: "崆峒区",
+		620821: "泾川县",
+		620822: "灵台县",
+		620823: "崇信县",
+		620824: "华亭市",
+		620825: "庄浪县",
+		620826: "静宁县",
+		620902: "肃州区",
+		620921: "金塔县",
+		620922: "瓜州县",
+		620923: "肃北蒙古族自治县",
+		620924: "阿克塞哈萨克族自治县",
+		620981: "玉门市",
+		620982: "敦煌市",
+		621002: "西峰区",
+		621021: "庆城县",
+		621022: "环县",
+		621023: "华池县",
+		621024: "合水县",
+		621025: "正宁县",
+		621026: "宁县",
+		621027: "镇原县",
+		621102: "安定区",
+		621121: "通渭县",
+		621122: "陇西县",
+		621123: "渭源县",
+		621124: "临洮县",
+		621125: "漳县",
+		621126: "岷县",
+		621202: "武都区",
+		621221: "成县",
+		621222: "文县",
+		621223: "宕昌县",
+		621224: "康县",
+		621225: "西和县",
+		621226: "礼县",
+		621227: "徽县",
+		621228: "两当县",
+		622901: "临夏市",
+		622921: "临夏县",
+		622922: "康乐县",
+		622923: "永靖县",
+		622924: "广河县",
+		622925: "和政县",
+		622926: "东乡族自治县",
+		622927: "积石山保安族东乡族撒拉族自治县",
+		623001: "合作市",
+		623021: "临潭县",
+		623022: "卓尼县",
+		623023: "舟曲县",
+		623024: "迭部县",
+		623025: "玛曲县",
+		623026: "碌曲县",
+		623027: "夏河县",
+		630102: "城东区",
+		630103: "城中区",
+		630104: "城西区",
+		630105: "城北区",
+		630121: "大通回族土族自治县",
+		630122: "湟中区",
+		630123: "湟源县",
+		632121: "平安区",
+		632122: "民和回族土族自治县",
+		632123: "乐都区",
+		632126: "互助土族自治县",
+		632127: "化隆回族自治县",
+		632128: "循化撒拉族自治县",
+		632221: "门源回族自治县",
+		632222: "祁连县",
+		632223: "海晏县",
+		632224: "刚察县",
+		632321: "同仁市",
+		632322: "尖扎县",
+		632323: "泽库县",
+		632324: "河南蒙古族自治县",
+		632521: "共和县",
+		632522: "同德县",
+		632523: "贵德县",
+		632524: "兴海县",
+		632525: "贵南县",
+		632621: "玛沁县",
+		632622: "班玛县",
+		632623: "甘德县",
+		632624: "达日县",
+		632625: "久治县",
+		632626: "玛多县",
+		632721: "玉树市",
+		632722: "杂多县",
+		632723: "称多县",
+		632724: "治多县",
+		632725: "囊谦县",
+		632726: "曲麻莱县",
+		632801: "格尔木市",
+		632802: "德令哈市",
+		632803: "茫崖市",
+		632821: "乌兰县",
+		632822: "都兰县",
+		632823: "天峻县",
+		640104: "兴庆区",
+		640105: "西夏区",
+		640106: "金凤区",
+		640121: "永宁县",
+		640122: "贺兰县",
+		640181: "灵武市",
+		640202: "大武口区",
+		640205: "惠农区",
+		640221: "平罗县",
+		640302: "利通区",
+		640303: "红寺堡区",
+		640323: "盐池县",
+		640324: "同心县",
+		640381: "青铜峡市",
+		640402: "原州区",
+		640422: "西吉县",
+		640423: "隆德县",
+		640424: "泾源县",
+		640425: "彭阳县",
+		640502: "沙坡头区",
+		640521: "中宁县",
+		640522: "海原县",
+		650102: "天山区",
+		650103: "沙依巴克区",
+		650104: "新市区",
+		650105: "水磨沟区",
+		650106: "头屯河区",
+		650107: "达坂城区",
+		650109: "米东区",
+		650121: "乌鲁木齐县",
+		650202: "独山子区",
+		650203: "克拉玛依区",
+		650204: "白碱滩区",
+		650205: "乌尔禾区",
+		650502: "伊州区",
+		652101: "高昌区",
+		652122: "鄯善县",
+		652123: "托克逊县",
+		652222: "巴里坤哈萨克自治县",
+		652223: "伊吾县",
+		652301: "昌吉市",
+		652302: "阜康市",
+		652323: "呼图壁县",
+		652324: "玛纳斯县",
+		652325: "奇台县",
+		652327: "吉木萨尔县",
+		652328: "木垒哈萨克自治县",
+		652701: "博乐市",
+		652702: "阿拉山口市",
+		652722: "精河县",
+		652723: "温泉县",
+		652801: "库尔勒市",
+		652822: "轮台县",
+		652823: "尉犁县",
+		652824: "若羌县",
+		652825: "且末县",
+		652826: "焉耆回族自治县",
+		652827: "和静县",
+		652828: "和硕县",
+		652829: "博湖县",
+		652901: "阿克苏市",
+		652922: "温宿县",
+		652923: "库车市",
+		652924: "沙雅县",
+		652925: "新和县",
+		652926: "拜城县",
+		652927: "乌什县",
+		652928: "阿瓦提县",
+		652929: "柯坪县",
+		653001: "阿图什市",
+		653022: "阿克陶县",
+		653023: "阿合奇县",
+		653024: "乌恰县",
+		653101: "喀什市",
+		653121: "疏附县",
+		653122: "疏勒县",
+		653123: "英吉沙县",
+		653124: "泽普县",
+		653125: "莎车县",
+		653126: "叶城县",
+		653127: "麦盖提县",
+		653128: "岳普湖县",
+		653129: "伽师县",
+		653130: "巴楚县",
+		653131: "塔什库尔干塔吉克自治县",
+		653201: "和田市",
+		653221: "和田县",
+		653222: "墨玉县",
+		653223: "皮山县",
+		653224: "洛浦县",
+		653225: "策勒县",
+		653226: "于田县",
+		653227: "民丰县",
+		654002: "伊宁市",
+		654003: "奎屯市",
+		654004: "霍尔果斯市",
+		654021: "伊宁县",
+		654022: "察布查尔锡伯自治县",
+		654023: "霍城县",
+		654024: "巩留县",
+		654025: "新源县",
+		654026: "昭苏县",
+		654027: "特克斯县",
+		654028: "尼勒克县",
+		654201: "塔城市",
+		654202: "乌苏市",
+		654221: "额敏县",
+		654223: "沙湾市",
+		654224: "托里县",
+		654225: "裕民县",
+		654226: "和布克赛尔蒙古自治县",
+		654301: "阿勒泰市",
+		654321: "布尔津县",
+		654322: "富蕴县",
+		654323: "福海县",
+		654324: "哈巴河县",
+		654325: "青河县",
+		654326: "吉木乃县",
+		659001: "石河子市",
+		710101: "中正区",
+		710102: "大同区",
+		710103: "中山区",
+		710104: "松山区",
+		710105: "大安区",
+		710106: "万华区",
+		710107: "信义区",
+		710108: "士林区",
+		710109: "北投区",
+		710110: "内湖区",
+		710111: "南港区",
+		710112: "文山区",
+		710201: "新兴区",
+		710202: "前金区",
+		710203: "芩雅区",
+		710204: "盐埕区",
+		710205: "鼓山区",
+		710206: "旗津区",
+		710207: "前镇区",
+		710208: "三民区",
+		710209: "左营区",
+		710210: "楠梓区",
+		710211: "小港区",
+		710241: "苓雅区",
+		710242: "仁武区",
+		710243: "大社区",
+		710244: "冈山区",
+		710245: "路竹区",
+		710246: "阿莲区",
+		710247: "田寮区",
+		710248: "燕巢区",
+		710249: "桥头区",
+		710250: "梓官区",
+		710251: "弥陀区",
+		710252: "永安区",
+		710253: "湖内区",
+		710254: "凤山区",
+		710255: "大寮区",
+		710256: "林园区",
+		710257: "鸟松区",
+		710258: "大树区",
+		710259: "旗山区",
+		710260: "美浓区",
+		710261: "六龟区",
+		710262: "内门区",
+		710263: "杉林区",
+		710264: "甲仙区",
+		710265: "桃源区",
+		710266: "那玛夏区",
+		710267: "茂林区",
+		710268: "茄萣区",
+		710301: "中西区",
+		710302: "东区",
+		710303: "南区",
+		710304: "北区",
+		710305: "安平区",
+		710306: "安南区",
+		710339: "永康区",
+		710340: "归仁区",
+		710341: "新化区",
+		710342: "左镇区",
+		710343: "玉井区",
+		710344: "楠西区",
+		710345: "南化区",
+		710346: "仁德区",
+		710347: "关庙区",
+		710348: "龙崎区",
+		710349: "官田区",
+		710350: "麻豆区",
+		710351: "佳里区",
+		710352: "西港区",
+		710353: "七股区",
+		710354: "将军区",
+		710355: "学甲区",
+		710356: "北门区",
+		710357: "新营区",
+		710358: "后壁区",
+		710359: "白河区",
+		710360: "东山区",
+		710361: "六甲区",
+		710362: "下营区",
+		710363: "柳营区",
+		710364: "盐水区",
+		710365: "善化区",
+		710366: "大内区",
+		710367: "山上区",
+		710368: "新市区",
+		710369: "安定区",
+		710401: "中区",
+		710402: "东区",
+		710403: "南区",
+		710404: "西区",
+		710405: "北区",
+		710406: "北屯区",
+		710407: "西屯区",
+		710408: "南屯区",
+		710431: "太平区",
+		710432: "大里区",
+		710433: "雾峰区",
+		710434: "乌日区",
+		710435: "丰原区",
+		710436: "后里区",
+		710437: "石冈区",
+		710438: "东势区",
+		710439: "和平区",
+		710440: "新社区",
+		710441: "潭子区",
+		710442: "大雅区",
+		710443: "神冈区",
+		710444: "大肚区",
+		710445: "沙鹿区",
+		710446: "龙井区",
+		710447: "梧栖区",
+		710448: "清水区",
+		710449: "大甲区",
+		710450: "外埔区",
+		710451: "大安区",
+		710507: "金沙镇",
+		710508: "金湖镇",
+		710509: "金宁乡",
+		710510: "金城镇",
+		710511: "烈屿乡",
+		710512: "乌坵乡",
+		710614: "南投市",
+		710615: "中寮乡",
+		710616: "草屯镇",
+		710617: "国姓乡",
+		710618: "埔里镇",
+		710619: "仁爱乡",
+		710620: "名间乡",
+		710621: "集集镇",
+		710622: "水里乡",
+		710623: "鱼池乡",
+		710624: "信义乡",
+		710625: "竹山镇",
+		710626: "鹿谷乡",
+		710701: "仁爱区",
+		710702: "信义区",
+		710703: "中正区",
+		710704: "中山区",
+		710705: "安乐区",
+		710706: "暖暖区",
+		710707: "七堵区",
+		710801: "东区",
+		710802: "北区",
+		710803: "香山区",
+		710901: "东区",
+		710902: "西区",
+		711130: "万里区",
+		711131: "金山区",
+		711132: "板桥区",
+		711133: "汐止区",
+		711134: "深坑区",
+		711135: "石碇区",
+		711136: "瑞芳区",
+		711137: "平溪区",
+		711138: "双溪区",
+		711139: "贡寮区",
+		711140: "新店区",
+		711141: "坪林区",
+		711142: "乌来区",
+		711143: "永和区",
+		711144: "中和区",
+		711145: "土城区",
+		711146: "三峡区",
+		711147: "树林区",
+		711148: "莺歌区",
+		711149: "三重区",
+		711150: "新庄区",
+		711151: "泰山区",
+		711152: "林口区",
+		711153: "芦洲区",
+		711154: "五股区",
+		711155: "八里区",
+		711156: "淡水区",
+		711157: "三芝区",
+		711158: "石门区",
+		711214: "宜兰市",
+		711215: "头城镇",
+		711216: "礁溪乡",
+		711217: "壮围乡",
+		711218: "员山乡",
+		711219: "罗东镇",
+		711220: "三星乡",
+		711221: "大同乡",
+		711222: "五结乡",
+		711223: "冬山乡",
+		711224: "苏澳镇",
+		711225: "南澳乡",
+		711226: "钓鱼台",
+		711314: "竹北市",
+		711315: "湖口乡",
+		711316: "新丰乡",
+		711317: "新埔镇",
+		711318: "关西镇",
+		711319: "芎林乡",
+		711320: "宝山乡",
+		711321: "竹东镇",
+		711322: "五峰乡",
+		711323: "横山乡",
+		711324: "尖石乡",
+		711325: "北埔乡",
+		711326: "峨眉乡",
+		711414: "中坜市",
+		711415: "平镇市",
+		711416: "龙潭乡",
+		711417: "杨梅市",
+		711418: "新屋乡",
+		711419: "观音乡",
+		711420: "桃园市",
+		711421: "龟山乡",
+		711422: "八德市",
+		711423: "大溪镇",
+		711424: "复兴乡",
+		711425: "大园乡",
+		711426: "芦竹乡",
+		711519: "竹南镇",
+		711520: "头份镇",
+		711521: "三湾乡",
+		711522: "南庄乡",
+		711523: "狮潭乡",
+		711524: "后龙镇",
+		711525: "通霄镇",
+		711526: "苑里镇",
+		711527: "苗栗市",
+		711528: "造桥乡",
+		711529: "头屋乡",
+		711530: "公馆乡",
+		711531: "大湖乡",
+		711532: "泰安乡",
+		711533: "铜锣乡",
+		711534: "三义乡",
+		711535: "西湖乡",
+		711536: "卓兰镇",
+		711727: "彰化市",
+		711728: "芬园乡",
+		711729: "花坛乡",
+		711730: "秀水乡",
+		711731: "鹿港镇",
+		711732: "福兴乡",
+		711733: "线西乡",
+		711734: "和美镇",
+		711735: "伸港乡",
+		711736: "员林镇",
+		711737: "社头乡",
+		711738: "永靖乡",
+		711739: "埔心乡",
+		711740: "溪湖镇",
+		711741: "大村乡",
+		711742: "埔盐乡",
+		711743: "田中镇",
+		711744: "北斗镇",
+		711745: "田尾乡",
+		711746: "埤头乡",
+		711747: "溪州乡",
+		711748: "竹塘乡",
+		711749: "二林镇",
+		711750: "大城乡",
+		711751: "芳苑乡",
+		711752: "二水乡",
+		711919: "番路乡",
+		711920: "梅山乡",
+		711921: "竹崎乡",
+		711922: "阿里山乡",
+		711923: "中埔乡",
+		711924: "大埔乡",
+		711925: "水上乡",
+		711926: "鹿草乡",
+		711927: "太保市",
+		711928: "朴子市",
+		711929: "东石乡",
+		711930: "六脚乡",
+		711931: "新港乡",
+		711932: "民雄乡",
+		711933: "大林镇",
+		711934: "溪口乡",
+		711935: "义竹乡",
+		711936: "布袋镇",
+		712121: "斗南镇",
+		712122: "大埤乡",
+		712123: "虎尾镇",
+		712124: "土库镇",
+		712125: "褒忠乡",
+		712126: "东势乡",
+		712127: "台西乡",
+		712128: "仑背乡",
+		712129: "麦寮乡",
+		712130: "斗六市",
+		712131: "林内乡",
+		712132: "古坑乡",
+		712133: "莿桐乡",
+		712134: "西螺镇",
+		712135: "二仑乡",
+		712136: "北港镇",
+		712137: "水林乡",
+		712138: "口湖乡",
+		712139: "四湖乡",
+		712140: "元长乡",
+		712434: "屏东市",
+		712435: "三地门乡",
+		712436: "雾台乡",
+		712437: "玛家乡",
+		712438: "九如乡",
+		712439: "里港乡",
+		712440: "高树乡",
+		712441: "盐埔乡",
+		712442: "长治乡",
+		712443: "麟洛乡",
+		712444: "竹田乡",
+		712445: "内埔乡",
+		712446: "万丹乡",
+		712447: "潮州镇",
+		712448: "泰武乡",
+		712449: "来义乡",
+		712450: "万峦乡",
+		712451: "崁顶乡",
+		712452: "新埤乡",
+		712453: "南州乡",
+		712454: "林边乡",
+		712455: "东港镇",
+		712456: "琉球乡",
+		712457: "佳冬乡",
+		712458: "新园乡",
+		712459: "枋寮乡",
+		712460: "枋山乡",
+		712461: "春日乡",
+		712462: "狮子乡",
+		712463: "车城乡",
+		712464: "牡丹乡",
+		712465: "恒春镇",
+		712466: "满州乡",
+		712517: "台东市",
+		712518: "绿岛乡",
+		712519: "兰屿乡",
+		712520: "延平乡",
+		712521: "卑南乡",
+		712522: "鹿野乡",
+		712523: "关山镇",
+		712524: "海端乡",
+		712525: "池上乡",
+		712526: "东河乡",
+		712527: "成功镇",
+		712528: "长滨乡",
+		712529: "金峰乡",
+		712530: "大武乡",
+		712531: "达仁乡",
+		712532: "太麻里乡",
+		712615: "花莲市",
+		712616: "新城乡",
+		712617: "太鲁阁",
+		712618: "秀林乡",
+		712619: "吉安乡",
+		712620: "寿丰乡",
+		712621: "凤林镇",
+		712622: "光复乡",
+		712623: "丰滨乡",
+		712624: "瑞穗乡",
+		712625: "万荣乡",
+		712626: "玉里镇",
+		712627: "卓溪乡",
+		712628: "富里乡",
+		712707: "马公市",
+		712708: "西屿乡",
+		712709: "望安乡",
+		712710: "七美乡",
+		712711: "白沙乡",
+		712712: "湖西乡",
+		712805: "南竿乡",
+		712806: "北竿乡",
+		712807: "莒光乡",
+		712808: "东引乡",
+		810101: "中西区",
+		810102: "湾仔区",
+		810103: "东区",
+		810104: "南区",
+		810201: "九龙城区",
+		810202: "油尖旺区",
+		810203: "深水埗区",
+		810204: "黄大仙区",
+		810205: "观塘区",
+		810301: "北区",
+		810302: "大埔区",
+		810303: "沙田区",
+		810304: "西贡区",
+		810305: "元朗区",
+		810306: "屯门区",
+		810307: "荃湾区",
+		810308: "葵青区",
+		810309: "离岛区",
+		820101: "花地玛堂区",
+		820102: "圣安多尼堂区",
+		820103: "大堂区",
+		820104: "望德堂区",
+		820105: "风顺堂区",
+		820201: "嘉模堂区",
+		820301: "圣方济各堂区",
+		820401: "路氹城",
+		820402: "澳门新城区",
+		36048301: "庐山市",
+		36048302: "共青城市",
+		44190004: "洪梅镇",
+		44200001: "中山港街道",
+		44200002: "石岐街道",
+		46040001: "儋州市",
+		46902101: "定安县",
+		46902301: "澄迈县",
+		46902401: "临高县",
+		46902501: "白沙黎族自治县",
+		46902801: "陵水黎族自治县",
+		46903001: "琼中黎族苗族自治县",
+		46903501: "保亭黎族苗族自治县",
+		62020001: "朝阳街道",
+		62020002: "建设街道",
+		62020003: "前进街道",
+		62020004: "胜利街道",
+		62020005: "五一街道",
+		62020006: "新华街道",
+		62020007: "峪苑街道",
+		62020008: "文殊镇",
+		62020009: "新城镇",
+		62020010: "峪泉镇",
+		65900201: "阿拉尔市",
+		65900301: "图木舒克市",
+		65900401: "五家渠市",
+		65900501: "北屯市",
+		65900601: "铁门关市",
+		65900701: "双河市",
+		65900801: "可克达拉市",
+		65900901: "昆玉市",
+		659010001: "兵团一二九团",
+		659010002: "兵团一三零团",
+		659011001: "兵团红星一场",
+		659011002: "兵团红星四场",
+		659011003: "兵团黄田农场",
+	},
+};
\ No newline at end of file
diff --git a/litemall-wx/utils/check.js b/litemall-wx/utils/check.js
index 20d0d860..b4c5e110 100644
--- a/litemall-wx/utils/check.js
+++ b/litemall-wx/utils/check.js
@@ -1,12 +1,12 @@
-function isValidPhone(str) {
-  var myreg = /^[1][3,4,5,7,8][0-9]{9}$/;
-  if (!myreg.test(str)) {
-    return false;
-  } else {
-    return true;
-  }
-}
-
-module.exports = {
-  isValidPhone
+function isValidPhone(str) {
+  var myreg = /^[1][3,4,5,7,8][0-9]{9}$/;
+  if (!myreg.test(str)) {
+    return false;
+  } else {
+    return true;
+  }
+}
+
+module.exports = {
+  isValidPhone
 }
\ No newline at end of file
diff --git a/litemall-wx/utils/user.js b/litemall-wx/utils/user.js
index 920fe7e5..32cb1e93 100644
--- a/litemall-wx/utils/user.js
+++ b/litemall-wx/utils/user.js
@@ -1,94 +1,106 @@
-/**
- * 用户相关服务
- */
-const util = require('../utils/util.js');
-const api = require('../config/api.js');
-
-
-/**
- * Promise封装wx.checkSession
- */
-function checkSession() {
-  return new Promise(function(resolve, reject) {
-    wx.checkSession({
-      success: function() {
-        resolve(true);
-      },
-      fail: function() {
-        reject(false);
-      }
-    })
-  });
-}
-
-/**
- * Promise封装wx.login
- */
-function login() {
-  return new Promise(function(resolve, reject) {
-    wx.login({
-      success: function(res) {
-        if (res.code) {
-          resolve(res);
-        } else {
-          reject(res);
-        }
-      },
-      fail: function(err) {
-        reject(err);
-      }
-    });
-  });
-}
-
-/**
- * 调用微信登录
- */
-function loginByWeixin(userInfo) {
-
-  return new Promise(function(resolve, reject) {
-    return login().then((res) => {
-      //登录远程服务器
-      util.request(api.AuthLoginByWeixin, {
-        code: res.code,
-        userInfo: userInfo
-      }, 'POST').then(res => {
-        if (res.errno === 0) {
-          //存储用户信息
-          wx.setStorageSync('userInfo', res.data.userInfo);
-          wx.setStorageSync('token', res.data.token);
-
-          resolve(res);
-        } else {
-          reject(res);
-        }
-      }).catch((err) => {
-        reject(err);
-      });
-    }).catch((err) => {
-      reject(err);
-    })
-  });
-}
-
-/**
- * 判断用户是否登录
- */
-function checkLogin() {
-  return new Promise(function(resolve, reject) {
-    if (wx.getStorageSync('userInfo') && wx.getStorageSync('token')) {
-      checkSession().then(() => {
-        resolve(true);
-      }).catch(() => {
-        reject(false);
-      });
-    } else {
-      reject(false);
-    }
-  });
-}
-
-module.exports = {
-  loginByWeixin,
-  checkLogin,
+/**
+ * 用户相关服务
+ */
+const util = require('../utils/util.js');
+const api = require('../config/api.js');
+
+
+/**
+ * Promise封装wx.checkSession
+ */
+function checkSession() {
+  return new Promise(function(resolve, reject) {
+    wx.checkSession({
+      success: function() {
+        console.log('truetruetruetruetrue')
+        
+        resolve(true);
+      },
+      fail: function() {
+        
+        reject(false);
+      }
+    })
+  });
+}
+// {
+      //   "pagePath": "pages/cart/cart",
+      //   "iconPath": "static/images/xiaoxi.png",
+      //   "selectedIconPath": "static/images/xiaoxis.png",
+      //   "text": ""
+      // },
+/**
+ * Promise封装wx.login
+ */
+function login() {
+  return new Promise(function(resolve, reject) {
+    wx.login({
+      success: function(res) {
+        if (res.code) {
+          resolve(res);
+        } else {
+          reject(res);
+        }
+      },
+      fail: function(err) {
+        reject(err);
+      }
+    });
+  });
+}
+
+/**
+ * 调用微信登录
+ */
+function loginByWeixin(userInfo) {
+  return new Promise(function(resolve, reject) {
+    return login().then((res) => {
+      //登录远程服务器
+      util.request(api.AuthLoginByWeixin, {
+        code: res.code,
+        userInfo: userInfo,
+        mobileInfo: userInfo
+      }, 'POST').then(res => {
+        if (res.errno === 0) {
+          //存储用户信息
+          wx.setStorageSync('status', res.data.status);
+          if(!!res.data.userInfo.userType){
+            wx.setStorageSync('userInfo', res.data.userInfo);
+            wx.setStorageSync('token', res.data.token);
+          }
+          resolve(res);
+        } else {
+          reject(res);
+        }
+      }).catch((err) => {
+        reject(err);
+      });
+    }).catch((err) => {
+      reject(err);
+    })
+  });
+}
+
+/**
+ * 判断用户是否登录
+ */
+function checkLogin() {
+  return new Promise(function(resolve, reject) {
+    
+    if (wx.getStorageSync('userInfo') && wx.getStorageSync('token')) {
+      
+      checkSession().then(() => {
+        resolve(true);
+      }).catch(() => {
+        reject(false);
+      });
+    } else {
+      reject(false);
+    }
+  });
+}
+
+module.exports = {
+  loginByWeixin,
+  checkLogin,
 };
\ No newline at end of file
diff --git a/litemall-wx/utils/util.js b/litemall-wx/utils/util.js
index 6f0630ad..2c7a9b30 100644
--- a/litemall-wx/utils/util.js
+++ b/litemall-wx/utils/util.js
@@ -1,93 +1,91 @@
-var api = require('../config/api.js');
-var app = getApp();
-
-function formatTime(date) {
-  var year = date.getFullYear()
-  var month = date.getMonth() + 1
-  var day = date.getDate()
-
-  var hour = date.getHours()
-  var minute = date.getMinutes()
-  var second = date.getSeconds()
-
-
-  return [year, month, day].map(formatNumber).join('-') + ' ' + [hour, minute, second].map(formatNumber).join(':')
-}
-
-function formatNumber(n) {
-  n = n.toString()
-  return n[1] ? n : '0' + n
-}
-
-/**
- * 封封微信的的request
- */
-function request(url, data = {}, method = "GET") {
-  return new Promise(function(resolve, reject) {
-    wx.request({
-      url: url,
-      data: data,
-      method: method,
-      header: {
-        'Content-Type': 'application/json',
-        'X-Litemall-Token': wx.getStorageSync('token')
-      },
-      success: function(res) {
-
-        if (res.statusCode == 200) {
-
-          if (res.data.errno == 501) {
-            // 清除登录相关内容
-            try {
-              wx.removeStorageSync('userInfo');
-              wx.removeStorageSync('token');
-            } catch (e) {
-              // Do something when catch error
-            }
-            // 切换到登录页面
-            wx.navigateTo({
-              url: '/pages/auth/login/login'
-            });
-          } else {
-            resolve(res.data);
-          }
-        } else {
-          reject(res.errMsg);
-        }
-
-      },
-      fail: function(err) {
-        reject(err)
-      }
-    })
-  });
-}
-
-function redirect(url) {
-
-  //判断页面是否需要登录
-  if (false) {
-    wx.redirectTo({
-      url: '/pages/auth/login/login'
-    });
-    return false;
-  } else {
-    wx.redirectTo({
-      url: url
-    });
-  }
-}
-
-function showErrorToast(msg) {
-  wx.showToast({
-    title: msg,
-    image: '/static/images/icon_error.png'
-  })
-}
-
-module.exports = {
-  formatTime,
-  request,
-  redirect,
-  showErrorToast
+var api = require('../config/api.js');
+var app = getApp();
+
+function formatTime(date) {
+  var year = date.getFullYear()
+  var month = date.getMonth() + 1
+  var day = date.getDate()
+
+  var hour = date.getHours()
+  var minute = date.getMinutes()
+  var second = date.getSeconds()
+
+
+  return [year, month, day].map(formatNumber).join('-') + ' ' + [hour, minute, second].map(formatNumber).join(':')
+}
+
+function formatNumber(n) {
+  n = n.toString()
+  return n[1] ? n : '0' + n
+}
+
+/**
+ * 封封微信的的request
+ */
+function request(url, data = {}, method = "GET") {
+  return new Promise(function(resolve, reject) {
+    wx.request({
+      url: url,
+      data: data,
+      method: method,
+      header: {
+        'Content-Type': 'application/json',
+        'X-Litemall-Token': wx.getStorageSync('token')
+      },
+      success: function(res) {
+        if (res.statusCode == 200) {
+          if (res.data.errno == 501) {
+            // 清除登录相关内容
+            try {
+              wx.removeStorageSync('userInfo');
+              wx.removeStorageSync('token');
+            } catch (e) {
+              // Do something when catch error
+            }
+            // 切换到登录页面
+            wx.navigateTo({
+              url: '/pages/auth/authorization/authorization'
+            });
+          } else {
+            resolve(res.data);
+          }
+        } else {
+          reject(res.errMsg);
+        }
+
+      },
+      fail: function(err) {
+        reject(err)
+      }
+    })
+  });
+}
+
+function redirect(url) {
+
+  //判断页面是否需要登录
+  if (false) {
+    wx.redirectTo({
+      url: '/pages/auth/authorization/authorization'
+    });
+    return false;
+  } else {
+    wx.redirectTo({
+      url: url
+    });
+  }
+}
+
+function showErrorToast(msg) {
+  wx.showToast({
+    title: msg,
+    image: '/static/images/icon_error.png'
+  })
+}
+
+module.exports = {
+  formatTime,
+  request,
+  redirect,
+  showErrorToast
 }
\ No newline at end of file
-- 
Gitee