hz/ylst-pc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ui-fix-from-master' into uat

Browse Source
This commit is contained in:
王博冉
2022-11-16 23:53:21 +08:00
parent 30dd9025c6 4c1098a210
commit 74a71c750b
10 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Layouts/BaseLayout.vue
View File

@@ -37,8 +37,9 @@
style="display: flex;align-items: center;" style="display: flex;align-items: center;"
@click.stop="clickEntrance"> @click.stop="clickEntrance">
<template #icon> <template #icon>
<img class="download_img" <i class="iconfont icon-fenxiang2 mr-6"></i>
:src="require('@/assets/img/fenxiang.png')" /> <!-- <img class="download_img"
:src="require('@/assets/img/fenxiang.png')" /> -->
</template> </template>
分享 分享
</a-button> </a-button>
@@ -56,8 +57,9 @@
style="display: flex;align-items: center;" style="display: flex;align-items: center;"
@click="openPublishModal"> @click="openPublishModal">
<template #icon> <template #icon>
<img class="download_img" <i class="iconfont icon-fabu3 mr-6"></i>
:src="require('@/assets/img/fabu.png')" /> <!-- <img class="download_img"
:src="require('@/assets/img/fabu.png')" /> -->
</template> </template>
发布 发布
</a-button> </a-button>
@@ -67,8 +69,9 @@
@click.stop="toDownload" @click.stop="toDownload"
v-if="showDownload&&showxiazai"> v-if="showDownload&&showxiazai">
<template #icon> <template #icon>
<img class="download_img" <!-- <img class="download_img"
:src="require('@/assets/img/download_center.png')" /> :src="require('@/assets/img/download_center.png')" /> -->
<i class="iconfont icon-xiazaiqi mr-6"></i>
</template> </template>
下载中心 下载中心
</a-button> </a-button>
@@ -81,8 +84,9 @@
style="display: flex;align-items: center;" style="display: flex;align-items: center;"
@click.stop="clickEntrance"> @click.stop="clickEntrance">
<template #icon> <template #icon>
<img class="download_img" <i class="iconfont icon-fenxiang2 mr-6"></i>
:src="require('@/assets/img/fenxiang.png')" /> <!-- <img class="download_img"
:src="require('@/assets/img/fenxiang.png')" /> -->
</template> </template>
分享 分享
</a-button> </a-button>
@@ -92,8 +96,9 @@
@click.stop="toDownload" @click.stop="toDownload"
v-if="showDownload"> v-if="showDownload">
<template #icon> <template #icon>
<img class="download_img" <!-- <img class="download_img"
:src="require('@/assets/img/download_center.png')" /> :src="require('@/assets/img/download_center.png')" /> -->
<i class="iconfont icon-xiazaiqi mr-6"></i>
</template> </template>
下载中心 下载中心
</a-button> </a-button>
@@ -459,14 +464,14 @@ onMounted(() => {
} }
.publish-btn { .publish-btn {
margin-left: 10px; margin-left: 10px;
height: 36px; height: 32px;
line-height: 18px; line-height: 18px;
border-radius: 6px; border-radius: 6px;
} }
.download-btn { .download-btn {
margin-left: 32px; margin-left: 32px;
// width: 88px; // width: 88px;
height: 36px; height: 32px;
line-height: 18px; line-height: 18px;
border-radius: 6px; border-radius: 6px;
} }
@@ -600,8 +605,8 @@ onMounted(() => {
transform: rotateY(180deg); transform: rotateY(180deg);
} }
.download_img { .download_img {
width: 24px; width: 16px;
height: 24px; height: 16px;
margin-right: 6px; margin-right: 6px;
} }
.click { .click {
@@ -631,4 +636,7 @@ onMounted(() => {
background-color: #f5f5f5; background-color: #f5f5f5;
margin-right: 8px; margin-right: 8px;
} }
.mr-6 {
margin-right: 6px;
}
</style> </style>

2
src/router/index.js
View File

@@ -111,7 +111,7 @@ const constantRoutes = [
}, },
{ {
path: 'answer-setting', path: 'answer-setting',
meta: { showPublish: true, showDownload: true }, meta: { showPublish: true, showDownload: false },
component: () => import(/* webpackChunkName: "planet" */ '../views/planetDesign/AnswerSetting.vue') component: () => import(/* webpackChunkName: "planet" */ '../views/planetDesign/AnswerSetting.vue')
}, },
{ {

7
src/views/Answer/components/PreviewLayout.vue
View File

@@ -35,7 +35,8 @@
v-show="isLogin && questionsData.survey?.status === 0" v-show="isLogin && questionsData.survey?.status === 0"
> >
<template #icon> <template #icon>
<i class="iconfont icon-Path" style="font-size: 18px; margin-right: 6px"></i> <!-- <i class="iconfont icon-Path" style="font-size: 18px; margin-right: 6px"></i> -->
<i class="iconfont icon-fabu3" style="margin-right: 6px"></i>
</template> </template>
发布 发布
</a-button> </a-button>
@@ -380,9 +381,11 @@ export default defineComponent({
.publish-btn { .publish-btn {
margin-left: 32px; margin-left: 32px;
width: 88px; width: 88px;
height: 36px; height: 32px;
line-height: 18px; line-height: 18px;
border-radius: 6px; border-radius: 6px;
display: flex;
align-items: center;
} }
} }

1
src/views/ProjectManage/fragment/TableList.vue
View File

@@ -775,6 +775,7 @@ export default defineComponent({
max-width: 120px; max-width: 120px;
padding: 0 5px; padding: 0 5px;
margin: 0 5px; margin: 0 5px;
margin-top: 5px;
display: inline-block; display: inline-block;
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;

7
src/views/Publish/launch-center/launch-task/index.vue
View File

@@ -61,7 +61,8 @@
@click="openPublishModal" @click="openPublishModal"
> >
<template #icon> <template #icon>
<i class="iconfont icon-Path" style="font-size: 15px; margin-right: 6px"></i> <!-- <i class="iconfont icon-Path" style="font-size: 15px; margin-right: 6px"></i> -->
<i class="iconfont icon-fabu3" style="margin-right: 6px"></i>
</template> </template>
发布 发布
</a-button> </a-button>
@@ -509,8 +510,10 @@ export default {
} }
.publish-btn { .publish-btn {
// height: auto !important; // height: auto !important;
height: 36px; height: 32px;
border-radius: 6px; border-radius: 6px;
display: flex;
align-items: center;
} }
.delivery-type { .delivery-type {

9
src/views/Publish/link.vue
View File

@@ -10,7 +10,8 @@
@click="openPublishModal" @click="openPublishModal"
> >
<template #icon> <template #icon>
<i class="iconfont icon-Path" style="font-size: 15px; margin-right: 6px"></i> <!-- <i class="iconfont icon-Path" style="font-size: 15px; margin-right: 6px"></i> -->
<i class="iconfont icon-fabu3" style="margin-right: 6px"></i>
</template> </template>
发布 发布
</a-button> </a-button>
@@ -652,8 +653,10 @@ onMounted(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.publish-btn { .publish-btn {
height: 36px; height: 32px;
border-radius: 6px; border-radius: 6px;
display: flex;
align-items: center;
} }
.pulish-container { .pulish-container {
height: calc(100vh - 150px); height: calc(100vh - 150px);
@@ -834,6 +837,6 @@ onMounted(() => {
padding-left: 10px; padding-left: 10px;
line-height: 32px; line-height: 32px;
border: 1px solid #d9d9d9; border: 1px solid #d9d9d9;
border-radius: 2px; border-radius: 4px;
} }
</style> </style>

2
src/views/planetDesign/Design/questions/choice/Choice.vue
View File

@@ -46,7 +46,7 @@
<div v-if="element.edit" class="choice-option-radio-btn"> <div v-if="element.edit" class="choice-option-radio-btn">
<a-checkbox <a-checkbox
:checked="Boolean(element.is_other)" :checked="Boolean(element.is_other)"
class="margin" class="margin custom-checkbox"
@change="otherChange($event, element)" @change="otherChange($event, element)"
><span style="color: #434343" ><span style="color: #434343"
>设为其他项</span >设为其他项</span

2
src/views/planetDesign/Theme/components/ThemeLeft/index.vue
View File

@@ -2,7 +2,7 @@
<div class="theme-left"> <div class="theme-left">
<div class="header"> <div class="header">
<div>问卷皮肤</div> <div>问卷皮肤</div>
<a-checkbox v-model:checked="headerImgInfo.checked" @change="handlerHeaderImg">带头图使用</a-checkbox> <a-checkbox class="custom-checkbox" v-model:checked="headerImgInfo.checked" @change="handlerHeaderImg">带头图使用</a-checkbox>
</div> </div>
<div class="line"></div> <div class="line"></div>
<ul class="theme-ol"> <ul class="theme-ol">

2
src/views/planetDesign/Theme/components/ThemeRight/index.vue
View File

@@ -215,7 +215,7 @@
/> />
</div> </div>
<div v-else @change="handlerStatus(item.key, 'checked-box')"> <div v-else @change="handlerStatus(item.key, 'checked-box')">
<a-checkbox v-model:checked="item.checked">{{ item.label }}</a-checkbox> <a-checkbox class="custom-checkbox" v-model:checked="item.checked">{{ item.label }}</a-checkbox>
</div> </div>
</div> </div>
</div> </div>

1
src/views/planetDesign/redpacket/addset.vue
View File

@@ -32,6 +32,7 @@
:disabled="route.query.start=='2'">同一用户只允许抽奖一次</a-checkbox> :disabled="route.query.start=='2'">同一用户只允许抽奖一次</a-checkbox>
<br /> --> <br /> -->
<a-checkbox <a-checkbox
class="custom-checkbox"
v-model:checked="checked1" v-model:checked="checked1"
@change="changecheckbox()" @change="changecheckbox()"
:disabled="route.query.start == '2'" :disabled="route.query.start == '2'"