From b8778878622defa5b5af337be81d17c98845f277 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Tue, 13 Dec 2022 17:00:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E8=B4=AD=E4=B9=B0=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=A4=9A=E4=B8=AA=E5=95=86=E5=93=81=E3=80=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=85=AC=E5=85=B1=E5=8A=A0=E5=85=A5=E8=B4=AD=E7=89=A9?= =?UTF-8?q?=E8=BD=A6=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 +- app/admin/view/default/public/header.html | 2 + app/index/controller/Buy.php | 13 +- app/index/view/default/buy/index.html | 6 +- app/index/view/default/goods/cart_info.html | 4 +- app/index/view/default/goods/index.html | 14 +- app/index/view/default/public/header.html | 4 + app/lang/zh-cn.php | 2 + .../public/common/goods_category_choice.html | 2 +- app/service/BuyService.php | 118 ++++---- extend/base/Page.php | 8 +- public/static/common/css/common.css | 73 +++++ public/static/common/js/common.js | 264 +++++++++++++++++- public/static/common/js/layout.admin.js | 6 +- .../lib/amazeui-dialog/amazeui.dialog.js | 46 +-- public/static/index/default/css/goods.css | 2 +- public/static/index/default/js/cart.js | 22 +- .../static/index/default/js/goods.cartinfo.js | 8 +- public/static/index/default/js/goods.js | 8 +- 19 files changed, 477 insertions(+), 130 deletions(-) diff --git a/README.md b/README.md index d7806e508..4b23b1b87 100755 --- a/README.md +++ b/README.md @@ -25,8 +25,8 @@ ------------------------------------------------------------------------ ### 项目介绍 -#### ShopXO国内领先企业级免费开源电商系统！ -* 求实进取、创新专注、自主研发、国内领先企业级电商系统解决方案。 +#### ShopXO国内企业级免费开源电商系统！ +* 求实进取、创新专注、自主研发、国内企业级电商系统解决方案。 * 遵循MIT开源协议发布，无需授权、可商用、可二次开发、满足99%的电商运营需求。 * 支持PC+H5，小程序（支付宝、微信、百度、头条&抖音、QQ、快手），APP等... * 支持多仓库、多商户、线下门店模式运营（组件插件化、即插即用），可视化DIY拖拽装修。 @@ -48,6 +48,7 @@ * 官方3群：1127073697 * 官方多商户群：782971010 * 官方多门店群：281418967 +* 官方进销存群：719894308 * 官方uniapp群：679303149 ### 当前项目源代码平台 diff --git a/app/admin/view/default/public/header.html b/app/admin/view/default/public/header.html index ec2c69d3d..36feb427a 100755 --- a/app/admin/view/default/public/header.html +++ b/app/admin/view/default/public/header.html @@ -95,6 +95,8 @@ var __env_max_input_vars_count__ = '{{$env_max_input_vars_count}}'; var __map_view_url__ = '{{:MyUrl("admin/map/index")}}'; var __load_map_type__ = '{{$load_map_type}}'; + var __goods_spec_type_url__ = ''; + var __goods_spec_detail_url__ = ''; // 语言定义（用于js调用、模板引擎直接使用$lang_data.xxx获取对应语言即可） {{if !empty($lang_data)}} {{foreach $lang_data as $k=>$v}} diff --git a/app/index/controller/Buy.php b/app/index/controller/Buy.php index 3973ba303..64bc424ca 100755 --- a/app/index/controller/Buy.php +++ b/app/index/controller/Buy.php @@ -66,21 +66,15 @@ class Buy extends Common } // 获取下单信息 - $data = MySession('buy_post_data'); - if(empty($data)) + $buy_data = MySession('buy_post_data'); + if(empty($buy_data) || empty($buy_data['goods_data'])) { MyViewAssign('msg', '商品信息为空'); return MyView('public/tips_error'); - } else { - // 规格数据避免被转义 - if(!empty($data['spec'])) - { - $data['spec'] = htmlspecialchars_decode($data['spec']); - } } // 参数 - $params = array_merge($this->data_request, $data); + $params = array_merge($this->data_request, $buy_data); $params['user'] = $this->user; // 默认支付方式 @@ -104,6 +98,7 @@ class Buy extends Common $assign = [ 'base' => $buy_base, 'buy_goods' => $buy_goods, + 'buy_data' => $buy_data, // 浏览器名称 'home_seo_site_title' => SeoService::BrowserSeoTitle('订单确认', 1), // 公共销售模式 diff --git a/app/index/view/default/buy/index.html b/app/index/view/default/buy/index.html index 390381a4a..9ccf37d05 100755 --- a/app/index/view/default/buy/index.html +++ b/app/index/view/default/buy/index.html @@ -646,10 +646,8 @@ {{/if}}
- - - - + + diff --git a/app/index/view/default/goods/cart_info.html b/app/index/view/default/goods/cart_info.html index 781eab7a1..971230d0b 100644 --- a/app/index/view/default/goods/cart_info.html +++ b/app/index/view/default/goods/cart_info.html @@ -4,7 +4,7 @@ {{include file="public/not_data" /}} {{else /}} -
+

{{$goods.title}} @@ -82,7 +82,7 @@ function GoodsCartInfoSubmitBack(e) Prompt(e.msg, 'success'); setTimeout(function() { - parent.IframePopupHomeCartNumberTotalUpdate(parseInt(e.data.buy_number), '.common-goods-cart-popup'); + parent.IframePopupHomeCartNumberTotalUpdate(e.data.buy_number, '.common-goods-cart-popup'); }, 1500); } else { Prompt(e.msg); diff --git a/app/index/view/default/goods/index.html b/app/index/view/default/goods/index.html index 77ca63731..78f31b614 100755 --- a/app/index/view/default/goods/index.html +++ b/app/index/view/default/goods/index.html @@ -527,20 +527,18 @@

- - + - - + -
+ - +
{{else /}}

{{if empty($buy_button['error'])}}暂停销售{{else /}}{{$buy_button.error}}{{/if}}

@@ -616,7 +614,7 @@