github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-01-06 12:28:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/ZhongBangKeJi/CRMEB

Browse Source
This commit is contained in:
等风来 2018-09-10 18:04:21 +08:00
commit 4f4830ace3
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/admin/view/widget/icon.php
View File

@ -24,7 +24,7 @@
} }
.form-control{ .form-control{
display: inline-block; display: inline-block;
width: 75%; width: 85%;
} }
</style> </style>
</head> </head>
@ -33,7 +33,7 @@
<div class="form-group"> <div class="form-group">
<input type="email" class="form-control" id="search" placeholder="输入关键词搜索：注意全是英文"> <input type="email" class="form-control" id="search" placeholder="输入关键词搜索：注意全是英文">
<button id="qingkong" class="btn btn-default">清空选择</button> <button id="qingkong" class="btn btn-default">清空选择</button>
<button id="close" class="btn btn-default">关闭</button> <!-- <button id="close" class="btn btn-default">关闭</button>-->
</div> </div>
<div> <div>
<h5> v4.3.0新增图标 </h5> <h5> v4.3.0新增图标 </h5>
@ -794,11 +794,11 @@
parent.$f.closeModal(); parent.$f.closeModal();
}); });
//close // //close
$('#close').on('click', function () { // $('#close').on('click', function () {
parent.$f.closeModal(); // parent.$f.closeModal();
//
}); // });
//搜索图标 //搜索图标
$("#search").on('input',function () { $("#search").on('input',function () {

4
application/admin/view/widget/images.php
View File

@ -62,7 +62,7 @@
<li ><a href="{:Url('index',array('pid'=>$vo.id,'fodder'=>$Request.param.fodder))}">{$vo.name}</a></li> <li ><a href="{:Url('index',array('pid'=>$vo.id,'fodder'=>$Request.param.fodder))}">{$vo.name}</a></li>
{/if} {/if}
{volist name="$vo.child" id="voo" key="kk"} {volist name="$vo.child" id="voo" key="kk"}
<li class="child {if condition="$voo.id eq $pid"} active{/if}"><a href="{:Url('index',array('pid'=>$voo.id,'fodder'=>$Request.param.fodder))}">┣{$voo.name}</a></li> <li class="child {if condition="$voo.id eq $pid"} active{/if}"><a href="{:Url('index',array('pid'=>$voo.id,'fodder'=>$Request.param.fodder))}">-{$voo.name}</a></li>
{/volist} {/volist}
{/volist} {/volist}
</ul> </ul>
@ -84,7 +84,7 @@
<div class="foot-tool"> <div class="foot-tool">
<button class="layui-btn layui-btn-sm" id="upload">上传图片</button> <button class="layui-btn layui-btn-sm" id="upload">上传图片</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" id="ConfirmChoices">使用选中的图片</button> <button class="layui-btn layui-btn-normal layui-btn-sm" id="ConfirmChoices">使用选中的图片</button>
<button class="layui-btn layui-btn-danger layui-btn-sm" id="close" >关闭</button> <!-- <button class="layui-btn layui-btn-danger layui-btn-sm" id="close" >关闭</button>-->
<div class="page">{$page}</div> <div class="page">{$page}</div>
</div> </div>
</div> </div>

0
application/routine/model/store/StoreOrder.php Normal file → Executable file
View File

0
application/routine/model/user/UserRecharge.php Normal file → Executable file
View File

1
application/wap/controller/Wechat.php Normal file → Executable file
View File

@ -18,6 +18,7 @@ class Wechat
*/ */
public function serve() public function serve()
{ {
ob_clean();
WechatService::serve(); WechatService::serve();
} }

2
vendor/xaboy/form-builder/src/Form.php vendored
View File

@ -87,7 +87,7 @@ class Form
'iview-css' => '<link href="https://cdn.jsdelivr.net/npm/iview@2.14.3/dist/styles/iview.css" rel="stylesheet">', 'iview-css' => '<link href="https://cdn.jsdelivr.net/npm/iview@2.14.3/dist/styles/iview.css" rel="stylesheet">',
'iview' => '<script src="https://cdn.jsdelivr.net/npm/iview@2.14.3/dist/iview.min.js"></script>', 'iview' => '<script src="https://cdn.jsdelivr.net/npm/iview@2.14.3/dist/iview.min.js"></script>',
//form-create 版本 1.3.1 //form-create 版本 1.3.1
'form-create' => '<script src="https://cdn.jsdelivr.net/npm/form-create@1.3.3/dist/form-create.min.js"></script>', 'form-create' => '<script src="https://cdn.jsdelivr.net/npm/form-create@1.4.2/dist/form-create.min.js"></script>',
'city-data' => '<script src="https://cdn.jsdelivr.net/npm/form-create/district/province_city.js"></script>', 'city-data' => '<script src="https://cdn.jsdelivr.net/npm/form-create/district/province_city.js"></script>',
'city-area-data' => '<script src="https://cdn.jsdelivr.net/npm/form-create/district/province_city_area.js"></script>' 'city-area-data' => '<script src="https://cdn.jsdelivr.net/npm/form-create/district/province_city_area.js"></script>'
]; ];