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

src/components/StoreDesign/labelBar.vue

@@ -242,8 +242,8 @@
     <!-- 导航菜单编辑 -->
     <el-dialog title="导航菜单编辑" :visible.sync="isShowDialog" width="800px">
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="120px">
-          <!--prop="icon" HK 0428去掉-->
-        <el-form-item label="图标" >
+        <!--prop="icon" HK 0428去掉-->
+        <el-form-item label="图标">
           <div>
             <el-tooltip class="item" effect="dark" content="建议尺寸:64*64" placement="top-start">
               <el-button size="small" @click="UploadIcon">选择文件</el-button>
@@ -255,7 +255,7 @@
           </div>
         </el-form-item>
         <!--prop="checkedIcon" HK 0428去掉-->
-        <el-form-item label="选择状态图标" >
+        <el-form-item label="选择状态图标">
           <div>
             <el-tooltip class="item" effect="dark" content="建议尺寸:64*64" placement="top-start">
               <el-button size="small" @click="UploadCkedIcon">选择文件</el-button>
@@ -276,8 +276,8 @@
           <el-color-picker size="small" v-model="addMsg.CheckedColor"></el-color-picker>
         </el-form-item>
         <el-form-item label="导航链接" prop="TagLink">
-          <el-input v-model="addMsg.TagLink" class="w400" size="small" maxlength="100" />
-          <el-button plain size="small">选择链接</el-button>
+          <el-input v-model="addMsg.TagLink" class="w400" size="small" maxlength="100" :disabled="true" />
+          <el-button plain size="small" @click="isShowLink=true">选择链接</el-button>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -285,9 +285,18 @@
         <el-button size="small" type="primary" @click="submitForm('addMsg')">提交</el-button>
       </span>
     </el-dialog>
+    <el-dialog title="选择链接" :visible.sync="isShowLink" width="800px">
+      <chooseMeun ref="chooseMeun">
+      </chooseMeun>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="isShowLink=false">取 消</el-button>
+        <el-button size="small" type="danger" @click="getMenu()">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
+  import chooseMeun from "../common/chooseMeun.vue";
   export default {
     data() {
       let validataIcon = (rule, value, callback) => {
@@ -305,6 +314,8 @@
         }
       }
       return {
+        //是否线下链接弹窗
+        isShowLink: false,
         mallMsg: {
           MallBaseId: 0,
           TopNavWordType: 1, //顶部标题文件颜色类型(0-白色，1-黑色)
@@ -408,10 +419,19 @@
         }
       };
     },
+    components: {
+      chooseMeun
+    },
     created() {
 
     },
     methods: {
+      getMenu() {
+        //调用子组件方法
+        var obj = this.$refs.chooseMeun.getChooseMenu();
+        this.addMsg.TagLink = obj.PageUrl;
+        this.isShowLink = false;
+      },
       //点击切换
       getChecked(item) {
         this.mallMsg.BottomTagList.forEach(x => {
@@ -441,8 +461,7 @@
           this.apipost("/api/Tenant/RemoveMiniProgramMallTag", {
             TagId: item.TagId
           }, res => {
-            if (res.data.resultCode == 1) {
-            } else {
+            if (res.data.resultCode == 1) {} else {
               this.Info(res.data.message);
             }
           })