v1.9 测试业主认证到发票一些细微bug 修复，比如点击按钮提示英文不提示中文等问题

wuxw
1 parent cce4a1fc
Showing 11 changed files with 26 additions and 26 deletions
src/api/community/communitySpaceConfirmApi.js
src/components/community/AddCommunitySpace.vue
src/components/community/EditCommunitySpaceOpenTime.vue
src/components/owner/DeleteAppUserBindingOwner.vue
src/components/owner/ResetStaffPwd.vue
src/views/community/communitySpaceConfirmList.vue
src/views/community/communitySpaceManageList.vue
src/views/community/communitySpacePersonManageLang.js
src/views/community/communitySpacePersonManageList.vue
src/views/owner/auditAuthOwnerList.vue
src/views/user/login/Login.vue
@@ -32,10 +32,10 @@ export function saveCommunitySpaceConfirmOrder(data) {
       data
     }).then(response => {
       const res = response.data
-      if (res.code === 0) {
+      if (res.code == 0) {
         resolve(res)
       } else {
-        reject(new Error(res.msg || '核销操作失败'))
+        reject(new Error(res.msg))
       }
     }).catch(error => {
       reject(error)
@@ -6,15 +6,15 @@
       </el-form-item>
  
       <el-form-item :label="$t('communitySpaceManage.feeMoney')" prop="feeMoney">
-        <el-input v-model="form.feeMoney" :placeholder="$t('communitySpaceManage.selectSpace')" />
+        <el-input v-model="form.feeMoney" :placeholder="$t('communitySpaceManage.feeMoney')" />
       </el-form-item>
  
       <el-form-item :label="$t('communitySpaceManage.adminName')" prop="adminName">
-        <el-input v-model="form.adminName" :placeholder="$t('communitySpaceManage.selectSpace')" />
+        <el-input v-model="form.adminName" :placeholder="$t('communitySpaceManage.adminName')" />
       </el-form-item>
  
       <el-form-item :label="$t('communitySpaceManage.tel')" prop="tel">
-        <el-input v-model="form.tel" :placeholder="$t('communitySpaceManage.selectSpace')" />
+        <el-input v-model="form.tel" :placeholder="$t('communitySpaceManage.tel')" />
       </el-form-item>
  
       <el-form-item :label="$t('communitySpaceManage.state')" prop="state">
@@ -59,13 +59,13 @@ export default {
           { required: true, message: this.$t('communitySpaceManage.selectSpace'), trigger: 'blur' }
         ],
         feeMoney: [
-          { required: true, message: this.$t('communitySpaceManage.selectSpace'), trigger: 'blur' }
+          { required: true, message: this.$t('communitySpaceManage.feeMoney'), trigger: 'blur' }
         ],
         adminName: [
-          { required: true, message: this.$t('communitySpaceManage.selectSpace'), trigger: 'blur' }
+          { required: true, message: this.$t('communitySpaceManage.adminName'), trigger: 'blur' }
         ],
         tel: [
-          { required: true, message: this.$t('communitySpaceManage.selectSpace'), trigger: 'blur' }
+          { required: true, message: this.$t('communitySpaceManage.tel'), trigger: 'blur' }
         ],
         state: [
           { required: true, message: this.$t('communitySpaceManage.selectStatus'), trigger: 'change' }
@@ -24,7 +24,7 @@
  
     <div slot="footer" class="dialog-footer">
       <el-button @click="visible = false">
-        {{ $t('communitySpaceManage.cancel') }}
+        {{ $t('common.close') }}
       </el-button>
     </div>
   </el-dialog>
@@ -51,7 +51,7 @@ export default {
         this.closeDialog()
       } catch (error) {
         console.error('删除失败:', error)
-        this.$message.error(this.$t('deleteBinding.errorMsg'))
+        this.$message.error(error)
       }
     }
   }
@@ -47,7 +47,7 @@ export default {
         this.closeDialog()
       } catch (error) {
         console.error('重置密码失败:', error)
-        this.$message.error(this.$t('resetPwd.errorMsg'))
+        this.$message.error(error)
       }
     }
   }
@@ -242,7 +242,7 @@ export default {
         }
  
         const result = await saveCommunitySpaceConfirmOrder(data)
