mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2026-05-09 11:07:21 +08:00
【新增】新增微信扫码支付功能，对接PC端。
【新增】增加DTO类库，将逐步完善dto层。 【修复】修复【分类】切换后，切换回来未清零原始数据，导致更新数据重复的问题。 【调整】移除模板库功能，防止出现审核因为模板库页面存在而导致的审核失败。暂将模板库的代码存放到会员QQ群内，方便下载使用。 【调整】代码生成器【Repository.tpl】移除Cache手动增删改，【SqlSugarSetup】增加sqlsugar自动检测增删改后清理二级缓存。 【调整】后端新增秒杀独立组件，用于区分团购及秒杀的差异，首页新增秒杀组件。 【优化】重写首页所有组件样式及接口数据获取效率。 【优化】优化拼团，秒杀，团购，接龙数据获取逻辑，提升列表及详情页面数据获取效率。 【优化】调整拼团，秒杀，团购，服务商品推广海报为新式海报效果。增加服务商品推广海报。 【优化】清理h5相关代码判断，移除h5支付组件，提高响应速度。 【优化】移除小程序前端冗余代码。加快代码执行效率。
This commit is contained in:
大灰灰
@@ -1045,7 +1045,8 @@ template {
|
||||
#selectGoods li .icon-delete:hover {
|
||||
color: #000;
|
||||
}
|
||||
#selectGroupPurchaseGoods li {
|
||||
#selectGroupPurchaseGoods li,
|
||||
#selectSeckillGoods li {
|
||||
float: left;
|
||||
margin: 10px;
|
||||
height: 100px;
|
||||
@@ -1055,23 +1056,27 @@ template {
|
||||
border-radius: 3px;
|
||||
cursor: move;
|
||||
}
|
||||
#selectGroupPurchaseGoods li .left {
|
||||
#selectGroupPurchaseGoods li .left,
|
||||
#selectSeckillGoods li .left {
|
||||
float: left;
|
||||
width: 170px;
|
||||
height: 90px;
|
||||
}
|
||||
#selectGroupPurchaseGoods li .left img {
|
||||
#selectGroupPurchaseGoods li .left img,
|
||||
#selectSeckillGoods li .left img {
|
||||
width: 170px;
|
||||
height: 90px;
|
||||
object-fit: cover;
|
||||
}
|
||||
#selectGroupPurchaseGoods li .right {
|
||||
#selectGroupPurchaseGoods li .right,
|
||||
#selectSeckillGoods li .right {
|
||||
float: left;
|
||||
width: calc(100% - 180px);
|
||||
height: 90px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
#selectGroupPurchaseGoods li .icon-delete {
|
||||
#selectGroupPurchaseGoods li .icon-delete,
|
||||
#selectSeckillGoods li .icon-delete {
|
||||
position: absolute;
|
||||
top: -6px;
|
||||
right: -6px;
|
||||
@@ -1082,7 +1087,8 @@ template {
|
||||
transition: background-color 0.3s ease-out, border-color 0.3s ease-out;
|
||||
-webkit-transition: background-color 0.3s ease-out, border-color 0.3s ease-out;
|
||||
}
|
||||
#selectGroupPurchaseGoods li .icon-delete:hover {
|
||||
#selectGroupPurchaseGoods li .icon-delete:hover,
|
||||
#selectSeckillGoods li .icon-delete:hover {
|
||||
color: #000;
|
||||
}
|
||||
.divider {
|
||||
|
||||
@@ -289,7 +289,7 @@ template { display: none; }
|
||||
}
|
||||
}
|
||||
}
|
||||
#selectGroupPurchaseGoods {
|
||||
#selectGroupPurchaseGoods, #selectSeckillGoods {
|
||||
li { float: left; margin: 10px; height: 100px; width: calc(100% - 20px); background: #f7fafc; position: relative; border-radius: 3px; cursor: move;
|
||||
.left { float: left; width: 170px; height: 90px;
|
||||
img { width: 170px; height: 90px; object-fit: cover; }
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -296,9 +296,30 @@ var allWidget = {
|
||||
},
|
||||
{
|
||||
"type": "groupPurchase",
|
||||
"name": "团购秒杀",
|
||||
"name": "团购",
|
||||
"value": {
|
||||
"title": '活动名称',
|
||||
"title": '团购活动名称',
|
||||
"limit": '10',
|
||||
"list": [
|
||||
{
|
||||
"image": "/static/images/common/empty-banner.png",
|
||||
"name": '',
|
||||
"price": ''
|
||||
},
|
||||
{
|
||||
"image": "/static/images/common/empty-banner.png",
|
||||
"name": '',
|
||||
"price": ''
|
||||
},
|
||||
]
|
||||
},
|
||||
"icon": "icon-tuangou"
|
||||
},
|
||||
{
|
||||
"type": "seckill",
|
||||
"name": "秒杀",
|
||||
"value": {
|
||||
"title": '秒杀活动名称',
|
||||
"limit": '10',
|
||||
"list": [
|
||||
{
|
||||
@@ -780,7 +801,10 @@ Vue.component('layout-config', {
|
||||
return '商品选项卡'
|
||||
break;
|
||||
case 'groupPurchase':
|
||||
return '团购秒杀'
|
||||
return '团购'
|
||||
break;
|
||||
case 'seckill':
|
||||
return '秒杀'
|
||||
break;
|
||||
case 'pinTuan':
|
||||
return '拼团'
|
||||
@@ -1202,7 +1226,7 @@ Vue.component('layout-config', {
|
||||
var that = this;
|
||||
layui.use(['form', 'table'], function () {
|
||||
layui.admin.popup({
|
||||
title: '团购秒杀列表',
|
||||
title: '团购列表',
|
||||
area: ['1200px', '90%'],
|
||||
id: 'LAY-app-CoreCmsCommon-getGroupIds',
|
||||
success: function (layero, index) {
|
||||
@@ -1218,9 +1242,36 @@ Vue.component('layout-config', {
|
||||
for (let i in ids) {
|
||||
arr.push(ids[i]);
|
||||
}
|
||||
|
||||
console.log(arr);
|
||||
|
||||
that.$set(that.selectWg.value, 'list', arr)
|
||||
layer.close(index);
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
},
|
||||
selectSeckillGoods: function () {
|
||||
var that = this;
|
||||
layui.use(['form', 'table'], function () {
|
||||
layui.admin.popup({
|
||||
title: '秒杀列表',
|
||||
area: ['1200px', '90%'],
|
||||
id: 'LAY-app-CoreCmsCommon-getSeckillIds',
|
||||
success: function (layero, index) {
|
||||
layui.view(this.id).render('common/getSeckillIds', null).done(function () {
|
||||
layui.form.on('submit(LAY-app-CoreCmsCommon-GetSeckillIds-submit)',
|
||||
function (data) {
|
||||
//判断个数是否满足
|
||||
if (Object.getOwnPropertyNames(ids).length > that.maxSelectGoods) {
|
||||
layer.msg("最多只能选择" + that.maxSelectGoods + "个");
|
||||
return false;
|
||||
}
|
||||
var arr = []
|
||||
for (let i in ids) {
|
||||
arr.push(ids[i]);
|
||||
}
|
||||
console.log(arr);
|
||||
that.$set(that.selectWg.value, 'list', arr)
|
||||
layer.close(index);
|
||||
});
|
||||
|
||||
@@ -12,7 +12,7 @@ layui.define(['laytpl', 'layer', 'element', 'util'], function (exports) {
|
||||
, pageTabs: false //是否开启页面选项卡功能。单页版不推荐开启
|
||||
|
||||
, name: '核心商城系统'
|
||||
, version: 'CoreShopProfessional v0.6.2'
|
||||
, version: '0.6.4'
|
||||
, tableName: 'CoreCms' //本地存储表名
|
||||
, MOD_NAME: 'admin' //模块事件名
|
||||
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
/** layuiAdmin.pro-v1.7.0 LPPL License */
|
||||
; layui.extend({ setter: "config", admin: "lib/admin", view: "lib/view", breadcrumb: 'controller/breadcrumb' }).define(["setter", "admin", "breadcrumb"],function(e){var a=layui.setter,n=layui.element,i=layui.admin,t=i.tabsPage,l=layui.view,r=function(){var e=layui.router(),o=e.path,y=i.correctRouter(e.path.join("/"));o.length||(o=[""]),""===o[o.length-1]&&(o[o.length-1]=a.entry);var h=function(e){r.haveInit&&d(".layui-layer").each(function(){var e=d(this),a=e.attr("times");e.hasClass("layui-layim")||layer.close(a)}),r.haveInit=!0,d(s).scrollTop(0),delete t.type};return"tab"===t.type&&("/"!==y||"/"===y&&i.tabsBody().html())?(i.tabsBodyChange(t.index),h(t.type)):(l().render(o.join("/")).then(function(l){var r,o=d("#LAY_app_tabsheader>li");o.each(function(e){var a=d(this),n=a.attr("lay-id");n===y&&(r=!0,t.index=e)}),a.pageTabs&&"/"!==y&&(r||(d(s).append('<div class="layadmin-tabsbody-item layui-show"></div>'),t.index=o.length,n.tabAdd(u,{title:"<span>"+(l.title||"新标签页")+"</span>",id:y,attr:e.href}))),this.container=i.tabsBody(t.index),a.pageTabs||this.container.scrollTop(0),n.tabChange(u,y),i.tabsBodyChange(t.index)}).done(function(){layui.use("common",layui.cache.callback.common),c.on("resize",layui.data.resize),n.render("breadcrumb","breadcrumb"),i.tabsBody(t.index).on("scroll",function(){var e=d(this),a=d(".layui-laydate"),n=d(".layui-layer")[0];a[0]&&(a.each(function(){var e=d(this);e.hasClass("layui-laydate-static")||e.remove()}),e.find("input").blur()),n&&layer.closeAll("tips")})}),void h())},o=function(e){var n,t=layui.router(),o=l(a.container),s=i.correctRouter(t.path.join("/"));if(layui.each(a.indPage,function(e,a){if(s===a)return n=!0}),layui.config({base:a.base+"controller/"}),n||"/user/login"===s)o.render(t.path.join("/")).done(function(){i.pageType="alone"});else{if(a.interceptor){var u=layui.data(a.tableName);if(!u[a.request.tokenName])return location.hash="/user/login/redirect="+encodeURIComponent(s)}"console"===i.pageType?r():o.render("layout").done(function(){r(),layui.element.render(),i.screen()<2&&i.sideFlexible(),i.pageType="console"})}},s="#LAY_app_body",u="layadmin-layout-tabs",d=layui.$,c=d(window);layui.link(a.base+"style/admin.css?v="+(i.v+"-1"),function(){o()},"layuiAdmin"),window.onhashchange=function(){o(),layui.event.call(this,a.MOD_NAME,"hash({*})",layui.router())},layui.each(a.extend,function(e,n){var i={},t=a.extend.constructor===Array;i[t?n:e]="{/}"+a.base+"lib/extend/"+n,layui.extend(i)}),e("index",{render:r})});
|
||||
; layui.extend({ setter: "config", admin: "lib/admin", view: "lib/view", breadcrumb: 'controller/breadcrumb' }).define(["setter", "admin", "breadcrumb"],function(e){console.log(`\n %c \u6838\u5fc3\u5546\u57ce\u7cfb\u7edf\u0020\u0043\u006f\u0072\u0065\u0053\u0068\u006f\u0070 V${layui.setter.version} %c \u0068\u0074\u0074\u0070\u0073\u003a\u002f\u002f\u0077\u0077\u0077\u002e\u0063\u006f\u0072\u0065\u0073\u0068\u006f\u0070\u002e\u0063\u006e\u002f \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #f1f1f1; padding:5px 0;');var a=layui.setter,n=layui.element,i=layui.admin,t=i.tabsPage,l=layui.view,r=function(){var e=layui.router(),o=e.path,y=i.correctRouter(e.path.join("/"));o.length||(o=[""]),""===o[o.length-1]&&(o[o.length-1]=a.entry);var h=function(e){r.haveInit&&d(".layui-layer").each(function(){var e=d(this),a=e.attr("times");e.hasClass("layui-layim")||layer.close(a)}),r.haveInit=!0,d(s).scrollTop(0),delete t.type};return"tab"===t.type&&("/"!==y||"/"===y&&i.tabsBody().html())?(i.tabsBodyChange(t.index),h(t.type)):(l().render(o.join("/")).then(function(l){var r,o=d("#LAY_app_tabsheader>li");o.each(function(e){var a=d(this),n=a.attr("lay-id");n===y&&(r=!0,t.index=e)}),a.pageTabs&&"/"!==y&&(r||(d(s).append('<div class="layadmin-tabsbody-item layui-show"></div>'),t.index=o.length,n.tabAdd(u,{title:"<span>"+(l.title||"新标签页")+"</span>",id:y,attr:e.href}))),this.container=i.tabsBody(t.index),a.pageTabs||this.container.scrollTop(0),n.tabChange(u,y),i.tabsBodyChange(t.index)}).done(function(){layui.use("common",layui.cache.callback.common),c.on("resize",layui.data.resize),n.render("breadcrumb","breadcrumb"),i.tabsBody(t.index).on("scroll",function(){var e=d(this),a=d(".layui-laydate"),n=d(".layui-layer")[0];a[0]&&(a.each(function(){var e=d(this);e.hasClass("layui-laydate-static")||e.remove()}),e.find("input").blur()),n&&layer.closeAll("tips")})}),void h())},o=function(e){var n,t=layui.router(),o=l(a.container),s=i.correctRouter(t.path.join("/"));if(layui.each(a.indPage,function(e,a){if(s===a)return n=!0}),layui.config({base:a.base+"controller/"}),n||"/user/login"===s)o.render(t.path.join("/")).done(function(){i.pageType="alone"});else{if(a.interceptor){var u=layui.data(a.tableName);if(!u[a.request.tokenName])return location.hash="/user/login/redirect="+encodeURIComponent(s)}"console"===i.pageType?r():o.render("layout").done(function(){r(),layui.element.render(),i.screen()<2&&i.sideFlexible(),i.pageType="console"})}},s="#LAY_app_body",u="layadmin-layout-tabs",d=layui.$,c=d(window);layui.link(a.base+"style/admin.css?v="+(i.v+"-1"),function(){o()},"layuiAdmin"),window.onhashchange=function(){o(),layui.event.call(this,a.MOD_NAME,"hash({*})",layui.router())},layui.each(a.extend,function(e,n){var i={},t=a.extend.constructor===Array;i[t?n:e]="{/}"+a.base+"lib/extend/"+n,layui.extend(i)}),e("index",{render:r})});
|
||||
Reference in New Issue
Block a user