no message

src/pages/booking/booking.vue

@@ -104,7 +104,7 @@ const handleBooking = async () => {
   const appointmentTimeEnd = yymmdd + ' ' + arr[1].split('-')[1] + ':00'
   // 回收订单添加明细
   const categoryListFilter = categoryList.filter((e) => e.selected)
-  const predictWeight = weightMenuList[activeWeightKey].val
+  const predictWeight = weightMenuList[activeWeightKey.value].val
   const params = {
     appointmentTimeStart,
     appointmentTimeEnd,
@@ -145,7 +145,8 @@ const handlePopClose = (item) => {
     appointmentTime.value = item
   }
   if (popupName.value == 'address') {
-    recycleAddress.value = item?.location
+    console.log(item)
+    recycleAddress.value = item?.receiveStreet
   }
   // if (popupName.value == 'site') {
   //   if (siteObj.value.id != item.id) {
@@ -447,4 +448,5 @@ page {
 .toolbar-height {
   height: 100rpx;
 }
-</style>
+</style>import type { log } from 'console'
+

src/pages/booking/components/AddressPanel.vue

@@ -1,11 +1,14 @@
 <script setup lang="ts">
 import { ref, reactive, toRaw } from 'vue'
 import { onReady } from '@dcloudio/uni-app'
+import { useMemberStore } from '@/stores'
 import { deleteMemberAddressByIdAPI, getMemberAddressAPI } from '@/services/address'
 // 子调父
 const emit = defineEmits<{
   (event: 'close'): void
 }>()
+const memberStore = useMemberStore()
+const staffId = memberStore.profile?.id
 
 // 获取收货地址列表数据
 const addressList = ref<any[]>([])
@@ -18,35 +21,13 @@ const handleClose = () => {
   const item = addressList.value[activeIndex.value]
   emit('close', toRaw(item))
 }
-// const getMemberAddressData = async () => {
-//   const res = await getMemberAddressAPI()
-//   addressList.value = res.data
-// }
-
 const getMemberAddressData = async () => {
-  const res = await new Promise((resolve, reject) => {
-    setTimeout(() => {
-      const dataList = [
-        {
-          id: '1',
-          name: '李聪聪 13824686868',
-          location: '北京市顺义区后沙峪地区安平北街6号院1',
-        },
-        {
-          id: '2',
-          name: '康宁 13824686868',
-          location: '北京市顺义区后沙峪地区安平北街6号院2',
-        },
-        {
-          id: '3',
-          name: '潘家阳 13824686868',
-          location: '北京市顺义区后沙峪地区安平北街6号院3',
-        },
-      ]
-      resolve(dataList)
-    }, 0);
-  })
-  addressList.value = res
+  const params = {
+    clientId: staffId,
+  }
+  console.log(params)
+  const res = await getMemberAddressAPI(params)
+  addressList.value = res.data
 }
 // 页面加载
 onReady(async () => {
@@ -70,8 +51,8 @@ onReady(async () => {
           :data-val="index"
           @click="handleChange"
         >
-          <view class="user">{{ item.name }}</view>
-          <view class="address">{{ item.location }}</view>
+          <view class="user">{{ item.receiveUserName }}</view>
+          <view class="address">{{ item.receiveStreet }}</view>
           <text :class="[activeIndex == index ? 'icon-checked' : 'icon-ring', 'icon']"></text>
         </view>
       </template>

src/pagesMember/address-form/address-form.vue

@@ -9,13 +9,13 @@ import { ref, reactive } from 'vue'
 
 // 表单数据
 const form = ref({
-  receiver: '', // 收货人
-  contact: '', // 联系方式
+  receiveUserName: '', // 收货人
+  receiveMobilePhone: '13201921745', // 联系方式
   fullLocation: '', // 省市区(前端展示)
   provinceCode: '', // 省份编码(后端参数)
   cityCode: '', // 城市编码(后端参数)
   countyCode: '', // 区/县编码(后端参数)
-  address: '', // 详细地址
+  receiveStreet: '', // 详细地址
   isDefault: 0, // 默认地址，1为是，0为否
 })
 
@@ -59,10 +59,10 @@ const onSwitchChange: UniHelper.SwitchOnChange = (ev) => {
 
 // 定义校验规则
 const rules: UniHelper.UniFormsRules = {
-  receiver: {
+  receiveUserName: {
     rules: [{ required: true, errorMessage: '请输入收货人姓名' }],
   },
-  contact: {
+  receiveMobilePhone: {
     rules: [
       { required: true, errorMessage: '请输入联系方式' },
       { pattern: /^1[3-9]\d{9}$/, errorMessage: '手机号格式不正确' },
@@ -71,7 +71,7 @@ const rules: UniHelper.UniFormsRules = {
   countyCode: {
     rules: [{ required: true, errorMessage: '请选择所在地区' }],
   },
-  address: {
+  receiveStreet: {
     rules: [{ required: true, errorMessage: '请选择详细地址' }],
   },
 }
@@ -83,7 +83,7 @@ let location = reactive('')
 const handlePointer = () => {
   uni.chooseLocation({
     success: async function (res) {
-      form.value.address = res.address
+      form.value.receiveStreet = res.address
       const longitude = res.longitude.toFixed(6)
       const latitude = res.latitude.toFixed(6)
       location = Object.assign(location, {
@@ -143,17 +143,17 @@ const onCityChange: UniHelper.UniDataPickerOnChange = (ev) => {
   <view class="content">
     <uni-forms :rules="rules" :model="form" ref="formRef">
       <!-- 表单内容 -->
-      <uni-forms-item name="receiver" class="form-item">
+      <uni-forms-item name="receiveUserName" class="form-item">
         <text class="label">收货人</text>
-        <input class="input" placeholder="请填写收货人姓名" v-model="form.receiver" />
+        <input class="input" placeholder="请填写收货人姓名" v-model="form.receiveUserName" />
       </uni-forms-item>
-      <uni-forms-item name="contact" class="form-item">
+      <uni-forms-item name="receiveMobilePhone" class="form-item">
         <text class="label">手机号码</text>
         <input
           class="input"
           placeholder="请填写收货人手机号码"
           :maxlength="11"
-          v-model="form.contact"
+          v-model="form.receiveMobilePhone"
         />
       </uni-forms-item>
       <uni-forms-item name="countyCode" class="form-item">
@@ -188,7 +188,7 @@ const onCityChange: UniHelper.UniDataPickerOnChange = (ev) => {
       </uni-forms-item>
       <uni-forms-item name="address" class="form-item" @tap="handlePointer">
         <text class="label">详细地址</text>
-        <view class="input">{{ form.address || '街道、楼牌号等信息' }} </view>
+        <view class="input">{{ form.receiveStreet || '街道、楼牌号等信息' }} </view>
         <!-- <input class="input" placeholder="街道、楼牌号等信息" v-model="form.address" /> -->
       </uni-forms-item>
       <view class="form-item">

src/services/address.ts

@@ -1,3 +1,11 @@
+/*
+ * @Author: 王文杰 
+ * @Date: 2024-01-04 12:54:56
+ * @LastEditors: 王文杰 
+ * @LastEditTime: 2024-03-14 17:55:56
+ * @FilePath: /app-nx-personal/src/services/address.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import type { AddressItem, AddressParams } from '@/types/address'
 import { http } from '@/utils/http'
 
@@ -5,10 +13,10 @@ import { http } from '@/utils/http'
  * 添加收货地址
  * @param data 请求参数
  */
-export const postMemberAddressAPI = (data: AddressParams) => {
+export const postMemberAddressAPI = (data: any) => {
   return http({
     method: 'POST',
-    url: '/member/address',
+    url: '/client-address/add',
     data,
   })
 }
@@ -16,10 +24,11 @@ export const postMemberAddressAPI = (data: AddressParams) => {
 /**
  * 获取收货地址列表
  */
-export const getMemberAddressAPI = () => {
+export const getMemberAddressAPI = (data: any) => {
   return http<AddressItem[]>({
     method: 'GET',
-    url: '/member/address',
+    url: '/client-address/list',
+    data,
   })
 }
 
@@ -42,7 +51,7 @@ export const getMemberAddressByIdAPI = (id: string) => {
 export const putMemberAddressByIdAPI = (id: string, data: AddressParams) => {
   return http({
     method: 'PUT',
-    url: `/member/address/${id}`,
+    url: `/client-address/address/${id}`,
     data,
   })
 }
@@ -54,6 +63,6 @@ export const putMemberAddressByIdAPI = (id: string, data: AddressParams) => {
 export const deleteMemberAddressByIdAPI = (id: string) => {
   return http({
     method: 'DELETE',
-    url: `/member/address/${id}`,
+    url: `/client-address/remove/${id}`,
   })
 }