Merge branch 'buttonmodify' into feature/订单服务单代码改造

xiaoyong931011

2022-03-25 7f4157d6a4983fa57c212e1286181d0d292c78d3

Merge branch 'buttonmodify' into feature/订单服务单代码改造

 zq-erp/src/main/java/com/matrix/system/common/dao/SysCompanyDao.java

@@ -40,4 +40,5 @@

    public SysCompany selectForUpdate(Long comId);

    List<SysCompany> selectAll();
}

 zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java

@@ -28,7 +28,7 @@
import com.matrix.core.constance.MatrixConstance;

/**
 * 
 *
 *  初始化web容器的类 一些网站启动需要加载的数据和方法在这里配置和执行
 * @author:姜友瑶
 * @date 2016年10月18日
@@ -61,7 +61,7 @@
    private String systemLanguage;

    /**
     * 
     *
     *  容器启动后加载数据
     * @author:姜友瑶
     * @date 2016年10月18日
@@ -79,7 +79,7 @@
                + "* =========== 成功 ===========\r\n"
                + "* DEBUG模式:" + debug+"*\r\n"
                + "* 语言环境:" + Locale.getDefault().getLanguage()+"\r\n"
			 

                + "**********************************************\r\n");
    }

@@ -93,7 +93,7 @@

    /**
     * 初始化语言环境，默认为中文
     * 
     *
     * @author JIANGYOUYAO
     * @email 935090232@qq.com
     * @date 2017年11月30日

 zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java

@@ -552,7 +552,7 @@

    // 服务器文件上传配置
    String SAVE_PATH = "/mnt/hive/static/uploadeFile/";
    String SAVE_URL = "http://resource.hive.jyymatrix.cc/uploadeFile/";
    String SAVE_URL = "http://filehive2.jyymatrix.cc/uploadeFile/";


    // 积分规则编号

 zq-erp/src/main/java/com/matrix/system/enums/WeekTypeEnum.java

New file
@@ -0,0 +1,52 @@
package com.matrix.system.enums;

import com.google.common.collect.Lists;
import com.matrix.core.enums.EnumApiShowAble;
import com.matrix.core.enums.EnumsShowVo;

import java.util.List;
import java.util.stream.Collectors;

public enum WeekTypeEnum implements EnumApiShowAble {


    WEEK_TYPE_ONE(1, "星期一"),
    WEEK_TYPE_TWO(2, "星期二"),
    WEEK_TYPE_THREE(3, "星期三"),
    WEEK_TYPE_FOUR(4, "星期四"),
    WEEK_TYPE_FIVE(5, "星期五"),
    WEEK_TYPE_SIX(6, "星期六"),
    WEEK_TYPE_SEVEN(7, "星期日");

    private  Integer value;

    private  String displayName;

    WeekTypeEnum(Integer value, String displayName) {
        this.value = value;
        this.displayName = displayName;
    }

    public Integer getValue() {
        return value;
    }

    public String getDisplayName() {
        return displayName;
    }

    @Override
    public String getEnumCode() {
        return "weekType";
    }

    @Override
    public List<EnumsShowVo> getEnumsShowVos() {
        return Lists.newArrayList(values()).stream().map(item ->
                EnumsShowVo.builder()
                        .displayName(item.getDisplayName())
                        .value(item.value)
                        .build()
        ).collect(Collectors.toList());
    }
}

 zq-erp/src/main/java/com/matrix/system/enums/WhetherTypeEnum.java

New file
@@ -0,0 +1,49 @@
package com.matrix.system.enums;

import com.google.common.collect.Lists;
import com.matrix.core.enums.EnumApiShowAble;
import com.matrix.core.enums.EnumsShowVo;

import java.util.List;
import java.util.stream.Collectors;

/**
 * 是否选择
 */
public enum WhetherTypeEnum implements EnumApiShowAble {

    WHETHER_YES(1, "是"),
    WHETHER_NO(2, "否");

    private  Integer value;

    private  String displayName;

    WhetherTypeEnum(Integer value, String displayName) {
        this.value = value;
        this.displayName = displayName;
    }

    public Integer getValue() {
        return value;
    }

    public String getDisplayName() {
        return displayName;
    }

    @Override
    public String getEnumCode() {
        return "whetherType";
    }

    @Override
    public List<EnumsShowVo> getEnumsShowVos() {
        return Lists.newArrayList(values()).stream().map(item ->
                EnumsShowVo.builder()
                        .displayName(item.getDisplayName())
                        .value(item.value)
                        .build()
        ).collect(Collectors.toList());
    }
}

 zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java

