mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2026-06-10 12:27:51 +08:00
# 2022-01-19
### 1.3.2 开源社区版(会员专业版同步修改): 【修复】修复前端首页【文章分类】组件会显示未设置为发布标签的文章问题;优化文章展示样式。#I4RA0C 【修复】修复前端首页【文章组】展示样式。 【修复】修复后端订单列表【支付】按钮异常问题。#I4QWAN 【修复】删除商品编辑界面的商品的重量,只保留sku的重量,防止引起歧义。#I4QESQ ### 0.1.0 会员专业版: 【升级】更新uview为v2.0.22版本。 【新增】微信直播组件增加上传图片到微信服务器功能。 【优化】优化升级uview后多个页面商品展示列表图片高度缩略问题。 【修复】修复商品预览数据未加载成功错误。
This commit is contained in:
@@ -77,13 +77,6 @@
|
||||
</div>
|
||||
<fieldset class="layui-elem-field layui-field-title site-title"><legend><a name="compress">其他参数</a></legend></fieldset>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label for="weight" class="layui-form-label layui-form-required">重量</label>
|
||||
<div class="layui-input-inline layui-inline-2">
|
||||
<input name="goods[weight]" id="weight" lay-verType="tips" lay-verify="required" value="{{d.data.model.weight }}" lay-verType="tips" lay-verify="required|number" class="layui-input" placeholder="请输入重量" lay-reqText="请输入重量" />
|
||||
</div>
|
||||
<div class="layui-form-mid layui-word-aux">克</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label for="unit" class="layui-form-label layui-form-required">单位</label>
|
||||
<div class="layui-input-inline layui-inline-2">
|
||||
|
||||
@@ -460,7 +460,7 @@
|
||||
//支付
|
||||
payOrder: function () {
|
||||
var id = $(this).attr('data-id');
|
||||
doPayOrder(id);
|
||||
doPayOrder(id, 0);
|
||||
},
|
||||
//发货
|
||||
shipOrder: function () {
|
||||
@@ -534,7 +534,7 @@
|
||||
var checkStatus = table.checkStatus(obj.config.id);
|
||||
switch (obj.event) {
|
||||
case 'payOrderArray':
|
||||
doPayOrder(checkStatus);
|
||||
doPayOrder(checkStatus, 1);
|
||||
break;
|
||||
case 'shipOrderArray':
|
||||
doShip(checkStatus, 0);
|
||||
@@ -1146,18 +1146,22 @@
|
||||
});
|
||||
}
|
||||
//执行支付操作
|
||||
function doPayOrder(checkStatus) {
|
||||
|
||||
var checkData = checkStatus.data;
|
||||
if (checkData.length === 0) {
|
||||
return layer.msg('请选择您要支付的数据');
|
||||
}
|
||||
function doPayOrder(checkStatus, type) {
|
||||
var delidsStr = [];
|
||||
layui.each(checkData,
|
||||
function (index, item) {
|
||||
delidsStr.push(item.orderId);
|
||||
});
|
||||
|
||||
if (type == 0) {
|
||||
delidsStr.push(checkStatus);
|
||||
} else if (type == 1) {
|
||||
var checkData = checkStatus.data;
|
||||
if (checkData.length === 0) {
|
||||
return layer.msg('请选择您要支付的数据');
|
||||
}
|
||||
layui.each(checkData,
|
||||
function (index, item) {
|
||||
delidsStr.push(item.orderId);
|
||||
});
|
||||
} else {
|
||||
return layer.msg('您的支付模式有问题,请核实');
|
||||
}
|
||||
coreHelper.Post("Api/CoreCmsOrder/GetPay", { id: delidsStr, data: 1 }, function (e) {
|
||||
if (e.code === 0) {
|
||||
admin.popup({
|
||||
|
||||
Reference in New Issue
Block a user