Merge branch 'master' of http://git.liuniu946.com/Kirin/zccy

app/admin/view/order/store_order/index.php

@@ -244,6 +244,14 @@
                                 </a>
                             </li>
                             {{# } ;}}
+                            {{# if(parseFloat(d.deposit) > parseFloat(d.deposit_back)){ }}
+                            <li>
+                                <a href="javascript:void(0);"
+                                   onclick="$eb.createModalFrame('退押金','{:Url('refund_deposit_y')}?id={{d.id}}')">
+                                    <i class="fa fa-history"></i> 退押金
+                                </a>
+                            </li>
+                            {{# } }}
                             <li>
                                 <a lay-event='marke' href="javascript:void(0);">
                                     <i class="fa fa-edit"></i> 订单备注
@@ -287,6 +295,14 @@
                                     <i class="fa fa-newspaper-o"></i> 订单记录
                                 </a>
                             </li>
+                            {{# if(parseFloat(d.deposit) > parseFloat(d.deposit_back)){ }}
+                            <li>
+                                <a href="javascript:void(0);"
+                                   onclick="$eb.createModalFrame('退押金','{:Url('refund_deposit_y')}?id={{d.id}}')">
+                                    <i class="fa fa-history"></i> 退押金
+                                </a>
+                            </li>
+                            {{# } }}
                         </ul>
                         {{#  }else if(d._status==2){ }}
                         {{# if(d.shipping_type==1){ }}

crmeb/services/YLYService.php

@@ -215,7 +215,8 @@ class YLYService extends HttpService implements ProviderInterface
 <FH>
 <LR>合计：￥{$orderInfo['total_price']},优惠: ￥{$orderInfo['coupon_price']}</LR>
 <LR>邮费：￥{$orderInfo['pay_postage']},抵扣：￥{$orderInfo['deduction_price']}</LR>
-<right>实际支付：￥{$orderInfo['pay_price']}</right>           
+<LR>押金：￥{$orderInfo['deposit']}</LR>
+<right>实际支付：￥{$orderInfo['pay_price']}+{$orderInfo['deposit']}</right>           
 </FH>
 <FS><center> ** 完 **</center></FS>
 CONTENT;