feat: 完善订单流程

guzijian
1 parent 89352c3f
Showing 31 changed files with 2096 additions and 551 deletions
garbage-removal/.env.production
garbage-removal/src/App.vue
garbage-removal/src/apis/address.js
garbage-removal/src/apis/carinfo.js
garbage-removal/src/apis/common.js
garbage-removal/src/apis/company.js
garbage-removal/src/apis/order.js
garbage-removal/src/apis/user.js
garbage-removal/src/components/liu-delivery-time/liu-delivery-time.vue
garbage-removal/src/manifest.json
garbage-removal/src/pages.json
garbage-removal/src/pages/home/address/addSite.vue
garbage-removal/src/pages/home/clean/company-detail/index.vue
garbage-removal/src/pages/home/clean/index.vue
garbage-removal/src/pages/home/index.vue
garbage-removal/src/pages/login/code.vue
garbage-removal/src/pages/order/detail/index.vue
garbage-removal/src/pages/order/evaluate/index.vue
garbage-removal/src/pages/order/index.vue
garbage-removal/src/pages/order/swiper-list-item/index.vue
 # VITE_BASE_URL=http://1.14.107.94:8820
+# VITE_BASE_FILE_UPLOAD_PREFIX=/common/upload
 # VITE_STOMP_URL=http://localhost:8860/ws
@@ -5,7 +5,7 @@ import { setRequestToken } from &quot;./utils/request/request.js&quot;;
 const store = useMainStore();
  
 onLaunch(async () => {
-  console.log("store::==>", store);
+  console.log("onLaunch");
   if (store.token) {
     setRequestToken(store.token);
     // store.userInfo = (await getUserInfo()).data.data;
-
 import { request } from "@/utils/request";
 /**
  * @method 新增用户地址
+import { request } from "@/utils/request";
+/**
+ * @method 编辑用户地址
+ */
+export async function queryCarList(params) {
+   return await request.get(
+     `/unit/carInfo/list`,
+     {params:params}
+  );
+}
+
+
+import { useMainStore } from '@/stores';
+const store = useMainStore();
+export const uploadFilePromise = async (requestPath, url) => {
+  return new Promise((resolve, reject) => {
+    let a = uni.uploadFile({
+      url: requestPath, // 仅为示例，非真实的接口地址
+      filePath: url,
+      name: 'file',
+      header: {
+        "Authorization": store.token
+      },
+      success: (res) => {
+        setTimeout(() => {
+          resolve(JSON.parse(res.data));
+        }, 1000);
+      },
+    });
+  });
+};
 import { request } from "@/utils/request";
  
 /**
- * @method 编辑用户地址
+ * @method 查询运输单位信息
  */
 export async function queryDisposalSiteList() {
    return await request.get(
-    `/enterprise/list`
+    `/disposalSite/list`
+  );
+}
+
+
+/**
+ * @method 企业详情
+ */
+export async function queryEnterpriseList(params) {
+   return await request.get(
+     `/unit/enterprise/list`,
+     {params:params}
   );
 }
+import { request } from "@/utils/request";
+
+/**
+ * @method 保存订单
+ */
+export async function saveOrder( params,config) {
+   return await request.post(
+     `/order/add`,
+     params,
+     config
+  );
+}
+
+/**
+ * @method 订单详情
+ */
+export async function queryOrderDetail(id) {
+   return await request.get(
+     `/order/detail/${id}`
+  );
+}
+
+
+
+/**
+ * @method 订单列表
+ */
+export async function queryOrderList(data) {
+   return await request.get(
+     `/order/query/list?type=${data.type}&pageNo=${data.pageNo}&pageSize=${data.pageSize}`,
+  );
+}
+
+
+/**
+ * @method 修改订单状态
+ */
+export async function updateOrder(params,config) {
+   return await request.put(
+     `/order/update`,
+     params,
+     config
+  );
+}
+
+/**
+ * @method 上传图片
+ */
+export async function uploadImageUrlByType(params,config) {
+   return await request.post(
+     `/order/upload/imageUrl`,
+     params,
+     config
+  );
+}
+
+
+/**
+ * @method 提交评价
+ */
+export async function uploadEvaluate(params,config) {
+   return await request.post(
+     `/order/evaluate`,
+     params,
+     config
+  );
+}
@@ -29,3 +29,13 @@ export async function sendCode(params) {
     `${prefix}/send/verify?tel=${params}`
   );
 }
+
+
+/**
+ * @method 发送验证码
+ */
+export async function updateUserInfo(params,config) {
+  return await request.put(
+    `${prefix}/update`,params,config
+  );
+}
+<template>
+	<view style="position: absolute; left: 0;" v-if="days && days.length">
+		<!-- 弹出层 -->
+		<view :class="scrollClass">
+			<view class="time-title" :style="{ borderRadius: getRadius }">
+				<span @click.stop="close">取消</span>
+				{{ title }}
+				<text @click.stop="confirm" :style="selectedTimeIndex ? 'color:#007aff;' : ''">确定</text>
+			</view>
+			<view class="time-picker" :style="{ height: height }">
+				<scroll-view class="date-scroll" scroll-y>
+					<view class="date-item" v-for="(item, index) in days" :key="index">
+						<view class="date" :class="{ active: selectedIndex === index }" @click="handleDateClick(index)">
+							{{ item.day }}
+						</view>
+					</view>
+				</scroll-view>
+				<scroll-view class="time-scroll" scroll-y>
+					<view class="time-item" v-for="(time, index) in selectedDay.timeList" :key="index">
+						<view class="time" :class="{ active: selectedTimeIndex === index }" @click="handleTimeClick(index)">
+							{{ time.time }}
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+		<view v-show="isShow" class="scroll-mask" @click="isMask ? close() : ''"></view>
+	</view>
+</template>
+
+<script>
+export default {
+	props: {
+		//标题
+		title: {
+			type: String,
+			default: '请选择预约时间',
+		},
+		//盒子高度
+		height: {
+			type: String,
+			default: '500rpx',
+		},
+		//展示近几日时间
+		day: {
+			type: Number,
+			default: 7
+		},
+		//是否点击阴影关闭
+		isMask: {
+			type: Boolean,
+			default: true,
+		},
+		//是否开启动画
+		animation: {
+			type: Boolean,
+			default: true,
+		},
+		//是否开启安全条
+		safeArea: {
+			type: Boolean,
+			default: true,
+		},
+		//圆角
+		radius: {
+			type: String,
+			default: '24rpx',
+		},
+	},
+	data() {
+		return {
+			isShow: false,
+			selectedIndex: 0,
+			selectedDay: {},
+			selectedTimeIndex: 999,
+			days: []
+		};
+	},
+	mounted() {
+		this.days = this.getFutureDays()
+		this.selectedDay = this.days[0]
+	},
+	computed: {
+		scrollClass() {
+			const classes = ['scroll-popup'];
+			if (this.isShow) classes.push('scroll-open');
+			if (this.animation) classes.push('scroll-animation');
+			if (this.safeArea) classes.push('scroll-temp');
+			return classes;
+		},
+		getRadius() {
+			return `${this.radius} ${this.radius} 0 0`;
+		},
+	},
+	methods: {
+		//时间数据构造
+		getFutureDays() {
+			const days = [];
+			for (let i = 0; i < this.day; i++) {
+				const date = new Date();
+				date.setDate(date.getDate() + i);
+				const year = date.getFullYear();
+				const month = (date.getMonth() + 1).toString().padStart(2, '0');
+				const day = date.getDate().toString().padStart(2, '0');
+				const timeList = [{
+					time: '06:00-08:00',
+					start: '06:00',
+					end: '08:00'
+				}, {
+					time: '08:00-10:00',
+					start: '08:00',
+					end: '10:00'
+				},
+				{
+					time: '10:00-12:00',
+					start: '10:00',
+					end: '12:00'
+				},
+				{
+					time: '12:00-14:00',
+					start: '12:00',
+					end: '14:00'
+				},
+				{
+					time: '14:00-16:00',
+					start: '14:00',
+					end: '16:00'
+				},
+				{
+					time: '16:00-18:00',
+					start: '16:00',
+					end: '18:00'
+				},
+				{
+					time: '18:00-20:00',
+					start: '18:00',
+					end: '20:00'
+				},
+				{
+					time: '20:00-22:00',
+					start: '20:00',
+					end: '22:00'
+				}
+				];
+				days.push({
+					day: `${year}-${month}-${day}`,
+					timeList: timeList
+				});
+			}
+			return days;
+		},
+		open() {
+			this.isShow = true;
+			this.init();
+		},
+		init() {
+			this.selectedIndex = 0;
+			this.selectedDay = this.days[0];
+			this.selectedTimeIndex = 999;
+		},
+		close() {
+			this.isShow = false;
+		},
+		handleDateClick(index) {
+			this.selectedIndex = index;
+			this.selectedDay = this.days[index];
+			this.selectedTimeIndex = 999;
+		},
+		handleTimeClick(index) {
+			this.selectedTimeIndex = index;
+		},
+		confirm() {
+			if (this.selectedTimeIndex == 999) {
+				uni.showToast({
+					title: this.title,
+					icon: 'none'
+				})
+				return
+			}
+			const time = this.selectedDay.timeList[this.selectedTimeIndex]
+			this.close();
+			this.$emit('change', {
+				day: this.selectedDay.day,
+				time: time.time,
+				startHour: time.start,
+				endHour: time.end,
+				value: `${this.selectedDay.day} ${time.time}`,
+			});
+		}
+	},
+};
+</script>
+
+<style>
+::v-deep .-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	color: transparent;
+	display: none;
+}
+</style>
+<style scoped>
+/* 弹出层默认样式 */
+.scroll-popup {
+	width: 100%;
+	position: fixed;
+	bottom: -100%;
+	z-index: 999;
+}
+
+/* 点击按钮是将盒子 bottom 值归零即可实现弹出效果,
+	 同理，如需更改弹出方向只需将bottom改成top、left、right即可
+	 (默认样式的方向也需一起更改哦) */
+.scroll-open {
+	bottom: 0px !important;
+}
+
+.scroll-animation {
+	transition: all 0.25s linear;
+}
+
+.scroll-temp {
+	padding-bottom: env(safe-area-inset-bottom);
+}
+
+/* 遮罩层样式 */
+.scroll-mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background: rgba(0, 0, 0, 0.3);
+	z-index: 998;
+}
+
+.time-picker {
+	display: flex;
+	align-items: center;
+	color: #666666;
+	background-color: #fff;
+}
+
+.time-title {
+	width: 100%;
+	height: 88rpx;
+	line-height: 88rpx;
+	font-size: 32rpx;
+	font-weight: bold;
+	color: #333333;
+	background-color: #ffffff;
+	text-align: center;
+	position: relative;
+	border-bottom: 1rpx solid #f6f6f6;
+}
+
+.time-title span {
+	font-size: 28rpx;
+	font-weight: 400;
+	position: absolute;
+	left: 32rpx;
+	top: 0;
+	bottom: 0;
+	margin: auto 0;
+	color: #666666;
+}
+
+.time-title text {
+	font-size: 28rpx;
+	font-weight: 400;
+	position: absolute;
+	right: 32rpx;
+	top: 0;
+	bottom: 0;
+	margin: auto 0;
+	color: #666666;
+}
+
+.date-scroll {
+	flex: 1;
+	height: 100%;
+	border-right: 1rpx solid #f6f6f6;
+	box-sizing: border-box;
+}
+
+.date-item {
+	height: 88rpx;
+	line-height: 88rpx;
+	text-align: center;
+	box-sizing: border-box;
+	border-bottom: 1rpx solid #f6f6f6;
+}
+
+.date {
+	font-size: 28rpx;
+}
+
+.date.active {
+	font-size: 30rpx;
+	font-weight: bold;
+	color: #007aff;
+}
+
+.time-scroll {
+	flex: 1;
+	height: 100%;
+}
+
+.time-item {
+	height: 88rpx;
+	line-height: 88rpx;
+	text-align: center;
+	box-sizing: border-box;
+	border-bottom: 1rpx solid #f6f6f6;
+}
+
+.time {
+	font-size: 28rpx;
+}
+
+.time.active {
+	font-size: 30rpx;
+	font-weight: bold;
+	color: #007aff;
+}
+</style>
@@ -57,6 +57,15 @@
         },
         "usingComponents" : true
     },
+    "h5" : {
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "LNFBZ-YRSW3-HMU3T-RZP6V-XCWV5-EKFWP"
+                }
+            }
+        }
+    },
     "mp-alipay" : {
         "usingComponents" : true
     },
