Parcourir la source

Merge branch 'car_dev' of 121.43.114.153:/home/git/repositories/shopnc into car_dev

stanley-king il y a 7 ans
Parent
commit
f036289853

+ 9 - 0
mobile/car/index.html

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+</head>
+<body>
+
+</body>
+</html>

+ 4 - 4
shop/control/store_goods_add.php

@@ -282,9 +282,9 @@ class store_goods_addControl extends BaseSellerControl
             $common_array['virtual_invalid_refund'] = intval($_POST['g_vinvalidrefund']);
             $common_array['is_fcode']           = intval($_POST['is_fc']);
             $common_array['is_appoint']         = intval($_POST['is_appoint']);     // 只有库存为零的商品可以预约
-            $common_array['appoint_satedate']   = $common_array['is_appoint'] == 1 ? strtotime($_POST['g_saledate']) : '';   // 预约商品的销售时间
+            $common_array['appoint_satedate']   = $common_array['is_appoint'] == 1 ? strtotime($_POST['g_saledate']) : 0;   // 预约商品的销售时间
             $common_array['is_presell']         = $common_array['goods_state'] == 1 ? intval($_POST['is_presell']) : 0;     // 只有出售中的商品可以预售
-            $common_array['presell_deliverdate']= $common_array['is_presell'] == 1? strtotime($_POST['g_deliverdate']) : ''; // 预售商品的发货时间
+            $common_array['presell_deliverdate']= $common_array['is_presell'] == 1? strtotime($_POST['g_deliverdate']) : 0; // 预售商品的发货时间
             $common_array['is_own_shop']        = in_array($_SESSION['store_id'], model('store')->getOwnShopIds()) ? 1 : 0;
 
             // 保存数据
@@ -319,7 +319,7 @@ class store_goods_addControl extends BaseSellerControl
                         $goods['final_pay']         = floatval($value['final_pay']);     //尾款
                         $goods['storage_exp_date']  = strtotime($value['expdate']);      //库存有效期
                         $final_pay_solution = [
-                            'surplus_payment' => $value['surplus_payment'],
+                            'support_stage' => $value['support_stage'],
                             'surplus_periods' => $value['surplus_periods'],
                             'terminally_price'=> $value['terminally_price'],
                         ];
@@ -411,7 +411,7 @@ class store_goods_addControl extends BaseSellerControl
                     $goods['is_appoint']        = $common_array['is_appoint'];
                     $goods['is_presell']        = $common_array['is_presell'];
                     $goods['is_own_shop']       = $common_array['is_own_shop'];
-                    $goods['storage_exp_date']  = strtotime($_POST['expdate']);      //库存有效期
+                    $goods['storage_exp_date']  = 0;      //库存有效期
                     $goods['final_pay_solution']= serialize(null);              //序列化空值
                     $goods_id = $model_goods->addGoods($goods);
                     $model_type->addGoodsType($goods_id, $common_id, array('cate_id' => $_POST['cate_id'], 'type_id' => $_POST['type_id'], 'attr' => $_POST['attr']));

+ 3 - 3
shop/control/store_goods_online.php

@@ -153,7 +153,7 @@ class store_goods_onlineControl extends BaseSellerControl {
                     $sp_value ['i_' . $id . '|expdate'] = date("Y-m-d",$v['storage_exp_date']);
                     $final_pay_solution = unserialize($v['final_pay_solution']);
                     if(is_array($final_pay_solution)) {
-                        $sp_value ['i_' . $id . '|surplus_payment'] = $final_pay_solution['surplus_payment'];
+                        $sp_value ['i_' . $id . '|support_stage'] = $final_pay_solution['support_stage'];
                         $sp_value ['i_' . $id . '|surplus_periods'] = $final_pay_solution['surplus_periods'];
                         $sp_value ['i_' . $id . '|terminally_price'] = $final_pay_solution['terminally_price'];
                     }
@@ -468,7 +468,7 @@ class store_goods_onlineControl extends BaseSellerControl {
                     $update['final_pay']         = floatval($value['final_pay']);   //尾款
                     $update['storage_exp_date']  = strtotime($value['expdate']);    //库存有效期
                     $final_pay_solution = [
-                        'surplus_payment' => $value['surplus_payment'],
+                        'support_stage' => $value['support_stage'],
                         'surplus_periods' => $value['surplus_periods'],
                         'terminally_price'=> $value['terminally_price'],
                     ];
@@ -543,7 +543,7 @@ class store_goods_onlineControl extends BaseSellerControl {
                     $insert['final_pay']         = floatval($value['final_pay']);   //尾款
                     $insert['storage_exp_date']  = strtotime($value['expdate']);    //库存有效期
                     $final_pay_solution = [
-                        'surplus_payment' => $value['surplus_payment'],
+                        'support_stage' => $value['support_stage'],
                         'surplus_periods' => $value['surplus_periods'],
                         'terminally_price'=> $value['terminally_price'],
                     ];

Fichier diff supprimé car celui-ci est trop grand
+ 6 - 6
shop/templates/default/seller/store_goods_add.step2.php