Merge branch 'api' into hive2.0

jyy

2021-01-26 ec0c71cc88407098e0c088dbf1e44cddf856b8f8

Merge branch 'api' into hive2.0

 zq-erp/pom.xml

@@ -391,10 +391,10 @@
                    <exclude>config/xcx/*</exclude>

                    <!--

                    <exclude>config/config.json</exclude>
                    <exclude>config/application.properties</exclude>
                    <exclude>config/system.properties</exclude>

                    -->



 zq-erp/src/main/java/com/matrix/system/app/action/ApiKnowledgeAction.java

@@ -4,9 +4,11 @@
import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.app.dto.ArticleListDto;
import com.matrix.system.hive.action.BaseController;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.Article;
import com.matrix.system.hive.bean.ArticleType;
import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.dao.ArticleDao;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.service.ArticleService;
import com.matrix.system.hive.service.ArticleTypeService;
@@ -27,6 +29,7 @@
    @Autowired
    private ArticleTypeService articleTypeService;


    @Autowired
    private ArticleService articleService;

@@ -35,7 +38,6 @@
    public AjaxResult findKnowledgeType() {
        ArticleType type = new ArticleType();
        type.setCompanyId(getMe().getCompanyId());
        type.setParentId(0L);
        return AjaxResult.buildSuccessInstance(articleTypeService.findByModel(type));
    }

@@ -47,6 +49,7 @@
        pageVo.setLimit(articleListDto.getPageSize());

        Article article = new Article();
        QueryUtil.setQueryLimitCom(article);
        article.setTypeId(articleListDto.getTypeId());
        return AjaxResult.buildSuccessInstance(articleService.findApiArticleListInPage(article, pageVo));
    }

 zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java

@@ -84,7 +84,10 @@
    @PostMapping(value = "/findShoppingGoods")
    public AjaxResult findShoppingGoods(@RequestBody @Validated ShoppingGoodsListDto shoppingGoodsListDto) {
        SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        shoppingGoodsListDto.setShopId(user.getShopId());
        if (!DataAuthUtil.hasAllShopAuth()) {
            shoppingGoodsListDto.setShopId(user.getShopId());
        }
        QueryUtil.setQueryLimitCom(shoppingGoodsListDto);
        return AjaxResult.buildSuccessInstance(shoppingGoodsService.findShoppingGoodsListForApi(shoppingGoodsListDto), shoppingGoodsService.findShoppingGoodsListTotalForApi(shoppingGoodsListDto));
    }


 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java

@@ -20,6 +20,7 @@
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.SysBeauticianState;
import com.matrix.system.hive.bean.SysProjServices;
import com.matrix.system.hive.bean.SysProjUse;
@@ -213,8 +214,8 @@
        if (!DataAuthUtil.hasAllShopAuth()) {
            SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
            orderListDto.setShopId(user.getShopId());
            orderListDto.setUserId(user.getSuId());
        }
        QueryUtil.setQueryLimitCom(orderListDto);
        return AjaxResult.buildSuccessInstance(projServicesService.findApiServiceOrderListInPage(orderListDto, pageVo), projServicesService.findApiServiceOrderListTotal(orderListDto));
    }


 zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java

@@ -19,6 +19,7 @@
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.PasswordUtil;
import com.matrix.system.hive.action.BaseController;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import com.matrix.system.hive.dao.VipAnswerDao;
@@ -165,7 +166,7 @@
        if(!DataAuthUtil.hasAllShopAuth()) {
            sysVipInfo.setShopId(user.getShopId());
        }

        QueryUtil.setQueryLimitCom(sysVipInfo);
        return AjaxResult.buildSuccessInstance(sysVipInfoService.findAll(sysVipInfo));
    }


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

@@ -49,7 +49,7 @@
    AjaxResult showList(Article article, PaginationVO pageVo) {
        article.setType(Dictionary.ARTICEL_TYPE_NAME_SCWZ);
        SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        article.setShopId(users.getShopId());
        article.setCompanyId(users.getCompanyId());
        return showList(currentService, article, pageVo);
    }
    
@@ -61,7 +61,7 @@
        article.setType(Dictionary.ARTICEL_TYPE_NAME_MDXY);

        SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        article.setShopId(users.getShopId());
        article.setCompanyId(users.getCompanyId());
        return showList(currentService, article, pageVo);
        //return new AjaxResult(AjaxResult.STATUS_SUCCESS, currentService.findInPage(article, pageVo),currentService.findTotal(article));
    }
@@ -73,7 +73,7 @@
    public @ResponseBody AjaxResult queryAll(Article article, PaginationVO pageVo) {
        article.setType(Dictionary.ARTICEL_TYPE_NAME_WXXMWZ);
        SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        article.setShopId(users.getShopId());
        article.setCompanyId(users.getCompanyId());
        return showList(currentService, article, pageVo);
        //return new AjaxResult(AjaxResult.STATUS_SUCCESS, currentService.findInPage(article, pageVo),currentService.findTotal(article));
    }
@@ -99,7 +99,7 @@
       @RemoveRequestToken
    public @ResponseBody AjaxResult addOrModify(Article article) {
        SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        article.setShopId(users.getShopId());
        article.setCompanyId(users.getCompanyId());
        if (article.getId() != null) {
            return modify(currentService, article, "文章");
        } else {

 zq-erp/src/main/java/com/matrix/system/hive/bean/Article.java

@@ -96,14 +96,14 @@
     */
    private Integer commentNum;

    private Long shopId;
    private Long companyId;

    public Long getShopId() {
        return shopId;
    public Long getCompanyId() {
        return companyId;
    }

    public void setShopId(Long shopId) {
        this.shopId = shopId;
    public void setCompanyId(Long companyId) {
        this.companyId = companyId;
    }

    public Integer getCommentNum() {

 zq-erp/src/main/java/com/matrix/system/hive/dao/ArticleDao.java

@@ -2,6 +2,7 @@

import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.hive.bean.Article;
import com.matrix.system.hive.bean.ArticleType;
import org.apache.ibatis.annotations.Param;
import java.util.List;


 zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java

@@ -38,7 +38,7 @@

    public SysVipInfo selectById(Long id);

    public List<SysVipInfo> selectByVipNoOrTel(@Param("key") String key, @Param("shopId") Long shopId);
    public List<SysVipInfo> selectByVipNoOrTel(@Param("key") String key);

    /**
     * 查询是否唯一 @Title: selectTotalByField
@@ -134,7 +134,7 @@
     * @param keyWord
     * @return
     */
    public List<SysVipInfo> selectUserByKey(@Param("keyWord") String keyWord, @Param("shopId") Long shopId);
    public List<SysVipInfo> selectUserByKey(@Param("keyWord") String keyWord);
    
    /**
     * 会员活跃状态自动修改

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java

@@ -212,8 +212,7 @@

    @Override
    public List<SysVipInfo> findByVipNoOrTel(String key) {
        SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        return sysVipInfoDao.selectByVipNoOrTel(key, users.getShopId());
        return sysVipInfoDao.selectByVipNoOrTel(key);

    }

@@ -294,8 +293,7 @@

    @Override
    public List<SysVipInfo> findUserByKey(String keyWord) {
        SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        return sysVipInfoDao.selectUserByKey(keyWord, users.getShopId());
        return sysVipInfoDao.selectUserByKey(keyWord);
    }
    


 zq-erp/src/main/resources/mybatis/mapper/hive/ArticleDao.xml

@@ -16,7 +16,7 @@
            <result property="sort" column="sort" />
            <result property="createtiem" column="createtiem" />
            <result property="url" column="url" />
        <result property="shopId" column="shop_id"/>
        <result property="companyId" column="company_id"/>
            
            
            <result property="articleTypeName" column="article_type_name" />
@@ -43,7 +43,7 @@
            url,
            like_number,
            classify,
            shop_id
            company_id
        )
    VALUES (
            #{id},
@@ -59,7 +59,7 @@
            #{url},
            #{likeNumber},
            #{classify},
            #{shopId}
            #{companyId}
    )
    </insert>
    
@@ -143,7 +143,7 @@
            url,
            classify,
            like_number,
            shop_id,
            company_id,
            (select article_type_name from article_type c where type_id = c.id) articleTypeName,
            (select type from article_type c where type_id = c.id) type
        from article
@@ -188,8 +188,8 @@
            <if test="record.likeNumber != null and record.likeNumber !='' ">
                and like_number = #{record.likeNumber}
            </if>
            <if test="record.shopId != null and record.shopId !='' ">
                and shop_id = #{record.shopId}
            <if test="record.companyId != null and record.companyId !='' ">
                and company_id = #{record.companyId}
            </if>
            <if test="record.type != null and record.type !='' ">
                and (select type from article_type c where type_id = c.id) = #{record.type}
@@ -228,7 +228,7 @@
            url,
            classify,
            like_number,
            shop_id,
            company_id,
            (select article_type_name from article_type c where type_id = c.id) articleTypeName,
            (select type from article_type c where type_id = c.id) type
        from article
@@ -279,8 +279,8 @@
            <if test="record.articleTypeName != null and record.url !='' ">
                and (select article_type_name from article_type c where type_id = c.id) = #{record.articleTypeName}
            </if>
            <if test="record.shopId != null and record.shopId !='' ">
                and shop_id = #{record.shopId}
            <if test="record.companyId != null and record.companyId !='' ">
                and company_id = #{record.companyId}
            </if>
        </if>
        order by type_id,sort,createtiem desc
@@ -338,8 +338,8 @@
            <if test="record.articleTypeName != null and record.url !='' ">
                and (select article_type_name from article_type c where type_id = c.id) = #{record.articleTypeName}
            </if>
            <if test="record.shopId != null and record.shopId !='' ">
                and shop_id = #{record.shopId}
            <if test="record.companyId != null and record.companyId !='' ">
                and company_id = #{record.companyId}
            </if>
        </if>
    </select>
@@ -360,12 +360,14 @@
            url,
            like_number,
            classify,
            shop_id,
            company_id,
           (select article_type_name from article_type c where type_id = c.id) articleTypeName<!-- 所属门店名称 -->
        from article
        where  id=#{id} 
    </select>	
	
    </select>



    
    <!-- 根据对象查询-->
    <select id="selectByModel" resultMap="ArticleMap">
@@ -383,7 +385,7 @@
            a.url,
            a.classify,
            a.like_number,
            a.shop_id,
            a.company_id,
           (select article_type_name from article_type c where a.type_id = c.id) articleTypeName,<!-- 所属门店名称 -->
           (select count(*) from article_comment ac where ac.article_id=a.id) commentNum
        from article a
@@ -431,8 +433,8 @@
            <if test="record.articleTypeName != null and record.url !='' ">
                and (select article_type_name from article_type c where a.type_id = c.id) = #{record.articleTypeName}
            </if>
            <if test="record.shopId != null and record.shopId !='' ">
                and a.shop_id = #{record.shopId}
            <if test="record.companyId != null and record.companyId !='' ">
                and a.company_id = #{record.companyId}
            </if>
        </if>
        order by type_id,sort,createtiem desc
@@ -441,7 +443,7 @@
    <select id="selectApiArticleListInPage" resultMap="ArticleMap">
        select * from article a
        inner join article_type b on a.type_id=b.id
        where  a.type_id=#{record.typeId} or find_in_set(#{record.typeId}, b.parent_ids)
        where a.company_id=#{record.companyId} and  (a.type_id=#{record.typeId} or find_in_set(#{record.typeId}, b.parent_ids))
        order by a.createtiem desc
        <if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
            <if test="pageVo.offset >=0  and pageVo.limit >0">
@@ -451,4 +453,5 @@
        </if>
    </select>


</mapper>

 zq-erp/src/main/resources/mybatis/mapper/hive/ArticleTypeDao.xml

@@ -232,7 +232,7 @@
            <if test="record.articleTypeName != null and record.articleTypeName !='' ">
                and article_type_name = #{record.articleTypeName}
            </if>
            <if test="record.parentId != null and record.parentId !='' ">
            <if test="record.parentId != null or record.parentId ==0 ">
                and parent_id = #{record.parentId}
            </if>
            <if test="record.sort != null and record.sort !='' ">

 zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml

@@ -1259,6 +1259,9 @@
            <![CDATA[    and ( a.shop_id = #{record.shopId} or
                      (  a.headquarters=1 and  ( ISNULL(a.use_shop) or LENGTH(trim(a.use_shop))<1 or FIND_IN_SET(#{record.shopId},a.use_shop))))]]>
        </if>
        <if test="record.companyId != null and record.companyId !='' ">
            a.company_id=#{record.companyId}
        </if>
        <if test="record.goodType!=null">
            and a.good_type=#{record.goodType}
        </if>

 zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml

@@ -643,13 +643,10 @@
        EMAIL,CREATE_TIME,UUID,BALANCE,blood,sfCard,link,marry,vocation 
         from sys_vip_info 
         where
         SHOP_ID=#{shopId}
        and  (
        instr(PHONE,#{keyWord})
          or instr(VIP_NAME ,#{keyWord})
          or instr(zjm ,#{keyWord})
            or instr(VIP_NO ,#{keyWord})
        )
          limit 0,15
    </select>

@@ -674,7 +671,7 @@
        and
        (a.VIP_NO =#{key} or
        a.VIP_NAME =#{key} or
        a.PHONE =#{key}) and a.shop_id=#{shopId}
        a.PHONE =#{key})
    </select>

    <select id="getLevelIdByMoney" resultMap="SysVipInfoMap">

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

@@ -108,7 +108,7 @@
                        </el-col>
                        <el-col :span="14" style="text-align: right;">
                            <label>¥ {{order.total}}</label>
                            <label>¥ {{order.zkTotal - order.total}}</label>
                            <label>¥ {{(order.zkTotal - order.total).toFixed(2)}}</label>
                            <label>¥ {{order.zkTotal}}</label>
                            <label>¥ {{order.arrears}}</label>
                            <label>¥ {{order.repay}}</label>

 zq-erp/src/main/resources/templates/views/admin/hive-erp/vip/vipInfo-list.html

@@ -115,11 +115,6 @@
                </button>
                    <button matrix:fn="mdhyzl-gjjl"  onclick="openFollow()" type="button" class="btn btn-info btn-sm"><i class="fa fa-edit" ></i> 跟进记录</button>
                    <button matrix:fn="mdhyzl-khda"  onclick="openArchieves()" type="button" class="btn btn-info btn-sm"><i class="fa fa-edit" ></i> 客户档案</button>
                    <button matrix:btn="mdhyzl-projTaocan"  onclick="openProj()" type="button" class="btn btn-info btn-sm"><i class="fa fa-cube"></i> 项目管理</button>
                    <button matrix:btn="mdhyzl-projTaocan"  onclick="openTc()" type="button" class="btn btn-info btn-sm"><i class="fa fa-cubes"></i> 套餐管理</button>
                    <button matrix:btn="mdhyzl-projTaocan"  onclick="openMoneyCard()" type="button" class="btn btn-info btn-sm"><i class="fa fa-credit-card"></i> 充值卡管理</button>
                    <button matrix:fn="mdhyzl-xfdd"   onclick="openOrder()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 消费订单</button>
                    <button matrix:fn="mdhyzl-fwd"   onclick="openServiceOrder()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 服务单</button>
                    <button matrix:btn="mdhyzl-excelOut"  onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
            </div>

@@ -138,6 +133,7 @@
                <th data-field="arrivalWay">到店途径</th>
                <th data-field="staffName">健康顾问</th>
                <th data-field="shopName">所属门店</th>
                <th data-field="phone" data-formatter="buildOperation">操作</th>
            </tr>
            </thead>
        </table>
@@ -156,7 +152,6 @@
        var delUrl="";
        delUrl=basePath+"/hiveErp/vipInfo/del";


        myGrid=
            MGrid.initGrid({
                url : basePath+"/hiveErp/vipInfo/showVipInfoList",
@@ -165,16 +160,7 @@
            });
    });

        function openOrder(){
            var vipName=myGrid.getSelectItemId("vipName");
            layer.full(layer.open({
                type : 2,
                title : "消费记录",
                area : [ MUI.SIZE_L, '450px' ],
                maxmin : true,
                content : [ basePath+'/admin/redirect/hive/operate/sysOrder-list?vipName=' + vipName ]
            }));
        }

    /**
     * 构建会员名称
     */
@@ -185,16 +171,7 @@
            return value;
        }
    }
    function openServiceOrder(){
        var vipName=myGrid.getSelectItemId("vipName");
        layer.full(layer.open({
            type : 2,
            title : "服务单",
            area : [ MUI.SIZE_L, '450px' ],
            maxmin : true,
            content : [ basePath+'/admin/redirect/hive/store/projService-list?vipName=' + vipName ]
        }));
    }


        function openArchieves(){
            var id=myGrid.getSelectItemId();
@@ -219,66 +196,8 @@
            content : [ basePath+'/admin/serviceRecord/toServicefollowListForZd?id=' + id ]
        });
    }
    function createDateDictionary() {
        $(".dds").each(
            function() {
                var type = $(this).attr("cc");
                var _this = $(this);
                //取服务器请求数据
                $.AjaxProxy({
                    p : {
                        type : type
                    }
                })
                    .invoke(
                        basePath+"/admin/dds/showDataDictionary",
                        function(loj) {
                            var html = '';
                            console.log(loj.getRowCount());
                            for (var i = 0; i < loj
                                .getRowCount(); i++) {
                                html += '<option value="'
                                    + loj
                                        .getString(i,
                                            "id")
                                    + '">'
                                    + loj.getString(i,
                                        "name")
                                    + "</option>";
                            }
                            _this.html(html);
                        });

            });
    }
        function openTc() {
            var id=myGrid.getSelectItemId();
            layer.open({
                type: 2,
                title: "会员套餐管理",
                area: MUI.SIZE_M,
                content : [ basePath+'/admin/redirect/hive-erp/vip/viptc-list?vipId=' + id]
            });
        }

        function openProj() {
            var id=myGrid.getSelectItemId();
            layer.open({
                type: 2,
                title: "会员项目管理",
                area: MUI.SIZE_M,
                content : [ basePath+'/admin/redirect/hive-erp/vip/projUse-list?vipId=' + id]
            });
        }
        function openMoneyCard() {
            var id=myGrid.getSelectItemId();
            layer.open({
                type: 2,
                title: "会员充值卡管理",
                area: MUI.SIZE_M,
                content : [ basePath+'/admin/redirect/hive-erp/vip/moneyCardUse-list?vipId=' + id]
            });
        }



