mirror of
https://github.com/CoreUnion/CoreShop.git
synced 2026-10-27 11:56:37 +08:00
## 1.2.1(2021-11-29)
【优化】调整本地存储域名规则,防止出现前后端不统一问题。#I4K56N 【修复】修复因初始化coreshop密码小写,导致后端修改密码失败的问题。#I4K6KH 【修复】修复商品详情本店推荐列表高度不够,导致显示不完全的问题。 【修复】修复sku过多,导致弹出层不支持伸缩的问题。#I4K994 【修复】修复21寸以下显示器后台平台设置菜单显示不全的问题。#I4K5A9
This commit is contained in:
@@ -269,7 +269,7 @@
|
||||
</view>
|
||||
|
||||
|
||||
<u-popup class="coreshop-bottom-popup-box" v-model="bottomModal" mode="bottom">
|
||||
<u-popup class="coreshop-bottom-popup-box" v-model="bottomModal" mode="bottom" height="60%">
|
||||
<view class="radius coreshop-bg-white">
|
||||
<!--标题-->
|
||||
<view class="coreshop-text-black u-text-center u-margin-top-30 u-margin-bottom-30 u-font-lg coreshop-title-bar">
|
||||
|
||||
@@ -433,7 +433,7 @@
|
||||
</view>
|
||||
|
||||
<!--弹出框-->
|
||||
<u-popup class="coreshop-bottom-popup-box" v-model="bottomModal" mode="bottom">
|
||||
<u-popup class="coreshop-bottom-popup-box" v-model="bottomModal" mode="bottom" height="60%">
|
||||
<view class="radius coreshop-bg-white">
|
||||
<!--标题-->
|
||||
<view class="coreshop-text-black u-text-center u-margin-top-30 u-margin-bottom-30 u-font-lg coreshop-title-bar">
|
||||
|
||||
@@ -270,7 +270,7 @@
|
||||
|
||||
|
||||
<!--弹出框-->
|
||||
<u-popup class="coreshop-bottom-popup-box" v-model="bottomModal" mode="bottom">
|
||||
<u-popup class="coreshop-bottom-popup-box" v-model="bottomModal" mode="bottom" height="60%">
|
||||
<view class="radius coreshop-bg-white">
|
||||
<!--标题-->
|
||||
<view class="coreshop-text-black u-text-center u-margin-top-30 u-margin-bottom-30 u-font-lg coreshop-title-bar">
|
||||
|
||||
@@ -223,7 +223,7 @@
|
||||
</form>
|
||||
|
||||
<!--弹出框-->
|
||||
<u-popup class="coreshop-bottom-popup-box" v-model="bottomModal" mode="bottom" border-radius="14" closeable="true">
|
||||
<u-popup class="coreshop-bottom-popup-box" v-model="bottomModal" mode="bottom" border-radius="14" closeable="true" height="60%">
|
||||
<!-- 多规格商品弹出 -->
|
||||
<block v-if="showSpecs">
|
||||
<view class="coreshop-bg-white">
|
||||
|
||||
@@ -318,7 +318,7 @@
|
||||
|
||||
|
||||
<!--弹出框-->
|
||||
<u-popup class="coreshop-bottom-popup-box" v-model="bottomModal" mode="bottom">
|
||||
<u-popup class="coreshop-bottom-popup-box" v-model="bottomModal" mode="bottom" height="60%">
|
||||
<view class="radius coreshop-bg-white">
|
||||
<!--标题-->
|
||||
<view class="coreshop-text-black u-text-center u-margin-top-30 u-margin-bottom-30 u-font-lg coreshop-title-bar">
|
||||
|
||||
@@ -686,7 +686,7 @@ page, .bg-page { background: #f7f7f7; }
|
||||
}
|
||||
.coreshop-good-shop-recommend-list-box {
|
||||
.recommend-scroll-box { position: relative; width: 100%;
|
||||
.recommend-scroll { position: relative; height: 320rpx; white-space: nowrap; width: 100%;
|
||||
.recommend-scroll { position: relative; height: 360rpx; white-space: nowrap; width: 100%;
|
||||
.recommend-scroll-item { display: inline-block; padding-top: 28rpx; width: 200rpx; padding-right: 18rpx; white-space: initial;
|
||||
.coreshop-avatar { width: 180rpx; height: 180rpx; }
|
||||
}
|
||||
|
||||
@@ -274,12 +274,12 @@ namespace CoreCms.Net.Web.Admin.Controllers
|
||||
var newPassWord = CommonHelper.Md5For32(entity.password);
|
||||
|
||||
var userModel = await _sysUserServices.QueryByIdAsync(_user.ID);
|
||||
if (userModel.passWord != oldPassWord)
|
||||
if (userModel.passWord.ToUpperInvariant() != oldPassWord)
|
||||
{
|
||||
jm.msg = "旧密码输入错误";
|
||||
return jm;
|
||||
}
|
||||
else if (userModel.passWord == newPassWord)
|
||||
else if (userModel.passWord.ToUpperInvariant() == newPassWord)
|
||||
{
|
||||
jm.msg = "新旧密码一致,无需修改,请设置与旧密码不同的新密码";
|
||||
return jm;
|
||||
|
||||
@@ -68,7 +68,6 @@ a {
|
||||
/*tab切换标题显示字体大小*/
|
||||
.layui-tab-title li {
|
||||
font-size: 13px;
|
||||
width: 100px;
|
||||
}
|
||||
/*带标题的栅格线*/
|
||||
.layui-elem-field legend {
|
||||
|
||||
@@ -28,7 +28,7 @@ a { cursor: pointer }
|
||||
/*后台快捷方式图标字体大小重写*/
|
||||
.layadmin-shortcut li cite { font-size: 13px; }
|
||||
/*tab切换标题显示字体大小*/
|
||||
.layui-tab-title li { font-size: 13px; width: 100px; }
|
||||
.layui-tab-title li { font-size: 13px; }
|
||||
|
||||
/*带标题的栅格线*/
|
||||
.layui-elem-field legend { font-size: 13px; }
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user