Merge branch 'feat/liujie'

src/mod_user/orderList/index.tsx

@@ -27,7 +27,12 @@ const OrderList = () => {
             <View key={item.id} className={styles.orderItem}>
               <View className={styles.orderTitle}></View>
               <View className={styles.gameInfo}>{item?.game_info?.title}</View>
-              <View className={styles.orderActions}></View>
+              <View className={styles.orderActions}>
+                <View></View>
+                <View>
+                  <Button>取消订单</Button>
+                </View>
+              </View>
             </View>
           )
         })

src/pages/detail/index.scss

@@ -93,6 +93,12 @@
     padding: 15px 15px 0;
     box-sizing: border-box;
     overflow-x: scroll;
+    &::-webkit-scrollbar {
+      display: none;
+      width: 0;
+      height: 0;
+      color: transparent; /* 透明色 */
+    }
 
     .detail-swiper-scroll-container {
       display: flex;
@@ -394,10 +400,12 @@
           align-items: center;
           justify-content: center;
           overflow: hidden;
+          border-radius: 12px;
 
           &-map {
             width: 100%;
             height: 95px;
+            border-radius: 12px;
           }
         }
       }

src/pages/detail/index.tsx

@@ -454,20 +454,20 @@ function GameInfo(props) {
           {longitude && latitude && (
             <Map
               className="location-map-map"
-              longitude={latitude}
+              longitude={longitude}
-              latitude={longitude}
+              latitude={latitude}
               markers={[
                 {
                   id: 1,
-                  latitude: longitude,
+                  latitude,
-                  longitude: latitude,
+                  longitude,
                   iconPath: require("@/static/detail/icon-stark.svg"),
                   width: 16,
                   height: 16,
                 },
               ]}
               includePoints={[
-                { latitude: longitude, longitude: latitude },
+                { latitude, longitude },
                 { latitude: currentLocation[0], longitude: currentLocation[1] },
               ]}
               includePadding={{ left: 50, right: 50, top: 50, bottom: 50 }}
@@ -573,12 +573,14 @@ function VenueInfo(props) {
 }
 
 function genNTRPRequirementText(min, max) {
-  if (min && max) {
+  if (min && max && min !== max) {
     return `${min} - ${max} 之间`;
+  } else if (max === 1) {
+    return "没有要求";
   } else if (max) {
     return `${max} 以上`;
   }
-  return "没有要求";
+  return '-'
 }
 // 玩法要求
 function GamePlayAndRequirement(props) {