Merge remote-tracking branch 'origin/user_action' into send_coupon

zxl

20 小时以前 eabb18cf60273b25471509858b287474cea9b370

 pages/order/myOrder.vue

@@ -177,7 +177,7 @@
              </view>
            <view style="display: flex;justify-content: space-around;">
               <view class="" @click="callPhone">
                   客服热线: 028-84472936
                   客服热线: 19980834650
               </view>
               <view class="" @click="copyToClipboard">
                   客服微信: meiyikuang
@@ -389,7 +389,7 @@
           param.sessionId = this.pageSessionNo
           userAction(param)
        }
     })	
     })
    if(this.$options.filters.tipsToLogin()){
      if (!this.tabCurrentIndex) {
        this.initData(0);
@@ -444,7 +444,7 @@
           success(e) {
              if(e.confirm){
                 uni.makePhoneCall({
                    phoneNumber:'028-84472936'
                    phoneNumber:'19980834650'
                 })
              }
           }
@@ -714,14 +714,14 @@
     * 查看物流
     */
    navigateToLogistics(order) {
      uni.navigateTo({
        url:
          "/pages/mine/msgTips/packageMsg/logisticsDetail?order_sn=" + order.sn,
      });
      // uni.navigateTo({
      //   url:
      //     "/pages/mine/msgTips/packageMsg/logisticsDetail?order_sn=" + order.sn,
      //       `/pages/order/deliverDetail?order_sn=${order.sn}`,
      // });
     uni.navigateTo({
       url:
         `/pages/order/deliverDetail?order_sn=${order.sn}`,
     });
    },
  },
};