!174 【优化】前端用户登录状态去除监听，防止onlogin二次加载问题。【修复】修复分销店铺、代理店铺设置logo返回异常问题。

Merge pull request !174 from 大灰灰/dahuihui/develop
## 1.2.1（2021-11-28）
【优化】前端用户登录状态去除监听，防止onlogin二次加载问题。
【优化】调整后端管理UI一些样式问题。
【修复】修复分销店铺、代理店铺设置logo返回异常问题。
【修复】修复苹果手机门店列表中门店标题被遮挡样式问题。#I4HRU1

CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue

@@ -146,19 +146,19 @@
             }
             // #endif
         },
-        watch: {
-            'hasLogin': {
-                handler(newVal) {
-                    console.log(newVal);
-                    if (newVal == false) {
-                        console.log("watch监听");
-                        this.doToken();
-                    }
-                },
-                deep: true,
-                immediate: true,
-            }
-        },
+        //watch: {
+        //    'hasLogin': {
+        //        handler(newVal) {
+        //            console.log(newVal);
+        //            if (newVal == false) {
+        //                console.log("watch监听");
+        //                this.doToken();
+        //            }
+        //        },
+        //        deep: true,
+        //        immediate: true,
+        //    }
+        //},
         methods: {
             doToken() {
                 const _this = this

CoreCms.Net.Uni-App/CoreShop/pages/storeMap/storeMap.scss

@@ -1,7 +1,7 @@
 .content { width: 100%; /* #ifdef H5 */ height: calc(100vh - 44px); /* #endif */ }
 .map-body { width: 100%; height: 700rpx; position: relative; }
 .store-list { background-color: #fff; height: calc(100vh - 44px - 700rpx);
-    .coreshop-list-item { height: 160rpx;
+    .coreshop-list-item { min-height: 160rpx;
         .action { width: 130rpx; }
     }
 }

CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html

@@ -537,7 +537,7 @@
                                     <div class="layui-form coreshop-form">
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">{{d.data.configs['filesStorageType']['sKey']}}：</label>
-                                            <div class="layui-input-inline layui-inline-7">
+                                            <div class="layui-input-inline layui-inline-12">
                                                 {{# layui.each(d.data.filesStorageOptionsType, function(index, item){ }}
                                                 <input type="radio" name="filesStorageType" value="{{ item.title }}" lay-filter="filesStorageType" title="{{ item.description }}" {{d.data.configs['filesStorageType']['sValue']=== item.title ? 'checked':''}}>
                                                 {{# }); }}

CoreCms.Net.Web.WebApi/Controllers/CommonController.cs

@@ -310,12 +310,14 @@ namespace CoreCms.Net.Web.WebApi.Controllers
             }
 
             var bl = !string.IsNullOrEmpty(url);
+            jm.status = bl;
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? "上传成功!" : "上传失败";
             jm.data = new
             {
                 fileUrl = url,
-                src = url
+                src = url,
+                imageId = url
             };
 
             return jm;