线上测试

global.d.ts

@@ -16,3 +16,7 @@ declare namespace NodeJS {
     TARO_ENV: 'weapp' | 'swan' | 'alipay' | 'h5' | 'rn' | 'tt' | 'quickapp' | 'qq' | 'jd'
   }
 }
+
+declare const CURRENT_VERSION: string
+declare const CURRENT_GITHASH: string
+declare const CURRENT_ENV: string

src/components/banner/index.tsx

@@ -28,7 +28,7 @@ export default (props: params) => {
   }
 
   const skipTo = (item) => {
-    if (item.jump_type == 2) {
+    if (item.jump_type == 2 || item.jump_type == 0) {
       goLink(item.link + '&title=' + item.title)
     } else {
       goLink(item.link)

src/components/orderBtns/index.tsx

@@ -1,29 +1,28 @@
-import { CancelOrderApi, ReceiveOrderApi } from "@/api/order"
+import { CancelOrderApi, ReceiveOrderApi } from '@/api/order'
-import { alert, goLink } from "@/common/common"
+import { alert, goLink } from '@/common/common'
-import { ORDER_STATUS, SALE_MODE, SUBSCRIPTION_MESSAGE_SCENE } from "@/common/enum"
+import { ORDER_STATUS, SALE_MODE, SUBSCRIPTION_MESSAGE_SCENE } from '@/common/enum'
-import {Text, View } from "@tarojs/components"
+import { Text, View } from '@tarojs/components'
-import Taro from "@tarojs/taro"
+import Taro from '@tarojs/taro'
-import {useRef, memo, useState, useMemo } from "react"
+import { useRef, memo, useState, useMemo } from 'react'
-import classnames from "classnames";
+import classnames from 'classnames'
 import styles from './index.module.scss'
-import { AddShoppingCartApi } from "@/api/shopCart"
+import { AddShoppingCartApi } from '@/api/shopCart'
-import { ApplyRefundApi } from "@/api/salesAfterOrder"
+import { ApplyRefundApi } from '@/api/salesAfterOrder'
-import { UseSubscriptionMessage } from "@/use/useCommon"
+import { UseSubscriptionMessage } from '@/use/useCommon'
-import { throttle } from "@/common/util"
+import { throttle } from '@/common/util'
 
 type Param = {
   orderInfo: {
-        status: number, //订单状态
+    status: number //订单状态
-        orderId: number, //订单id
+    orderId: number //订单id
-        actual_amount: number, //实付金额
+    actual_amount: number //实付金额
-        wait_pay_amount: number, //待付金额
+    wait_pay_amount: number //待付金额
-        sale_mode: number, //订单类型
+    sale_mode: number //订单类型
-        av_return_roll?: number, //可退数量
+    av_return_roll?: number //可退数量
-        is_return?: true|false, //是否申请了售后
+    is_return?: true | false //是否申请了售后
-        is_should_collect_audit?: true|false, //应收单是否审核
+    is_should_collect_audit?: true | false //应收单是否审核
-
+  }
-    },
+  showStatus?: 'detail' | 'list' //订单详情，订单列表
-    showStatus?: 'detail'|'list', //订单详情，订单列表
   onClick?: (val: number) => void //点击后触发的事件，返回订单状态
 }
 
@@ -40,18 +39,14 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
     SaleOrderStatusWaitingReceipt,
     SaleOrderStatusAlreadyReceipt,
     SaleorderstatusWaitingPrePayment,
-        SaleOrderStatusTaking
+    SaleOrderStatusTaking,
   } = ORDER_STATUS
 
   //订单类型
-    const {
+  const { SaLeModeBulk, SaleModeLengthCut, SaLeModeWeightCut } = SALE_MODE
-        SaLeModeBulk,
-        SaleModeLengthCut,
-        SaLeModeWeightCut,
-    } = SALE_MODE
 
   //注册按钮, id:按钮id唯一，label：按钮名称，sort：排序数字越大越靠后，validatarFunc：验证
-    type orderBtnsListParams = {id: number, label: string, sort: number, validatarFunc: (val: typeof orderInfo) => any}
+  type orderBtnsListParams = { id: number; label: string; sort: number; validatarFunc: (val: typeof orderInfo) => any }
   const orderBtnsList = useRef<orderBtnsListParams[]>([
     {
       id: 1,
@@ -66,10 +61,10 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
           SaleOrderStatusArranged.value,
           SaleOrderStatusWaitingPayment.value,
           SaleOrderStatusTaking.value,
-                    SaleOrderStatusWaitingDelivery.value
+          SaleOrderStatusWaitingDelivery.value,
         ]
         return orderInfo.actual_amount == 0 && orderStatus.includes(orderInfo.status)
-            }
+      },
     },
     {
       id: 2,
@@ -84,10 +79,10 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
           SaleOrderStatusWaitingDelivery.value,
           SaleOrderStatusWaitingReceipt.value,
           SaleOrderStatusAlreadyReceipt.value,
-                    SaleOrderStatusComplete.value
+          SaleOrderStatusComplete.value,
         ]
         return orderInfo.wait_pay_amount > 0 && orderStatus.includes(orderInfo.status)
