diff --git a/jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue
index 4a112db..dbd93a8 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue
@@ -8,8 +8,8 @@
                     <el-button @click="goBack">取 消</el-button>
                 </div>
             </div>
-            <el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
-                <el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
+            <el-row :gutter="5" class=" main" :style="{ margin: '0 auto', width: '100%' }">
+                <el-form ref="formRef" :model="dataForm" size="small" label-width="130px" label-position="right">
                     <template v-if="!loading">
                         <el-col :span="24">
                             <jnpf-form-tip-item label-width="0">
@@ -17,52 +17,52 @@
                                 </JnpfGroupTitle>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="订单编号" prop="orderNumber">
                                 <p>{{ dataForm.orderNumber }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="订单类型" prop="orderTypeId">
                                 <p>{{ dataForm.orderTypeId }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="订单金额(元)" prop="orderAmount">
                                 <p>{{ dataForm.orderAmount }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="散户状态" prop="orderClientStatusId">
                                 <p>{{ dataForm.orderClientStatusId }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="回收员状态" prop="orderStaffsStatusId">
                                 <p>{{ dataForm.orderStaffsStatusId }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="接单周期(分)" prop="receivePeriod">
                                 <p>{{ dataForm.receivePeriod }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="下单地址经度" prop="longitude">
                                 <p>{{ dataForm.longitude }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="下单地址纬度" prop="latitude">
                                 <p>{{ dataForm.latitude }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="订单距离" prop="distance">
                                 <p>{{ dataForm.distance }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="12">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="订单状态" prop="orderStatusId">
                                 <p>{{ dataForm.orderStatusId }}</p>
                             </jnpf-form-tip-item>
@@ -113,37 +113,37 @@
                                 </JnpfGroupTitle>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="散户昵称" prop="clientId">
                                 <p>{{ dataForm.clientId }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="散户姓名" prop="clientName">
                                 <p>{{ dataForm.clientName }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="散户手机号" prop="clientMobile">
                                 <p>{{ dataForm.clientMobile }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="预估重量" prop="predictWeight">
                                 <p>{{ dataForm.predictWeight }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="预约时间起" prop="appointmentTimeStart">
                                 <p>{{ dataForm.appointmentTimeStart }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="预约时间止" prop="appointmentTimeEnd">
                                 <p>{{ dataForm.appointmentTimeEnd }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="散户下单关联地址" prop="clientAddressId">
                                 <p>{{ dataForm.clientAddressId }}</p>
                             </jnpf-form-tip-item>
@@ -154,80 +154,84 @@
                                 </JnpfGroupTitle>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="回收站" prop="recycleStationId">
                                 <p>{{ dataForm.recycleStationId }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="回收员" prop="staffsId">
                                 <p>{{ dataForm.staffsId }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="回收员姓名" prop="staffsName">
                                 <p>{{ dataForm.staffsName }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="24">
-                            <JnpfDivider contentPosition="center">
-                                其他信息 </JnpfDivider>
+                            <jnpf-form-tip-item label-width="0">
+                                <JnpfGroupTitle content="其他信息" contentPosition="left">
+                                </JnpfGroupTitle>
+                            </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="协商时间起" prop="consultTimeStart">
                                 <p>{{ dataForm.consultTimeStart }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="协商时间止" prop="consultTimeEnd">
                                 <p>{{ dataForm.consultTimeEnd }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="收货时间" prop="receiveTime">
                                 <p>{{ dataForm.receiveTime }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="结算时间" prop="settleTime">
                                 <p>{{ dataForm.settleTime }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="24">
-                            <JnpfDivider contentPosition="center">
-                                用户评论 </JnpfDivider>
+                            <jnpf-form-tip-item label-width="0">
+                                <JnpfGroupTitle content="用户评论" contentPosition="left">
+                                </JnpfGroupTitle>
+                            </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="综合评分" prop="starScore">
                                 <JnpfRate v-model="dataForm.starScore" disabled :max="5">
                                 </JnpfRate>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="评价详情" prop="comment">
                                 <p>{{ dataForm.comment }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="评价图片" prop="commentPics">
                                 <JnpfUploadImg v-model="dataForm.commentPics" disabled detailed :fileSize="10"
                                     sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
                                 </JnpfUploadImg>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="响应速度" prop="responseStar">
                                 <JnpfRate v-model="dataForm.responseStar" disabled :max="5">
                                 </JnpfRate>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="服务态度" prop="attitudeStar">
                                 <JnpfRate v-model="dataForm.attitudeStar" disabled :max="5">
                                 </JnpfRate>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="6">
                             <jnpf-form-tip-item label="平台价格" prop="priceStar">
                                 <JnpfRate v-model="dataForm.priceStar" disabled :max="5">
                                 </JnpfRate>
diff --git a/jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue b/jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue
index 800a400..22f0b80 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue
@@ -30,32 +30,32 @@
         </div>
       </div>
       <el-row :gutter="15" class="main" :style="{ margin: '0 auto', width: '100%' }">
-        <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
+        <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="140px"
           label-position="right">
 
           <template v-if="!loading">
             <!-- 具体表单 -->
             <el-col :span="24">
-              <jnpf-form-tip-item>
+              <jnpf-form-tip-item label-width="0">
                 <JnpfGroupTitle content="订单信息" contentPosition="left">
                 </JnpfGroupTitle>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="订单编号" prop="orderNumber">
                 <JnpfInput v-model="dataForm.orderNumber" @change="changeData('orderNumber', -1)" placeholder="系统自动生成"
                   readonly :style="{ width: '100%' }">
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="订单类型" prop="orderTypeId">
                 <JnpfSelect v-model="dataForm.orderTypeId" @change="changeData('orderTypeId', -1)" placeholder="请选择"
                   disabled :style="{ width: '100%' }" :options="orderTypeIdOptions" :props="orderTypeIdProps">
                 </JnpfSelect>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="订单金额(元)" prop="orderAmount">
                 <JnpfInput v-model="dataForm.orderAmount" @change="changeData('orderAmount', -1)" placeholder="请输入"
                   clearable :style="{ width: '100%' }">
@@ -76,7 +76,7 @@
                 </JnpfSelect>
               </jnpf-form-tip-item>
             </el-col> -->
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="回收员状态" prop="orderStaffsStatusId">
                 <JnpfSelect v-model="dataForm.orderStaffsStatusId" @change="changeData('orderStaffsStatusId', -1)"
                   placeholder="请选择" clearable :style="{ width: '100%' }" :options="orderStaffsStatusIdOptions"
@@ -84,21 +84,21 @@
                 </JnpfSelect>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="接单周期(分)" prop="receivePeriod">
                 <JnpfInput v-model="dataForm.receivePeriod" @change="changeData('receivePeriod', -1)" placeholder="请输入"
                   clearable :style="{ width: '100%' }">
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="下单地址经度" prop="longitude">
                 <JnpfInput v-model="dataForm.longitude" @change="changeData('longitude', -1)" placeholder="请输入"
                   clearable disabled :style="{ width: '100%' }">
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="下单地址纬度" prop="latitude">
                 <JnpfInput v-model="dataForm.latitude" @change="changeData('latitude', -1)" placeholder="请输入" clearable
                   disabled :style="{ width: '100%' }">
@@ -117,7 +117,7 @@
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col> -->
-            <el-col :span="12">
+            <el-col :span="6">
               <jnpf-form-tip-item label="订单状态" prop="orderStatusId">
                 <JnpfSelect v-model="dataForm.orderStatusId" @change="changeData('orderStatusId', -1)" placeholder="请选择"
                   clearable :style="{ width: '100%' }" :options="orderStatusIdOptions" :props="orderStatusIdProps">
@@ -125,12 +125,12 @@
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="24">
-              <jnpf-form-tip-item>
+              <jnpf-form-tip-item label-width="0">
                 <JnpfGroupTitle content="散户信息" contentPosition="left">
                 </JnpfGroupTitle>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="散户昵称" prop="clientId">
                 <JnpfPopupSelect v-model="dataForm.clientId" @change="changeDataClient" :rowIndex="null"
                   :formData="dataForm" :templateJson="interfaceRes.clientId" placeholder="请选择" hasPage propsValue="id"
@@ -152,14 +152,14 @@
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col> -->
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="散户手机号" prop="clientMobile">
                 <JnpfInput v-model="dataForm.clientMobile" @change="changeData('clientMobile', -1)" placeholder="请输入"
                   clearable :style="{ width: '100%' }">
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="预估重量" prop="predictWeight">
                 <JnpfInput v-model="dataForm.predictWeight" @change="changeData('predictWeight', -1)" placeholder="请输入"
                   clearable :style="{ width: '100%' }">
@@ -167,7 +167,7 @@
               </jnpf-form-tip-item>
             </el-col>
 
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="预约时间起" prop="appointmentTimeStart">
                 <JnpfDatePicker v-model="dataForm.appointmentTimeStart" @change="changeData('appointmentTimeStart', -1)"
                   :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
@@ -176,7 +176,7 @@
               </jnpf-form-tip-item>
             </el-col>
 
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="预约时间止" prop="appointmentTimeEnd">
                 <JnpfDatePicker v-model="dataForm.appointmentTimeEnd" @change="changeData('appointmentTimeEnd', -1)"
                   :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
@@ -195,12 +195,12 @@
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="24">
-              <jnpf-form-tip-item>
+              <jnpf-form-tip-item label-width="0">
                 <JnpfGroupTitle content="收货员信息" contentPosition="left">
                 </JnpfGroupTitle>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="回收站" prop="recycleStationId">
                 <JnpfSelect v-model="dataForm.recycleStationId" @change="changeData('recycleStationId', -1)"
                   placeholder="请选择" clearable :style="{ width: '100%' }" :options="recycleStationIdOptions"
@@ -208,14 +208,14 @@
                 </JnpfSelect>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="回收员" prop="staffsId">
                 <JnpfSelect v-model="dataForm.staffsId" @change="changeData('staffsId', -1)" placeholder="请选择" clearable
                   :style="{ width: '100%' }" :options="staffsIdOptions" :props="staffsIdProps">
                 </JnpfSelect>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="回收员姓名" prop="staffsName">
                 <JnpfInput v-model="dataForm.staffsName" @change="changeData('staffsName', -1)" placeholder="请输入"
                   clearable :style="{ width: '100%' }">
@@ -223,13 +223,13 @@
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="24">
-              <jnpf-form-tip-item>
-                <JnpfDivider content="其他信息" contentPosition="center">
-                </JnpfDivider>
+              <jnpf-form-tip-item label-width="0">
+                <JnpfGroupTitle content="其他信息" contentPosition="left">
+                </JnpfGroupTitle>
               </jnpf-form-tip-item>
             </el-col>
 
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="协商时间起" prop="consultTimeStart">
                 <JnpfDatePicker v-model="dataForm.consultTimeStart" @change="changeData('consultTimeStart', -1)"
                   :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
@@ -238,7 +238,7 @@
               </jnpf-form-tip-item>
             </el-col>
 
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="协商时间止" prop="consultTimeEnd">
                 <JnpfDatePicker v-model="dataForm.consultTimeEnd" @change="changeData('consultTimeEnd', -1)"
                   :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
@@ -247,7 +247,7 @@
               </jnpf-form-tip-item>
             </el-col>
 
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="收货时间" prop="receiveTime">
                 <JnpfDatePicker v-model="dataForm.receiveTime" @change="changeData('receiveTime', -1)"
                   :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
@@ -256,7 +256,7 @@
               </jnpf-form-tip-item>
             </el-col>
 
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="结算时间" prop="settleTime">
                 <JnpfDatePicker v-model="dataForm.settleTime" @change="changeData('settleTime', -1)"
                   :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
@@ -265,14 +265,14 @@
               </jnpf-form-tip-item>
             </el-col>
 
-            <el-col :span="24">
+            <el-col :span="6">
               <jnpf-form-tip-item label="创建时间" prop="creatorTime">
                 <JnpfOpenData v-model="dataForm.creatorTime" @change="changeData('creatorTime', -1)"
                   placeholder="系统自动生成" readonly disabled :style="{ width: '100%' }" type="currTime">
                 </JnpfOpenData>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="6">
               <jnpf-form-tip-item label="创建用户" prop="creatorUserId">
                 <JnpfOpenData v-model="dataForm.creatorUserId" @change="changeData('creatorUserId', -1)"
                   placeholder="系统自动生成" readonly disabled :style="{ width: '100%' }" type="currUser">
@@ -281,18 +281,18 @@
             </el-col>
 
             <el-col :span="24">
-              <jnpf-form-tip-item>
-                <JnpfDivider content="用户评论" contentPosition="center">
-                </JnpfDivider>
+              <jnpf-form-tip-item label-width="0">
+                <JnpfGroupTitle content="用户评论" contentPosition="left">
+                </JnpfGroupTitle>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="综合评分" prop="starScore">
                 <JnpfRate v-model="dataForm.starScore" @change="changeData('starScore', -1)" :max="5">
                 </JnpfRate>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="评价详情" prop="comment">
                 <JnpfTextarea v-model="dataForm.comment" @change="changeData('comment', -1)" placeholder="请输入"
                   :maxlength="200" :style="{ width: '100%' }" true type="textarea"
@@ -300,26 +300,26 @@
                 </JnpfTextarea>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="评价图片" prop="commentPics">
                 <JnpfUploadImg v-model="dataForm.commentPics" @change="changeData('commentPics', -1)" :fileSize="10"
                   sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
                 </JnpfUploadImg>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="响应速度" prop="responseStar">
                 <JnpfRate v-model="dataForm.responseStar" @change="changeData('responseStar', -1)" :max="5">
                 </JnpfRate>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="服务态度" prop="attitudeStar">
                 <JnpfRate v-model="dataForm.attitudeStar" @change="changeData('attitudeStar', -1)" :max="5">
                 </JnpfRate>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <jnpf-form-tip-item label="平台价格" prop="priceStar">
                 <JnpfRate v-model="dataForm.priceStar" @change="changeData('priceStar', -1)" :max="5">
                 </JnpfRate>