@@ -310,6 +229,21 @@
        });
    }

    function buildOperation(value, row, index) {
        var html = "";
        html += '<a class="text-info" href="javascript:void(0)" onClick="openVipDetail(\''+row.phone+'\')">查看详情</a>&nbsp;&nbsp;'
        return html;
    }
    function openVipDetail(value) {
        debugger
        layer.full(layer.open({
            type : 2,
            title : "会员详情",
            area : [ MUI.SIZE_L, '450px' ],
            maxmin : true,
            content : [ basePath+'/admin/redirect/hive/beautySalon/vip?vipPhone=' + value ]
        }));
    }

</script>


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

@@ -516,7 +516,7 @@
                <el-row style="line-height: 50px;" v-for="(item, index) in payMoneys">
                    <el-col :span="6" style="text-align: right; padding-right: 10px; font-size: 12px;">{{item.value}}</el-col>
                    <el-col :span="8"><el-input v-model="item.money"></el-input></el-col>
                    <el-col :span="6" style="margin-left: 10px;" v-if="item.type == '储值卡'">{{item.isGift == 1 ? '赠送余额' : '余额' }}：<span class="arrears">¥ {{item.balance}}</span></el-col>
                    <el-col :span="8" style="margin-left: 10px;" v-if="item.type == '储值卡'">{{item.isGift == 1 ? '赠送余额' : '余额' }}：<span class="arrears">¥ {{item.balance}}</span></el-col>
                </el-row>
            </el-col>
        </el-row>
