From 16464f482aebdac3c89a86d90383d66441c41a1a Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Wed, 11 Jan 2023 11:44:17 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(=E9=9A=90=E8=97=8F=E5=8E=9F?=
 =?UTF-8?q?=E6=9C=AC=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=85=A5=E5=8F=A3):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/constant.ts      |  4 +--
 src/pages/details/index.tsx |  4 +--
 src/pages/index/index.tsx   | 56 ++++++++++++++++++-------------------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/common/constant.ts b/src/common/constant.ts
index 8fd7573..28fc231 100644
--- a/src/common/constant.ts
+++ b/src/common/constant.ts
@@ -1,4 +1,4 @@
-export const BASE_URL = CURRENT_BASE_URL
+// export const BASE_URL = CURRENT_BASE_URL
 // export const BASE_URL = `http://192.168.0.75:50001/lymarket`
 // export const BASE_URL = `http://192.168.0.89:50001/lymarket`
 // export const BASE_URL = `http://10.0.0.5:50001/lymarket`
@@ -12,7 +12,7 @@ export const BASE_URL = CURRENT_BASE_URL
 // export const BASE_URL = 'https://dev.zzfzyc.com/lymarket' // 开发环境
 // export const BASE_URL = 'https://www.zzfzyc.com/lymarket' // 正式环境
 // export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
-// export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
+export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
 // export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷
 // export const BASE_URL = 'http://192.168.1.42:50002/lymarket' //  杰
 
diff --git a/src/pages/details/index.tsx b/src/pages/details/index.tsx
index 2f1d659..6cbe413 100644
--- a/src/pages/details/index.tsx
+++ b/src/pages/details/index.tsx
@@ -15,7 +15,7 @@ import { AnalysisShortCodeApi, GetShortCodeApi } from '@/api/share'
 import { SHARE_SCENE } from '@/common/enum'
 import useUserInfo from '@/use/useUserInfo'
 import LabAndImg from '@/components/LabAndImg'
-import { alert } from '@/common/common'
+import { alert, goLink } from '@/common/common'
 import AddCollection from '@/components/addCollection'
 import { AddFavoriteApi, DelFavoriteProductApi } from '@/api/favorite'
 import useCommonData from '@/use/useCommonData'
@@ -334,7 +334,7 @@ const Details = (props: Params) => {
                 ></Button>
               </View>
             </View>
-            <View className={styles.buy_cart} onClick={() => setShowCart(true)}>
+            <View className={styles.buy_cart} onClick={() => goLink('/pages/shopCar/index', {}, 'switchTab')}>
               <View className={classnames('iconfont icon-gouwuche', styles.miconfont)}></View>
               <View className={styles.text}>购物车</View>
               {commonData.shopCount > 0 && <View className={styles.product_num}>{commonData.shopCount > 99 ? '99+' : commonData.shopCount}</View>}
diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx
index 6171cfe..cdd3d8f 100644
--- a/src/pages/index/index.tsx
+++ b/src/pages/index/index.tsx
@@ -95,37 +95,37 @@ const Index = () => {
     categoryList()
   }, [])
   return (
-    <MoveBtn showList={['shop']} onShopClick={() => setShowShopCart(!showShopCart)}>
-      <View className={styles.main}>
-        <View className={styles.header}>
-          <View className={styles.search}>
-            <View className={styles.search_input} onClick={() => goLink('/pages/searchList/search')}>
-              <Search disabled style={{ width: '263rpx' }} borderRadius="16rpx" placeholder="请输入搜索布料" />
-            </View>
+    // <MoveBtn showList={['shop']} onShopClick={() => setShowShopCart(!showShopCart)}>
+    <View className={styles.main}>
+      <View className={styles.header}>
+        <View className={styles.search}>
+          <View className={styles.search_input} onClick={() => goLink('/pages/searchList/search')}>
+            <Search disabled style={{ width: '263rpx' }} borderRadius="16rpx" placeholder="请输入搜索布料" />
           </View>
-          <Banner />
         </View>
-        <View className={styles.products}>
-          <SideBar
-            list={kindData.list}
-            height="100%"
-            defaultValue={kindData.defaultId}
-            hasMore={hasMore}
-            statusMore={statusMore}
-            selfOnScrolltolower={getScrolltolower}
-            sideBarOnClick={getProductKindId}
-            heightItem={82}
-            refresherTriggered={refresherTriggeredStatus}
-            selectClass={getSelectClassId}
-            selfOnRefresherRefresh={() => getRefresherRefresh()}
-          >
-            <Product productList={productData.list} />
-          </SideBar>
-        </View>
-        <View className="common_safe_area_y"></View>
-        <ShopCart show={showShopCart} onClose={() => setShowShopCart(false)} />
+        <Banner />
       </View>
-    </MoveBtn>
+      <View className={styles.products}>
+        <SideBar
+          list={kindData.list}
+          height="100%"
+          defaultValue={kindData.defaultId}
+          hasMore={hasMore}
+          statusMore={statusMore}
+          selfOnScrolltolower={getScrolltolower}
+          sideBarOnClick={getProductKindId}
+          heightItem={82}
+          refresherTriggered={refresherTriggeredStatus}
+          selectClass={getSelectClassId}
+          selfOnRefresherRefresh={() => getRefresherRefresh()}
+        >
+          <Product productList={productData.list} />
+        </SideBar>
+      </View>
+      <View className="common_safe_area_y"></View>
+      {/* <ShopCart show={showShopCart} onClose={() => setShowShopCart(false)} /> */}
+    </View>
+    // </MoveBtn>
   )
 }