李志伟 3 年前
父节点
当前提交
139c88d5e6
共有 5 个文件被更改,包括 35 次插入14 次删除
  1. 1
    1
      config/dev.js
  2. 1
    1
      config/prod.js
  3. 1
    1
      project.config.json
  4. 32
    10
      src/components/CompoentsOrder/OrderCard/index.jsx
  5. 0
    1
      src/pages/index/tabs/Recommend.jsx

+ 1
- 1
config/dev.js 查看文件

@@ -4,7 +4,7 @@ module.exports = {
4 4
   },
5 5
   defineConstants: {
6 6
     // HOST: '"http://192.168.89.147:8080"',
7
-    HOST: '"https://sgl-v2.njyunzhi.com"',
7
+    HOST: '"http://sgl-v2-test.njyunzhi.com"',
8 8
   },
9 9
   mini: {},
10 10
   h5: {}

+ 1
- 1
config/prod.js 查看文件

@@ -3,7 +3,7 @@ module.exports = {
3 3
     NODE_ENV: '"production"'
4 4
   },
5 5
   defineConstants: {
6
-    HOST: '"https://sgl-v2.njyunzhi.com"',
6
+    HOST: '"http://sgl-v2.njyunzhi.com"',
7 7
   },
8 8
   mini: {},
9 9
   h5: {

+ 1
- 1
project.config.json 查看文件

@@ -2,7 +2,7 @@
2 2
   "miniprogramRoot": "./dist",
3 3
   "projectname": "miniapp",
4 4
   "description": "十公里",
5
-  "appid": "wx06a7372d48d56843",
5
+  "appid": "wx835627a9b9b3932a",
6 6
   "setting": {
7 7
     "urlCheck": true,
8 8
     "es6": false,

+ 32
- 10
src/components/CompoentsOrder/OrderCard/index.jsx 查看文件

@@ -60,17 +60,39 @@ export default (props) => {
60 60
       url: `/pages/MineUserAll/RefundMoney/CheckRefund/index?id=${item.orderId}`,
61 61
     });
62 62
   };
63
-  const PayAction =
64
-    kkp == '1' ? null ://空卡片用于售后详情页面
65
-      sh == '1' ? <Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} /> ://售后页面卡片
66
-        item.status === 0 ? <Action.Icon icon={Pay} text='支付' onClick={handleDetail} /> ://待支付
67
-          item.status === 1 && item.isVerified == false ? <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} /> ://待核销
68
-            item.status === 2 && item.isVerified == false ? <Action.Image image={refund} /> ://已退费
69
-              item.status === 7 && item.isVerified == false ? <Action.Image image={Cancel} /> ://已取消
70
-                item.status === 9 ? <Action.Image image={Null} /> ://已过期
71
-                  item.isVerified == true && item.isEvaluated > 0 ? <Action.Image image={Evaluated} /> ://已评价
72
-                    item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : null//待评价
63
+  // const PayAction =
64
+  //   kkp == '1' ? null ://空卡片用于售后详情页面
65
+  //     sh == '1' ? <Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} /> ://售后页面卡片
66
+  //       item.status === 0 ? <Action.Icon icon={Pay} text='支付' onClick={handleDetail} /> ://待支付
67
+  //         item.status === 1 && item.isVerified == false ? <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} /> ://待核销
68
+  //           item.status === 2 && item.isVerified == false ? <Action.Image image={refund} /> ://已退费
69
+  //             item.status === 7 && item.isVerified == false ? <Action.Image image={Cancel} /> ://已取消
70
+  //               item.status === 9 ? <Action.Image image={Null} /> ://已过期
71
+  //                 item.isVerified == true && item.isEvaluated > 0 ? <Action.Image image={Evaluated} /> ://已评价
72
+  //                   item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : null//待评价
73 73
 
74
+  let PayAction=null
75
+  if (kkp=='1') {//空卡片用于售后详情页面
76
+    PayAction=null
77
+  }else if (sh=='1') {//售后页面卡片
78
+     PayAction=<Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} />
79
+  }else if (item.status===0) {//待支付
80
+     PayAction=<Action.Icon icon={Pay} text='支付' onClick={handleDetail} />
81
+  }else if (item.status === 1 && item.isVerified == false) {//待核销
82
+     PayAction=<Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} />
83
+  }else if (item.status === 2 && item.isVerified == false) {//已退费
84
+     PayAction=<Action.Image image={refund} />
85
+  }else if (item.status === 7 && item.isVerified == false) {//已取消
86
+     PayAction=<Action.Image image={Cancel} />
87
+  }else if(item.status === 9){//已过期
88
+     PayAction=<Action.Image image={Null} />
89
+  }else if (item.isVerified == true && item.isEvaluated > 0) {//已评价
90
+     PayAction=<Action.Image image={Evaluated} />
91
+  }else if (item.isVerified == true) {//待评价
92
+     PayAction=<Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} />
93
+  }else{
94
+    PayAction=null
95
+  }
74 96
 
75 97
   return (
76 98
     <>

+ 0
- 1
src/pages/index/tabs/Recommend.jsx 查看文件

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