|
@@ -31,10 +31,6 @@
|
|
|
</view>
|
|
</view>
|
|
|
<view class="user-info" @click="pageTo({url:'/admin/home/edit'})">
|
|
<view class="user-info" @click="pageTo({url:'/admin/home/edit'})">
|
|
|
<text class="username">{{ (shopInfo && shopInfo.shopName == '首店') ? (shopInfo.merchantName || '') : (((shopInfo && shopInfo.merchantName) ? shopInfo.merchantName : '') + (shopInfo && shopInfo.shopName ? (' ' + shopInfo.shopName) : '')) }}</text>
|
|
<text class="username">{{ (shopInfo && shopInfo.shopName == '首店') ? (shopInfo.merchantName || '') : (((shopInfo && shopInfo.merchantName) ? shopInfo.merchantName : '') + (shopInfo && shopInfo.shopName ? (' ' + shopInfo.shopName) : '')) }}</text>
|
|
|
- <text class="user-id">ID {{ shopInfo && shopInfo.id ? shopInfo.id : '' }}</text>
|
|
|
|
|
- </view>
|
|
|
|
|
- <view class="more-icon" @click="pageTo({url:'/admin/home/edit'})">
|
|
|
|
|
- <zui-svg-icon icon="home-more" :width="26" color="#FFFFFF" />
|
|
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
|
|
|
|
@@ -493,10 +489,6 @@
|
|
|
showShopName(){
|
|
showShopName(){
|
|
|
currentShop().then(res => {
|
|
currentShop().then(res => {
|
|
|
if(res.code == 1){
|
|
if(res.code == 1){
|
|
|
- let sjName = res.data.merchantName ? res.data.merchantName : ''
|
|
|
|
|
- let shopName = res.data.shopName ? res.data.shopName : ''
|
|
|
|
|
- let title = shopName == '首店' ? sjName : sjName+' '+shopName
|
|
|
|
|
- uni.setNavigationBarTitle({ title: title })
|
|
|
|
|
this.shopInfo = res.data?res.data:[]
|
|
this.shopInfo = res.data?res.data:[]
|
|
|
if(this.shopInfo.avatar) {
|
|
if(this.shopInfo.avatar) {
|
|
|
uni.setStorageSync('shopAvatar', this.shopInfo.avatar);
|
|
uni.setStorageSync('shopAvatar', this.shopInfo.avatar);
|
|
@@ -1079,9 +1071,9 @@
|
|
|
display: flex;
|
|
display: flex;
|
|
|
align-items: center;
|
|
align-items: center;
|
|
|
.avatar-container {
|
|
.avatar-container {
|
|
|
- width: 120upx;
|
|
|
|
|
- height: 120upx;
|
|
|
|
|
- border-radius: 60upx;
|
|
|
|
|
|
|
+ width: 50upx;
|
|
|
|
|
+ height: 50upx;
|
|
|
|
|
+ border-radius: 50upx;
|
|
|
overflow: hidden;
|
|
overflow: hidden;
|
|
|
background-color: rgba(255,255,255,0.2);
|
|
background-color: rgba(255,255,255,0.2);
|
|
|
border: 1upx solid #ffffff;
|
|
border: 1upx solid #ffffff;
|
|
@@ -1092,15 +1084,15 @@
|
|
|
margin: 0 !important;
|
|
margin: 0 !important;
|
|
|
line-height: 1;
|
|
line-height: 1;
|
|
|
display: block;
|
|
display: block;
|
|
|
- width: 120upx;
|
|
|
|
|
- height: 120upx;
|
|
|
|
|
|
|
+ width: 50upx;
|
|
|
|
|
+ height: 50upx;
|
|
|
color: transparent !important;
|
|
color: transparent !important;
|
|
|
&::after { border: none !important; }
|
|
&::after { border: none !important; }
|
|
|
}
|
|
}
|
|
|
.avatar {
|
|
.avatar {
|
|
|
- width: 120upx;
|
|
|
|
|
- height: 120upx;
|
|
|
|
|
- border-radius: 60upx;
|
|
|
|
|
|
|
+ width: 50upx;
|
|
|
|
|
+ height: 50upx;
|
|
|
|
|
+ border-radius: 50upx;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
.user-info {
|
|
.user-info {
|
|
@@ -1108,7 +1100,7 @@
|
|
|
margin-left: 24upx;
|
|
margin-left: 24upx;
|
|
|
.username {
|
|
.username {
|
|
|
display: block;
|
|
display: block;
|
|
|
- font-size: 36upx;
|
|
|
|
|
|
|
+ font-size: 40upx;
|
|
|
font-weight: bold;
|
|
font-weight: bold;
|
|
|
color: #ffffff;
|
|
color: #ffffff;
|
|
|
}
|
|
}
|