fixbug
This commit is contained in:
齐斌
parent
8c047e1ea4
commit
663f2a74eb
@ -1,5 +1,5 @@
|
|||||||
$theme-primary: #BA4A8F;
|
$theme-primary: #BA4A8F;
|
||||||
$theme-darker: #C1B2E5;
|
$theme-darker: #DCA4C7;
|
||||||
$theme-dark: #DFD7F2;
|
$theme-dark: #DFD7F2;
|
||||||
$basic-white: #FFFFFF;
|
$basic-white: #FFFFFF;
|
||||||
$basic-black: #000000;
|
$basic-black: #000000;
|
||||||
|
|||||||
@ -163,7 +163,7 @@
|
|||||||
<n-button
|
<n-button
|
||||||
tertiary
|
tertiary
|
||||||
class="fl-mr-md"
|
class="fl-mr-md"
|
||||||
:style="`width: 161px; background: ${themeDarker}; color: #ffffff`"
|
:style="`width: 161px;`"
|
||||||
@click="handleDialogInitiateCancel"
|
@click="handleDialogInitiateCancel"
|
||||||
>
|
>
|
||||||
取消
|
取消
|
||||||
@ -547,12 +547,12 @@
|
|||||||
<div
|
<div
|
||||||
@click="handleAddMailAddress"
|
@click="handleAddMailAddress"
|
||||||
class="col-2 row justify-center border-1 border-solid border-primary cursor-pointer"
|
class="col-2 row justify-center border-1 border-solid border-primary cursor-pointer"
|
||||||
style="
|
:style="`
|
||||||
padding: 8px 0;
|
padding: 8px 0;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
color: #46299d;
|
color: ${themeColor};`"
|
||||||
"
|
|
||||||
>
|
>
|
||||||
<span>新增地址</span>
|
<span>新增地址</span>
|
||||||
</div>
|
</div>
|
||||||
@ -570,8 +570,9 @@
|
|||||||
</n-button>
|
</n-button>
|
||||||
|
|
||||||
<n-button
|
<n-button
|
||||||
tertiary
|
|
||||||
style="width: 161px; background: #46299d; color: #fff"
|
style="width: 161px; color: #fff"
|
||||||
|
type="primary"
|
||||||
:loading="state.saveAddressEditBtnLoading"
|
:loading="state.saveAddressEditBtnLoading"
|
||||||
@click="saveEditReceiveAddress"
|
@click="saveEditReceiveAddress"
|
||||||
:disabled="!state.canUseSaveAddressBtn"
|
:disabled="!state.canUseSaveAddressBtn"
|
||||||
@ -708,7 +709,7 @@ const cascaderRefs = ref([]);
|
|||||||
|
|
||||||
// 计算属性：获取主题色
|
// 计算属性：获取主题色
|
||||||
const themeColor = computed(() => settingConfig.themeColor);
|
const themeColor = computed(() => settingConfig.themeColor);
|
||||||
const themeDarker = '#C1B2E5'; // 对应 $theme-darker
|
|
||||||
const basicWhite = '#FFFFFF'; // 对应 $basic-white
|
const basicWhite = '#FFFFFF'; // 对应 $basic-white
|
||||||
|
|
||||||
const state = reactive({
|
const state = reactive({
|
||||||
@ -2384,7 +2385,7 @@ const getProvinceCityAreaOptions = async () => {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
padding: 13px 35px;
|
padding: 13px 35px;
|
||||||
background-color: rgb(238, 233, 248);
|
background-color: $theme-darker;
|
||||||
margin: 0 16px;
|
margin: 0 16px;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
.receive-artwork-address-info {
|
.receive-artwork-address-info {
|
||||||
@ -2412,7 +2413,7 @@ const getProvinceCityAreaOptions = async () => {
|
|||||||
}
|
}
|
||||||
.edit-receive-address-btn {
|
.edit-receive-address-btn {
|
||||||
span {
|
span {
|
||||||
color: #409eff;
|
color: $theme-primary;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -389,16 +389,16 @@ const updateImg = () => {
|
|||||||
duration: 2,
|
duration: 2,
|
||||||
});
|
});
|
||||||
//修改头像成功后，同步更新聊天系统的头像
|
//修改头像成功后，同步更新聊天系统的头像
|
||||||
const updateChatAvatarRes = await updateChatAvatar({
|
// const updateChatAvatarRes = await updateChatAvatar({
|
||||||
erpUserId: state.info.ID, //erp用户id
|
// erpUserId: state.info.ID, //erp用户id
|
||||||
avatar: state.avatar, //头像url
|
// avatar: state.avatar, //头像url
|
||||||
type: "" //送空，那就只更新聊天系统这边的头像，送erp，就erp的头像也更新
|
// type: "" //送空，那就只更新聊天系统这边的头像，送erp，就erp的头像也更新
|
||||||
})
|
// })
|
||||||
if(updateChatAvatarRes.status === 0){
|
// if(updateChatAvatarRes.status === 0){
|
||||||
message.success("更新聊天系统头像成功")
|
// message.success("更新聊天系统头像成功")
|
||||||
} else {
|
// } else {
|
||||||
message.error(updateChatAvatarRes.msg)
|
// message.error(updateChatAvatarRes.msg)
|
||||||
}
|
// }
|
||||||
state.avatar = "";
|
state.avatar = "";
|
||||||
} else {
|
} else {
|
||||||
message.error(res.msg);
|
message.error(res.msg);
|
||||||
|
|||||||
@ -72,8 +72,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<a-button class="col-10 fl-mt-sm"
|
<a-button class="col-10 fl-mt-sm"
|
||||||
|
type="primary"
|
||||||
shape="round"
|
shape="round"
|
||||||
style="background: #370d9b; border: none; color: #fff"
|
style="border: none; color: #fff"
|
||||||
:loading="state.btnLoading">导出excel</a-button>
|
:loading="state.btnLoading">导出excel</a-button>
|
||||||
</a-popover>
|
</a-popover>
|
||||||
|
|
||||||
@ -112,7 +113,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<a-button style="background: #370d9b; border: none; color: #fff"
|
<a-button style="border: none; color: #fff"
|
||||||
|
type="primary"
|
||||||
class="col-10 fl-mt-sm"
|
class="col-10 fl-mt-sm"
|
||||||
shape="round"
|
shape="round"
|
||||||
:loading="state.btnLoading">导出图片等资源</a-button>
|
:loading="state.btnLoading">导出图片等资源</a-button>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user