取件单详情对接api

src/pages/pickup/waybillPickUpDetail.vue

@@ -1,14 +1,8 @@
 <script setup lang="ts">
-import type {
-  SkuPopupEvent,
-  SkuPopupInstance,
-  SkuPopupLocaldata,
-} from '@/components/vk-data-goods-sku-popup/vk-data-goods-sku-popup'
-import { postMemberCartAPI } from '@/services/cart'
-import { getGoodsByIdAPI } from '@/services/goods'
-import type { GoodsResult } from '@/types/goods'
+import { getPickUpById } from '@/services/waybillPickUpOrder'
+import type { PickUpDetailItem } from '@/types/waybillPickUp'
 import { onLoad } from '@dcloudio/uni-app'
-import { computed, ref } from 'vue'
+import { ref } from 'vue'
 
 // 获取屏幕边界到安全区域距离
 const { safeAreaInsets } = uni.getSystemInfoSync()
@@ -19,46 +13,19 @@ const query = defineProps<{
 }>()
 
 // 获取商品详情信息
-const goods = ref<GoodsResult>()
-const getGoodsByIdData = async () => {
-  const res = await getGoodsByIdAPI(query.id)
-  goods.value = res.result
-  // SKU组件所需格式
-  localdata.value = {
-    _id: res.result.id,
-    name: res.result.name,
-    goods_thumb: res.result.mainPictures[0],
-    spec_list: res.result.specs.map((v) => {
-      return {
-        name: v.name,
-        list: v.values,
-      }
-    }),
-    sku_list: res.result.skus.map((v) => {
-      return {
-        _id: v.id,
-        goods_id: res.result.id,
-        goods_name: res.result.name,
-        image: v.picture,
-        price: v.price * 100, // 注意：需要乘以 100
-        stock: v.inventory,
-        sku_name_arr: v.specs.map((vv) => vv.valueName),
-      }
-    }),
-  }
+const details = ref<PickUpDetailItem[]>()
+const getOrderByIdData = async () => {
+  const res = await getPickUpById(query.id)
+  console.log('res--', res.data.details)
+
+  details.value = res.data.details
 }
 
 // 页面加载
 onLoad(() => {
-  getGoodsByIdData()
+  getOrderByIdData()
 })
 
-// 轮播图变化时
-const currentIndex = ref(0)
-const onChange: UniHelper.SwiperOnChange = (ev) => {
-  currentIndex.value = ev.detail.current
-}
-
 // 点击图片时
 const onTapImage = (url: string) => {
   // 大图预览
@@ -68,116 +35,16 @@ const onTapImage = (url: string) => {
   })
 }
 
-// uni-ui 弹出层组件 ref
-const popup = ref<{
-  open: (type?: UniHelper.UniPopupType) => void
-  close: () => void
-}>()
-
-// 弹出层条件渲染
-const popupName = ref<'address' | 'service'>()
-const openPopup = (name: typeof popupName.value) => {
-  // 修改弹出层名称
-  popupName.value = name
-  popup.value?.open()
-}
-// 是否显示SKU组件
-const isShowSku = ref(false)
-// 商品信息
-const localdata = ref({} as SkuPopupLocaldata)
-// 按钮模式
-enum SkuMode {
-  Both = 1,
-  Cart = 2,
-  Buy = 3,
-}
-const mode = ref<SkuMode>(SkuMode.Cart)
-// 打开SKU弹窗修改按钮模式
-const openSkuPopup = (val: SkuMode) => {
-  // 显示SKU弹窗
-  isShowSku.value = true
-  // 修改按钮模式
-  mode.value = val
-}
-// SKU组件实例
-const skuPopupRef = ref<SkuPopupInstance>()
-// 计算被选中的值
-const selectArrText = computed(() => {
-  return skuPopupRef.value?.selectArr?.join(' ').trim() || '请选择商品规格'
-})
-// 加入购物车事件
-const onAddCart = async (ev: SkuPopupEvent) => {
-  await postMemberCartAPI({ skuId: ev._id, count: ev.buy_num })
-  uni.showToast({ title: '添加成功' })
-  isShowSku.value = false
-}
-// 立即购买
-const onBuyNow = (ev: SkuPopupEvent) => {
-  uni.navigateTo({ url: `/pagesOrder/create/create?skuId=${ev._id}&count=${ev.buy_num}` })
+// 联系客户
+const contactClient = () => {
+  uni.makePhoneCall({
+    phoneNumber: '13200000000',
+  })
 }
 </script>
 
 <template>
-  <!-- SKU弹窗组件 -->
-  <vk-data-goods-sku-popup
-    v-model="isShowSku"
-    :localdata="localdata"
-    :mode="mode"
-    add-cart-background-color="#FFA868"
-    buy-now-background-color="#27BA9B"
-    ref="skuPopupRef"
-    :actived-style="{
-      color: '#27BA9B',
-      borderColor: '#27BA9B',
-      backgroundColor: '#E9F8F5',
-    }"
-    @add-cart="onAddCart"
-    @buy-now="onBuyNow"
-  />
   <scroll-view enable-back-to-top scroll-y class="viewport">
