wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-03-26 17:57:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

# 2022-01-22

Browse Source 
###  开源社区版（会员专业版同步修改）：
--无修改
### 0.1.1 会员专业版：
【新增】增加微信支付服务商配置，支付微信支付服务商及子商户功能。
【新增】增加根据不同下单类型，控制不同的下单送货模式的功能，如普通商品购买只需要【物流快递，同城配送】，团购秒杀只需要【同城配送，上门自提】，可后台自定义。
【新增】微信直播带货功能新增【上传图片】功能，可直接将本地图片上传至微信侧，获取cdn图片进行处理。
【更新】nuget更新组件。
【修复】修复首页商品组件图片高度被错写array的问题。
【修复】修复生成海报保存路径问题，调整开发版或者预览版小程序获取不到的二维码的报错问题。
【优化】调整订单详情商品tag未设置宽度，导致撑破容易的问题。
【修复】调整订单列表左侧图片大小，防止被遮挡。I4PP1F
【修复】修复微信自定义交易组件申请商品类目失败的问题。#I4QE17
This commit is contained in:
JianWeie
2022-01-22 02:57:53 +08:00
parent ae8a2b3514
commit f1d02b6f89
40 changed files with 2708 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
CoreCms.Net.Web.Admin/wwwroot/views/shop/orderdistributionmodel/create.html Normal file
View File