@@ -197,6 +197,30 @@

    }

    @RequestMapping(value = "/showAllList")
    @ResponseBody
    public AjaxResult showAllList(ShoppingGoods shoppingGoods, PaginationVO pageVo) {
        QueryUtil.setQueryLimit(shoppingGoods);
        if(StringUtils.isBlank(pageVo.getSort())){
            pageVo.setOrder("desc");
            pageVo.setSort("createTime");
        }

        //2表示查询总部产品
        if (shoppingGoods.getHeadquarters()!=null && 2==shoppingGoods.getHeadquarters()) {
            //仅查询本店产品
            SysShopInfo zbShop = shopInfoDao.selectZbShop(getMe().getCompanyId());
            //如果是总部自己查询自己的库存则不需加入这个调价
            if (getMe().getShopId().equals(zbShop.getId())){
                shoppingGoods.setHeadquarters(1);
            }
        }
        shoppingGoods.setIsDel(ShoppingGoods.NORMAL);
        List<ShoppingGoods> dataList = shoppingGoodsService.findInPage(shoppingGoods, pageVo);
        AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList, shoppingGoodsService.findTotal(shoppingGoods));
        return result;
    }

    @RequestMapping(value = "/showListShopId")
    @ResponseBody
    public AjaxResult showListShopId(ShoppingGoods shoppingGoods, PaginationVO pageVo) {

 zq-erp/src/main/resources/config/dev/config.json

@@ -8,7 +8,7 @@
    "imageCompressEnable": true, /* 是否压缩图片,默认是true */
    "imageCompressBorder": 1600, /* 图片压缩最长边限制 */
    "imageInsertAlign": "none", /* 插入的图片浮动方式 */
    "imageUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "imageUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "imagePathFormat": "/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
                                /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
                                /* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
@@ -28,13 +28,13 @@
    "scrawlFieldName": "upfile", /* 提交的图片表单名称 */
    "scrawlPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
    "scrawlMaxSize": 2048000, /* 上传大小限制，单位B */
    "scrawlUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "scrawlUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "scrawlInsertAlign": "none",

    /* 截图工具上传 */
    "snapscreenActionName": "uploadimage", /* 执行上传截图的action名称 */
    "snapscreenPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
    "snapscreenUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "snapscreenUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "snapscreenInsertAlign": "none", /* 插入的图片浮动方式 */

    /* 抓取远程图片配置 */
@@ -42,7 +42,7 @@
    "catcherActionName": "catchimage", /* 执行抓取远程图片的action名称 */
    "catcherFieldName": "source", /* 提交的图片列表表单名称 */
    "catcherPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
    "catcherUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "catcherUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "catcherMaxSize": 2048000, /* 上传大小限制，单位B */
    "catcherAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 抓取图片格式显示 */


 zq-erp/src/main/resources/config/lhx/config.json

@@ -8,7 +8,7 @@
    "imageCompressEnable": true, /* 是否压缩图片,默认是true */
    "imageCompressBorder": 1600, /* 图片压缩最长边限制 */
    "imageInsertAlign": "none", /* 插入的图片浮动方式 */
    "imageUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "imageUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "imagePathFormat": "/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
                                /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
                                /* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
@@ -28,13 +28,13 @@
    "scrawlFieldName": "upfile", /* 提交的图片表单名称 */
    "scrawlPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
    "scrawlMaxSize": 2048000, /* 上传大小限制，单位B */
    "scrawlUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "scrawlUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "scrawlInsertAlign": "none",

    /* 截图工具上传 */
    "snapscreenActionName": "uploadimage", /* 执行上传截图的action名称 */
    "snapscreenPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
    "snapscreenUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "snapscreenUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "snapscreenInsertAlign": "none", /* 插入的图片浮动方式 */

    /* 抓取远程图片配置 */
@@ -42,7 +42,7 @@
    "catcherActionName": "catchimage", /* 执行抓取远程图片的action名称 */
    "catcherFieldName": "source", /* 提交的图片列表表单名称 */
    "catcherPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
    "catcherUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "catcherUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "catcherMaxSize": 2048000, /* 上传大小限制，单位B */
    "catcherAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 抓取图片格式显示 */


 zq-erp/src/main/resources/config/mdprd/application.properties

@@ -68,4 +68,5 @@

#默认头像
default.vip.photo.woman=https://filehive2.jyymatrix.cc/uploadeFile/20210125/db53552e688040afb286686f081e1e68f3fe946f75624598828f01898635152e.png
default.vip.photo.man=https://filehive2.jyymatrix.cc/uploadeFile/20210125/3642f1d827c44c76832fea106c85e0f89e089c16cbcc4dd0a82bb52b9ac700f4.png
default.vip.photo.man=https://filehive2.jyymatrix.cc/uploadeFile/20210125/3642f1d827c44c76832fea106c85e0f89e089c16cbcc4dd0a82bb52b9ac700f4.png


 zq-erp/src/main/resources/config/mdprd/config.json

@@ -8,7 +8,7 @@
    "imageCompressEnable": true, /* 是否压缩图片,默认是true */
    "imageCompressBorder": 1600, /* 图片压缩最长边限制 */
    "imageInsertAlign": "none", /* 插入的图片浮动方式 */
    "imageUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "imageUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile/md", /* 图片访问路径前缀 */
    "imagePathFormat": "/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
                                /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
                                /* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
@@ -28,13 +28,13 @@
    "scrawlFieldName": "upfile", /* 提交的图片表单名称 */
    "scrawlPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
    "scrawlMaxSize": 2048000, /* 上传大小限制，单位B */
    "scrawlUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "scrawlUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile/md", /* 图片访问路径前缀 */
    "scrawlInsertAlign": "none",

    /* 截图工具上传 */
    "snapscreenActionName": "uploadimage", /* 执行上传截图的action名称 */
    "snapscreenPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
    "snapscreenUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "snapscreenUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile/md", /* 图片访问路径前缀 */
    "snapscreenInsertAlign": "none", /* 插入的图片浮动方式 */

    /* 抓取远程图片配置 */
@@ -42,7 +42,7 @@
    "catcherActionName": "catchimage", /* 执行抓取远程图片的action名称 */
    "catcherFieldName": "source", /* 提交的图片列表表单名称 */
    "catcherPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
    "catcherUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "catcherUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile/md", /* 图片访问路径前缀 */
    "catcherMaxSize": 2048000, /* 上传大小限制，单位B */
    "catcherAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 抓取图片格式显示 */


 zq-erp/src/main/resources/config/prd/application.properties

@@ -26,6 +26,7 @@
spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
spring.thymeleaf.prefix: classpath:/templates/views/
spring.thymeleaf.cache=false
mybatis-plus.global-config.db-config.id-type=auto
mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml
mybatis-plus.mapper-locations=classpath*:mybatis/mapper/**/*.xml
#设置全局时间返回格式 第三行设置为true表示返回时间戳
@@ -68,3 +69,4 @@
#默认头像
default.vip.photo.woman=https://filehive2.jyymatrix.cc/uploadeFile/20210125/db53552e688040afb286686f081e1e68f3fe946f75624598828f01898635152e.png
default.vip.photo.man=https://filehive2.jyymatrix.cc/uploadeFile/20210125/3642f1d827c44c76832fea106c85e0f89e089c16cbcc4dd0a82bb52b9ac700f4.png


 zq-erp/src/main/resources/config/prd/config.json

@@ -8,7 +8,7 @@
    "imageCompressEnable": true, /* 是否压缩图片,默认是true */
    "imageCompressBorder": 1600, /* 图片压缩最长边限制 */
    "imageInsertAlign": "none", /* 插入的图片浮动方式 */
    "imageUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "imageUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "imagePathFormat": "/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
                                /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
                                /* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
@@ -28,13 +28,13 @@
    "scrawlFieldName": "upfile", /* 提交的图片表单名称 */
    "scrawlPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
    "scrawlMaxSize": 2048000, /* 上传大小限制，单位B */
    "scrawlUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "scrawlUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "scrawlInsertAlign": "none",

    /* 截图工具上传 */
    "snapscreenActionName": "uploadimage", /* 执行上传截图的action名称 */
    "snapscreenPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
    "snapscreenUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "snapscreenUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "snapscreenInsertAlign": "none", /* 插入的图片浮动方式 */

    /* 抓取远程图片配置 */
@@ -42,7 +42,7 @@
    "catcherActionName": "catchimage", /* 执行抓取远程图片的action名称 */
    "catcherFieldName": "source", /* 提交的图片列表表单名称 */
    "catcherPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
    "catcherUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "catcherUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "catcherMaxSize": 2048000, /* 上传大小限制，单位B */
    "catcherAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 抓取图片格式显示 */


 zq-erp/src/main/resources/config/xcx/config.json

@@ -8,7 +8,7 @@
    "imageCompressEnable": true, /* 是否压缩图片,默认是true */
    "imageCompressBorder": 1600, /* 图片压缩最长边限制 */
    "imageInsertAlign": "none", /* 插入的图片浮动方式 */
    "imageUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "imageUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "imagePathFormat": "/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
                                /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
                                /* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
@@ -28,13 +28,13 @@
    "scrawlFieldName": "upfile", /* 提交的图片表单名称 */
    "scrawlPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
    "scrawlMaxSize": 2048000, /* 上传大小限制，单位B */
    "scrawlUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "scrawlUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "scrawlInsertAlign": "none",

    /* 截图工具上传 */
    "snapscreenActionName": "uploadimage", /* 执行上传截图的action名称 */
    "snapscreenPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
    "snapscreenUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "snapscreenUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "snapscreenInsertAlign": "none", /* 插入的图片浮动方式 */

    /* 抓取远程图片配置 */
@@ -42,7 +42,7 @@
    "catcherActionName": "catchimage", /* 执行抓取远程图片的action名称 */
    "catcherFieldName": "source", /* 提交的图片列表表单名称 */
    "catcherPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
    "catcherUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "catcherUrlPrefix": "http://filehive2.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
    "catcherMaxSize": 2048000, /* 上传大小限制，单位B */
    "catcherAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 抓取图片格式显示 */


 zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml

@@ -861,4 +861,7 @@
            </if>
        </where>
    </select>
    <select id="selectAll" resultMap="SysCompanyMap">
        select * from sys_company
    </select>
</mapper>

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html

@@ -118,7 +118,7 @@
        }
    </style>