-    <!-- 基本信息 -->
-    <view class="goods">
-      <!-- 商品主图 -->
-      <view class="preview">
-        <swiper @change="onChange" circular>
-          <swiper-item v-for="item in goods?.mainPictures" :key="item">
-            <image class="image" @tap="onTapImage(item)" mode="aspectFill" :src="item" />
-          </swiper-item>
-        </swiper>
-        <view class="indicator">
-          <text class="current">{{ currentIndex + 1 }}</text>
-          <text class="split">/</text>
-          <text class="total">{{ goods?.mainPictures.length }}</text>
-        </view>
-      </view>
-
-      <!-- 商品简介 -->
-      <view class="meta">
-        <view class="price">
-          <text class="symbol">¥</text>
-          <text class="number">{{ goods?.price }}</text>
-        </view>
-        <view class="name ellipsis">{{ goods?.name }}</view>
-        <view class="desc"> {{ goods?.desc }} </view>
-      </view>
-
-      <!-- 操作面板 -->
-      <view class="action">
-        <view @tap="openSkuPopup(SkuMode.Both)" class="item arrow">
-          <text class="label">选择</text>
-          <text class="text ellipsis"> {{ selectArrText }} </text>
-        </view>
-        <view @tap="openPopup('address')" class="item arrow">
-          <text class="label">送至</text>
-          <text class="text ellipsis"> 请选择收获地址 </text>
-        </view>
-        <view @tap="openPopup('service')" class="item arrow">
-          <text class="label">服务</text>
-          <text class="text ellipsis"> 无忧退 快速退款 免费包邮 </text>
-        </view>
-      </view>
-    </view>
-
     <!-- 商品详情 -->
     <view class="detail panel">
       <view class="title">
@@ -186,70 +53,32 @@ const onBuyNow = (ev: SkuPopupEvent) => {
       <view class="content">
         <view class="properties">
           <!-- 属性详情 -->
-          <view class="item" v-for="item in goods?.details.properties" :key="item.name">
-            <text class="label">{{ item.name }}</text>
-            <text class="value">{{ item.value }}</text>
+          <view class="item" v-for="item in details" :key="item.id">
+            <text class="label">{{ item.status }}</text>
           </view>
         </view>
         <!-- 图片详情 -->
-        <image
+        <!-- <image
           class="image"
           v-for="item in goods?.details.pictures"
           :key="item"
           mode="widthFix"
           :src="item"
-        ></image>
-      </view>
-    </view>
-
-    <!-- 同类推荐 -->
-    <view class="similar panel">
-      <view class="title">
-        <text>同类推荐</text>
-      </view>
-      <view class="content">
-        <navigator
-          v-for="item in goods?.similarProducts"
-          :key="item.id"
-          class="goods"
-          hover-class="none"
-          :url="`/pages/goods/goods?id=${item.id}`"
-        >
-          <image class="image" mode="aspectFill" :src="item.picture"></image>
-          <view class="name ellipsis">{{ item.name }}</view>
-          <view class="price">
-            <text class="symbol">¥</text>
-            <text class="number">{{ item.price }}</text>
-          </view>
-        </navigator>
+        ></image> -->
       </view>
     </view>
   </scroll-view>
 
   <!-- 用户操作 -->
-  <view v-if="goods" class="toolbar" :style="{ paddingBottom: safeAreaInsets?.bottom + 'px' }">
-    <view class="icons">
-      <button class="icons-button"><text class="icon-heart"></text>收藏</button>
-      <!-- #ifdef MP-WEIXIN -->
-      <button class="icons-button" open-type="contact">
-        <text class="icon-handset"></text>客服
-      </button>
-      <!-- #endif -->
-      <navigator class="icons-button" url="/pages/cart/cart2" open-type="navigate">
-        <text class="icon-cart"></text>购物车
-      </navigator>
-    </view>
+  <view
+    v-if="details"
+    class="contact-client"
+    :style="{ paddingBottom: safeAreaInsets?.bottom + 'px' }"
+  >
     <view class="buttons">
-      <view @tap="openSkuPopup(SkuMode.Cart)" class="addcart"> 加入购物车 </view>
-      <view @tap="openSkuPopup(SkuMode.Buy)" class="payment"> 立即购买 </view>
+      <view @tap="contactClient" class="payment"> 联系客户 </view>
     </view>
   </view>
-
-  <!-- uni-ui 弹出层 -->
-  <uni-popup ref="popup" type="bottom" background-color="#fff">
-    <!-- <AddressPanel v-if="popupName === 'address'" @close="popup?.close()" /> -->
-    <!-- <ServicePanel v-if="popupName === 'service'" @close="popup?.close()" /> -->
-  </uni-popup>
 </template>
 
 <style lang="scss">
@@ -302,102 +131,6 @@ page {
   }
 }
 
