From b796935b8e262d071459a0bdb0d3305e747a7398 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: Thu, 27 May 2021 13:25:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E8=8F=9C=E5=8D=95=E3=80=81?=
 =?UTF-8?q?=E5=92=8C=E5=95=86=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/addStoreInfo/addStoreInfo.js        |  7 ----
 .../editConvenienceMenus.js                   |  7 ----
 .../admin/editStoreInfo/editStoreInfo.js      |  7 ----
 .../frame/uploadImage/uploadImage.js          |  8 +++-
 .../convenienceMenusManage.html               |  5 ++-
 .../storeInfoManage/storeInfoManage.html      | 40 ++++++++++++++++++-
 6 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/public/components/admin/addStoreInfo/addStoreInfo.js b/public/components/admin/addStoreInfo/addStoreInfo.js
index bbc7b30cf..8077b41c2 100644
--- a/public/components/admin/addStoreInfo/addStoreInfo.js
+++ b/public/components/admin/addStoreInfo/addStoreInfo.js
@@ -50,13 +50,6 @@
                             errInfo:"商户名称太长"
                         },
                     ],
-'addStoreInfoInfo.icon':[
- {
-                            limit:"maxLength",
-                            param:"100",
-                            errInfo:"图片地址太长"
-                        },
-                    ],
 'addStoreInfoInfo.tel':[
  {
                             limit:"maxLength",
diff --git a/public/components/admin/editConvenienceMenus/editConvenienceMenus.js b/public/components/admin/editConvenienceMenus/editConvenienceMenus.js
index 906bf74ca..6b9825e24 100644
--- a/public/components/admin/editConvenienceMenus/editConvenienceMenus.js
+++ b/public/components/admin/editConvenienceMenus/editConvenienceMenus.js
@@ -52,13 +52,6 @@
                             errInfo:"菜单名称太长"
                         },
                     ],
-'editConvenienceMenusInfo.icon':[
- {
-                            limit:"maxLength",
-                            param:"100",
-                            errInfo:"图片地址太长"
-                        },
-                    ],
 'editConvenienceMenusInfo.url':[
  {
                             limit:"maxLength",
diff --git a/public/components/admin/editStoreInfo/editStoreInfo.js b/public/components/admin/editStoreInfo/editStoreInfo.js
index f4f6563b4..232c4dc8d 100644
--- a/public/components/admin/editStoreInfo/editStoreInfo.js
+++ b/public/components/admin/editStoreInfo/editStoreInfo.js
@@ -56,13 +56,6 @@
                             errInfo:"商户名称太长"
                         },
                     ],