@@ -906,7 +906,7 @@
                                    }
                                })
                            });

                            _this.order.payMoney = _this.order.payMoney.toFixed(2);
                            //计算欠款
                            // _this.order.arrears = _this.order.zkTotal - _this.order.payMoney;
                            // if (_this.order.arrears < 0) {

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

@@ -108,7 +108,7 @@
                        </el-col>
                        <el-col :span="14" style="text-align: right;">
                            <label>¥ {{order.total}}</label>
                            <label>¥ {{order.zkTotal - order.total}}</label>
                            <label>¥ {{(order.zkTotal - order.total).toFixed(2)}}</label>
                            <label>¥ {{order.zkTotal}}</label>
                            <label>¥ {{order.arrears}}</label>
                            <label>¥ {{order.repay}}</label>

 zq-erp/src/main/resources/templates/views/admin/hive/operate/trainingMaterialsManage-form.html

@@ -13,14 +13,14 @@
            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/kindeditor/themes/default/default.css}"/>
    <link rel="stylesheet"
          th:href="@{/plugin/kindeditor/plugins/code/prettify.css}"/>
    <script th:src="@{/plugin/kindeditor/kindeditor.js}"></script>
    <script th:src="@{/plugin/kindeditor/lang/zh_CN.js}"></script>
    <script
            th:src="@{/plugin/kindeditor/plugins/code/prettify.js}"></script>
    <script type="text/javascript" charset="utf-8"
            th:src="@{/plugin/beditor/ueditor.config.js}"></script>
    <script type="text/javascript" charset="utf-8"
            th:src="@{/plugin/beditor/ueditor.all.js}">
    </script>
    <script type="text/javascript" charset="utf-8"
            th:src="@{/plugin/beditor/lang/zh-cn/zh-cn.js}"></script>

    <style type="text/css">
        #projBox {
            max-height: 400px;
