update 合伙人、花店端

xuxueyang

2024-08-04 6e4b859a05e29eb75ff39c340e015265c3be85e9

 pages/order/order-detail.vue

@@ -300,10 +300,10 @@
            dto.status === 'SEND' && '商家已发货，正在通知取货'
            || dto.status === 'PENDING' && '订单还未支付，立即去支付'
            || dto.status === 'RECEIVE' && '待签收'
            || ('订单' + dto.statusStr)
            || ('订单状态: ' + dto.statusStr)
          }}
            </view>
            <view class="desc-gray">支付时间:{{dto.paymentTime}}</view>
            <view class="desc-gray">支付时间:{{dto.paymentTime || '-'}}</view>
         </view>
      </view>
      <view class="address-container bg-white br-4 m-t-12" v-if="!showSales">
@@ -313,29 +313,37 @@
            <view class="info">
               <view class="title">
                  {{ dto.customer }}
                  <view class="tel">{{ dto.customerTel }}</view>
                  <view class="tel">{{ dto.customerTel  || ''}}</view>
               </view>
               <view class="content">{{ dto.customerAddress }}</view>
               <view class="content">{{ dto.customerAddress || ''}}</view>
            </view>
         </view>
      </view>
      <view class="flower-info m-b-20 m-t-12 br-4" v-for="(item,index) of list" :key="index">
         <view class="supplier-name ">
            <image class="icon-dp" src="/static/common/icon-dp.png"></image>
            {{ item.supplierName }}
            {{ item.supplierName || ''}}
         </view>
         <view class="flex m-t-12">
            <radio v-if="showSales" :checked="submitForm.orderItems.indexOf(item.id)>=0" @click="changeSalesOrderItem(item)"></radio>
            <radio v-if="showSales" :checked="submitForm.orderItems.indexOf(item.id)>=0"
               @click="changeSalesOrderItem(item)"></radio>

            <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)">
            <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover"
               @click="previewImg(item.flowerCover)">
            </image>
            <view class="flex1">
               <view class=" flex">
                  <view class="title"><span class="level">{{ item.flowerCategory }}</span><span
                        class="level">{{ item.flowerLevelStr }}</span>{{ item.flowerName }}
                  <view class="title"><span class="level">{{ item.flowerCategory || ''}}</span><span
                        class="level">{{ item.flowerLevelStr || ''}}</span>{{ item.flowerName || ''}}
                  </view>
               </view>
               <view class="each-list">
                  <view class="each-item">
                     <view class="label">货位号</view>
                     <view class="value">{{ item.warehouseLocationCode || dto.warehouseLocationCode  || '-' }}
                     </view>
                  </view>

                  <view class="each-item">
                     <view class="label">颜色</view>
                     <view class="value">{{ item.flowerColor || '-' }}</view>
@@ -369,6 +377,12 @@
            <view class="label">订单编号:</view>
            <view class="value">{{ dto.orderNo || '-' }}</view>
            <view class="button m-l-a m-r-0" @click="copyTxt(dto.orderNo)">复制
            </view>
         </view>
         <view class="form-item" v-if="dto.deliveryNo">
            <view class="label">快递单号:</view>
            <view class="value">{{ dto.deliveryNo || '-' }}</view>
            <view class="button m-l-a m-r-0" @click="copyTxt(dto.deliveryNo)">复制
            </view>
         </view>
         <view class="form-item">
@@ -446,13 +460,17 @@
         <view class="flex m-t-12">
            <view class="flex1 w-fit m-auto icon-view" @click.stop="callTel">
               <image src="/static/common/icon-call.png" class="icon icon-call m-r-10  img100"></image>
               15974805814
               拨打15974805814
            </view>
            <view class="flex1 w-fit m-auto icon-view" open-type="contact">
               <image src="/static/common/icon-wx.png" class="icon icon-call  m-r-10 img100"></image>
               在线客服
            <view class="flex1 w-fit m-auto icon-view flex flex-wrap-normal" open-type="contact">
               <image src="/static/common/icon-wx.png" class="icon icon-call m-t-2  m-r-10 img100"></image>

               <button open-type="contact" class="component-button-contact" @handleContact="handleContact">
                  联系在线客服
               </button>
            </view>


         </view>
      </view>