From 1ceae955ee32c1330eb3b56656efd52e37fe4f5b Mon Sep 17 00:00:00 2001
From: iborvs <dlqqppw@163.com>
Date: Sun, 18 Jun 2017 18:42:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E9=83=A8=E5=88=86=E5=8E=86=E5=8F=B2=E9=81=97?=
 =?UTF-8?q?=E7=95=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/good/goodInfo.blade.php     | 4 ++--
 resources/views/good/goodInfoForm.blade.php | 6 +++---
 resources/views/layout/catlist.blade.php    | 4 ++--
 resources/views/welcome.blade.php           | 6 ++++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/resources/views/good/goodInfo.blade.php b/resources/views/good/goodInfo.blade.php
index d8b0305..6a3c781 100644
--- a/resources/views/good/goodInfo.blade.php
+++ b/resources/views/good/goodInfo.blade.php
@@ -9,7 +9,7 @@
             max-width: 200px;
         }
         p>img{
-            max-width: 50%;
+            max-width: 100%;
         }
     </style>
     <script>
@@ -60,7 +60,7 @@
             @if(($good->user_id) != Session::get('user_id') && !$good->baned)
                 <form action="/good/{{ $good->id }}/buy" method="post">
                     <div class="input-group">
-                        <input type="number" name="count" value="1" class="form-control"/>
+                        <input type="number" name="count" value="1" class="form-control" min="0" onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')"/>
                         {!! csrf_field() !!}
                         <span class="input-group-btn">
                         <input type="submit" class="btn btn-primary" value="购买"/>
diff --git a/resources/views/good/goodInfoForm.blade.php b/resources/views/good/goodInfoForm.blade.php
index 370a45d..8ef5a02 100644
--- a/resources/views/good/goodInfoForm.blade.php
+++ b/resources/views/good/goodInfoForm.blade.php
@@ -38,11 +38,11 @@
                 </div>
                 <div class="form-group">
                     <label for="description">商品描述</label>
-                    <textarea name="description" id="description" placeholder="商品描述" class="form-control" style="resize:none" rows="6">{!! count($errors) ? old('description') : $good->description !!}</textarea>
+                    <textarea name="description" id="description" placeholder="商品描述" class="form-control" style="resize:none;" rows="6">{!! count($errors) ? old('description') : $good->description !!}</textarea>
                 </div>
                 <div class="form-group">
                     <label for="price">商品价格</label>
-                    <input type="number" min="0" name="price" id="price" value="{{count($errors) ? old('price') : $good->price}}" placeholder="商品价格" class="form-control">
+                    <input type="number" min="0" name="price" id="price" value="{{count($errors) ? old('price') : $good->price}}" placeholder="商品价格" class="form-control"  onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')">
                 </div>
                 <div class="form-group hidden-xs-up">
                     <label>商品类型</label>
@@ -53,7 +53,7 @@
                 </div>
                 <div class="form-group">
                     <label for="count">商品数量</label>
-                    <input type="number" name="count" id="count" min="0" value="{{count($errors) ? old('count') : $good->count}}" placeholder="库存" class="form-control">
+                    <input type="number" name="count" id="count" min="0" value="{{count($errors) ? old('count') : $good->count}}" placeholder="库存" class="form-control" onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')" />
                 </div>
                 {{--
                 <div class="row">
diff --git a/resources/views/layout/catlist.blade.php b/resources/views/layout/catlist.blade.php
index 544a393..fb7b9f2 100644
--- a/resources/views/layout/catlist.blade.php
+++ b/resources/views/layout/catlist.blade.php
@@ -1,4 +1,4 @@
-<div class="col-md-2 hidden-sm-down" style="position:sticky;top:0;left:0">
+<div class="col-md-2 hidden-sm-down" style="top:0;left:0;">
     <ul class="nav nav-pills flex-column">
         <li class="nav-item"><a href="/good" class="nav-link @if(isset($cat_id)&&$cat_id == 0) active @endif" style="white-space:nowrap;overflow:hidden" data-toggle="tooltip">所有商品</a></li>
         @foreach($cats as $cat)
@@ -6,7 +6,7 @@
         @endforeach
     </ul>
 </div>
-<div class="col-12 hidden-md-up" style="position:sticky;top:0">
+<div class="col-12 hidden-md-up" style="top:0;">
     <ul class="nav nav-pills" style="overflow-x: scroll;overflow-y: hidden;white-space: nowrap;height:40px;display:-webkit-box;display:-moz-box">
         <li class="nav-item" style="float: none"><a href="/good" class="nav-link @if(isset($cat_id)&&$cat_id == 0) active @endif">所有商品</a></li>
         @foreach($cats as $cat)
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 27c8fe6..25a492f 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -22,7 +22,9 @@
     @include('layout.catlist')
     <div class="col-12 col-md-7">
         @if(count($newgoods)>0)
-            <h3>新品</h3>
+            <h3 style="display : inline">新品</h3>
+            <span style="font-size: 13px;margin-left:3px" class="text-warning hidden-md-up">点击分类查看更多商品哦↑</span>
+            <span style="font-size: 13px;margin-left:3px" class="text-warning hidden-sm-down">点击分类查看更多商品哦</span>
                 <div class="row">
                 @foreach($newgoods as $good)
                     @include('good.goodInfoOnWelcome')
@@ -30,7 +32,7 @@
                 </div>
         @endif
             @if(count($populargoods)>0)
-                <h3>热门</h3>
+                <h3 style="display : inline">热门</h3><span style="font-size: 13px;margin-left:3px" class="text-warning">热门商品都在这里哦</span>
                 <div class="row">
                     @foreach($populargoods as $good)
                         @include('good.goodInfoOnWelcome')