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

src/components/StoreDesign/navigationIcon.vue

@@ -63,10 +63,7 @@
           <el-form-item label="导航图标" prop="NavIconImg">
             <div>
               <el-tooltip class="item" effect="dark" content="建议尺寸:88*88" placement="top-start">
-                <el-upload class="avatar-uploader" action="" accept="image/jpeg,image/gif,image/png,image/bmp"
-                  :show-file-list="false" :http-request="UploadImage">
-                  <el-button size="small">选择文件</el-button>
-                </el-upload>
+                <el-button size="small" @click="choicImg=true">选择文件</el-button>
               </el-tooltip>
             </div>
             <div class="navNavIconImg">
@@ -189,13 +186,10 @@
           }
         })
       },
-      //上传图片
-      UploadImage(file) {
-        this.UploadFileToTencent(this.FileType().UserNavIconImg, file.file, res => {
-          if (res.resultCode == 1) {
-            this.addMsg.NavIconImg = res.FileUrl;
-          }
-        })
+      //选择图片
+      SelectId(msg) {
+        this.addMsg.NavIconImg = this.getIconLink(msg.url);
+        this.choicImg = false;
       },
       submitform(addMsg) {
         //提交创建、修改表单

src/components/sallCenter/plugin/modal.vue

@@ -194,7 +194,7 @@
       },
       //选择图片
       SelectId(msg) {
-        this.data.list[this.comImgIndex].picUrl = msg.url;
+        this.data.list[this.comImgIndex].picUrl = this.getIconLink(msg.url);
         this.choicImg = false;
       },
       //选择链接