李志伟 3 jaren geleden
bovenliggende
commit
d91d521d4e

+ 15
- 8
src/components/CollectList/MyCollect/index.jsx Bestand weergeven

@@ -25,6 +25,7 @@ export default (props) => {
25 25
 
26 26
   const star = parseFloat(((item.sweetScore + item.environmentScore + item.serviceScore) / 3).toFixed(1));
27 27
   return (
28
+
28 29
     <View>
29 30
       {
30 31
         targetType === "shop_package" && (
@@ -53,7 +54,7 @@ export default (props) => {
53 54
                   <text className='title-position-image'>
54 55
                     {
55 56
                       targetType === "shop_package" && (
56
-                        item.areaPName == null ?  item.areaName: item.areaPName+'/'+ item.areaName
57
+                        item.areaPName == null ? item.areaName : item.areaPName + '/' + item.areaName
57 58
                       )
58 59
                     }
59 60
                   </text>
@@ -61,7 +62,7 @@ export default (props) => {
61 62
               </view>
62 63
             </view>
63 64
             <view class='right-complete-two'>
64
-              <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` }); }}>
65
+              <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` }); }}>
65 66
                 <image className='right-image' src={SeeDetails} />
66 67
                 <view className='right-title'>查看详情</view>
67 68
               </view>
@@ -92,20 +93,28 @@ export default (props) => {
92 93
                     <text className='title-position-image'>
93 94
                       {
94 95
                         targetType === "tourist" && (
95
-                          item.areaPName == null ? item.areaName : (item.areaPName +'/'+item.areaName)
96
+                          item.areaPName == null ? item.areaName : (item.areaPName + '/' + item.areaName)
96 97
                         )
97 98
                       }
98 99
                       {
99 100
                         targetType === "shop" && (
100
-                          item.areaPName === null ? item.areaName : (item.areaPName +'/'+ item.areaName)
101
+                          item.areaPName === null ? item.areaName : (item.areaPName + '/' + item.areaName)
101 102
                         )
102 103
                       }</text>
103 104
                   </view>
104 105
                 </view>
105 106
               </view>
106 107
               <view class='right-complete-two'>
107
-                <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` }); }}>
108
-                  {/* <view className='right-number'>×1</view> */}
108
+                <view className='right-content' onClick={() => {
109
+                  if (item.targetType === "tourist") {
110
+                    return Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` });
111
+                  } else {
112
+                    return Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?shop=${item.shopId}` });
113
+
114
+                  }
115
+                }}
116
+                >
117
+
109 118
                   <image className='right-image' src={SeeDetails} />
110 119
                   <view className='right-title'>查看详情</view>
111 120
                 </view>
@@ -115,7 +124,5 @@ export default (props) => {
115 124
         }
116 125
       </View>
117 126
     </View>
118
-
119
-
120 127
   )
121 128
 }

+ 18
- 18
src/pages/MineUserAll/Collect/index.jsx Bestand weergeven

@@ -24,27 +24,27 @@ export default withLayout((props) => {
24 24
   // }, [location])
25 25
 
26 26
   return (
27
-      <view className='page-index box-content'>
27
+    <view className='page-index box-content'>
28 28
       <view className='index-navbar'>
29 29
         <CustomNav title='我的收藏' />
30 30
       </view>
31
-        <view style={{ overflow: 'hidden', height: '100%' }}>
32
-          <List
33
-            style={{ height: '100%' }}
34
-            request={getCollectList}
35
-            params={queryParams}
36
-            onDataChange={setCollectContent}
37
-          >
38
-            {
39
-              collectContent.length == 0 ?
40
-                <NoData /> :
41
-                <view className='waterfall'>
42
-                  {
43
-                    collectContent.map((item, index) => { return <MyCollect key={(index)} item={item} /> })
44
-                  }
45
-                </view>
46
-            }
47
-          </List>
31
+      <view style={{ overflow: 'hidden', height: '100%' }}>
32
+        <List
33
+          style={{ height: '100%' }}
34
+          request={getCollectList}
35
+          params={queryParams}
36
+          onDataChange={setCollectContent}
37
+        >
38
+          {
39
+            collectContent.length == 0 ?
40
+              <NoData /> :
41
+              <view className='waterfall'>
42
+                {
43
+                  collectContent.map((item, index) => { return <MyCollect key={(index)} item={item} /> })
44
+                }
45
+              </view>
46
+          }
47
+        </List>
48 48
       </view>
49 49
     </view>
50 50
   )

+ 2
- 3
src/pages/MineUserAll/RefundMoney/index.jsx Bestand weergeven

@@ -17,7 +17,6 @@ import CustomNav from "@/components/CustomNav";
17 17
 import "./style.less";
18 18
 
19 19
 const scoreList = new Array(5).fill(0);
20
-const score = "3.9";
21 20
 export default withLayout((props) => {
22 21
   const { router, person } = props;
23 22
   const [list, setList] = useState([]);
@@ -86,7 +85,7 @@ export default withLayout((props) => {
86 85
         onscrolltolower={pageLoadMore}
87 86
       >
88 87
         <view>
89
-          {(list||[]).map((item) => {
88
+          {(list || []).map((item) => {
90 89
             return (
91 90
               <view class="wrapper" key={item.orderId}>
92 91
                 <view class="left-complete-one">
@@ -134,7 +133,7 @@ export default withLayout((props) => {
134 133
                     <view className="title-time">有效期:{formatTime(item?.endTime, "yyyy/MM/dd")}</view>
135 134
                   </view>
136 135
                 </view>
137
-                <view class="right-complete-two" onClick={()=>handleRefund2(item)}>
136
+                <view class="right-complete-two" onClick={() => handleRefund2(item)}>
138 137
                   <view className="right-content">
139 138
                     {/* <image className='right-image-two' src={Null} /> */}
140 139
                     <image className="right-image" src={Refund} />

+ 0
- 18
src/pages/MineUserAll/Rules/index.jsx Bestand weergeven

@@ -13,24 +13,6 @@ export default withLayout((props) => {
13 13
     <view className='box-content'>
14 14
       <CustomNav title='用户协议须知' />
15 15
       <WebView src='https://sgl-v2.njyunzhi.com/protocol.html' />
16
-      {/* <view className='aaa'>
17
-        以下是详细的用户须知:
18
-      </view>
19
-      <view className='content'>
20
-        Lorem ipsumdolorsitamet,consectetur adipiscing elit,
21
-        sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
22
-        Quisipsumsuspendisseultricesgravida. Risuscommodoviverramaecenasaccumsan lacus vel facilisis.
23
-      </view>
24
-      <view className='content'>
25
-        Lorem ipsumdolorsitamet,consectetur adipiscing elit,
26
-        sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
27
-        Quisipsumsuspendisseultricesgravida. Risuscommodoviverramaecenasaccumsan lacus vel facilisis.
28
-        Lorem ipsumdolorsitamet,consectetur adipiscing elit,
29
-      </view>
30
-      <view className='content'>
31
-        sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
32
-        Quisipsumsuspendisseultricesgravida. Risuscommodoviverramaecenasaccumsan lacus vel facilisis.
33
-      </view> */}
34 16
     </view>
35 17
   )
36 18
 })