|
@@ -101,8 +101,8 @@
|
|
|
<div class="ogMarkButton">Pay With PayPal</div>
|
|
|
<div class="ogCancelButton">Cancel</div>
|
|
|
{/if}
|
|
|
- {if $order['delivery'] == 20}
|
|
|
- <div class="receivedConfirmButton">Pay With PayPal</div>
|
|
|
+ {if $order['delivery_status'] == 20 && $order['receipt_status'] == 10}
|
|
|
+ <div class="receivedConfirmButton">Confirm receipt</div>
|
|
|
{/if}
|
|
|
</div>
|
|
|
<p class="ogTips">
|
|
@@ -124,7 +124,7 @@
|
|
|
<p class="ogToPr">${$goods['total_price']}</p>
|
|
|
<!-- 评价 -->
|
|
|
{eq name="order['receipt_status']" value="20"}
|
|
|
- <div class="evaluate">Evaluate</div>
|
|
|
+ <div class="evaluate">Preview</div>
|
|
|
{/eq}
|
|
|
</div>
|
|
|
{/foreach}
|
|
@@ -342,7 +342,7 @@
|
|
|
|
|
|
<div id="deleteAddressModal">
|
|
|
<div class="deleteAddressBox">
|
|
|
- <p class="deteTips">Confirm you have </p>
|
|
|
+ <p class="deteTips">Confirm receipt of goods </p>
|
|
|
<input type="hidden" id="deleteAddInfoId" value="0">
|
|
|
<div class="deteButtonBox">
|
|
|
<div id="cancelDelete">Cancel</div>
|
|
@@ -491,6 +491,10 @@
|
|
|
$.get('/index/order/receipt?orderId=' + orderId, function (res) {
|
|
|
if (res.status === 200 || res.status === "200") {
|
|
|
showToast('Success')
|
|
|
+ setTimeout(function () {
|
|
|
+ window.location.replace('/index/user/order.html')
|
|
|
+ }
|
|
|
+ , 3000)
|
|
|
} else {
|
|
|
showToast('Something wrong')
|
|
|
}
|