fl

src/components/CollectList/MyCollect/index.jsx

@@ -25,6 +25,7 @@ export default (props) => {
 
   const star = parseFloat(((item.sweetScore + item.environmentScore + item.serviceScore) / 3).toFixed(1));
   return (
+
     <View>
       {
         targetType === "shop_package" && (
@@ -53,7 +54,7 @@ export default (props) => {
                   <text className='title-position-image'>
                     {
                       targetType === "shop_package" && (
-                        item.areaPName == null ?  item.areaName: item.areaPName+'/'+ item.areaName
+                        item.areaPName == null ? item.areaName : item.areaPName + '/' + item.areaName
                       )
                     }
                   </text>
@@ -61,7 +62,7 @@ export default (props) => {
               </view>
             </view>
             <view class='right-complete-two'>
-              <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` }); }}>
+              <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` }); }}>
                 <image className='right-image' src={SeeDetails} />
                 <view className='right-title'>查看详情</view>
               </view>
@@ -92,20 +93,28 @@ export default (props) => {
                     <text className='title-position-image'>
                       {
                         targetType === "tourist" && (
-                          item.areaPName == null ? item.areaName : (item.areaPName +'/'+item.areaName)
+                          item.areaPName == null ? item.areaName : (item.areaPName + '/' + item.areaName)
                         )
                       }
                       {
                         targetType === "shop" && (
-                          item.areaPName === null ? item.areaName : (item.areaPName +'/'+ item.areaName)
+                          item.areaPName === null ? item.areaName : (item.areaPName + '/' + item.areaName)
                         )
                       }</text>
                   </view>
                 </view>
               </view>
               <view class='right-complete-two'>
-                <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` }); }}>
-                  {/* <view className='right-number'>×1</view> */}
+                <view className='right-content' onClick={() => {
+                  if (item.targetType === "tourist") {
+                    return Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` });
+                  } else {
+                    return Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?shop=${item.shopId}` });
+
+                  }
+                }}
+                >
+
                   <image className='right-image' src={SeeDetails} />
                   <view className='right-title'>查看详情</view>
                 </view>
@@ -115,7 +124,5 @@ export default (props) => {
         }
       </View>
     </View>
-
-
   )
 }

src/pages/MineUserAll/Collect/index.jsx

@@ -22,16 +22,31 @@ export default withLayout((props) => {
   }, [location])
 
   return (
+
     <view className='box-content'>
+
+
       <CustomNav title='我的收藏' />
-      <view >
-        {
-          collectContent.map((item, index) => { return <MyCollect key={(index)} item={item} /> })
-        }
-      </view>
-      <view className='foot'>
-        已经到底了~
+
+
+      <view className='scroll-box-view' >
+        <scroll-view scroll-y style={{ height: 'calc(100% - 15em)' }}>
+
+          <view >
+
+            {
+              collectContent.map((item, index) => { return <MyCollect key={(index)} item={item} /> })
+            }
+
+          </view>
+
+          <view className='foot'>
+            已经到底了~
+          </view>
+        </scroll-view>
+
       </view>
+
     </view>
   )
 })

src/pages/MineUserAll/Collect/style.less

@@ -2,11 +2,16 @@
 
 .box-content {
   padding: 0 25px;
-  .foot {
-    font-size: 28px;
-    color: #c0c8d3;
-    line-height: 34px;
-    margin-top: 40px;
-    text-align: center;
+  .scroll-box-view{
+    width: 100%;
+    .foot {
+      font-size: 28px;
+      color: #c0c8d3;
+      line-height: 34px;
+      margin-top: 40px;
+      text-align: center;
+    }
+
   }
+
 }

src/pages/MineUserAll/RefundMoney/index.jsx

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

src/pages/MineUserAll/Rules/index.jsx

@@ -13,24 +13,6 @@ export default withLayout((props) => {
     <view className='box-content'>
       <CustomNav title='用户协议须知' />
       <WebView src='https://sgl-v2.njyunzhi.com/protocol.html' />
-      {/* <view className='aaa'>
-        以下是详细的用户须知：
-      </view>
-      <view className='content'>
-        Lorem ipsumdolorsitamet,consectetur adipiscing elit,
-        sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-        Quisipsumsuspendisseultricesgravida. Risuscommodoviverramaecenasaccumsan lacus vel facilisis.
-      </view>
-      <view className='content'>
-        Lorem ipsumdolorsitamet,consectetur adipiscing elit,
-        sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-        Quisipsumsuspendisseultricesgravida. Risuscommodoviverramaecenasaccumsan lacus vel facilisis.
-        Lorem ipsumdolorsitamet,consectetur adipiscing elit,
-      </view>
-      <view className='content'>
-        sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-        Quisipsumsuspendisseultricesgravida. Risuscommodoviverramaecenasaccumsan lacus vel facilisis.
-      </view> */}
     </view>
   )
 })