Fixing merge conflicts in another branch

resources/assets/js/pages/home.vue

@@ -144,7 +144,7 @@
         <el-form ref="bookingForm" :model="bookingForm" :rules="rules">
           <div align="center">
             <el-form-item prop="account_name">
-              <el-input v-model="bookingForm.account_name" placeholder="China Beneficiary Account" style="width: 80%" required="true" />
+              <el-input v-model="bookingForm.account_name" placeholder="China Beneficiary Account" style="width: 80%" />
             </el-form-item>
             <el-form-item prop="bank_name">
               <el-input v-model="bookingForm.bank_name" type="text" placeholder="Bank Name / AliPay / WechatPay" style="width: 80%" />
@@ -343,16 +343,16 @@ export default {
         account_num: ''
       }],
       rules: {
-        amount: [{
+        /*amount: [{
           required: true,
           message: 'Please input amount',
           trigger: 'change'
-        } ],
+        }],*/
         bank_name: [{
           required: true,
           message: 'Please input bank name',
           trigger: 'change'
-        } ],
+        }],
         account_name: [{
           required: true,
           message: 'Please input account name',
@@ -363,11 +363,12 @@ export default {
           message: 'Please input branch',
           trigger: 'change'
         }],
-        account_num: [{
-          required: true,
-          message: 'Please input account number',
-          trigger: 'change'
-        }]
+        account_num: [
+          {required: true,
+          message: 'Please input account number',trigger: 'change'}]/*,
+          {type:'number',
+          message: 'Account number cannot be text',trigger: 'change'}
+        ]*/
       },
       term: '',
       options1: [{
@@ -484,6 +485,13 @@ export default {
         })
         return
       }
+      if ((this.booking.amount < 0) || isNaN(this.booking.amount)) {
+        this.$message({
+          message: 'Amount must be a number greater than 0',
+          type: 'warning'
+        })
+        return
+      }
       this.dialogFormVisible = true
       this.term = newterm
     },
@@ -518,10 +526,10 @@ export default {
               console.log(error)
             })
         } else {
-          this.loading = false
-          this.$message({
+            this.loading = false
+            this.$message({
                 showClose: true,
-                message: 'Please fill the booking form in full.',
+                message: 'Please fill the booking form properly.',
                 type: 'error',
                 duration: 10000
               })