wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-02-05 23:09:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

【修复】修复升级最新版layuiadmin后存在的一些兼容性问题。

Browse Source
This commit is contained in:
大灰灰
2022-12-20 03:13:12 +08:00
parent 2910501266
commit 1c1707784d
11 changed files with 341 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CoreCms.Net.Web.Admin/wwwroot/views/content/notice/index.html
View File

@@ -60,7 +60,7 @@
, coreHelper = layui.coreHelper
, util = layui.util
, view = layui.view;
var searchwhere;
//监听搜索
form.on('submit(LAY-app-CoreCmsNotice-search)',
@@ -88,7 +88,7 @@
[
{ field: 'id', title: '序列', width: 60, sort: false },
{ field: 'title', title: '公告标题', sort: false },
{ field: 'contentBody', title: '公告内容', sort: false },
{ field: 'contentBody', title: '公告内容', sort: false, templet: function (data) { return data.contentBody } },
{ field: 'sort', title: '排序', sort: false, width: 105 },
{ field: 'createTime', title: '创建时间', width: 130, sort: false },
{ width: 122, align: 'center', title: '操作', fixed: 'right', toolbar: '#LAY-app-CoreCmsNotice-tableBox-bar' }

3
CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
View File

@@ -505,7 +505,7 @@
layui.data.done = function (d) {
//开启调试情况下获取接口赋值数据
if (debug) { console.log(d.data); }
layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'dtree', 'view', 'laytpl', 'xmSelect', 'layedit', 'util', 'cropperImg'],
layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'dtree', 'view', 'laytpl', 'xmSelect', 'util', 'cropperImg'],
function () {
$ = layui.$;
var form = layui.form
@@ -516,7 +516,6 @@
, view = layui.view
, laytpl = layui.laytpl
, xmSelect = layui.xmSelect
, layedit = layui.layedit
, util = layui.util
, cropperImg = layui.cropperImg
, coreHelper = layui.coreHelper;

5
CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html
View File

@@ -168,7 +168,7 @@
<div class="layui-tab-item">
<div class="layui-form-item layui-form-text">
<div class="layui-input-block">
{{d.params.data.model.intro}}
{{-d.params.data.model.intro}}
</div>
</div>
</div>
@@ -355,7 +355,7 @@
types = d.params.data.types;
//开启调试情况下获取接口赋值数据
if (debug) { console.log(d.data); }
layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'dtree', 'view', 'laytpl', 'xmSelect', 'layedit', 'util', 'cropperImg'],
layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'dtree', 'view', 'laytpl', 'xmSelect', 'util', 'cropperImg'],
function () {
$ = layui.$;
var form = layui.form
@@ -366,7 +366,6 @@
, view = layui.view
, laytpl = layui.laytpl
, xmSelect = layui.xmSelect
, layedit = layui.layedit
, util = layui.util
, cropperImg = layui.cropperImg
, coreHelper = layui.coreHelper;

3
CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
View File

@@ -505,7 +505,7 @@
types = d.data.types;
//开启调试情况下获取接口赋值数据
if (debug) { console.log(d.data); }
layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'dtree', 'view', 'laytpl', 'xmSelect', 'layedit', 'util', 'cropperImg'],
layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'dtree', 'view', 'laytpl', 'xmSelect', 'util', 'cropperImg'],
function () {
$ = layui.$;
var form = layui.form
@@ -516,7 +516,6 @@
, view = layui.view
, laytpl = layui.laytpl
, xmSelect = layui.xmSelect
, layedit = layui.layedit
, util = layui.util
, cropperImg = layui.cropperImg
, coreHelper = layui.coreHelper;

2
CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html
View File

@@ -44,7 +44,7 @@
</div>
<div class="layui-form-item">
<label class="layui-form-label">订单状态</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">{{d.params.data.statusText}}</div>
<div class="layui-input-inline layui-inline-3 layui-form-mid">{{-d.params.data.statusText}}</div>
<label class="layui-form-label">发货状态</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">{{d.params.data.shipStatusText}}</div>

40
CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
View File

@@ -281,7 +281,11 @@
cols: [
[
{ type: 'checkbox' },
{ field: 'operating', title: '操作', width: 60, align: 'center' },
{
field: 'operating', title: '操作', width: 90, align: 'center', templet: function (data) {
return data.operating;
}
},
{
field: 'orderId',
title: '订单号',
@@ -334,15 +338,18 @@
title: '订单状态',
width: 80,
align: 'center',
templet: '#statusText'
//templet: function (data) {
// for (var i = 0; i < d.data.orderStatus.length; i++) {
// if (data.status == d.data.orderStatus[i].value) {
// return d.data.orderStatus[i].description;
// }
// }
// return "";
//}
templet: function (data) {
var html = '';
for (var i = 0; i < d.data.orderStatus.length; i++) {
if (data.status == d.data.orderStatus[i].value) {
html += d.data.orderStatus[i].description;
}
}
if (data.tcOrder) {
html += '<button type="button" class="layui-btn layui-btn-warm layui-btn-xs" data-id="' + data.orderId + '" lay-active="showTcOrder" style="margin-left: 0px">直播订单</button>';
}
return html;
}
},
//{
// field: 'payStatus',
@@ -1372,19 +1379,6 @@
</script>
<!--直播订单-->
<script type="text/html" id="statusText">
{{# layui.each(orderStatus, function(index, item){ }}
{{# if(d.status == item.value){ }}
{{item.description}}
{{# } }}
{{# }); }}
{{# if(d.tcOrder){ }}
<button type="button" class="layui-btn layui-btn-warm layui-btn-xs" data-id="{{d.orderId}}" lay-active="showTcOrder" style="margin-left: 0px">直播订单</button>
{{# } }}
</script>
<!--用户地址-->
<script type="text/html" id="orderShip">
<div class="orderShip">