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

src/components/sallCenter/plugin/rubik.vue

@@ -149,7 +149,9 @@
                     </div>
                   </el-form-item>
                   <el-form-item label="选择链接">
-                    <el-input size="small" v-model="rubData.data.list&&rubData.data.list[rubik].link[0].PageName" :disabled="true">
+                    <el-input size="small" v-if="rubData.data.list&&rubData.data.list.length>0
+                        && rubData.data.list[rubik].link && rubData.data.list[rubik].link.length>0" v-model="
+                         rubData.data.list[rubik].link[0].PageName" :disabled="true">
                       <template slot="append">
                         <el-button @click="isShowLink=true">选择链接</el-button>
                       </template>