zhangjiangbin 8 лет назад
Родитель
Сommit
a033e08850

+ 2 - 2
resources/views/admin/addUser.blade.php

@@ -249,13 +249,13 @@
                                             <div class="form-group">
                                                 <label for="protocol_param" class="col-md-3 control-label">协议参数</label>
                                                 <div class="col-md-8">
-                                                    <input type="text" class="form-control" name="protocol_param" id="protocol_param" placeholder="">
+                                                    <input type="text" class="form-control" name="protocol_param" id="protocol_param" placeholder="节点单端口时,请务必留空">
                                                 </div>
                                             </div>
                                             <div class="form-group">
                                                 <label for="obfs_param" class="col-md-3 control-label">混淆参数</label>
                                                 <div class="col-md-8">
-                                                    <textarea class="form-control" rows="3" name="obfs_param" id="obfs_param"></textarea>
+                                                    <textarea class="form-control" rows="3" name="obfs_param" id="obfs_param" placeholder="节点单端口时,请务必留空"></textarea>
                                                 </div>
                                             </div>
                                             <hr>

+ 2 - 2
resources/views/admin/editUser.blade.php

@@ -260,13 +260,13 @@
                                             <div class="form-group">
                                                 <label for="protocol_param" class="col-md-3 control-label">协议参数</label>
                                                 <div class="col-md-8">
-                                                    <input type="text" class="form-control" name="protocol_param" value="{{$user->protocol_param}}" id="protocol_param" placeholder="">
+                                                    <input type="text" class="form-control" name="protocol_param" value="{{$user->protocol_param}}" id="protocol_param" placeholder="节点单端口时,请务必留空">
                                                 </div>
                                             </div>
                                             <div class="form-group">
                                                 <label for="obfs_param" class="col-md-3 control-label">混淆参数</label>
                                                 <div class="col-md-8">
-                                                    <textarea class="form-control" rows="5" name="obfs_param" id="obfs_param">{{$user->obfs_param}}</textarea>
+                                                    <textarea class="form-control" rows="5" name="obfs_param" id="obfs_param" placeholder="节点单端口时,请务必留空">{{$user->obfs_param}}</textarea>
                                                 </div>
                                             </div>
                                             <hr>

+ 9 - 5
resources/views/admin/system.blade.php

@@ -439,8 +439,8 @@
                                                     <div class="portlet-body">
                                                         <div class="form-group">
                                                             <div class="col-md-6">
-                                                                <label class="col-md-5 control-label">微信</label>
-                                                                <div class="col-md-7">
+                                                                <label class="control-label col-md-3">微信</label>
+                                                                <div class="col-md-9">
                                                                     <div class="fileinput fileinput-new" data-provides="fileinput">
                                                                         <div class="fileinput-new thumbnail" style="width: 200px; height: 150px;">
                                                                             @if ($wechat_qrcode)
@@ -461,9 +461,12 @@
                                                                     </div>
                                                                 </div>
                                                             </div>
+                                                            <div class="col-md-6"></div>
+                                                        </div>
+                                                        <div class="form-group">
                                                             <div class="col-md-6">
-                                                                <label class="col-md-5 control-label">支付宝</label>
-                                                                <div class="col-md-7">
+                                                                <label class="control-label col-md-3">支付宝</label>
+                                                                <div class="col-md-9">
                                                                     <div class="fileinput fileinput-new" data-provides="fileinput">
                                                                         <div class="fileinput-new thumbnail" style="width: 200px; height: 150px;">
                                                                             @if ($alipay_qrcode)
@@ -484,12 +487,13 @@
                                                                     </div>
                                                                 </div>
                                                             </div>
+                                                            <div class="col-md-6"></div>
                                                         </div>
                                                     </div>
                                                 </div>
                                                 <div class="form-actions">
                                                     <div class="row">
-                                                        <div class="col-md-offset-6 col-md-6">
+                                                        <div class="col-md-offset-2 col-md-9">
                                                             <input type="hidden" name="_token" value="{{csrf_token()}}" />
                                                             <button type="submit" class="btn green">提 交</button>
                                                         </div>

+ 9 - 9
resources/views/coupon/addCoupon.blade.php

@@ -47,14 +47,14 @@
                         <form action="{{url('coupon/addCoupon')}}" method="post" enctype="multipart/form-data" class="form-horizontal" role="form">
                             <div class="form-body">
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">卡券名称</label>
+                                    <label class="control-label col-md-2">卡券名称</label>
                                     <div class="col-md-6">
                                         <input type="text" class="form-control" name="name" value="" id="name" placeholder="" required>
                                         <input type="hidden" name="_token" value="{{csrf_token()}}" />
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">LOGO</label>
+                                    <label class="control-label col-md-2">LOGO</label>
                                     <div class="col-md-9">
                                         <div class="fileinput fileinput-new" data-provides="fileinput">
                                             <div class="fileinput-new thumbnail" style="width: 200px; height: 150px;">
