From 8d0d3370aff3b3bc978bc06c6c78bb48f1d8bb96 Mon Sep 17 00:00:00 2001
From: HHS <1339084443@qq.com>
Date: Fri, 13 Jun 2025 16:57:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/GetHivePupop.vue                   |   8 +-
 components/Introduction.vue                   |   2 +-
 pages.json                                    |  15 +-
 pages/adoptionRecords/adoptionRecords.vue     | 277 ++-----
 .../addFarm.vue                               |  90 +--
 .../beeFarmInfo.vue                           |   0
 pages/beeFarmerJion/beeFarmerJion.vue         |   2 +-
 pages/beeFarmerJion/jionForm.vue              | 142 ----
 pages/beeHiveData/beeHiveData.vue             |  10 +-
 pages/cashWithdrow/cashWithdrow.vue           | 365 ++++-----
 pages/commissionDetail/commissionDetail.vue   |  19 +-
 pages/customerService/customerService.vue     |   6 +-
 .../deviceManagement/addDeviceManagement.vue  |  94 +--
 pages/deviceManagement/deviceManagement.vue   |   8 +-
 pages/homePage/collectBee.vue                 | 111 +--
 pages/homePage/homePage.vue                   |  22 +-
 pages/honeySource/honeySource.vue             |  19 +-
 pages/login/login.vue                         |   2 +-
 pages/messagePage/messagePage.vue             |  12 +-
 pages/myBeeHive/myBeeHive.vue                 | 721 +++++++++---------
 pages/myPage/myPage.vue                       | 498 +++++-------
 pages/orderList/orderList.vue                 |  56 +-
 pages/shoppingMall/shopDetails.vue            |  19 +-
 .../shoppingCart.vue                          |   5 +-
 pages/shoppingMall/shoppingMall.vue           |  55 +-
 pages/shoppingMall/shoppingPay.vue            |  11 +-
 pages/smartBee/smartBee.vue                   |  56 +-
 pages/surveyList/surveyList.vue               |   3 +-
 pages/traceabilityManagement/addProduct.vue   |  62 +-
 .../traceabilityManagement.vue                |   2 -
 pages/trafficRecharge/trafficRecharge.vue     | 121 +--
 pages/userAgreement/userAgreement.vue         |   6 +-
 pages/userInfo/addressEdit.vue                |   3 +-
 pages/userInfo/addressList.vue                |   4 -
 pages/userInfo/userInfo.vue                   |   6 +-
 pages/withdraw/withdraw.vue                   | 240 +++---
 utils/request.js                              | 170 ++++-
 utils/shareUserId.js                          |  19 -
 utils/storage.js                              |   1 -
 utils/system.js                               |  31 +-
 40 files changed, 1319 insertions(+), 1974 deletions(-)
 rename pages/{beeFarmInfo => beeFarmerJion}/addFarm.vue (81%)
 rename pages/{beeFarmInfo => beeFarmerJion}/beeFarmInfo.vue (100%)
 delete mode 100644 pages/beeFarmerJion/jionForm.vue
 rename pages/{shoppingCart => shoppingMall}/shoppingCart.vue (99%)
 delete mode 100644 utils/shareUserId.js