</head>
<body style="overflow: hidden">
<body  >
<div  id="app" v-cloak>



 zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-md-list.html

@@ -151,7 +151,7 @@
        delUrl = basePath + "/admin/shoppinggoods/del";

        myGrid = MGrid.initGrid({
            url: basePath + "/admin/shoppinggoods/showList",
            url: basePath + "/admin/shoppinggoods/showAllList",
            delUrl: delUrl
        });
    });

 zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html

@@ -147,7 +147,7 @@
        delUrl = basePath + "/admin/shoppinggoods/del";

        myGrid = MGrid.initGrid({
            url: basePath + "/admin/shoppinggoods/showList",
            url: basePath + "/admin/shoppinggoods/showAllList",
            delUrl: delUrl
        });
    });

 zq-erp/src/main/resources/templates/views/admin/shop/parameterSetting-form.html

@@ -14,6 +14,11 @@
    <link rel="stylesheet" th:href="@{/plugin/bootstrap-3.3.5/css/bootstrap.min.css}">
    <link th:href="@{/css/styleOne/style.min.css}" rel="stylesheet" type="text/css"/>
</head>
<style>
    .el-upload__input {
        display: none !important;
    }
</style>
<body>
<div class="ibox-content" id="app" v-cloak>

@@ -34,11 +39,6 @@

                <template v-for="paramSetting in paramSettings">

                    <div v-if="paramSetting.type==4" class="form-group">
                        <label class="col-md-2 control-label">{{paramSetting.name}}</label>
                    </div>


                    <div class="form-group" v-if="paramSetting.type==1">
                        <label class="col-md-2 control-label">{{paramSetting.name}}</label>
                        <div class="col-md-8">
@@ -46,36 +46,97 @@
                        </div>
                    </div>


                    <div class="form-group" v-if="paramSetting.type==2">
                        <label class="col-md-2 control-label">{{paramSetting.name}}</label>
                        <div class="col-md-8">
                            <el-select v-model="paramSetting.userValue" placeholder="请选择">
                                <el-option
                                        v-for="item in paramSetting.value"
                                        :key="item"
                                        :label="item"
                                        :value="item">
                                </el-option>
                            </el-select>
                            <el-radio-group v-model="paramSetting.userValue">
                                <el-radio v-for="item in buttonType"
                                          :key="item.value"
                                          :label="item.displayName"
                                          :value="item.value"></el-radio>
                            </el-radio-group>
                        </div>
                    </div>

                    <div class="form-group" v-if="paramSetting.type==3">
                        <label class="col-md-2 control-label">{{paramSetting.name}}</label>
                        <div class="col-md-8">
                            <el-checkbox-group v-model="paramSetting.userValue">
                                <template v-for="item in paramSetting.value">
                                    <el-checkbox v-bind:label="item" v-bind:value="item"></el-checkbox>
                                </template>
                            </el-checkbox-group>
                            <el-select v-model="paramSetting.userValue" placeholder="">
                                <el-option
                                        v-for="item in buttonType"
                                        :key="item.value"
                                        :label="item.displayName"
                                        :value="item.displayName">
                                </el-option>
                            </el-select>
                        </div>
                    </div>

                    <div class="form-group" v-if="paramSetting.type==4">
                        <label class="col-md-2 control-label">{{paramSetting.name}}</label>
                        <div class="col-md-8">
                            <el-select v-model="paramSetting.userValue" multiple placeholder="请选择">
                                <el-option
                                        v-for="item in buttonType"
                                        :key="item.value"
                                        :label="item.displayName"
                                        :value="item.displayName">
                                </el-option>
                            </el-select>
                        </div>
                    </div>

                    <div class="form-group" v-if="paramSetting.type==5">
                        <label class="col-md-2 control-label">{{paramSetting.name}}</label>
                        <div class="col-md-8">
                            <el-input  type="textarea"  :rows="2" v-model="paramSetting.userValue"></el-input>
                            <el-upload
                                    class="upload-demo"
                                    action="/admin/multipleUploadFile/doUpload"
                                    :on-preview="handlePreview"
                                    :on-remove="handleRemove"
                                    :before-remove="beforeRemove"
                                    multiple
                                    :limit="3"
                                    :on-exceed="handleExceed"
                                    :file-list="fileList">
                                <el-button size="small" type="primary">点击上传</el-button>
                                <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
                            </el-upload>
                        </div>
                    </div>

                    <div class="form-group" v-if="paramSetting.type==6">
                        <label class="col-md-2 control-label">{{paramSetting.name}}</label>
                        <div class="col-md-8">
                            <el-upload action="/admin/multipleUploadFile/doUpload"
                                        list-type="picture-card"
                                        :auto-upload="false">
                                <i slot="default" class="el-icon-plus"></i>
                                <img v-if="paramSetting.userValue" :src="paramSetting.userValue" style="max-width: 300px;">
                                <div slot="file" slot-scope="{file}">
                                    <img class="el-upload-list__item-thumbnail"
                                            :src="file.url" alt="" >
                                    <span class="el-upload-list__item-actions">
                                    <span class="el-upload-list__item-preview"
                                            @click="handlePictureCardPreview(file)" >
                                      <i class="el-icon-zoom-in"></i>
                                    </span>
