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 @@
剩余时间:00:{{minute}}:{{second}}
再次购买
退款详情
- 确认收货
+ 确认收货
申请退款
取消订单
去评价