'初次对接完成'

pages/index/maintain.vue

@@ -4,14 +4,14 @@
     <view class="selector-section">
       <!-- 紧急程度选择器 -->
       <view class="selector-item" @click="openUrgencyPicker">
-        <text class="selector-label" :class="{ active: selectedUrgency !== '紧急程度' }">{{ selectedUrgency }}</text>
-        <uv-icon name="arrow-down-fill" size="14" :color="selectedUrgency !== '紧急程度' ? '#C70019' : '#000'"></uv-icon>
+        <text class="selector-label" :class="{ active: urgency }">{{ urgency.label || '紧急状态' }}</text>
+        <uv-icon name="arrow-down-fill" size="14" :color="urgency ? '#C70019' : '#000'"></uv-icon>
       </view>
       
       <!-- 维修状态选择器 -->
       <view class="selector-item" @click="openStatusPicker">
-        <text class="selector-label" :class="{ active: selectedStatus !== '维修状态' }">{{ selectedStatus }}</text>
-        <uv-icon name="arrow-down-fill" size="14" :color="selectedStatus !== '维修状态' ? '#C70019' : '#000'"></uv-icon>
+        <text class="selector-label" :class="{ active: status }">{{ status.label || '维修状态' }}</text>
+        <uv-icon name="arrow-down-fill" size="14" :color="status ? '#C70019' : '#000'"></uv-icon>
       </view>
     </view>
     
@@ -78,13 +78,16 @@
           <button class="item-actions-button">立即维修</button>
         </view>
       </view>
+     <!-- 空状态 -->
     </view>
+    <uv-empty v-if="!list.length"  icon="/static/暂无搜索结果.png" />
     
     <!-- 紧急程度选择器 -->
     <uv-picker 
       ref="urgencyPicker"
       v-model="urgencyShow" 
       :columns="urgencyColumns"
+      keyName="label"
       mode="selector"
       @confirm="onUrgencyConfirm"
       confirmColor="#C70019"
@@ -95,6 +98,7 @@
       ref="statusPicker"
       v-model="statusShow" 
       :columns="statusColumns"
+      keyName="label"
       mode="selector"
       @confirm="onStatusConfirm"
       confirmColor="#C70019"