-            }
+      },
     },
     {
       id: 3,
@@ -95,35 +90,27 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
       sort: 5,
       validatarFunc: (orderInfo) => {
         //大货在待发货付过款
-                let orderStatus = [
+        let orderStatus = [SaleOrderStatusWaitingDelivery.value, SaleOrderStatusTaking.value]
-                    SaleOrderStatusWaitingDelivery.value,
-                    SaleOrderStatusTaking.value
-                ]
         return orderInfo.sale_mode == SaLeModeBulk.value && orderInfo.actual_amount > 0 && orderInfo.av_return_roll && orderStatus.includes(orderInfo.status)
-            }
+      },
     },
     {
       id: 5,
       label: '申请退货',
       sort: 5,
       validatarFunc: (orderInfo) => {
-                let orderStatus = [
+        let orderStatus = [SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusRefund.value]
-                    SaleOrderStatusAlreadyReceipt.value,
-                    SaleOrderStatusRefund.value
-                ]
         return orderInfo.av_return_roll && orderStatus.includes(orderInfo.status)
-            }
+      },
     },
     {
       id: 6,
       label: '确认收货',
       sort: 10,
       validatarFunc: (orderInfo) => {
-                let orderStatus = [
+        let orderStatus = [SaleOrderStatusWaitingReceipt.value]
-                    SaleOrderStatusWaitingReceipt.value
-                ]
         return orderStatus.includes(orderInfo.status)
-            }
+      },
     },
     {
       id: 7,
@@ -131,7 +118,7 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
       sort: 6,
       validatarFunc: () => {
         return true
-            }
+      },
     },
     {
       id: 8,
@@ -139,11 +126,9 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
       sort: 5,
       validatarFunc: (orderInfo) => {
         //散剪和剪板在待接单时付过款
-                let orderStatus = [
+        let orderStatus = [SaleOrderStatusBooking.value]
-                    SaleOrderStatusBooking.value
-                ]
         return orderInfo.sale_mode != SaLeModeBulk.value && orderInfo.actual_amount > 0 && orderStatus.includes(orderInfo.status)
-            }
+      },
     },
     {
       id: 9,
@@ -151,21 +136,22 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
       sort: 6,
       validatarFunc: (orderInfo) => {
         return orderInfo.is_return
-            }
+      },
     },
     {
       id: 10,
       label: '销售码单',
       sort: 9,
       validatarFunc: (orderInfo) => {
-                return orderInfo.is_should_collect_audit && showStatus == 'detail'
+        if (orderInfo.sale_mode === 1 && showStatus == 'detail') return true
-            }
+        if (orderInfo.sale_mode !== 1 && showStatus == 'detail') return orderInfo.is_should_collect_audit
+      },
     },
   ])
 
   //显示的按钮数组
   const orderBtnsShowList: orderBtnsListParams[] = useMemo(() => {
-        let list = orderBtnsList.current.filter(item => {
+    let list = orderBtnsList.current.filter((item) => {
       return item.validatarFunc(orderInfo)
     })
     return list.sort((a, b) => a.sort - b.sort)
@@ -203,7 +189,7 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
         } else {
           console.log('用户点击取消')
         }
-            }
+      },
     })
   }
 
@@ -224,7 +210,7 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
         } else if (res.cancel) {
           console.log('用户点击取消')
         }
-            }
+      },
     })
   }
 
@@ -247,7 +233,7 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
         } else if (res.cancel) {
           console.log('用户点击取消')
         }
-            }
+      },
     })
   }
 
@@ -271,9 +257,8 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
         } else if (res.cancel) {
           console.log('用户点击取消')
         }
-            }
+      },
     })
-        
   }
 
   //申请退货
