浏览代码

Landing Pages fix

master
GJWilliams87 4 年前
父节点
当前提交
21da3a5976

二进制
Landing Pages.docx 查看文件


+ 1
- 1
src/components/about/aboutUsContentSection.vue 查看文件

@@ -50,7 +50,7 @@
50 50
             commercial, or vacant property or whether you would like to buy or rent a: timeshare,
51 51
             home, industrial, commercial, or vacant property; Uni-Vate is able to assist you.
52 52
           </p>
53
-          <img src="../../../public/img/logos.jpg" width="100%" /><br />
53
+          <!-- <img src="../../../public/img/logos.jpg" width="100%" /><br /> -->
54 54
         </div>
55 55
       </div>
56 56
     </div>

+ 10
- 7
src/components/admin/misc/carouselSearch.vue 查看文件

@@ -16,6 +16,7 @@
16 16
               v-if="name === 'Timeshare'"
17 17
               :items="items"
18 18
               :showNew="false"
19
+              :showColumnChooser="false"
19 20
               @onRowClick="onRowClick"
20 21
             />
21 22
             <ListView2 v-else :items="propertiesLive" :showNew="false" @onRowClick="onRowClick" />
@@ -69,13 +70,15 @@ export default {
69 70
     ...mapActions('myWeeks', ['getItems']),
70 71
     ...mapActions('propertyList', ['getLiveProperties']),
71 72
     onRowClick(item) {
72
-      if (this.name === 'Timeshare') {
73
-        const week = this.items[item];
74
-        this.$emit('onSelected', week);
75
-      } else {
76
-        const prop = this.propertiesLive[item];
77
-        this.$emit('onSelected', prop);
78
-      }
73
+         
74
+      // if (this.name === 'Timeshare') {
75
+      //   const week = this.items[item];
76
+      //   this.$emit('onSelected', week);
77
+      // } else {
78
+      //   const prop = this.propertiesLive[item];
79
+      //           alert(JSON.stringify(prop));   
80
+        this.$emit('onSelected', item);
81
+      //}
79 82
     },
80 83
   },
81 84
   watch: {

+ 3
- 0
src/components/marketing/clientView.vue 查看文件

@@ -28,6 +28,9 @@ export default {
28 28
   },
29 29
   computed: {
30 30
     ...mapState("campaign", ["campaignHtml"])
31
+  }, 
32
+  destroyed() {
33
+    this.$emit("setLandingPage", false);
31 34
   }
32 35
 };
33 36
 </script>

+ 8
- 8
src/components/marketing/landingPage.vue 查看文件

