|
@@ -42,9 +42,9 @@
|
|
|
</div>
|
|
|
</a>
|
|
|
<!-- 收藏 -->
|
|
|
-<!-- <div class="headIconItem collectIcon">-->
|
|
|
-<!-- <img src="/assets/index/asstes/icon/collect.png" alt="collect" tabindex="collect">-->
|
|
|
-<!-- </div>-->
|
|
|
+ <!-- <div class="headIconItem collectIcon">-->
|
|
|
+ <!-- <img src="/assets/index/asstes/icon/collect.png" alt="collect" tabindex="collect">-->
|
|
|
+ <!-- </div>-->
|
|
|
<!-- 个人中心 -->
|
|
|
<a href="/index/user/order.html">
|
|
|
<div class="headIconItem userIcon">
|
|
@@ -83,9 +83,9 @@
|
|
|
<div class="mobileMenuItem">
|
|
|
<h2 class="menuItemTitle shoppingCartIcon">Shopping Cart</h2>
|
|
|
</div>
|
|
|
-<!-- <div class="mobileMenuItem">-->
|
|
|
-<!-- <h2 class="menuItemTitle collectIcon">Collect</h2>-->
|
|
|
-<!-- </div>-->
|
|
|
+ <!-- <div class="mobileMenuItem">-->
|
|
|
+ <!-- <h2 class="menuItemTitle collectIcon">Collect</h2>-->
|
|
|
+ <!-- </div>-->
|
|
|
<div class="mobileMenuItem active">
|
|
|
<h2 class="menuItemTitle userIcon">Personal</h2>
|
|
|
</div>
|
|
@@ -182,14 +182,14 @@
|
|
|
<div class="orderGoodsBox eleBox">
|
|
|
<div class="ogTeFlex">
|
|
|
<p class="ogTitle">Listing</p>
|
|
|
- <div class="ogMarkButton">Pay With PayPal</div>
|
|
|
+ <div class="ogMarkButton">Pay With PayPal</div>
|
|
|
</div>
|
|
|
<p class="ogTips">
|
|
|
Your goods will be shipped in 2 3days
|
|
|
</p>
|
|
|
{foreach $order['goods'] as $goods}
|
|
|
|
|
|
- <div class="ogGoodsInfo">
|
|
|
+ <div class="ogGoodsInfo" data-id="{$goods['goods_id']}" order-goods-id="{$goods['order_goods_id']}">
|
|
|
<div class="ogImgBox">
|
|
|
<img src="{$goods['goods_image']}"
|
|
|
alt="">
|
|
@@ -200,6 +200,10 @@
|
|
|
</div>
|
|
|
<p class="ogPr">${$goods['goods_price']}x{$goods['total_num']}</p>
|
|
|
<p class="ogToPr">${$goods['total_price']}</p>
|
|
|
+ <!-- 评价 -->
|
|
|
+ {eq name="order['receipt_status']" value="20"}
|
|
|
+ <div class="evaluate">Evaluate</div>
|
|
|
+ {/eq}
|
|
|
</div>
|
|
|
{/foreach}
|
|
|
|
|
@@ -339,10 +343,10 @@
|
|
|
<p class="aiKey">Street</p>
|
|
|
<p class="aiValue">{$orderAddress['detail']}</p>
|
|
|
</div>
|
|
|
-<!-- <div class="addInfoItem">-->
|
|
|
-<!-- <p class="aiKey">公寓,别至</p>-->
|
|
|
-<!-- <p class="aiValue">XXXXXXXXXX</p>-->
|
|
|
-<!-- </div>-->
|
|
|
+ <!-- <div class="addInfoItem">-->
|
|
|
+ <!-- <p class="aiKey">公寓,别至</p>-->
|
|
|
+ <!-- <p class="aiValue">XXXXXXXXXX</p>-->
|
|
|
+ <!-- </div>-->
|
|
|
<div class="addInfoItem">
|
|
|
<p class="aiKey">State</p>
|
|
|
<p class="aiValue">{$orderAddress['region']['region']}</p>
|
|
@@ -448,6 +452,48 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
+<div id="toastContainer"></div>
|
|
|
+
|
|
|
+<!-- 评价弹窗 -->
|
|
|
+<div id="evaluateModal">
|
|
|
+ <div class="evaluateBox">
|
|
|
+ <div class="evaluateItem">
|
|
|
+ <p class="evaluateTitle">Score:</p>
|
|
|
+ <div class="starContainer">
|
|
|
+ <div class="starItem">
|
|
|
+ <img class="star" src="/assets/index/asstes/icon/star.png" alt="">
|
|
|
+ <img class="selStar" src="/assets/index/asstes/icon/selStar.png" alt="">
|
|
|
+ </div>
|
|
|
+ <div class="starItem">
|
|
|
+ <img class="star" src="/assets/index/asstes/icon/star.png" alt="">
|
|
|
+ <img class="selStar" src="/assets/index/asstes/icon/selStar.png" alt="">
|
|
|
+ </div>
|
|
|
+ <div class="starItem">
|
|
|
+ <img class="star" src="/assets/index/asstes/icon/star.png" alt="">
|
|
|
+ <img class="selStar" src="/assets/index/asstes/icon/selStar.png" alt="">
|
|
|
+ </div>
|
|
|
+ <div class="starItem">
|
|
|
+ <img class="star" src="/assets/index/asstes/icon/star.png" alt="">
|
|
|
+ <img class="selStar" src="/assets/index/asstes/icon/selStar.png" alt="">
|
|
|
+ </div>
|
|
|
+ <div class="starItem">
|
|
|
+ <img class="star" src="/assets/index/asstes/icon/star.png" alt="">
|
|
|
+ <img class="selStar" src="/assets/index/asstes/icon/selStar.png" alt="">
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="evaluateItem">
|
|
|
+ <div class="textareaBox">
|
|
|
+ <textarea id="evaluateTextarea" placeholder="评价一下吧"></textarea>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="evaluateBotBox">
|
|
|
+ <div id="evaluateBot">submit</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div id="closeEvaluateModal"></div>
|
|
|
+</div>
|
|
|
+
|
|
|
</body>
|
|
|
<script src="/assets/index/js/jquery-1.12.0.js"></script>
|
|
|
<script src="/assets/index/js/flexible.js"></script>
|
|
@@ -457,11 +503,11 @@
|
|
|
<script>
|
|
|
$(document).ready(function () {
|
|
|
var orderId = "{$order['order_id']}";
|
|
|
- console.log('orderId::',orderId)
|
|
|
+ console.log('orderId::', orderId)
|
|
|
var payStatus = "{$order['pay_status']}";
|
|
|
- console.log('payStatus::',payStatus)
|
|
|
+ console.log('payStatus::', payStatus)
|
|
|
$('#ogMarkButton').hide(0)
|
|
|
- if ( payStatus === "10"){
|
|
|
+ if (payStatus === "10") {
|
|
|
$('#ogMarkButton').show(0)
|
|
|
}
|
|
|
|
|
@@ -541,7 +587,7 @@
|
|
|
console.log("paypaing")
|
|
|
$("#loadingModel").show(0)
|
|
|
|
|
|
- const params = { }
|
|
|
+ const params = {}
|
|
|
const res = await orderPayment(params)
|
|
|
const {status, message, data} = res || {}
|
|
|
if (status === 200 || status === "200") {
|
|
@@ -573,6 +619,103 @@
|
|
|
});
|
|
|
|
|
|
initNavState()
|
|
|
+
|
|
|
+ //商品id(评价记录)
|
|
|
+ let goodsId
|
|
|
+
|
|
|
+ let orderGoodsId
|
|
|
+ //商品评分
|
|
|
+ let score = 0
|
|
|
+
|
|
|
+ //商品评价点击
|
|
|
+ $(".evaluate").on(tap, function (event) {
|
|
|
+ event.preventDefault();
|
|
|
+ const parentEle = $(this).closest('.ogGoodsInfo')
|
|
|
+ goodsId = parentEle.attr("data-id")
|
|
|
+ orderGoodsId = parentEle.attr("order-goods-id")
|
|
|
+ $('#evaluateTextarea').val("")
|
|
|
+ $(".starItem").removeClass('active');
|
|
|
+ $("#evaluateModal").show(0)
|
|
|
+ });
|
|
|
+
|
|
|
+
|
|
|
+ $(".starItem").on(tap, function (event) {
|
|
|
+ event.preventDefault();
|
|
|
+ const _this = $(this)
|
|
|
+ score = _this.index() + 1;
|
|
|
+ _this.addClass('active');
|
|
|
+ _this.prevAll().addClass('active');
|
|
|
+ _this.nextAll().removeClass('active');
|
|
|
+ });
|
|
|
+
|
|
|
+ //输入框聚焦
|
|
|
+ $('#evaluateTextarea').focus(function () {
|
|
|
+ $(this).addClass('active');
|
|
|
+ });
|
|
|
+
|
|
|
+ //输入框失焦
|
|
|
+ $('#evaluateTextarea').blur(function () {
|
|
|
+ $(this).removeClass('active');
|
|
|
+ });
|
|
|
+
|
|
|
+ //关闭评价
|
|
|
+ $('#closeEvaluateModal').on(tap, function () {
|
|
|
+ $("#evaluateModal").hide(0)
|
|
|
+ });
|
|
|
+
|
|
|
+ //提交评价
|
|
|
+ $('#evaluateBot').on(tap, function () {
|
|
|
+ const evaluateTextareaEle = $('#evaluateTextarea')
|
|
|
+ const textareaValue = evaluateTextareaEle.val()
|
|
|
+ if (!textareaValue || textareaValue == "") {
|
|
|
+ evaluateTextareaEle.focus()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ console.log("评价内容", textareaValue)
|
|
|
+ console.log("商品id", goodsId)
|
|
|
+ console.log("商品orderGoodsId", orderGoodsId)
|
|
|
+ console.log("score", score)
|
|
|
+ var dp = {
|
|
|
+ orderId: orderId,
|
|
|
+ form: [{
|
|
|
+ order_goods_id: orderGoodsId,
|
|
|
+ goods_id: goodsId,
|
|
|
+ score: score,
|
|
|
+ content: textareaValue,
|
|
|
+ }]
|
|
|
+ }
|
|
|
+ $.ajax({
|
|
|
+ url: "/index/comment/submit",
|
|
|
+ headers: {platform: 'H5'},
|
|
|
+ dataType: 'json',
|
|
|
+ data: JSON.stringify(dp),
|
|
|
+ type: "POST",
|
|
|
+ contentType: 'application/json',
|
|
|
+ success: function (obj) {
|
|
|
+ //注册成功后进入
|
|
|
+ if (obj.status === 200 || obj.status === '200') {
|
|
|
+ showToast("Successful")
|
|
|
+ $("#evaluateModal").hide(0)
|
|
|
+ goodsId = null
|
|
|
+ } else if (obj.status === 401 || obj.status === '401') {
|
|
|
+ window.location.replace('../passport/logIn.html')
|
|
|
+ } else {
|
|
|
+ showToast('Something wrong,please try again later')
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 吐司提示
|
|
|
+ * @param message 消息
|
|
|
+ * @returns
|
|
|
+ */
|
|
|
+ function showToast(message) {
|
|
|
+ var toastElement = $('#toastContainer');
|
|
|
+ toastElement.text(message);
|
|
|
+ toastElement.stop(true, true).fadeIn(200).delay(2000).fadeOut(200);
|
|
|
+ }
|
|
|
})
|
|
|
</script>
|
|
|
|