@@ -291,20 +276,35 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
 
   return (
     <View className={styles.btns_list}>
-            {(orderBtnsShowList.length > 3)&&<View className={styles.more}>
+      {orderBtnsShowList.length > 3 && (
+        <View className={styles.more}>
           <Text onClick={() => setShowMore(!showMore)}>{!showMore ? '更多' : '关闭'}</Text>
-                {showMore&&<View className={styles.more_con}>
+          {showMore && (
+            <View className={styles.more_con}>
               <View className={styles.more_list} style={styleTop}>
                 {orderBtnsShowList.map((item, index) => {
-                            return ((index < (orderBtnsShowList.length - 3)) &&<View className={styles.more_item} key={item.id}  onClick={() => submitBtns(item.id, index)}>{item.label}</View>)
+                  return (
+                    index < orderBtnsShowList.length - 3 && (
+                      <View className={styles.more_item} key={item.id} onClick={() => submitBtns(item.id, index)}>
+                        {item.label}
+                      </View>
+                    )
+                  )
                 })}
               </View>
               {/* <View className={styles.more_bg} catchMove onClick={() => setShowMore(false)}></View> */}
-                </View>}
+            </View>
-            </View>}
+          )}
+        </View>
+      )}
       <View className={styles.list_scroll}>
-                {orderBtnsShowList.map((item, index) => 
+        {orderBtnsShowList.map(
-                    ((orderBtnsShowList.length - 3) <= index)&&<View key={item.id} className={classnames(styles.btns_item)} onClick={() => submitBtns(item.id, index)}>{item.label}</View>
+          (item, index) =>
+            orderBtnsShowList.length - 3 <= index && (
+              <View key={item.id} className={classnames(styles.btns_item)} onClick={() => submitBtns(item.id, index)}>
+                {item.label}
+              </View>
+            ),
         )}
       </View>
     </View>

src/pages/classList/index.tsx

@@ -1,24 +1,32 @@
-import { Input, ScrollView, Text, Textarea, View } from "@tarojs/components"
+import { Input, ScrollView, Text, Textarea, View } from '@tarojs/components'
-import classnames from "classnames";
+import classnames from 'classnames'
 import Search from '@/components/search'
 import Product from '@/components/product'
 import InfiniteScroll from '@/components/infiniteScroll'
 import styles from './index.module.scss'
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import Filter from "@/components/filter";
+import Filter from '@/components/filter'
-import SortBtn from "@/components/sortBtn";
+import SortBtn from '@/components/sortBtn'
-import SelectData, {ListProps} from "../searchList/components/selectData";
+import SelectData, { ListProps } from '../searchList/components/selectData'
 import { GetProductListApi } from '@/api/material'
-import { useRouter } from "@tarojs/taro";
+import { useRouter } from '@tarojs/taro'
-import { dataLoadingStatus, getFilterData } from "@/common/util";
+import { dataLoadingStatus, getFilterData } from '@/common/util'
-import LoadingCard from "@/components/loadingCard";
+import LoadingCard from '@/components/loadingCard'
-import useLogin from "@/use/useLogin";
+import Taro from '@tarojs/taro'
+import useLogin from '@/use/useLogin'
 
 export default () => {
   useLogin()
   const [showPopup, setShowPopup] = useState(false)
 
   const router = useRouter()
+
+  useEffect(() => {
+    Taro.setNavigationBarTitle({
+      title: router.params.title || '分类页面',
+    })
+  }, [router])
+
   //搜索参数
   const [searchField, setSearchField] = useState({
     code_or_name: '',
@@ -28,13 +36,13 @@ export default () => {
     width: '',
     weight_density: '',
     product_kind_id: '',
-        component: ''
+    component: '',
   })
 
   //获取列表
-    const [categoryList, setCategoryList] = useState<{list:any[], total:number}>({
+  const [categoryList, setCategoryList] = useState<{ list: any[]; total: number }>({
     list: [],
-        total:0
+    total: 0,
   })
   const { fetchData, state } = GetProductListApi()
   const getSubjectList = async () => {
@@ -73,7 +81,7 @@ export default () => {
       weight_density: data?.weight,
       size: 10,
       component: data?.element,
-            product_kind_id: data?.seriesId
+      product_kind_id: data?.seriesId,
     })
     formatSelectList(e)
   }
@@ -101,7 +109,7 @@ export default () => {
   type sortParam = 'none' | 'top' | 'bottom'
   const sortComprehensiveRef = useRef<any>(null)
   const [sortStatus, setSortStatus] = useState<{ comprehensive: sortParam }>({
-        comprehensive: 'none'
+    comprehensive: 'none',
   })
   const changeSort = () => {
     setCategoryList(() => ({ list: [], total: 0 }))
@@ -114,7 +122,7 @@ export default () => {
   return (
     <View className={styles.main}>
       <View className={styles.search}>
-                <Search placeIcon="out" showBtn={true} btnStyle={{color: '#007AFF'}} changeOnSearch={getSearchData} debounceTime={300}/>
+        <Search placeIcon='out' showBtn={true} btnStyle={{ color: '#007AFF' }} changeOnSearch={getSearchData} debounceTime={300} />
       </View>
       <View className={styles.filter}>
         <View className={styles.filter_all}>

src/pages/order/components/scanPay/index.tsx

@@ -46,7 +46,7 @@ export default memo(({ show = true, onClose, company, orderInfo }: Param) => {
             length: (citem.length / 100).toString(),
             weight: formatWeightDiv(citem.actual_weight || citem.estimate_weight).toString(),
             sale_price: formatPriceDiv(citem.sale_price).toString(),
-            total_price: formatPriceDiv(citem.estimate_amount).toString(),
+            total_price: formatPriceDiv(citem.total_sale_price || citem.estimate_amount).toString(), //小计
             weight_error: formatWeightDiv(citem.weight_error).toString(),
           })
         })