@@ -58,10 +58,10 @@
                       th:value="${obj?.title }" datatype="*" nullmsg="标题不能为空">
            </div>
            <div class="Validform_checktip"></div>
            <label class="col-sm-2 control-label">排序<span class="text-danger">*</span></label>
            <label class="col-sm-2 control-label">排序</label>
            <div class="col-sm-3">
                <input autocomplete="off"   type="text" class="form-control" name="sort"
                       th:value="${obj?.sort }" datatype="n" nullmsg="序号不能为空"
                       th:value="${obj?.sort }" datatype="n"      ignore="ignore"
                       errormsg="序号只能为数字">
            </div>
            <div class="Validform_checktip"></div>
@@ -86,10 +86,16 @@
            <div class="col-sm-3">

                    <div th:if="${obj ne null }" class="checkbox checkbox-inline">
                        <input autocomplete="off"    name="isPublish" type="radio" id="inlineCheckbox1" value="是"   >

                        <input autocomplete="off"   th:if="${obj.isPublish eq '是' }"  checked   name="isPublish" type="radio" id="inlineCheckbox1" value="是"    >
                        <input autocomplete="off"   th:if="${obj.isPublish eq '否' }"     name="isPublish" type="radio" id="inlineCheckbox1" value="是"    >
                        <label for="inlineCheckbox1">是 </label> &nbsp;&nbsp;
                        <input autocomplete="off"    name="isPublish" type="radio" id="inlineCheckbox2" value="否">

                        <input autocomplete="off"    th:if="${obj.isPublish eq '是' }"  name="isPublish" type="radio" id="inlineCheckbox2" value="否">
                        <input autocomplete="off"    th:if="${obj.isPublish eq '否' }" checked name="isPublish" type="radio" id="inlineCheckbox2" value="否">
                        <label for="inlineCheckbox2">否 </label>


                    </div>

                    <div  th:if="${obj eq null }" class="checkbox checkbox-inline">