<!--                                    <span v-if="!disabled"-->
<!--                                            class="el-upload-list__item-delete"-->
<!--                                            @click="handleDownload(file)" >-->
<!--                                      <i class="el-icon-download"></i>-->
<!--                                    </span>-->
                                    <span v-if="!disabled"
                                            class="el-upload-list__item-delete"
                                            @click="handleRemove(file)" >
                                      <i class="el-icon-delete"></i>
                                    </span>
                                  </span>
                                </div>
                            </el-upload>
                            <el-dialog :visible.sync="dialogVisible">
                                <img width="100%" :src="dialogImageUrl" alt="">
                            </el-dialog>
                        </div>
                    </div>

@@ -107,6 +168,10 @@
    var app = new Vue({
        el: '#app',
        data: {
            dialogImageUrl: '',
            dialogVisible: false,
            disabled: false,

            form: {
                warehouseId: '',
                shopId: '',
@@ -116,6 +181,9 @@
            warehouses: [],
            shops: [],
            categoryList: [],
            buttonType:[],
            fileList:[],
            codeName:'',
        },
        created: function () {
            this.loadInfo();
@@ -137,15 +205,7 @@
                    data: {},
                    url: basePath + '/admin/busParameterSettings/getAllCategoryList',
                    callback: function (data) {

                        let categoryList = data.rows;
                        for (let i = 0; i < categoryList.length; i++) {
                            if (categoryList[i].type == 3) {
                                if (categoryList[i].value) {
                                    categoryList[i].value = categoryList[i].value.split(",");
                                }
                            }
                        }
                        console.log(categoryList);
                        _this.categoryList = categoryList;
                        _this.currentCategory = categoryList[0];
@@ -154,6 +214,19 @@
                });
            },

            //获取枚举列表
            loadEnum(codeName){
                let _this = this;
                //获取枚举列表
                AjaxProxy.requst({
                    app: _this,
                    url: basePath + '/common/data/getEnums',
                    data:{"enumCodes":[_this.codeName]},
                    callback: function (data) {
                        _this.buttonType = data.data[''+_this.codeName+''];
                    }
                });
            },

            //改变编辑页面，切换页面元素
            changeCategory(index) {
@@ -171,15 +244,29 @@
                    callback: function (data) {
                        let paramSettings = data.rows;
                        for (let i = 0; i < paramSettings.length; i++) {
                           if (paramSettings[i].type == 3) {
                                paramSettings[i].value = paramSettings[i].value.split(",");
                                if (paramSettings[i].userValue) {
                                    paramSettings[i].userValue = paramSettings[i].userValue.split(",");
                           if (paramSettings[i].type === 2) {
                                if(paramSettings[i].value != null && paramSettings[i].value != ''){
                                    _this.codeName = paramSettings[i].value;
                                    _this.loadEnum(_this.codeName);
                                }
                            } else if (paramSettings[i].type == 2) {
                                paramSettings[i].value = paramSettings[i].value.split(",");

                            }
                           }else if(paramSettings[i].type === 3){
                               if(paramSettings[i].value != null && paramSettings[i].value != ''){
                                   _this.codeName = paramSettings[i].value;
                                   _this.loadEnum(_this.codeName);
                               }
                           }else if(paramSettings[i].type === 4){
                               if(paramSettings[i].value != null && paramSettings[i].value != ''){
                                   //下拉框回显
                                   paramSettings[i].userValue = paramSettings[i].userValue.split(',');
                                   _this.codeName = paramSettings[i].value;
                                   _this.loadEnum(_this.codeName);
                               }
                           }else if(paramSettings[i].type === 5){
                               if(paramSettings[i].value != null && paramSettings[i].value != ''){
                               }
                           }else if(paramSettings[i].type === 6){
                                   _this.file.push(paramSettings[i].userValue);
                           }
                        }
                        _this.paramSettings = paramSettings;
                        console.log("over");
@@ -187,24 +274,49 @@
                });
            },

            submit() {
            handleRemove(file, fileList) {
                console.log(file, fileList);
            },
            handlePreview(file) {
                console.log(file);
            },
            handleExceed(files, fileList) {
                this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
            },
            beforeRemove(file, fileList) {
                return this.$confirm(`确定移除 ${ file.name }？`);
            },
            handleRemove(file) {
                console.log(file);
            },
            handlePictureCardPreview(file) {
                this.dialogImageUrl = file.url;
                this.dialogVisible = true;
            },
            handleDownload(file) {
                console.log(file);
            },

            submit() {
                console.log("提交");
                let _this = this;
                let submitDate = [];
                for (let i = 0; i < _this.paramSettings.length; i++) {
                    let paramSetting = _this.paramSettings[i];

                    let userValue = paramSetting.userValue;

                    if (paramSetting.type == 3) {
                    if (paramSetting.type == 4) {
                        userValue = paramSetting.userValue.join(",");
                    }

                    if (paramSetting.type == 6) {
                        userValue = _this.dialogImageUrl;
                        alert(_this.dialogImageUrl);
                    }
                    let obj = {
                        code: paramSetting.code,
                        userValue: userValue
                    }

                    submitDate.push(obj);
                }


 zq-erp/src/main/resources/templates/views/common/login.html

@@ -260,7 +260,7 @@

    </div>
    <div class="signup-footer" style="color: #4968bd;">
        <div class="" style="font-size: 16px;">讯聪管理系统V2.3.0</div>
<!--        <div class="" style="font-size: 16px;">讯聪管理系统V2.3.0</div>-->
        <div class="">

            <p class="download-bar" style="font-size: 12px;"><strong>浏览器：</strong>Win7以上<a

 zq-erp/src/main/resources/templates/views/super/sysCompany-form.html

@@ -1,211 +1,211 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
<meta name="renderer" content="webkit|ie-comp|ie-stand">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport"
    content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
<meta http-equiv="Cache-Control" content="no-siteapp" />
<!-- 本框架基本脚本和样式 -->
<script type="text/javascript"
    th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
<script type="text/javascript" th:src="@{/js/systools/MBase.js}"></script>
    <meta charset="utf-8">
    <META HTTP-EQUIV="Pragma" CONTENT="no-cache">
    <meta name="renderer" content="webkit|ie-comp|ie-stand">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport"
          content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
    <meta http-equiv="Cache-Control" content="no-siteapp" />
    <!-- 本框架基本脚本和样式 -->
    <script type="text/javascript"
            th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
    <script type="text/javascript" th:src="@{/js/systools/MBase.js}"></script>

<!-- 界面单独引入的其他样式和脚本 -->
<link rel="stylesheet"
    th:href="@{/plugin/zTree/zTreeStyle/zTreeStyle.css}" type="text/css">
<script type="text/javascript"
    th:src="@{/plugin/zTree/jquery.ztree.core-3.5.min.js}"></script>
<script type="text/javascript"
    th:src="@{/plugin/zTree/jquery.ztree.excheck.min.js}"></script>
    <!-- 界面单独引入的其他样式和脚本 -->
    <link rel="stylesheet"
          th:href="@{/plugin/zTree/zTreeStyle/zTreeStyle.css}" type="text/css">
    <script type="text/javascript"
            th:src="@{/plugin/zTree/jquery.ztree.core-3.5.min.js}"></script>
    <script type="text/javascript"
            th:src="@{/plugin/zTree/jquery.ztree.excheck.min.js}"></script>
    <style>
        #treeDemo{
            height: 500px;
            overflow: scroll;
            width: 300px;
        }
        #treeDemo{
            height: 500px;
            overflow: scroll;
            width: 300px;
        }

    </style>
</head>
<body>
    <div class="ibox-content">
        <form class="form-horizontal" id="dataform"
            onsubmit="javascripr:return false;">
            <input   type="hidden" name="tokenUrl" th:value="${tokenUrl}"> <input
                type="hidden" name="token" th:value="${token}"> <input
                type="hidden" name="comId" th:value="${obj.comId }">
            <div class="form-group">
                <label class="col-sm-2 control-label">公司名称<span
<div class="ibox-content">
    <form class="form-horizontal" id="dataform"
          onsubmit="javascripr:return false;">
        <input   type="hidden" name="tokenUrl" th:value="${tokenUrl}"> <input
            type="hidden" name="token" th:value="${token}"> <input
            type="hidden" name="comId" th:value="${obj.comId }">
        <div class="form-group">
            <label class="col-sm-2 control-label">公司名称<span
                    class="text-danger">*</span></label>
                <div class="col-sm-4">
                    <input   type="text" dataType="*1-100" class="form-control"
                        name="comName" th:value="${obj.comName }" 
                        nullmsg="公司名称不能为空">
                    <div class="Validform_checktip"></div>
                </div>
                <label class="col-sm-2 control-label">联系人<span
                    class="text-danger">*</span></label>
                <div class="col-sm-4">
                    <input   type="text" dataType="*1-50" class="form-control"
                        th:value="${obj.comBoss }" name="comBoss" nullmsg="联系人不能为空">
                    <div class="Validform_checktip"></div>
                </div>
            <div class="col-sm-4">
                <input   type="text" dataType="*1-100" class="form-control"
                         name="comName" th:value="${obj.comName }"
                         nullmsg="公司名称不能为空">
                <div class="Validform_checktip"></div>
            </div>
            <div class="form-group">
                <label class="col-sm-2 control-label">联系电话</label>
                <div class="col-sm-4">
                    <input   type="text" dataType="*11-11" class="form-control"
                        name="comBossTel" ignore="ignore" th:value="${obj.comBossTel }"
            <label class="col-sm-2 control-label">联系人<span
                    class="text-danger">*</span></label>
            <div class="col-sm-4">
                <input   type="text" dataType="*1-50" class="form-control"
                         th:value="${obj.comBoss }" name="comBoss" nullmsg="联系人不能为空">
                <div class="Validform_checktip"></div>
            </div>
        </div>
        <div class="form-group">
            <label class="col-sm-2 control-label">联系电话</label>
            <div class="col-sm-4">
                <input   type="text" dataType="*11-11" class="form-control"
                         name="comBossTel" ignore="ignore" th:value="${obj.comBossTel }"
                         nullmsg="联系电话不能为空">
                    <div class="Validform_checktip"></div>
                </div>
                <label class="col-sm-2 control-label">地址</label>
                <div class="col-sm-4">
                    <input   type="text" dataType="*1-510" class="form-control"
                        ignore="ignore" th:value="${obj.comAddress }" name="comAddress"
                        nullmsg="地址不能为空">
                    <div class="Validform_checktip"></div>
                </div>
                <div class="Validform_checktip"></div>
            </div>
            <div class="form-group">
                <label class="col-sm-2 control-label">网站地址<span
                        class="text-danger">*</span></label>
                <div class="col-sm-4">
                    <input   type="text"  class="form-control"
                        ignore="ignore" dataType="*1-100" th:value="${obj.comWebUrl }" name="comWebUrl"
                        nullmsg="网站不能为空">
                    <div class="Validform_checktip"></div>
                </div>
                <label class="col-sm-2 control-label">企业可以用店铺数</label>
                <div class="col-sm-4">
                    <input   type="text" dataType="n" class="form-control"
                        ignore="ignore" th:value="${obj.comAge}" name="comAge"
                        nullmsg="企业可以用店铺数不能为空">
                    <div class="Validform_checktip"></div>
                </div>
            <label class="col-sm-2 control-label">地址</label>
            <div class="col-sm-4">
                <input   type="text" dataType="*1-510" class="form-control"
                         ignore="ignore" th:value="${obj.comAddress }" name="comAddress"
                         nullmsg="地址不能为空">
                <div class="Validform_checktip"></div>
            </div>
        </div>
        <div class="form-group">
            <label class="col-sm-2 control-label">网站地址<span
                    class="text-danger">*</span></label>
            <div class="col-sm-4">
                <input   type="text"  class="form-control"
                         ignore="ignore" dataType="*1-100" th:value="${obj.comWebUrl }" name="comWebUrl"
                         nullmsg="网站不能为空">
                <div class="Validform_checktip"></div>
            </div>
            <label class="col-sm-2 control-label">企业可以用店铺数</label>
            <div class="col-sm-4">
                <input   type="text" dataType="n" class="form-control"
                         ignore="ignore" th:value="${obj.comAge}" name="comAge"
                         nullmsg="企业可以用店铺数不能为空">
                <div class="Validform_checktip"></div>
            </div>
        </div>

            <div class="form-group">
                <label class="col-sm-2 control-label">公司编码<span
                        class="text-danger">*</span></label>
                <div class="col-sm-4">
                    <input   type="text" dataType="*1-100" class="form-control"
                             name="comCode" th:value="${obj.comCode }"
                             nullmsg="公司编码不能为空">
                    <div class="Validform_checktip"></div>
                </div>
        <div class="form-group">
            <label class="col-sm-2 control-label">公司编码<span
                    class="text-danger">*</span></label>
            <div class="col-sm-4">
                <input   type="text" dataType="*1-100" class="form-control"
                         name="comCode" th:value="${obj.comCode }"
                         nullmsg="公司编码不能为空">
                <div class="Validform_checktip"></div>
            </div>
            <div class="form-group">
                <label class="col-sm-2 control-label">企业功能</label>
                <div class=" ztree col-sm-9" id="treeDemo"></div>
        </div>
        <div class="form-group">
            <label class="col-sm-2 control-label">企业功能</label>
            <div class=" ztree col-sm-9" id="treeDemo"></div>
        </div>
        <div class="form-group ">
            <div class="col-sm-12 text-center">
                <a href="javascript:;" onclick="myForm.submit()"
                   class="btn btn-success radius"><i class="fa fa-check"></i> 保存</a>&nbsp;&nbsp;&nbsp;&nbsp;
                <a class="btn btn-danger radius" href="javascript:;"
                   onclick="MTools.closeForm()"><i class="fa fa-close"></i> 关闭</a>
            </div>
            <div class="form-group ">
                <div class="col-sm-12 text-center">
                    <a href="javascript:;" onclick="myForm.submit()"
                        class="btn btn-success radius"><i class="fa fa-check"></i> 保存</a>&nbsp;&nbsp;&nbsp;&nbsp;
                    <a class="btn btn-danger radius" href="javascript:;"
                        onclick="MTools.closeForm()"><i class="fa fa-close"></i> 关闭</a>
                </div>
            </div>
        </form>
    </div>
    <script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script>
    <script th:inline="javascript">
        var invokeUrl = basePath+"/admin/sysCompany/addCompany";
        /*<![CDATA[*/
        var obj=/*[[${obj}]]*/     
        /*]]>*/
        </div>
    </form>
</div>
<script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script>
<script th:inline="javascript">
    var invokeUrl = basePath+"/admin/sysCompany/addCompany";
    /*<![CDATA[*/
    var obj=/*[[${obj}]]*/
    /*]]>*/
    if(obj.comId!=null){
        invokeUrl = basePath+"/admin/sysCompany/modifyCompany";
    }

    var myForm = null;
    var tree = null;
    $(function() {
        MTools.autoFullSelect();
        $(".select2").select2({
            'width' : '100%'
        });
        myForm = MForm.initForm({
            invokeUrl : invokeUrl,
            beforeSubmit : function() {
                var items = tree.getCheckedNodes();
                var keys = "";
                for (var i = 0; i < items.length; i++) {
                    keys += items[i]["id"] + ",";
                }
                myForm.initParam.extendParam = {
                    "comFunctions" : keys
                };
            },
            afterSubmit : function() {
                parent.myGrid.serchData();
            },
        });
        initFunctionList();
    });

    function initFunctionList() {
        var zNodes = new Array();
        $.AjaxProxy().invoke(
            basePath+"/admin/sysFunction/all",
            function(loj) {
                for (var i = 0; i < loj.getRowCount(); i++) {
                    zNodes[i] = createNode(loj.getString(i, "fnId"),
                        loj.getString(i, "fnParentId"), loj
                            .getString(i, "fnName"));
                }
                initTree(zNodes);
            });
    }

    function initTree(zNodes) {
        var setting = {
            check : {
                enable : true,
                chkStyle : "checkbox",
                radioType : "level",
                chkboxType : {
                    "Y" : "ps",
                    "N" : "ps"
                }
            },
            view : {
                dblClickExpand : false,
                showLine : true,
            },
            data : {
                simpleData : {
                    enable : true,
                    idKey : "id",
                    pIdKey : "pId",
                    rootPId : ""
                }
            },

        };
        tree = $.fn.zTree.init($("#treeDemo"), setting, zNodes);
    }

    function createNode(id, parentId, name) {
        var o = new Object();
        o.id = id;
        o.pId = parentId;
        o.name = name;
        o.open = true;
        //如果是编辑则设置节点选中
        if(obj.comId!=null){
            invokeUrl = basePath+"/admin/sysCompany/modifyCompany";
            //var fns = "${obj.comFunctions}";
            var fns = obj.comFunctions;
            if (fns.indexOf(id) != -1) {
                o.checked = true;
            }
        }

        var myForm = null;
        var tree = null;
        $(function() {
            MTools.autoFullSelect();
            $(".select2").select2({
                'width' : '100%'
            });
            myForm = MForm.initForm({
                invokeUrl : invokeUrl,
                beforeSubmit : function() {
                    var items = tree.getCheckedNodes();
                    var keys = "";
                    for (var i = 0; i < items.length; i++) {
                        keys += items[i]["id"] + ",";
                    }
                    myForm.initParam.extendParam = {
                        "comFunctions" : keys
                    };
                },
                afterSubmit : function() {
                    parent.myGrid.serchData();
                },
            });
            initFunctionList();
        });

        function initFunctionList() {
            var zNodes = new Array();
            $.AjaxProxy().invoke(
                    basePath+"/admin/sysFunction/all",
                    function(loj) {
                        for (var i = 0; i < loj.getRowCount(); i++) {
                            zNodes[i] = createNode(loj.getString(i, "fnId"),
                                    loj.getString(i, "fnParentId"), loj
                                            .getString(i, "fnName"));
                        }
                        initTree(zNodes);
                    });
        }

        function initTree(zNodes) {
            var setting = {
                check : {
                    enable : true,
                    chkStyle : "checkbox",
                    radioType : "level",
                    chkboxType : {
                        "Y" : "ps",
                        "N" : "ps"
                    }
                },
                view : {
                    dblClickExpand : false,
                    showLine : true,
                },
                data : {
                    simpleData : {
                        enable : true,
                        idKey : "id",
                        pIdKey : "pId",
                        rootPId : ""
                    }
                },

            };
            tree = $.fn.zTree.init($("#treeDemo"), setting, zNodes);
        }

        function createNode(id, parentId, name) {
            var o = new Object();
            o.id = id;
            o.pId = parentId;
            o.name = name;
            o.open = true;
            //如果是编辑则设置节点选中
        if(obj.comId!=null){
            //var fns = "${obj.comFunctions}";
            var fns = obj.comFunctions;
            if (fns.indexOf(id) != -1) {
                o.checked = true;
            }
        }
			
            return o;
        }
    </script>
        return o;
    }
</script>
</body>
</html>

 zq-xcx/project.config.json

@@ -1,224 +1,224 @@
{
  "description": "项目配置文件。",
  "packOptions": {
    "ignore": []
  },
  "setting": {
    "urlCheck": false,
    "es6": true,
    "enhance": true,
    "postcss": true,
    "preloadBackgroundData": false,
    "minified": true,
    "newFeature": true,
    "coverView": true,
    "nodeModules": false,
    "autoAudits": false,
    "showShadowRootInWxmlPanel": true,
    "scopeDataCheck": false,
    "uglifyFileName": false,
    "checkInvalidKey": true,
    "checkSiteMap": true,
    "uploadWithSourceMap": true,
    "compileHotReLoad": false,
    "useMultiFrameRuntime": true,
    "useApiHook": true,
    "useApiHostProcess": false,
    "babelSetting": {
      "ignore": [],
      "disablePlugins": [],
      "outputPath": ""
    },
    "enableEngineNative": false,
    "bundle": false,
    "useIsolateContext": true,
    "useCompilerModule": true,
    "userConfirmedUseCompilerModuleSwitch": false,
    "userConfirmedBundleSwitch": false,
    "packNpmManually": false,
    "packNpmRelationList": [],
    "minifyWXSS": true
  },
  "compileType": "miniprogram",
  "libVersion": "1.9.98",
  "appid": "wx3836ab3c1490ff29",
  "projectname": "%E8%82%BD%E7%A0%94",
  "isGameTourist": false,
  "simulatorType": "wechat",
  "simulatorPluginLibVersion": {},
  "condition": {
    "plugin": {
      "list": []
    },
    "game": {
      "list": []
    },
    "gamePlugin": {
      "list": []
    },
    "miniprogram": {
      "list": [
        {
          "id": -1,
          "name": "pages/yuyue/yyInfo",
          "pathName": "pages/yuyue/yyInfo",
          "query": "model=1&id=10",
          "scene": null
        },
        {
          "id": -1,
          "name": "pages/customerCenter/customerCenter",
          "pathName": "pages/customerCenter/customerCenter",
          "query": "",
          "scene": null
        },
        {
          "id": -1,
          "name": "pages/yuyue/order",
          "pathName": "pages/yuyue/order",
          "query": "status=0",
          "scene": null
        },
        {
          "id": -1,
          "name": "pages/service/service",
          "pathName": "pages/service/service",
          "query": "status=0",
          "scene": null
        },
        {
          "id": -1,
          "name": "pages/logistics/logistics",
          "pathName": "pages/logistics/logistics",
          "query": "id=911",
          "scene": null
        },
        {
          "id": -1,
          "name": "pages/yuyue/choseShop",
          "pathName": "pages/yuyue/choseShop",
          "query": "",
          "scene": null
        },
        {
          "id": -1,
          "name": "pages/service/service2",
          "pathName": "pages/service/service2",
          "query": "",
          "scene": null
        },
        {
          "id": -1,
          "name": "pages/shopCar/shopCar",
          "pathName": "pages/shopCar/shopCar",
          "query": "",
          "scene": null
        },
        {
          "id": 8,
          "name": "pages/groupbuy/groupList",
          "pathName": "pages/groupbuy/groupList",
          "query": "",
          "scene": null
        },
        {
          "id": 9,
          "name": "groupDetails",
          "pathName": "pages/groupbuy/groupDetails",
          "query": "",
          "scene": null
        },
        {
          "id": -1,
          "name": "pages/miaosha/msList",
          "pathName": "pages/miaosha/msList",
          "query": "",
          "scene": null
        },
        {
          "id": 11,
          "name": "pages/groupbuy/groupDetails",
          "pathName": "pages/groupbuy/groupDetails",
          "query": "id=1&shopId=16&gjId=12",
          "scene": null
        },
        {
          "id": 12,
          "name": "pages/groupbuy/groupDetails",
          "pathName": "pages/groupbuy/groupDetails",
          "query": "id=1&shopId=16&gjId=1",
          "scene": null
        },
        {
          "id": 13,
          "name": "pages/groupbuy/groupDetails",
          "pathName": "pages/groupbuy/groupDetails",
          "query": "id=1&shopId=16&gjId=1",
          "scene": null
        },
        {
          "id": 14,
          "name": "pages/groupbuy/groupDetails",
          "pathName": "pages/groupbuy/groupDetails",
          "query": "id=2&shopId=33&gjId=9",
          "scene": null
        },
        {
          "id": -1,
          "name": "pages/payOrder/paySuccess",
          "pathName": "pages/payOrder/paySuccess",
          "query": "showModel=1",
          "scene": null
        },
        {
          "id": -1,
          "name": "pages/miaosha/msList",
          "pathName": "pages/miaosha/msList",
          "query": "id=2&shopId=33&gjId=9",
          "scene": null
        },
        {
          "id": -1,
          "name": "pages/customerCenter/customerCenter",
          "pathName": "pages/shalong/shalongList",
          "query": "id=2&shopId=33&gjId=9",
          "scene": null
        },
        {
          "id": -1,
          "name": "pages/index/index",
          "pathName": "pages/shalong/shalongList",
          "query": "",
          "scene": null
        },
        {
          "id": -1,
          "name": "pages/groupbuy/groupDetails",
          "pathName": "pages/groupbuy/groupDetails",
          "query": "id=1&shopId=16&gjId=15",
          "scene": null
        },
        {
          "id": 20,
          "name": "pages/ads/showAdPage",
          "pathName": "pages/ads/showAdPage",
          "query": "pageCode=index",
          "scene": null
        },
        {
          "id": -1,
          "name": "pages/shalong/shalongDetail",
          "pathName": "pages/shalong/shalongDetail",
          "query": "id=6",
          "scene": null
        },
        {
          "name": "pages/yuyue/showYyInfo",
          "pathName": "pages/yuyue/showYyInfo",
          "query": "id=3004",
          "scene": null
        }
      ]
    }
  }
    "description": "项目配置文件。",
    "packOptions": {
        "ignore": []
    },
    "setting": {
        "urlCheck": false,
        "es6": true,
        "enhance": true,
        "postcss": true,
        "preloadBackgroundData": false,
        "minified": true,
        "newFeature": true,
        "coverView": true,
        "nodeModules": false,
        "autoAudits": false,
        "showShadowRootInWxmlPanel": true,
        "scopeDataCheck": false,
        "uglifyFileName": false,
        "checkInvalidKey": true,
        "checkSiteMap": true,
        "uploadWithSourceMap": true,
        "compileHotReLoad": false,
        "useMultiFrameRuntime": true,
        "useApiHook": true,
        "useApiHostProcess": false,
        "babelSetting": {
            "ignore": [],
            "disablePlugins": [],
            "outputPath": ""
        },
        "enableEngineNative": false,
        "bundle": false,
        "useIsolateContext": true,
        "useCompilerModule": true,
        "userConfirmedUseCompilerModuleSwitch": false,
        "userConfirmedBundleSwitch": false,
        "packNpmManually": false,
        "packNpmRelationList": [],
        "minifyWXSS": true
    },
    "compileType": "miniprogram",
    "libVersion": "1.9.98",
    "appid": "wx3836ab3c1490ff29",
    "projectname": "%E8%82%BD%E7%A0%94",
    "isGameTourist": false,
    "simulatorType": "wechat",
    "simulatorPluginLibVersion": {},
    "condition": {
        "plugin": {
            "list": []
        },
        "game": {
            "list": []
        },
        "gamePlugin": {
            "list": []
        },
        "miniprogram": {
            "list": [
                {
                    "id": -1,
                    "name": "pages/yuyue/yyInfo",
                    "pathName": "pages/yuyue/yyInfo",
                    "query": "model=1&id=10",
                    "scene": null
                },
                {
                    "id": -1,
                    "name": "pages/customerCenter/customerCenter",
                    "pathName": "pages/customerCenter/customerCenter",
                    "query": "",
                    "scene": null
                },
                {
                    "id": -1,
                    "name": "pages/yuyue/order",
                    "pathName": "pages/yuyue/order",
                    "query": "status=0",
                    "scene": null
                },
                {
                    "id": -1,
                    "name": "pages/service/service",
                    "pathName": "pages/service/service",
                    "query": "status=0",
                    "scene": null
                },
                {
                    "id": -1,
                    "name": "pages/logistics/logistics",
                    "pathName": "pages/logistics/logistics",
                    "query": "id=911",
                    "scene": null
                },
                {
                    "id": -1,
                    "name": "pages/yuyue/choseShop",
                    "pathName": "pages/yuyue/choseShop",
                    "query": "",
                    "scene": null
                },
                {
                    "id": -1,
                    "name": "pages/service/service2",
                    "pathName": "pages/service/service2",
                    "query": "",
                    "scene": null
                },
                {
                    "id": -1,
                    "name": "pages/shopCar/shopCar",
                    "pathName": "pages/shopCar/shopCar",
                    "query": "",
                    "scene": null
                },
                {
                    "id": 8,
                    "name": "pages/groupbuy/groupList",
                    "pathName": "pages/groupbuy/groupList",
                    "query": "",
                    "scene": null
                },
                {
                    "id": 9,
                    "name": "groupDetails",
                    "pathName": "pages/groupbuy/groupDetails",
                    "query": "",
                    "scene": null
                },
                {
                    "id": -1,
                    "name": "pages/miaosha/msList",
                    "pathName": "pages/miaosha/msList",
                    "query": "",
                    "scene": null
                },
                {
                    "id": 11,
                    "name": "pages/groupbuy/groupDetails",
                    "pathName": "pages/groupbuy/groupDetails",
                    "query": "id=1&shopId=16&gjId=12",
                    "scene": null
                },
                {
                    "id": 12,
                    "name": "pages/groupbuy/groupDetails",
                    "pathName": "pages/groupbuy/groupDetails",
                    "query": "id=1&shopId=16&gjId=1",
                    "scene": null
                },
                {
                    "id": 13,
                    "name": "pages/groupbuy/groupDetails",
                    "pathName": "pages/groupbuy/groupDetails",
                    "query": "id=1&shopId=16&gjId=1",
                    "scene": null
                },
                {
                    "id": 14,
                    "name": "pages/groupbuy/groupDetails",
                    "pathName": "pages/groupbuy/groupDetails",
                    "query": "id=2&shopId=33&gjId=9",
                    "scene": null
                },
                {
                    "id": -1,
                    "name": "pages/payOrder/paySuccess",
                    "pathName": "pages/payOrder/paySuccess",
                    "query": "showModel=1",
                    "scene": null
                },
                {
                    "id": -1,
                    "name": "pages/miaosha/msList",
                    "pathName": "pages/miaosha/msList",
                    "query": "id=2&shopId=33&gjId=9",
                    "scene": null
                },
                {
                    "id": -1,
                    "name": "pages/customerCenter/customerCenter",
                    "pathName": "pages/shalong/shalongList",
                    "query": "id=2&shopId=33&gjId=9",
                    "scene": null
                },
                {
                    "id": -1,
                    "name": "pages/index/index",
                    "pathName": "pages/shalong/shalongList",
                    "query": "",
                    "scene": null
                },
                {
                    "id": -1,
                    "name": "pages/groupbuy/groupDetails",
                    "pathName": "pages/groupbuy/groupDetails",
                    "query": "id=1&shopId=16&gjId=15",
                    "scene": null
                },
                {
                    "id": 20,
                    "name": "pages/ads/showAdPage",
                    "pathName": "pages/ads/showAdPage",
                    "query": "pageCode=index",
                    "scene": null
                },
                {
                    "id": -1,
                    "name": "pages/shalong/shalongDetail",
                    "pathName": "pages/shalong/shalongDetail",
                    "query": "id=6",
                    "scene": null
                },
                {
                    "name": "pages/yuyue/showYyInfo",
                    "pathName": "pages/yuyue/showYyInfo",
                    "query": "id=3004",
                    "scene": null
                }
            ]
        }
    }
}