diff --git a/app/admin/view/default/site/sitetype/index.html b/app/admin/view/default/site/sitetype/index.html index 6664ba995..89b6f6e0f 100644 --- a/app/admin/view/default/site/sitetype/index.html +++ b/app/admin/view/default/site/sitetype/index.html @@ -18,7 +18,7 @@
-

1. 销售型、常规电商流程,用户选择收货地址下单支付 -> 商家发货 -> 确认收货 -> 订单完成

+

1. 快递、常规电商流程,用户选择收货地址下单支付 -> 商家发货 -> 确认收货 -> 订单完成

2. 展示型、仅展示产品,可发起咨询(不能下单)

3. 自提点、下单时选择自提货物地址,用户下单支付 -> 确认提货 -> 订单完成

4. 虚拟销售、常规电商流程,用户下单支付 -> 自动发货 -> 确认提货 -> 订单完成

diff --git a/app/index/view/default/buy/index.html b/app/index/view/default/buy/index.html index 0299257b4..cf75a879f 100755 --- a/app/index/view/default/buy/index.html +++ b/app/index/view/default/buy/index.html @@ -55,7 +55,7 @@
{{/if}} - + {{if isset($base['site_model']) and $base['site_model'] eq 0}}
diff --git a/app/service/BuyService.php b/app/service/BuyService.php index c67720775..82951fd2c 100755 --- a/app/service/BuyService.php +++ b/app/service/BuyService.php @@ -1062,7 +1062,7 @@ class BuyService ], ]; - // // 销售型,自提点,销售+自提 则校验地址 + // // 快递,自提点,销售+自提 则校验地址 if(in_array($site_model, [0,2])) { $p[] = [ @@ -1150,7 +1150,7 @@ class BuyService return $check; } - // 销售型,自提点,销售+自提 地址处理 + // 快递,自提点,销售+自提 地址处理 $address = []; if(in_array($site_model, [0,2])) { @@ -1337,7 +1337,7 @@ class BuyService } // 订单模式处理 - // 销售型模式,自提模式,销售+自提 + // 快递模式,自提模式,销售+自提 if(in_array($order['order_model'], [0,2])) { // 添加订单(收货|取货)地址 diff --git a/app/service/ConstService.php b/app/service/ConstService.php index ba5e32fd1..bc64ce123 100644 --- a/app/service/ConstService.php +++ b/app/service/ConstService.php @@ -311,16 +311,16 @@ class ConstService // 站点类型 'common_site_type_list' => [ - 0 => ['value' => 0, 'name' => '销售'], + 0 => ['value' => 0, 'name' => '快递'], 1 => ['value' => 1, 'name' => '展示'], 2 => ['value' => 2, 'name' => '自提'], - 3 => ['value' => 3, 'name' => '虚拟销售'], - 4 => ['value' => 4, 'name' => '销售+自提', 'is_ext' => 1], + 3 => ['value' => 3, 'name' => '虚拟售卖'], + 4 => ['value' => 4, 'name' => '快递+自提', 'is_ext' => 1], ], // 订单类型 'common_order_type_list' => [ - 0 => ['value' => 0, 'name' => '销售'], + 0 => ['value' => 0, 'name' => '快递'], 1 => ['value' => 1, 'name' => '展示'], 2 => ['value' => 2, 'name' => '自提'], 3 => ['value' => 3, 'name' => '虚拟销售'], diff --git a/app/service/GoodsService.php b/app/service/GoodsService.php index eaa0ddb24..250dacba7 100755 --- a/app/service/GoodsService.php +++ b/app/service/GoodsService.php @@ -2760,7 +2760,9 @@ class GoodsService } // 仅可单独购买 - return DataReturn('仅单买', -1, $site_type); + $site_type_arr = MyConst('common_site_type_list'); + $msg = array_key_exists($site_type, $site_type_arr) ? '仅'.$site_type_arr[$site_type]['name'] : '仅单买'; + return DataReturn($msg, -1, $site_type); } /** diff --git a/app/service/OrderService.php b/app/service/OrderService.php index ed6674073..db700378d 100755 --- a/app/service/OrderService.php +++ b/app/service/OrderService.php @@ -1306,7 +1306,7 @@ class OrderService } // 订单模式处理 - // 销售型模式+自提模式 + // 快递模式+自提模式 if(in_array($v['order_model'], [0,2])) { // 销售模式+自提模式 地址信息 diff --git a/app/service/SystemBaseService.php b/app/service/SystemBaseService.php index cc8dd75f0..4f48cd412 100644 --- a/app/service/SystemBaseService.php +++ b/app/service/SystemBaseService.php @@ -280,7 +280,7 @@ class SystemBaseService */ public static function SiteTypeValue() { - // 当前站点类型、默认销售型(0销售型, 1展示型, 2自提点, 3虚拟销售, 4销售+自提) + // 当前站点类型、默认快递(0快递, 1展示型, 2自提点, 3虚拟销售, 4销售+自提) $value = (int) MyC('common_site_type', 0, true); // 钩子