Merge branch 'master' of http://192.168.6.188:3000/Provision/UnivateProperties

src/components/timeshare/buy/weekListComponent.vue

@@ -4,15 +4,15 @@
       <table class="table table-bordered">
         <thead>
           <tr>
-            <th>Region</th>
+            <th>Province</th>
             <th>Resort</th>
-            <th>Unit Number</th>
-            <th>Week Number</th>
-            <th>Arrival Date</th>
-            <th>Departure Date</th>
+            <th>Unit</th>
+            <th>Week</th>
+            <th>Arrival</th>
+            <th>Departure</th>
             <th>Bedrooms</th>
-            <th>Price</th>
-            <th>Status</th>
+            <th style="width:15%">Price</th>
+            <!-- <th>Status</th> -->
             <th>Interested</th>
           </tr>
         </thead>
@@ -26,7 +26,7 @@
             <td>{{item.departureDate | toDate}}</td>
             <td>{{item.bedrooms}}</td>
             <td>{{item.sellPrice | toCurrency}}</td>
-            <td>{{item.status ? item.status.description : ''}}</td>
+            <!-- <td>{{item.status ? item.status.description : ''}}</td> -->
             <td>
               <div class="col-md-12">
                 <button

src/components/timeshare/searchTimeshare.vue

@@ -34,10 +34,7 @@
             </span>
           </div>
           <select class="form-control" name="resort" id="resort" v-model="filter.resort">
-            <option v-for="(item, i) in filteredResorts" :key="i" :value="item">
-              {
-              {item.resortName}}
-            </option>
+            <option v-for="(item, i) in filteredResorts" :key="i" :value="item">{{item.resortName}}</option>
           </select>
           <div class="input-group-append" @click="clearFilter('resort')">
             <span class="input-group-text cursor-pointer" style="color: #60CBEB">