@@ -109,29 +113,56 @@ export default {
   mixins: [ListMixin],
   data() {
     return {
-      selectedUrgency: '紧急程度',
-      selectedStatus: '维修状态',
+      urgency: null,
+      status: null,
       urgencyShow: false,
       statusShow: false,
       mixinListApi: 'exhibit.queryMalfunctionList',
       urgencyColumns: [
         [
-          '一般',
-          '紧急',
-          '非常紧急'
+          {
+            label: '全部',
+            value: ''
+          },
+          {
+            label: '一般',
+            value: '0'
+          },
+          {
+            label: '紧急',
+            value: '1'
+          },
         ]
       ],
       statusColumns: [
         [
-
-          '维护中',
-          '故障中', 
-          '已解决'
+          {
+            label: '全部',
+            value: ''
+          },
+          {
+            label: '故障中',
+            value: '0'
+          },
+          {
+            label: '维修中',
+            value: '1'
+          },
+          {
+            label: '已解决',
+            value: '2'
+          }
         ]
       ],
     }
   },
   methods: {
+    mixinSetParams(){
+      return {
+        urgency: this.urgency?.value || '',
+        status: this.status?.value || ''
+      }
+    },
     navigateToDetail(item) {
       uni.navigateTo({
         url: '/subPages/repair/maintainSubmit?id=' + item.id
@@ -144,13 +175,17 @@ export default {
       this.$refs.statusPicker.open()
     },
     onUrgencyConfirm(e) {
-      this.selectedUrgency = e.value[0]
+      this.urgency = e.value[0]
       console.log('选择紧急程度:', e)
+      this.initPage()
+      this.getList(true)
       // TODO: 根据紧急程度筛选
     },
     onStatusConfirm(e) {
-      this.selectedStatus = e.value[0]
+      this.status = e.value[0]
       console.log('选择维修状态:', e)
+      this.initPage()
+      this.getList(true)
       // TODO: 根据状态筛选
     },
     getStatusClass(status) {

pages/index/user.vue

@@ -38,6 +38,15 @@
           </view>
           <uv-icon name="arrow-right" size="24" color="#000"></uv-icon>
         </view>
+        
+        <!-- 退出登录 -->
+        <view class="function-item" @click="logout">
+          <view class="item-left">
+            <uv-icon name="minus-circle" size="24" color="#C70019"></uv-icon>
+            <text class="item-text">退出登录</text>
+          </view>
+          <uv-icon name="arrow-right" size="24" color="#000"></uv-icon>
+        </view>
       </view>
     </view>
     
@@ -53,6 +62,7 @@
 </template>
 
 <script>
+
 export default {
   data() {
     return {
@@ -95,6 +105,35 @@ export default {
     // 显示隐私政策弹窗
     showPrivacyPolicy() {
       this.$refs.privacyModal.open()
+    },
+    
+    // 退出登录
+    logout() {
+      uni.showModal({
+        title: '提示',
+        content: '确定要退出登录吗？',
+        confirmColor: '#C70019',
+        success: (res) => {
+          if (res.confirm) {
+            // 清除本地存储的用户信息
+            uni.removeStorageSync('token')
+            // uni.removeStorageSync('userInfo')
+            
+            // 重置用户信息
+            this.userInfo = {
+              headImage: '/static/默认头像.png',
+              nickName: '请先登录',
+              id: 'XXXXX'
+            }
+            
+            // 显示退出成功提示
+            uni.showToast({
+              title: '退出成功',
+              icon: 'success'
+            })
+          }
+        }
+      })
     }
   }
 }

subPages/home/maintainanceSubmit.vue

@@ -93,25 +93,25 @@
         <view class="radio-options">
           <view 
             class="radio-item" 
-            :class="{ active: isExpend === true }"
-            @click="selectCost(true)"
+            :class="{ active: isExpend === '1' }"
+            @click="selectCost('1')"
           >
-            <view class="radio-dot" :class="{ active: isExpend === true }"></view>
-            <text :class="{ active: isExpend === true }">是</text>
+            <view class="radio-dot" :class="{ active: isExpend === '1' }"></view>
+            <text :class="{ active: isExpend === '1' }">是</text>
           </view>
           <view 
             class="radio-item" 
-            :class="{ active: isExpend === false }"
-            @click="selectCost(false)"
+            :class="{ active: isExpend === '0' }"
+            @click="selectCost('0')"
           >
-            <view class="radio-dot" :class="{ active: isExpend === false }"></view>
-            <text :class="{ active: isExpend === false }">否</text>
+            <view class="radio-dot" :class="{ active: isExpend === '0' }"></view>
+            <text :class="{ active: isExpend === '0' }">否</text>
           </view>
         </view>
       </view>
       
       <!-- 产生费用 -->
-      <view v-if="isExpend" class="cost-section">
+      <view v-if="isExpend === '1'" class="cost-section">
         <view class="form-item form-item-header">
           <text class="label active">产生费用</text>
         </view>
@@ -244,21 +244,19 @@
     </view>
     
     <!-- 日期选择器 -->
-    <uv-picker 
+    <uv-datetime-picker 
       confirm-color="#C70019"
       ref="datePicker"
       mode="date"
       @confirm="confirmDate"
-      @cancel="cancelDate"
-    ></uv-picker>
+    ></uv-datetime-picker>
     
-    <uv-picker 
+    <uv-datetime-picker 
       confirm-color="#C70019"
       ref="nextDatePicker"
       mode="date"
       @confirm="confirmNextDate"
-      @cancel="cancelNextDate"
-    ></uv-picker>
+    ></uv-datetime-picker>
   </view>
 </template>
 
@@ -273,7 +271,7 @@ export default {
       stateFrontImage: [],
       stateBackText: '',
       stateBackImage: [],
-      isExpend: false,
+      isExpend: '0',
       newCostName: '',
       costList: [],
       remarkText: '',
@@ -287,7 +285,7 @@ export default {
   computed: {
     // 计算总金额
     amount() {
-      return this.costList.reduce((sum, item) => sum + (parseFloat(item.amount) || 0), 0)
+      return this.costList.reduce((sum, item) => sum + (parseFloat(item.amount) * Number(item.quantity) || 0), 0)
     }
   },
   methods: {
@@ -298,12 +296,11 @@ export default {
     
     // 确认日期
     confirmDate(e) {
-      this.maintenanceDate = e.value
-    },
-    
-    // 取消日期选择
-    cancelDate() {
-      // 取消操作
+      // uv-datetime-picker返回的是时间戳，需要转换为日期格式
+      const date = new Date(e.value)
+      this.maintenanceDate = date.getFullYear() + '-' + 
+        String(date.getMonth() + 1).padStart(2, '0') + '-' + 
+        String(date.getDate()).padStart(2, '0')
     },
     
     // 显示下次保养日期选择器
@@ -313,12 +310,11 @@ export default {
     
     // 确认下次保养日期
     confirmNextDate(e) {
-      this.nextMaintenanceDate = e.value
-    },
-    
-    // 取消下次保养日期选择
-    cancelNextDate() {
-      // 取消操作
+      // uv-datetime-picker返回的是时间戳，需要转换为日期格式
+      const date = new Date(e.value)
+      this.nextMaintenanceDate = date.getFullYear() + '-' + 
+        String(date.getMonth() + 1).padStart(2, '0') + '-' + 
+        String(date.getDate()).padStart(2, '0')
     },
     
     // 选择是否产生费用
@@ -452,11 +448,7 @@ export default {
         uni.showToast({ title: '请填写保养人', icon: 'none' })
         return
       }
-      // 先去掉日期限制
-      // if (!this.maintenanceDate) {
-      //   uni.showToast({ title: '请选择保养日期', icon: 'none' })
-      //   return
-      // }
+
       if (!this.stateFrontText.trim()) {
         uni.showToast({ title: '请填写保养前状态', icon: 'none' })
         return
@@ -466,15 +458,22 @@ export default {
         return
       }
 
-
+      if (this.isExpend === '1' && !this.amount){
+        uni.showToast({ title: '请填写消费', icon: 'none' })
+        return
+      }
+      // 把costList切换成字符串并用,,;分割
       // 提交数据
       const formData = {
         maintenanceName: this.maintenanceName,
-        maintenanceDate: this.maintenanceDate,
+        maintenanceDate: this.maintenanceDate,  
         stateFrontText: this.stateFrontText,
         stateFrontImage: this.stateFrontImage?.join(',') || '',
         stateBackText: this.stateBackText,
         stateBackImage: this.stateBackImage?.join(',') || '',
+        expenseList: this.costList.map(item => {
+          return `${item.name},${item.quantity},${item.amount}`
+        }).join(';'),
         isExpend: this.isExpend,
         amount: this.amount,
         remarkText: this.remarkText,
@@ -486,17 +485,22 @@ export default {
       
       
       this.submiting = true
-      const subRes  = await this.$api.exhibit.addMaintenance(formData)
-      if(subRes.code == 200){
-        uni.showToast({ title: subRes.message, icon: 'success' })
-        // 返回上一页
-        setTimeout(() => {
-          uni.navigateBack()
-        }, 1000)
-      }else{
-        uni.showToast({ title: subRes.message, icon: 'none' })
+      try{
+
+        const subRes  = await this.$api.exhibit.addMaintenance(formData)
+        if(subRes.code == 200){
+          uni.showToast({ title: subRes.message, icon: 'success' })
+          // 返回上一页
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 1000)
+        }else{
+          uni.showToast({ title: subRes.message, icon: 'none' })
+        }
+      }catch(err){
+        // uni.showToast({ title: err.message, icon: 'none' })
+        this.submiting = false
       }
-      this.submiting = false
     }
   },
   onLoad(options) {

subPages/home/repairSubmit.vue

@@ -468,7 +468,7 @@ export default {
       
       // console.log('提交数据:', formData)
       // uni.showToast({ title: '提交成功', icon: 'success' })
-      const subRes = await this.$api.exhibit.addMalfunction(formData)
+      const subRes = await this.$api.exhibit.addMalfunction({...formData})
       if (subRes.code === 200) {
         uni.showToast({ title: subRes.message})
         setTimeout(() => {

subPages/repair/maintainSubmit.vue

@@ -428,7 +428,7 @@ export default {
     // 计算总金额
     amount() {
       return this.processData.costDetails.reduce((sum, item) => {
-        return sum + (Number(item.quantity) * Number(item.amount))
+        return sum + (Number(item.quantity) * parseFloat(item.amount || 0))
       }, 0)
     }
   },