mirror of
https://github.com/CoreUnion/CoreShop.git
synced 2026-10-29 13:39:51 +08:00
!189 修复后端订单列表【支付】按钮异常问题。修复前端首页【文章分类】组件会显示未设置为发布标签的文章问题，修复前端首页【文章组】展示样式。
### 1.3.2 开源社区版（会员专业版同步修改）： 【修复】修复前端首页【文章分类】组件会显示未设置为发布标签的文章问题；优化文章展示样式。#I4RA0C 【修复】修复前端首页【文章组】展示样式。 【修复】修复后端订单列表【支付】按钮异常问题。#I4QWAN 【修复】删除商品编辑界面的商品的重量，只保留sku的重量，防止引起歧义。#I4QESQ ### 0.1.0 会员专业版： 【升级】更新uview为v2.0.22版本。 【新增】微信直播组件增加上传图片到微信服务器功能。 【优化】优化升级uview后多个页面商品展示列表图片高度缩略问题。 【修复】修复商品预览数据未加载成功错误。
This commit is contained in:
大灰灰
@@ -497,7 +497,7 @@ namespace CoreCms.Net.Services
|
||||
var articleClassifyId = parameters["articleClassifyId"].ObjectToInt(0);
|
||||
var limit = parameters["limit"].ObjectToInt(0);
|
||||
limit = limit > 0 ? limit : 20;
|
||||
var list = await _articleServices.QueryPageAsync(p => p.typeId == articleClassifyId,
|
||||
var list = await _articleServices.QueryPageAsync(p => p.typeId == articleClassifyId && p.isPub == true,
|
||||
p => p.createTime, OrderByType.Desc, 1, limit);
|
||||
if (list != null && list.Any())
|
||||
{
|
||||
|
||||
@@ -4,10 +4,9 @@
|
||||
*/
|
||||
|
||||
//接口请求地址，如果需要不部署接口端的情况下测试uni-app，可以直接替换为官方测试接口：https://api.demo.coreshop.cn
|
||||
export const apiBaseUrl = 'https://api.demo.coreshop.cn';
|
||||
export const apiBaseUrl = 'https://api.nsts.mvccms.cn';
|
||||
//项目静态资源请求地址，如果使用官方的静态文件地址可以直接替换为：https://files.cdn.coreshop.cn
|
||||
export const apiFilesUrl = 'https://files.cdn.coreshop.cn';
|
||||
|
||||
export const h5Url = apiBaseUrl + "/wap/"; //H5端网站地址,
|
||||
|
||||
// #ifdef H5
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
<style scoped lang="scss">
|
||||
.coreshop-index-article { border-radius: 16rpx; padding: 0rpx 25rpx; background: #FFFFFF !important; color: #333333 !important; margin: 20rpx 20rpx; overflow: hidden;
|
||||
.coreshop-cell-item { padding: 10rpx 0rpx 10rpx 0; float: left; width: 100%; border-bottom: 2rpx solid #f3f3f3;
|
||||
.coreshop-cell-item-bd { float: left; width: calc(100% - 200rpx); height: 90rpx; margin-top: 20rpx;
|
||||
.coreshop-cell-item-bd { float: left; width: calc(100% - 200rpx); margin-top: 20rpx; display: flex; flex-direction: column; align-items: flex-start;
|
||||
.article-title { font-size: 28rpx; color: #333; width: 100%; overflow: hidden; float: left; margin-bottom: 10rpx; }
|
||||
.article-des { font-size: 24rpx; color: #999; overflow: hidden; float: left; line-height: 40rpx; }
|
||||
}
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
methods: {
|
||||
// 查看文章详情
|
||||
articleDetail(articleId) {
|
||||
console.log();
|
||||
this.$u.route('/pages/article/details/details?id=' + articleId + '&idType=1')
|
||||
}
|
||||
}
|
||||
@@ -45,7 +46,7 @@
|
||||
<style lang="scss" scoped>
|
||||
.coreshop-index-article { border-radius: 16rpx; padding: 0rpx 25rpx; background: #FFFFFF !important; color: #333333 !important; margin: 20rpx 20rpx; overflow: hidden;
|
||||
.coreshop-cell-item { padding: 10rpx 0rpx 10rpx 0; float: left; width: 100%; border-bottom: 2rpx solid #f3f3f3;
|
||||
.coreshop-cell-item-bd { float: left; width: calc(100% - 200rpx); height: 90rpx; margin-top: 20rpx;
|
||||
.coreshop-cell-item-bd { float: left; width: calc(100% - 200rpx); margin-top: 20rpx; display: flex; flex-direction: column; align-items: flex-start;
|
||||
.article-title { font-size: 28rpx; color: #333; width: 100%; overflow: hidden; float: left; margin-bottom: 10rpx; }
|
||||
.article-des { font-size: 24rpx; color: #999; overflow: hidden; float: left; line-height: 40rpx; }
|
||||
}
|
||||
|
||||
@@ -76,14 +76,6 @@
|
||||
</div>
|
||||
</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);
|
||||
@@ -1147,18 +1147,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