-/* 商品信息 */
-.goods {
-  background-color: #fff;
-  .preview {
-    height: 750rpx;
-    position: relative;
-    .image {
-      width: 750rpx;
-      height: 750rpx;
-    }
-    .indicator {
-      height: 40rpx;
-      padding: 0 24rpx;
-      line-height: 40rpx;
-      border-radius: 30rpx;
-      color: #fff;
-      font-family: Arial, Helvetica, sans-serif;
-      background-color: rgba(0, 0, 0, 0.3);
-      position: absolute;
-      bottom: 30rpx;
-      right: 30rpx;
-      .current {
-        font-size: 26rpx;
-      }
-      .split {
-        font-size: 24rpx;
-        margin: 0 1rpx 0 2rpx;
-      }
-      .total {
-        font-size: 24rpx;
-      }
-    }
-  }
-  .meta {
-    position: relative;
-    border-bottom: 1rpx solid #eaeaea;
-    .price {
-      height: 130rpx;
-      padding: 25rpx 30rpx 0;
-      color: #fff;
-      font-size: 34rpx;
-      box-sizing: border-box;
-      background-color: #35c8a9;
-    }
-    .number {
-      font-size: 56rpx;
-    }
-    .brand {
-      width: 160rpx;
-      height: 80rpx;
-      overflow: hidden;
-      position: absolute;
-      top: 26rpx;
-      right: 30rpx;
-    }
-    .name {
-      max-height: 88rpx;
-      line-height: 1.4;
-      margin: 20rpx;
-      font-size: 32rpx;
-      color: #333;
-    }
-    .desc {
-      line-height: 1;
-      padding: 0 20rpx 30rpx;
-      font-size: 24rpx;
-      color: #cf4444;
-    }
-  }
-  .action {
-    padding-left: 20rpx;
-    .item {
-      height: 90rpx;
-      padding-right: 60rpx;
-      border-bottom: 1rpx solid #eaeaea;
-      font-size: 26rpx;
-      color: #333;
-      position: relative;
-      display: flex;
-      align-items: center;
-      &:last-child {
-        border-bottom: 0 none;
-      }
-    }
-    .label {
-      width: 60rpx;
-      color: #898b94;
-      margin: 0 16rpx 0 10rpx;
-    }
-    .text {
-      flex: 1;
-      -webkit-line-clamp: 1;
-    }
-  }
-}
-
 /* 商品详情 */
 .detail {
   padding-left: 20rpx;
@@ -427,57 +160,15 @@ page {
   }
 }
 
