From da7c834198b408725f6c3c2a1fc0f2ff6a50bfad Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Thu, 14 Jul 2022 11:47:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E=E6=B5=8B=E8=AF=95=E7=89=88v5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/common/constant.js | 4 +--
src/components/orderBtns/index.tsx | 6 ++--
src/components/shopCart/index.module.scss | 39 ++++++++++++++------
src/components/shopCart/index.tsx | 43 ++++++++++++-----------
src/pages/applyAfterSales/index.tsx | 8 +++--
src/pages/userEdit/index.tsx | 22 ++++++++----
src/reducers/userInfo.ts | 11 +++++-
7 files changed, 87 insertions(+), 46 deletions(-)
diff --git a/src/common/constant.js b/src/common/constant.js
index 4b55726..346a828 100644
--- a/src/common/constant.js
+++ b/src/common/constant.js
@@ -4,7 +4,7 @@
// export const BASE_URL = `http://10.0.0.5:50001/lymarket`
// export const BASE_URL = `http://192.168.0.89:40001/lymarket`
// export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞
-// export const BASE_URL = `https://test.zzfzyc.com/lymarket` // 测试环境
+export const BASE_URL = `https://test.zzfzyc.com/lymarket` // 测试环境
// export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发
// export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发
// export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
@@ -12,7 +12,7 @@
// 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.42:50001/lymarket` // 杰
+// export const BASE_URL = `http://192.168.1.42:50001/lymarket` // 杰
// CDN
// 生成密钥
diff --git a/src/components/orderBtns/index.tsx b/src/components/orderBtns/index.tsx
index e5468cc..028ea5e 100644
--- a/src/components/orderBtns/index.tsx
+++ b/src/components/orderBtns/index.tsx
@@ -47,7 +47,7 @@ export default memo(({orderInfo, onClick}:Param) => {
SaLeModeWeightCut,
} = SALE_MODE
- //订单按钮按订单状态归类, value是该订单状态，可能该按钮会出现
+ //注册按钮
const orderBtnsList = useRef([
{
@@ -60,7 +60,7 @@ export default memo(({orderInfo, onClick}:Param) => {
SaleOrderStatusWaitingPayment.value,
SaleOrderStatusTaking.value,
SaleOrderStatusWaitingDelivery.value], //取消订单按钮对应： 待接单，配布中，已配布, 待付款， 待发货, 提货中
- label: '取消订单'
+ label: '取消订单',
},
{
id: 3,
@@ -112,7 +112,7 @@ export default memo(({orderInfo, onClick}:Param) => {
//取消订单按钮
return( orderInfo.actual_amount == 0 && item.value.includes(orderInfo.status)) //在待发货之前没有付过款
} else if (item.id == 2) {
- //去付款按钮(这里后端偷偷改了逻辑)
+ //去付款按钮
return( orderInfo.wait_pay_amount != 0 && item.value.includes(orderInfo.status)) //只要没有付完款就显示
} else if(item.id == 3 ) {
//申请退款, 只有大货才有
diff --git a/src/components/shopCart/index.module.scss b/src/components/shopCart/index.module.scss
index e862c14..7efbac4 100644
--- a/src/components/shopCart/index.module.scss
+++ b/src/components/shopCart/index.module.scss
@@ -54,7 +54,7 @@
padding-bottom: 120px;
.product_item{
display: flex;
- justify-content: space-between;
+ align-items: center;
&:nth-child(n+2) {
margin-top: 37px;
}
@@ -80,14 +80,11 @@
margin-left: 20px;
padding-right: 10px;
box-sizing: border-box;
- .title{
- font-size: $font_size;
- color: $color_font_one;
- @include common_ellipsis;
- }
+
.subtitle{
color: $color_font_two;
font-size: $font_size_medium;
+ margin: 10px 0;
}
.tag{
font-size: $font_size_min;
@@ -106,9 +103,7 @@
}
.count{
display: flex;
- flex-direction: column;
justify-content: space-between;
- align-items: flex-end;
.btn_count{
width: 235px;
height: 64px;
@@ -118,6 +113,25 @@
display: flex;
align-items: center;
}
+
+ .long{
+ color: $color_main;
+ font-size: $font_size_medium;
+ }
+ }
+ .product_item_name{
+ display: flex;
+ flex-direction: column;
+ flex: 1;
+ color: #3C3C3C;
+
+ }
+ .product_item_name_header{
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 10px;
+ margin-left: 20px;
+ font-size: 28px;
.price{
font-size: $font_size;
font-weight: 700;
@@ -126,9 +140,12 @@
font-size: $font_size_min;
}
}
- .long{
- color: $color_main;
- font-size: $font_size_medium;
+ .title{
+ font-size: $font_size;
+ color: $color_font_one;
+ padding-right: 10px;
+ @include common_ellipsis;
+ flex: 1;
}
}
}
diff --git a/src/components/shopCart/index.tsx b/src/components/shopCart/index.tsx
index b245395..a41218c 100644
--- a/src/components/shopCart/index.tsx
+++ b/src/components/shopCart/index.tsx
@@ -307,26 +307,29 @@ export default ({show = false, onClose}: param) => {
-
- {formatHashTag(item.product_code, item.product_name)}
- {item.product_color_code +' ' + item.product_color_name}
- {item.sale_mode_name}
-
-
- ￥{formatPirce(item.sale_price)}/{selectList[item.sale_mode].eunit}
- {/* ×{formatCount(item)}{selectList[selectIndex].unit} */}
-
- getInputValue(e, item)}
- defaultNum={formatCount(item)}
- step={selectList[selectIndex].step}
- digits={selectList[selectIndex].digits}
- onClickBtn={(e) => getInputValue(e, item)}
- unit={formatUnit(item)}
- minNum={selectList[selectIndex].minNum}
- maxNum={selectList[selectIndex].maxNum}
- disable={UpdateShoppingCartLoading}
- />
+
+
+ {formatHashTag(item.product_code, item.product_name)}
+ ￥{formatPirce(item.sale_price)}/{selectList[item.sale_mode].eunit}
+
+
+
+ {item.product_color_code +' ' + item.product_color_name}
+ {item.sale_mode_name}
+
+
+ getInputValue(e, item)}
+ defaultNum={formatCount(item)}
+ step={selectList[selectIndex].step}
+ digits={selectList[selectIndex].digits}
+ onClickBtn={(e) => getInputValue(e, item)}
+ unit={formatUnit(item)}
+ minNum={selectList[selectIndex].minNum}
+ maxNum={selectList[selectIndex].maxNum}
+ disable={UpdateShoppingCartLoading}
+ />
+
diff --git a/src/pages/applyAfterSales/index.tsx b/src/pages/applyAfterSales/index.tsx
index 3a46f34..c72585d 100644
--- a/src/pages/applyAfterSales/index.tsx
+++ b/src/pages/applyAfterSales/index.tsx
@@ -3,7 +3,7 @@ import { FC, memo, useCallback, useEffect, useMemo, useRef, useState } from "rea
import classnames from "classnames";
import styles from './index.module.scss'
import ReasonPopup from "./components/reasonPopup";
-import { useDidShow, useRouter } from "@tarojs/taro";
+import Taro, { useDidShow, useRouter } from "@tarojs/taro";
import { GetSaleOrderDetailApi } from "@/api/order";
import KindList from "./components/kindList"
import CutKindList from "./components/cutkindList"
@@ -129,7 +129,7 @@ export default () => {
//提交数据
const {fetchData: fetchDataReturnApply} = ReturnApplyOrderApi()
const onSubmitData = async () => {
- if(submitData.roll_list.length <= 0) return alert.error('请选择退货颜色')
+ if(submitData.roll_list.length <= 0) return alert.none('请选择或输入退货颜色')
console.log('submitData::',submitData)
let res = await fetchDataReturnApply(submitData)
if(res.success) {
@@ -143,8 +143,10 @@ export default () => {
//底部按钮
const onSubmit = throttle((val) => {
if(val == 2) {
- if(!submitData.return_explain) return alert.error('请填写其他说明')
+ if(!submitData.return_explain && !submitData.reason_describe) return alert.error('请填写其他说明')
onSubmitData()
+ } else {
+ Taro.navigateBack()
}
}, 600)
diff --git a/src/pages/userEdit/index.tsx b/src/pages/userEdit/index.tsx
index 1372fc7..f6eca7f 100644
--- a/src/pages/userEdit/index.tsx
+++ b/src/pages/userEdit/index.tsx
@@ -5,7 +5,7 @@ import { Button, Image, Picker, Text, Textarea, View } from "@tarojs/components"
import Taro, { chooseMedia } from "@tarojs/taro";
import { realNameUpdateApi, companyTypeApi, portraitUpdateApi } from "@/api/user";
import { companyDetailApi, companyUpdateApi } from "@/api/company"
-import { memo, useCallback, useEffect, useRef, useState } from "react"
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react"
import "./index.scss"
import ModifyModal from "./components/ModifyModal";
import useLogin from "@/use/useLogin";
@@ -32,9 +32,7 @@ export default () => {
getCompanyTypeData();
}, [])
// 表单数据
- const [formData, setFormData] = useState({
- user_name: "麦兜"
- });
+ const [formData, setFormData] = useState(adminUserInfo);
// 昵称修改保存
const { fetchData: realNameUpdateFetch } = realNameUpdateApi();
const rules = {
@@ -128,6 +126,7 @@ export default () => {
const { value } = ev.detail;
const item = companyTypeData.data.list && companyTypeData.data.list[value];
if (item) {
+ if(item.id == 0) return alert.error('请选择类型')
const params = await getCompanyFetch();
const result = await saveFetch({
...params.data,
@@ -150,6 +149,17 @@ export default () => {
goLink('/pages/index/index',{}, 'switchTab')
}
+ const comanyTypeDataFormat = useMemo(() => {
+ if(companyTypeData.data.list) {
+ return companyTypeData.data.list?.map(item => {
+ if(item.id == 0) item.name = '--请选择类型--'
+ return item
+ })
+ } else {
+ return []
+ }
+ }, [companyTypeData])
+
return (
@@ -172,8 +182,8 @@ export default () => {
组织资料
(ModifyCompanyNameEl.current as any).setModalShow(true)} data={(formData as any)?.company_name} label="名称" placeholder="待绑定" icon="" />
-
- {(companyTypeData.data as any).list && (companyTypeData.data as any).list[(formData as any)?.company_type_index].name}
+
+ {formData?.purchaser_type_name}
onNavigate("/pages/certification/index")} label="我的认证" placeholder="待绑定" icon="">
diff --git a/src/reducers/userInfo.ts b/src/reducers/userInfo.ts
index 6a4cb11..9edaa36 100644
--- a/src/reducers/userInfo.ts
+++ b/src/reducers/userInfo.ts
@@ -41,7 +41,16 @@ export type UserAdminParam = {
is_authorize_name?: false|true,
is_authorize_phone?: false|true,
phone?:string,
- authentication_status?:number
+ authentication_status?:number,
+ authentication_status_name: string,
+ company_id?: number,
+ company_name?: string,
+ founder_user_id?: string,
+ founder_user_name?: string,
+ order_access_status?: number,
+ order_access_status_name?: string,
+ purchaser_type?: number,
+ purchaser_type_name?: string
}
export type SortCodeParam = {