From 00662560090047a887dd57a1c97224492f5b124d Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Thu, 12 May 2022 14:28:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E8=BF=94=E5=9B=9E=E5=8C=BA=E5=9F=9F=E7=AD=89=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/order.ts                  | 10 ++++++++++
 src/components/address/index.tsx  | 12 +++++-------
 src/components/shopCart/index.tsx | 17 ++++++++++++++---
 src/pages/addressAdd/index.tsx    |  2 +-
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/api/order.ts b/src/api/order.ts
index 770d977..2fd72f8 100644
--- a/src/api/order.ts
+++ b/src/api/order.ts
@@ -8,4 +8,14 @@ import { useRequest } from "@/use/useHttp"
         url: `/v1/mall/saleOrder`,
         method: "post",
     })
+}
+
+/**
+ * 预览销售单
+ */
+ export const SaleOrderPreViewApi = () => {
+    return useRequest({
+        url: `/v1/mall/saleOrder/preView`,
+        method: "put",
+    })
 }
\ No newline at end of file
diff --git a/src/components/address/index.tsx b/src/components/address/index.tsx
index 3de4487..b3b9072 100644
--- a/src/components/address/index.tsx
+++ b/src/components/address/index.tsx
@@ -8,13 +8,13 @@ import { GetAddressListApi } from "@/api/addressList";
 import { alert } from "@/common/common";
 
 
-type DefaultValueParm = {name?: string, id?:string|number}
+type DefaultValueParm = {name: string, id:string|number, level: number|string}
 
 type Params = {
     addressOnSelect?: (val:DefaultValueParm[]) => void,
     addressOnClose?: () => void,
     show?: true|false,
-    defaultValue?:DefaultValueParm[]
+    defaultValue?:DefaultValueParm[] 
     selectStatus?: false|true, //false不需要选择完整地址，true需要选择完整地址
 }
 
@@ -73,15 +73,15 @@ export default memo(({
     const selectItem = (item) => {
         setSelectId(item.id)
         if(selectIndex == 0) {
-            setSelectArr([{name:item.name, id:item.id}])
+            setSelectArr([{name:item.name, id:item.id, level:item.level}])
             getCity(item.id)
             setAreaStatus(false)
             setCityStatus(false)
         } else if(selectIndex == 1){
-            setSelectArr([selectArr[0], {name:item.name, id:item.id}])
+            setSelectArr([selectArr[0], {name:item.name, id:item.id, level:item.level}])
             area(item.id)
         } else {
-            setSelectArr([selectArr[0], selectArr[1], {name:item.name, id:item.id}])
+            setSelectArr([selectArr[0], selectArr[1], {name:item.name, id:item.id, level:item.level}])
             getDomDes('#address_tab_2')
         }
     }
@@ -144,7 +144,6 @@ export default memo(({
             setConfirmBtnStatus(true)
             setAreaStatus(false)
         }
-        
     }
 
     //确定按钮
@@ -167,7 +166,6 @@ export default memo(({
 
     //获取省市区宽度
     const getDomDes = (id) => {
-
         setTimeout(() => {
             let query = Taro.createSelectorQuery();
             query.select(id).boundingClientRect(rect=>{
diff --git a/src/components/shopCart/index.tsx b/src/components/shopCart/index.tsx
index 16c6880..9d9f7c5 100644
--- a/src/components/shopCart/index.tsx
+++ b/src/components/shopCart/index.tsx
@@ -7,7 +7,7 @@ import InfiniteScroll from "@/components/infiniteScroll";
 import styles from "./index.module.scss"
 import { useCallback, useEffect, useRef, useState } from "react";
 import Taro from "@tarojs/taro";
-import { goLink } from "@/common/common";
+import { alert, goLink } from "@/common/common";
 import {GetShoppingCartApi, DelShoppingCartApi} from "@/api/shopCart"
 import { formatHashTag, formatImgUrl, formatMillionYuan } from "@/common/fotmat";
 
@@ -184,6 +184,16 @@ export default ({show = false, onClose}: param) => {
     const formatCount = useCallback((item) => {
         return item.sale_mode == 0? item.roll + '件': item.length + 'm'
     }, [])
+
+    //去结算
+    const orderDetail = () => {
+        if(selectIndex == -1 ) {
+            console.log(selectIndex, selectIds.current)
+            alert.error('请选择面料')
+        } 
+        goLink('/pages/order/index',{ids:selectIds.current, sale_mode:selectIndex})
+        
+    }
     
     return (
         <View className={styles.shop_cart_main}>
@@ -241,7 +251,7 @@ export default ({show = false, onClose}: param) => {
                                 <View className={styles.price_real}><text>￥</text>200</View>
                                 <View className={styles.price_forecast}>预估金额</View>
                             </View>
-                            <View className={styles.goPay} onClick={() => goLink('/pages/order/index')}>
+                            <View className={styles.goPay} onClick={() => orderDetail()}>
                                 去结算
                             </View>
                         </View>
@@ -250,4 +260,5 @@ export default ({show = false, onClose}: param) => {
             </Popup>
         </View>
     )
-}
\ No newline at end of file
+}
+
diff --git a/src/pages/addressAdd/index.tsx b/src/pages/addressAdd/index.tsx
index 7951d1c..caf683f 100644
--- a/src/pages/addressAdd/index.tsx
+++ b/src/pages/addressAdd/index.tsx
@@ -123,7 +123,7 @@ export default ()=>{
       <Button style={{"background": hozon?'#007aff':''}} hoverClass="none" className={`add-address-save`} onClick={handleSave}>
         保存
       </Button>
-      <Address addressOnSelect={handleSetSite}  defaultValue={[ {name: "广东省", id: 193}, {name: "佛山市", id: 202}, {name: "高明区", id: 204}]} addressOnClose={()=>setShowSiteModal(false)} show={showSiteModal}/>
+      <Address addressOnSelect={handleSetSite}  defaultValue={[ {name: "广东省", id: 193, level: 2}, {name: "佛山市", id: 202, level:3}, {name: "高明区", id: 204, level:4}]} addressOnClose={()=>setShowSiteModal(false)} show={showSiteModal}/>
     </View>
   )
 }