李志伟 3 anos atrás
pai
commit
3cc42f5738

BIN
src/assets/icons/GuideCheck/Pay_logo.png Ver arquivo


BIN
src/assets/icons/housemantj/pay.png Ver arquivo


+ 1
- 1
src/components/BossCard/index.jsx Ver arquivo

@@ -1,6 +1,6 @@
1 1
 import Taro from '@tarojs/taro'
2 2
 import { View, Text } from '@tarojs/components'
3
-import Pay from '@/assets/icons/GuideCheck/Pay_logo.png'
3
+import Pay from '@/assets/icons/housemantj/pay.png'
4 4
 import { getQueryString } from '@/utils/index'
5 5
 import CouponCard from '@/components/CouponCard'
6 6
 import { compressImage } from '@/utils'

+ 1
- 11
src/components/CompoentsOrder/OrderCard/index.jsx Ver arquivo

@@ -9,7 +9,7 @@ import { getQrcode } from '@/services/miniapp'
9 9
 import QRcode from "@/assets/icons/UserCenter/QRcode.png";
10 10
 import refund from "@/assets/icons/GuideCheck/refund.png";
11 11
 import Cancel from "@/assets/icons/UserCenter/Cancel.png";
12
-import Pay from "@/assets/icons/GuideCheck/Pay_logo.png";
12
+import Pay from "@/assets/icons/housemantj/pay.png";
13 13
 import Null from "@/assets/icons/UserCenter/null_logo.png";
14 14
 import Evaluated from "@/assets/icons/UserCenter/evaluated.png";
15 15
 import Refund from "@/assets/icons/UserCenter/Refund.png";
@@ -75,16 +75,6 @@ export default (props) => {
75 75
       url: `/pages/MineUserAll/RefundMoney/CheckRefund/index?id=${item.orderId}`,
76 76
     });
77 77
   };
78
-  // const PayAction =
79
-  //   kkp == '1' ? null ://空卡片用于售后详情页面
80
-  //     sh == '1' ? <Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} /> ://售后页面卡片
81
-  //       item.status === 0 ? <Action.Icon icon={Pay} text='支付' onClick={handleDetail} /> ://待支付
82
-  //         item.status === 1 && item.isVerified == false ? <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} /> ://待核销
83
-  //           item.status === 2 && item.isVerified == false ? <Action.Image image={refund} /> ://已退费
84
-  //             item.status === 7 && item.isVerified == false ? <Action.Image image={Cancel} /> ://已取消
85
-  //               item.status === 9 ? <Action.Image image={Null} /> ://已过期
86
-  //                 item.isVerified == true && item.isEvaluated > 0 ? <Action.Image image={Evaluated} /> ://已评价
87
-  //                   item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : null//待评价
88 78
 
89 79
   let PayAction = null
90 80
   if (kkp == '1') {//空卡片用于售后详情页面

+ 1
- 1
src/components/CouponCard/Action/IconAction.jsx Ver arquivo

@@ -18,7 +18,7 @@ export default (props) => {
18 18
     <View className='cpn-action cpn-icon-action'>
19 19
       <View onClick={handleClick}>
20 20
         <Image src={icon} />
21
-        {text?<Text>{text}</Text>:null}
21
+        {text?<Text style={{color:text=='支付'?'#FC9C57':'#202020'}}>{text}</Text>:null}
22 22
       </View>
23 23
     </View>
24 24
   )

+ 1
- 1
src/hotel/pages/landlord/addRoom/addRoom.jsx Ver arquivo

@@ -41,7 +41,7 @@ export default withLayout((props) => {
41 41
 
42 42
   const onParkMap = () => {
43 43
     Taro.chooseLocation().then((res) => {
44
-      setRoomModel({ ...roomModel, parkingLocation: res.longitude + ',' + res.latitude, pkLocName: res.name, address: res.address })
44
+      setRoomModel({ ...roomModel, parkingLocation: res.longitude + ',' + res.latitude, pkLocName: res.name, parkingAddress: res.address })
45 45
     })
46 46
   }
47 47
   const sumbit = () => {