diff --git a/src/app.tsx b/src/app.tsx
index 72d455c..f61a81d 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -33,10 +33,11 @@ const App:FC = (params) => {
if(res.from === 'button') {
path = `/pages/details/index?share=${sortCode.shareShortDetail.code}`
title = sortCode.shareShortDetail.title
+ imageUrl = sortCode.shareShortDetail.img
} else {
path = `/pages/index/index?share=${sortCode.shareShortPage.code}`
title = sortCode.shareShortPage.title
- imageUrl = IMG_CND_Prefix + '/mall/share_img_01.png'
+ imageUrl = sortCode.shareShortPage.img
}
return {
title,
diff --git a/src/common/constant.js b/src/common/constant.js
index 32e0173..4512c59 100644
--- a/src/common/constant.js
+++ b/src/common/constant.js
@@ -20,10 +20,12 @@ export const GET_UPLOAD_SIGN = `/upyun/getsign` // 请求签名 url
export const UPLOAD_CDN_URL = `https://v0.api.upyun.com/`
// cdn
-export const IMG_CND_Prefix = CURRENT_ENV.includes('development')? "https://test.cdn.zzfzyc.com":"https://cdn.zzfzyc.com"
+// export const IMG_CND_Prefix = CURRENT_ENV.includes('development')? "https://test.cdn.zzfzyc.com":"https://cdn.zzfzyc.com"
+export const IMG_CND_Prefix = CURRENT_ENV.includes('development')? "https://test.cdn.zzfzyc.com":"https://test.cdn.zzfzyc.com"
//在线支付图片baseUrl
-export const CAP_HTML_TO_IMAGE_BASE_URL = CURRENT_ENV.includes('development')? "https://test.zzfzyc.com":"https://www.zzfzyc.com"
+// export const CAP_HTML_TO_IMAGE_BASE_URL = CURRENT_ENV.includes('development')? "https://test.zzfzyc.com":"https://www.zzfzyc.com"
+export const CAP_HTML_TO_IMAGE_BASE_URL = CURRENT_ENV.includes('development')? "https://test.zzfzyc.com":"https://test.zzfzyc.com"
// 上传图片视频
export const CDN_UPLOAD_IMG = `${UPLOAD_CDN_URL || ''}`;
diff --git a/src/pages/applyAfterSales/components/cutKindList/index.tsx b/src/pages/applyAfterSales/components/cutKindList/index.tsx
index 2af3855..70e7825 100644
--- a/src/pages/applyAfterSales/components/cutKindList/index.tsx
+++ b/src/pages/applyAfterSales/components/cutKindList/index.tsx
@@ -30,7 +30,6 @@ const kindeList:FC = memo(({order, onSelectChange}) => {
//checkbox选中回调
const selectCallBack = (colorItem) => {
- console.log('colorItem::',colorItem)
onSelectChange?.({color_id:colorItem.id, length:colorItem.length, sale_order_detail_id:colorItem.sale_order_detail_id, status: true})
}
diff --git a/src/pages/applyAfterSales/components/kindList/index.tsx b/src/pages/applyAfterSales/components/kindList/index.tsx
index f046edb..6c7092b 100644
--- a/src/pages/applyAfterSales/components/kindList/index.tsx
+++ b/src/pages/applyAfterSales/components/kindList/index.tsx
@@ -37,7 +37,7 @@ const kindeList:FC = memo(({order, onNumChange}) => {
//判断该面料下的颜色都退完了
const colorNum = (item) => {
let res = item.product_colors.some(val => {
- return val.return_roll < val.roll
+ return (val.return_roll + val.apply_return_roll) < val.roll
})
return res
}
diff --git a/src/pages/details/index.tsx b/src/pages/details/index.tsx
index fcbaebf..6ce3184 100644
--- a/src/pages/details/index.tsx
+++ b/src/pages/details/index.tsx
@@ -18,9 +18,8 @@ import LabAndImg from '@/components/LabAndImg';
import { alert } from '@/common/common';
import AddCollection from '@/components/addCollection';
import { AddFavoriteApi, DelFavoriteProductApi } from '@/api/favorite';
-import { GetShoppingCartApi } from '@/api/shopCart';
-import { useSelector } from '@/reducers/hooks';
import useCommonData from '@/use/useCommonData';
+import { IMG_CND_Prefix } from '@/common/constant';
type item = {title:string, img:string, url:string, id:number}
@@ -109,15 +108,14 @@ export default (props:Params) => {
setShowPreview(true)
}
-
-
const {setSortCode, userInfo : userObj } = useUserInfo()
//详情页获取分享短码
const {ShareDetail} = SHARE_SCENE
const {fetchData: fetchDataShortCode} = GetShortCodeApi()
const getShortCode = async () => {
const {data: resDetail} = await fetchDataShortCode({"share_user_id": userObj.adminUserInfo.user_id, type:ShareDetail.value, product_id: parseInt(params.id)})
- setSortCode({... userObj.sort_code, shareShortDetail: {title: productName as string, code: resDetail.md5_key, img:''}})
+ const img = IMG_CND_Prefix + (productInfo.texture_url?productInfo.texture_url.split(',')[0]:'/mall/share_img_01.png')
+ setSortCode({... userObj.sort_code, shareShortDetail: {title: productName as string, code: resDetail.md5_key, img:img}})
}
//授权手机号和下单
@@ -175,16 +173,11 @@ export default (props:Params) => {
}
}
-
-
-
-
//页面下拉刷新
usePullDownRefresh(() => {
getProductDetail()
})
-
return (
diff --git a/src/pages/order/components/scanPayCheck/index.tsx b/src/pages/order/components/scanPayCheck/index.tsx
index 2c9f805..4927d70 100644
--- a/src/pages/order/components/scanPayCheck/index.tsx
+++ b/src/pages/order/components/scanPayCheck/index.tsx
@@ -43,7 +43,8 @@ export default memo(({show = true, onClose, company, orderInfo}:Param) => {
//有应收单id时用应收单获取数据
let {data} = await orderFetchData({id: orderInfo?.should_collect_order_id})
setPayInfo(() => data)
- } else {
+ }
+ else if(orderInfo&&orderInfo.pre_collect_order_id) {
//用预付单id获取支付信息
let {data} = await prepayOrderFetchData({id: orderInfo?.pre_collect_order_id})
setPayInfo(() => data)
@@ -63,7 +64,6 @@ export default memo(({show = true, onClose, company, orderInfo}:Param) => {
useEffect(() => {
if(orderInfo && payInfo) {
- console.log('orderInfo::',orderInfo)
let lists:ListParam[] = []
orderInfo.product_list?.map(pitem => {
pitem?.product_colors?.map(citem => {
diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx
index 925cca4..517ee8e 100644
--- a/src/pages/user/index.tsx
+++ b/src/pages/user/index.tsx
@@ -103,7 +103,7 @@ const Header = memo((props: any) => {
const { data } = props;
console.log(props, 'propsprops')
let menu = [{ text: "待配布", icon: "icon-daipeibu", url: "/pages/orderList/index?status=0" }, { text: "待付款", icon: "icon-daifukuan", url: "/pages/orderList/index?status=1" },
- { text: "待发货", icon: "icon-daifahuo", url: "/pages/orderList/index?status=2" }, { text: "已发货", icon: "icon-yifahuo", url: "/pages/orderList/index?status=3" },
+ { text: "待发货", icon: "icon-daifahuo", url: "/pages/orderList/index?status=2" }, { text: "待收货", icon: "icon-yifahuo", url: "/pages/orderList/index?status=3" },
{ text: "退款/售后", icon: "icon-a-tuikuanshouhou", url: "/pages/salesAfterList/index" }];
const { getPhoneNumber } = useLogin();
const mGetPhoneNumber = (ev) => {
diff --git a/src/use/useLogin.ts b/src/use/useLogin.ts
index 66deb2a..7839e7a 100644
--- a/src/use/useLogin.ts
+++ b/src/use/useLogin.ts
@@ -6,6 +6,7 @@ import { SHARE_SCENE } from "@/common/enum"
import { GetShortCodeApi } from "@/api/share"
import { alert } from "@/common/common"
import { LoginApi } from "@/api/login"
+import { IMG_CND_Prefix } from "@/common/constant"
export default () => {
const {setUserInfo, setAdminUserInfo, setSortCode, userInfo} = useUserInfo()
@@ -122,7 +123,7 @@ export default () => {
const {fetchData: fetchDataShortCode} = GetShortCodeApi()
const getShortCode = async (user_id) => {
const {data: resPage} = await fetchDataShortCode({"share_user_id": user_id, type:SharePage.value})
- setSortCode({...userInfo.sort_code, shareShortPage: {title: '陆盈电子商城', code: resPage.md5_key, img:''}})
+ setSortCode({...userInfo.sort_code, shareShortPage: {title: '打造面料爆品 专注客户服务', code: resPage.md5_key, img:IMG_CND_Prefix + '/mall/share_img_01.png'}})
}
return {