From 44aa2ed215a9aeef63c07465e1d55ff603f101d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E6=9D=B0?= <>
Date: Wed, 13 Mar 2024 15:26:02 +0800
Subject: [PATCH] no message

---
 src/App.vue                                  |   4 +-
 src/pages/my/my.vue                          |  14 ++---
 src/pages/orderList/components/OrderItem.vue |  63 ++++++++++++++-----
 src/pages/orderList/orderList.vue            |   4 +-
 src/pagesMember/profile/profile.vue          |  54 +++++-----------
 src/services/constants.ts                    |   4 +-
 src/static/images/locate.png                 | Bin 3939 -> 0 bytes
 src/static/images/loction.png                | Bin 1368 -> 0 bytes
 src/static/images/loction_home.png           | Bin 2346 -> 0 bytes
 src/static/images/order_bg.png               | Bin 13522 -> 0 bytes
 src/static/images/order_my.png               | Bin 2696 -> 0 bytes
 src/stores/modules/member.ts                 |   4 +-
 src/utils/http.ts                            |   4 +-
 13 files changed, 80 insertions(+), 71 deletions(-)
 delete mode 100644 src/static/images/locate.png
 delete mode 100644 src/static/images/loction.png
 delete mode 100644 src/static/images/loction_home.png
 delete mode 100644 src/static/images/order_bg.png
 delete mode 100644 src/static/images/order_my.png

diff --git a/src/App.vue b/src/App.vue
index 1f923da..d5a5b5e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: 王文杰
  * @Date: 2024-01-04 12:54:56
- * @LastEditors: 王文杰
- * @LastEditTime: 2024-03-13 13:47:12
+ * @LastEditors: 王文杰 
+ * @LastEditTime: 2024-03-13 15:19:50
  * @FilePath: /app-nx-recycle/src/App.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
