Lene Scholtz 5 年之前
父節點
當前提交
38a9812cfe

+ 2
- 3
src/components/admin/status/agentsUserManagementPage.vue 查看文件

153
     };
153
     };
154
   },
154
   },
155
   methods: {
155
   methods: {
156
-    ...mapActions('registerIndividual', ['getAgents']),
157
-
156
+    ...mapActions('register', ['getAgents']),
158
     addNewAgent({ commit }) {
157
     addNewAgent({ commit }) {
159
       axios
158
       axios
160
         .post('/api/agent')
159
         .post('/api/agent')
200
     }
199
     }
201
   },
200
   },
202
   computed: {
201
   computed: {
203
-    ...mapState('registerIndividual', ['agents']),
202
+    ...mapState('register', ['agents']),
204
 
203
 
205
     SortDirection() {
204
     SortDirection() {
206
       return this.reverse ? 'desc' : 'asc';
205
       return this.reverse ? 'desc' : 'asc';

+ 2
- 3
src/components/admin/status/userManagementPage.vue 查看文件

147
     };
147
     };
148
   },
148
   },
149
   methods: {
149
   methods: {
150
-    ...mapActions('registerIndividual', ['getIndividuals']),
151
-
150
+    ...mapActions('register', ['getIndividuals']),
152
     routerGoTo(goTo) {
151
     routerGoTo(goTo) {
153
       this.$router.push(goTo);
152
       this.$router.push(goTo);
154
     },
153
     },
188
     }
187
     }
189
   },
188
   },
190
   computed: {
189
   computed: {
191
-    ...mapState('registerIndividual', ['individuals']),
190
+    ...mapState('register', ['individuals']),
192
 
191
 
193
     SortDirection() {
192
     SortDirection() {
194
       return this.reverse ? 'desc' : 'asc';
193
       return this.reverse ? 'desc' : 'asc';

+ 4
- 1
src/components/shared/alert.vue 查看文件

11
     </div>
11
     </div>
12
     <div class="alert alert-warning" v-if="type === 'WARNING'">
12
     <div class="alert alert-warning" v-if="type === 'WARNING'">
13
       <eva-icon name="alert-circle-outline"></eva-icon>
13
       <eva-icon name="alert-circle-outline"></eva-icon>
14
-      <strong>{{ text }}</strong>
14
+      <strong class="color-black">{{ text }}</strong>
15
     </div>
15
     </div>
16
     <div class="alert alert-danger" v-if="type === 'ERROR'">
16
     <div class="alert alert-danger" v-if="type === 'ERROR'">
17
       <eva-icon name="slash-outline"></eva-icon>
17
       <eva-icon name="slash-outline"></eva-icon>
41
 </script>
41
 </script>
42
 
42
 
43
 <style>
43
 <style>
44
+.color-black {
45
+  color: black;
46
+}
44
 </style>
47
 </style>

+ 1
- 1
src/components/timeshare/buy/weekListComponent.vue 查看文件

47
             class="img-fluid"
47
             class="img-fluid"
48
             src="/img/kloader.gif"
48
             src="/img/kloader.gif"
49
             alt="UVProp logo"
49
             alt="UVProp logo"
50
-            style="width:400px;height:364px;"
50
+            style="width:128px;height:128px;"
51
           />
51
           />
52
         </div>
52
         </div>
53
         <div v-else>No Results Found</div>
53
         <div v-else>No Results Found</div>

+ 35
- 4
src/components/timeshare/sell/sellPage.vue 查看文件

16
             <div style="float: right;" class="btn btn-link color-b"></div>
16
             <div style="float: right;" class="btn btn-link color-b"></div>
17
           </div>
17
           </div>
18
           <br />
18
           <br />
19
-          <br />
20
-          <p>* You need to be logged in to submit your listing. Please register and log in if you have not done so already.</p>
19
+          <div v-if="!isLoggedIn">
20
+            <hr />
21
+            <Alert
22
+              :text="'* You need to be logged in to submit your listing. Please register and log in if you have not done so already.'"
23
+              :type="'WARNING'"
24
+            />
25
+          </div>
21
           <hr />
26
           <hr />
27
+          <br />
22
           <div class="form-group row">
28
           <div class="form-group row">
23
             <div class="col-md-4">
29
             <div class="col-md-4">
24
               <div class="form-group">
30
               <div class="form-group">
118
                     >
124
                     >
119
                       <option value="Other">Other</option>
125
                       <option value="Other">Other</option>
120
                       <option
126
                       <option
121
-                        v-for="(resort, r) in resorts"
127
+                        v-for="(resort, r) in filteredResort"
122
                         :key="r"
128
                         :key="r"
123
                         :value="resort"
129
                         :value="resort"
124
                       >{{resort.resortName}}</option>
130
                       >{{resort.resortName}}</option>
507
 import DetailIndividual from '../../user/timeshareIndividual.vue';
513
 import DetailIndividual from '../../user/timeshareIndividual.vue';
508
 import BankDetails from '../../shared/bankAccount.vue';
514
 import BankDetails from '../../shared/bankAccount.vue';
509
 import Address from '../../misc/address.vue';
515
 import Address from '../../misc/address.vue';
516
+import Alert from '../../shared/alert.vue';
510
 
517
 
511
 export default {
518
 export default {
512
   name: 'TimeshareToSell',
519
   name: 'TimeshareToSell',
513
-  components: { DetailIndividual, BankDetails, Address },
520
+  components: {
521
+    DetailIndividual,
522
+    BankDetails,
523
+    Address,
524
+    Alert,
525
+  },
514
   created() {
526
   created() {
515
     this.initTimeshare();
527
     this.initTimeshare();
516
   },
528
   },
528
       'agencies',
540
       'agencies',
529
       'agents',
541
       'agents',
530
     ]),
542
     ]),
543
+    ...mapState('authentication', ['isLoggedIn']),
531
     refAgent() {
544
     refAgent() {
532
       return this.sellItem && this.sellItem.referedByAgent;
545
       return this.sellItem && this.sellItem.referedByAgent;
533
     },
546
     },
547
+    filteredResort() {
548
+      let list = [];
549
+      if (
550
+        this.sellItem
551
+        && this.sellItem.region
552
+        && this.sellItem.region.regionCode
553
+      ) {
554
+        const item = this.detailedRegion.find(
555
+          region => region.region.regionCode === this.sellItem.region.regionCode,
556
+        );
557
+        if (item) {
558
+          list = item.children;
559
+        }
560
+      } else {
561
+        list = this.resorts;
562
+      }
563
+      return _.sortBy(list, x => x.resortName);
564
+    },
534
   },
565
   },
