页面修改

src/components/StoreDesign/labelBar.vue

@@ -222,7 +222,7 @@
                       </div>
                       <div class="btnCenter">{{item.TagName}}</div>
                       <div class="nav_Action">
-                        <span style="background: rgba(64, 158, 255, 0.9);" @click="EditInfo(item)">编辑</span>
+                        <span style="background: rgba(64, 158, 255, 0.9);" @click="EditInfo(item,index)">编辑</span>
                         <span style="background: rgba(245, 108, 108, 0.9);" @click="delItem(index,item)">删除</span>
                       </div>
                     </div>
@@ -246,7 +246,7 @@
         <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>
+              <el-button size="small" @click="choicImg=true,checkIndex=1">选择文件</el-button>
             </el-tooltip>
           </div>
           <div class="labelBarIconImg">
@@ -258,7 +258,7 @@
         <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>
+              <el-button size="small" @click="choicImg=true,checkIndex=2">选择文件</el-button>
             </el-tooltip>
           </div>
           <div class="labelBarIconImg">
@@ -293,10 +293,15 @@
         <el-button size="small" type="danger" @click="getMenu()">确 定</el-button>
       </span>
     </el-dialog>
+    <!-- 选择图片文件 -->
+    <el-dialog title="选择文件" :visible.sync="choicImg" width="1240px">
+      <ChooseImg @SelectId="SelectId"></ChooseImg>
+    </el-dialog>
   </div>
 </template>
 <script>
   import chooseMenu from "../common/chooseMenu.vue";
+  import ChooseImg from "@/components/global/ChooseImg.vue";
   export default {
     data() {
       let validataIcon = (rule, value, callback) => {
@@ -314,6 +319,10 @@
         }
       }
       return {
+        //图标索引
+        checkIndex: 0,
+        //选择图片
+        choicImg: false,
         //是否显示链接弹窗
         isShowLink: false,
         mallMsg: {
@@ -387,14 +396,15 @@
           TenantId: 0, //商户Id
           MallBaseId: 0, //小程序Id
           TagName: '',
-          DefaultIcon: '1', //默认图片
-          CheckedIcon: '1', //激活状态图片
+          DefaultIcon: '', //默认图片
+          CheckedIcon: '', //激活状态图片
           DefaultColor: 'rgb(136, 136, 136)', //默认字体颜色
           CheckedColor: 'rgb(255, 69, 68)', //激活字体颜色
           TagLink: "", //链接地址
           TagSort: 1, //排序
           IsActive: false
         },
+        EditIndex:-1,//编辑的行
         rules: {
           icon: [{
             required: true,
@@ -420,12 +430,22 @@
       };
     },
     components: {
-      chooseMenu
+      chooseMenu,
+      ChooseImg
     },
     created() {
 
     },
     methods: {
+      //选择图片
+      SelectId(msg) {
+        if (this.checkIndex == 1) {
+          this.addMsg.DefaultIcon = this.getIconLink(msg.url);
+        } else if (this.checkIndex == 2) {
+          this.addMsg.CheckedIcon = this.getIconLink(msg.url);
+        }
+        this.choicImg = false;
+      },
       getMenu() {
         //调用子组件方法
         var obj = this.$refs.chooseMenu.getChooseMenu();
@@ -468,14 +488,6 @@
         }
         this.mallMsg.BottomTagList.splice(index, 1);
       },
-      //上传图标
-      UploadIcon() {
-        this.addMsg.DefaultIcon = "";
-      },
-      //上传选中图标
-      UploadCkedIcon() {
-        this.addMsg.CheckedIcon = "";
-      },
       //点击添加图标
       addIconList() {
         this.isAdd = true;
@@ -496,9 +508,10 @@
         this.addMsg.IsActive = false;
       },
       //点击编辑
-      EditInfo(item) {
+      EditInfo(item,index) {
         this.isAdd = false;
-        this.addMsg = item;
+        this.EditIndex=index;
+        this.addMsg = JSON.parse(JSON.stringify(item));
         this.isShowDialog = true;
       },
       //提交数据
@@ -510,6 +523,10 @@
               this.mallMsg.BottomTagList.push(JSON.parse(JSON.stringify(this.addMsg)));
               this.clearAddmsg();
             }
+            else
+            {
+                this.mallMsg.BottomTagList[this.EditIndex]=JSON.parse(JSON.stringify(this.addMsg));
+            }
             this.isShowDialog = false;
           } else {
             return false;
@@ -565,7 +582,6 @@
           }
         })
       },