-        if (result.code === 0) {
+        if (result.code == 0) {
           this.$message.success(this.$t('common.operationSuccess'))
           this.communitySpaceConfirmInfo.timeId = ''
  
@@ -258,11 +258,11 @@ export default {
           this.pagination.current = 1
           this.listCommunitySpaceConfirms()
         } else {
-          this.$message.error(result.msg)
+          this.$message.error(result)
         }
       } catch (error) {
         console.error('核销失败:', error)
-        this.$message.error(this.$t('communitySpaceConfirm.writeOffFailed'))
+        this.$message.error(error)
       }
     },
     queryCommunitySpaceConfirm() {
@@ -30,13 +30,13 @@
             <span>{{ $t('communitySpaceManage.query') }}</span>
           </div>
           <el-form :inline="true" :model="conditions" class="search-form">
-            <el-form-item :label="$t('communitySpaceManage.spaceId')">
+            <el-form-item >
               <el-input v-model="conditions.spaceId" :placeholder="$t('communitySpaceManage.selectSpace')"></el-input>
             </el-form-item>
-            <el-form-item :label="$t('communitySpaceManage.name')">
+            <el-form-item >
               <el-input v-model="conditions.name" :placeholder="$t('communitySpaceManage.selectSpace')"></el-input>
             </el-form-item>
-            <el-form-item :label="$t('communitySpaceManage.state')">
+            <el-form-item >
               <el-select v-model="conditions.state" :placeholder="$t('communitySpaceManage.selectStatus')"
                 style="width:100%">
                 <el-option :label="$t('communitySpaceManage.selectStatus')" value=""></el-option>
@@ -285,7 +285,6 @@ export default {
  
 .venue-items li {
   padding: 12px 15px;
-  border-bottom: 1px solid #eee;
   cursor: pointer;
   transition: all 0.3s;
 }
@@ -32,7 +32,9 @@ export const messages = {
         F: 'Appointment Failed',
         W: 'Pending Review',
         P: 'Pending Payment'
-      }
+      },
+      stateWaitConfirm: 'Pending Confirm',
+      stateConfirm: 'Confirmed'
     },
     deleteCommunitySpacePerson: {
       confirmTitle: 'Please confirm your operation!',
@@ -74,7 +76,9 @@ export const messages = {
         F: '预约失败',
         W: '待审核',
         P: '待支付'
-      }
+      },
+      stateWaitConfirm: '待核销',
+      stateConfirm: '已核销'
     },
     deleteCommunitySpacePerson: {
       confirmTitle: '请确认您的操作！',
@@ -58,7 +58,7 @@
         <el-table-column :label="$t('communitySpacePersonManage.appointmentTime')" align="center">
           <template slot-scope="scope">
             <div v-for="(time, index) in scope.row.times" :key="index">
-              <span> {{ formatTimes(scope.row.times) }}</span>
+              <span> {{ time.hours }}({{ time.state == 'W'? $t('communitySpacePersonManage.stateWaitConfirm'): $t('communitySpacePersonManage.stateConfirm') }})</span>
             </div>
           </template>
         </el-table-column>
@@ -107,7 +107,6 @@
       </el-col>
     </el-row>
  
-    <audit-dialog ref="auditDialog" @submit="_auditSubmit" />
     <delete-binding-owner-dialog ref="deleteDialog" @delete-success="_deleteSuccess" />
     <reset-pwd-dialog ref="resetPwdDialog" />
   </div>
@@ -116,14 +115,12 @@
 <script>
 import { listAuditAppUserBindingOwners } from '@/api/owner/auditAuthOwnerApi'
 import { getCommunityId } from '@/api/community/communityApi'
-import AuditDialog from '@/components/owner/Audit'
 import DeleteBindingOwnerDialog from '@/components/owner/DeleteAppUserBindingOwner'
 import ResetPwdDialog from '@/components/owner/ResetStaffPwd'
  
 export default {
   name: 'AuditAuthOwnerList',
   components: {
-    AuditDialog,
     DeleteBindingOwnerDialog,
     ResetPwdDialog
   },
@@ -44,8 +44,8 @@ export default {
       logo: '',
       companyName:'',
       loginForm: {
-        username: 'wuxw',
-        passwd: 'admin',
+        username: '',
+        passwd: '',
         validateCode: ''
       },
       captchaUrl: '',