update 合并v2版本的宏定义

xuxueyang

2024-09-11 af773c6b3e85cf3e7628eefe6f287c44a8d5a11a

 sub_pages/partner/order-manage/order-manage.vue

@@ -16,38 +16,43 @@
            <view>
              订单：{{ item.orderNo }}
            </view>
            <view class="status t-red m-l-a m-r-0">{{ item.paymentAmount }}</view>
            <view class="status t-red m-l-a m-r-0">{{ item.paymentAmount || '' }}</view>
          </view>
          <view class="desc flex">
            <view class="label">
              订单状态:
            </view>
            <view class="value">{{ item.statusBackendStr }}</view>
          </view>
          <view class="desc flex">
            <view class="label">
              收货人:
            </view>
            <view class="value">{{ item.customer }}</view>
          </view>
          <view class="desc flex">
            <view class="label">
              收货人手机号码:
            </view>
            <view class="value">{{ item.customerTel }}</view>
          </view>
          <view class="flex">
           <view class="desc flex flex1">
             <view class="label">
               订单状态:
             </view>
             <view class="value">{{ item.statusBackendStr }}</view>
           </view>
           <view class="desc flex flex1">
             <view class="label">
               支付时间:
             </view>
             <view class="value">{{ item.paymentTime||'-' }}</view>
           </view>
        </view>
          <ivew class="flex">
           <view class="desc flex flex1">
             <view class="label">
               收货人:
             </view>
             <view class="value">{{ item.customer ||'-'}}</view>
           </view>
           <view class="desc flex flex1">
             <view class="label">
               收货人手机号码:
             </view>
             <view class="value">{{ item.customerTel ||'-'}}</view>
           </view>
        </ivew>
          <view class="desc flex">
            <view class="label">
              收货地址:
            </view>
            <view class="value">{{ item.customerAddress }}</view>
            <view class="value">{{ item.customerAddress ||'-'}}</view>
          </view>
          <view class="desc flex">
            <view class="label">
              支付时间:
            </view>
            <view class="value">{{ item.paymentTime }}</view>
          </view>
          

          <view class="button-green-1" v-if="false">确认配送完成</view>
        </view>
@@ -77,7 +82,6 @@

  },
  onReachBottom() {
    this.page.current += 1
    this.getMore()
  },
  async onPullDownRefresh() {