From 9f6e75012cbdf109936157d41ce8ce51e9f62014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E6=9D=B0?= <>
Date: Sun, 17 Mar 2024 11:55:18 +0800
Subject: [PATCH] no message

---
 .../index/components/NeighborhoodSite.vue     | 10 +++-
 src/pages/my/my.vue                           |  4 +-
 src/pages/orderDetail/orderDetail.vue         |  8 +--
 src/pages/serviceSite/components/SiteItem.vue |  2 +-
 src/pages/siteDetail/siteDetail.vue           | 49 +++++++++++++------
 src/pagesMember/address-form/address-form.vue | 13 +++--
 src/pagesMember/settings/settings.vue         |  4 +-
 src/services/constants.ts                     |  9 ++--
 src/utils/http.ts                             |  4 +-
 9 files changed, 70 insertions(+), 33 deletions(-)

diff --git a/src/pages/index/components/NeighborhoodSite.vue b/src/pages/index/components/NeighborhoodSite.vue
index dab7c0c..ea35f30 100644
--- a/src/pages/index/components/NeighborhoodSite.vue
+++ b/src/pages/index/components/NeighborhoodSite.vue
@@ -1,3 +1,11 @@
+<!--
+ * @Author: 王文杰
+ * @Date: 2024-03-15 21:26:32
+ * @LastEditors: 王文杰
+ * @LastEditTime: 2024-03-17 11:07:54
+ * @FilePath: /app-nx-personal/src/pages/index/components/NeighborhoodSite.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <script setup lang="ts">
 defineProps<{
   list: []
@@ -21,7 +29,7 @@ const handleToto = (id) => {
           <view class="loction">{{ item.address }}</view>
         </view>
         <view class="right">
-          <view class="num">{{ item.distance }}米</view>
+          <view class="num">{{ item.distance }}千米</view>
         </view>
       </view>
       <view class="md-tag" v-if="item.categoryStr"
diff --git a/src/pages/my/my.vue b/src/pages/my/my.vue
index 39c6c44..3f282aa 100644
--- a/src/pages/my/my.vue
+++ b/src/pages/my/my.vue
@@ -171,10 +171,10 @@ const getMemberProfileData = async () => {
         <uni-icons type="phone" color="#3775F6" size="20"></uni-icons>
         <view class="label"> 联系我们 </view>
       </button>
-      <!-- <navigator class="loation item arrow" url="/pagesMember/address/address" hover-class="none">
+      <navigator class="loation item arrow" url="/pagesMember/address/address" hover-class="none">
          <uni-icons type="location" color="#3775F6" size="20"></uni-icons>
         <view class="label"> 地址 </view>
-      </navigator> -->
+      </navigator>
       <navigator
         class="settings item arrow"
         url="/pagesMember/settings/settings"
diff --git a/src/pages/orderDetail/orderDetail.vue b/src/pages/orderDetail/orderDetail.vue
index f944de2..f66acff 100644
--- a/src/pages/orderDetail/orderDetail.vue
+++ b/src/pages/orderDetail/orderDetail.vue
@@ -86,12 +86,12 @@ const handleCancleOrder = () => {
         <view class="module info">
           <view class="title">取件信息</view>
           <view class="item">
-            <view class="label">取件时间</view>
+            <view class="label">取件时间：</view>
             <view class="val">{{ order.appointmentTime }}</view>
           </view>
           <view class="item">
-            <view class="label">取件地址</view>
-            <view class="val">{{ order.recycleAddress }}</view>
+            <view class="label">取件地址：</view>
+            <view class="val">{{ order.addressInfo?.receiveStreet }} {{ order.addressInfo?.receiveHouseNumber }} </view>
           </view>
           <view class="item">
             <view class="label">下单时间</view>
@@ -202,7 +202,7 @@ page {
           .label {
             font-size: 28rpx;
             color: #3D3D3D;
-            width: 120rpx;
+            width: 160rpx;
           }
           .val {
             font-size: 28rpx;
diff --git a/src/pages/serviceSite/components/SiteItem.vue b/src/pages/serviceSite/components/SiteItem.vue
index fe8ee3d..2045556 100644
--- a/src/pages/serviceSite/components/SiteItem.vue
+++ b/src/pages/serviceSite/components/SiteItem.vue
@@ -22,7 +22,7 @@ const handleToto = () => {
         <view class="loction">{{ siteVal.address }}</view>
       </view>
       <view class="right">
-        <view class="num">{{ siteVal.distance }}米</view>
+        <view class="num">{{ siteVal.distance }}千米</view>
       </view>
     </view>
     <view class="md-tag" v-if="siteVal.categoryStr"
diff --git a/src/pages/siteDetail/siteDetail.vue b/src/pages/siteDetail/siteDetail.vue
index 09507c2..dd986b8 100644
--- a/src/pages/siteDetail/siteDetail.vue
+++ b/src/pages/siteDetail/siteDetail.vue
@@ -40,6 +40,8 @@ const bannerList = [
     type: '1',
   },
 ]
+// 地图经纬度
+const location = uni.getStorageSync('location')
 
 const siteInfo = ref({})
 const rateValue = ref(5)
@@ -51,6 +53,7 @@ const getDataList = async (stationId) => {
   // 发送请求
   const queryParams = {
     stationId,
+    ...location,
   }
   const res = await getSiteDetailAPI(queryParams)
   const obj = res.data
@@ -58,17 +61,17 @@ const getDataList = async (stationId) => {
   const arr = obj.stationImg && JSON.parse(obj.stationImg)
   const imgUrl = fileDomain + arr[0].url
   obj.imgUrl = imgUrl
-  const categoryArr = obj.stationProducts?.map((q) => q.name) || []
-  obj.categoryStr = categoryArr.join('.')
+  // const categoryArr = obj.stationProducts?.map((q) => q.name) || []
+  // obj.categoryStr = categoryArr.join('.')
 
-  if (obj.orderDetails) {
-    obj.orderDetails.forEach((q) => {
-      const arr = JSON.parse(q.product.photo)
+  if (obj.stationProducts) {
+    obj.stationProducts.forEach((q) => {
+      const arr = JSON.parse(q.photo)
       const imgUrl = fileDomain + arr[0].url
       q.imgUrl = imgUrl
     })
   } else {
-    obj.orderDetails = []
+    obj.stationProducts = []
   }
   siteInfo.value = obj
   // 发送请求后，重置标记
@@ -87,7 +90,7 @@ onLoad((options) => {
         <view class="info">
           <view class="hd">
             <view class="name">{{ siteInfo?.stationName }}</view>
-            <view class="num">{{ siteInfo.distance || 0.0 }}米</view>
+            <view class="num">{{ siteInfo.distance || 0.0 }}千米</view>
           </view>
           <view class="md">
             <view class="label">营业时间：</view>
@@ -99,10 +102,11 @@ onLoad((options) => {
           </view>
         </view>
         <view class="module-menu">
-          <view class="order-details" v-if="siteInfo.orderDetails">
-            <view class="detail-item" v-for="item2 in siteInfo.orderDetails" :key="item2.id">
+          <view class="module-title">回收品类：</view>
+          <view class="order-details" v-if="siteInfo.stationProducts">
+            <view class="detail-item" v-for="item2 in siteInfo.stationProducts" :key="item2.id">
               <image class="img-url" :src="item2.imgUrl"></image>
-              <view class="product-name">{{ item2.product?.name }}</view>
+              <view class="product-name">{{ item2.name }}</view>
             </view>
           </view>
           <!-- <view
@@ -118,9 +122,9 @@ onLoad((options) => {
           <view class="item arrow flex-row">
             <view class="service-title">服务</view>
             <view class="tag-list">
-              <view class="tag">上门服务</view>
-              <view class="tag">家电维修</view>
-              <view class="tag">品控质检</view>
+              <view class="tag">再生资源回收</view>
+              <!-- <view class="tag">家电维修</view>
+              <view class="tag">品控质检</view> -->
             </view>
           </view>
           <view class="item flex-column rate">
@@ -190,7 +194,7 @@ onLoad((options) => {
     }
     .module-menu {
       display: flex;
-      padding: 36rpx 0rpx;
+      padding: 36rpx 20rpx;
       box-shadow: 0px 0px 8px 0px rgba(161, 161, 177, 0.12);
       .item {
         flex: 1;
@@ -202,6 +206,23 @@ onLoad((options) => {
           background: #fff7e8;
         }
       }
+      .order-details {
+        margin-left: 20rpx;
+        margin-top: 20rpx;
+        .detail-item {
+          margin: 20rpx 0;
+          display: flex;
+          align-items: center;
+          .img-url {
+            width: 40rpx;
+            height: 40rpx;
+            margin-right: 20rpx;
+          }
+          .product-name {
+            //
+          }
+        }
+      }
     }
     .detail-list {
       padding: 0 20rpx;
diff --git a/src/pagesMember/address-form/address-form.vue b/src/pagesMember/address-form/address-form.vue
index 3f97b62..03da86b 100644
--- a/src/pagesMember/address-form/address-form.vue
+++ b/src/pagesMember/address-form/address-form.vue
@@ -4,8 +4,11 @@ import {
   postMemberAddressAPI,
   postMemberAddressUpdateAPI,
 } from '@/services/address'
-import { onLoad } from '@dcloudio/uni-app'
+import { onLoad, onReady } from '@dcloudio/uni-app'
 import { ref, reactive } from 'vue'
+import { useMemberStore } from '@/stores'
+
+const memberStore = useMemberStore()
 
 // 表单数据
 const form = ref({
@@ -37,8 +40,13 @@ const getMemberAddressByIdData = async () => {
 
     // 动态设置标题
     uni.setNavigationBarTitle({ title: isEdit.value ? '修改地址' : '新建地址' })
+  } else {
+    const receiveMobilePhone = memberStore.profile?.phone || ''
+    form.value.receiveMobilePhone = receiveMobilePhone
   }
 }
+onReady(() => {
+})
 // 页面加载
 onLoad(() => {
   getMemberAddressByIdData()
@@ -287,5 +295,4 @@ page {
   font-size: 30rpx;
   background-color: #3775F6;
 }
-</style>import type { debug } from 'console';
-
+</style>
diff --git a/src/pagesMember/settings/settings.vue b/src/pagesMember/settings/settings.vue
index aac8ef3..5f19f16 100644
--- a/src/pagesMember/settings/settings.vue
+++ b/src/pagesMember/settings/settings.vue
@@ -31,11 +31,11 @@ const onLogout = () => {
 <template>
   <view class="viewport">
      <!-- 列表1 -->
-    <view class="list" v-if="isLogin">
+    <!-- <view class="list" v-if="isLogin">
       <navigator url="/pagesMember/address/address" hover-class="none" class="item arrow">
         我的地址
       </navigator>
-    </view>
+    </view> -->
     <view class="list">
       <button hover-class="none" class="item arrow" open-type="openSetting">授权管理</button>
       <button hover-class="none" class="item arrow" open-type="feedback">问题反馈</button>
diff --git a/src/services/constants.ts b/src/services/constants.ts
index 9ea9ce5..a9ae361 100644
--- a/src/services/constants.ts
+++ b/src/services/constants.ts
@@ -1,8 +1,8 @@
 /*
- * @Author: 王文杰 
+ * @Author: 王文杰
  * @Date: 2024-01-04 12:54:56
- * @LastEditors: 王文杰 
- * @LastEditTime: 2024-03-15 18:09:02
+ * @LastEditors: 王文杰
+ * @LastEditTime: 2024-03-17 11:18:03
  * @FilePath: /app-nx-personal/src/services/constants.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -97,7 +97,8 @@ export const weightMenuList = [
   },
 ]
 // 文件路径
-export const fileDomain = 'https://nxhs.cjyx.cc'
+// export const fileDomain = 'https://nxhs.cjyx.cc'
+export const fileDomain = 'http://222.71.165.188:8808'
 
 export const storage_userInfo = {
   userType: {
diff --git a/src/utils/http.ts b/src/utils/http.ts
index 8ced4d7..02045da 100644
--- a/src/utils/http.ts
+++ b/src/utils/http.ts
@@ -11,8 +11,8 @@
  *   4. 添加 token 请求头标识
  */
 import { useMemberStore } from '@/stores'
-// const baseURL = 'http://192.168.0.166:8808/api'
-const baseURL = 'https://nxhs.cjyx.cc/api'
+const baseURL = 'http://222.71.165.188:8808/api'
+// const baseURL = 'https://nxhs.cjyx.cc/api'
 // 添加拦截器
 const httpInterceptor = {
   // 拦截前触发