合并

MrShi

10 小时以前 87a0661bd4bfd91228747f77ce575db7775a44a5

 mini-program/pagesA/pages/order-details/order-details.vue

@@ -66,7 +66,7 @@
               <view class="user-jxa-lx">
                  <image src="/static/icon/ic_call@2x.png" mode="widthFix"></image>
                  <text v-if="userType==1" @click="contact(info.linkphone)">联系客户</text> 
                  <text v-if="info.orderStatus!=0 && userType==0" @click="contact(info.shopPhone)">联系经销商</text>
                  <text v-if="info.orderStatus!=0 && userType==0" @click="contact(info.shopInfo.phone || '')">联系经销商</text>
               </view>
            </view>
            <view class="user-jxtime">
@@ -86,27 +86,27 @@
               <view class="user-qrcode-btn" @click="copyText(info.exchangeCode)">复制自提码</view>
            </view>
         </view>
         <!-- <view class="user">
         <view class="user"   v-if="info.receiveType!=1">
            <view class="user-top">
               <view class="user-icon">
                  <image src="/static/icon/ic_location@2x.png" mode="widthFix"></image>
               </view>
               <view class="user-info">
                  <view class="user-info-a">
                     <text>李金平</text>
                     <text>181777889338</text>
                     <text>{{info.linkename || ''}}</text>
                     <text>{{info.linkephone || ''}}</text>
                  </view>
                  <view class="user-info-b">
                     安徽省合肥市经开区松谷路凤凰国际B座808 豆米科技有限公司
                     {{info.addr||''}}
                  </view>
               </view>
            </view>
            <view class="user-xian"></view>
            <view class="user-kd">
               <image src="/static/icon/ic_wuliu@2x.png" mode="widthFix"></image>
               <text>顺丰速运｜SF1923218478129473</text>
               <text>{{info.kdName || ''}}｜{{info.kdCode || ''}}</text>
            </view>
         </view> -->
         </view>  
         <view class="shop">
            <view class="shop-info" style="margin: 0;"  v-if="info.status ==6">
               <view class="shop-info-item" style="margin-bottom: 12rpx;">
@@ -133,8 +133,7 @@
         <view class="shop">
            <view class="shop-top">
               <view :class="'shop-top-tips '+(info.receiveType==1?'shop-top-tips-a':'shop-top-tips-b' )">{{info.receiveType==1?'自提':'配送'}}</view>
               <text v-if="info.receiveType==1">{{info.shopInfo.name}}</text>
               <text v-if="info.receiveType!=1">{{info.kdName}}</text>
               <text>{{info.shopInfo.name || ''}}</text>
            </view>
            <view class="b">
               <view class="b-item" v-for="(item, index) in (info.goodsorderDetailList||[])" :key="index">