更新版本号

application/version.php

@@ -1,2 +1,2 @@
-version=CRMEB-DTKY v2.5.36b
+version=CRMEB-DT v2.6.03
-version_code=129
+version_code=131

public/install/index.php

@@ -369,19 +369,6 @@ function testwrite($d) {
 
 }
 
-function sql_execute($sql, $tablepre) {
-    $sqls = sql_split($sql, $tablepre);
-    if (is_array($sqls)) {
-        foreach ($sqls as $sql) {
-            if (trim($sql) != '') {
-                mysqli_query($sql);
-            }
-        }
-    } else {
-        mysqli_query($sqls);
-    }
-    return true;
-}
 
 function sql_split($sql, $tablepre) {
 

public/install/templates/step5.php

@@ -33,7 +33,7 @@ $(function(){
 	$.ajax({
 	type: "POST",
 	url: "http://shop.crmeb.net/index.php/admin/server.upgrade_api/updatewebinfo",
-	data: {host:'<?php echo $host;?>',https:'<?php echo 'http://'.$host;?>',version:'CRMEB-DTKY v2.5.3',ip:'<?php echo $_SERVER[HTTP_CLIENT_IP];?>'},
+	data: {host:'<?php echo $host;?>',https:'<?php echo 'http://'.$host;?>',version:'CRMEB-DT v2.6.03',ip:'<?php echo $_SERVER[HTTP_CLIENT_IP];?>'},
 	dataType: 'json',
 	success: function(){}
 	});

public/static/plug/helper.js

@@ -203,7 +203,7 @@
         _params = Object.keys(p).map(function(key){
             return key+'/'+p[key];
         }).join('/');
-        return "/index.php/"+m+"/"+c+"/"+a+(_params == '' ? '' : '/'+_params)+(q == '' ? '' : '?'+q);
+        return "/"+m+"/"+c+"/"+a+(_params == '' ? '' : '/'+_params)+(q == '' ? '' : '?'+q);
     };
 
     $h.isLogin = function(){

public/system/js/index.js

@@ -163,6 +163,8 @@ setTimeout(function(){
                         var api = globalMethods(this,swal);
                         api.closeModalFrame = function(name){
                             layer.close(layer.getFrameIndex(name) || name);
+                            //关闭页面刷新
+                            // window.frames[$(".page-tabs-content .active").index()].location.reload();
                         };
                         api.h = this.$createElement;
                         api.axios = axios;
@@ -187,7 +189,7 @@ setTimeout(function(){
                             content: src,//内容
                             move:'.layui-layer-title',// 默认".layui-layer-title",// 触发拖动的元素
                             moveEnd:function(){//拖动之后回调
-                                console.log(this);
+                                // console.log(this);
 
                             }
                         });

public/system/js/layuiList.js

@@ -96,7 +96,7 @@
     };
     //初始化 layui table
     layList.tableList = function (odj, url, data, limit, size,boxids,is_tables) {
-        var limit = limit || 20, size = size || 'lg', $data = [], that = this,boxids=boxids || this.boxids;
+        var limit = limit || 20, size = size || 'sm', $data = [], that = this,boxids=boxids || this.boxids;
         switch (typeof data) {
             case 'object':
                 $data = data;
@@ -108,14 +108,12 @@
         if(is_tables!=true) this.odj=odj;
         if(that.elemOdj[odj]==undefined) that.elemOdj[odj]=odj;
         var elemOdj=that.elemOdj[this.odj];
-        console.log(that.elemOdj);
         that.tableIns = that.table.render({
             id:boxids,
             elem: '#' +elemOdj,
             url: url,
             page: true,
             limit: limit,
-            size: size,
             cols: [$data]
         });
         return that.tableIns;
@@ -144,7 +142,6 @@
         if(typeof tableIns=='Object'){
             tableIns.reload(whereOdJ);
         }else{
-            console.log(whereOdJ);
             this.tableIns.reload(whereOdJ);
         }
     }
@@ -163,13 +160,11 @@
         }
     }
     //监听列表
-    layList.tool = function (EventFn, fieldStr,odjs) {
+    layList.tool = function (EventFn, fieldStr,odj) {
         var that = this;
         // var elemOdj=elemOdj || that.elemOdj
-        var elemOdj=that.elemOdj[odjs || this.odj];
+        var elemOdj=that.elemOdj[odj || this.odj];
-        console.log(elemOdj);
         this.table.on('tool(' + elemOdj + ')', function (obj) {
-            console.log(obj)
             var data = obj.data, layEvent = obj.event;
             if (typeof EventFn == 'function') {
                 EventFn(layEvent, data,obj);
@@ -278,6 +273,9 @@
             var value = obj.value //得到修改后的值
                 ,data = obj.data //得到所在行所有键值
                 ,field = obj.field; //得到字段
+            if (typeof name == "function") {
+                name && name(obj);
+            }else{
                 switch (field){
                     case name:
                         successFn && successFn(obj);
@@ -286,6 +284,7 @@
                         console.log('未检测到指定字段'+name);
                         break;
                 }
+            }
         });
     }
     //页面有多个table请用此函数包裹起来

public/system/util/mpFrame.js

@@ -9,4 +9,20 @@
     };
 
     global.mpFrame = factory;
+
+    /*$(function init(){
+        if(typeof footable=='function') $(".footable").footable();
+        $(".no-sort").off('click');
+        $('.search-item>.btn').on('click',function(){
+            var that = $(this),value = that.data('value'),p = that.parent(),name = p.data('name'),form = p.parents();
+            form.find('input[name="'+name+'"]').val(value);
+            form.submit();
+        });
+        $('.search-item-value').each(function(){
+            var that = $(this),name = that.attr('name'), value = that.val(),dom = $('.search-item[data-name="'+name+'"] .btn[data-value="'+value+'"]');
+            dom.eq(0).removeClass('btn-outline btn-link').addClass('btn-primary btn-sm')
+                .siblings().addClass('btn-outline btn-link').removeClass('btn-primary btn-sm')
+        });
+    });*/
+
 })(this);