diff --git a/src/pages/my/my.vue b/src/pages/my/my.vue
index c6ca102..e526704 100644
--- a/src/pages/my/my.vue
+++ b/src/pages/my/my.vue
@@ -30,7 +30,7 @@ const getMemberProfileData = async () => {
   const res = await getMemberProfileAPI()
   if (res.code == 200) {
     const obj = res.data
-    const avatar = domain + JSON.parse(obj.headIcon).url
+    const avatar = domain + JSON.parse(obj.headIcon)[0].url
     info.value = {
       orderTotal: obj.orderTotal,
       recycleMiles: obj.recycleMiles,
@@ -48,12 +48,12 @@ const getMemberProfileData = async () => {
 const handleOrderList = () => {
   uni.navigateTo({ url: '/pages/orderList/orderList' })
 }
-const handleOrderAuto = () => {
-  uni.navigateTo({ url: '/pages/orderAuto/orderAuto' })
-}
-const handleNewsList = () => {
-  uni.navigateTo({ url: '/pages/newsList/newsList' })
-}
+// const handleOrderAuto = () => {
+//   uni.navigateTo({ url: '/pages/orderAuto/orderAuto' })
+// }
+// const handleNewsList = () => {
+//   uni.navigateTo({ url: '/pages/newsList/newsList' })
+// }
 </script>
 <template>
   <view class="viewport">
diff --git a/src/pages/orderList/components/OrderItem.vue b/src/pages/orderList/components/OrderItem.vue
index e97c4a1..dff6efb 100644
--- a/src/pages/orderList/components/OrderItem.vue
+++ b/src/pages/orderList/components/OrderItem.vue
@@ -6,13 +6,9 @@ import { useMemberStore } from '@/stores'
 
 // 获取屏幕边界到安全区域距离
 const { safeAreaInsets } = uni.getSystemInfoSync()
-const memberStore = useMemberStore()
-const staffId = memberStore.profile?.id
 const location = uni.getStorageSync('location')
 // 请求参数
 const queryParams = {
-  id: staffId,
-  // stationId: '521612939661154757',
   pageNo: 1,
   pageSize: 10,
   location: location,
@@ -36,7 +32,12 @@ const getMemberOrderData = async () => {
   isLoading.value = true
   // 发送请求
   const res = await getListOrderAPI(queryParams)
-  // debugger
+  res.data.list.forEach((e) => {
+    const str = e.appointmentTimeStart.slice(0, 10)
+    const start = e.appointmentTimeStart.slice(11, 16)
+    const end = e.appointmentTimeEnd.slice(11, 16)
+    e.appointmentTime = str + ' ' + start + '-' + end
+  })
   // 发送请求后，重置标记
   isLoading.value = false
   // 数组追加
@@ -87,23 +88,33 @@ const onRefresherrefresh = async () => {
     <view class="card" v-for="item in orderList" :key="item.id">
       <!-- 订单信息 -->
       <view class="hd">
-        <text class="locationNum">订单编号：HG201604052233</text>
+        <text class="locationNum">订单编号：{{ item.orderNumber }}</text>
       </view>
       <navigator class="goods" :url="`/pagesOrder/detail/detail?id=${item.id}`" hover-class="none">
         <view class="meta">
-          <view class="location ellipsis">
-            <image src="/static/images/loction.png" mode="aspectFit" class="icon" />
-            {{ item.loction }}</view
-          >
-          <view class="people ellipsis">
-            <image src="/static/images/iphone.png" mode="aspectFit" class="icon" />
-            {{ item.people }}</view
-          >
+          <view class="meta-item">
+            <view class="icon">
+              <uni-icons type="location" color="#3775F6" size="20"></uni-icons>
+            </view>
+            <view class="text ellipsis">{{ item.recycleAddress }}</view>
+          </view>
+          <view class="meta-item">
+            <view class="icon">
+              <uni-icons type="calendar" color="#3775F6" size="20"></uni-icons>
+            </view>
+            <view class="text ellipsis">{{ item.appointmentTime }}</view>
+          </view>
+          <view class="meta-item">
+            <view class="icon">
+              <uni-icons type="phone" color="#3775F6" size="20"></uni-icons>
+            </view>
+            <view class="text phone">{{ item.clientName }} <text class="iphone">{{ item.clientMobile }}</text></view>
+          </view>
         </view>
       </navigator>
       <!-- 订单操作按钮 -->
       <view class="action">
-        <text class="label">订单完成时间：2024-01-16 13:25:22</text>
+        <text class="label">订单完成时间：{{ item.completeTime }}</text>
       </view>
       <image src="/static/images/order_completed.png" mode="aspectFit" class="img"></image>
     </view>
@@ -167,6 +178,24 @@ const onRefresherrefresh = async () => {
             margin-right: 6rpx;
           }
         }
+        .meta-item {
+          display: flex;
+          margin: 10rpx 0;
+          align-items: center;
+          .icon {
+            width: 40rpx;
+            height: 40rpx;
+            margin-right: 20rpx;
+          }
+          .text {
+            font-size: 28rpx;
+            color: #3D3D3D;
+          }
+          .iphone {
+            color: #3775f6;
+            margin-left: 10rpx;
+          }
+        }
       }
     }
     .action {
@@ -174,11 +203,11 @@ const onRefresherrefresh = async () => {
       justify-content: space-between;
       align-items: center;
       padding: 20rpx 0;
+      font-size: 28rpx;
       .label {
         flex: 1;
         align-items: center;
-        color: #999a9f;
-        font-size: 32rpx;
+        color: #3d3d3d;
       }
     }
     .img {
diff --git a/src/pages/orderList/orderList.vue b/src/pages/orderList/orderList.vue
index c14a97e..ee53441 100644
--- a/src/pages/orderList/orderList.vue
+++ b/src/pages/orderList/orderList.vue
@@ -2,7 +2,7 @@
  * @Author: 王文杰
  * @Date: 2024-01-08 09:15:12
  * @LastEditors: 王文杰
- * @LastEditTime: 2024-03-07 17:39:16
+ * @LastEditTime: 2024-03-13 14:47:48
  * @FilePath: /app-nx-recycle/src/pages/orerdList/orerdList.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -12,7 +12,6 @@ import OrderItem from './components/OrderItem.vue'
 
 // 获取屏幕边界到安全区域距离
 const { safeAreaInsets } = uni.getSystemInfoSync()
-
 </script>
 
 <template>
@@ -40,6 +39,7 @@ page {
 // swiper
 .cont {
   background-color: #f7f7f8;
+  height: 100%;
   // margin-top: 128rpx;
 }
 </style>
diff --git a/src/pagesMember/profile/profile.vue b/src/pagesMember/profile/profile.vue
index b8e090b..7feb47d 100644
--- a/src/pagesMember/profile/profile.vue
+++ b/src/pagesMember/profile/profile.vue
@@ -8,7 +8,7 @@ import { computed, ref } from 'vue'
 // 获取屏幕边界到安全区域距离
 const { safeAreaInsets } = uni.getSystemInfoSync()
 const isDev = import.meta.env.DEV
-
+const memberStore = useMemberStore()
 const domain = isDev ? 'http://192.168.0.166:8808' : 'http://222.71.165.188:8808'
 
 // 获取个人信息，修改个人信息需提供初始值
@@ -17,24 +17,20 @@ const headIcon = ref()
 const getMemberProfileData = async () => {
   const res = await getMemberProfileAPI()
   const obj = res.data
-  const avatar = domain + JSON.parse(obj.headIcon).url
+  const avatar = domain + JSON.parse(obj.headIcon)[0].url
   profile.value = {
     avatar,
     gender: obj.gender + '',
     mobilePhone: obj.mobilePhone,
-    nickName: obj.nickName,
-    birthday: obj.birthday?.slice(0, 10),
+    staffsName: obj.staffsName || '',
   }
+  // 头像
+  headIcon.value = obj.headIcon
   // 同步 Store 的头像和昵称，用于我的页面展示
   memberStore.profile!.avatar = avatar
-  memberStore.profile!.nickName = obj.nickName
+  memberStore.profile!.staffsName = obj.staffsName
 }
 
-onLoad(() => {
-  getMemberProfileData()
-})
-
-const memberStore = useMemberStore()
 // 修改头像
 const onAvatarChange = () => {
   uni.chooseMedia({
@@ -59,7 +55,8 @@ const uploadFile = (file: string) => {
     filePath: file,
     success: (res) => {
       if (res.statusCode === 200) {
-        headIcon.value = JSON.stringify(JSON.parse(res.data).data)
+        const target = [JSON.parse(res.data).data]
+        headIcon.value = JSON.stringify(target)
         const avatar = JSON.parse(res.data).data.url
         // 个人信息页数据更新
         const imgUrl = domain + avatar
@@ -79,28 +76,26 @@ const onGenderChange: UniHelper.RadioGroupOnChange = (ev) => {
   profile.value.gender = ev.detail.value as Gender
 }
 
-// 修改生日
-const onBirthdayChange: UniHelper.DatePickerOnChange = (ev) => {
-  profile.value.birthday = ev.detail.value
-}
-
 // 点击保存提交表单
 const onSubmit = async () => {
-  const { nickName, gender, birthday } = profile.value
+  const { staffsName, gender } = profile.value
   const params = {
     headIcon: headIcon.value,
-    nickName,
+    staffsName,
     gender,
-    birthday: birthday + ' ' + '00:00:01',
   }
   const res = await postMemberProfileAPI(params)
   // 更新Store昵称
-  memberStore.profile!.nickName = nickName
+  memberStore.profile!.staffsName = staffsName
   uni.showToast({ icon: 'success', title: '保存成功' })
   setTimeout(() => {
     uni.navigateBack()
   }, 400)
 }
+
+onLoad(() => {
+  getMemberProfileData()
+})
 </script>
 
 <template>
@@ -127,7 +122,7 @@ const onSubmit = async () => {
         </view>
         <view class="form-item">
           <text class="label">昵称</text>
-          <input class="input" type="text" placeholder="请填写昵称" v-model="profile.nickName" />
+          <input class="input" type="text" placeholder="请填写昵称" v-model="profile.staffsName" />
         </view>
         <view class="form-item">
           <text class="label">性别</text>
@@ -142,20 +137,6 @@ const onSubmit = async () => {
             </label>
           </radio-group>
         </view>
-        <view class="form-item">
-          <text class="label">生日</text>
-          <picker
-            @change="onBirthdayChange"
-            mode="date"
-            class="picker"
-            :value="profile?.birthday"
-            start="1900-01-01"
-            :end="formatDate(new Date())"
-          >
-            <view v-if="profile?.birthday">{{ profile?.birthday }}</view>
-            <view class="placeholder" v-else>请选择日期</view>
-          </picker>
-        </view>
       </view>
       <!-- 提交按钮 -->
       <button @tap="onSubmit" class="form-button">保 存</button>
@@ -292,5 +273,4 @@ page {
     background: linear-gradient(158deg, #51B6FF -10%, #3775F6 129%);
   }
 }
-</style>import type { parse } from 'path'
-
+</style>
diff --git a/src/services/constants.ts b/src/services/constants.ts
index 1886661..61e8cb8 100644
--- a/src/services/constants.ts
+++ b/src/services/constants.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: 王文杰
  * @Date: 2024-01-04 12:54:56
- * @LastEditors: 王文杰 
+ * @LastEditors: 王文杰
  * @LastEditTime: 2024-03-11 13:37:39
  * @FilePath: /app-nx-recycle/src/services/constants.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
@@ -31,5 +31,5 @@ export const orderStateList = [
   { id: 5, text: '已完成' },
   { id: 6, text: '已取消' },
 ]
-export const storage_token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ1c2VyIjp7InVzZXJUeXBlIjoiUkVDWUNMRVIiLCJpZCI6IjUzMzI0Mjk5NTY0Njk1MTY4NSIsInVzZXJuYW1lIjoiMTM2MDE5MjE3NDUiLCJwaG9uZSI6IjEzNjAxOTIxNzQ1Iiwib3BlbmlkIjoib2dZMm82X01waThuemsyWlFPQllsa1lhZWVNRSIsInRpbWVFeHBpcmUiOjI1OTIwMDAwMDB9LCJleHAiOjE3MTI3MjczOTd9.ZzqEbPayoiv4L36R6vYwQVWZcxoeSoM2g_-S1kyQoj32R6a2wFvBSqAOLafk-xbZ3RgUqgmgcB_QH5shOgQXUXamt-GEW8XP75j5314YpPgR3uFSQhKcOLFwPWbMK2jPHs72rjHlIpydLV0YSrRVKtws8a_bmkRMULx7naSFvdXa-nhF0SPYpjgSGHRHACjs3Mx1_ycewF8p0vw0iNpn5Dk0s-msM373_QUw7LAAPEKFHNTswFk6Rb0K0hmK6Axs0GLCv1Dl_F52NsNSRRU2UUBdBcnwOn__7oCfPj-lQDh7ob97b3koVEzmN-KZGuTfl76gc__B7EndghSzb9cnrw'
+export const storage_token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ1c2VyIjp7InVzZXJUeXBlIjoiUkVDWUNMRVIiLCJpZCI6IjUzMzI0Mjk5NTY0Njk1MTY4NSIsInN0YXRpb25JZCI6IjUyMTYxMjkzOTY2MTE1NDc1NyIsInVzZXJuYW1lIjoiMTM2MDE5MjE3NDUiLCJwaG9uZSI6IjEzNjAxOTIxNzQ1Iiwib3BlbmlkIjoib2dZMm82X01waThuemsyWlFPQllsa1lhZWVNRSIsInRpbWVFeHBpcmUiOjI1OTIwMDAwMDB9LCJleHAiOjE3MTI5MDQyNjh9.gcGTxIfpJrptg6yCJykT2EGHw8UzOUK2wu-iBOiIYn2U9IU7wFTrEm_nfBKz7pPx_mTORs7rklRIa7qwt3JU05aacJE0KL1pDLMD41fe9BmtpFLLO2aoQDr0r1sYaQyz8RQGTL2VmxsQaGk_dwIQIShrLIVF2RdcgHLVzibS_SLQNNhf7GeelQFmS7pAYG9odCd4fH_LCLSQoe99_Ik6LX9clvLNlYyvDhSQNEpqpaYI5aWuCylQSItST7jZQi3wimO2Nd1mhhJR1lDWgiTtdBzcMY6TYvjF5chkTwL5vUBF-0O2JUs6QZk6LnTAnh3dI-9lf-HU4lZihS-Ab5IKFw'
 
diff --git a/src/static/images/locate.png b/src/static/images/locate.png
deleted file mode 100644
index 03c67b1fa90d10020a51fa00326431d36dfbd134..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3939
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

diff --git a/src/static/images/loction.png b/src/static/images/loction.png
deleted file mode 100644
index 944a0609cdbc8f18913507e8e8d2a192006df1f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1368
zcmV-e1*iInP)<h;3K|Lk000e1NJLTq0027x002e^1^@s6a+&O`00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZu0!c(cRCt`#o6&LGMi7R-#bhQ<CNrTc2vb3*3QRtl
zelV{B(H+<oNUFec1(GW`dNL9p$y5-g0>Kpod5NuuaPxqpOiCaLU=N`5zepV5?)Jyt
z?E(Am2@S#fs~*q;$^QyJ10A57-=P^umjA1Nfuu`F6J+At%d`obBxYycPy3)_gcsbA
zs)Y>YBRTPT6yu0M*86D}mSaSYu@T&c4Al?t<GFK#%+gV9vN=gTML4z?PyuGrwa9vZ
zHAduwW<0qM8OoV+!}F>QE0Ohn+C{hk?N=QrK4gyarb;j?P1gHqAJGdA<IQczP;q60
zSW@OD@2}q?I^%H>1?V6;^Zxp6nVa{L_5SJ<;l16i1|hun{_1r9Z99;A^pO)?hw7Pg
zuTHmJ-b&W{={T&>rv=41H=Gn*DkPgnUHy~%_3o)5L*=L_N<Ub$-p@KA7(GRz5Q0|G
zg@OR}?^_;U)UAqcQNY@m#$o#2v}RJ%Q2BLzI)AruQD`zC%|TLxR3R1UqI5yKK);zG
z^%NMde%*OCydf3NbpujV&mfuadad)`cQkqST2#lxCcfs~Z)7LaS;TkVH0*hoRU3ML
zJqmk!H;N_7N9TrP2xRjJ{N;u?5qOSDr5E)3@ZNWj?>(`+9K0LW?3XbyhzjTK_3)jw
z8|PdG4E*Hk0%UBqi)A0U%(otq*Y*x&9)svQ-00OCU}5hme_)CCvyOeOYKHR0Zd6g%
z;(*lDhw#GtSto(7y$A-KHI)%`?q!JRR($OxVLn^1sFNb8f)LeHTQAFg0@5{gp?tI%
zQ4)6V_7a5OEIlOLUK))kJJQ_LT;!Jo+m^Ek+eG6CF~Jg<J2tYapACc87>|Dpt&L<?
zT1|UM4Q)F~E-=+b+hh&nX_nZ$quu&#Yr!-N6HHG_+D_ecEsYb?qBm|^t&XRBP7wY!
z4ByE$+2#?(vCO12St@_n%+Rr|ed%#VmexyHBne{sgc6Q(t+qJ?_0XgPC;Yca;8}$4
zMLo6mu>+#-F((&(S|mZmj^N#LN?KKTKOF<6DGV%}8)SK=!n|$);UxBS_Wr6DylR8$
zC%97tq)-T|h@h3miOxAu@kB`iF6Xe3O1-`zUi$K#<%2%5RGPWb@HuQ~Ju;8fc`go5
zrj@<y{q@LCu5Y4h!XkGMeO(b~O6N&YK82-{uIH-48t;ORLZO&FA9f%5!}C=s(WbC9
znO?N?l917kBszDa;b8S+Q?hI;pVXH2tFn=|dZ4^V4OEB4hF76Tj8<tT+1)noc@+xC
z<^@!8*@it0VqR1TR$K?AM99D&4B58XSx7dX<Zu8eTcw!YMPE-YSjpUtUJkZh-CfS7
zGB9QzTf}}PaVOb)IzNnRj}pqeeM;iqLQUs}=Ln6ebY=+WW$HJ|*Bd|H^}BGR;Zd0z
zOVt|#Vf|V)(&$KoGG7Wc%H|(Sk+o)MQdp3=4dp${-TvziAE7lv8B{H8sC)XOhcG*U
z{J}S(uPP@A4d;3eLAX9qFrL_Im#~c}#5$hVe9%f!sk}z-Bg(<Uh6zU@3KgUAHsn$I
z_6UfPe_qD~y{)vp>_XHdrLZ~&Bq!#M_8eQOgXm-dy#KwAB)(?gN<)%8_AF_JEZnW*
z3#!!&n`@PKp)s;6gmZi+d%fJiw7rkU$--VQFTzR5v}rq9A-h5ltd7ZLjs>b8>YO8}
ai~j+gvlv0MIdx?K0000<MNUMnLSTXbs*nW$

diff --git a/src/static/images/loction_home.png b/src/static/images/loction_home.png
deleted file mode 100644
index c8c8b0fb771a3a23a26557500358cac70d398245..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2346
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
Qh5!Hn07*qoM6N<$g2Fz1KmY&$

diff --git a/src/static/images/order_bg.png b/src/static/images/order_bg.png
deleted file mode 100644
index cc8ee573d7cd5bf54be90730e69b8dce7d73a04d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13522
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
We*41d4CQ|v>1Y~i+&_6S<o^JcDBXkr

diff --git a/src/static/images/order_my.png b/src/static/images/order_my.png
deleted file mode 100644
index 4277f48bfdcb4995ed9836dde868ebf060a43a78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2696
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
C?fl{Z

diff --git a/src/stores/modules/member.ts b/src/stores/modules/member.ts
index a606d6d..f84fddc 100644
--- a/src/stores/modules/member.ts
+++ b/src/stores/modules/member.ts
@@ -2,7 +2,7 @@
  * @Author: 王文杰
  * @Date: 2024-01-04 12:54:56
  * @LastEditors: 王文杰
- * @LastEditTime: 2024-02-22 10:12:46
+ * @LastEditTime: 2024-03-13 14:35:47
  * @FilePath: /app-nx-recycle/src/stores/modules/member.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -17,11 +17,13 @@ export const useMemberStore = defineStore('member', () => {
   // 保存会员信息，登录时使用
   const setProfile = (val: LoginResult) => {
     profile.value = val
+    uni.setStorageSync('storage_token', val.token)
   }
 
   // 清理会员信息，退出时使用
   const clearProfile = () => {
     profile.value = undefined
+    uni.setStorageSync('storage_token', '')
   }
 
   // 记得 return
diff --git a/src/utils/http.ts b/src/utils/http.ts
index 53a10a5..41a47e4 100644
--- a/src/utils/http.ts
+++ b/src/utils/http.ts
@@ -2,7 +2,7 @@
  * @Author: 王文杰
  * @Date: 2024-01-04 12:54:56
  * @LastEditors: 王文杰
- * @LastEditTime: 2024-03-13 10:11:48
+ * @LastEditTime: 2024-03-13 14:24:26
  * @FilePath: /app-nx-recycle/src/utils/http.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -17,9 +17,7 @@
  *   3. 添加小程序端请求头标识
  *   4. 添加 token 请求头标识
  */
-
 import { useMemberStore } from '@/stores'
-
 // const baseURL = 'http://192.168.0.166:8808/api'
 const baseURL = 'http://222.71.165.188:8808/api'
 // 添加拦截器