Merge branch 'dev_fix_sub' into user_action

peng

12 小时以前 9653f4faa20699a2d9a03391f4a6175ff8ce59c3

 pages/order/myOrder.vue

@@ -175,6 +175,14 @@
                  </u-button> -->
                </view>
              </view>
            <view style="display: flex;justify-content: space-around;">
               <view class="" @click="callPhone">
                   客服热线: 028-84472936
               </view>
               <view class="" @click="copyToClipboard">
                   客服微信: meiyikuang
               </view>
            </view>
            </view>
          </view>
          <uni-load-more :status="tabItem.loadStatus"></uni-load-more>
@@ -241,6 +249,7 @@
import { getClearReason } from "@/api/after-sale.js";
import LiLiWXPay from "@/js_sdk/lili-pay/wx-pay.js";
import {buyBack} from "@/api/trade.js";
import { getSessionId, userAction } from "@/api/userAction.js";
export default {

  data() {
@@ -327,6 +336,16 @@
      reason: "", //取消原因
      cancelList: "", //取消列表
      rogShow: false, //显示是否收货
     pageSessionNo:"",
     actionParam:{
           sessionId:'',
           actionType:"PAGE",
           joinType:"SELF",
           pageCode:"ORDER_LIST",
           pageParams:"{}",
           pageStatus:"JOIN",
           pageType:"DETAIL"
        }
    };
  },

@@ -349,7 +368,28 @@
    }
    // this.loadData(this.status);
  },
  onUnload() {
    let   param = this.actionParam;
    if (this.sendOnShow)return
    param.pageStatus = "LEAVE"
    userAction(param)
  },
  onHide() {
    this.startHidenTime = Date.now()
    let   param = this.actionParam;
    this.sendOnShow = true;
    param.pageStatus = "LEAVE"
    userAction(param)
  },
  onShow() {
     getSessionId().then(res=>{
        this.pageSessionNo = res.data.data
        if(this.pageSessionNo){
        let   param = this.actionParam;
           param.sessionId = this.pageSessionNo
           userAction(param)
        }
     })	
    if(this.$options.filters.tipsToLogin()){
      if (!this.tabCurrentIndex) {
        this.initData(0);
@@ -359,6 +399,7 @@
  },

  onLoad(options) {
     this.actionParam.pageParams = JSON.stringify(options)
    /**
     * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
     * 替换onLoad下代码即可
@@ -386,6 +427,29 @@
    },
  },
  methods: {
     copyToClipboard(){
        uni.setClipboardData({
           data:'meiyikuang',
           success() {
              uni.showToast({
            title: '复制成功',
            icon: 'none'
              })
           }
        })
     },
     callPhone(){
        uni.showModal({
           title:'确认联系客服吗?',
           success(e) {
              if(e.confirm){
                 uni.makePhoneCall({
                    phoneNumber:'028-84472936'
                 })
              }
           }
        })
     },
     openCouponPackage(order){
        console.log(order)
      uni.navigateTo({