-'editStoreInfoInfo.icon':[
- {
-                            limit:"maxLength",
-                            param:"100",
-                            errInfo:"图片地址太长"
-                        },
-                    ],
 'editStoreInfoInfo.tel':[
  {
                             limit:"maxLength",
diff --git a/public/components/frame/uploadImage/uploadImage.js b/public/components/frame/uploadImage/uploadImage.js
index e69d69d9a..99041bd5d 100755
--- a/public/components/frame/uploadImage/uploadImage.js
+++ b/public/components/frame/uploadImage/uploadImage.js
@@ -51,11 +51,17 @@
                         this.uploadImageInfo.photos.push(_photo);
                         return;
                     }
+                    if (_photo.indexOf("https") > -1 || _photo.indexOf("http") > -1) {
+                        vc.urlToBase64(_photo, function (_base64Data) {
+                            this.uploadImageInfo.photos.push(_base64Data);
+                        });
+                        return;
+                    }
                     if (_photo.indexOf(photoUrl) > -1) {
                         vc.urlToBase64(_photo, function (_base64Data) {
                             this.uploadImageInfo.photos.push(_base64Data);
                         });
-                        return ;
+                        return;
                     }
                     vc.urlToBase64(photoUrl + "?fileId=" + _photo + "&communityId=" + vc.getCurrentCommunity().communityId + "&time=" + new Date(), function (_base64Data) {
                         this.uploadImageInfo.photos.push(_base64Data);
diff --git a/public/pages/admin/convenienceMenusManage/convenienceMenusManage.html b/public/pages/admin/convenienceMenusManage/convenienceMenusManage.html
index 6f37e2486..16b817d9d 100644
--- a/public/pages/admin/convenienceMenusManage/convenienceMenusManage.html
+++ b/public/pages/admin/convenienceMenusManage/convenienceMenusManage.html
@@ -34,7 +34,10 @@
                         <tr v-for="convenienceMenus in convenienceMenusManageInfo.convenienceMenuss">
                                                         <td class="text-center">{{convenienceMenus.convenienceMenusId}}</td>
                             <td class="text-center">{{convenienceMenus.name}}</td>
-                            <td class="text-center">{{convenienceMenus.icon}}</td>
+                            <td class="text-center">
+                                <img style="width: 60px; height: 60px; border-radius: 5px;"
+                                v-bind:src="convenienceMenus.icon"></img>
+                            </td>
                             <td class="text-center">{{convenienceMenus.url}}</td>
                             <td class="text-center">{{convenienceMenus.seq}}</td>
                             <td class="text-center">{{convenienceMenus.remark}}</td>
diff --git a/public/pages/admin/storeInfoManage/storeInfoManage.html b/public/pages/admin/storeInfoManage/storeInfoManage.html
index 6465c0963..86f3cc0f1 100644
--- a/public/pages/admin/storeInfoManage/storeInfoManage.html
+++ b/public/pages/admin/storeInfoManage/storeInfoManage.html
@@ -1,5 +1,32 @@
 <div >
-   
+    <div class="row" v-if="storeInfoManageInfo.componentShow == 'storeInfoManage'">
+        <div class="col-lg-12">
+            <div class="ibox ">
+                <div class="ibox-title">
+                    <h5>查询条件</h5>
+                    <div class="ibox-tools" style="top:10px;">
+                        
+                    </div>
+                </div>
+                <div class="ibox-content">
+                    <div class="row">
+                <div class="col-sm-4" >
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入商户名称" v-model="storeInfoManageInfo.conditions.name" class=" form-control">
+                            </div>                        </div>
+                            <div class="col-sm-1">
+                                <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryStoreInfoMethod()">
+                                    <i class="glyphicon glyphicon-search"></i> 查询
+                                </button>
+                            </div>
+                        
+                        </div>
+
+
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="row" v-if="storeInfoManageInfo.componentShow == 'storeInfoManage'">
         <div class="col-lg-12">
             <div class="ibox">
@@ -12,6 +39,11 @@
                         </button>
                     </div>
                 </div>
+
+
+
+
+
                 <div class="ibox-content">
 
                     <table class="footable table table-stripped toggle-arrow-tiny"
@@ -22,6 +54,7 @@
                                                         <th class="text-center">商户信息ID</th>
                             <th class="text-center">商户名称</th>
                             <th class="text-center">图片地址</th>
+                            
                             <th class="text-center">商户电话</th>
                             <th class="text-center">商户位置</th>
                             <th class="text-center">显示序号</th>
@@ -35,7 +68,10 @@
                         <tr v-for="storeInfo in storeInfoManageInfo.storeInfos">
                                                         <td class="text-center">{{storeInfo.storeInfoId}}</td>
                             <td class="text-center">{{storeInfo.name}}</td>
-                            <td class="text-center">{{storeInfo.icon}}</td>
+                            <td class="text-center">
+                                <img style="width: 60px; height: 60px; border-radius: 5px;"
+                                v-bind:src="storeInfo.icon"></img>
+                            </td>
                             <td class="text-center">{{storeInfo.tel}}</td>
                             <td class="text-center">{{storeInfo.site}}</td>
                             <td class="text-center">{{storeInfo.seq}}</td>