代码优化

be83661b · hank · b2acb410 · be83661b · be83661b · be83661b
Commit be83661b authored Aug 26, 2019 by hank
7 changed files
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -4,5 +4,5 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
    NODE_ENV: '"development"',
-    BASE_API: '"http://equipment.bdideal.com"'
+    BASE_API: '"https://equipment.bdideal.com"'
 })
\ No newline at end of file
--- a/src/templates/listingInformation/index.vue
+++ b/src/templates/listingInformation/index.vue
@@ -89,12 +89,13 @@ export default {
  },
  methods: {
    loaded(index) {
-      console.log("child mouted", index);
+      if (!this.isEditMode) {
-      setTimeout(() => {
+        setTimeout(() => {
-        this.$refs["child" + this.sliderActiveIndex][0].enter().then(() => {
+          this.$refs["child" + this.sliderActiveIndex][0].enter().then(() => {
-          console.log(index, "enter 完毕");
+            console.log(index, "enter 完毕");
-        });
+          });
-      }, 1000);
+        }, 1000);
+      }
    },
    message(data) {
      Message.send(data, "*");
@@ -130,20 +131,25 @@ export default {
    });
  },
  created() {
-    Scene.EventBus.on("leaveBefore", e => {
+    if (getQuery("isEdit")) {
-      console.log("leaveBefore");
+      this.isEditMode = true;
-      if (this.pages.length > 1) {
+    } else {
-        this.$refs["child" + this.sliderActiveIndex][0].leave().then(() => {
+      Scene.EventBus.on("leaveBefore", e => {
-          console.log("leaveBefore then");
+        console.log("leaveBefore");
-          var index = this.sliderActiveIndex;
+        if (this.pages.length > 1) {
-          if (index >= this.pages.length - 1) {
+          this.$refs["child" + this.sliderActiveIndex][0].leave().then(() => {
-            index = -1;
+            console.log("leaveBefore then");
-            console.log(index);
+            var index = this.sliderActiveIndex;
-          }
+            if (index >= this.pages.length - 1) {
-          this.swiper.slideTo(index + 1, 0, false);
+              index = -1;
-        });
+              console.log(index);
-      }
+            }
-    });
+            this.swiper.slideTo(index + 1, 0, false);
+          });
+        }
+      });
+      this.isEditMode = false;
+    }
    var vm = this;
    Message.init(e => {
      var isObj = typeof e.data === "object";
@@ -200,11 +206,6 @@ export default {
        }
      }
    };
-    if (getQuery("isEdit")) {
-      this.isEditMode = true;
-    } else {
-      this.isEditMode = false;
-    }
    if (getQuery("filmId") && !this.isEditMode) {
      getFilmDetail(getQuery("filmId")).then(result => {
        console.log(result);
@@ -242,7 +243,7 @@ export default {
  position: relative;
  opacity: 1;
  .ant {
-    clip-path: url(#cd-image-1)
+    clip-path: url(#cd-image-1);
  }
  .decoration {
    position: absolute;

--- a/src/templates/listingInformation/itemList/buyingHouse.js
+++ b/src/templates/listingInformation/itemList/buyingHouse.js
@@ -45,28 +45,28 @@ export default [
    type: 'text',
    name: '亮点二名称',
    description: '填写亮点二名称不超过三个字',
-    dataKey: 'brighTwoName',
+    dataKey: 'brightTwoName',
    valueRule: ''
  },
  {
    type: 'text',
    name: '亮点二内容',
    description: '填写亮点二内容不超过五个字',
-    dataKey: 'brighTwoContent',
+    dataKey: 'brightTwoContent',
    valueRule: ''
  },
  {
    type: 'text',
    name: '亮点三名称',
    description: '填写亮点三名称不超过三个字',
-    dataKey: 'brighThreeName',
+    dataKey: 'brightThreeName',
    valueRule: ''
  },
  {
    type: 'text',
    name: '亮点三内容',
    description: '填写亮点三内容不超过五个字',
-    dataKey: 'brighThreeContent',
+    dataKey: 'brightThreeContent',
    valueRule: ''
  },
  {

--- a/src/templates/listingInformation/pages/buyingHouse.vue
+++ b/src/templates/listingInformation/pages/buyingHouse.vue
@@ -42,7 +42,7 @@
        </div>
        <div class="surrounding" zh="房源特色" ref="surrounding">PROPERTY FEATURES</div>
        <div class="feature-list" ref="feature-list">
-          <div class="feature-item"  v-for="(item, index) in feutrueList" :key="index">{{item}}</div>
+          <div class="feature-item" v-for="(item, index) in feutrueList" :key="index">{{item}}</div>
        </div>
      </div>
    </div>
@@ -54,7 +54,7 @@ import { swiper, swiperSlide } from "vue-awesome-swiper";
 import StarSky from "@/framework/components/BoxShadowSky";
 import methods from "../methods";
 import anime from "animejs/lib/anime.es.js";
-import Scene from '@/framework/utils/sence'
+import Scene from "@/framework/utils/sence";
 export default {
  name: "welcome",
  props: ["schemaData", "page", "isEditMode", "cancelEdit"],
@@ -93,16 +93,16 @@ export default {
          easing: "easeOutQuad"
        }).finished
      ];
-      var enPromise = Promise.all(PromiseAll)
+      var enPromise = Promise.all(PromiseAll);
      return enPromise;
    },
    enter() {
-      console.log('enter anime')
+      console.log("enter anime");
      var PromiseAll = [
        anime({
          targets: this.$refs["house-list"],
          translateX: 0,
-          opacity: 1, 
+          opacity: 1,
          duration: 1000
        }).finished,
        anime({
@@ -149,8 +149,8 @@ export default {
        }).finished
      ];
      Promise.all(PromiseAll).then(() => {
-        this.enterAfter()
+        this.enterAfter();
-      })
+      });
      return Promise.all(PromiseAll);
    },
    enterBefore() {
@@ -215,8 +215,12 @@ export default {
    }
  },
  mounted() {
-    console.log('mounted')
+    console.log(this.isEditMode);
-    this.enterBefore()
+    if (!this.isEditMode) {
+      console.log(this.isEditMode);
+      this.enterBefore();
+    }
  },
  data() {
    return {

--- a/src/templates/listingInformation/pages/rentHouse.vue
+++ b/src/templates/listingInformation/pages/rentHouse.vue
@@ -246,8 +246,9 @@ export default {
    }
  },
  mounted() {
-    console.log("mounted");
+    if (!this.isEditMode) {
-    this.enterBefore();
+      this.enterBefore();
+    }
  },
  data() {
    return {

--- a/src/templates/listingInformation/pages/rentHouse2.vue
+++ b/src/templates/listingInformation/pages/rentHouse2.vue
@@ -243,8 +243,9 @@ export default {
    }
  },
  mounted() {
-    console.log("mounted");
+    if (!this.isEditMode) {
-    this.enterBefore();
+      this.enterBefore();
+    }
  },
  data() {
    return {

--- a/src/templates/listingInformation/pages/rentHouse3.vue
+++ b/src/templates/listingInformation/pages/rentHouse3.vue
@@ -266,7 +266,9 @@ export default {
    }
  },
  mounted() {
-    this.enterBefore();
+    if (!this.isEditMode) {
+      this.enterBefore();
+    } 
  },
  data() {
    return {