diff --git a/config/prod.js b/config/prod.js
index 31497d7..30ccf79 100644
--- a/config/prod.js
+++ b/config/prod.js
@@ -1,3 +1,4 @@
+const path = require('path')
module.exports = {
env: {
NODE_ENV: '"production"'
@@ -14,5 +15,11 @@ module.exports = {
* .use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin, [])
* }
*/
+ },
+ alias: {
+ '@': path.resolve(__dirname, '..', 'src'),
+ },
+ sass: {
+ resource: path.resolve(__dirname, '..', 'src/styles/common.scss')
}
}
diff --git a/src/app.config.ts b/src/app.config.ts
index 487ef1c..28257f6 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -67,7 +67,25 @@ export default {
]
},
{
- root: "pages/addAddress",
+ root: "pages/addressAdd",
+ pages: [
+ "index"
+ ]
+ },
+ {
+ root: "pages/company",
+ pages: [
+ "index"
+ ]
+ },
+ {
+ root: "pages/weightList",
+ pages: [
+ "index"
+ ]
+ },
+ {
+ root: "pages/weightListAdd",
pages: [
"index"
]
diff --git a/src/common/common.ts b/src/common/common.ts
index d0266a1..a5a7bc8 100644
--- a/src/common/common.ts
+++ b/src/common/common.ts
@@ -22,4 +22,68 @@ export const goLink = (path = '', params = {}, type:false|true = false) => {
}
}
-}
\ No newline at end of file
+}
+/**
+ * 判断对象为空
+ * @param object
+ * @returns
+ */
+export const isEmptyObject = (object: any)=>{
+ if(object==undefined||object==null||Number.isNaN(object)){
+ return true;
+ }else{
+ if(object.constructor==Object){
+ return Reflect.ownKeys(object).length==0;
+ }else if(object.constructor==Array){
+ return object.length==0;
+ }else if(object.constructor==String){
+ return object=="";
+ }
+ }
+ return false;
+ }
+
+/**
+ * 表单检索
+ * @param data
+ * @param rules
+ * @param message
+ * @returns
+ */
+export const retrieval = (data: any, message: string="请填写完信息", rules?: Object)=>{
+ return new Promise((resolve, reject)=>{
+ if(rules){
+ const keys = Reflect.ownKeys(rules);
+ const result = keys.some((key:any)=>{
+ for(let item of (rules as any)[key]){
+
+ let _res = false;
+ if(item.validator){
+ if(item.validator(data[key],item)){
+ _res=true;
+ }
+ }else if(item.regex){
+ if(!item.regex.test(data[key])){
+ _res=true;
+ }
+ }else{
+ if(isEmptyObject(data[key])){
+ _res=true;
+ }
+ }
+ message = item.message;
+ return _res;
+ }
+ });
+ if(result){
+ reject(message);
+ }
+ }else{
+ const keys = Reflect.ownKeys(data);
+ if(keys.some((key:any)=>isEmptyObject(data[key]))){
+ reject(message);
+ }
+ }
+ resolve(null);
+ })
+ }
\ No newline at end of file
diff --git a/src/components/AddressList/index.scss b/src/components/AddressList/index.scss
index 1e94570..78f6d40 100644
--- a/src/components/AddressList/index.scss
+++ b/src/components/AddressList/index.scss
@@ -16,6 +16,7 @@
padding: 30px;
box-sizing: border-box;
margin: 18px auto 0;
+ border: 1px solid #ffffff;
}
.address-list:hover{
border: 1px solid #68b4ff;
@@ -50,8 +51,8 @@
color: #ababab;
margin-left: 30px;
}
- .address-edit{
- font-size: 26px;
+ .address-edit .icon-bianji{
+ font-size: 40px;
}
.address-list-info{
@@ -75,4 +76,13 @@
position: absolute;bottom: 8%;left: 50%;
transform: translateX(-50%);
}
+ .address-no-data{
+ font-size: 24px;
+ font-weight: 400;
+ text-align: center;
+ color: #707070;
+ height: 100%;
+ padding-top: 40%;
+ box-sizing: border-box;
+ }
}
\ No newline at end of file
diff --git a/src/components/AddressList/index.tsx b/src/components/AddressList/index.tsx
index bc1b374..1681fbc 100644
--- a/src/components/AddressList/index.tsx
+++ b/src/components/AddressList/index.tsx
@@ -1,6 +1,6 @@
import { Button, Navigator, ScrollView, Text, View } from "@tarojs/components"
-import { useState } from "react"
+import { memo, useState } from "react"
import "./index.scss"
interface Params{
@@ -10,22 +10,23 @@ interface Params{
}
// 地址列表
-const AddressList = (props:Params)=>{
+const AddressList = memo((props:Params)=>{
// 处理刷新
const [refreshState, setRefreshState] = useState(false);
const handleRefresh = ()=>{
setRefreshState(true);
setTimeout(()=>{
setRefreshState(false);
- },3000)
-
+ },500)
}
+ const data = Array.from({length:15});
return (
{
- Array.from({length:15}).map((item,index)=>{
+ data.length>0?
+ data.map((item,index)=>{
return(
props.onSelect&&props.onSelect(item,index)} className="address-list">
@@ -38,16 +39,19 @@ const AddressList = (props:Params)=>{
**省**市**区**街道****仓库
181****9790
- 编辑
+
+
+
);
- })
+ }):
+ 暂未添加地址
}
- 添加收货地址
+ 添加收货地址
)
-}
+})
export default AddressList;
\ No newline at end of file
diff --git a/src/pages/addAddress/index.scss b/src/components/FromList/index.scss
similarity index 80%
rename from src/pages/addAddress/index.scss
rename to src/components/FromList/index.scss
index b77fdba..c59c84e 100644
--- a/src/pages/addAddress/index.scss
+++ b/src/components/FromList/index.scss
@@ -1,10 +1,8 @@
-.add-address{
+.form-list{
+ display: flex;
+ justify-content: space-between;
+ margin: 30px 30px 0;
- .form-list{
- display: flex;
- justify-content: space-between;
- margin: 30px 30px 0;
- }
.form-list-label{
font-size: 28px;
font-weight: 700;
@@ -13,13 +11,16 @@
}
.form-list-right{
width: 506px;
- min-height: 80px;
- background: #f6f6f6;
- border-radius: 20px;
- padding: 10px 20px;
- box-sizing: border-box;
font-size: 26px;
font-weight: 400;
+ }
+ .form-list-right-meet{
+ background: #f6f6f6;
+ width: 506px;
+ min-height: 80px;
+ border-radius: 20px;
+ box-sizing: border-box;
+ padding: 10px 20px;
display: flex;justify-content: space-between;
align-items: center;
}
@@ -32,6 +33,7 @@
.form-list-right textarea{
height: 186px;
border-radius: 10px;
+ padding: 10px 0;
}
.form-list-right .phcolor{
color: #ababab;
@@ -39,8 +41,8 @@
.form-list-right-placeholder{
color: #ababab;
}
- .form-list-right-enter{
-
+ .form-list-right-enter .icon-a-moreback{
+ font-size: 28px;
}
.add-address-default{
display: flex;align-items: center;justify-content: space-between;
diff --git a/src/components/FromList/index.tsx b/src/components/FromList/index.tsx
new file mode 100644
index 0000000..2d428cf
--- /dev/null
+++ b/src/components/FromList/index.tsx
@@ -0,0 +1,46 @@
+
+import { Input, Text, Textarea, View } from "@tarojs/components"
+import { memo } from "react"
+import "./index.scss"
+
+interface ListParams{
+ label: string, //左边label
+ onInput?: ()=>any, // 输入框输入
+ onClick?:()=>any, //点击列表
+ placeholder?:string, // 提示文本
+ children?: any, // 插槽
+ type?: string // 类型：1.input,2.textarea,3.select
+ value?: any
+}
+
+// 表单列表
+const FromList = memo((props:ListParams)=>{
+ const {type="input",value=""} = props;
+
+ return (
+
+ {props.label}
+
+ {
+ props.children??
+
+ {
+ type=="input"?:
+ type=="textarea"?:
+ <>
+ {
+ props.value?{value}:
+
+ {props.placeholder}
+
+ }
+
+
+ }
+
+ }
+
+
+ )
+})
+export default FromList;
\ No newline at end of file
diff --git a/src/pages/addAddress/index.config.ts b/src/pages/addAddress/index.config.ts
deleted file mode 100644
index 367665a..0000000
--- a/src/pages/addAddress/index.config.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export default {
- navigationBarTitleText: '新增收货地址'
-}
diff --git a/src/pages/addAddress/index.tsx b/src/pages/addAddress/index.tsx
deleted file mode 100644
index 7ed107f..0000000
--- a/src/pages/addAddress/index.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-
-import Address from "@/components/address"
-import { Button, Input, Text, Textarea, View } from "@tarojs/components"
-import { useState } from "react"
-import "./index.scss"
-
-export default ()=>{
- const [showSiteModal, setShowSiteModal] = useState(false);
- const handleSelectSite = ()=>{
- setShowSiteModal(true);
- }
-
- // 保存
- const [formData, setFormData] = useState({
- aa: "",
- bb:"",
- cc:"",
- dd:""
- })
- const handleSave = ()=>{
-
- }
-
- return (
-
-
-
-
-
-
- 设为默认地址
- 1
-
-
-
- setShowSiteModal(false)} show={showSiteModal}/>
-
- )
-}
-
-// 表单列表
-const FromList = (props:ListParams)=>{
- const {type="input",value=""} = props;
-
- return (
-
- {props.label}
-
- {
- props.children??(
- type=="input"?:
- type=="textarea"?:
- <>
- {
- props.value?{value}:
-
- {props.placeholder}
-
- }
- 1
-
- )
- }
-
-
- )
-}
-interface ListParams{
- label: string, //左边label
- onInput?: ()=>any, // 输入框输入
- onClick?:()=>any, //点击列表
- placeholder?:string, // 提示文本
- children?: any, // 插槽
- type?: string // 类型：1.input,2.textarea,3.select
- value?: any
-}
\ No newline at end of file
diff --git a/src/pages/addressAdd/index.config.ts b/src/pages/addressAdd/index.config.ts
new file mode 100644
index 0000000..969ece3
--- /dev/null
+++ b/src/pages/addressAdd/index.config.ts
@@ -0,0 +1,3 @@
+export default {
+ navigationBarTitleText: ''
+}
diff --git a/src/pages/addressAdd/index.scss b/src/pages/addressAdd/index.scss
new file mode 100644
index 0000000..69db495
--- /dev/null
+++ b/src/pages/addressAdd/index.scss
@@ -0,0 +1,23 @@
+.add-address{
+ display: flex;
+ flex-direction: column;
+ .add-address-default{
+ display: flex;align-items: center;justify-content: space-between;
+ margin: 70px 30px 0;
+ font-size: 26px;
+ font-weight: 700;
+ color: #000000;
+ }
+
+ .add-address-save{
+ width: 668px;
+ height: 82px;
+ background: #68b4ff;
+ border-radius: 40px;
+ font-size: 32px;
+ font-weight: 400;
+ color: #ffffff;
+ display: flex;align-items: center;justify-content: center;
+ margin: 620px auto 0;
+ }
+}
\ No newline at end of file
diff --git a/src/pages/addressAdd/index.tsx b/src/pages/addressAdd/index.tsx
new file mode 100644
index 0000000..3fea805
--- /dev/null
+++ b/src/pages/addressAdd/index.tsx
@@ -0,0 +1,59 @@
+
+import { retrieval } from "@/common/common"
+import Address from "@/components/address"
+import FromList from "@/components/FromList"
+import { Button, Input, Text, Textarea, View } from "@tarojs/components"
+import Taro, { setNavigationBarTitle, useRouter } from "@tarojs/taro"
+import { useEffect, useState } from "react"
+import "./index.scss"
+
+export default ()=>{
+ const [showSiteModal, setShowSiteModal] = useState(false);
+ const {type} = useRouter().params;
+ useEffect(()=>{
+ if(type=="add"){
+ setNavigationBarTitle({title:"新增收货地址"})
+ }else{
+ setNavigationBarTitle({title:"编辑收货地址"})
+ }
+ },[])
+
+ const handleSelectSite = ()=>{
+ setShowSiteModal(true);
+ }
+
+ // 保存
+ const [formData, setFormData] = useState({
+ aa: "1",
+ bb:"2",
+ cc:"aa",
+ dd:"d"
+ })
+ const handleSave = ()=>{
+ Taro.navigateBack();
+ }
+ const [hozon, setHozon] = useState(false);
+ useEffect(()=>{
+ if(retrieval){
+ retrieval(formData).then(()=>setHozon(true)).catch(()=>setHozon(false))
+ }
+ },[formData])
+
+ return (
+
+
+
+
+
+
+ 设为默认地址
+ 1
+
+
+
+ setShowSiteModal(false)} show={showSiteModal}/>
+
+ )
+}
diff --git a/src/pages/company/index.config.ts b/src/pages/company/index.config.ts
new file mode 100644
index 0000000..ef79748
--- /dev/null
+++ b/src/pages/company/index.config.ts
@@ -0,0 +1,3 @@
+export default {
+ navigationBarTitleText: '公司资料'
+}
diff --git a/src/pages/company/index.scss b/src/pages/company/index.scss
new file mode 100644
index 0000000..17d4e67
--- /dev/null
+++ b/src/pages/company/index.scss
@@ -0,0 +1,44 @@
+.company{
+ display: flex;
+ flex-direction: column;
+ .save-button{
+ width: 668px;
+ height: 82px;
+ background: #007aff;
+ border-radius: 40px;
+ font-size: 32px;
+ font-weight: 400;
+ color: #ffffff;
+ display: flex;align-items: center;justify-content: center;
+ margin: 320px auto 0;
+ }
+
+ .form-radio{
+ display: flex;
+ flex-wrap: wrap;align-items: center;
+ }
+ .form-radio view{
+ height: 54px;
+ background: #f0f0f0;
+ border-radius: 28px;
+ font-size: 24px;
+ font-weight: 400;
+ color: #707070;
+ padding: 10px 28px;
+ box-sizing: border-box;
+ display: flex;align-items: center;justify-content: center;
+ margin: 10px;
+ border: 2px solid #f0f0f0;
+ max-width: 100%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 1;
+ overflow: hidden;
+ }
+ .form-radio .form-radio-active{
+ background: #ecf5ff;
+ border: 2px solid #cde5ff;
+ }
+}
\ No newline at end of file
diff --git a/src/pages/company/index.tsx b/src/pages/company/index.tsx
new file mode 100644
index 0000000..84633f1
--- /dev/null
+++ b/src/pages/company/index.tsx
@@ -0,0 +1,61 @@
+
+import Address from "@/components/address"
+import FromList from "@/components/FromList"
+import { Button, Input, Text, Textarea, View } from "@tarojs/components"
+import Taro, { getCurrentPages, useRouter } from "@tarojs/taro"
+import { useEffect, useState } from "react"
+import "./index.scss"
+
+export default ()=>{
+ const [showSiteModal, setShowSiteModal] = useState(false);
+
+ const handleSelectSite = ()=>{
+ setShowSiteModal(true);
+ }
+
+
+ // 保存
+ const [formData, setFormData] = useState({
+ aa: "",
+ bb:"",
+ cc:"",
+ dd:""
+ })
+ const handleSave = ()=>{
+ const pages = getCurrentPages();
+ const prevPage = pages[pages.length-2];
+ Taro.eventCenter.trigger('message:detail', { text: 'test' })
+
+ Taro.navigateBack();
+ }
+ // 单选
+ const radioData = ['布行','二批','制衣厂'];
+ const [radioActive, setRadioActive] = useState(0);
+ const handleActiveRadio = (index:number)=>{
+ setRadioActive(index);
+ }
+
+ return (
+
+
+
+
+
+ {
+ radioData.map((item,index)=>{
+ return handleActiveRadio(index)} className={radioActive==index?'form-radio-active':''} key={index}>{item}
+ })
+ }
+
+
+
+
+
+
+
+
+
+ setShowSiteModal(false)} show={showSiteModal}/>
+
+ )
+}
diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx
index c95df26..b742df6 100644
--- a/src/pages/user/index.tsx
+++ b/src/pages/user/index.tsx
@@ -43,7 +43,7 @@ const Header = memo(()=>{
return (
- 待配布
+ {item.text}
)
})
diff --git a/src/pages/userEdit/index.scss b/src/pages/userEdit/index.scss
index bed20e5..154525b 100644
--- a/src/pages/userEdit/index.scss
+++ b/src/pages/userEdit/index.scss
@@ -50,6 +50,9 @@
.user-edit-list-right-placeholder{
color: #cccccc;
}
+ .user-edit-list-right .icon-a-moreback{
+ font-size: 30px;
+ }
.user-edit-logout{
width: 668px;
@@ -67,6 +70,7 @@
.user-edit-popup-content{
margin: 0 auto;
width: 658px;
+ padding-bottom: 50px;
}
.user-edit-popup-input{
width: 658px;
diff --git a/src/pages/userEdit/index.tsx b/src/pages/userEdit/index.tsx
index 92a7364..61ba8a8 100644
--- a/src/pages/userEdit/index.tsx
+++ b/src/pages/userEdit/index.tsx
@@ -1,6 +1,8 @@
+import { goLink } from "@/common/common";
import Popup from "@/components/popup";
import { Button, Image, Text, Textarea, View } from "@tarojs/components"
+import Taro, { chooseMedia } from "@tarojs/taro";
import { memo, useCallback, useState } from "react"
import "./index.scss"
@@ -20,24 +22,40 @@ export default ()=>{
const handleTextareaSave = ()=>{
}
+ Taro.eventCenter.on('message:detail', (message) => console.log(message))
+ // 面面跳转
+ const onNavigate = (url:string)=>{
+ goLink(url);
+ }
+ // 肖像编辑
+ const handleSelectRortrait = ()=>{
+ chooseMedia({
+ count: 1,
+ mediaType: ["image"],
+ success(ev){
+ console.log(ev);
+
+ }
+ })
+ }
return (
-
+
点击编辑头像
triggerList('nickname')} data={formData} label="昵称" placeholder="请输入" icon=""/>
-
-
-
+ onNavigate("/pages/company/index")} label="公司/组织" placeholder="请输入" icon=""/>
+ onNavigate("/pages/addressManager/index")} label="地址管理" placeholder="添加 / 修改收货地址" icon=""/>
+ onNavigate("/pages/weightList/index")} label="码单管理" placeholder="修改码单抬头 / 客户 / 电话等显示信息" icon=""/>
-
+
)
}
@@ -54,7 +72,7 @@ const UserEditList = memo((props:any)=>{
{props.placeholder}
{/* 请输入 */}
- 1
+
)
@@ -63,9 +81,7 @@ const UserEditList = memo((props:any)=>{
// popup内容
const PopupContent = memo((props:any)=>{
// popup输入长度
- const [inputLength, setInputLength] = useState(0);
const handleTextareaInput = (ev:any)=>{
- setInputLength(ev.detail.value.length);
}
// 重置
const handleTextareaReset = ()=>{
@@ -75,8 +91,8 @@ const PopupContent = memo((props:any)=>{
props.setPopupShow(false)} title="修改昵称" show={props.show}>
-