李志伟 3 anos atrás
pai
commit
bb8c8f8576

+ 2
- 2
src/components/MyButton/index.jsx Ver arquivo

@@ -1,7 +1,7 @@
1
-import { View } from "@tarojs/components"
1
+import { View,Button } from "@tarojs/components"
2 2
 import './style.less'
3 3
 
4 4
 export default (props) => {
5 5
   const { value, onClick } = props
6
-  return <View className='myBtn' onClick={onClick}>{value}</View>
6
+  return <Button className='myBtn' onClick={onClick}>{value}</Button>
7 7
 }

+ 9
- 13
src/components/MyButton/style.less Ver arquivo

@@ -1,13 +1,9 @@
1
-
2
-  .myBtn{
3
-    height: 94px;
4
-    font-size: 34px;
5
-    font-weight: bold;
6
-    line-height: 94px;
7
-    text-align: center;
8
-    color: #fff;
9
-    background: linear-gradient(0deg, #00AE39,#A0E067);
10
-    border-radius: 49px;
11
-    width: 100%;
12
-    margin: 25px 0 18px;
13
-  }
1
+.myBtn{
2
+  font-size: 34px;
3
+  font-weight: bold;
4
+  line-height: 94px;
5
+  color: #fff;
6
+  background: linear-gradient(0deg, #00AE39,#A0E067);
7
+  border-radius: 49px;
8
+  margin: 25px 0 18px;
9
+}

+ 4
- 4
src/pages/index/components/Job/index.jsx Ver arquivo

@@ -19,8 +19,10 @@ export default (props) => {
19 19
   }
20 20
   return (
21 21
     <ScrollView scrollY style={{ height: '100%' }}>
22
-      <MyCard job changeJob={handleChange} />
23
-      <MyCard job changeJob={handleChange} />
22
+      <MyCard job onClick={handleChange} />
23
+      <MyCard job onClick={handleChange} />
24
+      <MyCard job onClick={handleChange} />
25
+      <MyCard job onClick={handleChange} />
24 26
       <Popup
25 27
         show={show}
26 28
         onClose={onClose}
@@ -31,8 +33,6 @@ export default (props) => {
31 33
         <View>河南省南阳市邓州市孟楼镇</View>
32 34
         <Button className='btn' onClick={handleOk}>确认</Button>
33 35
       </Popup>
34
-      <MyCard job onClick={handleChange} />
35
-      <MyCard job onClick={handleChange} />
36 36
     </ScrollView>
37 37
   )
38 38
 }

+ 1
- 1
src/pages/index/components/Job/style.less Ver arquivo

@@ -17,7 +17,7 @@
17 17
   .btn{
18 18
     width: 200px;
19 19
     height: 88px;
20
-    background: linear-gradient(0deg, #A0E067, #00AE39);
20
+    background: linear-gradient(0deg, #00AE39, #A0E067);
21 21
     border-radius: 34px;
22 22
     font-size: 32px;
23 23
     color: #FFFFFF;  

+ 2
- 2
src/pages/login/index.jsx Ver arquivo

@@ -1,6 +1,6 @@
1 1
 import Taro from "@tarojs/taro"
2 2
 import { useState } from "react"
3
-import { View, Image, Input, Text, Checkbox, Label } from "@tarojs/components"
3
+import { View, Image, Input, Text, Checkbox, Label, Button } from "@tarojs/components"
4 4
 import CustomNav from "@/components/CustomNav"
5 5
 import MyButton from "@/components/MyButton"
6 6
 import bgi from '@/assets/login/loginImg.png'
@@ -92,7 +92,7 @@ export default (props) => {
92 92
         <View className='loginCell'>
93 93
           <View className='loginHeader'>+86</View>
94 94
           <Input type='number' maxlength='11' placeholder='请输入手机号' value={phone} onBlur={handlePhone} />
95
-          <View  className={['loginAction',dsb?'qCodeActive':'']} onClick={dsb?'':changeqCode}>{qCodeBtn}</View>
95
+          <Button  className={['loginAction',dsb?'qCodeActive':'']} disabled={dsb} onClick={dsb?'':changeqCode}>{qCodeBtn}</Button>
96 96
         </View>
97 97
         <View className='loginCell'>
98 98
           <View className='loginHeader'>

+ 1
- 4
src/pages/login/style.less Ver arquivo

@@ -39,15 +39,12 @@
39 39
       }
40 40
     }
41 41
     .loginAction{
42
-      width: 8em;
43
-      height: 68px;
42
+      width: 9em;
44 43
       background: linear-gradient(0deg, #00AE39,#A0E067);
45 44
       border-radius: 20px;
46 45
       line-height: 68px;
47
-      text-align: center;
48 46
       color: #fff;
49 47
       font-size: 30px;
50
-      font-weight: bold
51 48
     }
52 49
     .qCodeActive{
53 50
       opacity: 0.5;