diff --git a/components/GetHivePupop.vue b/components/GetHivePupop.vue
index eff97ff..8b49d48 100644
--- a/components/GetHivePupop.vue
+++ b/components/GetHivePupop.vue
@@ -25,22 +25,22 @@ const props = defineProps({
 
 const hives = ref([
 	{
-		image: '/static/images/hive1.png',
+		image: '/static/images/apiculture.png',
 		name: '标准蜂箱',
 		beeName: '意大利蜜蜂'
 	},
 	{
-		image: '/static/images/hive2.png',
+		image: '/static/images/apiculture.png',
 		name: '高级蜂箱',
 		beeName: '卡尼鄂拉蜂'
 	},
 	{
-		image: '/static/images/hive3.png',
+		image: '/static/images/apiculture.png',
 		name: '豪华蜂箱',
 		beeName: '高加索蜂'
 	},
 	{
-		image: '/static/images/hive4.png',
+		image: '/static/images/apiculture.png',
 		name: '定制蜂箱',
 		beeName: '中华蜜蜂'
 	}
diff --git a/components/Introduction.vue b/components/Introduction.vue
index e528117..a99f39c 100644
--- a/components/Introduction.vue
+++ b/components/Introduction.vue
@@ -1,7 +1,7 @@
 <template>
 		<view class="view_box">
 			<view :style="transitionStyle">
-				<template v-for="item in list">
+				<template v-for="(item,index) in list" :key="index">
 					<view class="notice-content">{{ item }}</view>
 				</template>
 			</view>
diff --git a/pages.json b/pages.json
index 162ac28..331687a 100644
--- a/pages.json
+++ b/pages.json
@@ -47,7 +47,7 @@
 		},
 	
 		{
-			"path": "pages/shoppingCart/shoppingCart",
+			"path": "pages/shoppingMall/shoppingCart",
 			"style": {
 				"navigationBarTitleText" : "",
 				"navigationStyle": "custom"
@@ -83,14 +83,14 @@
 			}
 		},
 		{
-			"path": "pages/beeFarmInfo/beeFarmInfo",
+			"path": "pages/beeFarmerJion/beeFarmInfo",
 			"style": {
 				"navigationBarTitleText": "",
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path": "pages/beeFarmInfo/addFarm",
+			"path": "pages/beeFarmerJion/addFarm",
 			"style": {
 				"navigationBarTitleText": "",
 				"navigationStyle": "custom"
@@ -269,14 +269,7 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path" : "pages/beeFarmerJion/jionForm",
-			"style" : 
-			{
-				"navigationBarTitleText" : "",
-				"navigationStyle": "custom"
-			}
-		},
+	
 		{
 			"path" : "pages/beeFarmerJion/jionFeedback",
 			"style" : 
diff --git a/pages/adoptionRecords/adoptionRecords.vue b/pages/adoptionRecords/adoptionRecords.vue
index 8c7e84d..4a7f390 100644
--- a/pages/adoptionRecords/adoptionRecords.vue
+++ b/pages/adoptionRecords/adoptionRecords.vue
@@ -1,231 +1,112 @@
 <template>
-    <view>
+  <view>
     <TransNavVue title="认养记录" />
-  <view class="container">
-
-    <view class="nav-tabs">
-      <view 
-        v-for="tab in tabs" 
-        :key="tab.value"
-        :class="['tab-item', {active: activeTab === tab.value}]"
-        @click="activeTab = tab.value"
-      >
-        <text>{{ tab.label }}</text>
-      </view>
-    </view>
-    
-
-    <scroll-view scroll-y class="list-container">
-      <view 
-        v-for="item in filteredList" 
-        :key="item.id" 
-        class="record-item"
-      >
-        <image class="pet-image" :src="item.image ?item.image  :'/static/images/apiculture.png'" mode="aspectFill"></image>
-        <view class="info-content">
-          <text class="pet-name">{{ item.beehiveName }}</text>
-          <text class="pet-date">{{ formatDateTime(item.createTime) }}</text>
-          <text class="pet-amount">¥{{ item.price||0 }}</text>
+    <view class="container">
+      <view class="nav-tabs">
+        <view v-for="tab in tabs" :key="tab.value" :class="['tab-item', { active: activeTab === tab.value }]"
+          @click="activeTab = tab.value">
+          <text>{{ tab.label }}</text>
         </view>
-        <text class="status" :style="{ color: getStatusColor(item.status), borderColor: getStatusColor(item.status) }" @click="payBtn(item)">
-          {{ getStatusText(item.status) }}
-        </text>
       </view>
-      <view v-if="filteredList.length === 0" class="empty-state">
-        <text class="empty-text">暂无认养记录</text>
-      </view>
-    </scroll-view>
-  </view>
+      <scroll-view scroll-y class="list-container">
+        <view v-for="item in filteredList" :key="item.id" class="record-item">
+          <image class="pet-image" :src="item.image ? item.image : '/static/images/apiculture.png'" mode="aspectFill">
+          </image>
+          <view class="info-content">
+            <text class="pet-name">{{ item.beehiveName }}</text>
+            <text class="pet-date">{{ formatDateTime(item.createTime) }}</text>
+            <text class="pet-amount">¥{{ item.adoptType == 1 ? item.price : item.sharedPrice }}</text>
+          </view>
+          <text class="status" :style="{ color: getStatusColor(item.status), borderColor: getStatusColor(item.status) }"
+            @click="payBtn(item)">
+            {{ getStatusText(item.status) }}
+          </text>
+        </view>
+        <view v-if="filteredList.length === 0" class="empty-state">
+          <text class="empty-text">暂无认养记录</text>
+        </view>
+      </scroll-view>
     </view>
+  </view>
 </template>
 
 <script setup>
-import { ref, computed , onMounted} from 'vue';
+import { ref, computed} from 'vue';
 import { request } from '@/utils/request'
-import { useTokenStorage } from '../../utils/storage'
 import TransNavVue from '../../components/TransNav.vue';
-import { getStatusBarHeight, getTitleBarHeight, getNarBarHeight } from '../../utils/system';
-const { getAccessToken, getOpenId } = useTokenStorage();
-
-const tabs = [
-  { label: '全部认养', value: '' },
-  { label: '已认养', value: 0 },
-  { label: '已完成', value: 1 },
-  { label: '已取消', value: 2 }
-];
+import { getNarBarHeight, formatDateTime } from '../../utils/system';
+import { onShow } from '@dcloudio/uni-app'
 
 const activeTab = ref('');
+const records = ref([]);
+const tabs = [{ label: '全部认养', value: '' }, { label: '已认养', value: 0 }, { label: '已完成', value: 1 }, { label: '已取消', value: 2 }];
 
-// 模拟数据
-const records = ref([
-  {
-    adoptCircle: 3,
-adoptType: 2,
-beehiveId: 24989,
-id: 6,
-price: 473,
-sharedPrice: 279,
-status: 2,
-userId: 23038,
-     image: '/static/images/apiculture.png'
-  },
-
-]);
-
+// 筛选
 const filteredList = computed(() => {
   if (activeTab.value === '') return records.value;
   return records.value.filter(item => item.status === activeTab.value);
 });
 
+// 不同的状态颜色
 const getStatusColor = (status) => {
   const colors = {
     0: '#ff6f0e', // 已认养
     1: '#67c23a', // 已完成
-    2: '#909399' , // 已取消
-    3: '#ff6f0e', // 已认养
+    2: '#909399', // 已取消
+    3: '#f50101', // 待支付
   };
   return colors[status] || '#1989fa';
 };
-
 const getStatusText = (status) => {
   const texts = {
     0: '已认养',
-    1: '已完成', 
+    1: '已完成',
     2: '已取消',
-    3:  '待支付'
+    3: '继续支付'
   };
   return texts[status] || '未知状态';
 };
-
-
-const payBtn =async(item)=>{
+// 待支付的状态可以继续支付
+const payBtn = async (item) => {
   if (item.status === 3) {
-      const payOrderId = item.payOrderId;
-      const paylist = await request({
-        url: '/app-api/pay/order/submit',
-        data: {
-          id: payOrderId,
-          channelCode: 'wx_lite',
-          channelExtras: {
-            openid: getOpenId() // 实际环境应从用户信息中获取
-          }
-        },
-        method: 'post',
-        showLoading: true,
-      });
-
-      if (paylist.code === 0) {
-        // 解析支付参数
-        const payParams = JSON.parse(paylist.data.displayContent);
-        console.log('支付参数:', payParams);
-
-        // 3. 调用微信支付API
-        const payRes = await uni.requestPayment({
-          provider: 'wxpay',
-          timeStamp: String(payParams.timeStamp),  // 确保为字符串类型
-          nonceStr: String(payParams.nonceStr),    // 确保为字符串类型
-          package: payParams.packageValue || payParams.package, // 兼容不同后端返回字段
-          signType: payParams.signType || 'MD5',   // 默认MD5
-          paySign: String(payParams.paySign),      // 确保为字符串类型
-
-          success: async (res) => {
-            uni.showToast({
-              title: '支付成功',
-              icon: 'success'
-            });
-
-            // 4. 支付成功后更新订单状态
-            await request({
-              url: '/app-api/weixin/order/update-paid',
-              data: {
-                payOrderId: payOrderId
-              },
-              method: 'post',
-              showLoading: true,
-            });
-
-            // 5. 跳转到订单详情页
-            setTimeout(() => {
-              uni.navigateTo({
-                url: '/pages/orderList/orderList'
-              });
-            }, 1500);
-          },
-
-          fail: async (err) => {
-            console.error('支付失败:', err);
-
-            if (err.errMsg.includes('cancel')) {
-              uni.showToast({
-                title: '支付已取消',
-                icon: 'none'
-              });
-            } else {
-              // 显示支付失败原因
-              const errorMsg = err.errMsg.includes('fail')
-                ? '支付失败，请重试'
-                : err.errMsg;
-
-              // 提供重试选项
-              const { confirm } = await uni.showModal({
-                title: '支付失败',
-                content: errorMsg,
-                confirmText: '重试',
-                cancelText: '返回'
-              });
-
-            
-            }
-          }
-        });
-      } else {
-        throw new Error(paylist.msg || '支付请求失败');
-      }
-    } 
+    const options = { orderId: item.payOrderI, }
+    processPayment(options)
+  }
 }
 
-
-onMounted(() => {
+onShow(() => {
   getRecordsList()
- 
-
 })
-//获取认养记录记录
-const getRecordsList= async () => {
-	try {
+//获取认养记录
+const getRecordsList = async () => {
+  try {
     const res = await request({
       url: '/app-api/front/beehive/get/records/list',
-      showLoading: true, 
-     
+      showLoading: true,
     })
-    
-    if (res.code === 0 || res.code === 200) {
+    if (res.code === 0) {
       records.value = res.data || [];
-      
+
     } else {
       throw new Error(res.msg || '数据异常')
     }
   } catch (err) {
     console.error('获取认养记录失败:', err)
-   
+
   }
 }
-// 时间戳转换
-const formatDateTime = (dateString) => {
-  if (!dateString) return ''
-  const date = new Date(dateString)
-  return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}:${String(date.getSeconds()).padStart(2, '0')}`
-}
+
 </script>
 
 <style lang="scss" scoped>
 .container {
   background-color: #f7f7f7;
-	height: 100vh;
-	display: flex;
-	flex-direction: column;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+
   .nav-tabs {
-  position: absolute;
+    position: absolute;
     top: getNarBarHeight();
     left: 0;
     right: 0;
@@ -235,14 +116,14 @@ const formatDateTime = (dateString) => {
     justify-content: space-around;
     border-bottom: 1rpx solid #eee;
     padding-bottom: 20rpx;
-    
+
     .tab-item {
       padding: 10rpx 0;
       position: relative;
-      
+
       &.active {
         font-weight: bold;
-        
+
         &::after {
           content: '';
           position: absolute;
@@ -256,14 +137,14 @@ const formatDateTime = (dateString) => {
       }
     }
   }
-  
+
   .list-container {
     margin-top: 100rpx;
     height: calc(100vh - 100rpx);
     background-color: #f7f7f7; // 整体背景色
- 
-	
-    
+
+
+
     .record-item {
       display: flex;
       padding: 30rpx;
@@ -272,47 +153,47 @@ const formatDateTime = (dateString) => {
       margin: 20rpx; // 列表项间距
       align-items: center;
 
-      
+
       .pet-image {
         width: 120rpx;
         height: 120rpx;
         border-radius: 10rpx;
         margin-right: 20rpx;
       }
-      
+
       .info-content {
         flex: 1;
         display: flex;
         flex-direction: column;
-        
+
         .pet-name {
           font-size: 32rpx;
           font-weight: bold;
           margin-bottom: 10rpx;
         }
-        
+
         .pet-date {
           font-size: 24rpx;
           color: #999;
           margin-bottom: 10rpx;
         }
-        
+
         .pet-amount {
           font-size: 28rpx;
           color: #ff6f0e;
         }
       }
-      
+
       .status {
         font-size: 24rpx;
-		width: 120rpx;
-		border: 1px solid #ddd;
-		border-radius: 10rpx;
-		text-align: center;
-		height: 50rpx;
-		line-height: 50rpx;
-		border-radius: 46rpx;
-		border: 2rpx solid rgba(153,153,153,0.7);
+        width: 120rpx;
+        border: 1px solid #ddd;
+        border-radius: 10rpx;
+        text-align: center;
+        height: 50rpx;
+        line-height: 50rpx;
+        border-radius: 46rpx;
+        border: 2rpx solid rgba(153, 153, 153, 0.7);
       }
     }
   }
@@ -324,9 +205,9 @@ const formatDateTime = (dateString) => {
   align-items: center;
   justify-content: center;
   padding: 100rpx 0;
-  
-  
-  
+
+
+
   .empty-text {
     font-size: 28rpx;
     color: #999;
diff --git a/pages/beeFarmInfo/addFarm.vue b/pages/beeFarmerJion/addFarm.vue
similarity index 81%
rename from pages/beeFarmInfo/addFarm.vue
rename to pages/beeFarmerJion/addFarm.vue
index bf80c80..6bbc921 100644
--- a/pages/beeFarmInfo/addFarm.vue
+++ b/pages/beeFarmerJion/addFarm.vue
@@ -49,9 +49,8 @@
 <script setup>
 import { ref } from 'vue';
 import TransNavVue from '../../components/TransNav.vue';
-import { request } from '@/utils/request'; 
+import { request ,uploadImage} from '@/utils/request'; 
 
-const BASE_URL = 'https://www.cdsrh.top' 
 const formData = ref({
     region: '',
     honeySeeds: '',
@@ -68,91 +67,28 @@ const imageInfo = ref({
     data: ''          
 });
 
-// 选择图片（使用uni.uploadFile）
+
+// 选择图片
 const chooseImage = () => {
   if (imageInfo.value.tempFilePath) {
-    uni.showToast({
+     uni.showToast({
       title: '已上传一张图片',
       icon: 'none'
     });
     return;
   }
-  
-  uni.chooseImage({
-    count: 1,
-    success: async (res) => {
-      if (!res || !res.tempFilePaths || res.tempFilePaths.length === 0) {
-        uni.showToast({
-          title: '未选择图片',
-          icon: 'none'
-        });
-        return;
-      }
-
-      const tempFilePath = res.tempFilePaths[0];
-      uni.showLoading({
-        title: '上传中...'
-      });
-      
-      try {
-    
-        const uploadRes = await new Promise((resolve, reject) => {
-          uni.uploadFile({
-            url: BASE_URL + '/app-api/infra/file/upload', 
-            filePath: tempFilePath,
-            name: 'file', 
-         
-            success: (response) => {
-              try {
-                const data = JSON.parse(response.data);
-                resolve(data);
-              } catch (err) {
-                reject(new Error('解析响应失败'));
-              }
-            },
-            fail: (err) => {
-              reject(err);
-            }
-          });
-        });
-        
-        if (uploadRes.code === 0) {
-          // 保存图片信息
-          imageInfo.value = {
-            tempFilePath,
-            data: uploadRes.data
-          };
-          
-          // 保存到表单数据
-          formData.value.imgUrl = uploadRes.data;
-          
-          uni.showToast({
-            title: '上传成功',
-            icon: 'success'
-          });
-        } else {
-          throw new Error(uploadRes.msg || '图片上传失败');
-        }
-      } catch (err) {
-        uni.showToast({
-          title: '上传失败',
-          icon: 'none'
-        });
-        console.error('图片上传失败:', err);
-      } finally {
-        uni.hideLoading();
-      }
-    },
-    fail: (err) => {
-      console.error('选择图片失败:', err);
-      uni.showToast({
-        title: '选择图片失败',
-        icon: 'none'
-      });
-    }
+  uploadImage(1)
+  .then((result) => {
+    imageInfo.value = result
+    formData.value.imgUrl = result.data;
+  })
+  .catch((err) => {
+    console.error('上传失败:', err);
   });
+
 };
 
+
 // 预览图片
 const previewImage = () => {
   if (imageInfo.value.tempFilePath) {
diff --git a/pages/beeFarmInfo/beeFarmInfo.vue b/pages/beeFarmerJion/beeFarmInfo.vue
similarity index 100%
rename from pages/beeFarmInfo/beeFarmInfo.vue
rename to pages/beeFarmerJion/beeFarmInfo.vue
diff --git a/pages/beeFarmerJion/beeFarmerJion.vue b/pages/beeFarmerJion/beeFarmerJion.vue
index a95d53f..b4c9e58 100644
--- a/pages/beeFarmerJion/beeFarmerJion.vue
+++ b/pages/beeFarmerJion/beeFarmerJion.vue
@@ -27,7 +27,7 @@
 import TransNavVue from '../../components/TransNav.vue';
 const gotoJion = ()=>{
 	uni.navigateTo({
-		url:'/pages/beeFarmerJion/jionForm'
+		url:'/pages/beeFarmerJion/addFarm'
 	})
 }
 </script>
diff --git a/pages/beeFarmerJion/jionForm.vue b/pages/beeFarmerJion/jionForm.vue
deleted file mode 100644
index 31e72ea..0000000
--- a/pages/beeFarmerJion/jionForm.vue
+++ /dev/null
@@ -1,142 +0,0 @@
-<template>
-	<view>
-		<TransNavVue title="入驻"/>
-	<view class="container">
-		<image src="/static/images/myPage/BeeEnterInfoBg.png" class="container-bg" mode=""></image>
-		
-		<view class="title-content">
-			填写信息
-			<text class="tips">填写相关信息，完成入驻</text>
-		</view>
-		<view class="form-content">
-			<picker mode="region" @change="selectCity" class="form-item">
-				<view class="picker-view" :class="{ 'has-value': formData.region }">
-					{{ formData.region || '请选择省、市、区' }}
-				</view>
-			</picker>
-			<input :inputBorder="false" placeholder-class="place" v-model="formData.honeySeeds" placeholder="蜜源种类" class="form-item form-input" />
-			<input :inputBorder="false" placeholder-class="place" v-model="formData.name" placeholder="蜂场名称" class="form-item form-input" />
-			<input :inputBorder="false" placeholder-class="place" v-model="formData.area" placeholder="蜂场面积" class="form-item form-input" />
-			<input :inputBorder="false" placeholder-class="place" v-model="formData.beeType" placeholder="蜜蜂种类" class="form-item form-input" />
-			<input :inputBorder="false" placeholder-class="place" v-model="formData.ownerName" placeholder="养蜂人" class="form-item form-input" />
-			<button class="submit-btn" @click="enterBtn">入驻</button>
-		</view>
-	</view>
-	</view>
-</template>
-
-<script setup>
-import { ref } from 'vue';
-import TransNavVue from '../../components/TransNav.vue';
-import { request } from '@/utils/request';
-const formData = ref({
-	region: '',
-	honeyseeds: '',
-	name: '',
-	area: '',
-	beetype: '',
-	ownername: '',
-});
-
-
-const enterBtn = async () => {
-  try {
-    const res = await request({
-      url: '/app-api/weixin/beeFarmApply/create',
-      showLoading: true, 
-		data:formData.value,
-		method:'post'
-    })
-   
-    if (res.code === 0 ) {
-		uni.navigateTo({
-    url: '/pages/beeFarmerJion/jionFeedback'
-  })
-    } else {
-      throw new Error(res.msg || '数据异常')
-    }
-  } 
-  catch (err) {
-    console.error('入驻失败:', err)
-   
-  }
-}
-
-const selectCity = (e) => {
-    // 将数组转换为空格分隔的字符串
-    formData.value.region = e.detail.value.join(' ');
-};
-</script>
-
-<style lang="scss" scoped>
-.container {
-	display: flex;
-	flex-direction: column;
-	position: relative;
-	background: #f6f6f6;
-	height: 100vh;
-	z-index: 1;
-	.container-bg {
-		width: 100%;
-		height: 548rpx;
-		position: absolute;
-		z-index: -1;
-	}
-	.title-content {
-		margin-top: 70rpx;
-		margin-left: 72rpx;
-		display: flex;
-		flex-direction: column;
-		font-weight: bold;
-		font-size: 48rpx;
-		color: #1e1e1e;
-		line-height: 72rpx;
-		.tips {
-			margin-top: 12rpx;
-			font-size: 26rpx;
-			color: #999999;
-			line-height: 40rpx;
-		}
-	}
-	.form-content {
-		padding: 48rpx 15rpx;
-		margin: auto;
-		width: 686rpx;
-		background: #ffffff;
-		border-radius: 24rpx;
-		.form-item {
-			padding-left: 32rpx;
-			margin-bottom: 28rpx;
-			width: 622rpx;
-			height: 110rpx;
-			background: #f6f6f6;
-			border-radius: 16rpx;
-			.picker-view {
-				padding: 32rpx 0;
-				line-height: 48rpx;
-				font-size: 32rpx;
-				&.has-value {
-					color: #000;
-				}
-				&:not(.has-value) {
-					color: rgba(0, 0, 0, 0.25);
-				}
-			}
-		}
-
-		::v-deep .place {
-			color: rgba(0, 0, 0, 0.25);
-		}
-		.submit-btn{
-			width: 622rpx;
-			height: 96rpx;
-			background: #FF6F0E;
-			border-radius: 50rpx;
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #FFFFFF;
-			line-height: 96rpx;
-		}
-	}
-}
-</style>
diff --git a/pages/beeHiveData/beeHiveData.vue b/pages/beeHiveData/beeHiveData.vue
index b472252..5f25d84 100644
--- a/pages/beeHiveData/beeHiveData.vue
+++ b/pages/beeHiveData/beeHiveData.vue
@@ -47,7 +47,8 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
 import TransNavVue from '../../components/TransNav.vue';
 import { request } from '@/utils/request'
 
@@ -116,9 +117,8 @@ const getInfoData = async () => {
       url: '/app-api/WeiXinMini/index/get/info',
       showLoading: true, 
     })
-    
-    // 处理返回数据（兼容code=0和code=200）
-    if (res.code === 0 || res.code === 200) {
+
+    if (res.code === 0 ) {
     dataList.value=res.data
     } else {
       throw new Error(res.msg || '数据异常')
@@ -128,7 +128,7 @@ const getInfoData = async () => {
    
   }
 }
-onMounted(() => {
+onShow(() => {
   getInfoData()
 })
 </script>
diff --git a/pages/cashWithdrow/cashWithdrow.vue b/pages/cashWithdrow/cashWithdrow.vue
index 7d40fbe..319c809 100644
--- a/pages/cashWithdrow/cashWithdrow.vue
+++ b/pages/cashWithdrow/cashWithdrow.vue
@@ -1,202 +1,211 @@
 <template>
-     <view>
-        <TransNavVue title="微信提现"/>
-    <view class="container">
-     
-        
-        
-        <view class="withdraw-card">
-            <view class="title">提现金额</view>
-            <view class="input-box">
-                <text>¥</text>
-                <input 
-                    type="number" 
-                    placeholder="请输入提现金额" 
-                    v-model="amount"
-                />
-            </view>
-            <view class="balance-box">
-                <text class="balance">可提现余额: ¥{{ availableBalance }}</text>
-                <text class="withdraw-all" @click="fillAllAmount">全部提现</text>
-            </view>
-        </view>
-        
-        
-        
-        <view class="withdraw-btn" @click="submitWithdraw">申请提现</view>
+    <view>
+       <TransNavVue title="微信提现"/>
+   <view class="container">
+    
+       <view class="withdraw-card">
+           <view class="title">提现金额</view>
+           <view class="input-box">
+               <text>¥</text>
+               <input 
+                   type="number" 
+                   placeholder="请输入提现金额" 
+                   v-model="amount"
+                   @blur="validateAmount"
+               />
+           </view>
+           <view class="balance-box">
+               <text class="balance">可提现余额: ¥{{ availableBalance }}</text>
+               <text v-if="availableBalance!=0" class="withdraw-all" @click="fillAllAmount">全部提现</text>
+           </view>
+           <view class="error-message" v-if="errorMessage">{{ errorMessage }}</view>
+       </view>
+       
+       <view class="withdraw-btn" @click="submitWithdraw" :class="{ disabled: errorMessage }">
+           申请提现
+       </view>
+   </view>
     </view>
-     </view>
 </template>
 
 <script setup>
-import { ref ,onMounted} from 'vue'
-
+import { ref, onMounted } from 'vue'
 import { request } from '@/utils/request'
-
 import TransNavVue from '../../components/TransNav.vue'
 import { useTokenStorage } from '../../utils/storage'
-const {  getAccessToken ,getOpenId} = useTokenStorage()
+import { onShow } from '@dcloudio/uni-app'
+
+const { getOpenId } = useTokenStorage()
 
 const amount = ref('')
 const availableBalance = ref('0')
-const wechatInfo = ref({
-    nickname: '微信用户',
-    avatar: ''
-})
+const errorMessage = ref('')
 
+// 验证提现金额
+const validateAmount = () => {
+ if (!amount.value) {
+   errorMessage.value = '请输入提现金额'
+   return false
+ }
+ 
+ const withdrawAmount = parseFloat(amount.value)
+ const balance = parseFloat(availableBalance.value)
+ 
+ if (withdrawAmount <= 0) {
+   errorMessage.value = '提现金额必须大于0'
+   return false
+ }
+ 
+ if (withdrawAmount > balance) {
+   errorMessage.value = `提现金额不能超过可提现余额 ¥${availableBalance.value}`
+   return false
+ }
+ 
+ errorMessage.value = ''
+ return true
+}
+
+//提现
 const submitWithdraw = async () => {
-    if (!amount.value) {
-        uni.showToast({
-            title: '请输入提现金额',
-            icon: 'none'
-        })
-        return
-    }
-    
-    try {
-        const res = await request({
-        url: '/app-api/weixin/pay/initiate/payout',
-        method: 'POST',
-        data: { transferAmount: amount.value ,
-                openid: getOpenId(),
-                 transferRemark: '极蜜部落提现',
-                 transferSceneId: '1000',
-                 transferSceneReportInfos: [
-                  {
-                    infoType: '活动名称',
-                    infoContent: '极蜜部落提现'
-                  },
-                  {
-                    infoType: '奖励说明',
-                    infoContent: '提现奖励'
-                  }
-                ]
-        },
-        showLoading: true,
-       
-      })
-        
-        uni.showToast({
-            title: '提现申请已提交',
-            icon: 'success'
-        })
-        
-        // 更新余额
-        availableBalance.value = (parseFloat(availableBalance.value) - parseFloat(amount.value)).toFixed(2)
-        
-        amount.value = ''
-        
-    } catch (error) {
-        uni.showToast({
-            title: error.message || '提现失败',
-            icon: 'none'
-        })
-    }
+ // 先验证金额
+ if (!validateAmount()) {
+   return
+ }
+ 
+ try {
+   const res = await request({
+     url: '/app-api/weixin/pay/initiate/payout',
+     method: 'POST',
+     data: { 
+       transferAmount: amount.value,
+       openid: getOpenId(),
+       transferRemark: '极蜜部落提现',
+       transferSceneId: '1000',
+       transferSceneReportInfos: [
+         {
+           infoType: '活动名称',
+           infoContent: '极蜜部落提现'
+         },
+         {
+           infoType: '奖励说明',
+           infoContent: '提现奖励'
+         }
+       ]
+     },
+     showLoading: true,
+   })
+   
+   uni.showToast({
+       title: '提现申请已提交',
+       icon: 'success'
+   })
+   
+   // 更新余额
+   availableBalance.value = (parseFloat(availableBalance.value) - parseFloat(amount.value)).toFixed(2)
+   
+   amount.value = ''
+   
+ } catch (error) {
+   uni.showToast({
+       title: error.message || '提现失败',
+       icon: 'none'
+   })
+ }
 }
 
 const fillAllAmount = () => {
-    amount.value = availableBalance.value
+ amount.value = availableBalance.value
+ errorMessage.value = ''
 }
-onMounted(() => {
 
-    const pages = getCurrentPages();
-  const currentPage = pages[pages.length - 1];
-  
-  // 通过页面参数获取数据
-  if (currentPage && currentPage.$vm) {
-    const eventChannel = currentPage.$vm.getOpenerEventChannel();
-    eventChannel.on('withdrawAmount', (data) => {
-        // 处理提现金额数据
-        availableBalance.value = data.amount||0
-    });
-  }
-  
+onShow(() => {
+ const pages = getCurrentPages();
+ const currentPage = pages[pages.length - 1];
+
+ if (currentPage && currentPage.$vm) {
+   const eventChannel = currentPage.$vm.getOpenerEventChannel();
+   eventChannel.on('withdrawAmount', (data) => {
+     availableBalance.value = data.amount || 0
+   });
+ }
 })
 </script>
 
 <style lang="scss" scoped>
 .container {
-    padding: 30rpx;
-    background-color: #f7f7f7;
-    min-height: 100vh;
-    
-    .withdraw-card {
-        background-color: #fff;
-        border-radius: 16rpx;
-        padding: 40rpx;
-        margin-bottom: 30rpx;
-        
-        .title {
-            font-size: 32rpx;
-            color: #333;
-            margin-bottom: 40rpx;
-        }
-        
-        .input-box {
-            display: flex;
-            align-items: center;
-            border-bottom: 1rpx solid #eee;
-            padding-bottom: 20rpx;
-            margin-bottom: 20rpx;
-            
-            text {
-                font-size: 48rpx;
-                color: #333;
-                margin-right: 10rpx;
-            }
-            
-            input {
-                flex: 1;
-                font-size: 48rpx;
-                height: 80rpx;
-            }
-        }
-        
-        .balance-box {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            
-            .balance {
-                font-size: 28rpx;
-                color: #999;
-            }
-            
-            .withdraw-all {
-                font-size: 28rpx;
-                color: #FF7D00;
-            }
-        }
-    }
-    
-    .wechat-info {
-        display: flex;
-        align-items: center;
-        background-color: #fff;
-        border-radius: 16rpx;
-        padding: 30rpx;
-        margin-bottom: 60rpx;
-        
-        image {
-            width: 60rpx;
-            height: 60rpx;
-            margin-right: 20rpx;
-        }
-        
-        text {
-            font-size: 28rpx;
-            color: #333;
-        }
-    }
-    
-    .withdraw-btn {
-        height: 90rpx;
-        line-height: 90rpx;
-        background-color: #FF7D00;
-        color: white;
-        font-size: 32rpx;
-        border-radius: 45rpx;
-        text-align: center;
-    }
+   padding: 30rpx;
+   background-color: #f7f7f7;
+   min-height: 100vh;
+   
+   .withdraw-card {
+       background-color: #fff;
+       border-radius: 16rpx;
+       padding: 40rpx;
+       margin-bottom: 30rpx;
+       
+       .title {
+           font-size: 32rpx;
+           color: #333;
+           margin-bottom: 40rpx;
+       }
+       
+       .input-box {
+           display: flex;
+           align-items: center;
+           border-bottom: 1rpx solid #eee;
+           padding-bottom: 20rpx;
+           margin-bottom: 20rpx;
+           
+           text {
+               font-size: 48rpx;
+               color: #333;
+               margin-right: 10rpx;
+           }
+           
+           input {
+               flex: 1;
+               font-size: 48rpx;
+               height: 80rpx;
+           }
+       }
+       
+       .balance-box {
+           display: flex;
+           justify-content: space-between;
+           align-items: center;
+           
+           .balance {
+               font-size: 28rpx;
+               color: #999;
+           }
+           
+           .withdraw-all {
+               font-size: 28rpx;
+               color: #FF7D00;
+           }
+       }
+       
+       .error-message {
+           font-size: 24rpx;
+           color: #FF4D4F;
+           margin-top: 10rpx;
+       }
+   }
+   
+   .withdraw-btn {
+       height: 90rpx;
+       line-height: 90rpx;
+       background-color: #FF7D00;
+       color: white;
+       font-size: 32rpx;
+       border-radius: 45rpx;
+       text-align: center;
+       
+       &.disabled {
+           background-color: #FFB366;
+           opacity: 0.7;
+           cursor: not-allowed;
+       }
+   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/commissionDetail/commissionDetail.vue b/pages/commissionDetail/commissionDetail.vue
index 5325675..7257581 100644
--- a/pages/commissionDetail/commissionDetail.vue
+++ b/pages/commissionDetail/commissionDetail.vue
@@ -60,22 +60,15 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref } from 'vue'
 import TransNavVue from '../../components/TransNav.vue';
-import { useTokenStorage } from '../../utils/storage'
 import { request } from '@/utils/request'
-const { getAccessToken } = useTokenStorage()
+import { onShow } from '@dcloudio/uni-app';
 
-const records = ref([
-    { createTime: '2023-10-15 14:30', amount: '0' },
+const records = ref([])
+const commissionData = ref({})
 
-    // 可以添加更多记录数据
-])
-const commissionData = ref({
-	cumulativeEarnings: 0,
-	currentEarnings: 0,
-	todaySEarnings: 0
-})
+// 跳转提现
 const goToWithdraw = ()=>{
     uni.navigateTo({
         url:'/pages/cashWithdrow/cashWithdrow',
@@ -122,7 +115,7 @@ const getCommissionDetailList = async () => {
    
   }
 }
-onMounted(() => {
+onShow(() => {
 	getCommissionDetail()
 	getCommissionDetailList()
 })
diff --git a/pages/customerService/customerService.vue b/pages/customerService/customerService.vue
index 728e906..1b9be0c 100644
--- a/pages/customerService/customerService.vue
+++ b/pages/customerService/customerService.vue
@@ -28,9 +28,11 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import { request } from '@/utils/request';
 import TransNavVue from '../../components/TransNav.vue';
+import { onShow } from '@dcloudio/uni-app'
+
 
 const qrCodeUrl = ref('/static/images/logo.png'); // 默认图片
 
@@ -50,7 +52,7 @@ const getCustomerQrCode = async () => {
   }
 };
 
-onMounted(() => {
+onShow(() => {
   getCustomerQrCode();
 });
 
diff --git a/pages/deviceManagement/addDeviceManagement.vue b/pages/deviceManagement/addDeviceManagement.vue
index dfbc182..090385f 100644
--- a/pages/deviceManagement/addDeviceManagement.vue
+++ b/pages/deviceManagement/addDeviceManagement.vue
@@ -43,9 +43,10 @@
 <script setup>
 import { ref, onMounted } from 'vue';
 import TransNavVue from '../../components/TransNav.vue';
-import { request } from '@/utils/request';
+import { request,uploadImage } from '@/utils/request';
+import { onShow } from '@dcloudio/uni-app'
+
 
-const BASE_URL = 'https://www.cdsrh.top'
 const formData = ref({
   facilityName: '',
   facilityType: '',
@@ -58,7 +59,7 @@ const mainImage = ref({
   data: ''
 })
 
-onMounted(() => {
+onShow(() => {
   const pages = getCurrentPages()
   const currentPage = pages[pages.length - 1]
   const beeFarmId = currentPage.$page.options || currentPage.options
@@ -69,88 +70,29 @@ onMounted(() => {
   }
 })
 
+
 // 选择图片
 const chooseImage = () => {
   if (mainImage.value.tempFilePath) {
-    uni.showToast({
+     uni.showToast({
       title: '已上传一张图片',
       icon: 'none'
     });
     return;
   }
-
-  uni.chooseImage({
-    count: 1,
-    success: async (res) => {
-      if (!res || !res.tempFilePaths || res.tempFilePaths.length === 0) {
-        uni.showToast({
-          title: '未选择图片',
-          icon: 'none'
-        });
-        return;
-      }
-
-      const tempFilePath = res.tempFilePaths[0];
-      uni.showLoading({
-        title: '上传中...'
-      });
-
-      try {
-        
-        const uploadRes = await new Promise((resolve, reject) => {
-          uni.uploadFile({
-            url: BASE_URL + '/app-api/infra/file/upload',
-            filePath: tempFilePath,
-            name: 'file',
-           
-            success: (response) => {
-              try {
-                const data = JSON.parse(response.data);
-                resolve(data);
-              } catch (err) {
-                reject(new Error('解析响应失败'));
-              }
-            },
-            fail: (err) => {
-              reject(err);
-            }
-          });
-        });
-
-        if (uploadRes.code === 0) {
-          mainImage.value = {
-            tempFilePath,
-            data: uploadRes.data
-          };
-          formData.value.imgUrl = uploadRes.data;
-
-          uni.showToast({
-            title: '上传成功',
-            icon: 'success'
-          });
-        } else {
-          throw new Error(uploadRes.msg || '图片上传失败');
-        }
-      } catch (err) {
-        uni.showToast({
-          title: '上传失败',
-          icon: 'none'
-        });
-        console.error('图片上传失败:', err);
-      } finally {
-        uni.hideLoading();
-      }
-    },
-    fail: (err) => {
-      console.error('选择图片失败:', err);
-      uni.showToast({
-        title: '选择图片失败',
-        icon: 'none'
-      });
-    }
+  uploadImage(1)
+  .then((result) => {
+    mainImage.value = result
+    formData.value.imgUrl = result.data;
+  })
+  .catch((err) => {
+    console.error('上传失败:', err);
   });
+
 };
 
+      
+       
 // 预览图片
 const previewImage = () => {
   if (mainImage.value.tempFilePath) {
@@ -212,11 +154,7 @@ const enterBtn = async () => {
   }
 };
 
-
-
-
 </script>
-
 <style lang="scss" scoped>
 .container {
   display: flex;
diff --git a/pages/deviceManagement/deviceManagement.vue b/pages/deviceManagement/deviceManagement.vue
index 99fb468..87d191a 100644
--- a/pages/deviceManagement/deviceManagement.vue
+++ b/pages/deviceManagement/deviceManagement.vue
@@ -21,20 +21,17 @@
           <text class="device-name">{{ device.facilityName }}</text>
           <button class="unbind-btn" @click.stop="handleUnbind(device.id)">解绑</button>
         </view>
-        
         <view class="device-status">
           <text class="info-tag">普通信息</text>
           <text class="online-tag">在线</text>
           <text class="device-model">{{ device.facilityType }}</text>
         </view>
-        
         <view class="divider"></view>
-        
         <view class="device-detail">
           <image class="device-image" :src="device.imgUrl" mode="aspectFit"></image>
           <view class="device-info">
             <text class="info-text">型号：{{ device.no }}</text>
-            <text class="info-text">绑定日期：{{ device.bindingTime }}</text>
+            <text class="info-text">绑定日期：{{formatDateTime (device.bandingTime) }}</text>
           </view>
         </view>
       </view>
@@ -50,10 +47,11 @@
 </template>
 
 <script setup>
-import { ref,onMounted } from 'vue'
+import { ref} from 'vue'
 import TransNavVue from '../../components/TransNav.vue'
 import { request } from '../../utils/request.js'
 import { onShow } from '@dcloudio/uni-app';
+import { formatDateTime } from '../../utils/system';
 
 
 const devices = ref([])
diff --git a/pages/homePage/collectBee.vue b/pages/homePage/collectBee.vue
index 0a2bc6c..06d44c2 100644
--- a/pages/homePage/collectBee.vue
+++ b/pages/homePage/collectBee.vue
@@ -28,7 +28,6 @@
           </view>
         </view>
       </view>
-
       <view class="empty-box" v-if="beehiveList.length === 0">
         <text class="empty-text">暂无蜂箱</text>
       </view>
@@ -37,27 +36,25 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
-import TransNavVue from '../../components/TransNav.vue';
-import { request } from '@/utils/request'
 import { getStatusBarHeight, getTitleBarHeight, getNarBarHeight } from '../../utils/system';
-import { useTokenStorage } from '../../utils/storage';
-
-const { getAccessToken, getOpenId } = useTokenStorage();
+import { ref} from 'vue'
+import TransNavVue from '../../components/TransNav.vue';
+import { request,processPayment } from '@/utils/request'
+import { onShow } from '@dcloudio/uni-app'
 
+const selectedFarmId = ref('')
+const selectedType = ref('')
+const typeOptions = ref([{ label: '独享', value: '1'},{ label: '拼团', value: '2' }])
 const beehiveList = ref([])
-
 const dataList = ref([])
-const fromData = ref({
-  BeeFarmId: '',
-  adoptionType: ''
-})
+const fromData = ref({ BeeFarmId: '',adoptionType: ''})
 
-onMounted(() => {
+onShow(() => {
   getBeehiveList()
   getInfoDataList()
 })
 
+//获取蜂箱数据
 const getBeehiveList = async () => {
   try {
     const res = await request({
@@ -80,7 +77,6 @@ const getBeehiveList = async () => {
     })
   }
 }
-
 //获取所有的蜂场列表
 const getInfoDataList = async () => {
   try {
@@ -100,7 +96,7 @@ const getInfoDataList = async () => {
 
   }
 }
-
+//判断蜂箱类型
 const getBeehiveTypeName = (type) => {
   const typeMap = {
     1: '基础蜂箱',
@@ -110,8 +106,7 @@ const getBeehiveTypeName = (type) => {
   }
   return typeMap[type] || '未知类型'
 }
-
-
+//创建订单
 const handleBuy = async (item) => {
   const dataPamas = {
     beehiveId: item.id,
@@ -127,85 +122,22 @@ const handleBuy = async (item) => {
       method: 'post',
       showLoading: true,
     });
-    if (res.code === 0) {
-      const payOrderId = res.data.payOrderId;
-      // 2. 提交支付请求
-      const paylist = await request({
-        url: '/app-api/pay/order/submit',
-        data: {
-          id: payOrderId,
-          channelCode: 'wx_lite',
-          channelExtras: {
-            openid: getOpenId() // 实际环境应从用户信息中获取
-          }
-        },
-        method: 'post',
-        showLoading: true,
-      });
-
-      if (paylist.code === 0) {
-        // 解析支付参数
-        const payParams = JSON.parse(paylist.data.displayContent);
-        // 3. 调用微信支付API
-        const payRes = await uni.requestPayment({
-          provider: 'wxpay',
-          timeStamp: String(payParams.timeStamp),  
-          nonceStr: String(payParams.nonceStr),   
-          package: payParams.packageValue || payParams.package,
-          signType: payParams.signType || 'MD5',   
-          paySign: String(payParams.paySign),      
-
-          success: async (res) => {
-            uni.showToast({
-              title: '支付成功',
-              icon: 'success'
-            });
-
-
-            // 4. 跳转到订单详情页
-            setTimeout(() => {
-              uni.navigateTo({
-                url: '/pages/adoptionRecords/adoptionRecords'
-              });
-            }, 1500);
-          },
-
-          fail: async (err) => {
-            getBeehiveList()
-            if (err.errMsg.includes('cancel')) {
-              uni.showToast({
-                title: '支付已取消',
-                icon: 'none'
-              });
-             
-            }
-          }
-        });
-      } else {
-        throw new Error(paylist.msg || '支付请求失败');
-      }
+    if (res.code === 0 && res.data.payOrderId) {
+    const options={orderId : res.data.payOrderId, successToUrl :'/pages/adoptionRecords/adoptionRecords'}
+    processPayment(options)
     } else {
       throw new Error(orderRes.msg || '订单创建失败');
     }
   } 
-
-
-
-
-
-
-const selectedFarmId = ref('')
-const selectedType = ref('')
-const typeOptions = ref([{ label: '独享', value: '1'},{ label: '拼团', value: '2' }])
-
+//选择蜂场
 const onFarmChange = (e) => {
   selectedFarmId.value = dataList.value[e.detail.value]?.id || ''
 }
-
+//选择蜂箱类型
 const onTypeChange = (e) => {
   selectedType.value = typeOptions.value[e.detail.value].value
 }
-
+//查询
 const handleQuery = () => {
   fromData.value = {
     BeeFarmId: selectedFarmId.value,
@@ -213,14 +145,11 @@ const handleQuery = () => {
   }
   getBeehiveList()
 }
-
+//重置
 const handleReset = () => {
   selectedFarmId.value = ''
   selectedType.value = ''
-  fromData.value = {
-    BeeFarmId: '',
-    adoptionType: ''
-  }
+  fromData.value = {BeeFarmId: '', adoptionType: ''}
   getBeehiveList()
 }
 </script>
diff --git a/pages/homePage/homePage.vue b/pages/homePage/homePage.vue
index e0f052a..4065e79 100644
--- a/pages/homePage/homePage.vue
+++ b/pages/homePage/homePage.vue
@@ -44,7 +44,7 @@
 						<view class="data-item-title">产量</view>
 						<view class="data-item-text">
 							{{infoData.outputAmount}}
-							<text>/万斤</text>
+							<text>/斤</text>
 						</view>
 					</view>
 					<view class="data-item">
@@ -165,7 +165,15 @@ import { ref, onMounted } from 'vue'
 import { onShow } from '@dcloudio/uni-app'
 import { request } from '@/utils/request'
 import { useTokenStorage } from '../../utils/storage'
+import {formatDateTime}  from '../../utils/system'
+
+
 const {  getAccessToken } = useTokenStorage()
+const swiperList=ref([])
+const infoData=ref({})
+const dataList=ref([])
+const popup = ref(null);
+const activities = ref([])
 
 
 onMounted(() => {
@@ -179,12 +187,6 @@ onShow(() => {
   }
 })
 
-const swiperList=ref([])
-const infoData=ref({})
-const dataList=ref([])
-const popup = ref(null);
-const activities = ref([])
-
 
 //跳转到活动页面
 const activeBtn = (item) => {
@@ -315,12 +317,6 @@ const collectBee = () => {
   }
  
 }
-// 时间戳转换
-const formatDateTime = (dateString) => {
-  if (!dateString) return ''
-  const date = new Date(dateString)
-  return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}:${String(date.getSeconds()).padStart(2, '0')}`
-}
 
 //扫码溯源
 const scanCode = () => {
diff --git a/pages/honeySource/honeySource.vue b/pages/honeySource/honeySource.vue
index 08357b8..d66b0f9 100644
--- a/pages/honeySource/honeySource.vue
+++ b/pages/honeySource/honeySource.vue
@@ -5,18 +5,14 @@
     <uni-popup ref="popup" type="center">
 		<view class="popup-content">
 			<view class="popup-title">{{ currentBeeDetail.name }}</view>
-		
 			<view class="popup-body">{{ currentBeeDetail.mainNectarPlants }}</view>
-	    <!-- <view class="popup-time">{{ formatDateTime(currentBeeDetail.establishTime) }}</view> -->
 			<button class="popup-btn" @click="closePopup">我已了解</button>
 		</view>
-	</uni-popup>
+	  </uni-popup>
    <view class="container">
      <image src="/static/images/homePage/homePageBg.png" mode="aspectFill" class="bg-image"></image>
      <view :style="{ height: getStatusBarHeight() + 'px' }"></view>
      <view class="title-bar" :style="{ height: getTitleBarHeight() + 'px' }"></view>
-     
-     
      <view class="map-container">
        <map 
          id="map" 
@@ -27,7 +23,6 @@
          show-location
        ></map>
      </view>
-     
      <view class="my-bee-title">
        <view>推荐蜜源</view>
        <image src="/static/images/homePage/myBeeTitle.png" mode="" class="title-image"></image>
@@ -51,15 +46,16 @@
 <script setup>
 import { getStatusBarHeight, getTitleBarHeight } from '../../utils/system';
 import BeeTabbarVue from '../../components/BeeTabbar.vue';
-import { ref, onMounted } from 'vue'
+import { ref } from 'vue'
 import { request } from '@/utils/request'
+
 import { onShow } from '@dcloudio/uni-app'
 
 const popup = ref(null);
 const loading = ref(false);
 const currentBeeDetail = ref({});
 const honeySourceList = ref([]);
-// 移除mapInstance引用
+//地图
 const markers = ref([
   {
 		id: 1,
@@ -76,6 +72,7 @@ const markers = ref([
 		}
 	}
 ])
+// 创建图例
 const generateMarkers = (list) => {
   return list
     .filter(item => item.latitude && item.longitude)
@@ -128,17 +125,11 @@ const showBeeDetail = (item) => {
 const closePopup = () => {
   popup.value.close();
 };
-const formatDateTime = (dateString) => {
-  if (!dateString) return ''
-  const date = new Date(dateString)
-  return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}:${String(date.getSeconds()).padStart(2, '0')}`
-}
 onShow(() => {
   getShoppingList();
 });
 </script>
 
-
 <style lang="scss" scoped>
 .popup-content {
 	width: 600rpx;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index f039c32..fd6ff12 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -27,7 +27,7 @@
 import { ref, onMounted } from 'vue'
 import { useTokenStorage } from '../../utils/storage'
 import { request } from '@/utils/request'
-import { initShareUserId, getShareUserId } from '../../utils/shareUserId' // 引入分享者ID工具函数
+import { initShareUserId, } from '../../utils/system' 
 
 const { setToken } = useTokenStorage()
 const isLoading = ref(false)
diff --git a/pages/messagePage/messagePage.vue b/pages/messagePage/messagePage.vue
index 8a2cf54..abec3a1 100644
--- a/pages/messagePage/messagePage.vue
+++ b/pages/messagePage/messagePage.vue
@@ -44,7 +44,8 @@
 import { ref ,onMounted} from 'vue';
 import { request } from '@/utils/request'
 import TransNavVue from '../../components/TransNav.vue';
-
+import {formatDateTime } from '../../utils/system';
+import { onShow } from '@dcloudio/uni-app'
 
 
 const popup = ref(null);
@@ -85,7 +86,7 @@ const closePopup = async () => {
     popup.value.close()
   }
 }
-onMounted(() => {
+onShow(() => {
 	getCurrentMessage()
  
 
@@ -109,12 +110,7 @@ const getCurrentMessage = async () => {
    
   }
 }
-// 时间戳转换
-const formatDateTime = (dateString) => {
-  if (!dateString) return ''
-  const date = new Date(dateString)
-  return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}:${String(date.getSeconds()).padStart(2, '0')}`
-}
+
 
 </script>
 
diff --git a/pages/myBeeHive/myBeeHive.vue b/pages/myBeeHive/myBeeHive.vue
index e69b9b6..e99d5f8 100644
--- a/pages/myBeeHive/myBeeHive.vue
+++ b/pages/myBeeHive/myBeeHive.vue
@@ -1,396 +1,411 @@
 <template>
 <view>
-	<TransNavVue title="我的蜂场"></TransNavVue>
-	<view class="container">
+ <TransNavVue title="我的蜂箱"></TransNavVue>
+	  <view class="container">
 		<view class="swiper-content">
-			<swiper class="swiper" circular indicator-active-color="#ffffff" indicator-dots="true" autoplay="true" interval="2000" duration="500">
-				<swiper-item class="swiper-item" v-for="item in MyBeehiveInfo.images" :key="item">
-					<image :src="item" class="swiper-image" mode=""></image>
-				</swiper-item>
-			
-			</swiper>
+		  <swiper class="swiper" circular indicator-active-color="#ffffff" indicator-dots autoplay interval="2000" duration="500">
+			<swiper-item v-for="(item, index) in MyBeehiveInfo.images" :key="index">
+			  <image :src="item" class="swiper-image"></image>
+			</swiper-item>
+		  </swiper>
 		</view>
-		<scroll-view scroll-y="true" class="scroll-content">
-			<view class="goods-info">
-				<image src="/static/images/shoppingBg.png" mode=""></image>
-				<view class="info-left">
-					<view class="info-content">
-						<view class="goods-price">
-							￥
-							<text>{{adoptionType==2 ? MyBeehiveInfo.sharePrice: MyBeehiveInfo.price }}</text>
-						</view>
-						
-					</view>
-					<view class="goods-name">{{MyBeehiveInfo.name }}</view>
-				</view>
-				<view class="user-avatars">
-					<AvatarStackVue :avatars="MyBeehiveInfo.avatars" :size="48"></AvatarStackVue>
+		<scroll-view scroll-y class="scroll-content">
+		  <view class="goods-info">
+			<image src="/static/images/shoppingBg.png"></image>
+			<view class="info-left">
+			  <view class="info-content">
+				<view class="goods-price">
+				  ￥
+				  <text>{{adoptionType==2 ? MyBeehiveInfo.sharePrice : MyBeehiveInfo.price }}</text>
 				</view>
+			  </view>
+			  <view class="goods-name">{{MyBeehiveInfo.name }}</view>
 			</view>
-			<view class="progress-panel">
-				<view class="progress-title">
-					<text class="title-text">进度报告</text>
-					<text class="progress-text">{{(MyBeehiveInfo.process/5) *100}}%交付进度</text>
-				</view>
-				<view class="progress-content">
-					<view class="steps-container">
-						<view class="step-item" v-for="(step, index) in steps" :key="index">
-							<view class="step-ccontent">
-								<image :src="step.completed ? step.url : step.curl" class="step-icon"></image>
-								<text :class="['step-text', { 'completed-text': step.completed }]">{{ step.text }}</text>
-							</view>
-							<image v-if="index < steps.length - 1" src="/static/images/homePage/next.png" class="arrow-icon"></image>
-						</view>
-					</view>
-				</view>
+			<view class="user-avatars">
+			  <AvatarStackVue :avatars="MyBeehiveInfo.avatars" :size="48"></AvatarStackVue>
 			</view>
-			<view class="hive-state">
-				<view class="hive-title">蜂箱状态</view>
-				<view class="state-info">
-					<view class="info-item">
-						<view class="info-val">
-							{{ MyBeehiveInfo.beeNumber }}
-							<text class="unit">/万只</text>
-						</view>
-						<view class="info-name">蜜蜂数量</view>
-					</view>
-					<view class="info-item">
-						<view class="info-val">
-							{{ MyBeehiveInfo.beeAttendance }}
-							<text class="unit">/万次</text>
-						</view>
-						<view class="info-name">蜜蜂出勤</view>
-					</view>
-					<view class="info-item">
-						<view class="info-val">
-							{{ MyBeehiveInfo.beeYield }}
-							<text class="unit">/斤</text>
-						</view>
-						<view class="info-name">蜂蜜产量</view>
-					</view>
-					<view class="info-item">
-						<view class="info-val">
-							
-							<text class="unit">健康</text>
-						</view>
-						<view class="info-name">健康状态</view>
-					</view>
-					
-				</view>
+		  </view>
+		  <view class="progress-panel">
+			<view class="progress-title">
+			  <text class="title-text">进度报告</text>
+			  <text class="progress-text">{{(MyBeehiveInfo.process/5) * 100}}%交付进度</text>
 			</view>
-			
-				<view class="message-content">
-					<view v-if="MyBeehiveTask.length > 0">
-						<view class="message-item" v-for="item in MyBeehiveTask" :key="item">
-							<text class="message-type">{{ item.name }}</text>
-							{{item.finishUser }} {{ item.status }}
-						</view>
-					</view>
-					<view v-else class="message-item">
-						<text class="message-type">暂无任务描述</text>
-					</view>
+			<view class="progress-content">
+			  <view class="steps-container">
+				<view class="step-item" v-for="(step, index) in steps" :key="index">
+				  <view class="step-ccontent">
+					<image :src="step.completed ? step.url : step.curl" class="step-icon"></image>
+					<text :class="['step-text', { 'completed-text': step.completed }]">{{ step.text }}</text>
+				  </view>
+				  <image v-if="index < steps.length - 1" src="/static/images/homePage/next.png" class="arrow-icon"></image>
 				</view>
-		
+			  </view>
+			</view>
+		  </view>
+		  <view class="hive-state">
+			<view class="hive-title">蜂箱状态</view>
+			<view class="state-info">
+			  <view class="info-item">
+				<view class="info-val">
+				  {{ MyBeehiveInfo.beeNumber }}
+				  <text class="unit">/万只</text>
+				</view>
+				<view class="info-name">蜜蜂数量</view>
+			  </view>
+			  <view class="info-item">
+				<view class="info-val">
+				  {{ MyBeehiveInfo.beeAttendance }}
+				  <text class="unit">/万次</text>
+				</view>
+				<view class="info-name">蜜蜂出勤</view>
+			  </view>
+			  <view class="info-item">
+				<view class="info-val">
+				  {{ MyBeehiveInfo.beeYield }}
+				  <text class="unit">/斤</text>
+				</view>
+				<view class="info-name">蜂蜜产量</view>
+			  </view>
+			  <view class="info-item">
+				<view class="info-val">
+				  <text class="unit">健康</text>
+				</view>
+				<view class="info-name">健康状态</view>
+			  </view>
+			</view>
+		  </view>
+		  <view class="message-content">
+			<view v-if="MyBeehiveTask.length > 0">
+			  <view class="message-item" v-for="(item, index) in MyBeehiveTask" :key="index">
+				<text class="message-type">{{ item.name }}</text>
+				{{item.finishUser }} {{ item.status }}
+			  </view>
+			</view>
+			<view v-else class="message-item">
+			  <text class="message-type">暂无任务描述</text>
+			</view>
+		  </view>
 		</scroll-view>
-		
-	</view>
+	  </view>
 </view>
 </template>
-
-<script setup>
-
-import AvatarStackVue from '../../components/AvatarStack.vue';
-import TransNavVue from '../../components/TransNav.vue';
-import { ref, onMounted, watch } from 'vue'
-import { request } from '@/utils/request'
-const MyBeehiveInfo=ref({})
-const MyBeehiveTask=ref([])
-const beeId=ref('')
-const steps = ref([
+  
+  <script setup>
+  import AvatarStackVue from '../../components/AvatarStack.vue';
+  import TransNavVue from '../../components/TransNav.vue';
+  import { ref, onMounted, watch } from 'vue';
+  import { request } from '@/utils/request';
+  import { onShow } from '@dcloudio/uni-app'
+  
+  const MyBeehiveInfo = ref({});
+  const MyBeehiveTask = ref([]);
+  const beeId = ref('');
+  
+  const steps = ref([
 	{ text: '开始', completed: false, url: '/static/images/homePage/accomplish.png', curl: '/static/images/homePage/accomplishs.png' },
 	{ text: '采蜜', completed: false, url: '/static/images/homePage/bee.png', curl: '/static/images/homePage/bees.png' },
 	{ text: '分装', completed: false, url: '/static/images/homePage/classify.png', curl: '/static/images/homePage/classifys.png' },
 	{ text: '完成', completed: false, url: '/static/images/homePage/accomplish.png', curl: '/static/images/homePage/accomplishs.png' },
 	{ text: '交付', completed: false, url: '/static/images/homePage/delivery.png', curl: '/static/images/homePage/deliverys.png' }
-]);
-
-watch(MyBeehiveInfo, (newVal) => {
-    const processValue = parseInt(newVal.process);
-    if (!isNaN(processValue)) {
-        steps.value = steps.value.map((step, index) => ({
-            ...step,
-            completed: index < processValue
-        }));
-    }
-	
-}, { immediate: true });
-onMounted(() => {
-  const pages = getCurrentPages();
-  const currentPage = pages[pages.length - 1];
+  ]);
   
- 
-
-  // 保留原有事件通道监听
-  if (currentPage && currentPage.$vm) {
-    const eventChannel = currentPage.$vm.getOpenerEventChannel();
-    eventChannel.on('itemId', (data) => {
-      if (data?.beeId) {
-        beeId.value = data.beeId;
-        getBeeHiveInfo();
-		getBeeHiveTask()
-      } else {
-        console.error('未接收到有效的beeId参数');
-        uni.showToast({ title: '参数错误', icon: 'none' });
-      }
-    });
-  }
-})
-const getBeeHiveInfo = async () => {
-  try {
-    const res = await request({
-      url: `/app-api/front/beehive/get/info?id=${beeId.value}`,
-      showLoading: true, 
-    })
-    if (res.code === 0 ) {
-		MyBeehiveInfo.value=res.data
-    } else {
-      throw new Error(res.msg || '数据异常')
-    }
-  } catch (err) {
-    console.error('获取蜂场数据失败:', err)
-   
-  }
-}
-const getBeeHiveTask = async () => {
-  try {
-    const res = await request({
-      url: `/app-api/front/beehive/get/taskInfo?id=${beeId.value}`,
-      showLoading: true, 
-    })
-    if (res.code === 0 ) {
-		MyBeehiveTask.value=res.data
-    } else {
-      throw new Error(res.msg || '数据异常')
-    }
-  } catch (err) {
-    console.error('获取蜂场数据失败:', err)
-   
-  }
-}
+  watch(MyBeehiveInfo, (newVal) => {
+	const processValue = parseInt(newVal.process);
+	if (!isNaN(processValue)) {
+	  steps.value = steps.value.map((step, index) => ({
+		...step,
+		completed: index < processValue
+	  }));
+	}
+  }, { immediate: true });
+  
+  onShow(() => {
+	const pages = getCurrentPages();
+	const currentPage = pages[pages.length - 1];
+	
+	if (currentPage && currentPage.$vm) {
+	  const eventChannel = currentPage.$vm.getOpenerEventChannel();
+	  eventChannel.on('itemId', (data) => {
+		if (data?.beeId) {
+		  beeId.value = data.beeId;
+		  getBeeHiveInfo();
+		  getBeeHiveTask();
+		} else {
+		  uni.showToast({ title: '参数错误', icon: 'none' });
+		}
+	  });
+	}
+  });
+  
+  const getBeeHiveInfo = async () => {
+	try {
+	  const res = await request({
+		url: `/app-api/front/beehive/get/info?id=${beeId.value}`,
+		showLoading: true, 
+	  });
+	  if (res.code === 0) {
+		MyBeehiveInfo.value = res.data;
+	  } else {
+		throw new Error(res.msg || '数据异常');
+	  }
+	} catch (err) {
+	  console.error('获取蜂场数据失败:', err);
+	}
+  };
+  
+  const getBeeHiveTask = async () => {
+	try {
+	  const res = await request({
+		url: `/app-api/front/beehive/get/taskInfo?id=${beeId.value}`,
+		showLoading: true, 
+	  });
+	  if (res.code === 0) {
+		MyBeehiveTask.value = res.data;
+	  } else {
+		throw new Error(res.msg || '数据异常');
+	  }
+	} catch (err) {
+	  console.error('获取蜂场任务失败:', err);
+	}
+  };
 </script>
-
+  
 <style lang="scss" scoped>
-.container {
+  .container {
 	height: 100%;
 	display: flex;
 	flex-direction: column;
 	background: #efefef;
 	
 	.swiper-content {
-		height: 380rpx;
+	  height: 380rpx;
+	  width: 100%;
+	  border-radius: 24rpx;
+	  overflow: hidden;
+	  margin: auto;
+	  margin-top: 5rpx;
+	  
+	  .swiper {
 		width: 100%;
-		border-radius: 24rpx;
-		overflow: hidden;
-		margin: auto;
-		margin-top: 5rpx;
-		.swiper {
-			width: 100%;
-			height: 100%;
-			.swiper-image {
-				height: 100%;
-				width: 100%;
-			}
+		height: 100%;
+		
+		.swiper-image {
+		  height: 100%;
+		  width: 100%;
 		}
+	  }
 	}
+	
 	.scroll-content {
-		flex: 1;
-		height: 100rpx;
-		padding-top: 24rpx;
-		border-radius: 32rpx 32rpx 0rpx 0rpx;
-		margin-bottom: 44rpx;
-		.goods-info {
-			height: 180rpx;
-			width: 702rpx;
-			position: relative;
+	  flex: 1;
+	  padding-top: 24rpx;
+	  border-radius: 32rpx 32rpx 0rpx 0rpx;
+	  margin-bottom: 44rpx;
+	  
+	  .goods-info {
+		height: 180rpx;
+		width: 702rpx;
+		position: relative;
+		display: flex;
+		justify-content: space-between;
+		margin: auto;
+		z-index: 1;
+		
+		image {
+		  position: absolute;
+		  width: 100%;
+		  height: 100%;
+		  z-index: -1;
+		}
+		
+		.info-left {
+		  display: flex;
+		  flex-direction: column;
+		  
+		  .info-content {
+			margin-top: 20rpx;
+			margin-left: 30rpx;
+			height: 84rpx;
+			display: flex;
+			
+			.goods-price {
+			  font-weight: 500;
+			  font-size: 32rpx;
+			  color: #ec652c;
+			  
+			  text {
+				font-weight: bold;
+				font-size: 56rpx;
+				color: #eb5c20;
+			  }
+			}
+		  }
+		  
+		  .goods-name {
+			font-weight: bold;
+			font-size: 36rpx;
+			color: #1e1e1e;
+			margin-left: 30rpx;
+			margin-top: 10rpx;
+		  }
+		}
+		
+		.user-avatars {
+		  margin-top: 40rpx;
+		  margin-right: 30rpx;
+		}
+	  }
+	  
+	  .progress-panel {
+		margin: auto;
+		margin-top: 24rpx;
+		width: 702rpx;
+		height: 246rpx;
+		background: #ffffff;
+		box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(0, 0, 0, 0.03);
+		border-radius: 24rpx;
+		
+		.progress-content {
+		  padding: 20rpx 30rpx;
+		  
+		  .steps-container {
 			display: flex;
 			justify-content: space-between;
-			margin: auto;
-			z-index: 1;
-			image {
-				position: absolute;
-				width: 100%;
-				height: 100%;
-				z-index: -1;
-			}
-			.info-left {
+			
+			.step-item {
+			  display: flex;
+			  
+			  .step-ccontent {
 				display: flex;
 				flex-direction: column;
-				.info-content {
-					margin-top: 20rpx;
-					margin-left: 30rpx;
-					height: 84rpx;
-					display: flex;
-
-					.goods-price {
-						font-weight: 500;
-						font-size: 32rpx;
-						color: #ec652c;
-						text {
-							font-weight: bold;
-							font-size: 56rpx;
-							color: #eb5c20;
-						}
-					}
-					.goods-weight {
-						margin-left: 20rpx;
-						margin-top: 34rpx;
-						font-weight: 400;
-						font-size: 28rpx;
-						color: #999999;
-					}
+				width: 72rpx;
+				height: 116rpx;
+				
+				.step-icon {
+				  width: 72rpx;
+				  height: 72rpx;
 				}
-				.goods-name {
-					font-weight: bold;
-					font-size: 36rpx;
-					color: #1e1e1e;
-					margin-left: 30rpx;
-					margin-top: 10rpx;
+				
+				.step-text {
+				  margin-top: 8rpx;
+				  text-align: center;
+				  font-size: 24rpx;
+				  color: #999999;
+				  line-height: 36rpx;
+				  
+				  &.completed-text {
+					color: #101010;
+				  }
 				}
+			  }
+			  
+			  .arrow-icon {
+				margin: 0 20rpx;
+				margin-top: 28rpx;
+				width: 27rpx;
+				height: 23rpx;
+			  }
 			}
-			.user-avatars {
-				margin-top: 40rpx;
-				margin-right: 30rpx;
-			}
+		  }
 		}
-		.progress-panel {
-			margin: auto;
-			margin-top: 24rpx;
-			width: 702rpx;
-			height: 246rpx;
-			background: #ffffff;
-			box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(0, 0, 0, 0.03);
-			border-radius: 24rpx;
-			.progress-content {
-				padding: 20rpx 30rpx;
-				.steps-container {
-					display: flex;
-					justify-content: space-between;
-					.step-item {
-						display: flex;
-						.step-ccontent {
-							display: flex;
-							flex-direction: column;
-							width: 72rpx;
-							height: 116rpx;
-							.step-icon {
-								width: 72rpx;
-								height: 72rpx;
-							}
-							.step-text {
-								margin-top: 8rpx;
-								text-align: center;
-								font-size: 24rpx;
-								color: #999999;
-								line-height: 36rpx;
-								&.completed-text {
-									color: #101010;
-								}
-							}
-						}
-						.arrow-icon {
-							margin: 0 20rpx;
-							margin-top: 28rpx;
-							width: 27rpx;
-							height: 23rpx;
-						}
-					}
-				}
-			}
-			.progress-title {
-				padding: 0 30rpx;
-				display: flex;
-				justify-content: space-between;
-				.title-text {
-					margin-top: 26rpx;
-					font-weight: 500;
-					font-size: 32rpx;
-					color: #1e1e1e;
-					line-height: 46rpx;
-				}
-				.progress-text {
-					margin-top: 38rpx;
-					font-weight: 400;
-					font-size: 26rpx;
-					color: #999999;
-					line-height: 40rpx;
-				}
-			}
+		
+		.progress-title {
+		  padding: 0 30rpx;
+		  display: flex;
+		  justify-content: space-between;
+		  
+		  .title-text {
+			margin-top: 26rpx;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #1e1e1e;
+			line-height: 46rpx;
+		  }
+		  
+		  .progress-text {
+			margin-top: 38rpx;
+			font-weight: 400;
+			font-size: 26rpx;
+			color: #999999;
+			line-height: 40rpx;
+		  }
 		}
-		.hive-state {
-			padding: 26rpx 30rpx;
-			margin: auto;
-			margin-top: 24rpx;
-			width: 702rpx;
-			height: 210rpx;
-			background: #ffffff;
-			box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(0, 0, 0, 0.03);
-			border-radius: 16rpx;
-			.hive-title {
-				font-weight: 500;
-				font-size: 32rpx;
-				color: #1e1e1e;
-				line-height: 46rpx;
-			}
-			.state-info {
-				margin-top: 22rpx;
-				display: grid;
-				grid-template-columns: repeat(4, 1fr);
-				.info-item {
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					.info-val {
-						font-weight: bold;
-						font-size: 32rpx;
-						color: #000000;
-						line-height: 48rpx;
-						.unit {
-							font-weight: 400;
-							font-size: 20rpx;
-							color: #999999;
-						}
-					}
-					.info-name {
-						font-size: 24rpx;
-						color: #999999;
-						line-height: 36rpx;
-					}
-				}
-			}
+	  }
+	  
+	  .hive-state {
+		padding: 26rpx 30rpx;
+		margin: auto;
+		margin-top: 24rpx;
+		width: 702rpx;
+		height: 210rpx;
+		background: #ffffff;
+		box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(0, 0, 0, 0.03);
+		border-radius: 16rpx;
+		
+		.hive-title {
+		  font-weight: 500;
+		  font-size: 32rpx;
+		  color: #1e1e1e;
+		  line-height: 46rpx;
 		}
-		.message-content {
-			margin: auto;
-			margin-top: 24rpx;
-			padding: 32rpx 28rpx;
-			width: 717rpx;
-			height: 280rpx;
-			background: #ffffff;
-			box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(0, 0, 0, 0.03);
-			border-radius: 16rpx 16rpx 16rpx 16rpx;
-			.message-item {
-				margin-bottom: 20rpx;
-				display: flex;
-				align-items: center;
-				font-size: 26rpx;
-				color: #262626;
-				line-height: 40rpx;
-				.message-type {
-					font-size: 26rpx;
-					color: #999999;
-					margin-right: 32rpx;
-				}
+		
+		.state-info {
+		  margin-top: 22rpx;
+		  display: grid;
+		  grid-template-columns: repeat(4, 1fr);
+		  
+		  .info-item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			
+			.info-val {
+			  font-weight: bold;
+			  font-size: 32rpx;
+			  color: #000000;
+			  line-height: 48rpx;
+			  
+			  .unit {
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #999999;
+			  }
 			}
+			
+			.info-name {
+			  font-size: 24rpx;
+			  color: #999999;
+			  line-height: 36rpx;
+			}
+		  }
 		}
+	  }
+	  
+	  .message-content {
+		margin: auto;
+		margin-top: 24rpx;
+		padding: 32rpx 28rpx;
+		width: 717rpx;
+		height: 280rpx;
+		background: #ffffff;
+		box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(0, 0, 0, 0.03);
+		border-radius: 16rpx;
+		
+		.message-item {
+		  margin-bottom: 20rpx;
+		  display: flex;
+		  align-items: center;
+		  font-size: 26rpx;
+		  color: #262626;
+		  line-height: 40rpx;
+		  
+		  .message-type {
+			font-size: 26rpx;
+			color: #999999;
+			margin-right: 32rpx;
+		  }
+		}
+	  }
 	}
-}
-</style>
+  }
+  </style>
\ No newline at end of file
diff --git a/pages/myPage/myPage.vue b/pages/myPage/myPage.vue
index 264ea5d..7f56cc3 100644
--- a/pages/myPage/myPage.vue
+++ b/pages/myPage/myPage.vue
@@ -152,393 +152,235 @@
 
 <script setup>
 import { getStatusBarHeight, getTitleBarHeight } from '../../utils/system'
-
 import BeeTabbarVue from '../../components/BeeTabbar.vue'
-import {ref,onMounted,} from 'vue'
-import { onShow ,onShareAppMessage} from '@dcloudio/uni-app'
+import { ref } from 'vue'
+import { onShareAppMessage, onShow } from '@dcloudio/uni-app'
 import { useTokenStorage } from '../../utils/storage'
-const {  getAccessToken ,getOpenId} = useTokenStorage()
 import { request } from '@/utils/request'
 
+const { getAccessToken, clearToken } = useTokenStorage()
 const userInfo = ref({})
 const commissionData = ref({})
-const isBeeFarm=ref({})
+const isBeeFarm = ref({})
 
+// 处理登录检查和导航的公共函数
+const navigateIfLoggedIn = (url) => {
+	if (!getAccessToken()) {
+		uni.showModal({
+			title: '提示',
+			content: '请先登录',
+			success: (res) => {
+				if (res.confirm) {
+					uni.navigateTo({ url: '/pages/login/login' })
+				}
+			}
+		})
+	} else {
+		uni.navigateTo({ url })
+	}
+}
 
 // 点击分享按钮时执行的函数
 const handleClickShare = (e) => {
-  // 如果用户未登录，可以在这里处理登录逻辑
-  if (!getAccessToken()) {
-    e.stopPropagation() // 阻止默认分享行为
-    uni.showModal({
-      title: '提示',
-      content: '请先登录再分享',
-      success: (res) => {
-        if (res.confirm) {
-          uni.navigateTo({ url: '/pages/login/login' })
-        }
-      }
-    })
-  }
-
+	if (!getAccessToken()) {
+		e.stopPropagation()
+		uni.showModal({
+			title: '提示',
+			content: '请先登录再分享',
+			success: (res) => {
+				if (res.confirm) {
+					uni.navigateTo({ url: '/pages/login/login' })
+				}
+			}
+		})
+	}
 }
-
-
 // 注册全局分享钩子
 onShareAppMessage(() => {
-  // 这里只处理已登录用户的分享配置
-  if (!getAccessToken()) {
-    return false // 阻止未登录用户的分享
-  }
-  
-  return {
-    title: '智慧养蜂，快来领养吧',
-    imageUrl: '/static/images/myPage/Invitation.png', 
-    path: `/pages/login/login?shareUserId=${userInfo.value.id}` ,
-    success: () => {
-      uni.showToast({
-        title: '分享成功',
-        icon: 'success'
-      })
-    },
-    fail: (err) => {
-      uni.showToast({
-        title: '分享失败',
-        icon: 'none'
-      })
-    }
-  }
+	if (!getAccessToken()) {
+		return false
+	}
+
+	return {
+		title: '智慧养蜂，快来领养吧',
+		imageUrl: '/static/images/myPage/Invitation.png',
+		path: `/pages/login/login?shareUserId=${userInfo.value.id}`,
+		success: () => {
+			uni.showToast({
+				title: '分享成功',
+				icon: 'success'
+			})
+		},
+		fail: (err) => {
+			uni.showToast({
+				title: '分享失败',
+				icon: 'none'
+			})
+		}
+	}
 })
-const toLogo=()=>{
-	uni.navigateTo({ url: '/pages/login/login' })	
+
+const toLogin = () => {
+	uni.navigateTo({ url: '/pages/login/login' })
 }
 
 onShow(() => {
-  if (!getAccessToken()) {
-    uni.showModal({
-      title: '提示',
-      content: '您尚未登录，请先登录',
-      confirmText: '去登录',
-      cancelText: '取消',
-      success: (res) => {
-        if (res.confirm) {
-          uni.navigateTo({ url: '/pages/login/login' })
-        }
-      }
-    })
-  } else {
-    getMyInfo()
-    getCommissionDetail()
-    // getWalletInfo()
-	getIsBeeFarm()
-  }
+	if (!getAccessToken()) {
+		uni.showModal({
+			title: '提示',
+			content: '您尚未登录，请先登录',
+			confirmText: '去登录',
+			cancelText: '取消',
+			success: (res) => {
+				if (res.confirm) {
+					uni.navigateTo({ url: '/pages/login/login' })
+				}
+			}
+		})
+	} else {
+		getMyInfo()
+		getCommissionDetail()
+		getIsBeeFarm()
+	}
 })
 
-
-
-//跳转到客服服务
-const gotoCustomerService = () => {
-  if (!getAccessToken()) {
-    uni.showModal({
-      title: '提示',
-      content: '请先登录',
-      success: (res) => {
-        if (res.confirm) {
-          uni.navigateTo({ url: '/pages/login/login' })
-        }
-      }
-    })
-  } else {
-    uni.navigateTo({
-      url: '/pages/customerService/customerService'
-    })
-  }
-}
-
 // 跳转佣金详情
 const gotoCommission = () => {
-	if (!getAccessToken()) {
-    uni.showModal({
-      title: '提示',
-      content: '请先登录',
-      success: (res) => {
-        if (res.confirm) {
-          uni.navigateTo({ url: '/pages/login/login' })
-        } 
-      }
-    })
-  } else{
-	uni.navigateTo({
-    url: '/pages/commissionDetail/commissionDetail'
-  })
-  }
-
-  
+	navigateIfLoggedIn('/pages/commissionDetail/commissionDetail')
 }
+
 // 跳转提现
 const gotoWithdraw = () => {
-	if (!getAccessToken()) {
-    uni.showModal({
-      title: '提示',
-	  content: '请先登录',
-      success: (res) => {
-        if (res.confirm) {
-          uni.navigateTo({ url: '/pages/login/login' })
-        } 
-      }
-    })
-  } else{
-	uni.navigateTo({
-    url: '/pages/withdraw/withdraw',
-    success: (res) => {
-      res.eventChannel.emit('walletData', walletData.value)
-    }
-  })
-  }
- 
- 
+	navigateIfLoggedIn('/pages/withdraw/withdraw')
 }
 
-
 // 跳转认养记录
 const gotAdoptionRecords = () => {
-	if (!getAccessToken()) {
-    uni.showModal({
-      title: '提示',
-      content: '请先登录',
-      success: (res) => {
-        if (res.confirm) {
-          uni.navigateTo({ url: '/pages/login/login' })
-        }
-      }
-    })
-	}else{
-		uni.navigateTo({
-    url: '/pages/adoptionRecords/adoptionRecords'
-  })
-	}	
+	navigateIfLoggedIn('/pages/adoptionRecords/adoptionRecords')
 }
+
 // 跳转订单列表
 const gotoOrderList = () => {
-	if (!getAccessToken()) {
-    uni.showModal({
-      title: '提示',
-      content: '请先登录',
-      success: (res) => {
-        if (res.confirm) {
-          uni.navigateTo({ url: '/pages/login/login' })
-        }
-      }
-    })
-	}else{
-		uni.navigateTo({
-    url: '/pages/orderList/orderList'
-  })
-	}
+	navigateIfLoggedIn('/pages/orderList/orderList')
 }
+
 // 跳转蜂农入住
 const gotoBeeFarmerJion = () => {
-    if (!getAccessToken()) {
-        uni.showModal({
-            title: '提示',
-            content: '请先登录',
-            success: (res) => {
-                if (res.confirm) {
-                    uni.navigateTo({ url: '/pages/login/login' })
-                }
-            }
-        })
-    } else {
-        if (isBeeFarm.value.auditStatus == 1 ) {
-            uni.navigateTo({
-                url: '/pages/beeFarmInfo/beeFarmInfo'
-            })
-        } else if(isBeeFarm.value.auditStatus == 0){
-            uni.navigateTo({
-                url: '/pages/beeFarmerJion/jionFeedback'
-            })
-        } 
-		 else {
-            uni.navigateTo({
-                url: '/pages/beeFarmerJion/beeFarmerJion'
-            })
-        } 
-    }
+	if (!getAccessToken()) {
+		uni.showModal({
+			title: '提示',
+			content: '请先登录',
+			success: (res) => {
+				if (res.confirm) {
+					uni.navigateTo({ url: '/pages/login/login' })
+				}
+			}
+		})
+	} else {
+		if (isBeeFarm.value.auditStatus == 1) {
+			uni.navigateTo({
+				url: '/pages/beeFarmerJion/beeFarmInfo'
+			})
+		} else if (isBeeFarm.value.auditStatus == 0) {
+			uni.navigateTo({
+				url: '/pages/beeFarmerJion/jionFeedback'
+			})
+		} else {
+			uni.navigateTo({
+				url: '/pages/beeFarmerJion/beeFarmerJion'
+			})
+		}
+	}
 }
+
 // 跳转智能养蜂
 const gotoSmartBee = () => {
-	if (!getAccessToken()) {
-    uni.showModal({
-      title: '提示',
-      content: '请先登录',
-      success: (res) => {
-        if (res.confirm) {
-          uni.navigateTo({ url: '/pages/login/login' })
-        }
-      }
-    })
-	}else{
-		uni.navigateTo({
-    url: '/pages/smartBee/smartBee'
-  })
-	}
+	navigateIfLoggedIn('/pages/smartBee/smartBee')
 }
+
 // 跳转消息
 const gotoMessagePage = () => {
-	if (!getAccessToken()) {
-    uni.showModal({
-      title: '提示',
-      content: '请先登录',
-      success: (res) => {
-        if (res.confirm) {
-          uni.navigateTo({ url: '/pages/login/login' })
-        }
-      }
-    })
-	}else{
-		uni.navigateTo({
-    url: '/pages/messagePage/messagePage'
-  })
-	}
+	navigateIfLoggedIn('/pages/messagePage/messagePage')
 }
+
 // 跳转问卷调查
 const gotoSurveyList = () => {
-	if (!getAccessToken()) {
-    uni.showModal({
-      title: '提示',
-      content: '请先登录',
-      success: (res) => {
-        if (res.confirm) {
-          uni.navigateTo({ url: '/pages/login/login' })
-        }
-      }
-    })
-	}else{
-		uni.navigateTo({
-    url: '/pages/surveyList/surveyList'
-  })
-	}
+	navigateIfLoggedIn('/pages/surveyList/surveyList')
 }
+
 // 跳转用户信息
 const gotoUserInfo = () => {
-	if (!getAccessToken()) {
-    uni.showModal({
-      title: '提示',
-      content: '请先登录',
-      success: (res) => {
-        if (res.confirm) {
-          uni.navigateTo({ url: '/pages/login/login' })
-        }
-      }
-    })
-	}else{
-		uni.navigateTo({
-    url: '/pages/userInfo/userInfo'
-  })
-	}
+	navigateIfLoggedIn('/pages/userInfo/userInfo')
+}
+
+// 跳转客服服务
+const gotoCustomerService = () => {
+	navigateIfLoggedIn('/pages/customerService/customerService')
 }
 
 // 获取佣金详情
 const getCommissionDetail = async () => {
 	try {
-    const res = await request({
-      url: '/app-api/weixin/distribution/get/commission/info',
-      showLoading: true, 
-    
-    })
-    
-    if (res.code === 0 || res.code === 200) {
-     commissionData.value=res.data || {};
-      
-    } else {
-      throw new Error(res.msg || '数据异常')
-    }
-  } catch (err) {
-    console.error('获取用户信息失败:', err)
-   
-  }
+		const res = await request({
+			url: '/app-api/weixin/distribution/get/commission/info',
+			showLoading: true,
+		})
+		if (res.code === 0 || res.code === 200) {
+			commissionData.value = res.data || {};
+		}
+	} catch (err) {
+		console.error('获取佣金信息失败:', err)
+	}
 }
-// 获取钱包信息
-// const getWalletInfo = async () => {
-// 	try {
-//     const res = await request({
-//       url: '/app-api/WeiXinMini/wallet/get/Info',
-//       showLoading: true, 
-     
-//     })
-    
-//     if (res.code === 0 || res.code === 200) {
-//      walletData.value = res.data || {};
-   
-//     } else {
-//       throw new Error(res.msg || '数据异常')
-//     }
-//   } catch (err) {
-//     console.error('获取用户信息失败:', err)
-   
-//   }
-// }
+
 // 获取用户信息
 const getMyInfo = async () => {
-  try {
-    const res = await request({
-      url: '/app-api/weixin/user/get/myInfo',
-      showLoading: true, 
-      
-    })
-    
-    if (res.code === 0 || res.code === 200) {
-     userInfo.value = res.data || {};
-      
-    } else {
-      throw new Error(res.msg || '数据异常')
-    }
-  } catch (err) {
-    console.error('获取用户信息失败:', err)
-   
-  }
+	try {
+		const res = await request({
+			url: '/app-api/weixin/user/get/myInfo',
+			showLoading: true,
+		})
+		if (res.code === 0 || res.code === 200) {
+			userInfo.value = res.data || {};
+		}
+	} catch (err) {
+		console.error('获取用户信息失败:', err)
+	}
 }
-//获取是否是蜂农入驻
+
+// 获取是否是蜂农入驻
 const getIsBeeFarm = async () => {
-  try {
-    const res = await request({
-      url: '/app-api/weixin/beeFarmApply/get',
-      showLoading: true, 
-      
-    })
-    
-    if (res.code === 0 || res.code === 200) {
-		isBeeFarm.value=res.data
-      
-    } else {
-      throw new Error(res.msg || '数据异常')
-    }
-  } catch (err) {
-    console.error('获取用户信息失败:', err)
-   
-  }
+	try {
+		const res = await request({
+			url: '/app-api/weixin/beeFarmApply/get',
+			showLoading: true,
+		})
+		if (res.code === 0 || res.code === 200) {
+			isBeeFarm.value = res.data
+		}
+	} catch (err) {
+		console.error('获取蜂农入驻信息失败:', err)
+	}
 }
-//退出登录
+
+// 退出登录
 const logout = () => {
-  uni.showModal({
-    title: '提示',
-    content: '确定要注销登录吗？',
-    success: (res) => {
-      if (res.confirm) {
-        const { clearToken } = useTokenStorage()
-        clearToken()
-        userInfo.value = {}
-        commissionData.value = {}
-        uni.showToast({
-          title: '已退出登录',
-          icon: 'success'
-        })
-      }
-    }
-  })
+	uni.showModal({
+		title: '提示',
+		content: '确定要注销登录吗？',
+		success: (res) => {
+			if (res.confirm) {
+				clearToken()
+				userInfo.value = {}
+				commissionData.value = {}
+				uni.showToast({
+					title: '已退出登录',
+					icon: 'success'
+				})
+			}
+		}
+	})
 }
-
-
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/orderList/orderList.vue b/pages/orderList/orderList.vue
index f10b66f..2e6dd7d 100644
--- a/pages/orderList/orderList.vue
+++ b/pages/orderList/orderList.vue
@@ -2,19 +2,13 @@
  <view>
   <TransNavVue title="订单列表" />
   <view class="container">
-    <!-- 导航栏 -->
+
     <view class="nav-tabs">
-      <view 
-        v-for="tab in tabs" 
-        :key="tab.value"
-        :class="['tab-item', {active: activeTab === tab.value}]"
-        @click="activeTab = tab.value"
-      >
+      <view   v-for="tab in tabs"  :key="tab.value" :class="['tab-item', {active: activeTab === tab.value}]" @click="activeTab = tab.value">
         <text>{{ tab.label }}</text>
       </view>
     </view>
     
-    <!-- 列表内容 -->
     <scroll-view scroll-y class="list-container">
       <view 
         v-for="item in filteredList" 
@@ -46,12 +40,11 @@
 </template>
 
 <script setup>
-import { ref, computed , onMounted} from 'vue';
+import { ref, computed , } from 'vue';
 import { request } from '@/utils/request'
-import { useTokenStorage } from '../../utils/storage'
 import TransNavVue from '../../components/TransNav.vue';
-import { getStatusBarHeight, getTitleBarHeight, getNarBarHeight } from '../../utils/system';
-const { getAccessToken} = useTokenStorage()
+import { getNarBarHeight,formatDateTime } from '../../utils/system';
+import { onShow } from '@dcloudio/uni-app'
 
 const tabs = [
   { label: '全部订单', value: '' },
@@ -62,30 +55,18 @@ const tabs = [
 ];
 
 const activeTab = ref('');
-
 // 模拟数据
-const records = ref([
-  {
-    adoptCircle: 3,
-adoptType: 2,
-beehiveId: 24989,
-id: 6,
-price: 473,
-sharedPrice: 279,
-status: 2,
-userId: 23038,
-     image: '/static/images/养蜂.png'
-  },
-
-]);
+const records = ref([]);
 
 const filteredList = computed(() => {
   if (activeTab.value === '') return records.value;
   return records.value.filter(item => item.status === activeTab.value);
 });
 
+
 const getStatusColor = (status) => {
   const colors = {
+    0:  '#f50101',  //待支付
     1: '#ff6f0e', // 待发货 - 橙色
     2: '#1989fa', // 已发货 - 蓝色 
     3: '#909399', // 已取消 - 灰色
@@ -93,21 +74,22 @@ const getStatusColor = (status) => {
   };
   return colors[status] || '#1989fa';
 };
-
 const getStatusText = (status) => {
   const texts = {
+    0:'未支付',
     1: '待发货',
     2: '已发货', 
     3: '已取消',
-    4: '已完成'
+    4: '已完成',
+    5:  '已退款',
+   
   };
-  return texts[status] || '未支付';
+  return texts[status] || '未知状态';
 };
 
-onMounted(() => {
+onShow(() => {
   getRecordsList()
  
-
 })
 //获取认养记录记录
 const getRecordsList= async () => {
@@ -118,23 +100,17 @@ const getRecordsList= async () => {
     
     })
     
-    if (res.code === 0 || res.code === 200) {
+    if (res.code === 0 ) {
       records.value = res.data || [];
       
     } else {
       throw new Error(res.msg || '数据异常')
     }
   } catch (err) {
-    console.error('获取认养记录失败:', err)
+    console.error('获取订单记录失败:', err)
    
   }
 }
-// 时间戳转换
-const formatDateTime = (dateString) => {
-  if (!dateString) return ''
-  const date = new Date(dateString)
-  return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}:${String(date.getSeconds()).padStart(2, '0')}`
-}
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/shoppingMall/shopDetails.vue b/pages/shoppingMall/shopDetails.vue
index 988ffb6..0e18199 100644
--- a/pages/shoppingMall/shopDetails.vue
+++ b/pages/shoppingMall/shopDetails.vue
@@ -13,8 +13,11 @@
 
         </view>
         <view class="swiper-title">
-          <view><text class="money">￥{{commodityDetails.price}}</text> <text class="discounts">优惠券</text><text
-                class="sale">满50-20</text> </view>
+          <view>
+			<text class="money">￥{{commodityDetails.price}}</text> 
+			<!-- <text class="discounts">优惠券</text>
+			 <text class="sale">满50-20</text>  -->
+			</view>
           <view class="kg">净重 {{commodityDetails.weight}}克</view>
         </view>
       </view>
@@ -69,15 +72,11 @@
 </style>
 
 <script setup>
-	import {
-		ref,
-		onMounted
-	} from 'vue'
+	import {ref,onMounted} from 'vue'
 	import TransNavVue from '../../components/TransNav.vue';
-	import {
-		request
-	} from '@/utils/request'
+	import {request} from '@/utils/request'
 	import { useTokenStorage } from '../../utils/storage'  // 新增导入
+	import { onShow } from '@dcloudio/uni-app'
 
 	const { getAccessToken } = useTokenStorage()  // 新增获取token方法
 	// 删除useRoute引入，改用uni-app方式获取参数
@@ -166,7 +165,7 @@
 	}
 
 	// 初始化数据
-	onMounted(() => {
+	onShow(() => {
 	  const pages = getCurrentPages()
 	  const currentPage = pages[pages.length - 1]
 	  const options = currentPage.$page.options || currentPage.options
diff --git a/pages/shoppingCart/shoppingCart.vue b/pages/shoppingMall/shoppingCart.vue
similarity index 99%
rename from pages/shoppingCart/shoppingCart.vue
rename to pages/shoppingMall/shoppingCart.vue
index 44d6e8a..bd5b90a 100644
--- a/pages/shoppingCart/shoppingCart.vue
+++ b/pages/shoppingMall/shoppingCart.vue
@@ -112,8 +112,9 @@
   <script setup>
   import { ref, computed, onMounted } from 'vue';
   import { request } from '@/utils/request';
-  import { useTokenStorage } from '../../utils/storage'; 
+
   import TransNavVue from '../../components/TransNav.vue';
+  import { onShow } from '@dcloudio/uni-app'
   
   // 状态与数据
   const isEdit = ref(false);        // 编辑状态
@@ -150,7 +151,7 @@
 	}
   };
   
-  onMounted(() => {
+  onShow(() => {
 	getCartList();
   });
   
diff --git a/pages/shoppingMall/shoppingMall.vue b/pages/shoppingMall/shoppingMall.vue
index 6a8a859..e108ffc 100644
--- a/pages/shoppingMall/shoppingMall.vue
+++ b/pages/shoppingMall/shoppingMall.vue
@@ -8,14 +8,13 @@
         </view>
    
         <scroll-view scroll-y="true" class="scroll-view" enable-flex>
-            <view class="scroll-content">
+
+            <view v-if="shoppingList.length === 0" class="empty-container"> 
+                <text class="empty-text">暂无商品</text> 
+            </view>
+            <view class="scroll-content" v-else>
                 <view class="goods-item" v-for="(item,index) in shoppingList" :key="index" @click="shopDetails(item)">
-                    <image 
-              :src="item.imgUrl" 
-              mode="aspectFill" 
-              class="goods-image"
-              lazy-load="true"
-            ></image>
+                 <image  :src="item.imgUrl"  mode="aspectFill"  class="goods-image" lazy-load="true" ></image>
                     <view class="goods-title" >{{item.name}}</view>
                     <view class="goods-info">
                         <view class="goods-weight">
@@ -48,16 +47,12 @@ import BeeTabbarVue from '../../components/BeeTabbar.vue';
 import { ref, onMounted } from 'vue'
 import { request } from '@/utils/request'
 import { onShow } from '@dcloudio/uni-app'
-const shoppingList=ref([])
 import { useTokenStorage } from '../../utils/storage'
 
-const {  getAccessToken } = useTokenStorage()
+const { getAccessToken } = useTokenStorage()
+const shoppingList=ref([])
 
-const gotoMessage =()=>{
-    uni.navigateTo({
-        url:'/pages/messagePage/messagePage'
-    })
-}
+// 跳转购物车
 const gotoCart = ()=>{
     if (!getAccessToken()) {
     uni.showModal({
@@ -71,16 +66,19 @@ const gotoCart = ()=>{
     })
 	}else{
         uni.navigateTo({
-        url:'/pages/shoppingCart/shoppingCart'
+        url:'/pages/shoppingMall/shoppingCart'
     })
 	}
    
 }
+// 跳转详情
 const shopDetails = (item)=>{
     uni.navigateTo({
         url:`/pages/shoppingMall/shopDetails?id=${item.id}`
     })
 }
+
+//单独购买
 const shoppingBuy = async (item)=>{
     const res = await request({
 	      url: '/app-api/trade/cart/add',
@@ -95,14 +93,13 @@ const shoppingBuy = async (item)=>{
  if (res.code === 0 ){
     const selectedItems = [
     {
-     count: 1,
+    count: 1,
     sku: {
     id:item.id, 
     picUrl: item.imgUrl,
     name: item.name,
-     weight: item.weight,
-      price: item.price *100,}
-
+    weight: item.weight,
+    price: item.price *100,}
     }
 ]
   
@@ -127,10 +124,9 @@ const getShoppingList = async () => {
       url: '/app-api/WeiXinMini/product/get/productList',
       showLoading: true, 
     })
-    if (res.code === 0 || res.code === 200) {
+    if (res.code === 0 ) {
 	shoppingList.value=res.data
 	
-		
     } else {
       throw new Error(res.msg || '数据异常')
     }
@@ -140,8 +136,6 @@ const getShoppingList = async () => {
    
   }
 }
-
-
 onShow(() => {
   getShoppingList()
 })
@@ -293,5 +287,20 @@ onShow(() => {
             }
         }
     }
+    .empty-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 60vh;
+  
+ 
+  
+  .empty-text {
+    font-size: 28rpx;
+    color: #999;
+  }
+ 
+}
 }
 </style>
\ No newline at end of file
diff --git a/pages/shoppingMall/shoppingPay.vue b/pages/shoppingMall/shoppingPay.vue
index 6f8bdbb..e15c40c 100644
--- a/pages/shoppingMall/shoppingPay.vue
+++ b/pages/shoppingMall/shoppingPay.vue
@@ -359,7 +359,7 @@ onShow(() => {
     
 });
 
-onMounted(() => {
+onShow(() => {
     // 获取从购物车或商品详情页传递过来的商品信息
     const pages = getCurrentPages();
     const currentPage = pages[pages.length - 1];
@@ -370,16 +370,9 @@ onMounted(() => {
         eventChannel.on('acceptSelectedItems', (data) => {
             if (data?.selectedItems && data.selectedItems.length > 0) {
                 selectedItems.value = data.selectedItems;
-
                 calculateTotalPrice();
                 getAddressList();
-                // 不自动获取优惠券，由用户手动点击选择
-            } else {
-                uni.showToast({ title: '参数错误', icon: 'none' });
-                setTimeout(() => {
-                    uni.navigateBack();
-                }, 1500);
-            }
+            } 
         });
     }
 });
diff --git a/pages/smartBee/smartBee.vue b/pages/smartBee/smartBee.vue
index bc57f87..1d92cf3 100644
--- a/pages/smartBee/smartBee.vue
+++ b/pages/smartBee/smartBee.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <TransNavVue title="认养记录" />
+    <TransNavVue title="智能养蜂" />
   <view class="container">
     <scroll-view scroll-y class="content">
       <!-- 使用v-for遍历后端数据 -->
@@ -20,6 +20,7 @@
       <!-- 弹窗组件 -->
       <uni-popup ref="popup" type="center">
         <view class="popup-content">
+          <view class="popup-title">详情</view>
           <scroll-view scroll-y class="detail-scroll">
             <text class="detail-text">{{ currentContent }}</text>
           </scroll-view>
@@ -38,19 +39,19 @@
 </template>
 
 <script setup>
-import { ref,  onMounted} from 'vue';
+import { ref} from 'vue';
 import { request } from '@/utils/request'
 import TransNavVue from '../../components/TransNav.vue'
+import { onShow } from '@dcloudio/uni-app'
 const smartBeeList=ref([])
 const popup=ref(null)
 
-onMounted(() => {
+onShow(() => {
   getSmartBeeList()
  
 
 })
 //获取智能养蜂内容
-
 const getSmartBeeList= async () => {
   try {
     const res = await request({
@@ -71,16 +72,16 @@ const getSmartBeeList= async () => {
     })
   }
 }
-const showDialog = ref(false)
+
 const currentContent = ref('')
 
 const showDetail = (content) => {
   currentContent.value = content
-  // popup.value.open()
+  popup.value.open()
 }
 
 const closeDetail = () => {
-  // popup.value.close()
+  popup.value.close()
 }
 </script>
 
@@ -144,12 +145,11 @@ const closeDetail = () => {
 }
 
 .popup-content {
-  background: #fff;
-  padding: 40rpx;
-  border-radius: 16rpx;
-  max-width: 80vw;
-  max-height: 70vh;
-  
+	width: 600rpx;
+	background: #fff;
+	border-radius: 24rpx;
+  padding: 20rpx;
+	
   .detail-scroll {
     max-height: 60vh;
     
@@ -159,15 +159,25 @@ const closeDetail = () => {
       color: #333;
     }
   }
-  
-  .close-btn {
-    margin-top: 30rpx;
-    background: #f0f0f0;
-    color: #666;
-    font-size: 28rpx;
-    padding: 10rpx 30rpx;
-    border-radius: 8rpx;
-    float: right;
-  }
+	
+
+	.popup-title {
+		font-weight: bold;
+		font-size: 40rpx;
+		color: #ff7f00;
+		text-align: center;
+		margin-bottom: 20rpx;
+	}
+
+
+	.close-btn {
+		
+		height: 80rpx;
+		background: #ff6f0e;
+		color: #fff;
+		border-radius: 40rpx;
+		font-size: 30rpx;
+	}
 }
+
 </style>
\ No newline at end of file
diff --git a/pages/surveyList/surveyList.vue b/pages/surveyList/surveyList.vue
index 50af20e..c0fdac5 100644
--- a/pages/surveyList/surveyList.vue
+++ b/pages/surveyList/surveyList.vue
@@ -35,6 +35,7 @@
 import { ref, onMounted } from 'vue'
 import { request } from '@/utils/request'
 import TransNavVue from '../../components/TransNav.vue';
+import { onShow } from '@dcloudio/uni-app'
 
 
 const surveyList = ref([
@@ -48,7 +49,7 @@ const handleSurveyClick = (id) => {
   })
 }
 
-onMounted(() => {
+onShow(() => {
   getQuestionList()
 })
 
diff --git a/pages/traceabilityManagement/addProduct.vue b/pages/traceabilityManagement/addProduct.vue
index f97a1e2..cc97482 100644
--- a/pages/traceabilityManagement/addProduct.vue
+++ b/pages/traceabilityManagement/addProduct.vue
@@ -69,10 +69,11 @@
 <script setup>
 import { ref, onMounted } from 'vue';
 import TransNavVue from '../../components/TransNav.vue';
-import { request } from '@/utils/request';
-
+import { request,uploadImage } from '@/utils/request';
+import { onShow } from '@dcloudio/uni-app'
 
 const BASE_URL = 'https://www.cdsrh.top'
+
 const formData = ref({
   name: '',
   describe: '',
@@ -90,7 +91,7 @@ const imageList = ref([]); //暂时储存的图片
 const isEditMode = ref(false)
 const productId = ref('') // 添加商品ID存储
 
-onMounted(() => {
+onShow(() => {
   const pages = getCurrentPages()
   const currentPage = pages[pages.length - 1]
   const beeFarmId = currentPage.$page.options || currentPage.options
@@ -118,6 +119,8 @@ onMounted(() => {
     console.error('蜂场 ID 缺失')
   }
 })
+
+// 多张图片选择
 const chooseImage = () => {
   if (imageList.value.length >= 9) {
     uni.showToast({
@@ -278,44 +281,25 @@ const enterBtn = async () => {
   }
 };
 
-// 单张图上传
-const chooseMainImage = () => {
-  uni.chooseImage({
-    count: 1,
-    success: async (res) => {
-      if (res.tempFilePaths.length === 0) return
-      
-      uni.showLoading({ title: '上传中...' })
-      try {
-        const result = await uploadSingleImage(res.tempFilePaths[0])
-        mainImage.value = {
-          tempFilePath: res.tempFilePaths[0],
-          data: result.data
-        }
-        formData.value.imgUrl = result.data
-      } finally {
-        uni.hideLoading()
-      }
-    }
-  })
-}
 
-// 图片上传方法
-const uploadSingleImage = (tempFilePath) => {
-  return new Promise((resolve, reject) => {
-    uni.uploadFile({
-      url: BASE_URL + '/app-api/infra/file/upload',
-      filePath: tempFilePath,
-      name: 'file',
-     
-      success: (response) => {
-        const data = JSON.parse(response.data)
-        resolve(data)
-      },
-      fail: reject
-    })
+const chooseMainImage = () => {
+  if (mainImage.value.tempFilePath) {
+     uni.showToast({
+      title: '已上传一张图片',
+      icon: 'none'
+    });
+    return;
+  }
+  uploadImage(1)
+  .then((result) => {
+    mainImage.value = result
+    formData.value.imgUrl = result.data;
   })
-}
+  .catch((err) => {
+    console.error('上传失败:', err);
+  });
+
+};
 // 删除主图
 const deleteMainImage = () => {
   mainImage.value = { tempFilePath: '', data: '' }
diff --git a/pages/traceabilityManagement/traceabilityManagement.vue b/pages/traceabilityManagement/traceabilityManagement.vue
index e219320..c546010 100644
--- a/pages/traceabilityManagement/traceabilityManagement.vue
+++ b/pages/traceabilityManagement/traceabilityManagement.vue
@@ -129,9 +129,7 @@ const editTraceability = (item) => {
   })
 }
 
-onMounted(() => {
 
-})
 
 onShow(() => {
   const pages = getCurrentPages()
diff --git a/pages/trafficRecharge/trafficRecharge.vue b/pages/trafficRecharge/trafficRecharge.vue
index bd4dece..47f859d 100644
--- a/pages/trafficRecharge/trafficRecharge.vue
+++ b/pages/trafficRecharge/trafficRecharge.vue
@@ -54,11 +54,9 @@
 
 <script setup>
 import { ref, onMounted, computed } from 'vue';
-import { request } from '@/utils/request';
+import { request ,processPayment} from '@/utils/request';
 import { onShow } from '@dcloudio/uni-app';
 import TransNavVue from '../../components/TransNav.vue'
-import { useTokenStorage } from '../../utils/storage';
-const { getAccessToken, getOpenId } = useTokenStorage();
 
 
 const deviceId=ref() //设备id
@@ -67,7 +65,6 @@ const selectedPackageId = ref(null); // 当前选中的套餐ID
 const agreementChecked = ref(false); // 用户协议勾选状态
 const isLoading = ref(false); // 加载状态
 const errorMsg = ref(''); // 错误信息
-const payOrderId=ref('')
 
 // 计算属性：获取当前选中的套餐详情
 const selectedPackage = computed(() => {
@@ -77,10 +74,6 @@ const selectedPackage = computed(() => {
 const recommendPackage = computed(() => {
   return trafficList.value.find(item => item.hot) || null;
 });
-
-
-
-
 // 页面加载时获取流量套餐列表
 onShow(async () => {
     await getTrafficList();
@@ -116,13 +109,11 @@ const getTrafficList = async () => {
         isLoading.value = false;
     }
 };
-
 // 套餐选择
 const handleRechargeSelect = (packageInfo) => {
     selectedPackageId.value = packageInfo.id;
-    payOrderId.value=''
+    
 };
-
 // 处理立即购买按钮点击
 const handleBuyNow = (packageInfo) => {
     selectedPackageId.value = packageInfo.id;
@@ -141,8 +132,6 @@ const handleAgreementChange = (e) => {
     agreementChecked.value = e.detail.value.length > 0;
 };
 
-       
-
 // 确认购买
 const handleConfirmBuy = async () => {
     if (!agreementChecked.value) {
@@ -162,118 +151,29 @@ const handleConfirmBuy = async () => {
     }
 
     try {
-        let orderId = payOrderId.value;
-
-        if (!orderId) {
             // 创建新订单
             const res = await request({
             url: `/app-api/weixin/flow/create/order?id=${selectedPackageId.value}&facilityId=${deviceId.value}`,
             method: 'POST',
             showLoading: true
         });
-            
-            if (res.code !== 0) {
+            if (res.code == 0 && res.data.payOrderId) {
+                payOrderId.value = res.data.payOrderId;
+                const options={orderId : res.data.payOrderId, successToUrl :'/pages/deviceManagement/deviceManagement'}
+                processPayment(options)
+            }else{
                 throw new Error(res.msg || '订单创建失败');
             }
-            
-            payOrderId.value = res.data.payOrderId;
-        }
-        
-        // 执行支付流程
-        await processPayment();
-        
+              
     } catch (err) {
-        console.error('支付流程出错:', err);
         uni.showToast({
             title: err.message || '支付出错，请重试',
             icon: 'none'
         });
-    } finally {
-        isPaying.value = false;
-    }
+    } 
 };
 
-// 处理支付流程的函数
-const processPayment = async (orderId) => {
-    // 提交支付请求
-    const paylist = await request({
-        url: '/app-api/pay/order/submit',
-        data: {
-            id: payOrderId.value,
-            channelCode: 'wx_lite',
-            channelExtras: {
-                openid: getOpenId()
-            }
-        },
-        method: 'post',
-        showLoading: true,
-    });
-    
-    if (paylist.code !== 0) {
-        throw new Error(paylist.msg || '支付请求失败');
-    }
-    
-    // 解析支付参数
-    const payParams = JSON.parse(paylist.data.displayContent);
-    
-    // 调用微信支付API
-    try {
-        await uni.requestPayment({
-            provider: 'wxpay',
-            timeStamp: String(payParams.timeStamp),
-            nonceStr: String(payParams.nonceStr),
-            package: payParams.packageValue || payParams.package,
-            signType: payParams.signType || 'MD5',
-            paySign: String(payParams.paySign),
-            
-            success: async () => {
-                uni.showToast({
-                    title: '支付成功',
-                    icon: 'success'
-                });
-                
-                
-                // 跳转到订单列表页
-                setTimeout(() => {
-                            uni.navigateTo({
-                                url: '/pages/deviceManagement/deviceManagement'
-                            });
-                        }, 1500);
-            },
-            
-            fail: async (err) => {
-                console.error('支付失败:', err);
-                
-                if (err.errMsg.includes('cancel')) {
-                    uni.showToast({
-                        title: '支付已取消',
-                        icon: 'none'
-                    });
-                    return;
-                }
-                
-                // 显示支付失败原因并提供重试选项
-                const errorMsg = err.errMsg.includes('fail') 
-                    ? '支付失败，请重试' 
-                    : err.errMsg;
-                
-                const { confirm } = await uni.showModal({
-                    title: '支付失败',
-                    content: errorMsg,
-                    confirmText: '重试',
-                    cancelText: '返回'
-                });
-                
-                if (confirm) {
-                    await confirmPay(); // 重试支付
-                }
-            }
-        });
-    } catch (err) {
-        // 处理微信支付API调用本身的错误
-        throw new Error('支付API调用失败: ' + err.message);
-    }
-};
+
 
 // 跳转协议
 const userAgreement=()=>{
@@ -283,7 +183,6 @@ const userAgreement=()=>{
     
   
 }
-
 //获取id
 onMounted(() => {
   const pages = getCurrentPages()
diff --git a/pages/userAgreement/userAgreement.vue b/pages/userAgreement/userAgreement.vue
index d90efaa..ed924c3 100644
--- a/pages/userAgreement/userAgreement.vue
+++ b/pages/userAgreement/userAgreement.vue
@@ -35,14 +35,10 @@
 import { ref, onMounted } from 'vue';
 import { request } from '@/utils/request'
 import TransNavVue from '../../components/TransNav.vue'
+import { onShow } from '@dcloudio/uni-app'
 const smartBeeList = ref([])
 
 
-onMounted(() => {
-   
-
-
-})
 //获取智能养蜂内容
 
 const getSmartBeeList = async () => {
diff --git a/pages/userInfo/addressEdit.vue b/pages/userInfo/addressEdit.vue
index 46cfb40..b61b650 100644
--- a/pages/userInfo/addressEdit.vue
+++ b/pages/userInfo/addressEdit.vue
@@ -67,6 +67,7 @@
 import { ref, onMounted, computed } from 'vue'
 import { request } from '@/utils/request'
 import TransNavVue from '../../components/TransNav.vue'
+import { onShow } from '@dcloudio/uni-app'
 
 const areaList = ref([])
 const regionPickerVisible = ref(false)
@@ -87,7 +88,7 @@ const form = ref({
 })
 
 
-onMounted(() => {
+onShow(() => {
   getAreaList()
   //判断是否编辑模式
   const pages = getCurrentPages()
diff --git a/pages/userInfo/addressList.vue b/pages/userInfo/addressList.vue
index 056f8eb..23d4d5a 100644
--- a/pages/userInfo/addressList.vue
+++ b/pages/userInfo/addressList.vue
@@ -85,10 +85,6 @@ const getAddressList = async () => {
   }
 }
 
-// 生命周期钩子
-onMounted(() => {
-  getAddressList()
-})
 
 onShow(() => {
   // 每次页面显示时刷新数据
diff --git a/pages/userInfo/userInfo.vue b/pages/userInfo/userInfo.vue
index 94d0248..f6be7aa 100644
--- a/pages/userInfo/userInfo.vue
+++ b/pages/userInfo/userInfo.vue
@@ -71,6 +71,7 @@ import { request } from '@/utils/request'
 import { useTokenStorage } from '../../utils/storage'
 import { onMounted } from 'vue'
 import TransNavVue from '../../components/TransNav.vue'
+import { onShow } from '@dcloudio/uni-app'
 const { getAccessToken} = useTokenStorage()
 const BASE_URL="https://www.cdsrh.top"
 
@@ -81,7 +82,6 @@ const tempNickname = ref('')
 const handleAddress = () => {
   uni.navigateTo({ url: '/pages/userInfo/addressList' })
 }
-
 const onChooseAvatar = (e) => {
     uni.uploadFile({
             url: BASE_URL + '/app-api/infra/file/upload', 
@@ -96,7 +96,7 @@ const onChooseAvatar = (e) => {
               }
             },
             
-          });
+    });
 
 };
 
@@ -183,7 +183,7 @@ const getUserInfo = async () => {
     }
 };
 
-onMounted(() => {
+onShow(() => {
     if (getAccessToken()) {
         getUserInfo();
     } else {
diff --git a/pages/withdraw/withdraw.vue b/pages/withdraw/withdraw.vue
index 56c520a..b9bae2a 100644
--- a/pages/withdraw/withdraw.vue
+++ b/pages/withdraw/withdraw.vue
@@ -1,140 +1,80 @@
 <template>
   <view>
-    <TransNavVue title="我的钱包"/>
-  <view class="container">
-    <!-- 修改顶部黑色区域显示现金余额 -->
-    <view class="top-card black-bg">
-      
-        <text class="amount">{{ walletData.balance || 0 }}</text>
+    <TransNavVue title="我的钱包" />
+    <view class="container">
+
+      <view class="top-card black-bg">
+        <text class="amount">{{ commissionData.currentEarnings || 0 }}</text>
         <view class="card-content">
           <text class="label">账号余额</text>
           <view class="right-content" @click="showCashWithdraw">
-          <image src="/static/images/myPage/crownIcon.png" class="arrow-icon"></image>
-          <text class="withdraw-text">余额提现</text>
-          <image src="/static/images/rightBtn.png" class="arrow-icon"></image>
+            <image src="/static/images/myPage/crownIcon.png" class="arrow-icon"></image>
+            <text class="withdraw-text">余额提现</text>
+            <image src="/static/images/rightBtn.png" class="arrow-icon"></image>
+          </view>
         </view>
+      </view>
+
+      <view class="bottom-card orange-bg">
+        <view class="card-content">
+          <view class="left-content">
+            <text class="amount">{{ commissionData.coin || 0 }}</text>
+            <view class="label">M币使用
+              <image style="width:24rpx;height:24rpx;display:inline-block" src="/static/images/rightBtn.png"></image>
+            </view>
+
+          </view>
+          <image style="width: 150rpx; height:150rpx" src="/static/images/myPage/Mbg.png" class="honey-icon"></image>
         </view>
-   
-      
+      </view>
+
 
     </view>
-    
-    <!-- 修改下方橙色区域显示M币余额 -->
-    <view class="bottom-card orange-bg">
-      <view class="card-content">
-        <view class="left-content">
-          <text class="amount">{{ walletData.coin || 0 }}</text>
-          <view class="label">M币使用
-            <image  style="width:24rpx;height:24rpx;display:inline-block" src="/static/images/rightBtn.png" ></image>
-          </view>
-        
-        </view>
-        <image style="width: 150rpx; height:150rpx" src="/static/images/myPage/Mbg.png" class="honey-icon"></image>
-      </view>
-    </view>
-    
-    <!-- 修改弹窗中的余额显示 -->
-    <uni-popup ref="popup" type="center">
-      <view class="popup-content center-popup">
-        <text class="title">现金提现</text>
-        <text class="balance">当前有<text class="amount-highlight">{{ walletData.balance || 0 }}</text>可提现</text>
-        <text class="notice">提现3-5分钟到账</text>
-        <button class="confirm-btn" @click="handleWithdraw">立即提现</button>
-      </view>
-    </uni-popup>
-  </view>
   </view>
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref } from 'vue'
 import { request } from '@/utils/request'
-import { useTokenStorage } from '../../utils/storage'
 import TransNavVue from '../../components/TransNav.vue'
-const { getAccessToken,getOpenId } = useTokenStorage()
+import { onShow } from '@dcloudio/uni-app';
 
-const popup = ref(null)
-const walletData = ref({
-  balance: 0,
-  coin: 0
+
+const commissionData = ref({})
+
+onShow(() => {
+  getCommissionDetail()
 })
 
-onMounted(() => {
-  getWalletInfo()
- 
-
-})
-const getWalletInfo = async () => {
-	try {
+// 获取提现详情
+const getCommissionDetail = async () => {
+  try {
     const res = await request({
-      url: '/app-api/WeiXinMini/wallet/get/Info',
-      showLoading: true, 
-     
+      url: '/app-api/weixin/distribution/get/commission/info',
+      showLoading: true,
     })
-    
-    if (res.code === 0 || res.code === 200) {
-     walletData.value = res.data || {};
-      
+    if (res.code === 0) {
+      commissionData.value = res.data || {};
+
     } else {
       throw new Error(res.msg || '数据异常')
     }
   } catch (err) {
     console.error('获取用户信息失败:', err)
-   
+
   }
 }
 
-
-const handleWithdraw = async () => {
-  try {
-   
-    if (walletData.value.balance === 0) {  
-      throw new Error('账号余额不足')
-    } else {
-      const res = await request({
-        url: '/app-api/weixin/pay/initiate/payout',
-        method: 'POST',
-        data: { transferAmount: walletData.value.balance,
-                openid: getOpenId(),
-                 transferRemark: '极蜜部落提现',
-                 transferSceneId: '1000',
-                 transferSceneReportInfos: [
-                  {
-                    infoType: '活动名称',
-                    infoContent: '极蜜部落提现'
-                  },
-                  {
-                    infoType: '奖励说明',
-                    infoContent: '提现奖励'
-                  }
-                ]
-        },
-        showLoading: true,
-       
-      })
-      
-      if (res.code === 0 || res.code === 200) {
-        uni.showToast({
-          title: '提现申请已提交',
-          icon: 'success'
-        });
-        await getWalletInfo()
-      } else {
-        throw new Error(res.msg || '提现失败')
-      }
-    }
-  } catch (err) {
-    console.error('提现失败:', err)
-    uni.showToast({
-      title: err.message || '提现失败',
-      icon: 'error'
-    });
-  } finally {
-    popup.value.close()
-  }
-};
+// 跳转提现
 const showCashWithdraw = () => {
-  popup.value.open();
+  uni.navigateTo({
+    url: '/pages/cashWithdrow/cashWithdrow',
+    success: (res) => {
+      res.eventChannel.emit('withdrawAmount', {
+        amount: commissionData.value.currentEarnings
+      })
+    }
+  })
 };
 
 </script>
@@ -150,66 +90,68 @@ const showCashWithdraw = () => {
 <style lang="scss" scoped>
 .container {
   padding: 20rpx;
-  
-  .top-card, .bottom-card {
+
+  .top-card,
+  .bottom-card {
     border-radius: 16rpx;
     padding: 50rpx;
     margin-bottom: 20rpx;
     height: 230rpx;
-    
+
     .amount {
-          font-size: 48rpx;
-          font-weight: bold;
-          color: #fff;
-        }
+      font-size: 48rpx;
+      font-weight: bold;
+      color: #fff;
+    }
+
     .card-content {
       display: flex;
       justify-content: space-between;
       align-items: center;
-     
-   
-        
-        
-        
-        .label {
-          font-size: 28rpx;
-          color: rgba(255, 255, 255, 0.8);
-          margin-top: 10rpx;
-        }
-      
-      
+
+
+
+
+
+      .label {
+        font-size: 28rpx;
+        color: rgba(255, 255, 255, 0.8);
+        margin-top: 10rpx;
+      }
+
+
       .right-content {
         display: flex;
         align-items: center;
-        
+
         .withdraw-text {
           font-size: 28rpx;
           color: #fff;
           margin-left: 10rpx;
         }
-        
+
         .arrow-icon {
           width: 24rpx;
           height: 24rpx;
           margin-left: 10rpx;
         }
       }
-      
+
       .honey-icon {
         width: 60rpx;
         height: 60rpx;
       }
     }
   }
-  
+
   .black-bg {
     background: linear-gradient(to bottom, #3b3b3b, #060608);
   }
-  
+
   .orange-bg {
     background: #ff7f27;
   }
-  
+
   .withdraw-btn {
     background: #fff;
     color: #000;
@@ -219,25 +161,25 @@ const showCashWithdraw = () => {
     line-height: 60rpx;
     font-size: 28rpx;
   }
-  
+
   .popup-content {
     background: #fff;
     padding: 40rpx;
-    border-radius: 20rpx ;
-    
+    border-radius: 20rpx;
+
     .title {
       font-size: 36rpx;
       font-weight: bold;
       display: block;
       margin-bottom: 30rpx;
     }
-    
+
     .balance {
       font-size: 32rpx;
       display: block;
       margin-bottom: 40rpx;
     }
-    
+
     .confirm-btn {
       background: #ff6f0e;
       color: #fff;
@@ -248,6 +190,7 @@ const showCashWithdraw = () => {
     }
   }
 }
+
 .center-popup {
   width: 600rpx;
   min-height: 400rpx;
@@ -255,29 +198,32 @@ const showCashWithdraw = () => {
   border-radius: 30rpx;
   padding: 50rpx;
   background: linear-gradient(180deg #fff2da, #ffffff 57%);
-  
-  
+
+
   .title {
     font-size: 40rpx;
     font-weight: bold;
     display: block;
     text-align: center;
     margin-bottom: 40rpx;
-    color: #000; /* 标题保持黑色 */
+    color: #000;
+    /* 标题保持黑色 */
   }
-  
+
   .balance {
     font-size: 36rpx;
     display: block;
     text-align: center;
     margin-bottom: 30rpx;
-    color: #000; /* 整体文字为黑色 */
+    color: #000;
+    /* 整体文字为黑色 */
   }
-  
+
   .amount-highlight {
-    color: #ff6f0e; /* 仅金额数字为橙色 */
+    color: #ff6f0e;
+    /* 仅金额数字为橙色 */
   }
-  
+
   .notice {
     font-size: 28rpx;
     color: #999;
@@ -285,7 +231,7 @@ const showCashWithdraw = () => {
     text-align: center;
     margin-bottom: 50rpx;
   }
-  
+
   .confirm-btn {
     width: 100%;
     background: #ff6f0e;
diff --git a/utils/request.js b/utils/request.js
index 3ad5a3d..6f50bf0 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,12 +1,11 @@
-
 import { useTokenStorage } from './storage'
-const { getRefreshToken, setToken, getAccessToken } = useTokenStorage()
-// const BASE_URL = 'http://192.168.1.132:48080' 
-const BASE_URL="https://www.cdsrh.top"
+const { getRefreshToken, setToken, getAccessToken ,getOpenId} = useTokenStorage()
+const BASE_URL = 'http://192.168.1.132:48080' 
+// const BASE_URL="https://www.cdsrh.top"
 // const BASE_URL="https://www.gemitribe.com"
 let isRefreshing = false
 let refreshSubscribers = []
-
+// 刷新token
 const refreshTokenRequest = async () => {
   if (isRefreshing) {
     return new Promise(resolve => {
@@ -45,7 +44,7 @@ const refreshTokenRequest = async () => {
     isRefreshing = false
   }
 }
-
+//网络请求
 export const request = (options) => {
   let loadingShown = false
   if (options.showLoading !== false) {
@@ -55,7 +54,6 @@ export const request = (options) => {
     })
     loadingShown = true
   }
-
   return new Promise((resolve, reject) => {
     const makeRequest = async (retry = true) => {
      
@@ -131,7 +129,161 @@ export const request = (options) => {
         }
       })
     }
-    
     makeRequest()
   })
-}
\ No newline at end of file
+}
+
+// 支付统一流程
+export const processPayment = async (options) => {
+  const {  orderId, successToUrl } = options
+  if (!orderId) {
+    throw new Error('订单ID不能为空')
+  }
+  
+  try {
+    // 提交支付请求
+    const paylist = await request({
+      url: '/app-api/pay/order/submit',
+      data: {
+        id: orderId,
+        channelCode:'wx_lite',
+        channelExtras: {
+          openid: getOpenId()
+        }
+      },
+      method: 'post',
+      showLoading: true,
+    })
+    
+    if (paylist.code !== 0) {
+      throw new Error(paylist.msg || '支付请求失败')
+    }
+    
+    // 解析支付参数
+    const payParams = JSON.parse(paylist.data.displayContent)
+    
+    // 调用微信支付API
+    return await uni.requestPayment({
+      provider: 'wxpay',
+      timeStamp: String(payParams.timeStamp),
+      nonceStr: String(payParams.nonceStr),
+      package: payParams.packageValue || payParams.package,
+      signType: payParams.signType || 'MD5',
+      paySign: String(payParams.paySign),
+      
+      success: async () => {
+        uni.showToast({
+          title: '支付成功',
+          icon: 'success'
+        });
+        if(successToUrl){
+          setTimeout(() => {
+            uni.navigateTo({
+              url: successToUrl
+            });
+          }, 1500);
+        }  
+      
+      },
+      
+      fail: async (err) => {
+        if (err.errMsg.includes('cancel')) {
+          uni.showToast({
+            title: '支付已取消',
+            icon: 'none'
+          });
+          return;
+        }
+        
+      
+      }
+    });
+  } catch (err) {
+    uni.showToast({
+      title: err.message || '支付处理失败',
+      icon: 'none'
+    })
+    throw err
+  }
+}
+
+//统一上传图片方法
+
+export const uploadImage=(count)=> {
+
+  return new Promise((resolve, reject) => {
+    uni.chooseImage({
+      count,
+      success: async (res) => {
+        if (!res || !res.tempFilePaths || res.tempFilePaths.length === 0) {
+          uni.showToast({
+            title: '未选择图片',
+            icon: 'none'
+          });
+          reject(new Error('未选择图片'));
+          return;
+        }
+        const tempFilePath = res.tempFilePaths[0];
+        
+        uni.showLoading({
+          title: '上传中...'
+        });
+
+        try {
+          // 上传图片
+          const uploadRes = await new Promise((resolveUpload, rejectUpload) => {
+            uni.uploadFile({
+              url: BASE_URL + '/app-api/infra/file/upload',
+              filePath: tempFilePath,
+              name : 'file',
+           
+              success: (response) => {
+                try {
+                  const data = JSON.parse(response.data);
+                  resolveUpload(data);
+                } catch (err) {
+                  rejectUpload(new Error('解析响应失败'));
+                }
+              },
+              fail: (err) => {
+                rejectUpload(err);
+              }
+            });
+          });
+
+          if (uploadRes.code === 0) {
+            const result = { tempFilePath, data: uploadRes.data } 
+            uni.showToast({
+              title: '上传成功',
+              icon: 'success'
+            });
+            resolve(result);
+          } else {
+            throw new Error(uploadRes.msg || '图片上传失败');
+          }
+        } catch (err) {
+          uni.showToast({
+            title: '上传失败',
+            icon: 'none'
+          });
+          console.error('图片上传失败:', err);
+          reject(err);
+        } 
+      },
+      fail: (err) => {
+        console.error('选择图片失败:', err);
+        uni.showToast({
+          title: '选择图片失败',
+          icon: 'none'
+        });
+        reject(err);
+      }
+    });
+  });
+}
+
+ 
+
+
+
+
diff --git a/utils/shareUserId.js b/utils/shareUserId.js
deleted file mode 100644
index f90cb91..0000000
--- a/utils/shareUserId.js
+++ /dev/null
@@ -1,19 +0,0 @@
-export function initShareUserId() {
-    const launchOptions = uni.getLaunchOptionsSync()
-    if (launchOptions.query.shareUserId) {
-      const shareUserId = launchOptions.query.shareUserId
-      uni.setStorageSync('shareUserId', shareUserId)
-      return shareUserId
-    }
-    return uni.getStorageSync('shareUserId') || ''
-  }
-  
-  // 获取分享者ID
-  export function getShareUserId() {
-    return uni.getStorageSync('shareUserId') || ''
-  }
-  
-  // 清除分享者ID（可选，用于特定场景）
-  export function clearShareUserId() {
-    uni.removeStorageSync('shareUserId')
-  }
\ No newline at end of file
diff --git a/utils/storage.js b/utils/storage.js
index f3c5067..b00c55f 100644
--- a/utils/storage.js
+++ b/utils/storage.js
@@ -1,5 +1,4 @@
 import { ref } from 'vue'
-
 export const useTokenStorage = () => {
   const token = ref(null)
   
diff --git a/utils/system.js b/utils/system.js
index 717a8ef..eb4b6d0 100644
--- a/utils/system.js
+++ b/utils/system.js
@@ -11,6 +11,33 @@ export const getTitleBarHeight = () => {
 		return 50
 	}
 }
-
 //导航栏高度（状态栏+标题栏)
-export const getNarBarHeight = ()=> getStatusBarHeight()+getTitleBarHeight()
\ No newline at end of file
+export const getNarBarHeight = ()=> getStatusBarHeight()+getTitleBarHeight()
+
+//获取分享者id
+export const initShareUserId=()=> {
+    const launchOptions = uni.getLaunchOptionsSync()
+    if (launchOptions.query.shareUserId) {
+      const shareUserId = launchOptions.query.shareUserId
+      uni.setStorageSync('shareUserId', shareUserId)
+      return shareUserId
+    }
+    return uni.getStorageSync('shareUserId') || ''
+  }
+
+  // 获取分享者ID
+  export const getShareUserId=()=> {
+    return uni.getStorageSync('shareUserId') || ''
+  }
+
+  // 清除分享者ID（可选，用于特定场景）
+  export const clearShareUserId=()=>  {
+    uni.removeStorageSync('shareUserId')
+  }
+  // 时间戳转换
+  export const formatDateTime = (dateString) => {
+	if (!dateString) return ''
+	const date = new Date(dateString)
+	return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}:${String(date.getSeconds()).padStart(2, '0')}`
+  }
+  
\ No newline at end of file