@@ -10,12 +10,44 @@
 		{
 			"path": "pages/login/index",
 			"style": {
-				"navigationBarTitleText": "装饰装修垃圾智慧功能模块登录"
+				"navigationBarTitleText": "装饰装修垃圾智慧功能模块登录",
+				"enablePullDownRefresh": false
 			}
 		},{
 			"path": "pages/login/code",
 			"style": {
-				"navigationBarTitleText": "输入验证码"
+				"navigationBarTitleText": "输入验证码",
+				"enablePullDownRefresh": false
+			}
+		},{
+			"path": "pages/wode/choose/index",
+			"style": {
+				"navigationBarTitleText": "选择身份",
+				"enablePullDownRefresh": false
+			}
+		},{
+			"path": "pages/order/detail/index",
+			"style": {
+				"navigationBarTitleText": "派单详情",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#53c21d",
+				"enablePullDownRefresh": false
+			}
+		},{
+			"path": "pages/order/upload/index",
+			"style": {
+				"navigationBarTitleText": "上传照片",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#53c21d",
+				"enablePullDownRefresh": false
+			}
+		},{
+			"path": "pages/order/evaluate/index",
+			"style": {
+				"navigationBarTitleText": "写评价",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#53c21d",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -39,13 +71,15 @@
 		{
 			"path": "pages/home/clean/company-detail/index",
 			"style": {
-				"navigationBarTitleText": "公司信息"
+				"navigationBarTitleText": "公司信息",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/home/clean/index",
 			"style": {
-				"navigationBarTitleText": "装修垃圾"
+				"navigationBarTitleText": "装修垃圾",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -53,7 +87,8 @@
 			"style": {
 				"navigationBarTitleText": "清运地址",
 				"navigationBarTextStyle":"white",
-				"navigationBarBackgroundColor":"#53c21d"
+				"navigationBarBackgroundColor":"#53c21d",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -61,19 +96,23 @@
 			"style": {
 				"navigationBarTitleText": "清运地址",
 				"navigationBarTextStyle":"white",
-				"navigationBarBackgroundColor":"#53c21d"
+				"navigationBarBackgroundColor":"#53c21d",
+				"enablePullDownRefresh": false
 			}
 		},{
 			"path": "pages/order/index",
 			"style": {
-				"navigationBarTitleText": "订单详情",
+				"navigationBarTitleText": "派单详情",
 				"navigationBarTextStyle":"white",
-				"navigationBarBackgroundColor":"#53c21d"
+				"navigationBarBackgroundColor":"#53c21d",
+				"enablePullDownRefresh": false
 			}
 		},{
 			"path": "pages/wode/index",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#ffffff",
+				"enablePullDownRefresh": false
 			}
 		}
 	],
@@ -91,7 +130,7 @@
 		"pagePath": "pages/order/index",
 		"iconPath": "static/tabbar/icon/order.png",
 		"selectedIconPath": "static/tabbar/icon/order-green.png",
-		"text": "订单"
+		"text": "派单"
 	}, {
 		"pagePath": "pages/wode/index",
 		"iconPath": "static/tabbar/icon/wode.png",
@@ -160,7 +160,6 @@ const submit = () =&gt; {
  * 打开地图选择地址
  */
 const chooseAddressDetail = () => {
-	console.log("sss");
 	uni.chooseLocation({
 		success: function (res) {
 			addressInfo.addressDetail = res.address + res.name;
@@ -3,14 +3,15 @@
     <view class="company-content-box">
       <view class="company-content-header">
         <view class="company-content-left">
-          <image class="company-content-left-image" src="https://ijry.github.io/uview-plus/h5/assets/logo-8d54bbeb.png" />
+          <image class="company-content-left-image"
+            :src="headerData.carParkPanorama ? headerData.carParkPanorama : 'https://ijry.github.io/uview-plus/h5/assets/logo-8d54bbeb.png'" />
         </view>
         <view class="company-content-right">
           <view class="company-content-right-name">
-            宁波垃圾回收公司
+            {{ headerData.name }}
           </view>
           <view class="company-content-right-area">
-            注册区划：海曙区
+            注册区划：{{ headerData.registrationArea }}
           </view>
         </view>
       </view>
@@ -23,9 +24,13 @@
             <view class="company-content-base-data-info-item-label">
               {{ item.label }}:
             </view>
-            <view class="company-content-base-data-info-item-txt">
+            <view v-if="item.label != '道路运输许可证'" class="company-content-base-data-info-item-txt">
               {{ item.value }}
             </view>
+            <view v-else class="company-content-base-data-info-item-txt">
+              <u-upload :fileList="[item.value]" name="3" multiple :maxCount="10" :previewFullImage="true"
+                :isReadOnly="true"></u-upload>
+            </view>
           </view>
         </view>
       </view>
@@ -33,8 +38,8 @@
         <view class="company-content-car-info-title">核准车辆信息</view>
         <view class="company-content-car-info-sub-title">车牌号（车型）</view>
         <view class="company-content-car-info-car-list">
-          <view v-for="(item, index) in  baseDataList" :key="index" class="company-content-car-info-car-list-item">
-            浙B5S785<text class="car-type">(自卸车)</text>
+          <view v-for="(item, index) in  carList" :key="index" class="company-content-car-info-car-list-item">
+            {{ item.carCode }}<text class="car-type">({{ item.carType }})</text>
           </view>
         </view>
         <view class="company-content-remark">
@@ -74,38 +79,31 @@
         </view>
       </view>
       <view class="company-bottom-button-right">
-        <u-button icon="car-fill" :custom-style="customStyle" @click="handleCleanGarbage(companyId, tel)" type="success"
-          :hairline="true" size="normal" shape="circle" text="垃圾清运"></u-button>
+        <u-button icon="car-fill" :custom-style="customStyle" @click="handleCleanGarbage(companyInfo, tel, userAddress)"
+          type="success" :hairline="true" size="normal" shape="circle" text="垃圾清运"></u-button>
       </view>
     </view>
   </view>
 </template>
  
 <script setup>
+import { queryCarList } from '@/apis/carinfo.js';
 import { onLoad } from '@dcloudio/uni-app';
-import { onMounted, ref } from 'vue';
+import { ref } from 'vue';
 const baseDataList = ref([{ label: '法人' }, { label: '负责人' }, { label: '业务联系电话' }, { label: '道路运输许可证' }, { label: '核准有效期' }, { label: '注册地址' }]);
-const baseData = ref({
-  legalEntity: '王波',
-  leader: '王波',
-  contact: '18985336652',
-  allowCertificate: "无",
-  validTime: '2020-10-20至2024-10-19',
-  signAddress: '浙江省宁波市清洲区复明街道会展路128号017幢7-32-3'
-})
 const customStyle = ref({
   fontSize: '30rpx',
   lineHeight: '30rpx'
 })
-const companyId = ref()
+const carList = ref()
+const companyInfo = ref()
 const tel = ref()
-const handleCleanGarbage = (companyId, tel) => {
-  console.log("垃圾清运");
-  uni.$u.route({
-    url: `pages/home/clean/index?companyId=${companyId}&tel=${tel}`,
-  })
-}
-
+const userAddress = ref()
+const headerData = ref({
+  name: "",
+  registrationArea: "",
+  carParkPanorama: ""
+})
 const serverData = ref([
   {
     label: '清运区域',
@@ -128,20 +126,32 @@ const handleContactClick = (val) =&gt; {
   }).catch(err => { });
 }
 onLoad((options) => {
-  console.log(options.companyId);
-  companyId.value = options.companyId
-  tel.value = options.tel
-})
-onMounted(() => {
-  initData();
+  companyInfo.value = JSON.parse(options.companyObj);
+  userAddress.value = JSON.parse(options.userAddress);
+  tel.value = options.tel;
+  initData(companyInfo.value);
+  queryCarList({ companyId: companyInfo.value.id }).then(res => {
+    carList.value = res.data.rows
+  })
 })
-const initData = () => {
-  baseDataList.value[0].value = baseData.value.legalEntity
-  baseDataList.value[1].value = baseData.value.leader
-  baseDataList.value[2].value = baseData.value.contact
-  baseDataList.value[3].value = baseData.value.allowCertificate
-  baseDataList.value[4].value = baseData.value.validTime
-  baseDataList.value[5].value = baseData.value.signAddress
+
+const handleCleanGarbage = (companyObj, tel, userAddress) => {
+  uni.$u.route({
+    url: `pages/home/clean/index?companyObj=${JSON.stringify(companyObj)}&tel=${tel}&userAddress=${JSON.stringify(userAddress)}`,
+  })
+}
+
+const initData = (baseData) => {
+  console.log(baseData);
+  baseDataList.value[0].value = baseData.legalRepresentative
+  baseDataList.value[1].value = baseData.safetyManagerName
+  baseDataList.value[2].value = baseData.safetyManagerPhone
+  baseDataList.value[3].value = baseData.transportPermission
+  baseDataList.value[4].value = baseData.businessLicenseDate
+  baseDataList.value[5].value = baseData.officeAddress
+  headerData.value.name = baseData.name;
+  headerData.value.registrationArea = baseData.registrationArea;
+  headerData.value.carParkPanorama = baseData.carParkPanorama;
 }
 </script>
  
@@ -3,21 +3,22 @@
     <view class="company-clean-container-box">
       <view class="company-clean-container-header">
         <view class="company-clean-container-header-address">
-          宁波市海曙区昱湖街道上海
+          {{ userAddress.garUserAddress + userAddress.garRemark }}
         </view>
         <view class="company-clean-container-header-base-info">
-          李云龙 189802245165
+          {{ userAddress.garUserContactName }} {{ userAddress.garUserContactTel }}
         </view>
         <view class="company-clean-container-header-reservation">
           <view class="company-clean-container-header-reservation-left">
             <u-icon name="calendar" size="40"></u-icon>
             预约时间
           </view>
-          <view class="company-clean-container-header-reservation-right" @click="handleTimeChoose">
-            <text style="margin-right: 10rpx;">请选择时间</text> <u-icon name="arrow-right" size="25"></u-icon>
+          <view class="company-clean-container-header-reservation-right">
+            <text style="margin-right: 10rpx;" @click="handleTimeChoose">{{ dayTime ? dayTime : "请选择时间" }}</text> <u-icon
+              name="arrow-right" size="25"></u-icon>
+            <liu-delivery-time @change="changeTime" ref="chooseTime" title="请选择预约时间"></liu-delivery-time>
           </view>
         </view>
-
       </view>
       <view class="company-clean-container-car-main">
         <view class="company-clean-container-car-main-title">
@@ -36,7 +37,7 @@
               <u-icon name="arrow-down" size="30" color="#ffffff"></u-icon>
             </view>
             <view class="company-clean-container-car-main-content-type-price-area">
-              $5000元/车
+              车
             </view>
           </view>
           <view class="company-clean-container-car-main-content-number">
@@ -72,7 +73,7 @@
         <view class="company-clean-container-site-image-info-sure-button-radio">
           <u-radio-group v-model="paramFrom.sureReadFlag">
             <u-radio activeColor="#a9e08f" size="27" labelSize="25" :labelDisabled="true" labelColor="#909399"
-              label="本人已确认信息真实有效，并将上述信息告知市容环境卫生主管部门。"></u-radio>
+              label=""></u-radio>本人已确认信息真实有效，并将上述信息告知市容环境卫生主管部门。
           </u-radio-group>
         </view>
       </view>
@@ -90,7 +91,7 @@
           <u-icon @click="handleCarInfo" :stop="true" size="50" name="car-fill"></u-icon>
         </view>
         <view class="company-clean-bottom-right">
-          <u-button @click="handleOderSure" shape="circle" color="#a9e08f" text="立即下单"></u-button>
+          <u-button @click="handleOderSure" shape="circle" color="#a9e08f" text="立即派单"></u-button>
         </view>
       </view>
     </view>
@@ -98,44 +99,55 @@
 </template>
  
 <script setup>
+import { queryCarList } from '@/apis/carinfo.js';
+import { uploadFilePromise } from '@/apis/common.js';
+import { saveOrder } from '@/apis/order.js';
+import liuDeliveryTime from "@/components/liu-delivery-time/liu-delivery-time.vue";
 import { onLoad } from '@dcloudio/uni-app';
 import { getCurrentInstance, onMounted, ref } from 'vue';
 const { proxy } = getCurrentInstance();
 const x = ref(5)
 const y = ref()
 const movableAreaElement = ref()
-const companyId = ref()
+const companyObj = ref()
 const tel = ref()
+const userAddress = ref()
+const carList = ref();
 const paramFrom = ref({
   carNumber: 0,
   remark: "",
   sureReadFlag: false
 })
+const dayTime = ref()
  
-const fileList = ref([{
-
-}])
+const chooseTime = ref()
+const fileList = ref([])
  
 const handleTimeChoose = () => {
-  console.log("选择时间");
+  chooseTime.value.open();
+}
+
+const changeTime = (e) => {
+  dayTime.value = e.value
 }
 /**
  * 初始化信息
  */
 onLoad((options) => {
-  companyId.value = options.companyId;
+  companyObj.value = JSON.parse(options.companyObj);
+  console.log(companyObj.value);
   tel.value = options.tel;
-  console.log("tel:", tel);
-
+  userAddress.value = JSON.parse(options.userAddress);
+  queryCarList({ companyId: companyObj.value.id }.then(res => {
+    carList.value = res.data.rows
+  }))
 })
  
 /**
  * 拨打电话回调
  */
 const handleContactClick = (val) => {
-  console.log("拨打电话");
   uni.makePhoneCall({ phoneNumber: val }).then(res => {
-    console.log(res);
   }).catch(err => { });
 }
  
@@ -157,35 +169,20 @@ const afterRead = async (event) =&gt; {
     });
   });
   for (let i = 0; i < lists.length; i++) {
-    const result = await uploadFilePromise(lists[i].url);
+    let requestPath = import.meta.env.VITE_BASE_URL + import.meta.env.VITE_BASE_FILE_UPLOAD_PREFIX;
+    const result = await uploadFilePromise(requestPath, lists[i].url);
     let item = fileList.value[fileListLen];
     fileList.value.splice(fileListLen, 1, {
       ...item,
       status: 'success',
       message: '',
-      url: result,
+      url: result.data.fileName,
     });
     fileListLen++;
   }
 };
  
-const uploadFilePromise = (url) => {
-  return new Promise((resolve, reject) => {
-    let a = uni.uploadFile({
-      url: 'http://192.168.2.21:7001/upload', // 仅为示例，非真实的接口地址
-      filePath: url,
-      name: 'file',
-      formData: {
-        user: 'test',
-      },
-      success: (res) => {
-        setTimeout(() => {
-          resolve(res.data.data);
-        }, 1000);
-      },
-    });
-  });
-};
+
  
 /**
  * 处理车子数量
@@ -198,7 +195,79 @@ const handleCarInfo = () =&gt; {
  * 处理下单
  */
 const handleOderSure = () => {
-  console.log("下单了");
+  console.log("下单了", companyObj.value);
+  let params = {
+    /**
+     * 订单地址
+     */
+    garOrderAddress: userAddress.value.garUserAddress,
+
+    /**
+     * 订单详细地址
+     */
+    garOrderAddressDetails: userAddress.value.garRemark,
+
+    /**
+     * 订单姓名
+     */
+    garOrderContactName: userAddress.value.garUserContactName,
+
+    /**
+     * 垃圾类型
+     */
+    garOrderTrashType: "建筑垃圾",
+
+    /**
+     * 订单人电话
+     */
+    garOrderContactTel: userAddress.value.garUserContactTel,
+
+    /**
+     * 承接经营单位
+     */
+    garOrderCompanyId: companyObj.value.id,
+
+    /**
+     * 公司名称
+     */
+    garOrderCompanyName: companyObj.value.name,
+
+    /**
+     * 公司负责人电话
+     */
+    garOrderCompanyTel: companyObj.value.safetyManagerPhone,
+
+    /**
+     * 约定时间
+     */
+    garOrderAgreementTime: dayTime.value,
+    /**
+     * 备注
+     */
+    garRemark: paramFrom.value.remark,
+    /**
+   * 图片列表
+   */
+    imageUrls: fileList.value.map(item => item.url),
+  }
+  if (!validateParams(params)) {
+    return;
+  }
+  saveOrder(params).then(res => {
+    console.log(res);
+    // TODO 订单详情
+    if (res.data.success) {
+      uni.$u.route({
+        type: "redirect",
+        url: `pages/order/detail/index`,
+        params: {
+          orderId: res.data.data
+        }
+      })
+    }
+    uni.$u.toast(res.data.msg)
+  })
+
 }
  
 onMounted(() => {
@@ -207,7 +276,6 @@ onMounted(() =&gt; {
   let movableArea = uni.createSelectorQuery().in(proxy).select(".movableArea");
   movableArea.boundingClientRect(function (data) {
     //	data - 包含元素的高度等信息
-    console.log("area:", data.height)  // 获取元素宽度
     areaHeight = data.height;
     y.value = areaHeight;
   }).exec(function (res) {
@@ -215,6 +283,10 @@ onMounted(() =&gt; {
   })
 })
  
+const validateParams = (params) => {
+  return true;
+}
+
 </script>
  
 <style lang="scss" scoped>
@@ -410,6 +482,7 @@ $custom-bottom-height: 200rpx;
         box-sizing: border-box;
         display: flex;
         flex-flow: row wrap;
+        color: $u-info;
       }
     }
  
@@ -9,7 +9,7 @@
       }" class="top-address">
         <view class="address-icon-image"><u-icon name="map" color="#fff" size="28"></u-icon></view>
         <view class="address-text" @click="handleAddressInfo">
-          {{ userAddress ? userAddress : "请设置清运地址" }}
+          {{ addressInfo ? addressInfo : "请设置清运地址" }}
         </view>
         <view class="address-icon-label">
           <u-icon name="arrow-right" color="#fff" size="28"></u-icon>
@@ -40,45 +40,52 @@
           </view>
           <view class="company-list-content">
             <view class="company-list-content-box">
-              <view class="company-list-item" v-for="item in companyList" :key="item.companyId">
-                <view class="company-list-item-main">
-                  <view class="company-list-item-main-left">
-                    <image class="company-list-item-main-left-img" :src="item.image" />
-                  </view>
-                  <view class="company-list-item-main-right" @click="handleDetailClick(item.companyId, item.tel)">
-                    <view class="company-list-item-main-right-name">
-                      {{ item.companyName }}
+              <z-paging ref="paging" :fixed="false" v-model="companyList" @query="queryList">
+                <empty-view slot:empty></empty-view>
+                <view class="company-list-item" v-for="item in companyList" :key="item.id">
+                  <view class="company-list-item-main">
+                    <view class="company-list-item-main-left">
+                      <image class="company-list-item-main-left-img"
+                        :src="item.carParkPanorama ? item.carParkPanorama : 'https://ijry.github.io/uview-plus/h5/assets/logo-8d54bbeb.png'" />
                     </view>
-                    <view class="company-list-item-main-right-score">
-                      <text class="company-list-item-main-right-text">评分:</text>
-                      <view class="company-list-item-main-right-score-start">
-                        <u-icon v-for="todo in maxStar" :name="item.score > todo ? 'star-fill' : 'star'" :key="todo"
-                          color="#f9ae3d" size="28"></u-icon>
+                    <view class="company-list-item-main-right"
+                      @click="handleDetailClick(item, item.legalRepresentativePhone, userAddress)">
+                      <view class="company-list-item-main-right-name">
+                        {{ item.abbreviation }}
                       </view>
-                      <text class="company-list-item-main-right-text" style="color: #fd5d00;">5分</text>
-                    </view>
-                    <view class="company-list-item-main-right-price-number">
-                      <view class="company-list-item-main-right-price">￥{{ item.startPrice }}起</view>
-                      <view class="company-list-item-main-right-number">
-                        清运数：<text class="company-list-item-main-right-number-text">{{ item.cleanNumber }}</text>
+                      <view class="company-list-item-main-right-score">
+                        <text class="company-list-item-main-right-text">评分:</text>
+                        <view class="company-list-item-main-right-score-start">
+                          <u-icon v-for="todo in maxStar" :name="item.score > todo ? 'star-fill' : 'star'" :key="todo"
+                            color="#f9ae3d" size="28"></u-icon>
+                        </view>
+                        <text class="company-list-item-main-right-text" style="color: #fd5d00;">5分</text>
+                      </view>
+                      <view class="company-list-item-main-right-price-number">
+                        <view class="company-list-item-main-right-price">公司类型：{{ item.companyType == 0 ? "经营单位" : "运输公司"
+                        }}&nbsp;&nbsp;</view>
+                        <view class="company-list-item-main-right-number">
+                          车辆数：<text class="company-list-item-main-right-number-text">{{ item.carNumber }}</text>
+                        </view>
+                      </view>
+                      <view class="company-list-item-main-right-remark">
+                        {{ item.remark }}
                       </view>
                     </view>
-                    <view class="company-list-item-main-right-remark">
-                      {{ item.remark }}
-                    </view>
-                  </view>
-                </view>
-                <view class="company-list-item-bottom">
-                  <view class="company-list-item-bottom-contact-company">
-                    <u-button @click="handleContactClick(item.tel)" color="#a9e08f" size="normal" type="success"
-                      :hairline="true" shape="circle" text="联系公司"></u-button>
                   </view>
-                  <view class="company-list-item-bottom-button-clean">
-                    <u-button @click="handleCleanGarbage(item.companyId, item.tel)" type="success" :hairline="true"
-                      size="normal" shape="circle" text="垃圾清运"></u-button>
+                  <view class="company-list-item-bottom">
+                    <view class="company-list-item-bottom-contact-company">
+                      <u-button @click="handleContactClick(item.legalRepresentativePhone)" color="#a9e08f" size="normal"
+                        type="success" :hairline="true" shape="circle" text="联系公司"></u-button>
+                    </view>
+                    <view class="company-list-item-bottom-button-clean">
+                      <u-button @click="handleCleanGarbage(item, item.legalRepresentativePhone, userAddress)"
+                        type="success" :hairline="true" size="normal" shape="circle" text="垃圾清运"></u-button>
+                    </view>
                   </view>
                 </view>
-              </view>
+              </z-paging>
+
             </view>
           </view>
         </view>
@@ -89,7 +96,7 @@
  
 <script setup >
 import { queryAddress } from '@/apis/address.js';
-import { queryDisposalSiteList } from '@/apis/company.js';
+import { queryEnterpriseList } from '@/apis/company.js';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import { ref } from 'vue';
 // 定义最大积分
@@ -98,6 +105,7 @@ const maxStar = ref([])
 const lightHeight = ref();//胶囊按钮信息
 const topMargin = ref(null);//状态栏高度
 const musicheadHeight = ref();
+const paging = ref(null)
 const swiperImageList = ref([{
   image: 'https://cdn.uviewui.com/uview/swiper/swiper2.png',
 }, {
@@ -106,8 +114,8 @@ const swiperImageList = ref([{
   image: 'https://cdn.uviewui.com/uview/swiper/swiper3.png',
 }])
  
-const userAddress = ref()
-
+const userAddress = ref({})
+const addressInfo = ref()
  
 // 信息指南
 const infoBoxList = ref([{
@@ -125,55 +133,14 @@ const infoBoxList = ref([{
 },])
  
 //公司列表
-const companyList = ref([
-  {
-    companyId: '1',
-    score: 4,
-    image: 'https://ijry.github.io/uview-plus/h5/assets/logo-8d54bbeb.png',
-    companyName: '宁波垃圾回收公司',
-    startPrice: '500',
-    cleanNumber: '1996',
-    remark: '我司专业拆除清运，装修大件垃圾的环保科技企业。',
-    tel: '18980249130',
-  }
-  , {
-    companyId: '2',
-    score: 4,
-    image: 'https://ijry.github.io/uview-plus/h5/assets/logo-8d54bbeb.png',
-    companyName: '宁波垃圾回收公司',
-    startPrice: '500',
-    cleanNumber: '1996',
-    remark: '我司专业拆除清运，装修大件垃圾的环保科技企业。',
-    tel: '18980249130',
-  },
-  {
-    companyId: '3',
-    score: 4,
-    image: 'https://ijry.github.io/uview-plus/h5/assets/logo-8d54bbeb.png',
-    companyName: '宁波垃圾回收公司',
-    startPrice: '500',
-    cleanNumber: '1996',
-    remark: '我司专业拆除清运，装修大件垃圾的环保科技企业。',
-    tel: '18980249130',
-  },
-  // {
-  //   companyId: '1',
-  //   score: 4,
-  //   image: 'https://ijry.github.io/uview-plus/h5/assets/logo-8d54bbeb.png',
-  //   companyName: '宁波垃圾回收公司',
-  //   startPrice: '500',
-  //   cleanNumber: '1996',
-  //   remark: '我司专业拆除清运，装修大件垃圾的环保科技企业。',
-  //   tel: '18980249130',
-  // }
-])
+const companyList = ref([])
  
  
 /**
  * 拨打电话回调
  */
 const handleContactClick = (val) => {
-  console.log("拨打电话");
+  console.log("拨打电话", val);
   uni.makePhoneCall({ phoneNumber: val }).then(res => {
     console.log(res);
   }).catch(err => { });
@@ -191,19 +158,20 @@ function handleAddressInfo() {
 /**
  * 公司详情
  */
-function handleDetailClick(companyId, tel) {
+function handleDetailClick(company, tel, userAddress) {
+  console.log(company);
   uni.$u.route({
-    url: `pages/home/clean/company-detail/index?companyId=${companyId}&tel=${tel}`,
+    url: `pages/home/clean/company-detail/index?companyObj=${JSON.stringify(company)}&tel=${tel}&userAddress=${userAddress}`,
   })
 }
  
 /**
  * 清运跳转
  */
-const handleCleanGarbage = (companyId, tel) => {
+const handleCleanGarbage = (companyObj, tel, userAddress) => {
   console.log("垃圾清运");
   uni.$u.route({
-    url: `pages/home/clean/index?companyId=${companyId}&tel=${tel}`,
+    url: `pages/home/clean/index?companyObj=${JSON.stringify(companyObj)}&tel=${tel}&userAddress=${userAddress}`,
   })
 }
  
@@ -223,7 +191,6 @@ onLoad(() =&gt; {
     maxStar.value.push(index);
   }
  
-  // 获取胶囊按钮信息（width、height、top等）
   try {
     const { height, top } = uni.getMenuButtonBoundingClientRect();
     topMargin.value = top + "px";
@@ -242,22 +209,23 @@ const initData = () =&gt; {
   userAddress.value = null;
   // 查询用户当前地址
   queryAddress('CURRENT').then(res => {
-    userAddress.value = res.data.data[0].garUserAddress + res.data.data[0].garRemark
+    if (res.data.data instanceof Array) {
+      addressInfo.value = res.data.data[0].garUserAddress + res.data.data[0].garRemark
+      userAddress.value = JSON.stringify(res.data.data[0] ? res.data.data[0] : {});
+    }
   })
+
+}
+const queryList = (pageNo, pageSize) => {
   // 查询公司信息
-  queryDisposalSiteList().then(res => {
-    console.log("company====>", res);
+  queryEnterpriseList({ companyType: 0, pageNum: pageNo, pageSize }).then(res => {
+    paging.value.complete(res.data.rows);
   })
 }
 </script>
  
 <style lang="scss" scoped>
 .home-container {
-  // position: fixed;
-  // top: 0;
-  // bottom: 0;
-  // left: 0;
-  // right: 0;
   background: linear-gradient(to bottom, $u-info-light, $u-info-light);
   box-sizing: border-box;
   display: flex;
@@ -475,9 +443,7 @@ const initData = () =&gt; {
                     justify-content: space-around;
                     align-items: center;
  
-                    .company-list-item-main-right-price {
-                      color: red;
-                    }
+                    .company-list-item-main-right-price {}
  
                     .company-list-item-main-right-number {
                       font-size: small;
@@ -17,7 +17,6 @@
 <script setup>
 import { sendCode, userLogin } from "@/apis/user.js";
 import { useMainStore } from '@/stores/index.js';
-import { setRequestToken } from '@/utils/request/request.js';
 import { onLoad } from "@dcloudio/uni-app";
 import { ref } from "vue";
 const store = useMainStore();
@@ -80,11 +79,9 @@ const checkVerifyNum = (code) =&gt; {
 		// 登录成功
 		if (res.data.success) {
 			verifyFlag.value = false;
-			setRequestToken(res.data.data)
-			store.token = res.data.data
+			store.tempToken = res.data.data
 			uni.$u.route({
-				type: "switchTab",
-				url: `pages/home/index`,
+				url: `pages/wode/choose/index`,
 			})
 		} else {
 			verifyFlag.value = true;
+<template>
+  <view class="order-detail-container" v-if="dataGram != null || dataGram != undefined">
+    <view class="order-detail-container-box">
+      <view class="order-detail-top">
+        <view class="order-detail-top-box">
+          <view class="order-detail-top-box-step">
+            <u-steps :current="currentStep(dataGram.garOrderHandlerStatus)" dot>
+              <u-steps-item title="待清运"></u-steps-item>
+              <u-steps-item title="清运中"></u-steps-item>
+              <u-steps-item title="已完成"></u-steps-item>
+            </u-steps>
+          </view>
+        </view>
+      </view>
+      <!-- 信息提示 -->
+      <view class="order-detail-container-box-card">
+        <text style="color: red;">请于交易完成后线下支付！！</text>
+      </view>
+      <!-- 派单信息 -->
+      <view class="order-detail-container-box-card">
+        <view class="order-detail-container-header-card-title">
+          派单信息
+        </view>
+        <view class="order-detail-container-header-item">
+          <text class="order-detail-container-header-title">派单地点：</text>
+          <view class="order-detail-container-header-content">
+            {{ dataGram.garOrderAddress + dataGram.garOrderAddressDetails }}
+          </view>
+        </view>
+
+        <view class="order-detail-container-header-item">
+          <text class="order-detail-container-header-title">现场图片：</text>
+          <view class="order-detail-container-header-content">
+            <u-upload :fileList="currentImages" name="3" multiple :maxCount="10" :previewFullImage="true"
+              :isReadOnly="true"></u-upload>
+          </view>
+        </view>
+        <view class="order-detail-container-header-item">
+          <text class="order-detail-container-header-title">负责单位：</text>
+          <view class="order-detail-container-header-content">
+            {{ dataGram.garOrderCompanyName }}
+          </view>
+        </view>
+        <view class="order-detail-container-header-item">
+          <text class="order-detail-container-header-title">垃圾类型：</text>
+          <view class="order-detail-container-header-content">
+            {{ dataGram.garOrderTrashType }}
+          </view>
+        </view>
+        <view class="order-detail-container-header-item">
+          <text class="order-detail-container-header-title">订单号：</text>
+          <view class="order-detail-container-header-content">
+            {{ orderId }}
+          </view>
+        </view>
+      </view>
+      <!-- 派单记录 -->
+      <view class="order-detail-container-box-card">
+        <view class="order-detail-container-header-card-title">
+          派单人员
+        </view>
+        <!-- <view class="order-detail-container-header-item">
+          <text class="order-detail-container-header-title">派单时间：</text>
+          <view class="order-detail-container-header-content">
+            {{ dataGram.garCreateTime }}
+          </view>
+        </view> -->
+        <view class="order-detail-container-header-item">
+          <text class="order-detail-container-header-title">约定时间：</text>
+          <view class="order-detail-container-header-content">
+            {{ dataGram.garOrderAgreementTime }}
+          </view>
+        </view>
+        <view class="order-detail-container-header-item">
+          <text class="order-detail-container-header-title">联系电话：</text>
+          <view class="order-detail-container-header-content">
+            {{ dataGram.garOrderContactTel }}
+            <u-icon name="phone" size="28" @click="handleContactClick(dataGram.garOrderCompanyTel)"></u-icon>
+          </view>
+        </view>
+        <view class="order-detail-container-header-item">
+          <text class="order-detail-container-header-title">派单人：</text>
+          <view class="order-detail-container-header-content">
+            {{ dataGram.garOrderContactName }}
+          </view>
+        </view>
+        <view class="order-detail-container-header-item">
+          <text class="order-detail-container-header-title">备注：</text>
+          <view class="order-detail-container-header-content">
+            {{ dataGram.garRemark }}
+          </view>
+        </view>
+      </view>
+      <!-- 处理信息 -->
+      <view class="order-detail-container-box-card">
+        <view class="order-detail-container-header-card-title">
+          处理信息
+        </view>
+        <view class="order-detail-container-header-item">
+          <text class="order-detail-container-header-title">负责人：</text>
+          <view class="order-detail-container-header-content">
+            {{ dataGram.garOrderHandlerId }}
+          </view>
+        </view>
+        <view class="order-detail-container-header-item">
+          <text class="order-detail-container-header-title">装车照片：</text>
+          <view class="order-detail-container-header-content">
+            <u-upload :fileList="putOnImages" name="3" multiple :maxCount="20" :previewFullImage="true"
+              :isReadOnly="true"></u-upload>
+          </view>
+        </view>
+        <view class="order-detail-container-header-item">
+          <text class="order-detail-container-header-title">卸车照片：</text>
+          <view class="order-detail-container-header-content">
+            <u-upload :fileList="putDownImages" name="3" multiple :maxCount="20" :previewFullImage="true"
+              :isReadOnly="true"></u-upload>
+          </view>
+        </view>
+        <!-- <view class="order-detail-container-header-item">
+          <text class="order-detail-container-header-title">备注：</text>
+          <view class="order-detail-container-header-content">
+            {{ dataGram.garRemark }}
+          </view>
+        </view> -->
+      </view>
+    </view>
+    <view class="space-box"></view>
+    <view class="order-detail-bottom">
+      <view class="order-detail-bottom-box">
+        <view class="order-detail-bottom-left">
+          <!-- <u-button @click="handleOderSure" shape="circle" color="#a9e08f" text="取消订单"></u-button> -->
+          <u-button v-if="dataGram.garOrderHandlerStatus == 1" @click="handleSubmitSuccess(orderId)" shape="circle"
+            color="#a9e08f" text="完成派单"></u-button>
+        </view>
+        <view class="order-detail-bottom-right">
+          <u-button @click="handleOrder(orderId)" v-if="dataGram.garOrderHandlerStatus == 0 && dataGram.handleFlag"
+            shape="circle" color="#a9e08f" text="处理派单"></u-button>
+          <u-button @click="handleUploadImage(orderId)" v-if="dataGram.garOrderHandlerStatus == 1" shape="circle"
+            color="#a9e08f" text="上传照片"></u-button>
+          <u-button @click="handleEvaluate(orderId)" v-if="dataGram.garEvaluateFlag == 0" shape="circle" color="#a9e08f"
+            text="去评价"></u-button>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { queryOrderDetail, updateOrder } from "@/apis/order.js";
+import { onLoad, onShow } from '@dcloudio/uni-app';
+import { ref } from 'vue';
+const dataGram = ref();
+const orderId = ref(null)
+const currentImages = ref([])
+const putOnImages = ref([])
+const putDownImages = ref([])
+/**
+ * 初始化信息
+ */
+onLoad((options) => {
+  orderId.value = options.orderId
+})
+const handleOrderDetail = (orderId) => {
+  queryOrderDetail(orderId).then(res => {
+    dataGram.value = res.data.data;
+    currentImages.value = res.data.data.currentImages.map(item => {
+      return { url: import.meta.env.VITE_BASE_URL + item };
+    });
+    putOnImages.value = res.data.data.putOnImages.map(item => {
+      return { url: import.meta.env.VITE_BASE_URL + item };
+    });
+    putDownImages.value = res.data.data.putDownImages.map(item => {
+      return { url: import.meta.env.VITE_BASE_URL + item };
+    });
+  })
+}
+/**
+ * 拨打电话回调
+ */
+const handleContactClick = (val) => {
+  uni.makePhoneCall({ phoneNumber: val }).then(res => {
+  }).catch(err => { });
+}
+
+// 提交完成
+const handleSubmitSuccess = (orderId) => {
+  uni.showModal({
+    title: '提示',
+    content: '派单已经清运完成了吗？',
+    success: function (res) {
+      if (res.confirm) {
+        updateOrder({ garOrderId: orderId, handleType: 3 }).then(res => {
+          if (res.data.success) {
+            uni.$u.toast("已完成")
+            handleOrderDetail(orderId)
+          }
+        })
+      } else if (res.cancel) {
+        console.log('用户点击取消');
+      }
+    }
+  });
+}
+const handleEvaluate = (orderId) => [
+  uni.$u.route(`pages/order/evaluate/index?orderId=${orderId}`)
+]
+
+// 接收订单
+const handleOrder = (orderId) => {
+  updateOrder({ garOrderId: orderId, handleType: 0 }).then(res => {
+    if (res.data.success) {
+      uni.$u.toast("派单状态已被改变")
+      handleOrderDetail(orderId)
+    }
+  })
+}
+
+
+const currentStep = (step) => {
+  console.log(step);
+  if (step > 2) {
+    return step - 1;
+  }
+  return step;
+}
+
+const handleUploadImage = (orderId) => {
+  uni.$u.route(`pages/order/upload/index?orderId=${orderId}`)
+}
+
+onShow(() => {
+  if (orderId.value != null) {
+    handleOrderDetail(orderId.value)
+  }
+})
+
+</script>
+
+<style lang="scss" scoped>
+$custom-marin-bottom: 20rpx;
+$custom-page-padding: 20rpx;
+$custom-border-radio: 20rpx;
+$custom-bottom-height: 200rpx;
+
+@mixin card {
+
+  padding: $custom-page-padding;
+  box-sizing: border-box;
+  background-color: #ffffff;
+  border-radius: $custom-border-radio;
+  margin-bottom: $custom-marin-bottom;
+}
+
+.order-detail-container {
+  height: 100%;
+  width: 100%;
+  background-color: $u-info-light;
+  box-sizing: border-box;
+  overflow-y: scroll;
+
+
+  .order-detail-container-box {
+    height: 100%;
+    width: 100%;
+    padding: $custom-page-padding;
+    box-sizing: border-box;
+    background: linear-gradient(to bottom, $u-success-dark, $u-info-light, $u-info-light, $u-info-light);
+
+    .order-detail-top {
+      @include card();
+
+      .order-detail-top-box {
+        .order-detail-top-box-step {
+          u-steps {
+            u-steps-item {}
+          }
+        }
+      }
+    }
+
+    .order-detail-container-box-card {
+      @include card();
+
+      .order-detail-container-header-card-title {
+        font-weight: bold;
+        line-height: 80rpx;
+        border-bottom: 3rpx solid $u-info-light;
+        margin-bottom: $custom-marin-bottom;
+        color: $u-primary;
+      }
+
+      .order-detail-container-header-item {
+        display: flex;
+        margin-bottom: $custom-marin-bottom;
+
+        // font-size: 30rpx;
+        // font-weight: bold;
+        // color: $u-main-color;
+        .order-detail-container-header-title {
+          color: $u-main-color;
+          white-space: nowrap; //溢出不换行
+          color: $u-info;
+        }
+
+        .order-detail-container-header-content {
+          display: flex;
+        }
+      }
+    }
+  }
+
+
+  .space-box {
+    padding-bottom: $custom-bottom-height;
+  }
+
+
+  .order-detail-bottom {
+    position: absolute;
+    width: 100%;
+    // height: 100%;
+    bottom: 0;
+    left: 0;
+
+    .movableAreaDetail {
+      pointer-events: none;
+      position: fixed;
+      left: 0;
+      top: 0;
+      width: 100%;
+      height: calc(100% - $custom-bottom-height);
+      z-index: 999;
+
+      .movableView {
+        pointer-events: auto;
+        min-height: 60rpx;
+        min-width: 60rpx;
+
+        .order-detail-call-box-container {
+          min-height: 60rpx;
+          min-width: 60rpx;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          background-color: #a9e08f;
+          border-radius: 100%;
+        }
+      }
+    }
+
+    .order-detail-bottom-box {
+      height: $custom-bottom-height;
+      padding: 50rpx;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .order-detail-bottom-left {
+        min-width: 200rpx;
+      }
+
+      .order-detail-bottom-right {
+        min-width: 200rpx;
+      }
+    }
+
+  }
+
+
+}
+</style>
+<template>
+  <view class='issue'>
+    <view class="issue-head">
+      <text class="issue-head-title">派单评价</text>
+      <view class="issue-head-star-box">
+        <u-icon v-for="(todo, index) in maxStar" :name="score > todo ? 'star-fill' : 'star'" :key="todo" color="#f9ae3d"
+          size="28" @click="setScore(index + 1)"></u-icon>
+      </view>
+    </view>
+    <textarea v-if="textareaShow" @blur="blur" :value="textareaValue" :placeholder="textareaPlaceholder" />
+    <view class="issue-btn-box">
+      <button class="submit-btn" type="primary" @click="doSubmit(orderId, score, content)">提交评价</button>
+    </view>
+  </view>
+</template>
+<script setup>
+import { uploadEvaluate } from "@/apis/order.js";
+import { onLoad } from '@dcloudio/uni-app';
+// import
+import { ref } from 'vue';
+let maxScore = ref(5);
+const orderId = ref()
+const maxStar = ref([])
+const score = ref(5)
+const textareaShow = ref(true)
+const textareaPlaceholder = ref("请输入对此次服务得评价")
+const content = ref("")
+const doSubmit = (orderId, score, content) => {
+  uploadEvaluate({ orderId, score, content }).then(res => {
+    if (res.data.success) {
+      uni.$u.toast("评价成功")
+      setTimeout(() => {
+        uni.$u.route({
+          type: "switchTab",
+          url: "pages/order/index"
+        })
+      }, 200);
+    }
+  })
+}
+const setScore = (index) => {
+  score.value = index
+}
+const blur = (e) => {
+  content.value = e.detail.value
+}
+onLoad((options) => {
+  orderId.value = options.orderId
+  // 积分初始化
+  for (let index = 0; index < maxScore.value; index++) {
+    maxStar.value.push(index);
+  }
+})
+
+</script>
+<style lang='scss' scoped>
+$backgroundC: #f9f9f9;
+$borderColor: #f5f5f5;
+$white: #ffffff;
+$fontSize: 28rpx;
+
+.issue {
+  background-color: $backgroundC;
+  height: 100%;
+  width: 100%;
+  box-sizing: border-box;
+  padding: 20rpx;
+
+  &-head {
+    background-color: $white;
+    height: 100rpx;
+    border-top: 1rpx solid $borderColor;
+    border-bottom: 1rpx solid $borderColor;
+    padding: 0 25rpx;
+    display: flex;
+
+    &-pic {
+      width: 70rpx;
+      height: 70rpx;
+      border-radius: 50%;
+      vertical-align: middle;
+      margin-right: 17rpx;
+    }
+
+    &-title {
+      line-height: 100rpx;
+      font-size: 30rpx;
+      vertical-align: middle;
+      margin-right: 35rpx;
+      color: $u-primary;
+    }
+
+    &-star-box {
+      display: flex;
+
+      image {
+        width: 32rpx;
+        height: 32rpx;
+        vertical-align: middle;
+        margin-right: 14rpx;
+      }
+
+      image.active {
+        animation: star_move ease-in 1 1s, star_rotate ease 1.5s infinite 1s;
+      }
+    }
+  }
+
+  textarea {
+    width: 100%;
+    height: 420rpx;
+    background-color: $white;
+    font-size: $fontSize;
+    color: #898989;
+    padding: 24rpx;
+    box-sizing: border-box;
+    line-height: 40rpx;
+    border: 2rpx solid $u-info-light;
+  }
+
+  &-btn-box {
+    padding: 54rpx 30rpx;
+
+    button {
+      width: 100%;
+      height: 80rpx;
+      border-radius: 80rpx;
+      font-size: $fontSize;
+      background-color: #3682FF;
+      line-height: 80rpx
+    }
+  }
+}
+
+@keyframes star_move {
+  from {
+    width: 50rpx;
+    height: 50rpx;
+    transform: rotate(180deg)
+  }
+
+  to {
+    width: 32rpx;
+    height: 32rpx;
+    transform: rotate(0)
+  }
+}
+
+@keyframes star_rotate {
+  0% {
+    transform: rotateY(360deg)
+  }
+
+  100% {
+    transform: rotateY(180deg)
+  }
+}
+</style>
@@ -15,7 +15,7 @@
 <script setup>
 import { ref } from 'vue';
 import swiperListItem from './swiper-list-item/index.vue';
-const list = ref([{ name: '待清运' }, { name: '清运中' }, { name: '全部' }, { name: '待支付' }, { name: '已完成' }])
+const list = ref([{ name: '待清运' }, { name: '清运中' }, { name: '全部' }, { name: '已完成' }])
 const current = ref(0);
 const swiperCurrent = ref(0)
 const uTabsElement = ref()
@@ -37,6 +37,6 @@ const translation = (e) =&gt; {
  
 .swiper {
   height: 100%;
-  background: linear-gradient(to bottom, $u-success-dark, #ffffff, #ffffff, #ffffff, #ffffff, #ffffff, #ffffff);
+  background: linear-gradient(to bottom, $u-success-dark, $u-bg-color, $u-bg-color, $u-bg-color, $u-bg-color, $u-bg-color, $u-bg-color);
 }
 </style>
 <template>
   <view class="content-container">
-    <z-paging ref="paging" :fixed="false" v-model="dataList" @query="queryList">
+    <z-paging ref="paging" :fixed="false" v-model="dataList" :auto="false" @query="queryList">
       <empty-view slot:empty></empty-view>
-      <view class="content-container-item-box" v-for="(item, index) in dataList">
-        <view class="content-container-item-box-title">{{ item }}</view>
+      <view class="page-box">
+        <view class="order" v-for="(item, index) in  dataList" :key="index">
+          <view class="top">
+            <view class="left">
+              <u-icon name="home" :size="30" color="rgb(94,94,94)"></u-icon>
+              <view class="store">{{ item.garOrderCompanyName }}</view>
+              <u-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></u-icon>
+            </view>
+            <view v-if="item.garOrderHandlerStatus === 0" class="right">待清运 </view>
+            <view v-if="item.garOrderHandlerStatus === 1" class="right">清运中 </view>
+            <view v-if="item.garEvaluateFlag === 0" class="right">待评价 </view>
+            <view v-if="item.garEvaluateFlag === 1" class="right">已评价 </view>
+          </view>
+          <view class="item" @click="handleClick(item.garOrderId)">
+            <view class="left">
+              <image :src="item.goodsUrl" mode="aspectFill"></image>
+            </view>
+            <view class="content">
+              <view class="title u-line-2">{{ item.garOrderAddress + item.garOrderAddressDetails }}</view>
+              <view class="type">垃圾类型: {{ item.garOrderTrashType }}</view>
+              <view class="delivery-time">预约时间 {{ item.garOrderAgreementTime }}</view>
+            </view>
+          </view>
+          <!-- <view class="bottom">
+            <view class="more">
+              <u-icon name="more-dot-fill" color="rgb(203,203,203)"></u-icon>
+            </view>
+            <view class="logistics btn" v-if="item.garOrderHandlerStatus === 0" @click="">取消订单</view>
+            <view class="evaluate btn" v-if="item.garOrderHandlerStatus === 4">评价</view>
+          </view> -->
+        </view>
       </view>
     </z-paging>
   </view>
 </template>
  
 <script setup>
-import { onMounted, ref } from 'vue';
-
+import { queryOrderList } from "@/apis/order.js";
+import { ref, watch } from 'vue';
 const props = defineProps({
   tabIndex: {
     type: Number
@@ -20,43 +49,177 @@ const props = defineProps({
     type: Number
   }
 })
-const paging = ref(null)
-const dataList = ref([])
-const count = ref(0)
-const timer = ref()
+const dataList = ref([]);
+const paging = ref(null);
+const firstLoaded = ref(false)
+
+const handleClick = (orderId) => {
+  uni.$u.route({
+    url: `pages/order/detail/index`,
+    params: {
+      orderId: orderId
+    }
+  })
+}
+// list集合
 const queryList = (pageNo, pageSize) => {
   //这里的pageNo和pageSize会自动计算好，直接传给服务器即可
   //这里的请求只是演示，请替换成自己的项目的网络请求，并在网络请求回调中通过paging.value.complete(请求回来的数组)将请求结果传给z-paging
   // request.queryList({ pageNo, pageSize }).then(res => {
   //   //请勿在网络请求回调中给dataList赋值！！只需要调用complete就可以了
+  queryOrderList({ type: props.tabIndex, pageNo, pageSize }).then((res) => {
+    paging.value.complete(res.data.data.list);
+    firstLoaded.value = true
+    console.log(res.data.data.list);
+  }).catch(res => {
+    //如果请求失败写paging.value.complete(false)，会自动展示错误页面
+    //注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+    //在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+    paging.value.complete(false);
+  })
   if (props.tabIndex == 3) {
     paging.value.complete([])
     return
   }
-  if (++count.value < 3) {
-    clearTimeout(timer.value)
-    timer.value = setTimeout(() => {
-      console.log("hhhh");
-      paging.value.complete([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
-    }, 500);
-  }
-
-  // }).catch(res => {
-  //   //如果请求失败写paging.value.complete(false)，会自动展示错误页面
-  //   //注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
-  //   //在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
-  //   paging.value.complete(false);
-  // })
 }
+watch(() => props.currentIndex, (val1, val2) => {
+  if (props.currentIndex == props.tabIndex) {
+    if (!firstLoaded.value) {
+      setTimeout(() => {
+        paging.value.reload();
+      }, 50);
+    }
  
-onMounted(() => {
-  console.log("tabIndex:", props.tabIndex);
-  console.log("currentIndex:", props.currentIndex);
-})
+  }
+}, { immediate: true })
 </script>
  
 <style lang="scss" scoped>
 .content-container {
   height: 100%;
+
+  .order {
+    width: 710rpx;
+    background-color: #ffffff;
+    margin: 20rpx auto;
+    border-radius: 20rpx;
+    box-sizing: border-box;
+    padding: 20rpx;
+    font-size: 28rpx;
+
+    .top {
+      display: flex;
+      justify-content: space-between;
+
+      .left {
+        display: flex;
+        align-items: center;
+
+        .store {
+          margin: 0 10rpx;
+          font-size: 32rpx;
+          font-weight: bold;
+        }
+      }
+    }
+
+    .item {
+      display: flex;
+      margin: 20rpx 0 0;
+
+      .left {
+        margin-right: 20rpx;
+
+        image {
+          width: 200rpx;
+          height: 200rpx;
+          border-radius: 10rpx;
+        }
+      }
+
+      .content {
+
+        .title {
+          font-size: 28rpx;
+          line-height: 50rpx;
+        }
+
+        .type {
+          margin: 10rpx 0;
+          font-size: 24rpx;
+          color: $u-tips-color;
+        }
+
+        .delivery-time {
+          color: #e5d001;
+          font-size: 24rpx;
+        }
+      }
+
+
+    }
+
+    .total {
+      margin-top: 20rpx;
+      text-align: right;
+      font-size: 24rpx;
+
+      .total-price {
+        font-size: 32rpx;
+      }
+    }
+
+    .bottom {
+      display: flex;
+      margin-top: 40rpx;
+      padding: 0 10rpx;
+      justify-content: space-between;
+      align-items: center;
+
+      .btn {
+        line-height: 52rpx;
+        width: 160rpx;
+        border-radius: 26rpx;
+        border: 2rpx solid $u-border-color;
+        font-size: 26rpx;
+        text-align: center;
+        color: $u-info-dark;
+      }
+
+      .evaluate {
+        color: $u-warning-dark;
+        border-color: $u-warning-dark;
+      }
+    }
+  }
+
+  .centre {
+    text-align: center;
+    margin: 200rpx auto;
+    font-size: 32rpx;
+
+    image {
+      width: 164rpx;
+      height: 164rpx;
+      border-radius: 50%;
+      margin-bottom: 20rpx;
+    }
+
+    .tips {
+      font-size: 24rpx;
+      color: #999999;
+      margin-top: 20rpx;
+    }
+
+    .btn {
+      margin: 80rpx auto;
+      width: 200rpx;
+      border-radius: 32rpx;
+      line-height: 64rpx;
+      color: #ffffff;
+      font-size: 26rpx;
+      background: linear-gradient(270deg, rgba(249, 116, 90, 1) 0%, rgba(255, 158, 1, 1) 100%);
+    }
+  }
 }
 </style>
+<template>
+  <view class="upload-image-box">
+    <view class="upload-image-box-choose">
+      <text class="upload-image-box-choose-txt">请选择图片类型：</text>
+      <view class="upload-image-box-choose-type">
+        <u-radio-group v-model="singleItem" @change="groupChange" placement="row">
+          <u-radio activeColor="#19be6b" :customStyle="{ marginBottom: '8px' }" size="28" labelSize="28"
+            v-for="(item, index) in chooseList" :key="index" :label="item.name" :name="item.name" @change="radioChange">
+          </u-radio>
+        </u-radio-group>
+      </view>
+    </view>
+    <view class="upload-image-box-bottom">
+      <text class="upload-image-box-bottom-txt">{{ singleItem }}（最多上传10张）</text>
+      <view class="upload-image-box-button-container">
+        <u-upload :fileList="fileList" @afterRead="afterRead" @delete="deletePic" name="3" multiple :maxCount="10"
+          :previewFullImage="true" width="200" height="150"></u-upload>
+      </view>
+    </view>
+    <view class="upload-image-box-submit-box">
+      <view class="upload-image-box-submit-box-button" @click="handleSubmit(orderId, singleItem)">
+        <view class="upload-image-box-submit-box-button-container">
+          <up-button color="#19be6b" type="primary" shape="circle" text="确定"></up-button>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { uploadFilePromise } from '@/apis/common.js';
+import { uploadImageUrlByType } from '@/apis/order.js';
+import { onLoad } from '@dcloudio/uni-app';
+import { reactive, ref } from 'vue';
+
+const orderId = ref();
+const fileList = ref([])
+const singleItem = ref("装车图片")
+const chooseList = reactive([{ name: "装车图片" }, { name: "卸车图片" }])
+// 删除图片
+const deletePic = (event) => {
+  fileList.value.splice(event.index, 1);
+};
+
+const groupChange = (e) => {
+  console.log(e);
+}
+const radioChange = (e) => {
+  console.log(e);
+}
+
+// 新增图片
+const afterRead = async (event) => {
+  // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+  let lists = [].concat(event.file);
+  let fileListLen = fileList.value.length;
+  lists.map((item) => {
+    fileList.value.push({
+      ...item,
+      status: 'uploading',
+      message: '上传中',
+    });
+  });
+  for (let i = 0; i < lists.length; i++) {
+    let requestPath = import.meta.env.VITE_BASE_URL + import.meta.env.VITE_BASE_FILE_UPLOAD_PREFIX;
+    const result = await uploadFilePromise(requestPath, lists[i].url);
+    let item = fileList.value[fileListLen];
+    fileList.value.splice(fileListLen, 1, {
+      ...item,
+      status: 'success',
+      message: '',
+      url: result.data.fileName,
+    });
+    fileListLen++;
+  }
+};
+// 提交图片
+const handleSubmit = (id, type) => {
+  if (!validateImage()) {
+    uni.$u.toast("请等待图片上传~")
+    return
+  }
+  let params = {
+    garOrderId: id,
+    type: type == "装车图片" ? 1 : 2,
+    imageUrls: fileList.value.map(item => item.url)
+  }
+  uploadImageUrlByType(params).then(res => {
+    console.log(res);
+    if (res.data.success) {
+      uni.$u.toast("图片上传完毕！");
+      uni.$u.route({
+        type: "navigateBack",
+        url: "pages/order/detail/index"
+      })
+    }
+  })
+}
+
+const validateImage = () => {
+  for (let index = 0; index < fileList.value.length; index++) {
+    const str = fileList.value[index].url;
+    if (str.startsWith("blob")) {
+      return false;
+    }
+  }
+  return true;
+}
+
+onLoad((options) => {
+  orderId.value = options.orderId;
+})
+</script>
+
+<style lang="scss" scoped>
+.upload-image-box {
+  height: 100%;
+  width: 100%;
+  background-color: #ffffff;
+  padding: 20rpx;
+  box-sizing: border-box;
+  line-height: 80rpx;
+
+  .upload-image-box-choose {
+    display: flex;
+
+    .upload-image-box-choose-txt {
+      white-space: nowrap;
+    }
+
+    .upload-image-box-choose-type {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+
+  .upload-image-box-bottom {
+    .upload-image-box-bottom-txt {
+      color: $u-info;
+    }
+
+    .upload-image-box-button-container {
+      min-height: 350rpx;
+      min-width: 100%;
+      padding: 20rpx;
+      // background-color: $u-info-light;
+      border: 2rpx solid $u-border-color;
+      box-sizing: border-box;
+      border-radius: 10rpx;
+    }
+  }
+
+  .upload-image-box-submit-box {
+    box-sizing: border-box;
+    margin-top: 80rpx;
+    width: 100%;
+
+    .upload-image-box-submit-box-button {
+      box-sizing: border-box;
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+
+      .upload-image-box-submit-box-button-container {
+        white-space: nowrap;
+        box-sizing: border-box;
+        width: 200rpx;
+      }
+    }
+  }
+}
+</style>
+<template>
+  <view class="wrap">
+    <u-radio-group v-model="userType" placement="row" @change="groupChange">
+      <view class="choose-type" v-for="(item, index) in typeList">
+        <u-radio :customStyle="{ marginBottom: '8px' }" size="28" labelSize="28" :key="index" :label="item.name"
+          :name="item.name" @change="radioChange">
+        </u-radio>
+      </view>
+    </u-radio-group>
+    <view class="choose-button">
+      <u-button shape="circle" color="#a9e08f" @click="submit(userType)">确定</u-button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { updateUserInfo } from "@/apis/user.js";
+import { useMainStore } from '@/stores/index.js';
+import { setRequestToken } from '@/utils/request/request.js';
+import { ref } from 'vue';
+const store = useMainStore();
+const userType = ref("居民用户")
+const typeList = ref([{ name: "居民用户" }, { name: "管理负责人" }])
+const radioChange = (e) => {
+  console.log(e);
+}
+const groupChange = (e) => {
+  console.log(e);
+}
+const submit = (userType) => {
+  setRequestToken(store.tempToken)
+  updateUserInfo({ garUserType: userType }).then(res => {
+    store.token = store.tempToken
+    store.tempToken = "";
+    if (res.data.success) {
+      uni.$u.route({
+        type: "switchTab",
+        url: `pages/home/index`,
+      })
+    }
+  })
+
+}
+</script>
+
+<style lang="scss" scoped>
+.wrap {
+  height: 100%;
+  width: 100%;
+  box-sizing: border-box;
+  padding: 20rpx;
+  background-color: $u-info-light;
+
+  .choose-type {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 30rpx;
+    background-color: #ffffff;
+    border-radius: 20rpx;
+
+    &:first-child {
+      margin-right: 20rpx;
+    }
+  }
+
+  .choose-button {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+</style>
 <template>
   <view>
-    myself
+    <view class="u-flex u-flex-y-center u-flex-around user-box u-p-l-30 u-p-r-20 u-p-b-30">
+      <view class="u-m-r-10">
+        <u-avatar :src="pic" size="140"></u-avatar>
+      </view>
+      <view class="u-flex-1">
+        <view class="u-font-18 u-p-b-20">普通用户</view>
+        <!-- <view class="u-font-14 u-tips-color"></view> -->
+      </view>
+      <!-- <view class="u-m-l-10 u-p-10">
+        <u-icon name="scan" color="#969799" size="28"></u-icon>
+      </view>
+      <view class="u-m-l-10 u-p-10">
+        <u-icon name="arrow-right" color="#969799" size="28"></u-icon>
+      </view> -->
+    </view>
+
+    <view class="u-m-t-20">
+      <u-cell-group>
+        <u-cell icon="map" title="地址管理"></u-cell>
+      </u-cell-group>
+    </view>
+
+    <view class="u-m-t-20">
+      <u-cell-group>
+        <u-cell icon="star" title="收藏"></u-cell>
+        <u-cell icon="photo" title="相册"></u-cell>
+        <u-cell icon="coupon" title="卡券"></u-cell>
+        <u-cell icon="heart" title="关注"></u-cell>
+      </u-cell-group>
+    </view>
+
+    <view class="u-m-t-20">
+      <u-cell-group>
+        <u-cell icon="setting" title="设置"></u-cell>
+      </u-cell-group>
+    </view>
   </view>
 </template>
  
-<script setup>
+<script>
+import headImg from "@/static/image/st_pic.png";
+export default {
+  data() {
+    return {
+      pic: headImg,
+      show: true
+    }
+  },
+  onLoad() {
+
+  },
+  methods: {
  
+  }
+}
 </script>
  
-<style lang="scss" scoped>
+<style lang="scss">
+page {
+  background-color: #ededed;
+}
+
+.camera {
+  width: 54px;
+  height: 44px;
+
+  &:active {
+    background-color: #ededed;
+  }
+}
+
+.user-box {
+  background-color: #fff;
+}
+
+.u-cell-group {
+  background-color: #fff;
+}
 </style>
@@ -4,9 +4,9 @@ export const useMainStore = defineStore(
   "main",
   () => {
     const token = ref(null);
-    const userInfo = ref(null);
+    const tempToken = ref(null);
  
-    return { token, userInfo };
+    return { token,tempToken };
   },
   {
     persist: {
@@ -2,9 +2,6 @@ import axios from &quot;axios&quot;;
 import settle from "axios/lib/core/settle";
 import buildURL from "axios/lib/helpers/buildURL";
 /* 格式化路径 */
-const URLFormat = function (baseURL, url) {
-  return url.startsWith("http") ? url : baseURL
-}
 axios.defaults.adapter = function (config) {
   return new Promise((resolve, reject) => {
     const timer = setTimeout(() => {
@@ -54,17 +51,21 @@ const instance = axios.create({
 });
 // 请求拦截器
 instance.interceptors.request.use((config) => {
+  if (config.method.toLocaleLowerCase() == "get") {
+    handleGet(config);
+  }
   return config;
 });
 // 响应拦截器
 instance.interceptors.response.use((response) => {
   if (response.data.code != 200) {
-    uni.showToast({
-      title: response.data.message,
-      icon: "none",
-    });
     if (response.data.code == 401) {
       reSetLoginStatus();
+    } else {
+      uni.showToast({
+        title: response.data.message,
+        icon: "none",
+      });
     }
   }
   return response;
@@ -89,8 +90,30 @@ export function setRequestToken(token) {
 }
  
 const reSetLoginStatus = () => {
+  setRequestToken(null);
+  uni.showToast({
+    title: "登录已过期，请重新登录！",
+    icon: "none",
+  });
   uni.navigateTo({
-      type: "reLaunch",
-      url: "/pages/login/index",
-    });
+    url: "/pages/login/index",
+  })
+  return
+}
+
+const handleGet = (config) => {
+  let strUrl = "";
+  let params = config.params;
+  let firstElement = true;
+  for (const key in params) {
+    if (firstElement) {
+      firstElement = false;
+      strUrl = "?" + key + "=" + params[key];
+    } else {
+      strUrl += "&" + key + "=" + params[key];
+    }
+  }
+  config.url += strUrl;
+  config.params = "";
+  console.log("请求拦截",config);
 }
@@ -109,8 +109,9 @@ export default {
 	&--row {
 		/* #ifndef APP-NVUE */
 		display: flex;
-		/* #endif */
-		// flex-flow: row wrap;
+		flex-direction: row
+			/* #endif */
+			// flex-flow: row wrap;
 	}
  
 	&--column {
@@ -6,35 +6,34 @@
 			:class="[`u-steps-item__wrapper--${parentData.direction}`, parentData.dot && `u-steps-item__wrapper--${parentData.direction}--dot`]">
 			<slot name="icon">
 				<view class="u-steps-item__wrapper__dot" v-if="parentData.dot" :style="{
-						backgroundColor: statusColor
-					}">
+					backgroundColor: statusColor
+				}">
  
 				</view>
 				<view class="u-steps-item__wrapper__icon" v-else-if="parentData.activeIcon || parentData.inactiveIcon">
-					<u-icon :name="index <= parentData.current ? parentData.activeIcon : parentData.inactiveIcon"
-						:size="iconSize"
+					<u-icon :name="index <= parentData.current ? parentData.activeIcon : parentData.inactiveIcon" :size="iconSize"
 						:color="index <= parentData.current ? parentData.activeColor : parentData.inactiveColor">
 					</u-icon>
 				</view>
 				<view v-else :style="{
-						backgroundColor: statusClass === 'process' ? parentData.activeColor : 'transparent',
-						borderColor: statusColor
-					}" class="u-steps-item__wrapper__circle">
-					<text v-if="statusClass === 'process' || statusClass === 'wait'"
-						class="u-steps-item__wrapper__circle__text" :style="{
+					backgroundColor: statusClass === 'process' ? parentData.activeColor : 'transparent',
+					borderColor: statusColor
+				}" class="u-steps-item__wrapper__circle">
+					<text v-if="statusClass === 'process' || statusClass === 'wait'" class="u-steps-item__wrapper__circle__text"
+						:style="{
 							color: index == parentData.current ? '#ffffff' : parentData.inactiveColor
-						}">{{ index + 1}}</text>
-					<u-icon v-else :color="statusClass === 'error' ? 'error' : parentData.activeColor" size="12"
+						}">{{ index + 1 }}</text>
+					<u-icon v-else :color="statusClass === 'error' ? 'error' : parentData.activeColor" size="24"
 						:name="statusClass === 'error' ? 'close' : 'checkmark'"></u-icon>
 				</view>
 			</slot>
 		</view>
 		<view class="u-steps-item__content" :class="[`u-steps-item__content--${parentData.direction}`]"
 			:style="[contentStyle]">
-			<u--text :text="title" :type="parentData.current == index ? 'main' : 'content'" lineHeight="20px"
-				:size="parentData.current == index ? 14 : 13"></u--text>
+			<u--text align="center" :text="title" :type="parentData.current == index ? 'main' : 'content'" lineHeight="20px"
+				:size="parentData.current == index ? 28 : 26"></u--text>
 			<slot name="desc">
-				<u--text :text="desc" type="tips" size="12"></u--text>
+				<u--text align="center" :text="desc" type="tips" size="24"></u--text>
 			</slot>
 		</view>
 		<!-- <view
@@ -47,272 +46,272 @@
 </template>
  
 <script>
-	import props from './props.js';
-	import mpMixin from '../../libs/mixin/mpMixin.js';
-	import mixin from '../../libs/mixin/mixin.js';
-	// #ifdef APP-NVUE
-	const dom = uni.requireNativePlugin('dom')
-	// #endif
-	/**
-	 * StepsItem 步骤条的子组件
-	 * @description 本组件需要和u-steps配合使用
-	 * @tutorial https://uviewui.com/components/steps.html
-	 * @property {String}			title			标题文字
-	 * @property {String}			current			描述文本
-	 * @property {String | Number}	iconSize		图标大小  (默认 17 )
-	 * @property {Boolean}			error			当前步骤是否处于失败状态  (默认 false )
-	 * @example <u-steps current="0"><u-steps-item title="已出库" desc="10:35" ></u-steps-item></u-steps>
-	 */
-	export default {
-		name: 'u-steps-item',
-		mixins: [mpMixin, mixin, props],
-		data() {
-			return {
-				index: 0,
-				childLength: 0,
-				showLine: false,
-				size: {
-					height: 0,
-					width: 0
-				},
-				parentData: {
-					direction: 'row',
-					current: 0,
-					activeColor: '',
-					inactiveColor: '',
-					activeIcon: '',
-					inactiveIcon: '',
-					dot: false
-				}
+import mixin from '../../libs/mixin/mixin.js';
+import mpMixin from '../../libs/mixin/mpMixin.js';
+import props from './props.js';
+// #ifdef APP-NVUE
+const dom = uni.requireNativePlugin('dom')
+// #endif
+/**
+ * StepsItem 步骤条的子组件
+ * @description 本组件需要和u-steps配合使用
+ * @tutorial https://uviewui.com/components/steps.html
+ * @property {String}			title			标题文字
+ * @property {String}			current			描述文本
+ * @property {String | Number}	iconSize		图标大小  (默认 17 )
+ * @property {Boolean}			error			当前步骤是否处于失败状态  (默认 false )
+ * @example <u-steps current="0"><u-steps-item title="已出库" desc="10:35" ></u-steps-item></u-steps>
+ */
+export default {
+	name: 'u-steps-item',
+	mixins: [mpMixin, mixin, props],
+	data() {
+		return {
+			index: 0,
+			childLength: 0,
+			showLine: false,
+			size: {
+				height: 0,
+				width: 0
+			},
+			parentData: {
+				direction: 'row',
+				current: 0,
+				activeColor: '',
+				inactiveColor: '',
+				activeIcon: '',
+				inactiveIcon: '',
+				dot: false
 			}
+		}
+	},
+	watch: {
+		'parentData'(newValue, oldValue) {
+		}
+	},
+	created() {
+		this.init()
+	},
+	computed: {
+		lineStyle() {
+			const style = {}
+			if (this.parentData.direction === 'row') {
+				style.width = this.size.width + 'px'
+				style.left = this.size.width / 2 + 'px'
+			} else {
+				style.height = this.size.height + 'px'
+				// style.top = this.size.height / 2 + 'px'
+			}
+			style.backgroundColor = this.parent.children?.[this.index + 1]?.error ? uni.$u.color.error : this.index <
+				this
+					.parentData
+					.current ? this.parentData.activeColor : this.parentData.inactiveColor
+			return style
 		},
-		watch: {
-			'parentData'(newValue, oldValue) {
+		statusClass() {
+			const {
+				index,
+				error
+			} = this
+			const {
+				current
+			} = this.parentData
+			if (current == index) {
+				return error === true ? 'error' : 'process'
+			} else if (error) {
+				return 'error'
+			} else if (current > index) {
+				return 'finish'
+			} else {
+				return 'wait'
 			}
 		},
-		created() {
-			this.init()
+		statusColor() {
+			let color = ''
+			switch (this.statusClass) {
+				case 'finish':
+					color = this.parentData.activeColor
+					break
+				case 'error':
+					color = uni.$u.color.error
+					break
+				case 'process':
+					color = this.parentData.dot ? this.parentData.activeColor : 'transparent'
+					break
+				default:
+					color = this.parentData.inactiveColor
+					break
+			}
+			return color
 		},
-		computed: {
-			lineStyle() {
-				const style = {}
-				if (this.parentData.direction === 'row') {
-					style.width = this.size.width + 'px'
-					style.left = this.size.width / 2 + 'px'
-				} else {
-					style.height = this.size.height + 'px'
-					// style.top = this.size.height / 2 + 'px'
-				}
-				style.backgroundColor = this.parent.children?.[this.index + 1]?.error ? uni.$u.color.error : this.index <
-					this
-					.parentData
-					.current ? this.parentData.activeColor : this.parentData.inactiveColor
-				return style
-			},
-			statusClass() {
-				const {
-					index,
-					error
-				} = this
-				const {
-					current
-				} = this.parentData
-				if (current == index) {
-					return error === true ? 'error' : 'process'
-				} else if (error) {
-					return 'error'
-				} else if (current > index) {
-					return 'finish'
-				} else {
-					return 'wait'
-				}
-			},
-			statusColor() {
-				let color = ''
-				switch (this.statusClass) {
-					case 'finish':
-						color = this.parentData.activeColor
-						break
-					case 'error':
-						color = uni.$u.color.error
-						break
-					case 'process':
-						color = this.parentData.dot ? this.parentData.activeColor : 'transparent'
-						break
-					default:
-						color = this.parentData.inactiveColor
-						break
-				}
-				return color
-			},
-			contentStyle() {
-				const style = {}
-				if (this.parentData.direction === 'column') {
-					style.marginLeft = this.parentData.dot ? '2px' : '6px'
-					style.marginTop = this.parentData.dot ? '0px' : '6px'
-				} else {
-					style.marginTop = this.parentData.dot ? '2px' : '6px'
-					style.marginLeft = this.parentData.dot ? '2px' : '6px'
-				}
+		contentStyle() {
+			const style = {}
+			if (this.parentData.direction === 'column') {
+				style.marginLeft = this.parentData.dot ? '2px' : '6px'
+				style.marginTop = this.parentData.dot ? '0px' : '6px'
+			} else {
+				style.marginTop = this.parentData.dot ? '2px' : '6px'
+				style.marginLeft = this.parentData.dot ? '2px' : '6px'
+			}
  
-				return style
+			return style
+		}
+	},
+	mounted() {
+		this.parent && this.parent.updateFromChild()
+		uni.$u.sleep().then(() => {
+			this.getStepsItemRect()
+		})
+	},
+	methods: {
+		init() {
+			// 初始化数据
+			this.updateParentData()
+			if (!this.parent) {
+				return uni.$u.error('u-steps-item必须要搭配u-steps组件使用')
 			}
+			this.index = this.parent.children.indexOf(this)
+			this.childLength = this.parent.children.length
 		},
-		mounted() {
-			this.parent && this.parent.updateFromChild()
-			uni.$u.sleep().then(() => {
-				this.getStepsItemRect()
-			})
+		updateParentData() {
+			// 此方法在mixin中
+			this.getParentData('u-steps')
 		},
-		methods: {
-			init() {
-				// 初始化数据
-				this.updateParentData()
-				if (!this.parent) {
-					return uni.$u.error('u-steps-item必须要搭配u-steps组件使用')
-				}
-				this.index = this.parent.children.indexOf(this)
-				this.childLength = this.parent.children.length
-			},
-			updateParentData() {
-				// 此方法在mixin中
-				this.getParentData('u-steps')
-			},
-			// 父组件数据发生变化
-			updateFromParent() {
-				this.init()
-			},
-			// 获取组件的尺寸，用于设置横线的位置
-			getStepsItemRect() {
-				// #ifndef APP-NVUE
-				this.$uGetRect('.u-steps-item').then(size => {
-					this.size = size
-				})
-				// #endif
+		// 父组件数据发生变化
+		updateFromParent() {
+			this.init()
+		},
+		// 获取组件的尺寸，用于设置横线的位置
+		getStepsItemRect() {
+			// #ifndef APP-NVUE
+			this.$uGetRect('.u-steps-item').then(size => {
+				this.size = size
+			})
+			// #endif
  
-				// #ifdef APP-NVUE
-				dom.getComponentRect(this.$refs['u-steps-item'], res => {
-					const {
-						size
-					} = res
-					this.size = size
-				})
-				// #endif
-			}
+			// #ifdef APP-NVUE
+			dom.getComponentRect(this.$refs['u-steps-item'], res => {
+				const {
+					size
+				} = res
+				this.size = size
+			})
+			// #endif
 		}
 	}
+}
 </script>
  
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
+@import "../../libs/css/components.scss";
  
-	.u-steps-item {
-		flex: 1;
-		@include flex;
+.u-steps-item {
+	flex: 1;
+	@include flex;
  
-		&--row {
-			flex-direction: column;
-			align-items: center;
-			position: relative;
-		}
-
-		&--column {
-			position: relative;
-			flex-direction: row;
-			justify-content: flex-start;
-			padding-bottom: 5px;
-		}
+	&--row {
+		flex-direction: column;
+		align-items: center;
+		position: relative;
+	}
  
-		&__wrapper {
-			@include flex;
-			justify-content: center;
-			align-items: center;
-			position: relative;
-			background-color: #fff;
+	&--column {
+		position: relative;
+		flex-direction: row;
+		justify-content: flex-start;
+		padding-bottom: 5px;
+	}
  
-			&--column {
-				width: 20px;
-				height: 32px;
+	&__wrapper {
+		@include flex;
+		justify-content: center;
+		align-items: center;
+		position: relative;
+		background-color: #fff;
  
-				&--dot {
-					height: 20px;
-					width: 20px;
-				}
-			}
+		&--column {
+			width: 20px;
+			height: 32px;
  
-			&--row {
-				width: 32px;
+			&--dot {
 				height: 20px;
-
-				&--dot {
-					width: 20px;
-					height: 20px;
-				}
+				width: 20px;
 			}
+		}
  
-			&__circle {
+		&--row {
+			width: 32px;
+			height: 20px;
+
+			&--dot {
 				width: 20px;
 				height: 20px;
-				/* #ifndef APP-NVUE */
-				box-sizing: border-box;
-				flex-shrink: 0;
-				/* #endif */
-				border-radius: 100px;
-				border-width: 1px;
-				border-color: $u-tips-color;
-				border-style: solid;
+			}
+		}
+
+		&__circle {
+			width: 20px;
+			height: 20px;
+			/* #ifndef APP-NVUE */
+			box-sizing: border-box;
+			flex-shrink: 0;
+			/* #endif */
+			border-radius: 100px;
+			border-width: 1px;
+			border-color: $u-tips-color;
+			border-style: solid;
+			@include flex(row);
+			align-items: center;
+			justify-content: center;
+			transition: background-color 0.3s;
+
+			&__text {
+				color: $u-tips-color;
+				font-size: 11px;
 				@include flex(row);
 				align-items: center;
 				justify-content: center;
-				transition: background-color 0.3s;
-
-				&__text {
-					color: $u-tips-color;
-					font-size: 11px;
-					@include flex(row);
-					align-items: center;
-					justify-content: center;
-					text-align: center;
-					line-height: 11px;
-				}
+				text-align: center;
+				line-height: 11px;
 			}
+		}
  
-			&__dot {
-				width: 10px;
-				height: 10px;
-				border-radius: 100px;
-				background-color: $u-content-color;
-			}
+		&__dot {
+			width: 10px;
+			height: 10px;
+			border-radius: 100px;
+			background-color: $u-content-color;
 		}
+	}
  
-		&__content {
-			@include flex;
-			flex: 1;
+	&__content {
+		@include flex;
+		flex: 1;
  
-			&--row {
-				flex-direction: column;
-				align-items: center;
-			}
+		&--row {
+			flex-direction: column;
+			align-items: center;
+		}
  
-			&--column {
-				flex-direction: column;
-				margin-left: 6px;
-			}
+		&--column {
+			flex-direction: column;
+			margin-left: 6px;
 		}
+	}
  
-		&__line {
-			position: absolute;
-			background: $u-tips-color;
+	&__line {
+		position: absolute;
+		background: $u-tips-color;
  
-			&--row {
-				top: 10px;
-				height: 1px;
-			}
+		&--row {
+			top: 10px;
+			height: 1px;
+		}
  
-			&--column {
-				width: 1px;
-				left: 10px;
-			}
+		&--column {
+			width: 1px;
+			left: 10px;
 		}
 	}
+}
 </style>
 <template>
-    <view
-        class="u-text"
-        :class="[]"
-        v-if="show"
-        :style="{
-            margin: margin,
-			justifyContent: align === 'left' ? 'flex-start' : align === 'center' ? 'center' : 'flex-end'
-        }"
-        @tap="clickHandler"
-    >
-        <text
-            :class="['u-text__price', type && `u-text__value--${type}`]"
-            v-if="mode === 'price'"
-            :style="[valueStyle]"
-            >￥</text
-        >
+    <view class="u-text" :class="[]" v-if="show" :style="{
+        margin: margin,
+        justifyContent: align === 'left' ? 'flex-start' : align === 'center' ? 'center' : 'flex-end',
+        textAlign: align === 'left' ? 'flex-start' : align === 'center' ? 'center' : 'flex-end'
+    }" @tap="clickHandler">
+        <text :class="['u-text__price', type && `u-text__value--${type}`]" v-if="mode === 'price'"
+            :style="[valueStyle]">￥</text>
         <view class="u-text__prefix-icon" v-if="prefixIcon">
-            <u-icon
-                :name="prefixIcon"
-                :customStyle="$u.addStyle(iconStyle)"
-            ></u-icon>
+            <u-icon :name="prefixIcon" :customStyle="$u.addStyle(iconStyle)"></u-icon>
         </view>
-        <u-link
-            v-if="mode === 'link'"
-            :text="value"
-            :href="href"
-            underLine
-        ></u-link>
+        <u-link v-if="mode === 'link'" :text="value" :href="href" underLine></u-link>
         <template v-else-if="openType && isMp">
-            <button
-                class="u-reset-button u-text__value"
-                :style="[valueStyle]"
-                :data-index="index"
-                :openType="openType"
-                @getuserinfo="onGetUserInfo"
-                @contact="onContact"
-                @getphonenumber="onGetPhoneNumber"
-                @error="onError"
-                @launchapp="onLaunchApp"
-                @opensetting="onOpenSetting"
-                :lang="lang"
-                :session-from="sessionFrom"
-                :send-message-title="sendMessageTitle"
-                :send-message-path="sendMessagePath"
-                :send-message-img="sendMessageImg"
-                :show-message-card="showMessageCard"
-                :app-parameter="appParameter"
-            >
+            <button class="u-reset-button u-text__value" :style="[valueStyle]" :data-index="index" :openType="openType"
+                @getuserinfo="onGetUserInfo" @contact="onContact" @getphonenumber="onGetPhoneNumber" @error="onError"
+                @launchapp="onLaunchApp" @opensetting="onOpenSetting" :lang="lang" :session-from="sessionFrom"
+                :send-message-title="sendMessageTitle" :send-message-path="sendMessagePath"
+                :send-message-img="sendMessageImg" :show-message-card="showMessageCard" :app-parameter="appParameter">
                 {{ value }}
             </button>
         </template>
-        <text
-            v-else
-            class="u-text__value"
-            :style="[valueStyle]"
-            :class="[
-                type && `u-text__value--${type}`,
-                lines && `u-line-${lines}`
-            ]"
-            >{{ value }}</text
-        >
+        <text v-else class="u-text__value" :style="[valueStyle]" :class="[
+            type && `u-text__value--${type}`,
+            lines && `u-line-${lines}`
+        ]">{{ value }}</text>
         <view class="u-text__suffix-icon" v-if="suffixIcon">
-            <u-icon
-                :name="suffixIcon"
-                :customStyle="$u.addStyle(iconStyle)"
-            ></u-icon>
+            <u-icon :name="suffixIcon" :customStyle="$u.addStyle(iconStyle)"></u-icon>
         </view>
     </view>
 </template>
  
 <script>
-import value from './value.js'
-import mpMixin from '../../libs/mixin/mpMixin.js';
+import button from '../../libs/mixin/button.js';
 import mixin from '../../libs/mixin/mixin.js';
-import button from '../../libs/mixin/button.js'
-import openType from '../../libs/mixin/openType.js'
-import props from './props.js'
+import mpMixin from '../../libs/mixin/mpMixin.js';
+import openType from '../../libs/mixin/openType.js';
+import props from './props.js';
+import value from './value.js';
 /**
  * Text 文本
  * @description 此组件集成了文本类在项目中的常用功能，包括状态，拨打电话，格式化日期，*替换，超链接...等功能。 您大可不必在使用特殊文本时自己定义，text组件几乎涵盖您能使用的大部分场景。
@@ -112,7 +72,7 @@ export default {
     // #ifndef MP
     mixins: [mpMixin, mixin, value, props],
     // #endif
-	emits: ['click'],
+    emits: ['click'],
     computed: {
         valueStyle() {
             const style = {
@@ -168,9 +128,9 @@ export default {
     align-items: center;
     flex-wrap: nowrap;
     flex: 1;
-	/* #ifndef APP-NVUE */
-	width: 100%;
-	/* #endif */
+    /* #ifndef APP-NVUE */
+    width: 100%;
+    /* #endif */
  
     &__price {
         font-size: 14px;
@@ -120,6 +120,11 @@ export default {
         previewImage: {
             type: Boolean,
             default: defprops.upload.previewImage
+        },
+        // 是否只读
+        isReadOnly: {
+            type: Boolean,
+            default: false
         }
     }
 }
@@ -21,13 +21,14 @@
 						</view>
 						<text v-if="item.message" class="u-upload__status__message">{{ item.message }}</text>
 					</view>
-					<view class="u-upload__deletable" v-if="item.status !== 'uploading' && (deletable || item.deletable)"
+					<view class="u-upload__deletable"
+						v-if="item.status !== 'uploading' && (deletable || item.deletable) && !isReadOnly"
 						@tap.stop="deleteItem(index)">
 						<view class="u-upload__deletable__icon">
 							<u-icon name="close" color="#ffffff" size="25"></u-icon>
 						</view>
 					</view>
-					<view class="u-upload__success" v-if="item.status === 'success'">
+					<view class="u-upload__success" v-if="false">
 						<!-- #ifdef APP-NVUE -->
 						<image :src="successIcon" class="u-upload__success__icon"></image>
 						<!-- #endif -->
@@ -41,7 +42,7 @@
  
 			</template>
  
-			<template v-if="isInCount">
+			<template v-if="isInCount && !isReadOnly">
 				<view v-if="$slots.default || $slots.$default" @tap="chooseFile">
 					<slot />
 				</view>
@@ -250,9 +251,16 @@ export default {
 		// 预览图片
 		onPreviewImage(item) {
 			if (!item.isImage || !this.previewFullImage) return
+			let baseUrl = import.meta.env.VITE_BASE_URL;
+			let imageArray = this.lists.filter((item) => this.accept === 'image' || uni.$u.test.image(item.url || item.thumb)).map((item) => item.url || item.thumb);
+			for (let index = 0; index < imageArray.length; index++) {
+				if (!imageArray[index].startsWith(baseUrl)) {
+					imageArray[index] = baseUrl + imageArray[index];
+				}
+			}
 			uni.previewImage({
 				// 先filter找出为图片的item，再返回filter结果中的图片url
-				urls: this.lists.filter((item) => this.accept === 'image' || uni.$u.test.image(item.url || item.thumb)).map((item) => item.url || item.thumb),
+				urls: imageArray,
 				current: item.url || item.thumb,
 				fail() {
 					uni.$u.toast('预览图片失败')
@@ -414,6 +422,7 @@ $u-upload-disabled-opacity: .5 !default;
 	}
  
 	&__success {
+		display: none;
 		position: absolute;
 		bottom: $u-upload-success-bottom;
 		right: $u-upload-success-right;