细节修改

canzhen · Jun 19, 2016 · 473b026 · 473b026
1 parent d8a336f
commit 473b026
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/database/migrations/2016_04_28_014558_orders.php b/database/migrations/2016_04_28_014558_orders.php
@@ -68,7 +68,7 @@ public function up()
                     'quantity' => 25,
                     'address' => '山西省阳泉市盂县xx镇',
                     'status'=> '已送达',
-                    'comment'=>''
+                    'comment'=>'减肥日记哈哈哈哈哈'
                 ),
                 array(
                     'user_name' => 'yhc',

diff --git a/resources/views/company/cpy_checkOrder.blade.php b/resources/views/company/cpy_checkOrder.blade.php
@@ -121,7 +121,6 @@
 								<div>
 									<span>备注信息：</span>
 									<input type="text" ng-model="orderDetail.comment"/>
-									<span style="color:red" ng-show="orderDetail.comment == ''">*此项必填</span>
 								</div>
 							</form>
 						</div>

diff --git a/resources/views/layouts/cpy_sidebar.blade.php b/resources/views/layouts/cpy_sidebar.blade.php
@@ -175,7 +175,7 @@
 							<a href="#"><i class="fa fa-sitemap fa-fw"></i> 公司管理<span class="fa arrow"></span></a>
 							<ul class="nav nav-second-level">
 								<li>
-									<a href="/cpy_info">公司信息</a>
+									<a href="/about_us">公司信息</a>
 								</li>
 								<li>
 									<a href="cpy_salesReport">销量报表</a>
-Original file line number
+Diff line change
@@ Expand Up / @@ -121,7 +121,6 @@ @@
     								<div>
     									<span>备注信息：</span>
     									<input type="text" ng-model="orderDetail.comment"/>
-    									<span style="color:red" ng-show="orderDetail.comment == ''">*此项必填</span>
     								</div>
     							</form>
     						</div>
@@ Expand Down @@