@@ -105,30 +111,11 @@
        <div class="form-group">
            <label class="col-sm-2 control-label">文章内容</label>
            <div class="col-sm-8">
                <textarea name="content" id="artcontent" th:text="${obj?.content}">

                </textarea>
                <script style="width: 100%; height: 500px" id="artcontent" name="content"
                        type="text/plain" th:utext="${obj?.content}" ></script>
            </div>
            <div class="Validform_checktip"></div>
        </div>
        <!--
                <div class="form-group">
                    <label class="col-sm-2 control-label">上传图片</label>
                    <div class="col-sm-9">
                        <input autocomplete="off"   onclick="MTools.chooesFile('#fileText')"
                            class="input-text upload-url radius form-control" type="text" id="showFileName"
                            readonly style="width: 30%;display: inline;">
                            <a onclick="MTools.chooesFile('#fileText')" class="btn btn-success radius">
                            <i class="fa fa-cloud-upload"></i> 浏览文件 </a>
                            <input autocomplete="off"   type="button" class='btn btn-success radius'
                            onclick="MTools.upFile('#submitBtn')" value="上传">
                             <a id="selectInServices" class="btn btn-success radius">
                             <i class="fa fa-cloud"></i> 远程图库
                        </a>
                    </div>
                </div> -->



        <div class="form-group ">
            <div class="col-sm-12 text-center">
