Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

src/components/CompoentsOrder/OrderCard/index.jsx

@@ -60,17 +60,39 @@ export default (props) => {
       url: `/pages/MineUserAll/RefundMoney/CheckRefund/index?id=${item.orderId}`,
     });
   };
-  const PayAction =
-    kkp == '1' ? null ://空卡片用于售后详情页面
-      sh == '1' ? <Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} /> ://售后页面卡片
-        item.status === 0 ? <Action.Icon icon={Pay} text='支付' onClick={handleDetail} /> ://待支付
-          item.status === 1 && item.isVerified == false ? <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} /> ://待核销
-            item.status === 2 && item.isVerified == false ? <Action.Image image={refund} /> ://已退费
-              item.status === 7 && item.isVerified == false ? <Action.Image image={Cancel} /> ://已取消
-                item.status === 9 ? <Action.Image image={Null} /> ://已过期
-                  item.isVerified == true && item.isEvaluated > 0 ? <Action.Image image={Evaluated} /> ://已评价
-                    item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : null//待评价
+  // const PayAction =
+  //   kkp == '1' ? null ://空卡片用于售后详情页面
+  //     sh == '1' ? <Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} /> ://售后页面卡片
+  //       item.status === 0 ? <Action.Icon icon={Pay} text='支付' onClick={handleDetail} /> ://待支付
+  //         item.status === 1 && item.isVerified == false ? <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} /> ://待核销
+  //           item.status === 2 && item.isVerified == false ? <Action.Image image={refund} /> ://已退费
+  //             item.status === 7 && item.isVerified == false ? <Action.Image image={Cancel} /> ://已取消
+  //               item.status === 9 ? <Action.Image image={Null} /> ://已过期
+  //                 item.isVerified == true && item.isEvaluated > 0 ? <Action.Image image={Evaluated} /> ://已评价
+  //                   item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : null//待评价
 
+  let PayAction=null
+  if (kkp=='1') {//空卡片用于售后详情页面
+    PayAction=null
+  }else if (sh=='1') {//售后页面卡片
+     PayAction=<Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} />
+  }else if (item.status===0) {//待支付
+     PayAction=<Action.Icon icon={Pay} text='支付' onClick={handleDetail} />
+  }else if (item.status === 1 && item.isVerified == false) {//待核销
+     PayAction=<Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} />
+  }else if (item.status === 2 && item.isVerified == false) {//已退费
+     PayAction=<Action.Image image={refund} />
+  }else if (item.status === 7 && item.isVerified == false) {//已取消
+     PayAction=<Action.Image image={Cancel} />
+  }else if(item.status === 9){//已过期
+     PayAction=<Action.Image image={Null} />
+  }else if (item.isVerified == true && item.isEvaluated > 0) {//已评价
+     PayAction=<Action.Image image={Evaluated} />
+  }else if (item.isVerified == true) {//待评价
+     PayAction=<Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} />
+  }else{
+    PayAction=null
+  }
 
   return (
     <>

src/pages/index/tabs/Recommend.jsx

@@ -1,6 +1,5 @@
 import Taro, { useDidShow } from '@tarojs/taro'
 import { React, useState, useEffect, useRef } from 'react'
-import { View } from '@tarojs/components';
 import iconsearch from '@/assets/icons/housemantj/search.png'
 import locationimg from '@/assets/icons/housemantj/location.png'
 import Tip from '@/components/tip'