正在显示
8 个修改的文件
包含
16 行增加
和
16 行删除
@@ -14,9 +14,9 @@ | @@ -14,9 +14,9 @@ | ||
14 | </div> | 14 | </div> |
15 | <div class="form-group layer-footer"> | 15 | <div class="form-group layer-footer"> |
16 | <label class="control-label col-xs-12 col-sm-2"></label> | 16 | <label class="control-label col-xs-12 col-sm-2"></label> |
17 | - <div class="col-xs-12 col-sm-8"> | ||
18 | - <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button> | ||
19 | - <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button> | ||
20 | - </div> | 17 | + <!--<div class="col-xs-12 col-sm-8">--> |
18 | + <!--<button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>--> | ||
19 | + <!--<button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>--> | ||
20 | + <!--</div>--> | ||
21 | </div> | 21 | </div> |
22 | </form> | 22 | </form> |
@@ -46,9 +46,9 @@ | @@ -46,9 +46,9 @@ | ||
46 | </div> | 46 | </div> |
47 | <div class="form-group layer-footer"> | 47 | <div class="form-group layer-footer"> |
48 | <label class="control-label col-xs-12 col-sm-2"></label> | 48 | <label class="control-label col-xs-12 col-sm-2"></label> |
49 | - <div class="col-xs-12 col-sm-8"> | ||
50 | - <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button> | ||
51 | - <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button> | ||
52 | - </div> | 49 | + <!--<div class="col-xs-12 col-sm-8">--> |
50 | + <!--<button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>--> | ||
51 | + <!--<button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>--> | ||
52 | + <!--</div>--> | ||
53 | </div> | 53 | </div> |
54 | </form> | 54 | </form> |
@@ -65,7 +65,7 @@ class Gorders extends Api | @@ -65,7 +65,7 @@ class Gorders extends Api | ||
65 | } | 65 | } |
66 | $this->success('成功'); | 66 | $this->success('成功'); |
67 | }else{ | 67 | }else{ |
68 | - $this->error('请求方式出错'); | 68 | + $this->error('请求方式错误'); |
69 | } | 69 | } |
70 | } | 70 | } |
71 | 71 | ||
@@ -120,7 +120,7 @@ class Gorders extends Api | @@ -120,7 +120,7 @@ class Gorders extends Api | ||
120 | ->find(); | 120 | ->find(); |
121 | $this->success('成功',['user'=>$user,'order'=>$data]); | 121 | $this->success('成功',['user'=>$user,'order'=>$data]); |
122 | }else{ | 122 | }else{ |
123 | - $this->error('请求方式出错'); | 123 | + $this->error('请求方式错误'); |
124 | } | 124 | } |
125 | } | 125 | } |
126 | 126 | ||
@@ -191,7 +191,7 @@ class Gorders extends Api | @@ -191,7 +191,7 @@ class Gorders extends Api | ||
191 | $this->error('提交失败'); | 191 | $this->error('提交失败'); |
192 | } | 192 | } |
193 | }else{ | 193 | }else{ |
194 | - $this->error('请求方式出错'); | 194 | + $this->error('请求方式错误'); |
195 | } | 195 | } |
196 | } | 196 | } |
197 | 197 | ||
@@ -248,7 +248,7 @@ class Gorders extends Api | @@ -248,7 +248,7 @@ class Gorders extends Api | ||
248 | } | 248 | } |
249 | $this->success('成功',$data); | 249 | $this->success('成功',$data); |
250 | }else{ | 250 | }else{ |
251 | - $this->error('请求方式出错'); | 251 | + $this->error('请求方式错误'); |
252 | } | 252 | } |
253 | } | 253 | } |
254 | } | 254 | } |
@@ -80,8 +80,8 @@ class Wxpay extends Api | @@ -80,8 +80,8 @@ class Wxpay extends Api | ||
80 | $order = [ | 80 | $order = [ |
81 | 'out_trade_no' => $pay_order_sn,//支付订单号 | 81 | 'out_trade_no' => $pay_order_sn,//支付订单号 |
82 | 'body' => '广西小纸皮再生资源回收有限公司', | 82 | 'body' => '广西小纸皮再生资源回收有限公司', |
83 | - 'total_fee' => 1, | ||
84 | -// 'total_fee' => floatval($total_price)*100,//单位:分 | 83 | +// 'total_fee' => 1, |
84 | + 'total_fee' => floatval($total_price)*100,//单位:分 | ||
85 | 'openid' => $openid, | 85 | 'openid' => $openid, |
86 | 'notify_url' => url('api/Wxpay/notify','','',true), | 86 | 'notify_url' => url('api/Wxpay/notify','','',true), |
87 | ]; | 87 | ]; |
fastadmin.sql
已删除
100644 → 0
此 diff 太大无法显示。
gc.sql
0 → 100644
此 diff 太大无法显示。
@@ -12023,7 +12023,7 @@ | @@ -12023,7 +12023,7 @@ | ||
12023 | 12023 | ||
12024 | <div class="row mt0 footer"> | 12024 | <div class="row mt0 footer"> |
12025 | <div class="col-md-6" align="left"> | 12025 | <div class="col-md-6" align="left"> |
12026 | - Generated on 2019-04-08 08:32:08 </div> | 12026 | + Generated on 2019-04-08 14:09:12 </div> |
12027 | <div class="col-md-6" align="right"> | 12027 | <div class="col-md-6" align="right"> |
12028 | <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> | 12028 | <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> |
12029 | </div> | 12029 | </div> |
-
请 注册 或 登录 后发表评论