From b40d6fd591e519f542d3edfb5e1fce84d1df1730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E4=B8=80=E5=B3=B0?= <1feng.0595@gmail.com>
Date: Tue, 15 Aug 2017 01:02:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/admin/goods/add.blade.php  | 16 +++++++++++++---
 resources/views/admin/goods/edit.blade.php |  8 ++++++--
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/resources/views/admin/goods/add.blade.php b/resources/views/admin/goods/add.blade.php
index 6136004..f40374e 100644
--- a/resources/views/admin/goods/add.blade.php
+++ b/resources/views/admin/goods/add.blade.php
@@ -14,11 +14,11 @@
     </tr>
 	<tr>
         <td align="right">货号：</td>
-        <td colspan="2"><input name="serial_no" type="text" id="serial_no" style="width:180px" value="">&nbsp;&nbsp; 运费：<input name="delivery_fee" type="text" id="delivery_fee" style="width:100px" value="">&nbsp;&nbsp; 销量：<input name="sales" type="text" id="sales" style="width:60px" value=""></td>
+        <td colspan="2"><input name="sn" type="text" id="sn" style="width:180px" value="">&nbsp;&nbsp; 运费：<input name="shipping_fee" type="text" id="shipping_fee" style="width:100px" value="">&nbsp;&nbsp; 销量：<input name="sale" type="text" id="sale" style="width:60px" value=""></td>
     </tr>
     <tr>
         <td align="right">商品价格：</td>
-        <td colspan="2"><input name="price" type="text" id="price" style="width:100px" value="">&nbsp;&nbsp; 原价：<input name="origin_price" type="text" id="origin_price" style="width:100px" value="">&nbsp;&nbsp; 库存：<input name="inventory" type="text" id="inventory" style="width:60px" value="">&nbsp;&nbsp; 浏览次数：<input type="text" name="click" id="click" value="" style="width:60px;"></td>
+        <td colspan="2"><input name="price" type="text" id="price" style="width:100px" value="">&nbsp;&nbsp; 原价：<input name="market_price" type="text" id="market_price" style="width:100px" value="">&nbsp;&nbsp; 库存：<input name="goods_number" type="text" id="goods_number" style="width:60px" value="">&nbsp;&nbsp; 浏览次数：<input type="text" name="click" id="click" value="" style="width:60px;"></td>
     </tr>
 	<tr>
         <td align="right">上架：</td>
@@ -29,7 +29,7 @@
     </tr>
     <tr>
         <td align="right">活动价：</td>
-        <td colspan="2"><input name="promote_price" type="text" id="promote_price" style="width:80px" value="">&nbsp;&nbsp; 活动开始日期：<input name="promote_start_date" onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})" type="text" id="promote_start_date" style="width:180px" value="">&nbsp;&nbsp; 活动结束日期：<input name="promote_end_date" onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})" type="text" id="promote_end_date" style="width:180px" value=""></td>
+        <td colspan="2"><input name="promote_price" type="text" id="promote_price" style="width:80px" value="">&nbsp;&nbsp; 活动开始日期：<input name="promote_start_date" onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})" type="text" id="promote_start_date" style="width:185px" value="">&nbsp;&nbsp; 活动结束日期：<input name="promote_end_date" onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})" type="text" id="promote_end_date" style="width:185px" value=""></td>
     </tr>
     <tr>
         <td align="right">推荐：</td>
@@ -40,6 +40,16 @@
             </select>
         </td>
     </tr>
+    <tr>
+        <td align="right">规格：</td>
+        <td id="spec"><button type="button" id="add_spec_button">+添加规格</button>
+        <script>
+        var spec = '<div class="spec_li" style="margin-top:5px;"><input required="required" name="spec_name[]" type="text" value="" style="width:120px" placeholder="颜色"> <input placeholder="黑，白" name="spec_data[]" type="text" value="" style="width:200px" required="required"> <button type="button" onClick="remove_specli(\'spec_li\');">删除</button></div>';
+        $("#add_spec_button").click(function(){var length=$(".spec_li").length+1;var reg=/spec_li/g;spec=spec.replace(reg,'spec_li'+length);$('#spec').append(spec);});
+        function remove_specli(a){$("."+a).remove();}
+        </script>
+        </td>
+    </tr>
     <tr>
         <td align="right">seoTitle：</td>
         <td><input name="seotitle" type="text" id="seotitle" value="" style="width:60%"></td>
