Merge branch 'dev_fix_sub' into user_action

peng

1 天以前 27fb1f51c37083585dc873dd9ff86de2f2db82bc

 pages/order/myOrder.vue

@@ -175,6 +175,14 @@
                  </u-button> -->
                </view>
              </view>
            <view style="display: flex;justify-content: space-around;">
               <view class="" @click="callPhone">
                   客服热线: 19980834650
               </view>
               <view class="" @click="copyToClipboard">
                   客服微信: meiyikuang
               </view>
            </view>
            </view>
          </view>
          <uni-load-more :status="tabItem.loadStatus"></uni-load-more>
@@ -381,7 +389,7 @@
           param.sessionId = this.pageSessionNo
           userAction(param)
        }
     })	
     })
    if(this.$options.filters.tipsToLogin()){
      if (!this.tabCurrentIndex) {
        this.initData(0);
@@ -419,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:'19980834650'
                 })
              }
           }
        })
     },
     openCouponPackage(order){
        console.log(order)
      uni.navigateTo({
@@ -683,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}`,
     });
    },
  },
};