diff --git a/src/components/FromList/index.scss b/src/components/FromList/index.scss
index c59c84e..38257e1 100644
--- a/src/components/FromList/index.scss
+++ b/src/components/FromList/index.scss
@@ -24,8 +24,23 @@
display: flex;justify-content: space-between;
align-items: center;
}
+ .form-list-input{
+ width: 100%;
+ display: flex;align-items: center;
+ }
+ .form-list-input text{
+ width: 30px;
+ min-width: 30px;
+ height: 30px;
+ background: rgba(0,0,0,0.3);
+ border-radius: 50%;
+ font-size: 18px;
+ display: flex;align-items: center;
+ justify-content: center;
+ flex: 1;
+ }
.form-list-right input,.form-list-right textarea{
- flex: 0 0 auto;
+ // flex: 0 0 auto;
min-height: 100%;
width: 100%;
color: #000000;
diff --git a/src/components/FromList/index.tsx b/src/components/FromList/index.tsx
index 2d428cf..6635fec 100644
--- a/src/components/FromList/index.tsx
+++ b/src/components/FromList/index.tsx
@@ -25,7 +25,11 @@ const FromList = memo((props:ListParams)=>{
props.children??
{
- type=="input"?:
+ type=="input"?
+
+
+ {value&&}
+ :
type=="textarea"?:
<>
{
diff --git a/src/pages/addressAdd/index.tsx b/src/pages/addressAdd/index.tsx
index 3fea805..1b60b60 100644
--- a/src/pages/addressAdd/index.tsx
+++ b/src/pages/addressAdd/index.tsx
@@ -43,7 +43,7 @@ export default ()=>{
-
+
设为默认地址
diff --git a/src/pages/company/index.tsx b/src/pages/company/index.tsx
index 84633f1..be5e165 100644
--- a/src/pages/company/index.tsx
+++ b/src/pages/company/index.tsx
@@ -50,7 +50,7 @@ export default ()=>{
-
+
diff --git a/src/pages/user/index.module.scss b/src/pages/user/index.module.scss
index d6abee5..2f57bfe 100644
--- a/src/pages/user/index.module.scss
+++ b/src/pages/user/index.module.scss
@@ -60,6 +60,22 @@
}
.card-info-right{
font-size: 26px;
+ display: flex;align-items: flex-end;
+ }
+ .setup-icon{
+ position: relative;
+ padding-bottom: 10px;
+ }
+ .icon-wrapper{
+ font-size: 60px;
+ }
+ .icon-point{
+ width: 8px;
+ height: 8px;
+ border-radius: 50%;
+ background: #ff0000;
+ position: absolute;
+ right: 0;top: 0;
}
.card-main-title{
diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx
index b742df6..4683787 100644
--- a/src/pages/user/index.tsx
+++ b/src/pages/user/index.tsx
@@ -1,6 +1,7 @@
-import { View,Image,Text } from "@tarojs/components"
+import { View,Image,Text, Navigator } from "@tarojs/components"
import { memo } from "react"
import styles from './index.module.scss'
+import classnames from "classnames";
export default () => {
@@ -29,7 +30,14 @@ const Header = memo(()=>{
- 1
+
+
+
+
diff --git a/src/pages/userEdit/index.tsx b/src/pages/userEdit/index.tsx
index 61ba8a8..4f2932a 100644
--- a/src/pages/userEdit/index.tsx
+++ b/src/pages/userEdit/index.tsx
@@ -80,8 +80,10 @@ const UserEditList = memo((props:any)=>{
// popup内容
const PopupContent = memo((props:any)=>{
+ const [value, setValue] = useState("");
// popup输入长度
const handleTextareaInput = (ev:any)=>{
+ setValue(ev.detail.value.slice(0,20));
}
// 重置
const handleTextareaReset = ()=>{
@@ -91,8 +93,8 @@ const PopupContent = memo((props:any)=>{
props.setPopupShow(false)} title="修改昵称" show={props.show}>
-
请设置2-20个字符,由中文、英文、数字、-和_组成
diff --git a/src/pages/weightList/index.tsx b/src/pages/weightList/index.tsx
index 29f89ab..9d61745 100644
--- a/src/pages/weightList/index.tsx
+++ b/src/pages/weightList/index.tsx
@@ -27,7 +27,7 @@ const WeightList = memo((props:Params)=>{
setRefreshState(false);
},500)
}
- const data = Array.from({length:15});
+ const data = Array.from({length:0});
return (
@@ -54,7 +54,10 @@ const WeightList = memo((props:Params)=>{
);
}):
- 暂未添加地址
+
+ 您末添加任何码单信息
+ 正在使用平台默认码单信息
+
}
添加新码单信息
diff --git a/src/pages/weightListAdd/index.scss b/src/pages/weightListAdd/index.scss
index 69db495..3ccabe1 100644
--- a/src/pages/weightListAdd/index.scss
+++ b/src/pages/weightListAdd/index.scss
@@ -7,6 +7,26 @@
font-size: 26px;
font-weight: 700;
color: #000000;
+ padding-right: 20px;
+ box-sizing: border-box;
+ }
+ .add-address-default-active{
+ width: 50px;
+ height: 50px;
+ background: #007aff;
+ border-radius: 50%;
+ display: flex;align-items: center;
+ justify-content: center;
+ font-size: 45px;
+ color: white;
+ box-sizing: border-box;
+ }
+ .add-address-default-noactive{
+ width: 50px;
+ height: 50px;
+ border: 2px solid #707070;
+ border-radius: 50%;
+ box-sizing: border-box;
}
.add-address-save{
diff --git a/src/pages/weightListAdd/index.tsx b/src/pages/weightListAdd/index.tsx
index 32ca7a5..465a7b8 100644
--- a/src/pages/weightListAdd/index.tsx
+++ b/src/pages/weightListAdd/index.tsx
@@ -20,11 +20,13 @@ export default ()=>{
aa: "",
bb:"",
cc:"",
- dd:""
+ dd:"",
+ ee: 0
})
const handleSave = ()=>{
Taro.navigateBack();
}
+ const handleSelectDefault = ()=>setFormData({...formData ,ee: formData.ee?0:1});
return (
@@ -33,7 +35,12 @@ export default ()=>{
设为默认地址
- 1
+
+ {
+ formData.ee?✓
+ :
+ }
+
diff --git a/src/styles/iconfont.scss b/src/styles/iconfont.scss
index b99fac8..868bd5f 100644
--- a/src/styles/iconfont.scss
+++ b/src/styles/iconfont.scss
@@ -12,6 +12,42 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-yifahuo:before {
+ content: "\e65b";
+}
+
+.icon-daipeibu:before {
+ content: "\e662";
+}
+
+.icon-yaoqingtuandui:before {
+ content: "\e65a";
+}
+
+.icon-a-tuikuanshouhou:before {
+ content: "\e65c";
+}
+
+.icon-daifukuan:before {
+ content: "\e65d";
+}
+
+.icon-shezhi:before {
+ content: "\e65e";
+}
+
+.icon-yanseduibi:before {
+ content: "\e65f";
+}
+
+.icon-daifahuo:before {
+ content: "\e660";
+}
+
+.icon-baoguo:before {
+ content: "\e661";
+}
+
.icon-tick-pressed:before {
content: "\e652";
}
@@ -40,10 +76,6 @@
content: "\e64a";
}
-.icon-baoguo:before {
- content: "\e64b";
-}
-
.icon-qingkong:before {
content: "\e64c";
}
@@ -54,44 +86,4 @@
.icon-jian:before {
content: "\e64e";
-}
-
-.icon-shoucang-pressed:before {
- content: "\e64f";
-}
-
-.icon-shoucang:before {
- content: "\e650";
-}
-
-.icon-phone:before {
- content: "\e651";
-}
-
-.icon-tick:before {
- content: "\e653";
-}
-
-.icon-a-moreback:before {
- content: "\e654";
-}
-
-.icon-fenlei:before {
- content: "\e657";
-}
-
-.icon-bianji:before {
- content: "\e658";
-}
-
-.icon-wode:before {
- content: "\e659";
-}
-
-.icon-sort-up-full:before {
- content: "\ea4c";
-}
-
-.icon-sort-down-full:before {
- content: "\ea4d";
}
\ No newline at end of file
diff --git a/src/styles/iconfont.ttf b/src/styles/iconfont.ttf
index fcf854d..02f0408 100644
Binary files a/src/styles/iconfont.ttf and b/src/styles/iconfont.ttf differ