Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/common/choiceArea.vue

@@ -146,11 +146,21 @@
               </el-row>
             </el-form-item>
             <el-form-item label="热区链接" v-if="isLink">
-              <el-input size="small" style="width: 100%;" :disabled="true" v-model="hotspotList[index].link.PageName">
-                <template slot="append">
-                  <el-button @click="isShowLink=true">选择链接</el-button>
-                </template>
-              </el-input>
+              <template v-if="chooseType=='rubik'">
+                <el-input size="small" style="width: 100%;" :disabled="true"
+                  v-model="hotspotList[index].link[0].PageName">
+                  <template slot="append">
+                    <el-button @click="isShowLink=true">选择链接</el-button>
+                  </template>
+                </el-input>
+              </template>
+              <template v-else>
+                <el-input size="small" style="width: 100%;" :disabled="true" v-model="hotspotList[index].link.PageName">
+                  <template slot="append">
+                    <el-button @click="isShowLink=true">选择链接</el-button>
+                  </template>
+                </el-input>
+              </template>
             </el-form-item>
             <el-form-item label="热区属性" v-if="mode == 'auth'">
               <el-radio-group v-model="hotspotList[index].open_type">
@@ -253,6 +263,9 @@
         return parseFloat(this.height) - this.hotspotList[this.index].top;
       },
     },
+    mounted() {
+      console.log("hotspotArray", this.hotspotArray);
+    },
     methods: {
       click(e) {
         this.is_mousedown = false;
@@ -309,6 +322,11 @@
         hotspot.top = position.y;
         hotspot.defaultX = position.x;
         hotspot.defaultY = position.y;
+        if (this.chooseType == "rubik") {
+          hotspot.link = [{
+            PageName: ""
+          }];
+        }
         this.hotspotList.push(hotspot);
         this.index = this.hotspotList.length - 1;
         this.zIndex = 102;
@@ -378,11 +396,11 @@
         var obj = this.$refs.chooseMenu.getChooseMenu();
         if (this.index > -1 && this.hotspotList.length > 0) {
           if (this.chooseType == "rubik") {
+            this.hotspotList[this.index].link = [];
             this.hotspotList[this.index].link.push(obj)
           } else {
             this.hotspotList[this.index].link = obj
           }
-
         }
         this.isShowLink = false;
       },