diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue index 2afc589..bcfa999 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue +++ b/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 diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/storeMap/storeMap.scss b/CoreCms.Net.Uni-App/CoreShop/pages/storeMap/storeMap.scss index f1fbe91..a417a25 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/storeMap/storeMap.scss +++ b/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; } } } diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html index 077ac70..66108a3 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html @@ -537,7 +537,7 @@