-/* 同类推荐 */
-.similar {
-  .content {
-    padding: 0 20rpx 20rpx;
-    background-color: #f4f4f4;
-    display: flex;
-    flex-wrap: wrap;
-    .goods {
-      width: 340rpx;
-      padding: 24rpx 20rpx 20rpx;
-      margin: 20rpx 7rpx;
-      border-radius: 10rpx;
-      background-color: #fff;
-    }
-    .image {
-      width: 300rpx;
-      height: 260rpx;
-    }
-    .name {
-      height: 80rpx;
-      margin: 10rpx 0;
-      font-size: 26rpx;
-      color: #262626;
-    }
-    .price {
-      line-height: 1;
-      font-size: 20rpx;
-      color: #cf4444;
-    }
-    .number {
-      font-size: 26rpx;
-      margin-left: 2rpx;
-    }
-  }
-  navigator {
-    &:nth-child(even) {
-      margin-right: 0;
-    }
-  }
-}
-
-/* 底部工具栏 */
-.toolbar {
+/* 底部联系客户 */
+.contact-client {
   position: fixed;
   left: 0;
   right: 0;
   bottom: calc((var(--window-bottom)));
   z-index: 1;
   background-color: #fff;
-  height: 100rpx;
-  padding: 0 20rpx;
+  height: 72rpx;
   border-top: 1rpx solid #eaeaea;
   display: flex;
   justify-content: space-between;
@@ -485,46 +176,15 @@ page {
   box-sizing: content-box;
   .buttons {
     display: flex;
+    background-color: #27ba9b;
+    flex: 1;
+    justify-content: center;
     & > view {
-      width: 220rpx;
+      width: 100%;
       text-align: center;
       line-height: 72rpx;
       font-size: 26rpx;
       color: #fff;
-      border-radius: 72rpx;
-    }
-    .addcart {
-      background-color: #ffa868;
-    }
-    .payment {
-      background-color: #27ba9b;
-      margin-left: 20rpx;
-    }
-  }
-  .icons {
-    padding-right: 20rpx;
-    display: flex;
-    align-items: center;
-    flex: 1;
-    // 兼容 H5 端和 App 端的导航链接样式
-    .navigator-wrap,
-    .icons-button {
-      flex: 1;
-      text-align: center;
-      line-height: 1.4;
-      padding: 0;
-      margin: 0;
-      border-radius: 0;
-      font-size: 20rpx;
-      color: #333;
-      background-color: #fff;
-      &::after {
-        border: none;
-      }
-    }
-    text {
-      display: block;
-      font-size: 34rpx;
     }
   }
 }

src/pages/pickup/waybillPickUpOrder.vue

@@ -423,7 +423,6 @@ const getScrollW = () => {
   query
     .select('.scroll-view')
     .boundingClientRect((data: any) => {
-      console.log('1+++', data)
       // 拿到 scroll-view 组件宽度
       contentScrollW.value = data.width
     })
@@ -432,7 +431,6 @@ const getScrollW = () => {
   query
     .selectAll('.scroll-item')
     .boundingClientRect((data: any) => {
-      console.log('2+++', data)
       let dataLen = data.length
       for (let i = 0; i < dataLen; i++) {
         //  scroll-view 子元素组件距离左边栏的距离

src/services/waybillPickUpOrder.ts

@@ -1,3 +1,4 @@
+import type { PickUpDetailItem } from '@/types/waybillPickUp'
 import { http } from '@/utils/http'
 
 /**
@@ -10,3 +11,14 @@ export const waybillPickUpOrders = (params: { page: number; limit: number }) =>
     data: params,
   })
 }
+/**
+ * 获取取件单详情
+ * @param id 取件单id
+ */
+export const getPickUpById = (pick_up_order_id: string) => {
+  return http<{ details: PickUpDetailItem[] }>({
+    method: 'GET',
+    url: '/admin/pickup.waybillPickUpOrder/detail',
+    data: { pick_up_order_id },
+  })
+}

src/types/waybillPickUp.d.ts

@@ -6,3 +6,50 @@ export type StatusItem = {
   left?: number
   width?: number
 }
+export type Good = {
+  qty: number
+  price: string
+  amount: string
+  goods_name: string
+  category_id: number
+  create_time: number
+  delete_time?: any
+  update_time: number
+  order_box_id: number
+  category_name: string
+  order_box_goods_id: number
+}
+
+export type PickUpDetailItem = {
+  operations: any[]
+  status_text: string
+  labels: any[]
+  id: number
+  pick_up_order_id: number
+  pick_up_type: number
+  order_id: number
+  order_no: string
+  waybill_id: number
+  waybill_no: string
+  user_id: number
+  user_name: string
+  sender_address_id: number
+  driver_id: number
+  express_company_id: number
+  express_no: string
+  express_label?: any
+  express_tracking_number?: any
+  track_pod_no: string
+  pick_up_date: string
+  status: number
+  goods: Good[]
+  estimated_weight: string
+  remark: string
+  create_time: number
+  update_time: number
+  delete_time?: any
+  ups_close_time?: any
+  ups_ready_time?: any
+  ups_prn?: any
+  courier_point: string
+}