Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxingli...

MrShi

2026-04-25 6f7f24efb43a64c79325a425dcd3e507d55bf876

 small-program/pages/itinerary/itinerary.vue

@@ -88,7 +88,7 @@

               <view class="card-footer">
                  <view class="footer-actions" v-if="item.type===0">
                     <view class="footer-btn contact-btn" @click="contactPhone(item,0)" v-if="item.status ===1 || item.status==2 || item.status===98">联系门店</view>
                     <view class="footer-btn contact-btn" @click="contactPhone(item,0)" v-if="item.status ===1 ||item.status ===5 || item.status==2 || item.status===98">联系门店</view>
                      <view class="footer-btn contact-btn" v-if="item.status ===0 || item.status ===1"  @click="cancelOrder(item)">取消订单</view>
                     <view class="footer-btn contact-btn" @click="deleteOrder(item)" v-if="item.status ===7 || item.status===96 || item.status == 99">删除订单</view>
                     <view class="footer-btn primary-btn"  @click="payOrder(item)" v-if="item.status ===0">立即支付</view>
@@ -119,7 +119,7 @@
         <view class="phone">
            <view class="phone-head">
               <view></view>
               <text>联系客户</text> 
               <text>{{linkItem.title}}</text> 
            </view>
            <!-- <view class="phone-item">
               <view>
@@ -129,10 +129,10 @@
                <view class="line" v-if="serverPhone && serverPhone.length"></view>
            </view> -->
             <view class="phone-item" >
                <view>
                  <image src="/static/icon/ic_call@2x.png" mode="widthFix" @click="contactPhoneDo()" ></image>
                  <text>{{linkItem.linkname||''}} </text> 
                  <text style="margin-left: 10px;"> {{linkItem.linkphone||''}}</text> 
                <view @click="contactPhoneDo()">
                  <image src="/static/icon/ic_call@2x.png" mode="widthFix"  ></image>
                  <text  >{{linkItem.linkname||''}} </text> 
                  <text  style="margin-left: 10px;"> {{linkItem.linkphone||''}}</text> 
               </view> 
             </view>  
             <view style="width: 100%; height: 30rpx;"></view>
@@ -226,6 +226,8 @@
            qrcodeImage:null,
            isLoadingMore: false,
            currentOrder:null,
            contanctType:0,
            linkItem:{title:'',linkname:'',linkphone:''},
            filterTabs: [
               { label: '全部'  ,value: -1},
               { label: '待支付',value: 0 },
@@ -246,10 +248,9 @@
      onLoad(options) {
         console.log(options )
         this.activeTab = -1
         if (options.status) {
         if (options.status != null && options.status != undefined) {
            this.activeTab =  Number(options.status)
         }
         this.getFirstPageData()
         var that =this
         uni.$on('updateOrder',function(data){
            console.log('监听到事件来自 update ，携带参数 msg 为：' ,data);
@@ -275,9 +276,18 @@
         this.showDelete=false
         this.showQrcode=false
         this.showPay=false
         this.contanctType =0
         this.showPhone=false
         this.loading=false
         this.currentOrder=null
         this.linkItem={title:'',linkname:'',linkphone:''}
         var orderStatus = uni.getStorageSync("orderStatus");
         console.log(orderStatus,"==================")
         if (orderStatus != null &&orderStatus != undefined) {
            this.activeTab =  Number(orderStatus)
         }
         uni.clearStorageSync("orderStatus")
         // this.getFirstPageData()
      },
      onReachBottom(){
         this.getDataList();
@@ -337,10 +347,20 @@
               that.showDone()
            } 
         },
         contactPhone(item){
         contactPhone(item,type){
             this.showPhone = !this.showPhone
             this.linkItem = item ||{}
            this.linkItem = {title:'',linkname:'',linkphone:''}
             console.log("==================================",this.showPhone)
             if(!item){
                return
             }
            if(type == 0){
               this.linkItem = {title:'联系门店',linkname:item.depositShopName,linkphone:item.depositShopPhone}
            }else if(type ==2){
               this.linkItem = {title:'联系骑手',linkname:item.driverName,linkphone:item.driverPhone}
            }else if(type ==1){
               this.linkItem = {title:'联系门店',linkname:item.takeShopName,linkphone:item.takeShopPhone}
            }
         },
         contactPhoneDo(){ 
            if(this.linkItem.linkphone !=null && this.linkItem.linkphone!=''){
@@ -685,6 +705,7 @@
      display: block;
      white-space: nowrap;
      overflow: hidden;
      text-align: center;
      text-overflow: ellipsis;
      max-width: 100%;  
   }