feat;提交

.env.development

@@ -1,3 +1,4 @@
 NODE_ENV = development
 VUE_APP_ENV = dev
 VITE_API_BASE_URL=https://crmtest.nanjingshiyu.com/prod-api
+#VITE_API_BASE_URL=https://crm.nanjingshiyu.com/prod-api

src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "小葫芦",
     "appid" : "__UNI__6259019",
     "description" : "",
-    "versionName" : "1.0.2",
-    "versionCode" : 102,
+    "versionName" : "1.0.3",
+    "versionCode" : 103,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

src/pages/login/index.vue

@@ -124,14 +124,14 @@ const handleLogin = () => {
 			uni.removeStorageSync('password');
 		}
 		const res = await loginApi.login(form.value)
-		loading.value = false
 		uni.setStorageSync('token', res.data.access_token)
 		const infoRes = await loginApi.getInfo()
 		uni.setStorageSync('userInfo', infoRes.user)
+		loading.value = false
 		uni.showToast({ title: '登录成功', icon: 'success' })
 		setTimeout(() => {
 			uni.reLaunch({ url: '/pages/repair/index' })
-		}, 500)
+		}, 50)
 	}).catch((res: any) => {
 		uni.$u.toast(res[0].message);
 	})

src/pages/repair/components/apply/index.vue

@@ -120,7 +120,7 @@
             <up-textarea v-model="formData.address" placeholder="请输入您的地址"></up-textarea>
           </up-form-item>
 
-          <up-form-item v-if="formData.serviceType === 'store'" prop="storeName" label="选择门店" required>
+          <up-form-item v-if="formData.serviceType === 'store'" prop="storeName" label="选择门店" required label-width="70">
             <up-select v-model="formData.storeName" :options="stores" label="请选择门店" @select="selectStoreItem">
               <template #text="{ label }">
                 <text>{{ formData.storeName }}</text>
@@ -128,7 +128,7 @@
             </up-select>
           </up-form-item>
 
-          <up-form-item v-if="formData.serviceType === 'home'" prop="delivery" label="上门时间" required
+          <up-form-item v-if="formData.serviceType === 'home'" prop="delivery" label="上门时间" required :label-width="70"
             @click="datetimerShow = true" labelPosition="top">
             <up-cate-tab height="300px" :tab-list="deliveryOptions" v-model:current="deliveryCurrent">
               <template v-slot:itemList="{ item }">

src/pages/repair/components/orderList/index.vue

@@ -17,12 +17,15 @@
                     <up-swipe-action>
                         <up-swipe-action-item :threshold="100" v-model:show="swipeShow" :options="swipeOptions"
                             @click="(val: any) => handleSwipeAction(val, item)">
+                            <view class="more-btn" @tap.stop="openPopover(item, index)">
+                                <up-icon name="more-dot-fill" size="40rpx" color="#999"></up-icon>
+                            </view>
                             <view class="order-header">
                                 <view class="order-info">
                                     <text class="order-number">工单号：{{ item.orderId }}</text>
                                     <text class="order-time">{{ formatTime(item.createTime) }}</text>
                                 </view>
-                                <view class="order-status">
+                                <view class="order-right">
                                     <text :style="{ color: getStatusColor(item.status) }" class="status-text">{{
                                         item.status
                                     }}</text>
@@ -49,6 +52,28 @@
                             </view>
                         </up-swipe-action-item>
                     </up-swipe-action>
+
+                    <!-- 浮层蒙版（点击空白关闭） -->
+                    <view v-if="popoverIndex === index" class="popover-mask" @tap.stop="closePopover"></view>
+                    <!-- Popover 浮层 -->
+                    <view v-if="popoverIndex === index" class="popover-menu" @tap.stop>
+                        <view class="popover-item" @tap="handlePopoverAction({ index: 0 }, item)">
+                            <up-icon name="play-right-fill" size="32rpx" color="#42b983"></up-icon>
+                            <text class="popover-text">进度</text>
+                        </view>
+                        <view class="popover-divider"></view>
+                        <view class="popover-item" @tap="handlePopoverAction({ index: 1 }, item)">
+                            <up-icon name="list" size="32rpx" color="#2c94f6"></up-icon>
+                            <text class="popover-text">详情</text>
+                        </view>
+                        <view class="popover-divider"></view>
+                        <view class="popover-item" @tap="handlePopoverAction({ index: 2 }, item)">
+                            <up-icon name="rmb-circle" size="32rpx" color="#FF9900"></up-icon>
+                            <text class="popover-text">报价</text>
+                        </view>
+                        <!-- 小三角箭头 -->
+                        <view class="popover-arrow"></view>
+                    </view>
                 </view>
             </up-list-item>
             <up-empty v-if="filteredOrders.length === 0" image="empty" text="暂无订单数据"></up-empty>
