hookehuyr

✨ feat(按钮组件): 细节调整

...@@ -53,7 +53,7 @@ export default { ...@@ -53,7 +53,7 @@ export default {
53 background: @base; 53 background: @base;
54 border-radius: 24px; 54 border-radius: 24px;
55 border: 1px solid @base; 55 border: 1px solid @base;
56 - color: #0B3A72; 56 + color: #713610;
57 font-weight: bold; 57 font-weight: bold;
58 } 58 }
59 .button-plain { 59 .button-plain {
...@@ -65,8 +65,8 @@ export default { ...@@ -65,8 +65,8 @@ export default {
65 font-size: 1rem; 65 font-size: 1rem;
66 background: #FFFFFF; 66 background: #FFFFFF;
67 border-radius: 24px; 67 border-radius: 24px;
68 - border: 1px solid #0B3A72; 68 + border: 1px solid #713610;
69 - color: #0B3A72; 69 + color: #713610;
70 font-weight: bold; 70 font-weight: bold;
71 } 71 }
72 .button-custom { 72 .button-custom {
......
...@@ -83,10 +83,10 @@ ...@@ -83,10 +83,10 @@
83 <span style="font-size: 0.85rem;">订阅</span> 83 <span style="font-size: 0.85rem;">订阅</span>
84 </div> 84 </div>
85 <div class="button"> 85 <div class="button">
86 - <my-button @on-click="payFor" type="custom" :custom-style="styleObject1">爱心捐书</my-button> 86 + <my-button @on-click="payFor" type="plain">爱心捐书</my-button>
87 </div> 87 </div>
88 <div class="button"> 88 <div class="button">
89 - <my-button @on-click="uploadVideo" type="custom" :custom-style="styleObject2">上传作品</my-button> 89 + <my-button @on-click="uploadVideo" type="primary">上传作品</my-button>
90 </div> 90 </div>
91 </div> 91 </div>
92 <to-me @on-click="gotoMe()"></to-me> 92 <to-me @on-click="gotoMe()"></to-me>
...@@ -116,18 +116,6 @@ import { Toast } from 'vant'; ...@@ -116,18 +116,6 @@ import { Toast } from 'vant';
116 const $route = useRoute(); 116 const $route = useRoute();
117 const $router = useRouter(); 117 const $router = useRouter();
118 118
119 -// 自定义按钮颜色样式
120 -const styleObject1 = reactive({
121 - backgroundColor: '#FFFFFF',
122 - color: '#713610',
123 - borderColor: '#713610'
124 -})
125 -const styleObject2 = reactive({
126 - backgroundColor: '#F9D95C',
127 - color: '#713610',
128 - borderColor: '#F9D95C'
129 -})
130 -
131 const items = reactive([]) 119 const items = reactive([])
132 120
133 const gotoMe = () => { 121 const gotoMe = () => {
......
...@@ -7,10 +7,12 @@ ...@@ -7,10 +7,12 @@
7 <p style="color: #B8B8B8; margin: 1rem; margin-bottom: 0;">请选择您的身份</p> 7 <p style="color: #B8B8B8; margin: 1rem; margin-bottom: 0;">请选择您的身份</p>
8 <div class="control"> 8 <div class="control">
9 <div class="plain"> 9 <div class="plain">
10 - <my-button type="plain" @on-click="goVisit">访客</my-button> 10 + <!-- <my-button type="plain" @on-click="goVisit">访客</my-button> -->
11 + <my-button type="custom" :custom-style="styleObject1" @on-click="goVisit">访客</my-button>
11 </div> 12 </div>
12 <div class="primary"> 13 <div class="primary">
13 - <my-button type="primary" @on-click="goSchool">我有所属幼儿园</my-button> 14 + <!-- <my-button type="primary" @on-click="goSchool">我有所属幼儿园</my-button> -->
15 + <my-button type="custom" :custom-style="styleObject2" @on-click="goSchool">我有所属幼儿园</my-button>
14 </div> 16 </div>
15 </div> 17 </div>
16 </div> 18 </div>
...@@ -22,10 +24,22 @@ import MyButton from '@/components/MyButton/index.vue' ...@@ -22,10 +24,22 @@ import MyButton from '@/components/MyButton/index.vue'
22 import $ from 'jquery'; 24 import $ from 'jquery';
23 import { useRoute, useRouter } from 'vue-router' 25 import { useRoute, useRouter } from 'vue-router'
24 import { Toast } from 'vant'; 26 import { Toast } from 'vant';
25 -import { nextTick, onMounted } from 'vue' 27 +import { nextTick, onMounted, reactive } from 'vue'
26 const $route = useRoute(); 28 const $route = useRoute();
27 const $router = useRouter(); 29 const $router = useRouter();
28 30
31 +// 自定义按钮颜色样式
32 +const styleObject1 = reactive({
33 + backgroundColor: '#FFFFFF',
34 + color: '#0B3A72',
35 + borderColor: '#0B3A72'
36 +})
37 +const styleObject2 = reactive({
38 + backgroundColor: '#F9D95C',
39 + color: '#0B3A72',
40 + borderColor: '#F9D95C'
41 +})
42 +
29 const goVisit = () => { // 跳转爱心书籍页面 43 const goVisit = () => { // 跳转爱心书籍页面
30 $router.push({ 44 $router.push({
31 path: '/client/chooseBook' 45 path: '/client/chooseBook'
...@@ -83,7 +97,8 @@ export default { ...@@ -83,7 +97,8 @@ export default {
83 margin-top: 0.5rem; 97 margin-top: 0.5rem;
84 overflow: auto; 98 overflow: auto;
85 .plain { 99 .plain {
86 - width: 30%; float: left; 100 + width: 29%; float: left;
101 + margin-right: 1%;
87 } 102 }
88 .primary { 103 .primary {
89 width: 70%; float: left; 104 width: 70%; float: left;
......