修改推荐

2 years ago · 7a4792e761
20 changed files with 141 additions and 45 deletions
--- a/pages/component/proRec/proRec.js
+++ b/pages/component/proRec/proRec.js
@ -23,15 +23,62 @@ Component({
    clickid: {
      type: String,
      value: ""
+    },
+    ids:{
+      type: String,
+      value: ""
+    }
+  },
+  observers:{
+    'ids': function(newVal,oldVal){
+      console.log('newVal--------',newVal)
+      console.log('oldVal--------',oldVal)
+      if (newVal) {
+        this.getTj(newVal)
+      }
    }
  },
  lifetimes: {
    created() {
-      commonApi._post("product/get_product_by_type", {
+      this.data.tjList=[]
+      // commonApi._post("product/get_product_by_type", {
+      //   offset: 0,
+      //   limit: 6,
+      //   rand: true,
+      //   type: "venue,post,line,ticket",
+      //   product_ids:this.data.ids
+      // }).then(res => {
+      //   this.setData({
+      //     showLoading: false
+      //   })
+      //   try {
+      //     this.setData({
+      //       tjList: res.data.list
+      //     })
+      //   } catch (error) {
+      //     console.log(error);
+      //   }
+      // })
+    }
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    tjList: [],
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    getTj() {
+      this.data.tjList = []
+      commonApi._post("search/product_recommend", {
        offset: 0,
        limit: 6,
        rand: true,
-        type: "venue,post,line,ticket"
+        type: "venue,post,line,ticket",
+        product_ids:this.data.ids
      }).then(res => {
        this.setData({
          showLoading: false
@ -43,19 +90,9 @@ Component({
        } catch (error) {
          console.log(error);
        }
+        console.log('tjList',this.data.tjList);
      })
-    }
-  },
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    tjList: [],
-  },
-  /**
-   * 组件的方法列表
-   */
-  methods: {
+    },
    gotoDetail: function (e) {
      let item = e.currentTarget.dataset.item;
      util.pagePoint({
@ -74,5 +111,6 @@ Component({
        util.gotoDetail(item);
      }
    },
-  }
+  },
+  
 })
--- a/pages/index/index.js
+++ b/pages/index/index.js
@ -122,7 +122,7 @@ Page({
    this.getVideoPrize()
  },
  goFeiyi: function () {
-    app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupon'
+    app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
    wx.navigateTo({
      url:"/pages/pbService/web/index"
    })
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@ -121,7 +121,8 @@ Page({
            offset: 0,
            limit: 6,
            rand: true,
-            type: 'post'
+            type: 'post',
+            product_ids:options.id,
        }).then(res => {
            try {
                this.setData({
--- a/pages/order/comment/index.js
+++ b/pages/order/comment/index.js
@ -45,11 +45,13 @@ Page({
        info: res.data
      })
    })
+    console.log('options.proId',options.proId);
    commonApi._post("search/product_recommend", {
      offset: 0,
      limit: 6,
      rand: true,
-      type: 'post'
+      type: 'post',
+      product_ids:options.proId,
  }).then(res => {
      try {
          this.setData({
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@ -18,7 +18,8 @@ Page({
    activePay:false,//是否活动支付
    SUBWALLET:false,
    wxPay:false,
-	isBook:false
+    isBook:false,
+    ids:[], // 多产品id
  },

  /**
@ -136,6 +137,14 @@ Page({
    })
  },
  pay:function(){
+    let arr = []
+    this.data.info.order_product_list.forEach(item => {
+      arr.push(item.product_id)
+    })
+    this.setData({
+      ids:arr
+    })
+
    if (this.data.activePay) {
      let flag = false
      if (this.data.payList.length!=0 && !this.data.info.coupon_activity.pay_type.includes('SUBWALLET')) {
@ -185,7 +194,7 @@ Page({
          })
          setTimeout(()=>{
            wx.redirectTo({
-              url: '../payresult/index?tid='+_this.data.id
+              url: '../payresult/index?tid='+_this.data.id+'&ids='+_this.data.ids.join(',')
            })
          },1000)
        },
@ -218,7 +227,7 @@ Page({
            })
            setTimeout(()=>{
              wx.redirectTo({
-                url: '../payresult/index?tid='+this.data.id
+                url: '../payresult/index?tid='+this.data.id+'&ids='+_this.data.ids.join(',')
              })
            },1000)
          }
--- a/pages/order/payresult/index.js
+++ b/pages/order/payresult/index.js
@ -20,6 +20,7 @@ Page({
      tid:options.tid,
      type:options.type
    })
+    console.log('options.ids',options.ids);
    commonApi.user_post("order/query",{
      order_id:options.tid
    }).then(res=>{
@ -32,7 +33,8 @@ Page({
      offset: 0,
      limit: 6,
      rand: true,
-      type: 'post'
+      type: 'post',
+      product_ids:options.ids,
  }).then(res => {
      try {
          this.setData({
--- a/pages/user/order/activityOrderInfo/index.wxml
+++ b/pages/user/order/activityOrderInfo/index.wxml
@ -50,7 +50,7 @@
    <navigator url="/pages/info/activityInfo/index?id={{info.order_product_list[0].activity_id}}" class="btn">再次购买</navigator>
    <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}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
+    <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>
    <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
    <!-- <view class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</view> -->
  </view>
--- a/pages/user/order/hotelOrderInfo/index.js
+++ b/pages/user/order/hotelOrderInfo/index.js
@ -18,7 +18,8 @@ Page({
    codeImgs:[],
    minute:"",
    second:"",
-    id:null
+    id:null,
+    ids:[]
  },

  /**
@ -190,6 +191,10 @@ Page({
        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.order_product_list.map(order=>{
        order.qrcode.map(item=>{
@ -207,7 +212,8 @@ Page({
      this.setData({
        isRefund:state.indexOf("REFUND")!=-1,
        info:res.data,
-        product_model:res.data.order_product_list[0].product_model
+        product_model:res.data.order_product_list[0].product_model,
+        ids: proId.join(",")
      })
      this.getCodeImg()
    })
--- a/pages/user/order/hotelOrderInfo/index.wxml
+++ b/pages/user/order/hotelOrderInfo/index.wxml
@ -40,7 +40,7 @@
    <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
  </view>
 </view>
-<sptj></sptj>
+<sptj ids="{{ ids }}"></sptj>
 <navigator url="/pages/info/hotelProductInfo/index?id={{item.scene_detail.id}}" class="box" wx:if='{{info}}' wx:for="{{info.order_product_list}}" style="padding-bottom:0">
  <view class="scene-box" style="align-items:center">
    <view class="scene-box-left">
--- a/pages/user/order/lineOrderInfo/index.js
+++ b/pages/user/order/lineOrderInfo/index.js
@ -19,7 +19,8 @@ Page({
    minute:"",
    second:"",
    id:"",
-    cardTypes:{}
+    cardTypes:{},
+    ids:[]
  },

  /**
@ -201,6 +202,10 @@ Page({
        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.order_product_list.map(order=>{
        order.qrcode.map(item=>{
@ -212,7 +217,8 @@ Page({
      this.setData({
        isRefund:state.indexOf("REFUND")!=-1,
        info:res.data,
-        product_model:res.data.order_product_list[0].product_model
+        product_model:res.data.order_product_list[0].product_model,
+        ids: proId.join(",")
      })
      this.getCodeImg()
    })
--- a/pages/user/order/lineOrderInfo/index.wxml
+++ b/pages/user/order/lineOrderInfo/index.wxml
@ -39,13 +39,13 @@
    <navigator url="/pages/info/roadInfo/index?id={{info.order_product_list[0].product_id}}" class="scene-btn" wx:if="{{info.state=='COMPLETED'}}">再次购买</navigator>
    <view class="scene-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}}" class="scene-btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
+    <navigator url="/pages/order/comment/index?id={{info.order_id}}&proId={{info.order_product_list[0].product_id}}" class="scene-btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
    <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
    <!-- <view class="scene-btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</view> -->
  </view>
 </view>

-<sptj></sptj>
+<sptj ids="{{ ids }}"></sptj>

 <!--景点订单详情需要这个  -->
 <navigator url="/pages/info/roadInfo/index?id={{info.order_product_list[0].product_id}}" class="box" wx:if='{{info}}'>
--- a/pages/user/order/movieOrderInfo/index.js
+++ b/pages/user/order/movieOrderInfo/index.js
@ -19,7 +19,8 @@ Page({
    codeImgs:[],
    id:null,
    minute:"",
-    second:""
+    second:"",
+    ids:[]
  },

  /**
@ -175,6 +176,10 @@ Page({
        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.order_product_list.map(order=>{
        order.qrcode.map(item=>{
@ -186,7 +191,8 @@ Page({
      this.setData({
        isRefund:state.indexOf("REFUND")!=-1,
        info:res.data,
-        product_model:res.data.order_product_list[0].product_model
+        product_model:res.data.order_product_list[0].product_model,
+        ids: proId.join(",")
      })
      this.getCodeImg()
    })
--- a/pages/user/order/movieOrderInfo/index.wxml
+++ b/pages/user/order/movieOrderInfo/index.wxml
@ -52,7 +52,7 @@
    <navigator url="../refundInfo/index?id={{info.order_id}}" class="btn" wx:if="{{isRefund}}">退款详情</navigator>
    <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}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
+    <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>
    <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
  </view>
 </view>
--- a/pages/user/order/museumOrderInfo/index.js
+++ b/pages/user/order/museumOrderInfo/index.js
@ -19,7 +19,8 @@ Page({
    codeImgs:[],
    id:null,
    minute:"",
-    second:""
+    second:"",
+    ids:[]
  },

  /**
@ -175,6 +176,10 @@ Page({
        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.order_product_list.map(order=>{
        order.qrcode.map(item=>{
@ -201,7 +206,8 @@ Page({
      this.setData({
        isRefund:state.indexOf("REFUND")!=-1,
        info:res.data,
-        product_model:res.data.order_product_list[0].product_model
+        product_model:res.data.order_product_list[0].product_model,
+        ids: proId.join(",")
      })
      this.getCodeImg()
      // 获取行程规划
--- a/pages/user/order/museumOrderInfo/index.wxml
+++ b/pages/user/order/museumOrderInfo/index.wxml
@ -50,13 +50,13 @@
    <navigator url="/pages/info/museumInfo/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
    <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}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
+    <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>
    <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
    <!-- <view class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</view> -->
  </view>
 </view>

-<sptj></sptj>
+<sptj ids="{{ ids }}"></sptj>
 <view class="box" wx:if="{{info}}">
  <view class="box-title">{{info.order_product_list[0].scene_detail.title}}</view>
  <view class="detail-item">
--- a/pages/user/order/postOrderInfo/index.js
+++ b/pages/user/order/postOrderInfo/index.js
@ -22,7 +22,8 @@ Page({
    id:null,
    pay_methods:app.globalData.pay_methods,
    tjList:[],
-    showLoading:true
+    showLoading:true,
+    ids:[]
  },

  /**
@ -240,6 +241,10 @@ Page({
        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=>{
@ -256,7 +261,8 @@ Page({
      this.setData({
        isRefund:state.indexOf("REFUND")!=-1,
        info:res.data,
-        product_model:res.data.order_product_list[0].product_model
+        product_model:res.data.order_product_list[0].product_model,
+        ids: proId.join(",")
      })
      this.getCodeImg()
    })
--- a/pages/user/order/postOrderInfo/index.wxml
+++ b/pages/user/order/postOrderInfo/index.wxml
@ -12,7 +12,7 @@
  <view class="box-title" style="margin-top:15rpx"><text style="margin-right:20rpx">{{info.order_product_list[0].consignee_info.name}}</text><text>{{info.order_product_list[0].consignee_info.tel}}</text></view>
  <view style="font-size:26rpx;color:#333;line-height:50rpx"><text style="color:#0B898E;margin-right:10rpx" class="iconfont icon-location"></text>{{info.order_product_list[0].consignee_info.address}}</view>
 </view>
-<sptj></sptj>
+<sptj ids="{{ ids }}"></sptj>
 <view class="box" wx:if="{{info}}" style="padding-bottom:0">
  <view wx:if="{{info.order_product_list && info.order_product_list.length>0}}" class="product-info" wx:for="{{info.order_product_list}}">
    <view class="product-info-top">
@ -52,7 +52,7 @@
    <view class="btn" wx:elif="{{info.stateNums.WAIT_DELIVERY==info.order_product_list.length}}">确认收货</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}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
+    <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>
    <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
    <navigator url="../expressInfo/index?id={{info.order_id}}" class="btn" wx:if="{{info.post_detail_list.length>0}}">查询快递</navigator>
  </view>
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@ -28,7 +28,8 @@ Page({
    sysmText:'更多',
    sysm2:false,
    sysm2Text:'更多',
-    imgLen:[]
+    imgLen:[],
+    ids:[]
  },

  /**
@ -259,6 +260,10 @@ Page({
        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.order_product_list.map(order=>{
        order.qrcode.map(item=>{
@ -270,8 +275,10 @@ Page({
      this.setData({
        isRefund:state.indexOf("REFUND")!=-1,
        info:res.data,
-        product_model:"ticket"||res.data.order_product_list[0].product_model
+        product_model:"ticket"||res.data.order_product_list[0].product_model,
+        ids: proId.join(",")
      })
+      console.log('ids',this.data.ids);
      this.getCodeImg()
      // 获取行程规划
      let that = this;
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@ -24,7 +24,7 @@
  <view class="code-state">{{codeImgs[codeIndex].state}} {{codeIndex+1}}/{{codeImgs.length}}</view>
 </view>

-<sptj></sptj>
+<sptj ids="{{ ids }}"></sptj>

 <!-- 景点订单详情需要这个 -->
 <view class="box" wx:if='{{product_model=="ticket"}}'>
@ -49,7 +49,7 @@
    <navigator url="../refundInfo/index?id={{info.order_id}}" class="scene-btn" wx:if="{{isRefund}}">退款详情</navigator>
    <view class="scene-btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消预订</view>
    <view class="scene-btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消预订</view>
-    <navigator url="/pages/order/comment/index?id={{info.order_id}}" class="scene-btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
+    <navigator url="/pages/order/comment/index?id={{info.order_id}}&proId={{info.order_product_list[0].product_id}}" class="scene-btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
    <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
  </view>
 </view>
--- a/project.private.config.json
+++ b/project.private.config.json
@ -81,6 +81,13 @@
          "query": "id=82342309051435565877",
          "launchMode": "default",
          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/user/order/activityOrderInfo/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
        }
      ]
    }