@@ -73,7 +73,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">类型</label>
+                                    <label class="control-label col-md-2">类型</label>
                                     <div class="col-md-6">
                                         <div class="mt-radio-inline">
                                             <label class="mt-radio">
@@ -88,7 +88,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">用途</label>
+                                    <label class="control-label col-md-2">用途</label>
                                     <div class="col-md-6">
                                         <div class="mt-radio-inline">
                                             <label class="mt-radio">
@@ -103,7 +103,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">数量</label>
+                                    <label class="control-label col-md-2">数量</label>
                                     <div class="col-md-3">
                                         <div class="input-group">
                                             <input type="text" class="form-control" name="num" value="{{Request::old('num')}}" id="num" placeholder="" required>
@@ -112,7 +112,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">金额</label>
+                                    <label class="control-label col-md-2">金额</label>
                                     <div class="col-md-3">
                                         <div class="input-group">
                                             <input type="text" class="form-control" name="amount" value="{{Request::old('amount')}}" id="amount" placeholder="" required>
@@ -121,7 +121,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group hide">
-                                    <label class="control-label col-md-3">折扣</label>
+                                    <label class="control-label col-md-2">折扣</label>
                                     <div class="col-md-3">
                                         <div class="input-group">
                                             <input type="text" class="form-control" name="discount" value="{{Request::old('discount')}}" id="discount" placeholder="">
@@ -130,7 +130,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">有效期</label>
+                                    <label class="control-label col-md-2">有效期</label>
                                     <div class="col-md-6">
                                         <div class="input-group input-large input-daterange">
                                             <input type="text" class="form-control" name="available_start" value="{{Request::old('available_start')}}" id="available_start" required>
@@ -142,7 +142,7 @@
                             </div>
                             <div class="form-actions">
                                 <div class="row">
-                                    <div class="col-md-offset-3 col-md-9">
+                                    <div class="col-md-offset-2 col-md-9">
                                         <button type="submit" class="btn green"> <i class="fa fa-check"></i> 提 交</button>
                                     </div>
                                 </div>

+ 10 - 10
resources/views/shop/addGoods.blade.php

@@ -47,14 +47,14 @@
                         <form action="{{url('shop/addGoods')}}" method="post" enctype="multipart/form-data" class="form-horizontal" role="form">
                             <div class="form-body">
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">名称</label>
+                                    <label class="control-label col-md-2">名称</label>
                                     <div class="col-md-6">
                                         <input type="text" class="form-control" name="name" value="" id="name" placeholder="" required>
                                         <input type="hidden" name="_token" value="{{csrf_token()}}" />
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">LOGO</label>
+                                    <label class="control-label col-md-2">LOGO</label>
                                     <div class="col-md-9">
                                         <div class="fileinput fileinput-new" data-provides="fileinput">
                                             <div class="fileinput-new thumbnail" style="width: 200px; height: 150px;">
@@ -72,13 +72,13 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">描述</label>
+                                    <label class="control-label col-md-2">描述</label>
                                     <div class="col-md-6">
                                         <textarea class="form-control" rows="3" name="desc" id="desc" placeholder="商品的简单描述"></textarea>
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">内含流量</label>
+                                    <label class="control-label col-md-2">内含流量</label>
                                     <div class="col-md-3">
                                         <div class="input-group">
                                             <input type="text" class="form-control" name="traffic" value="1024" id="traffic" placeholder="" required="">
@@ -87,7 +87,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">售价</label>
+                                    <label class="control-label col-md-2">售价</label>
                                     <div class="col-md-3">
                                         <div class="input-group">
                                             <input type="text" class="form-control" name="price" value="" id="price" placeholder="" required>
@@ -96,14 +96,14 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">所需积分</label>
+                                    <label class="control-label col-md-2">所需积分</label>
                                     <div class="col-md-3">
                                         <input type="text" class="form-control" name="score" value="0" id="score" placeholder="" required>
                                         <span class="help-block">换购该商品需要的积分值</span>
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label for="type" class="col-md-3 control-label">类型</label>
+                                    <label for="type" class="control-label col-md-2">类型</label>
                                     <div class="col-md-6">
                                         <div class="mt-radio-inline">
                                             <label class="mt-radio">