@@ -0,0 +1,72 @@
<script type="text/html" template lay-done="layui.data.done(d);">
<div class="layui-form coreshop-form layui-form-pane" lay-filter="LAY-app-CoreCmsOrderDistributionModel-createForm" id="LAY-app-CoreCmsOrderDistributionModel-createForm">
<div class="layui-form-item">
<label for="orderType" class="layui-form-label layui-form-required">订单类型</label>
<div class="layui-input-block">
<select name="orderType" lay-verify="required|number">
<option value="">请选择类型</option>
{{# layui.each(d.params.data.orderTypes, function(index, item){ }}
<option value="{{ item.value }}">{{ item.description }}</option>
{{# }); }}
</select>
</div>
</div>
<div class="layui-form-item">
<label for="description" class="layui-form-label">描述</label>
<div class="layui-input-block">
<input name="description" lay-verType="tips" class="layui-input" lay-reqText="请输入描述" placeholder="请输入描述" />
</div>
</div>
<div class="layui-form-item" pane>
<label for="isOpenMailing" class="layui-form-label layui-form-required">物流快递</label>
<div class="layui-input-block">
<input type="checkbox" lay-filter="switch" name="isOpenMailing" lay-skin="switch" lay-text="开启|关闭" checked="checked">
</div>
</div>
<div class="layui-form-item" pane>
<label for="isOpenHomeDelivery" class="layui-form-label layui-form-required">同城配送</label>
<div class="layui-input-block">
<input type="checkbox" lay-filter="switch" name="isOpenHomeDelivery" lay-skin="switch" lay-text="开启|关闭" checked="checked">
</div>
</div>
<div class="layui-form-item" pane>
<label for="isOpenSelfDelivery" class="layui-form-label layui-form-required">上门自提</label>
<div class="layui-input-block">
<input type="checkbox" lay-filter="switch" name="isOpenSelfDelivery" lay-skin="switch" lay-text="开启|关闭" checked="checked">
</div>
</div>
<div class="layui-form-item text-right core-hidden">
<input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-CoreCmsOrderDistributionModel-createForm-submit" id="LAY-app-CoreCmsOrderDistributionModel-createForm-submit" value="确认添加">
</div>
</div>
</script>
<script>
var debug = layui.setter.debug;
layui.data.done = function (d) {
//开启调试情况下获取接口赋值数据
if (debug) { console.log(d.params.data); }
layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'cropperImg'],
function () {
var $ = layui.$
, form = layui.form
, admin = layui.admin
, laydate = layui.laydate
, upload = layui.upload
, cropperImg = layui.cropperImg
, coreHelper = layui.coreHelper;
form.verify({
verifydescription: [/^.{0,255}$/, '描述最大只允许输入255位字符'],
});
//重载form
form.render(null, 'LAY-app-CoreCmsOrderDistributionModel-createForm');
})
};
</script>

81
CoreCms.Net.Web.Admin/wwwroot/views/shop/orderdistributionmodel/details.html Normal file
View File

@@ -0,0 +1,81 @@
<script type="text/html" template lay-done="layui.data.done(d);">
<table class="layui-table layui-form" lay-filter="LAY-app-CoreCmsOrderDistributionModel-detailsForm" id="LAY-app-CoreCmsOrderDistributionModel-detailsForm">
<colgroup>
<col width="100">
<col>
</colgroup>
<tbody>
<tr>
<td>
<label for="id">序列</label>
</td>
<td>
{{ d.params.data.id || '' }}
</td>
</tr>
<tr>
<td>
<label for="orderType">订单类型</label>
</td>
<td>
{{ d.params.data.orderType || '' }}
</td>
</tr>
<tr>
<td>
<label for="description">描述</label>
</td>
<td>
{{ d.params.data.description || '' }}
</td>
</tr>
<tr>
<td>
<label for="isOpenMailing">物流快递</label>
</td>
<td>
<input type="checkbox" disabled name="isOpenMailing" value="{{d.params.data.isOpenMailing}}" lay-skin="switch" lay-text="开启|关闭" lay-filter="isOpenMailing" {{ d.params.data.isOpenMailing ? 'checked' : '' }}>
</td>
</tr>
<tr>
<td>
<label for="isOpenHomeDelivery">同城配送</label>
</td>
<td>
<input type="checkbox" disabled name="isOpenHomeDelivery" value="{{d.params.data.isOpenHomeDelivery}}" lay-skin="switch" lay-text="开启|关闭" lay-filter="isOpenHomeDelivery" {{ d.params.data.isOpenHomeDelivery ? 'checked' : '' }}>
</td>
</tr>
<tr>
<td>
<label for="isOpenSelfDelivery">上门自提</label>
</td>
<td>
<input type="checkbox" disabled name="isOpenSelfDelivery" value="{{d.params.data.isOpenSelfDelivery}}" lay-skin="switch" lay-text="开启|关闭" lay-filter="isOpenSelfDelivery" {{ d.params.data.isOpenSelfDelivery ? 'checked' : '' }}>
</td>
</tr>
</tbody>
</table>
</script>
<script>
var debug= layui.setter.debug;
layui.data.done = function (d) {
//开启调试情况下获取接口赋值数据
if (debug) { console.log(d.params.data); }
layui.use(['admin', 'form', 'coreHelper'], function () {
var $ = layui.$
, setter = layui.setter
, admin = layui.admin
, coreHelper = layui.coreHelper
, form = layui.form;
form.render(null, 'LAY-app-CoreCmsOrderDistributionModel-detailsForm');
});
};
</script>

72
CoreCms.Net.Web.Admin/wwwroot/views/shop/orderdistributionmodel/edit.html Normal file
View File

@@ -0,0 +1,72 @@
<script type="text/html" template lay-done="layui.data.sendParams(d);">
<div class="layui-form coreshop-form layui-form-pane" lay-filter="LAY-app-CoreCmsOrderDistributionModel-editForm" id="LAY-app-CoreCmsOrderDistributionModel-editForm">
<input type="hidden" name="id" value="{{d.params.data.model.id || '' }}" />
<div class="layui-form-item">
<label for="orderType" class="layui-form-label layui-form-required">订单类型</label>
<div class="layui-input-block">
<select name="orderType" lay-verify="required|number" disabled="disabled">
<option value="">请选择类型</option>
{{# layui.each(d.params.data.orderTypes, function(index, item){ }}
<option value="{{ item.value }}" {{item.value===d.params.data.model.orderType?'selected="selected"':''}}>{{ item.description }}</option>
{{# }); }}
</select>
</div>
</div>
<div class="layui-form-item">
<label for="description" class="layui-form-label">描述</label>
<div class="layui-input-block">
<input name="description" lay-verType="tips" class="layui-input" placeholder="请输入描述" lay-reqText="请输入描述" value="{{d.params.data.model.description || '' }}" />
</div>
</div>
<div class="layui-form-item" pane>
<label for="isOpenMailing" class="layui-form-label layui-form-required">物流快递</label>
<div class="layui-input-block">
<input type="checkbox" lay-filter="switch" name="isOpenMailing" {{ d.params.data.model.isOpenMailing ? 'checked' : '' }} lay-skin="switch" lay-text="开启|关闭">
</div>
</div>
<div class="layui-form-item" pane>
<label for="isOpenHomeDelivery" class="layui-form-label layui-form-required">同城配送</label>
<div class="layui-input-block">
<input type="checkbox" lay-filter="switch" name="isOpenHomeDelivery" {{ d.params.data.model.isOpenHomeDelivery ? 'checked' : '' }} lay-skin="switch" lay-text="开启|关闭">
</div>
</div>
<div class="layui-form-item" pane>
<label for="isOpenSelfDelivery" class="layui-form-label layui-form-required">上门自提</label>
<div class="layui-input-block">
<input type="checkbox" lay-filter="switch" name="isOpenSelfDelivery" {{ d.params.data.model.isOpenSelfDelivery ? 'checked' : '' }} lay-skin="switch" lay-text="开启|关闭">
</div>
</div>
<div class="layui-form-item text-right core-hidden">
<input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-CoreCmsOrderDistributionModel-editForm-submit" id="LAY-app-CoreCmsOrderDistributionModel-editForm-submit" value="确认编辑">
</div>
</div>
</script>
<script>
var debug = layui.setter.debug;
layui.data.sendParams = function (d) {
//开启调试情况下获取接口赋值数据
if (debug) { console.log(d.params.data); }
layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'cropperImg'],
function () {
var $ = layui.$
, form = layui.form
, admin = layui.admin
, laydate = layui.laydate
, upload = layui.upload
, cropperImg = layui.cropperImg
, coreHelper = layui.coreHelper;
form.verify({
verifydescription: [/^.{0,255}$/, '描述最大只允许输入255位字符'],
});
//重载form
form.render(null, 'LAY-app-CoreCmsOrderDistributionModel-editForm');
})
};
</script>

298
CoreCms.Net.Web.Admin/wwwroot/views/shop/orderdistributionmodel/index.html Normal file
View File

@@ -0,0 +1,298 @@
<title>订单配送模式</title>
<!--当前位置开始-->
<div class="layui-card layadmin-header">
<div class="layui-breadcrumb" lay-filter="breadcrumb">
<script type="text/html" template lay-done="layui.data.updateMainBreadcrumb();">
</script>
</div>
</div>
<!--当前位置结束-->
<style>
/* 重写样式 */
</style>
<script type="text/html" template lay-type="Post" lay-url="Api/CoreCmsOrderDistributionModel/GetIndex" lay-done="layui.data.done(d);">
</script>
<div class="table-body">
<table id="LAY-app-CoreCmsOrderDistributionModel-tableBox" lay-filter="LAY-app-CoreCmsOrderDistributionModel-tableBox"></table>
</div>
<script type="text/html" id="LAY-app-CoreCmsOrderDistributionModel-toolbar">
<div class="layui-form coreshop-toolbar-search-form">
<div class="layui-form-item">
<div class="layui-inline">
注：未添加的订单类型，默认将开启所有下单配送模式。
</div>
</div>
</div>
</script>
<script type="text/html" id="LAY-app-CoreCmsOrderDistributionModel-pagebar">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" lay-event="addData"><i class="layui-icon layui-icon-add-1"></i>添加数据</button>
</div>
</script>
<script type="text/html" id="LAY-app-CoreCmsOrderDistributionModel-tableBox-bar">
<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
<a class="layui-btn layui-btn-danger layui-btn-xs" data-dropdown="#CoreCmsOrderDistributionModelTbDelDrop{{d.LAY_INDEX}}" no-shade="true">删除</a>
<div class="dropdown-menu-nav dropdown-popconfirm dropdown-top-right layui-hide" id="CoreCmsOrderDistributionModelTbDelDrop{{d.LAY_INDEX}}"
style="max-width: 200px;white-space: normal;min-width: auto;margin-left: 10px;">
<div class="dropdown-anchor"></div>
<div class="dropdown-popconfirm-title">
<i class="layui-icon layui-icon-help"></i>
确定要删除吗？
</div>
<div class="dropdown-popconfirm-btn">
<a class="layui-btn layui-btn-primary cursor" btn-cancel>取消</a>
<a class="layui-btn layui-btn-normal cursor" lay-event="del">确定</a>
</div>
</div>
</script>
<script>
var indexData;
var debug = layui.setter.debug;
layui.data.done = function (d) {
//开启调试情况下获取接口赋值数据
if (debug) { console.log(d); }
indexData = d.data;
layui.use(['index', 'table', 'laydate', 'util', 'coredropdown', 'coreHelper'],
function () {
var $ = layui.$
, admin = layui.admin
, table = layui.table
, form = layui.form
, laydate = layui.laydate
, setter = layui.setter
, coreHelper = layui.coreHelper
, util = layui.util
, view = layui.view;
var searchwhere;
//监听搜索
form.on('submit(LAY-app-CoreCmsOrderDistributionModel-search)',
function (data) {
var field = data.field;
searchwhere = field;
//执行重载
table.reloadData('LAY-app-CoreCmsOrderDistributionModel-tableBox', { where: field });
});
//数据绑定
table.render({
elem: '#LAY-app-CoreCmsOrderDistributionModel-tableBox',
url: layui.setter.apiUrl + 'Api/CoreCmsOrderDistributionModel/GetPageList',
method: 'POST',
toolbar: '#LAY-app-CoreCmsOrderDistributionModel-toolbar',
pagebar: '#LAY-app-CoreCmsOrderDistributionModel-pagebar',
className: 'pagebarbox',
defaultToolbar: ['filter', 'print', 'exports'],
height: 'full-127',//面包屑142px,搜索框4行172,3行137,2行102,1行67
page: true,
limit: 30,
limits: [10, 15, 20, 25, 30, 50, 100, 200],
text: { none: '暂无相关数据' },
cols: [
[
//{ type: "checkbox", fixed: "left" },
{ field: 'id', title: '序列', sort: false, width: 55 },
{
field: 'orderType', title: '订单类型', sort: false, width: 155, templet: function (data) {
for (var i = 0; i < d.data.orderTypes.length; i++) {
if (data.orderType == d.data.orderTypes[i].value) {
return d.data.orderTypes[i].description;
}
}
return "";
}
},
{ field: 'isOpenMailing', title: '物流快递', width: 95, templet: '#switch_isOpenMailing', sort: false, unresize: true },
{ field: 'isOpenHomeDelivery', title: '同城配送', width: 95, templet: '#switch_isOpenHomeDelivery', sort: false, unresize: true },
{ field: 'isOpenSelfDelivery', title: '上门自提', width: 95, templet: '#switch_isOpenSelfDelivery', sort: false, unresize: true },
{ field: 'description', title: '描述', sort: false },
{ width: 122, align: 'center', title: '操作', fixed: 'right', toolbar: '#LAY-app-CoreCmsOrderDistributionModel-tableBox-bar' }
]
]
});
//监听排序事件
table.on('sort(LAY-app-CoreCmsOrderDistributionModel-tableBox)', function (obj) {
table.reloadData('LAY-app-CoreCmsOrderDistributionModel-tableBox', {
initSort: obj, //记录初始排序，如果不设的话，将无法标记表头的排序状态。
where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
orderField: obj.field, //排序字段
orderDirection: obj.type //排序方式
}
});
});
//头工具栏事件
table.on('pagebar(LAY-app-CoreCmsOrderDistributionModel-tableBox)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
switch (obj.event) {
case 'addData':
doCreate();
break;
};
});
//监听工具条
table.on('tool(LAY-app-CoreCmsOrderDistributionModel-tableBox)',
function (obj) {
if (obj.event === 'del') {
doDelete(obj);
} else if (obj.event === 'edit') {
doEdit(obj)
}
});
//执行创建操作
function doCreate() {
coreHelper.Post("Api/CoreCmsOrderDistributionModel/GetCreate", null, function (e) {
if (e.code === 0) {
admin.popup({
shadeClose: false,
title: '创建数据',
area: ['500px', '400px'],
id: 'LAY-popup-CoreCmsOrderDistributionModel-create',
success: function (layero, index) {
view(this.id).render('shop/orderdistributionmodel/create', { data: e.data }).done(function () {
//监听提交
form.on('submit(LAY-app-CoreCmsOrderDistributionModel-createForm-submit)',
function (data) {
var field = data.field; //获取提交的字段
field.isOpenMailing = field.isOpenMailing == 'on';
field.isOpenHomeDelivery = field.isOpenHomeDelivery == 'on';
field.isOpenSelfDelivery = field.isOpenSelfDelivery == 'on';
if (debug) { console.log(field); } //开启调试返回数据
//提交 Ajax 成功后，关闭当前弹层并重载表格
coreHelper.Post("Api/CoreCmsOrderDistributionModel/DoCreate", field, function (e) {
console.log(e)
if (e.code === 0) {
layui.table.reloadData('LAY-app-CoreCmsOrderDistributionModel-tableBox'); //重载表格
layer.close(index); //再执行关闭
layer.msg(e.msg);
} else {
layer.msg(e.msg);
}
});
});
});
// 禁止弹窗出现滚动条
$(layero).children('.layui-layer-content').css('overflow', 'visible');
}
, btn: ['确定', '取消']
, yes: function (index, layero) {
layero.contents().find("#LAY-app-CoreCmsOrderDistributionModel-createForm-submit").click();
}
});
} else {
layer.msg(e.msg);
}
});
}
//执行编辑操作
function doEdit(obj) {
coreHelper.Post("Api/CoreCmsOrderDistributionModel/GetEdit", { id: obj.data.id }, function (e) {
if (e.code === 0) {
admin.popup({
shadeClose: false,
title: '编辑数据',
area: ['500px', '400px'],
id: 'LAY-popup-CoreCmsOrderDistributionModel-edit',
success: function (layero, index) {
view(this.id).render('shop/orderdistributionmodel/edit', { data: e.data }).done(function () {
//监听提交
form.on('submit(LAY-app-CoreCmsOrderDistributionModel-editForm-submit)',
function (data) {
var field = data.field; //获取提交的字段
field.isOpenMailing = field.isOpenMailing == 'on';
field.isOpenHomeDelivery = field.isOpenHomeDelivery == 'on';
field.isOpenSelfDelivery = field.isOpenSelfDelivery == 'on';
if (debug) { console.log(field); } //开启调试返回数据
//提交 Ajax 成功后，关闭当前弹层并重载表格
coreHelper.Post("Api/CoreCmsOrderDistributionModel/DoEdit", field, function (e) {
console.log(e)
if (e.code === 0) {
layui.table.reloadData('LAY-app-CoreCmsOrderDistributionModel-tableBox'); //重载表格
layer.close(index); //再执行关闭
layer.msg(e.msg);
} else {
layer.msg(e.msg);
}
});
});
})
// 禁止弹窗出现滚动条
$(layero).children('.layui-layer-content').css('overflow', 'visible');
}
, btn: ['确定', '取消']
, yes: function (index, layero) {
layero.contents().find("#LAY-app-CoreCmsOrderDistributionModel-editForm-submit").click();
}
});
} else {
layer.msg(e.msg);
}
});
}
//执行单个删除
function doDelete(obj) {
coreHelper.Post("Api/CoreCmsOrderDistributionModel/DoDelete", { id: obj.data.id }, function (e) {
if (debug) { console.log(e); } //开启调试返回数据
table.reloadData('LAY-app-CoreCmsOrderDistributionModel-tableBox');
layer.msg(e.msg);
});
}
//监听 表格复选框操作
layui.form.on('switch(switch_isOpenMailing)', function (obj) {
coreHelper.Post("Api/CoreCmsOrderDistributionModel/DoSetisOpenMailing", { id: this.value, data: obj.elem.checked }, function (e) {
if (debug) { console.log(e); } //开启调试返回数据
//table.reloadData('LAY-app-CoreCmsOrderDistributionModel-tableBox');
layer.msg(e.msg);
});
});
layui.form.on('switch(switch_isOpenHomeDelivery)', function (obj) {
coreHelper.Post("Api/CoreCmsOrderDistributionModel/DoSetisOpenHomeDelivery", { id: this.value, data: obj.elem.checked }, function (e) {
if (debug) { console.log(e); } //开启调试返回数据
//table.reloadData('LAY-app-CoreCmsOrderDistributionModel-tableBox');
layer.msg(e.msg);
});
});
layui.form.on('switch(switch_isOpenSelfDelivery)', function (obj) {
coreHelper.Post("Api/CoreCmsOrderDistributionModel/DoSetisOpenSelfDelivery", { id: this.value, data: obj.elem.checked }, function (e) {
if (debug) { console.log(e); } //开启调试返回数据
//table.reloadData('LAY-app-CoreCmsOrderDistributionModel-tableBox');
layer.msg(e.msg);
});
});
//重载form
form.render();
});
};
</script>
<!--设置物流快递-->
<script type="text/html" id="switch_isOpenMailing">
<input type="checkbox" name="switch_isOpenMailing" value="{{d.id}}" lay-skin="switch" lay-text="开启|关闭" lay-filter="switch_isOpenMailing" {{ d.isOpenMailing ? 'checked' : '' }}>
</script>
<!--设置同城配送-->
<script type="text/html" id="switch_isOpenHomeDelivery">
<input type="checkbox" name="switch_isOpenHomeDelivery" value="{{d.id}}" lay-skin="switch" lay-text="开启|关闭" lay-filter="switch_isOpenHomeDelivery" {{ d.isOpenHomeDelivery ? 'checked' : '' }}>
</script>
<!--设置上门自提-->
<script type="text/html" id="switch_isOpenSelfDelivery">
<input type="checkbox" name="switch_isOpenSelfDelivery" value="{{d.id}}" lay-skin="switch" lay-text="开启|关闭" lay-filter="switch_isOpenSelfDelivery" {{ d.isOpenSelfDelivery ? 'checked' : '' }}>
</script>

4
CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/auditcategory/create.html
View File

@@ -155,7 +155,7 @@
//普通图片上传
var uploadInst = upload.render({
elem: '#upBtnlicenseImage'
, url: layui.setter.apiUrl + 'Api/Tools/UploadFiles'
, url: layui.setter.apiUrl + 'Api/Tools/MiNiShopOpenComponent2_UploadImg'
, before: function (obj) {
obj.preview(function (index, file, result) {
@@ -179,7 +179,7 @@
upload.render({
elem: '#upBtnimageIds'
, url: layui.setter.apiUrl + 'Api/Tools/UploadFiles'
, url: layui.setter.apiUrl + 'Api/Tools/MiNiShopOpenComponent2_UploadImg'
, before: function (obj) {
obj.preview(function (index, file, result) {
//$('#viewImgBoxlicenseImage').attr('src', result);

4
CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/auditcategory/edit.html
View File

@@ -163,7 +163,7 @@
//普通图片上传
var uploadInst = upload.render({
elem: '#upBtnlicenseImage'
, url: layui.setter.apiUrl + 'Api/Tools/UploadFiles'
, url: layui.setter.apiUrl + 'Api/Tools/MiNiShopOpenComponent2_UploadImg'
, before: function (obj) {
obj.preview(function (index, file, result) {
@@ -187,7 +187,7 @@
upload.render({
elem: '#upBtnimageIds'
, url: layui.setter.apiUrl + 'Api/Tools/UploadFiles'
, url: layui.setter.apiUrl + 'Api/Tools/MiNiShopOpenComponent2_UploadImg'
, before: function (obj) {
obj.preview(function (index, file, result) {
//$('#viewImgBoxlicenseImage').attr('src', result);