Hooke / tswj

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
7941d2aa 1 parent 00534532

🌈 style: 主基调颜色调整

Inline Side-by-side
Showing 22 changed files with 122 additions and 74 deletions
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: hookehuyr hookehuyr@gmail.com 2 * @Author: hookehuyr hookehuyr@gmail.com
3 * @Date: 2022-05-26 23:52:36 3 * @Date: 2022-05-26 23:52:36
4 * @LastEditors: hookehuyr hookehuyr@gmail.com 4 * @LastEditors: hookehuyr hookehuyr@gmail.com
5 - * @LastEditTime: 2022-06-01 17:39:48 5 + * @LastEditTime: 2022-06-02 21:31:28
6 * @FilePath: /tswj/src/App.vue 6 * @FilePath: /tswj/src/App.vue
7 * @Description: 7 * @Description:
8 --> 8 -->
...@@ -54,10 +54,10 @@ body { ...@@ -54,10 +54,10 @@ body {
54 54
55 body { 55 body {
56 position: relative; 56 position: relative;
57 - /* --van-white: #fff; 57 + // --van-white: #fff;
58 - --van-blue: #1989fa; 58 + // --van-blue: #1989fa;
59 - --van-button-primary-color: var(--van-white); 59 + // --van-button-primary-color: var(--van-white);
60 - --van-button-primary-background: var(--van-primary-color); */ 60 + // --van-button-primary-background: var(--van-primary-color);
61 /* 全局修改主色调 */ 61 /* 全局修改主色调 */
62 // --van-blue: #F9D95C; 62 // --van-blue: #F9D95C;
63 63
......
...@@ -3,4 +3,6 @@ ...@@ -3,4 +3,6 @@
3 /* ============ 颜色 ============ */ 3 /* ============ 颜色 ============ */
4 4
5 // 主色调 5 // 主色调
6 -@base-color: #F9EA57; 6 +@base-color: #11D2B1;
7 +// 文字颜色
8 +@base-font-color: #FFFFFF;
......
...@@ -41,15 +41,15 @@ ...@@ -41,15 +41,15 @@
41 </div> 41 </div>
42 </div> 42 </div>
43 </div> 43 </div>
44 - <div v-if="status === 'PENDING'" class="van-hairline--top" style="padding: 0 1rem;"> 44 + <div v-if="status === 'PENDING'" class="van-hairline--top book-handle">
45 <van-row> 45 <van-row>
46 <van-col offset="3" style="padding: 1rem;" @click="onRefuse()"> 46 <van-col offset="3" style="padding: 1rem;" @click="onRefuse()">
47 - <div style="background: #B4B4B3; border-radius: 15px; color: #FFFFFF; padding: 0.25rem 0.8rem;"> 47 + <div class="disagree-btn">
48 <van-icon name="close" />&nbsp;不通过 48 <van-icon name="close" />&nbsp;不通过
49 </div> 49 </div>
50 </van-col> 50 </van-col>
51 <van-col style="padding: 1rem;" @click="onPass()"> 51 <van-col style="padding: 1rem;" @click="onPass()">
52 - <div style="background: #F9D95C; border-radius: 15px; color: #713610; padding: 0.25rem 1.5rem;"> 52 + <div class="agree-btn" style="">
53 <van-icon name="passed" />&nbsp;通过 53 <van-icon name="passed" />&nbsp;通过
54 </div> 54 </div>
55 </van-col> 55 </van-col>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
78 </div> 78 </div>
79 </van-overlay> 79 </van-overlay>
80 80
81 - <van-dialog v-model:show="show" title="温馨提示" show-cancel-button confirmButtonColor="#F9D95C" @confirm="handleAudit('enable')" @cancel="onCancel"> 81 + <van-dialog v-model:show="show" title="温馨提示" show-cancel-button :confirmButtonColor="styleColor.baseColor" @confirm="handleAudit('enable')" @cancel="onCancel">
82 <div style="padding: 1rem; text-align: center;">是否确认审核通过该视频 ？</div> 82 <div style="padding: 1rem; text-align: center;">是否确认审核通过该视频 ？</div>
83 </van-dialog> 83 </van-dialog>
84 </template> 84 </template>
...@@ -98,6 +98,7 @@ import MuiPlayer from 'mui-player' ...@@ -98,6 +98,7 @@ import MuiPlayer from 'mui-player'
98 import axios from '@/utils/axios'; 98 import axios from '@/utils/axios';
99 import _ from 'lodash'; 99 import _ from 'lodash';
100 import tools from '@/common/tool' 100 import tools from '@/common/tool'
101 +import { styleColor } from '@/constant.js';
101 102
102 import { useRoute, useRouter } from 'vue-router' 103 import { useRoute, useRouter } from 'vue-router'
103 import { Toast } from 'vant'; 104 import { Toast } from 'vant';
...@@ -259,6 +260,21 @@ export default { ...@@ -259,6 +260,21 @@ export default {
259 font-size: 1rem; 260 font-size: 1rem;
260 } 261 }
261 } 262 }
263 + .book-handle {
264 + padding: 0 1rem;
265 + .disagree-btn {
266 + background: #B4B4B3;
267 + border-radius: 15px;
268 + color: #FFFFFF;
269 + padding: 0.25rem 0.8rem;
270 + }
271 + .agree-btn {
272 + background: @base-color;
273 + border-radius: 15px;
274 + color: @base-font-color;
275 + padding: 0.25rem 1.5rem;
276 + }
277 + }
262 } 278 }
263 279
264 .wrapper { 280 .wrapper {
......
...@@ -107,7 +107,7 @@ export default { ...@@ -107,7 +107,7 @@ export default {
107 } 107 }
108 108
109 .upload { 109 .upload {
110 - color: #713610; 110 + color: @base-font-color;
111 background-color: @base-color; 111 background-color: @base-color;
112 border-radius: 15px; 112 border-radius: 15px;
113 width: 4rem; 113 width: 4rem;
......
...@@ -131,7 +131,7 @@ export default { ...@@ -131,7 +131,7 @@ export default {
131 background: @base-color; 131 background: @base-color;
132 border-radius: 24px; 132 border-radius: 24px;
133 border: 1px solid @base-color; 133 border: 1px solid @base-color;
134 - color: #713610; 134 + color: @base-font-color;
135 font-weight: bold; 135 font-weight: bold;
136 margin-left: 1rem; 136 margin-left: 1rem;
137 margin-bottom: 1rem; 137 margin-bottom: 1rem;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: hookehuyr hookehuyr@gmail.com 2 * @Author: hookehuyr hookehuyr@gmail.com
3 * @Date: 2022-05-31 18:32:38 3 * @Date: 2022-05-31 18:32:38
4 * @LastEditors: hookehuyr hookehuyr@gmail.com 4 * @LastEditors: hookehuyr hookehuyr@gmail.com
5 - * @LastEditTime: 2022-06-01 19:17:16 5 + * @LastEditTime: 2022-06-02 21:15:28
6 * @FilePath: /tswj/src/components/DonateBar/index.vue 6 * @FilePath: /tswj/src/components/DonateBar/index.vue
7 * @Description: 爱心助力底部固定栏 7 * @Description: 爱心助力底部固定栏
8 --> 8 -->
...@@ -81,7 +81,7 @@ const closeDonate = (v) => { ...@@ -81,7 +81,7 @@ const closeDonate = (v) => {
81 font-weight: bold; 81 font-weight: bold;
82 border-radius: 24px; 82 border-radius: 24px;
83 // border: 1px solid F7F7F7; 83 // border: 1px solid F7F7F7;
84 - color: #713610; 84 + color: @base-font-color;
85 background-color: @base-color; 85 background-color: @base-color;
86 box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.06); 86 box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.06);
87 } 87 }
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
2 * @Author: hookehuyr hookehuyr@gmail.com 2 * @Author: hookehuyr hookehuyr@gmail.com
3 * @Date: 2022-06-02 11:23:16 3 * @Date: 2022-06-02 11:23:16
4 * @LastEditors: hookehuyr hookehuyr@gmail.com 4 * @LastEditors: hookehuyr hookehuyr@gmail.com
5 - * @LastEditTime: 2022-06-02 20:02:30 5 + * @LastEditTime: 2022-06-02 21:41:36
6 * @FilePath: /tswj/src/components/DonateFlower/agreement.js 6 * @FilePath: /tswj/src/components/DonateFlower/agreement.js
7 * @Description: 7 * @Description:
8 */ 8 */
9 const str = '上海XX益基金会' 9 const str = '上海XX益基金会'
10 const html = ` 10 const html = `
11 - <div style="text-align: center; font-weight: bold; margin-bottom: 1rem; font-size: 1.25rem; color: #713610;"> 11 + <div style="text-align: center; font-weight: bold; margin-bottom: 1rem; font-size: 1.25rem; color: #11D2B1;">
12 捐赠协议 12 捐赠协议
13 </div> 13 </div>
14 <div style="text-align: justify; color: #231815; font-size: 1.05rem;"> 14 <div style="text-align: justify; color: #231815; font-size: 1.05rem;">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: hookehuyr hookehuyr@gmail.com 2 * @Author: hookehuyr hookehuyr@gmail.com
3 * @Date: 2022-05-31 22:09:58 3 * @Date: 2022-05-31 22:09:58
4 * @LastEditors: hookehuyr hookehuyr@gmail.com 4 * @LastEditors: hookehuyr hookehuyr@gmail.com
5 - * @LastEditTime: 2022-06-02 20:04:23 5 + * @LastEditTime: 2022-06-02 21:40:50
6 * @FilePath: /tswj/src/components/DonateFlower/index.vue 6 * @FilePath: /tswj/src/components/DonateFlower/index.vue
7 * @Description: 捐花组件 7 * @Description: 捐花组件
8 --> 8 -->
...@@ -56,14 +56,14 @@ ...@@ -56,14 +56,14 @@
56 </van-col> 56 </van-col>
57 </van-row> 57 </van-row>
58 </div> 58 </div>
59 - <van-row style="margin: 1rem 0;"> 59 + <van-row class="agree-wrapper">
60 <van-col span="12" offset="8"> 60 <van-col span="12" offset="8">
61 - <div style="display: flex;align-items: center; box-sizing: content-box;"> 61 + <div class="agree-content">
62 - <div style="display: flex; flex-direction: column; justify-content: center;"> 62 + <div class="btn">
63 <van-checkbox v-model="agreed" checked-color="#ee0a24">同意&nbsp;</van-checkbox> 63 <van-checkbox v-model="agreed" checked-color="#ee0a24">同意&nbsp;</van-checkbox>
64 </div> 64 </div>
65 - <div style="display: flex; flex-direction: column; justify-content: center;"> 65 + <div class="text">
66 - <span style="text-decoration: underline; color: #713610;" @click="handleDA">捐赠协议</span> 66 + <span @click="handleDA">捐赠协议</span>
67 </div> 67 </div>
68 </div> 68 </div>
69 </van-col> 69 </van-col>
...@@ -219,20 +219,21 @@ const closeDA = () => { ...@@ -219,20 +219,21 @@ const closeDA = () => {
219 219
220 .base-item { 220 .base-item {
221 text-align: center; 221 text-align: center;
222 - color: #713610;
223 padding: 0.5rem 0; 222 padding: 0.5rem 0;
224 } 223 }
225 224
226 .checked-item { 225 .checked-item {
227 - background: #F9EA57; 226 + color: @base-font-color;
227 + background: @base-color;
228 border-radius: 3px; 228 border-radius: 3px;
229 - border: 1px solid #F9EA57; 229 + border: 1px solid @base-color;
230 } 230 }
231 231
232 .uncheck-item { 232 .uncheck-item {
233 - background: #FFFFFF; 233 + color: @base-color;
234 + background: @base-font-color;
234 border-radius: 3px; 235 border-radius: 3px;
235 - border: 1px solid #713610; 236 + border: 1px solid @base-color;
236 } 237 }
237 } 238 }
238 239
...@@ -253,6 +254,21 @@ const closeDA = () => { ...@@ -253,6 +254,21 @@ const closeDA = () => {
253 margin-left: 1rem; 254 margin-left: 1rem;
254 } 255 }
255 } 256 }
257 + .agree-wrapper {
258 + margin: 1rem 0;
259 + .agree-content {
260 + display: flex;align-items: center; box-sizing: content-box;
261 + .btn {
262 + display: flex; flex-direction: column; justify-content: center;
263 + }
264 + .text {
265 + display: flex; flex-direction: column; justify-content: center;
266 + span {
267 + text-decoration: underline; color: #11D2B1;
268 + }
269 + }
270 + }
271 + }
256 272
257 .donate-number { 273 .donate-number {
258 padding: 1rem; 274 padding: 1rem;
...@@ -296,7 +312,7 @@ const closeDA = () => { ...@@ -296,7 +312,7 @@ const closeDA = () => {
296 font-weight: bold; 312 font-weight: bold;
297 border-radius: 24px; 313 border-radius: 24px;
298 // border: 1px solid F7F7F7; 314 // border: 1px solid F7F7F7;
299 - color: #713610; 315 + color: @base-font-color;
300 background-color: @base-color; 316 background-color: @base-color;
301 box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.06); 317 box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.06);
302 } 318 }
......
...@@ -39,6 +39,7 @@ import { ref, onMounted } from 'vue' ...@@ -39,6 +39,7 @@ import { ref, onMounted } from 'vue'
39 import { useRoute, useRouter } from 'vue-router' 39 import { useRoute, useRouter } from 'vue-router'
40 import { useCountDown } from '@vant/use'; 40 import { useCountDown } from '@vant/use';
41 import { wxInfo } from '@/utils/tools'; 41 import { wxInfo } from '@/utils/tools';
42 +import { styleColor } from '@/constant.js';
42 43
43 import { Cookies, $, _, axios, storeToRefs, mainStore, Toast, useTitle } from '@/utils/generatePackage.js' 44 import { Cookies, $, _, axios, storeToRefs, mainStore, Toast, useTitle } from '@/utils/generatePackage.js'
44 //import { } from '@/utils/generateModules.js' 45 //import { } from '@/utils/generateModules.js'
...@@ -71,9 +72,9 @@ defineExpose({ ...@@ -71,9 +72,9 @@ defineExpose({
71 }) 72 })
72 73
73 const themeVars = { 74 const themeVars = {
74 - buttonPrimaryBackground: '#F9D95C', 75 + buttonPrimaryBackground: styleColor.baseColor,
75 - buttonPrimaryBorderColor: '#F9D95C', 76 + buttonPrimaryBorderColor: styleColor.baseColor,
76 - buttonPrimaryColor: '#713610', 77 + buttonPrimaryColor: styleColor.baseFontColor,
77 CellVerticalPadding: '14px' 78 CellVerticalPadding: '14px'
78 }; 79 };
79 80
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: hookehuyr hookehuyr@gmail.com 2 * @Author: hookehuyr hookehuyr@gmail.com
3 * @Date: 2022-04-21 10:04:58 3 * @Date: 2022-04-21 10:04:58
4 * @LastEditors: hookehuyr hookehuyr@gmail.com 4 * @LastEditors: hookehuyr hookehuyr@gmail.com
5 - * @LastEditTime: 2022-06-01 17:07:58 5 + * @LastEditTime: 2022-06-02 21:18:10
6 * @FilePath: /tswj/src/components/MyButton/index.vue 6 * @FilePath: /tswj/src/components/MyButton/index.vue
7 * @Description: 7 * @Description:
8 --> 8 -->
...@@ -64,7 +64,7 @@ export default { ...@@ -64,7 +64,7 @@ export default {
64 background: @base-color; 64 background: @base-color;
65 border-radius: 24px; 65 border-radius: 24px;
66 border: 1px solid @base-color; 66 border: 1px solid @base-color;
67 - color: #713610; 67 + color: @base-font-color;
68 font-weight: bold; 68 font-weight: bold;
69 } 69 }
70 .button-plain { 70 .button-plain {
...@@ -74,10 +74,10 @@ export default { ...@@ -74,10 +74,10 @@ export default {
74 padding: 0.6rem; 74 padding: 0.6rem;
75 margin: 0.5rem; 75 margin: 0.5rem;
76 font-size: 1rem; 76 font-size: 1rem;
77 - background: #FFFFFF; 77 + background: @base-font-color;
78 border-radius: 24px; 78 border-radius: 24px;
79 - border: 1px solid #713610; 79 + border: 1px solid @base-color;
80 - color: #713610; 80 + color: @base-color;
81 font-weight: bold; 81 font-weight: bold;
82 } 82 }
83 .button-custom { 83 .button-custom {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: hookehuyr hookehuyr@gmail.com 2 * @Author: hookehuyr hookehuyr@gmail.com
3 * @Date: 2022-05-25 18:34:17 3 * @Date: 2022-05-25 18:34:17
4 * @LastEditors: hookehuyr hookehuyr@gmail.com 4 * @LastEditors: hookehuyr hookehuyr@gmail.com
5 - * @LastEditTime: 2022-05-31 14:28:40 5 + * @LastEditTime: 2022-06-02 21:14:14
6 * @FilePath: /tswj/src/constant.js 6 * @FilePath: /tswj/src/constant.js
7 * @Description: 7 * @Description:
8 */ 8 */
...@@ -14,5 +14,6 @@ export const JSJ_FORM_B = 'https://jsj.onwall.cn/f/g7D0MT'; ...@@ -14,5 +14,6 @@ export const JSJ_FORM_B = 'https://jsj.onwall.cn/f/g7D0MT';
14 14
15 // 颜色变量 15 // 颜色变量
16 export const styleColor = { 16 export const styleColor = {
17 - baseColor: '#F9EA57' 17 + baseColor: '#11D2B1',
18 + baseFontColor: '#FFFFFF'
18 } 19 }
......
...@@ -2,45 +2,51 @@ ...@@ -2,45 +2,51 @@
2 * @Author: hookehuyr hookehuyr@gmail.com 2 * @Author: hookehuyr hookehuyr@gmail.com
3 * @Date: 2022-05-26 10:08:06 3 * @Date: 2022-05-26 10:08:06
4 * @LastEditors: hookehuyr hookehuyr@gmail.com 4 * @LastEditors: hookehuyr hookehuyr@gmail.com
5 - * @LastEditTime: 2022-05-31 14:28:12 5 + * @LastEditTime: 2022-06-02 21:50:17
6 * @FilePath: /tswj/src/settings/designSetting.js 6 * @FilePath: /tswj/src/settings/designSetting.js
7 - * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE 7 + * @Description:
8 */ 8 */
9 import { ref } from 'vue'; 9 import { ref } from 'vue';
10 import { styleColor } from '@/constant.js'; 10 import { styleColor } from '@/constant.js';
11 11
12 export const styleObject1 = ref({ 12 export const styleObject1 = ref({
13 - backgroundColor: '#FFFFFF', 13 + backgroundColor: styleColor.baseFontColor,
14 - color: '#0B3A72', 14 + color: styleColor.baseColor,
15 - borderColor: '#0B3A72' 15 + borderColor: styleColor.baseColor
16 }) 16 })
17 17
18 export const styleObject2 = ref({ 18 export const styleObject2 = ref({
19 backgroundColor: styleColor.baseColor, 19 backgroundColor: styleColor.baseColor,
20 - color: '#0B3A72', 20 + color: styleColor.baseFontColor,
21 borderColor: styleColor.baseColor 21 borderColor: styleColor.baseColor
22 }) 22 })
23 23
24 export const styleObject3 = ref({ 24 export const styleObject3 = ref({
25 backgroundColor: '#F4675A', 25 backgroundColor: '#F4675A',
26 - color: '#FFFFFF', 26 + color: styleColor.baseFontColor,
27 borderColor: '#F4675A' 27 borderColor: '#F4675A'
28 }) 28 })
29 29
30 export const styleObject4 = ref({ 30 export const styleObject4 = ref({
31 - backgroundColor: '#FFFFFF', 31 + backgroundColor: styleColor.baseFontColor,
32 color: '#713610', 32 color: '#713610',
33 borderColor: '#713610' 33 borderColor: '#713610'
34 }) 34 })
35 35
36 export const styleObject5 = ref({ 36 export const styleObject5 = ref({
37 - backgroundColor: '#FFFFFF', 37 + backgroundColor: styleColor.baseFontColor,
38 color: '#FDD347', 38 color: '#FDD347',
39 borderColor: '#FDD347' 39 borderColor: '#FDD347'
40 }) 40 })
41 41
42 export const styleObject6 = ref({ 42 export const styleObject6 = ref({
43 - backgroundColor: '#FFFFFF', 43 + backgroundColor: styleColor.baseFontColor,
44 color: '#777777', 44 color: '#777777',
45 borderColor: '#777777' 45 borderColor: '#777777'
46 }) 46 })
47 +
48 +export const styleObject7 = ref({
49 + backgroundColor: styleColor.baseFontColor,
50 + color: '#0B3A72',
51 + borderColor: '#0B3A72'
52 +})
......
1 <template> 1 <template>
2 <div class=""> 2 <div class="">
3 - <van-tabs v-model:active="active" sticky @click-tab="onClickTab" color="#F9D95C" background="#F7F7F7" 3 + <van-tabs v-model:active="active" sticky @click-tab="onClickTab" :color="styleColor.baseColor" background="#F7F7F7"
4 title-active-color="#222222" title-inactive-color="#777777"> 4 title-active-color="#222222" title-inactive-color="#777777">
5 <van-tab title="待审核" :badge="prod_num" :title-style="titleStyle"> 5 <van-tab title="待审核" :badge="prod_num" :title-style="titleStyle">
6 <template v-if="!active"> 6 <template v-if="!active">
...@@ -38,6 +38,7 @@ import { useRoute, useRouter } from 'vue-router' ...@@ -38,6 +38,7 @@ import { useRoute, useRouter } from 'vue-router'
38 import axios from '@/utils/axios'; 38 import axios from '@/utils/axios';
39 import _ from 'lodash' 39 import _ from 'lodash'
40 import { Toast } from 'vant'; 40 import { Toast } from 'vant';
41 +import { styleColor } from '@/constant.js';
41 42
42 const titleStyle = { 43 const titleStyle = {
43 fontSize: '1rem' 44 fontSize: '1rem'
......
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
53 <script setup> 53 <script setup>
54 import Cookies from 'js-cookie' 54 import Cookies from 'js-cookie'
55 import ImageSliderVerify from '@/components/ImageSliderVerify/index.vue' 55 import ImageSliderVerify from '@/components/ImageSliderVerify/index.vue'
56 +import { styleColor } from '@/constant.js';
56 57
57 import { ref, onMounted } from 'vue'; 58 import { ref, onMounted } from 'vue';
58 import { Toast } from 'vant' 59 import { Toast } from 'vant'
...@@ -227,9 +228,9 @@ const onSubmit = (values) => { ...@@ -227,9 +228,9 @@ const onSubmit = (values) => {
227 }; 228 };
228 229
229 const themeVars = { 230 const themeVars = {
230 - buttonPrimaryBackground: '#F9D95C', 231 + buttonPrimaryBackground: styleColor.baseColor,
231 - buttonPrimaryBorderColor: '#F9D95C', 232 + buttonPrimaryBorderColor: styleColor.baseColor,
232 - buttonPrimaryColor: '#713610', 233 + buttonPrimaryColor: styleColor.baseFontColor,
233 CellVerticalPadding: '14px' 234 CellVerticalPadding: '14px'
234 }; 235 };
235 236
...@@ -274,7 +275,7 @@ body { ...@@ -274,7 +275,7 @@ body {
274 margin: 16px; 275 margin: 16px;
275 background-color: @base-color; 276 background-color: @base-color;
276 text-align: center; 277 text-align: center;
277 - color: #713610; 278 + color: @base-font-color;
278 font-size: 2.25vh; 279 font-size: 2.25vh;
279 padding: 1.5vh; 280 padding: 1.5vh;
280 border-radius: 5px; 281 border-radius: 5px;
......
1 <template> 1 <template>
2 - <div style="background: linear-gradient(310deg, #FDD347 0%, #FFED6D 100%); padding: 1rem; text-align: center;"> 2 + <div style="background: #CFF; padding: 1rem; text-align: center;">
3 <van-image v-if="myKgInfo.logo" round width="4rem" height="4rem" :src="myKgInfo.logo" /> 3 <van-image v-if="myKgInfo.logo" round width="4rem" height="4rem" :src="myKgInfo.logo" />
4 <van-image v-else round width="4rem" height="4rem" :src="icon_avatar" /> 4 <van-image v-else round width="4rem" height="4rem" :src="icon_avatar" />
5 <p style="margin-top: 1rem; font-size: 1.05rem; font-weight: bold;">{{ myKgInfo.name }}</p> 5 <p style="margin-top: 1rem; font-size: 1.05rem; font-weight: bold;">{{ myKgInfo.name }}</p>
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
26 <van-row> 26 <van-row>
27 <van-col span="12"> 27 <van-col span="12">
28 <span class="bg-gradient">作品演绎</span> 28 <span class="bg-gradient">作品演绎</span>
29 - <!-- <div style="background-color: #F9D95C; width: 70px; height: 4px;"></div> -->
30 </van-col> 29 </van-col>
31 <van-col span="12"> 30 <van-col span="12">
32 <div style="font-size: 1rem; color: #999999; text-align: right;"> 31 <div style="font-size: 1rem; color: #999999; text-align: right;">
...@@ -377,7 +376,7 @@ const goToDetail = (v) => { // 跳转作品详情页 ...@@ -377,7 +376,7 @@ const goToDetail = (v) => { // 跳转作品详情页
377 border-radius: 15px; 376 border-radius: 15px;
378 padding: 0.5rem; 377 padding: 0.5rem;
379 text-align: center; 378 text-align: center;
380 - color: #222222; 379 + color: @base-font-color;
381 margin: 0 0.25rem; 380 margin: 0 0.25rem;
382 } 381 }
383 382
......
...@@ -161,7 +161,8 @@ onBeforeRouteLeave(() => { ...@@ -161,7 +161,8 @@ onBeforeRouteLeave(() => {
161 .person-index-page { 161 .person-index-page {
162 .header-wrapper { 162 .header-wrapper {
163 // background: linear-gradient(310deg, #FDD347 0%, #FFED6D 100%); 163 // background: linear-gradient(310deg, #FDD347 0%, #FFED6D 100%);
164 - background: @base-color; 164 + // background: @base-color;
165 + background: #CFF;
165 166
166 .info { 167 .info {
167 padding: 2rem; 168 padding: 2rem;
...@@ -180,10 +181,10 @@ onBeforeRouteLeave(() => { ...@@ -180,10 +181,10 @@ onBeforeRouteLeave(() => {
180 .toggle-user { 181 .toggle-user {
181 float: right; 182 float: right;
182 font-size: 0.8rem; 183 font-size: 0.8rem;
183 - background-color: white; 184 + background-color: @base-font-color;
184 border-radius: 15px; 185 border-radius: 15px;
185 padding: 5px 10px; 186 padding: 5px 10px;
186 - color: #713610; 187 + color: @base-color;
187 } 188 }
188 } 189 }
189 190
......
...@@ -317,7 +317,7 @@ onMounted(() => { ...@@ -317,7 +317,7 @@ onMounted(() => {
317 font-weight: bold; 317 font-weight: bold;
318 border-radius: 24px; 318 border-radius: 24px;
319 // border: 1px solid F7F7F7; 319 // border: 1px solid F7F7F7;
320 - color: #713610; 320 + color: @base-font-color;
321 background-color: @base-color; 321 background-color: @base-color;
322 box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.06); 322 box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.06);
323 } 323 }
......
...@@ -116,7 +116,8 @@ watch(show, (v) => { ...@@ -116,7 +116,8 @@ watch(show, (v) => {
116 <style lang="less" scoped> 116 <style lang="less" scoped>
117 .donate-list-page { 117 .donate-list-page {
118 .donate-header { 118 .donate-header {
119 - background: linear-gradient(310deg, #FDD347 0%, #FFED6D 100%); 119 + // background: linear-gradient(310deg, #FDD347 0%, #FFED6D 100%);
120 + background: #CFF;
120 padding: 1rem; 121 padding: 1rem;
121 text-align: center; 122 text-align: center;
122 color: #713610; 123 color: #713610;
......
...@@ -43,6 +43,7 @@ import { useRoute, useRouter } from 'vue-router' ...@@ -43,6 +43,7 @@ import { useRoute, useRouter } from 'vue-router'
43 import axios from '@/utils/axios'; 43 import axios from '@/utils/axios';
44 import { Toast } from 'vant'; 44 import { Toast } from 'vant';
45 import _ from 'lodash' 45 import _ from 'lodash'
46 +import { styleColor } from '@/constant.js';
46 47
47 const { lock_btn, fileList, upload_image, metaId, afterRead, beforeDelete } = useUpload(); // 上传图片模块 48 const { lock_btn, fileList, upload_image, metaId, afterRead, beforeDelete } = useUpload(); // 上传图片模块
48 49
...@@ -51,9 +52,9 @@ const $router = useRouter(); ...@@ -51,9 +52,9 @@ const $router = useRouter();
51 52
52 // 自定义修改组件样式 53 // 自定义修改组件样式
53 const themeVars = { 54 const themeVars = {
54 - buttonPrimaryBackground: '#F9D95C', 55 + buttonPrimaryBackground: styleColor.baseColor,
55 - buttonPrimaryBorderColor: '#F9D95C', 56 + buttonPrimaryBorderColor: styleColor.baseColor,
56 - buttonPrimaryColor: '#713610', 57 + buttonPrimaryColor: styleColor.baseFontColor,
57 }; 58 };
58 59
59 // 编辑状态 60 // 编辑状态
...@@ -174,7 +175,7 @@ export default { ...@@ -174,7 +175,7 @@ export default {
174 .add-user-page { 175 .add-user-page {
175 padding: 1rem; 176 padding: 1rem;
176 .title { 177 .title {
177 - color: #713610; 178 + color: @base-color;
178 font-size: 1.25rem; 179 font-size: 1.25rem;
179 padding: 1rem; 180 padding: 1rem;
180 text-align: center; 181 text-align: center;
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 <my-button v-else type="custom" :custom-style="styleObject5">已认证</my-button> 53 <my-button v-else type="custom" :custom-style="styleObject5">已认证</my-button>
54 </div> 54 </div>
55 <div> 55 <div>
56 - <my-button v-if="userInfo.status === 'enable'" type="custom" :custom-style="styleObject1" 56 + <my-button v-if="userInfo.status === 'enable'" type="custom" :custom-style="styleObject7"
57 @on-click="handleUser('ADD')">新增儿童</my-button> 57 @on-click="handleUser('ADD')">新增儿童</my-button>
58 <my-button v-else type="custom" :custom-style="styleObject6" @on-click="showNotice = true">新增儿童</my-button> 58 <my-button v-else type="custom" :custom-style="styleObject6" @on-click="showNotice = true">新增儿童</my-button>
59 </div> 59 </div>
...@@ -95,7 +95,7 @@ import { icon_avatar } from '@/utils/generateIcons.js' ...@@ -95,7 +95,7 @@ import { icon_avatar } from '@/utils/generateIcons.js'
95 import { changePerformerAPI, myInfoAPI, myPerformerAPI } from '@/api/C/me.js' 95 import { changePerformerAPI, myInfoAPI, myPerformerAPI } from '@/api/C/me.js'
96 import meRoute from '@/router/routes/modules/me' 96 import meRoute from '@/router/routes/modules/me'
97 // 自定义按钮颜色样式 97 // 自定义按钮颜色样式
98 -import { styleObject1, styleObject4, styleObject5, styleObject6 } from '@/settings/designSetting.js' 98 +import { styleObject7, styleObject4, styleObject5, styleObject6 } from '@/settings/designSetting.js'
99 import { useGo } from '@/hooks/useGo' 99 import { useGo } from '@/hooks/useGo'
100 import { killPages } from '@/hooks/useKeepAlive' 100 import { killPages } from '@/hooks/useKeepAlive'
101 101
...@@ -192,7 +192,8 @@ const handleUser = (type) => { ...@@ -192,7 +192,8 @@ const handleUser = (type) => {
192 <style lang="less" scoped> 192 <style lang="less" scoped>
193 .me-index-page { 193 .me-index-page {
194 .header-wrapper { 194 .header-wrapper {
195 - background: linear-gradient(310deg, #FDD347 0%, #FFED6D 100%); 195 + // background: linear-gradient(310deg, #FDD347 0%, #FFED6D 100%);
196 + background: #CFF;
196 197
197 .info { 198 .info {
198 padding: 2rem; 199 padding: 2rem;
...@@ -211,10 +212,10 @@ const handleUser = (type) => { ...@@ -211,10 +212,10 @@ const handleUser = (type) => {
211 .toggle-user { 212 .toggle-user {
212 float: right; 213 float: right;
213 font-size: 0.8rem; 214 font-size: 0.8rem;
214 - background-color: white; 215 + background-color: @base-font-color;
215 border-radius: 15px; 216 border-radius: 15px;
216 padding: 5px 10px; 217 padding: 5px 10px;
217 - color: #713610; 218 + color: @base-color;
218 } 219 }
219 } 220 }
220 221
......
...@@ -47,13 +47,14 @@ import { ref, onMounted, nextTick } from 'vue' ...@@ -47,13 +47,14 @@ import { ref, onMounted, nextTick } from 'vue'
47 import { useRouter } from 'vue-router' 47 import { useRouter } from 'vue-router'
48 import axios from '@/utils/axios'; 48 import axios from '@/utils/axios';
49 import { Toast } from 'vant'; 49 import { Toast } from 'vant';
50 +import { styleColor } from '@/constant.js';
50 51
51 const $router = useRouter(); 52 const $router = useRouter();
52 53
53 const themeVars = { 54 const themeVars = {
54 - buttonPrimaryBackground: '#F9D95C', 55 + buttonPrimaryBackground: styleColor.baseColor,
55 - buttonPrimaryBorderColor: '#F9D95C', 56 + buttonPrimaryBorderColor: styleColor.baseColor,
56 - buttonPrimaryColor: '#713610', 57 + buttonPrimaryColor: styleColor.baseFontColor,
57 }; 58 };
58 59
59 /******************** 输入框控件 START ********************/ 60 /******************** 输入框控件 START ********************/
...@@ -218,7 +219,7 @@ export default { ...@@ -218,7 +219,7 @@ export default {
218 .verify-user-page { 219 .verify-user-page {
219 padding: 1rem; 220 padding: 1rem;
220 .title { 221 .title {
221 - color: #713610; 222 + color: @base-color;
222 font-size: 1.25rem; 223 font-size: 1.25rem;
223 padding: 1rem; 224 padding: 1rem;
224 text-align: center; 225 text-align: center;
......