@@ -370,14 +370,14 @@ export default {
370 370
         for (let i = 0; i < this.campaign.placeHolders.length; i++) {
371 371
           this.campaign.placeHolders[i].format = this.campaign.placeHolders[i].formatTemplate;
372 372
         }
373
-        console.log(JSON.stringify(this.campaign));
374
-        // this.saveCampaign(this.campaign)
375
-        //   .then(fulfilled => {
376
-        //     this.$router.push("/landingPages");
377
-        //   })
378
-        //   .catch(error => {
379
-        //     console.log(error.message);
380
-        //   });
373
+        //console.log(JSON.stringify(this.campaign));
374
+        this.saveCampaign(this.campaign)
375
+          .then(fulfilled => {
376
+            this.$router.push("/landingPages");
377
+          })
378
+          .catch(error => {
379
+            console.log(error.message);
380
+          });
381 381
       } else {
382 382
         this.updateCampaign(this.campaign).then(() => {
383 383
           this.$router.push("/landingPages");

+ 11
- 27
src/components/marketing/landingPageWeek.vue 查看文件

@@ -13,31 +13,11 @@
13 13
             type="button"
14 14
             class="input-group-text fa fa-search"
15 15
             style="color: #60CBEB"
16
-            data-toggle="modal"
17
-            data-target="#myModalWeeks"
18
-          ></button>
19
-          <!-- Modal content-->
20
-          <div id="myModalWeeks" class="modal fade" role="dialog">
21
-            <div class="modal-dialog modal-lg">
22
-              <div class="modal-content">
23
-                <div class="modal-header">
24
-                  <button type="button" class="close" data-dismiss="modal"></button>
25
-                </div>
26
-                <div padding-left="20px">
27
-                  <Search :name="'Timeshare'" @onSelected="onSelected" />
28
-                </div>
29
-                <div class="modal-footer">
30
-                  <button
31
-                    type="button"
32
-                    class="btn btn-b-n"
33
-                    style="width: 150px; height:40px;"
34
-                    data-dismiss="modal"
35
-                  >Close</button>
36
-                </div>
37
-              </div>
38
-            </div>
39
-          </div>
40
-          <!-- Modal content END-->
16
+            @click="SearchWeeks()"
17
+          ></button>          
18
+          <modal name="weeksearch"  :width="700" :height="900" >
19
+            <Search :name="'Timeshare'" @onSelected="onSelected" />
20
+          </modal>          
41 21
         </div>
42 22
         <div class="col-md-3">
43 23
           <input class="form-control" type="label" disabled :value="weekUni" />
@@ -181,9 +161,13 @@ export default {
181 161
   },
182 162
   methods: {
183 163
     ...mapActions("campaignItem", ["getCampaignItem"]),
184
-    onSelected(item) {
164
+    SearchWeeks(){
165
+      this.$modal.show("weeksearch");
166
+    },
167
+    onSelected(item) {            
185 168
       this.weekItem.selectedWeek = item[0];
186
-      this.weekUni = item[0].weekUni;
169
+      this.weekUni = item[0].weekUni; 
170
+      this.$modal.hide("weeksearch");           
187 171
     },
188 172
     checkImage(item) {
189 173
       this.uploadImage = !this.uploadImage;

+ 4
- 4
src/components/property/propertySearchPage.vue 查看文件

@@ -128,20 +128,20 @@
128 128
         </div>
129 129
         <div class="col-md-4">
130 130
           <p>
131
-            <img
131
+            <!-- <img
132 132
               v-if="propertyUsageType === 'Residential'"
133 133
               class="img-fluid"
134 134
               src="./../../../public/img/residential.jpg"
135 135
               alt="About Resale"
136 136
               style="border-radius:10px"
137
-            />
138
-            <img
137
+            /> -->
138
+            <!-- <img
139 139
               v-else
140 140
               class="img-fluid"
141 141
               src="./../../../public/img/commercial.jpg"
142 142
               alt="About Resale"
143 143
               style="border-radius:10px"
144
-            />
144
+            /> -->
145 145
           </p>
146 146
         </div>
147 147
       </div>

+ 2
- 2
src/components/timeshare/buy/searchResults.vue 查看文件

@@ -11,12 +11,12 @@
11 11
               :src="resort.resortImage"
12 12
               alt
13 13
             />
14
-            <img
14
+            <!-- <img
15 15
               v-else
16 16
               style="width:255px; height:255px; object-fit: cover;"
17 17
               src="../../../../public/img/blankImg.png"
18 18
               alt
19
-            />
19
+            /> -->
20 20
             <p v-if="resort.weeksAvailable == 1" class="normalText">
21 21
               {{ resort.weeksAvailable }} Week Available
22 22
             </p>

+ 4
- 0
src/main.js 查看文件

@@ -14,6 +14,8 @@ import VueFloatLabel from "vue-float-label";
14 14
 import VueCryptojs from "vue-cryptojs";
15 15
 import VueAnalytics from 'vue-analytics';
16 16
 import JsonExcel from "vue-json-excel";
17
+import VModal from "vue-js-modal";
18
+import vueFloatLabel from "vue-float-label";
17 19
 
18 20
 Vue.use(VueSocialSharing);
19 21
 Vue.use(EvaIcons);
@@ -101,3 +103,5 @@ new Vue({
101 103
   router,
102 104
   store
103 105
 }).$mount("#app");
106
+
107
+Vue.use(VModal);

正在加载...
取消
保存