@@ -156,6 +181,30 @@ const handleSwipeAction = (val: any, item: any) => {
     }
 }
 
+// Popover 相关
+const popoverIndex = ref<number | null>(null)
+const currentPopoverItem = ref<OrderListItem_Result | null>(null)
+
+const openPopover = (item: OrderListItem_Result, index: number) => {
+    if (popoverIndex.value === index) {
+        popoverIndex.value = null
+        currentPopoverItem.value = null
+    } else {
+        popoverIndex.value = index
+        currentPopoverItem.value = item
+    }
+}
+
+const closePopover = () => {
+    popoverIndex.value = null
+    currentPopoverItem.value = null
+}
+
+const handlePopoverAction = (val:object, item: OrderListItem_Result) => {
+    closePopover()
+    handleSwipeAction(val, item)
+}
+
 const loadMore = () => {
     if (loading.value) return
 
@@ -231,7 +280,13 @@ onMounted(() => {
         box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
         border-radius: 20rpx;
         margin: 20rpx 20rpx;
-
+        position: relative;
+        .more-btn {
+            display: flex;
+            align-items: center;
+            justify-content: flex-end;
+            border-radius: 50%;
+        }
         .order-header {
             display: flex;
             justify-content: space-between;
@@ -255,11 +310,17 @@ onMounted(() => {
                 }
             }
 
-            .order-status {
+            .order-right {
+                display: flex;
+                align-items: center;
+                gap: 16rpx;
+
                 .status-text {
                     font-size: 28rpx;
                     font-weight: bold;
                 }
+
+                
             }
         }
 
@@ -330,6 +391,61 @@ onMounted(() => {
         }
     }
 
+    /* Popover 浮层 */
+    .popover-mask {
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        z-index: 998;
+    }
+
+    .popover-menu {
+        position: absolute;
+        top: 80rpx;
+        right: 10rpx;
+        z-index: 999;
+        background: #fff;
+        border-radius: 16rpx;
+        box-shadow: 0 8rpx 32rpx rgba(0, 0, 0, 0.16);
+        padding: 8rpx 0;
+        min-width: 180rpx;
+
+        .popover-item {
+            display: flex;
+            align-items: center;
+            gap: 16rpx;
+            padding: 20rpx 32rpx;
+            &:active {
+                background: #f5f7fa;
+            }
+
+            .popover-text {
+                font-size: 28rpx;
+                color: #333;
+            }
+        }
+
+        .popover-divider {
+            height: 1rpx;
+            background: #f0f0f0;
+            margin: 0 16rpx;
+        }
+
+        .popover-arrow {
+            position: absolute;
+            top: -16rpx;
+            right: 32rpx;
+            width: 0;
+            height: 0;
+            border-left: 16rpx solid transparent;
+            border-right: 16rpx solid transparent;
+            border-bottom: 16rpx solid #fff;
+            filter: drop-shadow(0 -2rpx 2rpx rgba(0, 0, 0, 0.08));
+        }
+    }
+
     /* 空状态 */
     .empty {
         padding: 80rpx 0;

src/pages/repair/components/price/index.vue

@@ -49,8 +49,8 @@
         <view class="cost-list">
           <view v-for="(cost, index) in formData.costs" :key="index" class="cost-item">
             <view class="cost-header">
-              <up-select v-model="cost.type" @select="handleCostTypeSelect(cost, index)" :options="costTypeOptions"
-                :label="cost.type ? '' : '费用类型'">
+              <up-select v-model="cost.type" @select="(e:any) => handleCostTypeSelect(e,index)" :options="costTypeOptions"
+                :label="cost.type ? '' : '费用类型'" showOptionsLabel>
                 <template v-slot:text="{ value }">
                   <text>{{ cost.type }}</text>
                 </template>
@@ -93,11 +93,9 @@
       <view class="form-section">
         <view class="section-title">其他信息</view>
         <up-form-item label="预计完成日期" prop="estimatedCompletionDate" required :label-width="100" @click="showDatePicker">
-          <template #right>
             <up-datetime-picker hasInput :show="datePickerShow" v-model="formData.estimatedCompletionDate" mode="date"
-              @cancel="datePickerShow = false" @confirm="datePickerShow = false"
+              @cancel="handleDateCancel" @confirm="handleDateConfirm($event)"
               placeholder="请选择预计完成日期"></up-datetime-picker>
-          </template>
         </up-form-item>
         <up-form-item label="质保期" prop="warrantyPeriod" :label-width="70">
           <up-select v-model="formData.warrantyPeriod" :options="warrantyPeriodOptions" label="请选择质保期"
@@ -132,6 +130,8 @@ import {
   warrantyPeriodOptions
 } from '../public'
 import type { RepairQuoteForm_Params } from '@/types/repair'
+import dayjs from 'dayjs'
+
 const formRef = ref()
 const datePickerShow = ref(false)
 // 表单数据
@@ -140,7 +140,7 @@ const formData = ref<RepairQuoteForm_Params>({
   repairItems: [],
   laborHours: '2小时',
   costs: [
-    { type: 'PARTS', amount: 0, description: '' },
+    { type: '', amount: 0, description: '' },
   ],
   totalAmount: 0,
   remarks: '',
@@ -201,28 +201,20 @@ const removeCost = (index: number) => {
 
 const handleSubmit = () => {
   formRef.value.validate().then(() => {
-    // 更新表单数据
     formData.value.totalAmount = totalAmount.value
     formData.value.discountAmount = discountAmount.value
     formData.value.finalAmount = finalAmount.value
 
-    console.log('提交报价', formData.value)
     uni.showToast({
       title: '报价提交成功',
       icon: 'success'
     })
 
-    // 跳转到订单详情页
     setTimeout(() => {
       uni.navigateTo({
         url: '/pages/repair/components/orderDetail/index?orderId=' + formData.value.orderId,
       })
     }, 1500)
-  }).catch(() => {
-    uni.showToast({
-      title: '请完善表单信息',
-      icon: 'none'
-    })
   })
 }
 
@@ -242,10 +234,10 @@ const handleLaborHoursSelect = (value: any) => {
   formData.value.laborHours = value.name
 }
 
-const handleCostTypeSelect = (value: any, index: number) => {
+const handleCostTypeSelect = (val:any,index:number) => {
   formData.value.costs.forEach((cost, i) => {
-    if (index === i) {
-      cost.type = value.type
+    if (index == i) {
+      cost.type = val.name
     }
   })
 }
@@ -258,6 +250,16 @@ const showDatePicker = () => {
   datePickerShow.value = true
 }
 
+const handleDateCancel = () => {
+  datePickerShow.value = false
+}
+
+const handleDateConfirm = (value: any) => {
+  datePickerShow.value = false
+  formData.value.estimatedCompletionDate = dayjs(value.value).format('YYYY-MM-DD')
+  formRef.value?.validateField('estimatedCompletionDate')
+}
+
 
 
 // 生命周期

src/pages/repair/index.vue

@@ -60,27 +60,12 @@ import { ref } from 'vue'
 import type { Repair_Result } from '@/types/repair'
 import { gridList,processSteps} from './components/public'
 import LineChart from './components/charts/line.vue'
-import { hasRole } from '@/utils/utils'
 import { loginApi } from '@/apis/login'
 const searchKeyword = ref<string>('')
 const handleGridClick = (item: Repair_Result) => {
-  if(item.label == 'apply'){
-    if(hasRole('REPAIRMAN',false)){
-      uni.showToast({
-        title: '您没有权限访问该功能',
-        icon: 'none'
-      })
-      return false
-    }else{
-      uni.navigateTo({
-        url: item.path,
-      })
-    }
-  }else if(item.label == 'order'){
-    uni.navigateTo({
-      url: item.path,
-    })
-  }
+  uni.navigateTo({
+    url: item.path,
+  })
 }
 const handleLogout = () => {
   uni.removeStorageSync('userInfo')

src/types/repair.d.ts

@@ -51,7 +51,7 @@ export interface RepairQuoteForm_Params {
   totalAmount: number
   remarks: string
   technician: string
-  estimatedCompletionDate: string
+  estimatedCompletionDate: string | Date
   warrantyPeriod: string
   urgency: 'normal' | 'urgent' | 'emergency'
   discountRate: number

src/utils/http.ts

@@ -13,7 +13,6 @@ interface RequestOptions {
   toastError?: boolean
 }
 
-// 扩展 Headers 类型，添加 Authorization
 interface CustomHeaders {
   'Content-Type': string
   Authorization?: string
@@ -35,7 +34,7 @@ class HttpRequest {
       'Content-Type': 'application/json'
     }
     if (token) {
-      headers.Authorization = token
+      headers.Authorization = 'Bearer ' + token
     }
     return headers
   }
@@ -328,4 +327,4 @@ const http = new HttpRequest({})
 export { http }
 export const createHttp = (config?: { timeout?: number }) => {
   return new HttpRequest(config || {})
-}
+}