Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

 zq-erp/src/main/resources/templates/views/admin/shop/shopProductComment-list.html

@@ -52,6 +52,22 @@
                              <input autocomplete="off"   id="search-text" name="nickName" placeholder="输入查询关键词"
                                 type="text" class="form-control">
                           </div>
                           <div class="form-group mr-20 ml-20">
                              <select class="form-control select2" size="1"
                                    name="comAuditStatus"
                                    id="comAuditStatus" style="width: 98%">
                                 <option value="">请选择</option>
                                 <option value="0" >未审核</option>
                                 <option value="1" >审核通过</option>
                                 <option value="2" >审核不通过</option>
                              </select>
                           </div>
                           <div class="form-group mr-20 ml-20">
                              <input autocomplete="off"   name="commentBeginTime"
                                    type="text" class="form-control datetimepicker" >
                              <input autocomplete="off"   name="commentEndTime"
                                    type="text" class="form-control datetimepicker">
                           </div>
                           <div class="form-group">
                              <button onclick="myGrid.serchData(1)" type="button"
                                 class="btn btn-info">
@@ -62,64 +78,10 @@
                              </button>
                           </div>
                        </div>
                        <!-- 高级搜索 -->
                        <div class="senior-content">
                           <!-- <div><a class="serch-close closestyle">×</a></div> -->
                           <div class="serch-headline">高级搜索</div>
                           <div>
                              <div style="margin-bottom: 20px!important;">
                                 <div class="col-sm-6" style="text-align: right!important;">
                                    <label class="col-sm-12 control-label">
                                       开始日期：
                                    </label>
                                 </div>
                                 <div class="col-sm-6">
                                    <input autocomplete="off"   name="commentBeginTime" readonly="readonly"
                                          type="text" class="form-control datetimepicker" style="width: 98%">
                                 </div>
                              </div>

                              <div style="margin-bottom: 20px!important;">
                                 <div class="col-sm-6" style="text-align: right!important;">
                                    <label class="col-sm-12 control-label">
                                       结束日期：
                                    </label>
                                 </div>
                                 <div class="col-sm-6">
                                    <input autocomplete="off"   name="commentEndTime" readonly="readonly"
                                          type="text" class="form-control datetimepicker" style="width: 98%">
                                 </div>
                              </div>

                              <div style="margin-bottom: 20px!important;">
                                 <div class="col-sm-6" style="text-align: right!important;">
                                    <label class="col-sm-12 control-label">
                                       审核状态：
                                    </label>
                                 </div>
                                 <div class="col-sm-6">
                                    <select class="form-control select2" size="1"
                                          name="comAuditStatus"
                                          id="comAuditStatus" style="width: 98%">
                                       <option value="">请选择</option>
                                       <option value="0" >未审核</option>
                                       <option value="1" >审核通过</option>
                                       <option value="2" >审核不通过</option>
                                    </select>
                                 </div>
                              </div>

                           </div>
                           <div class="button col-sm-12">
                              <button type="button" class="btn btn-sm btn-info mr20" onclick="myGrid.serchData()">确认</button>
                              <button type="button" class="btn btn-warning serch-close">取消</button>
                           </div>
                        </div>
                     </form>
                  </div>
                  <div class="col-md-1 text-r layui-anim" data-anim="layui-anim-up">
                     <a class="senior-serch">高级搜索</a>
                  </div>

               </div>
            </div>
         </div>
@@ -151,7 +113,14 @@
   <script type="text/javascript">
       var myGrid;
      $(function(){
         MTools.ininDatetimepicker(".datetimepicker");
         var _initParam = {format : 'yyyy-mm-dd hh:ii',
            todayBtn : true,
            autoclose : true,
            startView : 2,
            maxView : 3,
            minView : 0};
         MTools.ininDatetimepicker(_initParam);
         MTools.limitStartEndTime(_initParam);
         var delUrl="";
         delUrl=basePath+"/admin/shopProductComment/del" ;
         myGrid=MGrid.initGrid({