535
   methods: {
566
   methods: {
536
     submitSale() {
567
     submitSale() {

+ 2
- 2
src/components/user/registerAgencySection.vue 查看文件

237
     };
237
     };
238
   },
238
   },
239
   computed: {
239
   computed: {
240
-    ...mapState('registerAgency', ['registerAgency']),
240
+    ...mapState('register', ['registerAgency']),
241
   },
241
   },
242
   methods: {
242
   methods: {
243
-    ...mapActions('registerAgency', [
243
+    ...mapActions('register', [
244
       'getAgency',
244
       'getAgency',
245
       'saveAgency',
245
       'saveAgency',
246
       'updateAgency',
246
       'updateAgency',

+ 2
- 2
src/components/user/registerPage.vue 查看文件

181
     };
181
     };
182
   },
182
   },
183
   computed: {
183
   computed: {
184
-    ...mapState('registerIndividual', ['registerIndividual']),
184
+    ...mapState('register', ['registerIndividual']),
185
 
185
 
186
     Header() {
186
     Header() {
187
       return this.RegisterHeader
187
       return this.RegisterHeader
190
     },
190
     },
191
   },
191
   },
192
   methods: {
192
   methods: {
193
-    ...mapActions('registerIndividual', [
193
+    ...mapActions('register', [
194
       'getIndividual',
194
       'getIndividual',
195
       'saveIndividual',
195
       'saveIndividual',
196
       'updateIndividual',
196
       'updateIndividual',

+ 2
- 2
src/components/user/updateProfileInfo.vue 查看文件

59
     return {};
59
     return {};
60
   },
60
   },
61
   methods: {
61
   methods: {
62
-    ...mapActions('registerIndividual', ['getIndividuals']),
62
+    ...mapActions('register', ['getIndividuals']),
63
   },
63
   },
64
   mounted() {
64
   mounted() {
65
     this.getIndividuals();
65
     this.getIndividuals();
66
   },
66
   },
67
   computed: {
67
   computed: {
68
-    ...mapState('registerIndividual', ['individuals']),
68
+    ...mapState('register', ['individuals']),
69
   },
69
   },
70
 };
70
 };
71
 </script>
71
 </script>

+ 1
- 2
src/store/index.js 查看文件

40
     propertyAdmin: PropertyAdminModule,
40
     propertyAdmin: PropertyAdminModule,
41
     propertyList: PropertyList,
41
     propertyList: PropertyList,
42
     propertyTypes: PropertyTypes,
42
     propertyTypes: PropertyTypes,
43
-    registerIndividual: Register,
44
-    registerAgency: Register,
43
+    register: Register,
45
     weekList: WeekList,
44
     weekList: WeekList,
46
     bid: Bid,
45
     bid: Bid,
47
     authentication: Authentication,
46
     authentication: Authentication,

Loading…
取消
儲存