@@ -119,7 +119,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="col-md-3 control-label">有效期</label>
+                                    <label class="control-label col-md-2">有效期</label>
                                     <div class="col-md-3">
                                         <div class="input-group">
                                             <input type="text" class="form-control" name="days" value="30" id="days" placeholder="" required="">
@@ -129,7 +129,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group last">
-                                    <label class="control-label col-md-3">状态</label>
+                                    <label class="control-label col-md-2">状态</label>
                                     <div class="col-md-6">
                                         <div class="mt-radio-inline">
                                             <label class="mt-radio">
@@ -146,7 +146,7 @@
                             </div>
                             <div class="form-actions">
                                 <div class="row">
-                                    <div class="col-md-offset-3 col-md-9">
+                                    <div class="col-md-offset-2 col-md-9">
                                         <button type="submit" class="btn green"> <i class="fa fa-check"></i> 提 交</button>
                                     </div>
                                 </div>

+ 10 - 10
resources/views/shop/editGoods.blade.php

@@ -46,7 +46,7 @@
                         <form action="{{url('shop/editGoods')}}" method="post" enctype="multipart/form-data" class="form-horizontal" role="form">
                             <div class="form-body">
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">商品名称</label>
+                                    <label class="control-label col-md-2">商品名称</label>
                                     <div class="col-md-6">
                                         <input type="text" class="form-control" name="name" value="{{$goods->name}}" id="name" placeholder="" required>
                                         <input type="hidden" name="id" value="{{$goods->id}}" />
@@ -54,7 +54,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">商品图片</label>
+                                    <label class="control-label col-md-2">商品图片</label>
                                     <div class="col-md-9">
                                         <div class="fileinput fileinput-new" data-provides="fileinput">
                                             <div class="fileinput-new thumbnail" style="width: 200px; height: 150px;">
@@ -77,13 +77,13 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">描述</label>
+                                    <label class="control-label col-md-2">描述</label>
                                     <div class="col-md-6">
                                         <textarea class="form-control" rows="3" name="desc" id="desc" placeholder="商品的简单描述">{{$goods->desc}}</textarea>
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">内含流量</label>
+                                    <label class="control-label col-md-2">内含流量</label>
                                     <div class="col-md-3">
                                         <div class="input-group">
                                             <input type="text" class="form-control" name="traffic" value="{{$goods->traffic}}" id="traffic" placeholder="" required="">
@@ -92,7 +92,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">售价</label>
+                                    <label class="control-label col-md-2">售价</label>
                                     <div class="col-md-3">
                                         <div class="input-group">
                                             <input type="text" class="form-control" name="price" value="{{$goods->price}}" id="price" placeholder="" required>
@@ -101,14 +101,14 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">所需积分</label>
+                                    <label class="control-label col-md-2">所需积分</label>
                                     <div class="col-md-3">
                                         <input type="text" class="form-control" name="score" value="{{$goods->score}}" id="score" placeholder="" required>
                                         <span class="help-block">换购该商品需要的积分值</span>
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label for="type" class="col-md-3 control-label">类型</label>
+                                    <label for="type" class="control-label col-md-2">类型</label>
                                     <div class="col-md-6">
                                         <div class="mt-radio-inline">
                                             <label class="mt-radio">
@@ -124,7 +124,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="col-md-3 control-label">有效期</label>
+                                    <label class="control-label col-md-2">有效期</label>
                                     <div class="col-md-3">
                                         <div class="input-group">
                                             <input type="text" class="form-control" name="days" value="{{$goods->days}}" id="days" placeholder="" required="">
@@ -134,7 +134,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group last">
-                                    <label class="control-label col-md-3">状态</label>
+                                    <label class="control-label col-md-2">状态</label>
                                     <div class="col-md-6">
                                         <div class="mt-radio-inline">
                                             <label class="mt-radio">
@@ -152,7 +152,7 @@
                             </div>
                             <div class="form-actions">
                                 <div class="row">
-                                    <div class="col-md-offset-3 col-md-9">
+                                    <div class="col-md-offset-2 col-md-9">
                                         <button type="submit" class="btn green"> <i class="fa fa-check"></i> 提 交</button>
                                     </div>
                                 </div>

+ 1 - 1
resources/views/user/index.blade.php

@@ -93,7 +93,7 @@
                                 <a href="javascript:;" data-toggle="modal" data-target="#charge_modal" style="color:#FFF;">充值</a>
                             </span>
                             &ensp;&ensp;积分:{{$info['score']}}
-                            <span class="badge badge-info">
+                            <span class="badge badge-danger">
                                 <a href="javascript:;" data-toggle="modal" data-target="#excharge_modal" style="color:#FFF;">兑换</a>
                             </span>
                         </p>