@@ -143,11 +130,14 @@
<script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script>
<script th:inline="javascript">
    var obj=[[${obj}]];
    var editor = null;

    //百度编辑器
    var ue = {};

    var myForm=MForm.initForm({
        invokeUrl:basePath+"/admin/article/addOrModify",
        beforeSubmit:function(){
            editor.sync();

        },
        afterSubmit:function(){
            parent.myGrid.serchData();
@@ -156,11 +146,10 @@

    $(function() {
        $(".select2").select2({'width':'100%'});
        MUI.createEdit("content", '100%', '400px', 'editor');
        MUI.openServiceImgSpace(function(url) {
            $("#img_1").attr("src", url).show();
            $("#hiddenImg").val(url);
        }, "#selectInServices");

        //初始化编辑器
        ue = UE.getEditor('artcontent');

        initFunctionList();
    });

@@ -185,7 +174,7 @@


    function autoZy() {
        var text = editor.text();
        var text = ue.getContentTxt();
        $("#zy-input").val(text.substring(0, 100));
    }
    function cleanZy() {

 zq-xcx/project.config.json

@@ -45,17 +45,10 @@
  "simulatorType": "wechat",
  "simulatorPluginLibVersion": {},
  "condition": {
    "search": {
      "list": []
    },
    "conversation": {
      "list": []
    },
    "plugin": {
      "list": []
    },
    "game": {
      "currentL": -1,
      "list": []
    },
    "gamePlugin": {
@@ -216,6 +209,12 @@
          "pathName": "pages/shalong/shalongDetail",
          "query": "id=6",
          "scene": null
        },
        {
          "name": "pages/yuyue/showYyInfo",
          "pathName": "pages/yuyue/showYyInfo",
          "query": "id=3004",
          "scene": null
        }
      ]
    }