From 8c952c85c2f4bad260ae1acafc3372b0574c9b49 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 2 Jul 2025 09:31:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=AF=84=E8=AE=BA5=E6=9D=A1?=
 =?UTF-8?q?=EF=BC=9B=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/hotelProductInfo/index.js      |  2 +-
 pages/info/postProductInfo/index.js       |  2 +-
 pages/info/roadInfo/index.js              |  2 +-
 pages/info/sceneProductInfoNew/index.js   |  2 +-
 pages/order/comment/index.js              |  2 +-
 pages/user/order/postOrderInfo/index.js   | 56 +++++++++++++++++++++++
 pages/user/order/postOrderInfo/index.wxml |  2 +-
 7 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/pages/info/hotelProductInfo/index.js b/pages/info/hotelProductInfo/index.js
index d5942c6..bab1448 100644
--- a/pages/info/hotelProductInfo/index.js
+++ b/pages/info/hotelProductInfo/index.js
@@ -245,7 +245,7 @@ Page({
         item.rate = Number(item.rate)
       })
       this.setData({
-        comment:  res.data.list.splice(0, 2),
+        comment:  res.data.list.splice(0, 5),
         commentTotal: res.data.total
       })
       let arr = this.data.comment
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 260946b..9ce4482 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -128,7 +128,7 @@ Page({
 
             })
             this.setData({
-                comment: res.data.list.splice(0, 2),
+                comment: res.data.list.splice(0, 5),
                 commentTotal: res.data.total
             })
             let arr = this.data.comment
diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js
index bda6477..212fa51 100644
--- a/pages/info/roadInfo/index.js
+++ b/pages/info/roadInfo/index.js
@@ -69,7 +69,7 @@ Page({
         commonApi._post("product/product_comment_list", {
             product_id: options.id,
             offset: 0,
-            limit: 3
+            limit: 5
         }).then(res => {
             res.data.list.map(item => {
                 item.rate = Number(item.rate)
diff --git a/pages/info/sceneProductInfoNew/index.js b/pages/info/sceneProductInfoNew/index.js
index 8b41122..91e1e51 100644
--- a/pages/info/sceneProductInfoNew/index.js
+++ b/pages/info/sceneProductInfoNew/index.js
@@ -184,7 +184,7 @@ Page({
         item.rate = Number(item.rate)
       })
       this.setData({
-        comment: res.data.list.splice(0, 3),
+        comment: res.data.list.splice(0, 5),
         commentTotal: res.data.total
       })
       console.log(res)
diff --git a/pages/order/comment/index.js b/pages/order/comment/index.js
index 2508d57..be31d8d 100644
--- a/pages/order/comment/index.js
+++ b/pages/order/comment/index.js
@@ -166,7 +166,7 @@ Page({
 
         for (let i = 0; i < tempFilePaths.length; i++) {
           wx.uploadFile({
-            url: 'https://test.api.cloud.sz-trip.com/api/pbservice.other/upload', //这里是上传的服务器地址
+            url: 'https://api.cloud.sz-trip.com/api/pbservice.other/upload', //这里是上传的服务器地址
             filePath: tempFilePaths[i],
             name: 'file',
             header: {
diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js
index 5ad6b07..7a5ac84 100644
--- a/pages/user/order/postOrderInfo/index.js
+++ b/pages/user/order/postOrderInfo/index.js
@@ -211,6 +211,62 @@ Page({
       this.daojishi(time);
     },1000)
   },
+  // 确认收货
+  toConfirmPost() {
+      let _this =this;
+    wx.showModal({
+      title:'提示',
+      content:"确定收货吗",
+      success:function(res){
+        if(res.confirm){
+          commonApi.user_post("order/confirm_post",{
+            order_id:_this.data.info.order_id
+          }).then(res=>{
+            wx.showToast({
+                title: '操作成功',
+                icon:'success'
+            })
+            _this.getInfo()
+          })
+        }
+      }
+    })
+},
+
+getInfo () {
+    commonApi.user_post("order/query",{
+        order_id:this.data.id
+      }).then(res=>{
+        if(res.data.create_time && res.data.auto_close_time && res.data.state=='UNPAID'){
+          let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000);
+          this.daojishi(time);
+        }
+        let proId = []
+        res.data.order_product_list.forEach(item => {
+          proId.push(item.product_id)
+        })
+        let state = "";
+        res.data.stateNums = {}
+        res.data.order_product_list.map(order=>{
+          if(res.data.stateNums[order.state]){
+            res.data.stateNums[order.state]++;
+          }
+          else {
+            res.data.stateNums[order.state] = 1;
+          }
+          order.consignee_info = order.consignee_info?JSON.parse(order.consignee_info):null;
+          state = state + order.state;
+          order.contacts_info = order.contacts_info?JSON.parse(order.contacts_info):[]
+        })
+        this.setData({
+          isRefund:state.indexOf("REFUND")!=-1,
+          info:res.data,
+          product_model:res.data.order_product_list[0].product_model,
+          ids: proId.join(",")
+        })
+        this.getCodeImg()
+      })
+},
 
   gotoDetail: function (e) {
     let item = e.currentTarget.dataset.item;
diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml
index 607af56..4d3f676 100644
--- a/pages/user/order/postOrderInfo/index.wxml
+++ b/pages/user/order/postOrderInfo/index.wxml
@@ -49,7 +49,7 @@
     <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view>
     <navigator wx:if="{{info.state!='UNPAID'}}" url="/pages/info/postProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
     <navigator url="../refundInfo/index?id={{info.order_id}}" class="btn" wx:if="{{isRefund}}">退款详情</navigator>
-    <view class="btn" wx:elif="{{info.stateNums.WAIT_DELIVERY==info.order_product_list.length}}">确认收货</view>
+    <view class="btn" wx:elif="{{info.stateNums.WAIT_DELIVERY==info.order_product_list.length}}" bind:tap="toConfirmPost">确认收货</view>
     <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">申请退款</view>
     <view class="btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消订单</view>
     <navigator url="/pages/order/comment/index?id={{info.order_id}}&proId={{info.order_product_list[0].product_id}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>