lionared 7 лет назад
Родитель
Сommit
53d6f89228

+ 20 - 0
admin/control/goods_plus.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * 商品附加条款管理
+ * User: lionared
+ * Date: 2018/3/1
+ * Time: 下午2:47
+ */
+
+defined('InShopNC') or exit('Access Invalid!');
+class goods_plusControl extends SystemControl {
+
+    public function __construct(){
+        parent::__construct();
+        //Language::read('');
+    }
+
+    public function indexOp()
+    {
+    }
+}

+ 3 - 2
admin/control/spec.php

@@ -49,6 +49,7 @@ class specControl extends SystemControl {
 			}else {
 				$spec = array();
 				$spec['sp_name']		= $_POST['s_name'];
+				$spec['sp_type']        = intval($_POST['sp_type']);
 				$spec['sp_sort']		= intval($_POST['s_sort']);
 				$spec['class_id']		= $_POST['class_id'];
 				$spec['class_name']		= $_POST['class_name'];
@@ -103,8 +104,8 @@ class specControl extends SystemControl {
                 if($add_new) {
                     $url = array(
                         array(
-                            'url'=>'index.php?act=spec&op=spec_add',
-                            'msg'=>$lang['spec_index_continue_to_dd']
+                            'url'=>'index.php?act=spec&op=spec_value_add',
+                            'msg'=>"继续添加规格值"
                         ),
                         array(
                             'url'=>'index.php?act=spec&op=spec',

+ 1 - 0
admin/include/menu.php

@@ -84,6 +84,7 @@ $arr = array(
 					array('args'=>'type,type,goods',						'text'=>$lang['nc_type_manage']),
 					array('args'=>'spec,spec,goods',						'text'=>$lang['nc_spec_manage']),
 					array('args'=>'list,goods_album,goods',					'text'=>$lang['nc_album_manage']),
+                    array('args'=>'index,goods_plus,goods',					'text'=>'附加条款'),
 				)
 			),
 			3 => array(

+ 1 - 1
admin/templates/default/sp_value.add.php

@@ -6,7 +6,7 @@
             <h3><?php echo $lang['nc_spec_manage'];?></h3>
             <ul class="tab-base">
                 <li><a href="index.php?act=spec&op=spec"><span><?php echo $lang['nc_manage'];?></span></a></li>
-                <li><a href="JavaScript:void(0);"><span><?php echo $lang['nc_new'];?></span></a></li>
+                <li><a href="index.php?act=spec&op=spec_add"><span><?php echo $lang['nc_new'];?></span></a></li>
                 <li><a class="current" href="index.php?act=spec&op=spec_value_add"><span>添加规格值</span></a></li>
             </ul>
         </div>

+ 17 - 0
admin/templates/default/spec.add.php

@@ -42,6 +42,20 @@
           <td class="vatop tips"><?php echo $lang['spec_common_belong_class_tips'];?></td>
         </tr>
         <tr>
+            <td class="vatop rowform required" colspan="2">
+                <label class="validation" for="sp_type">规格类型</label>
+            </td>
+        </tr>
+        <tr class="noborder">
+            <td>
+                <select class="class-select" name="sp_type" id="sp_type">
+                    <option value="1">店铺自定义规格</option>
+                    <option value="2">平台通用规格</option>
+                </select>
+            </td>
+            <td>店铺自定义规格由店铺自行发布规格值,平台通用规格只能由平台发布规格值</td>
+        </tr>
+        <tr>
           <td class="required" colspan="2"><label class="validation" for="s_sort"><?php echo $lang['nc_sort'].$lang['nc_colon'];?></label></td>
         </tr>
         <tr class="noborder">
@@ -72,6 +86,9 @@ $(function(){
                 maxlength: 10,
                 minlength: 1
             },
+            sp_type: {
+                required : true
+            },
             s_sort: {
 				required : true,
 				digits	 : true

+ 1 - 0
data/resource/js/jquery.spec.js

@@ -12,6 +12,7 @@ $(document).ready(function(){
                 url: 'index.php?act=spec&op=ajax_spec_values&ajax=1&sp_id='+id,
                 dataType: 'json',
                 success: function(data){
+                    if(data == undefined || data == '') return false;
                     var src='';
                     for(var i = 0; i < data.length; i++){
                         var tmp_vertline = "<img class='preimg' src='"+ADMIN_TEMPLATES_URL+"/images/vertline.gif'/>";

+ 6 - 1
shop/control/store_goods_add.php

@@ -197,6 +197,8 @@ class store_goods_addControl extends BaseSellerControl
             $common_array['goods_storage_alarm']= intval($_POST['g_alarm']);
             $common_array['goods_attr']         = serialize($_POST['attr']);
             $common_array['goods_body']         = $_POST['g_body'];
+            $common_array['car_id']             = intval($_POST['car_id']);         //车型id
+            $common_array['insurance_fee']      = floatval($_POST['insurance_fee']);//保险费用
             // 序列化保存手机端商品描述数据
             if ($_POST['m_body'] != '') {
                 $_POST['m_body'] = str_replace('&quot;', '"', $_POST['m_body']);
@@ -221,7 +223,7 @@ class store_goods_addControl extends BaseSellerControl
             $common_array['areaid_1']           = intval($_POST['province_id']);
             $common_array['areaid_2']           = intval($_POST['city_id']);
             $common_array['transport_id']       = ($_POST['freight'] == '0') ? '0' : intval($_POST['transport_id']); // 运费模板
-            $common_array['transport_title']    = $_POST['transport_title'];
+            $common_array['transport_title']    = $_POST['transport_title'] ? : '';
             $common_array['goods_freight']      = floatval($_POST['g_freight']);
             //查询店铺商品分类
             $goods_stcids_arr = array();
@@ -294,6 +296,7 @@ class store_goods_addControl extends BaseSellerControl
                         $goods['month_pay']         = floatval($value['month_pay']);     //月供
                         $goods['final_pay']         = floatval($value['final_pay']);     //尾款
                         $goods['storage_exp_date']  = strtotime($value['expdate']);      //库存有效期
+                        $goods['final_pay_solution']= serialize($value['final_pay_solution']);  //尾款支付方案序列化
 
                         $specs = array_values($value['sp_value']);
                         $split_num = 0;
@@ -377,6 +380,8 @@ 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['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']));
 

+ 4 - 0
shop/control/store_goods_online.php

@@ -326,6 +326,8 @@ class store_goods_onlineControl extends BaseSellerControl {
         $update_common['goods_storage_alarm']= intval($_POST['g_alarm']);
         $update_common['goods_attr']         = serialize($_POST['attr']);
         $update_common['goods_body']         = $_POST['g_body'];
+        $update_common['car_id']            = intval($_POST['car_id']);         //车型id
+        $update_common['insurance_fee']     = floatval($_POST['insurance_fee']);//保险费用
         // 序列化保存手机端商品描述数据
         if ($_POST['m_body'] != '') {
             $_POST['m_body'] = str_replace('&quot;', '"', $_POST['m_body']);
@@ -431,6 +433,7 @@ class store_goods_onlineControl extends BaseSellerControl {
                     $update['month_pay']         = floatval($value['month_pay']);   //月供
                     $update['final_pay']         = floatval($value['final_pay']);   //尾款
                     $update['storage_exp_date']  = strtotime($value['expdate']);    //库存有效期
+                    $update['final_pay_solution']= serialize($value['final_pay_solution']);  //尾款支付方案序列化
 
                     $specs = array_values($value['sp_value']);
                     $split_num = 0;
@@ -497,6 +500,7 @@ class store_goods_onlineControl extends BaseSellerControl {
                     $insert['month_pay']         = floatval($value['month_pay']);   //月供
                     $insert['final_pay']         = floatval($value['final_pay']);   //尾款
                     $insert['storage_exp_date']  = strtotime($value['expdate']);    //库存有效期
+                    $insert['final_pay_solution']= serialize($value['final_pay_solution']);  //尾款支付方案序列化
 
                     $specs = array_values($value['sp_value']);
                     $split_num = 0;

+ 2 - 0
shop/resource/js/store_goods_add.step2.js

@@ -352,7 +352,9 @@ $(function(){
         if(index > 0) {
             var car_name = $(this).find("option:selected").text();
             $('input[name="g_name"]').val(car_name);
+            //$('input[name="goods_name"]').val(car_name);
             $('input[name="g_mobile_name"]').val(car_name);
+            //$('input[name="goods_mobile_name"]').val(car_name);
             $('#car_id').val($(this).val());
             //获取市场指导价
             var url = SITEURL + '/index.php?act=store_goods_add&op=ajax_get_car_price&car_id=' + $(this).val();

Разница между файлами не показана из-за своего большого размера
+ 62 - 48
shop/templates/default/seller/store_goods_add.step2.php