-
       //重置
       resetInfo() {
         if (this.mallMsg.BottomTagList && this.mallMsg.BottomTagList.length > 0) {
@@ -575,7 +591,7 @@
               tagIds += item.TagId + ",";
             }
           });
-          tagIds=tagIds.substring(0, tagIds.lastIndexOf(','));
+          tagIds = tagIds.substring(0, tagIds.lastIndexOf(','));
           this.apipost("/api/Tenant/RemoveMiniProgramMallTag", {
             TagId: tagIds
           }, res => {

src/components/StoreDesign/navigationIcon.vue

@@ -36,7 +36,8 @@
           <el-table-column label="操作" width="120">
             <template slot-scope="scope">
               <img @click="EditNavIcon(scope.row)" src="../../assets/img/userman/edit.png" alt="">
-              <img @click="RemmoveNavIcon(scope.row)" style="margin-left:10px;" src="../../assets/img/userman/del.png" alt="">
+              <img @click="RemmoveNavIcon(scope.row)" style="margin-left:10px;" src="../../assets/img/userman/del.png"
+                alt="">
             </template>
           </el-table-column>
         </el-table>
@@ -56,8 +57,8 @@
             <el-input v-model="addMsg.NavIconName" class="w400" size="small" placeholder="请输入名称" maxlength="20" />
           </el-form-item>
           <el-form-item label="排序" prop="NavIconSort">
-            <el-input type="text" v-model="addMsg.NavIconSort" @keyup.native="checkInteger(addMsg,'NavIconSort')" size="small" class="w400" placeholder="请输入排序"
-              maxlength="4" />
+            <el-input type="text" v-model="addMsg.NavIconSort" @keyup.native="checkInteger(addMsg,'NavIconSort')"
+              size="small" class="w400" placeholder="请输入排序" maxlength="4" />
           </el-form-item>
           <el-form-item label="导航图标" prop="NavIconImg">
             <div>
@@ -74,7 +75,7 @@
             </div>
           </el-form-item>
           <el-form-item label="导航链接" prop="NavIconUrl">
-            <el-input v-model="addMsg.NavIconUrl" class="w400" size="small" maxlength="100" :disabled="true"  />
+            <el-input v-model="addMsg.NavIconUrl" class="w400" size="small" maxlength="100" :disabled="true" />
             <el-button plain size="small" @click="isShowLink=true">选择链接</el-button>
           </el-form-item>
           <el-form-item label="是否显示">
@@ -93,10 +94,15 @@
         <el-button size="small" type="danger" @click="getMenu()">确 定</el-button>
       </span>
     </el-dialog>
+    <!-- 选择图片文件 -->
+    <el-dialog title="选择文件" :visible.sync="choicImg" width="1240px">
+      <ChooseImg @SelectId="SelectId"></ChooseImg>
+    </el-dialog>
   </div>
 </template>
 <script>
   import chooseMenu from "../common/chooseMenu.vue";
+  import ChooseImg from "@/components/global/ChooseImg.vue";
   export default {
     data() {
       let validataNavIconImg = (rule, value, callback) => {
@@ -107,6 +113,8 @@
         }
       }
       return {
+        //选择图片
+        choicImg: false,
         //是否线下链接弹窗
         isShowLink: false,
         loading: false,
@@ -116,7 +124,7 @@
           pageSize: 15,
           NavIconName: "",
           MallBaseId: 0,
-          NavIconIsShow:-1
+          NavIconIsShow: -1
         },
         total: 0,
         NavIconIsShowAdd: true,
@@ -154,7 +162,8 @@
       };
     },
     components: {
-      chooseMenu
+      chooseMenu,
+      ChooseImg
     },
     created() {