From 08acb377692a4a2e1b6ab4a8babd4d92b5a8e709 Mon Sep 17 00:00:00 2001
From: li tong bao <2903733959@qq.com>
Date: Thu, 28 Apr 2022 18:13:36 +0800
Subject: [PATCH] =?UTF-8?q?--=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E8=AE=BE=E7=BD=AE=E5=9B=BE=E6=A0=87=20--=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E7=BB=84=E4=BB=B6input=E7=B1=BB=E5=9E=8B=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=90=8E=E9=9D=A2=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FromList/index.scss |  17 +++++-
 src/components/FromList/index.tsx  |   6 ++-
 src/pages/addressAdd/index.tsx     |   2 +-
 src/pages/company/index.tsx        |   2 +-
 src/pages/user/index.module.scss   |  16 ++++++
 src/pages/user/index.tsx           |  12 ++++-
 src/pages/userEdit/index.tsx       |   6 ++-
 src/pages/weightList/index.tsx     |   7 ++-
 src/pages/weightListAdd/index.scss |  20 ++++++++
 src/pages/weightListAdd/index.tsx  |  11 +++-
 src/styles/iconfont.scss           |  80 +++++++++++++----------------
 src/styles/iconfont.ttf            | Bin 6084 -> 8892 bytes
 12 files changed, 123 insertions(+), 56 deletions(-)

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??
           <View onClick={props?.onClick} className="form-list-right-meet">
             {
-              type=="input"?<Input value={value} placeholder-class="phcolor" onInput={props?.onInput} placeholder={props.placeholder} />:
+              type=="input"?
+              <View className="form-list-input">
+                <Input value={value} placeholder-class="phcolor" onInput={props?.onInput} placeholder={props.placeholder} />
+                {value&&<Text className="iconfont icon-qingkong"/>}
+              </View>:
               type=="textarea"?<Textarea value={value} placeholder-class="phcolor" onInput={props?.onInput} placeholder={props.placeholder} />:
               <>
                 {
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 ()=>{
     <View className="add-address">
       <FromList value={formData["aa"]} label="联系人" placeholder="请输入收货人姓名"/>
       <FromList value={formData["bb"]} label="联系方式" placeholder="请输入收货人姓名"/>
-      <FromList value={formData["cc"]} onClick={handleSelectSite} label="收地址" type="select" placeholder="请选择/省/市/区"/>
+      <FromList value={formData["cc"]} onClick={handleSelectSite} label="收货地址" type="select" placeholder="请选择/省/市/区"/>
       <FromList value={formData["dd"]} label="详细地址" type="textarea" placeholder="请输入详细地址（街道、门牌号等）"/>
       <View className="add-address-default">
         <Text>设为默认地址</Text>
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 ()=>{
       </FromList>
       <FromList value={formData["bb"]} label="联系人" placeholder="请输入收货人姓名"/>
       <FromList value={formData["bb"]} label="联系方式" placeholder="请输入收货人姓名"/>
-      <FromList value={formData["cc"]} onClick={handleSelectSite} label="收地址" type="select" placeholder="请选择/省/市/区"/>
+      <FromList value={formData["cc"]} onClick={handleSelectSite} label="收货地址" type="select" placeholder="请选择/省/市/区"/>
       <FromList value={formData["dd"]} label="详细地址" type="textarea" placeholder="请输入详细地址（街道、门牌号等）"/>
       
       
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(()=>{
                         </View>
                     </View>
                     <View className={styles['card-info-right']}>
-                        1
+                        <Navigator hoverClass="none" url="/pages/userEdit/index" className={styles['setup-icon']}>
+                            <View className={classnames(
+                                styles['icon-wrapper'],
+                                'iconfont',
+                                'icon-shezhi',
+                            )}></View>
+                            <View className={styles['icon-point']}></View>
+                        </Navigator>
                     </View>
                 </View>
                 <View className={styles['card-main']}>
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)=>{
     <Popup onClose={()=>props.setPopupShow(false)} title="修改昵称" show={props.show}>
         <View className="user-edit-popup-content">
           <View className="user-edit-popup-input">
-            <Textarea value={props.value} onInput={handleTextareaInput} maxlength={20}/>
-            <Text>{props.value.length}/20</Text>
+            <Textarea value={value} onInput={handleTextareaInput} maxlength={20}/>
+            <Text>{value.length}/20</Text>
           </View>
           <Text className="user-edit-popup-tips">请设置2-20个字符，由中文、英文、数字、-和_组成</Text>
           <View className="user-edit-popup-operation">
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 (
     <View className="weight-list-scroll-view">
@@ -54,7 +54,10 @@ const WeightList = memo((props:Params)=>{
               </View>
             );
           }):
-          <View className="weight-list-no-data">暂未添加地址</View>
+          <View className="weight-list-no-data">
+            <View>您末添加任何码单信息</View>
+            正在使用平台默认码单信息
+          </View>
         }
       </ScrollView>
       <Navigator url="/pages/weightListAdd/index?type=add" hoverClass="none" className="add-weight-list">添加新码单信息</Navigator>
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 (
     <View className="add-address">
@@ -33,7 +35,12 @@ export default ()=>{
       <FromList value={formData["bb"]} label="联系方式" placeholder="请输入码单显示联系号码"/>
       <View className="add-address-default">
         <Text>设为默认地址</Text>
-        <View>1</View>
+        <View onClick={handleSelectDefault}>
+          {
+            formData.ee?<View className="add-address-default-active">✓</View>
+            :<View className="add-address-default-noactive"></View>
+          }
+        </View>
       </View>
       
       <Button hoverClass="none" className="add-address-save" onClick={handleSave}>保存</Button>
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 fcf854d31cf065bdc2df3417347eb0b53729bfe8..02f040877815f27842f4a519d3447dbd2ca6abbe 100644
GIT binary patch
delta 3579
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

delta 779
zcmXw#&1+Lp5XH}ZA9=P(P145bqC#6OXsOy&15&y%n%1NrR;{TBl9-w-lBSR<5sE>n
zsJJj1a3Q#{E>+YDB29xr{s0%!l~h-^5V{o?YM$ri;w8V#%$+xP=1lcu{aAUZv{`;x
z0JJbEr?WS%zH)CK2TTL-hBNbtR8OdLKY$-(IKvC;yZ(fJl^o3EmWpxB{tJj5#_??a
zO5(_iL!SWSE90ZNL~&6Z#s>5I822nBa`V2`kvBkKjQ!G!`9jB%+}Tb7L0*c$qw0YZ
zK?r_JrenXmFMCIR!p&iLwjONz{#)C&ONP*IG2R8ux#e-{f_RIzN}u>r32Kv%HKUT!
zy7DWn6mS!I%NwL^=l3fxFvB7jt$-%y8WXk+$VemRSRTRL0IdO&p2cQutaQVJ4(w*u
z3m@C-@S_u52w)FOT&qGCB^G&FFSP#YF(o4kJ_pGSIPhV}aRpmIo>s6KWK_YnkTC@Z
zfSgb`BIKlkLqSd{*trBb&46%H$TJGg3`xZf&L-qp1$984Q&17)d4;oDIjf*b$O{VU
zg^Vkx9CA*<9iYKM8?jL~2+-lA4vu=BQ+O{HL|qGOuk}$qr9ai{`Zr_1cxM{su$gsv
zT(efvx@|pQ+wzuNQLf4Ur6={h>}^pXrxc-nuV#iUf4|@4Py2ko`C)nJnHYa~T|}C9
zn;%6)YoDr(bzj_=S#I8`iQ@Wt^Ii>Wmx88S1S`qjL4nGj-l*kDCi3ZP`AVd(@DGmv
BsO<m%