diff --git a/resources/views/admin/goods/edit.blade.php b/resources/views/admin/goods/edit.blade.php
index 44408d9..3b9fc70 100644
--- a/resources/views/admin/goods/edit.blade.php
+++ b/resources/views/admin/goods/edit.blade.php
@@ -13,11 +13,11 @@
     </tr>
 	<tr>
         <td align="right">货号：</td>
-        <td colspan="2"><input name="serial_no" type="text" id="serial_no" style="width:180px" value="<?php echo $post["serial_no"]; ?>">&nbsp;&nbsp; 运费：<input name="delivery_fee" type="text" id="delivery_fee" style="width:100px" value="<?php echo $post["delivery_fee"]; ?>">&nbsp;&nbsp; 销量：<input name="sales" type="text" id="sales" style="width:60px" value="<?php echo $post["sales"]; ?>"></td>
+        <td colspan="2"><input name="sn" type="text" id="sn" style="width:180px" value="<?php echo $post["sn"]; ?>">&nbsp;&nbsp; 运费：<input name="shipping_fee" type="text" id="shipping_fee" style="width:100px" value="<?php echo $post["shipping_fee"]; ?>">&nbsp;&nbsp; 销量：<input name="sale" type="text" id="sale" style="width:60px" value="<?php echo $post["sale"]; ?>"></td>
     </tr>
     <tr>
         <td align="right">商品价格：</td>
-        <td colspan="2"><input name="price" type="text" id="price" style="width:100px" value="<?php echo $post["price"]; ?>">&nbsp;&nbsp; 原价：<input name="origin_price" type="text" id="origin_price" style="width:100px" value="<?php echo $post["origin_price"]; ?>">&nbsp;&nbsp; 库存：<input name="inventory" type="text" id="inventory" style="width:60px" value="<?php echo $post["inventory"]; ?>">&nbsp;&nbsp; 浏览次数：<input type="text" name="click" id="click" value="<?php echo $post["click"]; ?>" style="width:60px;"></td>
+        <td colspan="2"><input name="price" type="text" id="price" style="width:100px" value="<?php echo $post["price"]; ?>">&nbsp;&nbsp; 原价：<input name="market_price" type="text" id="market_price" style="width:100px" value="<?php echo $post["market_price"]; ?>">&nbsp;&nbsp; 库存：<input name="goods_number" type="text" id="goods_number" style="width:60px" value="<?php echo $post["goods_number"]; ?>">&nbsp;&nbsp; 浏览次数：<input type="text" name="click" id="click" value="<?php echo $post["click"]; ?>" style="width:60px;"></td>
     </tr>
 	<tr>
         <td align="right">上架：</td>
@@ -26,6 +26,10 @@
 			<input type="radio" value='1' name="status" <?php if($post['status']==1){echo 'checked';} ?> />&nbsp;否
 		</td>
     </tr>
+    <tr>
+        <td align="right">活动价：</td>
+        <td colspan="2"><input name="promote_price" type="text" id="promote_price" style="width:80px" value="<?php if($post['promote_price']!=0){echo $post['promote_price'];} ?>">&nbsp;&nbsp; 活动开始日期：<input name="promote_start_date" onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})" type="text" id="promote_start_date" style="width:185px" value="<?php if($post['promote_start_date']!=0){echo $post['promote_start_date'];} ?>">&nbsp;&nbsp; 活动结束日期：<input name="promote_end_date" onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})" type="text" id="promote_end_date" style="width:185px" value="<?php if($post['promote_end_date']!=0){echo $post['promote_end_date'];} ?>"></td>
+    </tr>
     <tr>
         <td align="right">推荐：</td>
         <td>