问题修改和接口对接

src/api/mine.ts

@@ -0,0 +1,12 @@
+import { useRequest } from "@/use/useHttp"
+
+/**
+ *  获取用户资产
+ * @returns 
+*/
+export const userassets = () => {
+    return useRequest({
+        url: `/v1/mall/user/assets`,
+        method: "get",
+    })
+}

src/common/constant.js

@@ -5,12 +5,12 @@
 // 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 = `http://192.168.1.30:40001/lymarket` // 发
+// export const BASE_URL = `http://192.168.1.30:40001/lymarket` // 发
-// export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
+// export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发
 // export const BASE_URL = `https://dev.zzfzyc.com/lymarket`  // 开发环境
 // 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.224:50002/lymarket` // 添
+export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添
 // export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰
 
 // CDN

src/pages/addressAdd/index.tsx

@@ -55,9 +55,9 @@ export default ()=>{
   const rules = {
     name: [{
       message: "请输入正确收货人姓名",
-      validator: (value:any, rule:any)=>{ // 自定义验证，返回true表示匹配到了(错误)
+      // validator: (value:any, rule:any)=>{ // 自定义验证，返回true表示匹配到了(错误)
-        return value.length>5;
+      //   return value.length>5;
-      }
+      // }
     }],
     phone: [{
       message: "请输入正确的电话号码", regex: /^1[3|5|6|9|2|8|7]\d{9}$/

src/pages/certification/index.tsx

@@ -36,6 +36,7 @@ export default ()=>{
     business_license_url: "",
     legal_person: "",
     legal_person_identity: "",
+    businessLicense: '',
     legal_person_identity_url: [],
     name: ""
   });
@@ -130,7 +131,8 @@ export default ()=>{
         {/* <FromListCertification type="select" onClick={handleSelectTypeModalShow} value={(formData as any)?.authentication_type_name} label="认证类型" placeholder="企业认证"/> */}
         <SelectEnterpriseType ref={selectTypeRef} confirm={handleSelectTypeConfirm} />
         <FromListCertification onInput={(ev: any) => setFormData({ ...formData, name: ev.detail.value })} value={formData["name"]} label="企业名称" placeholder="请输入营业执照上的企业名称" required />
-        <FromListCertification type="select" style={{border: "0"}}label="企业营业执照" placeholder="注册号、统一社会信用代码、组织机构代码" required showIcon={false}/>
+        {/* <FromListCertification type="select" style={{border: "0"}}label="企业营业执照" placeholder="注册号、统一社会信用代码、组织机构代码" required showIcon={false}/> */}
+        <FromListCertification  onInput={(ev: any) => setFormData({ ...formData, businessLicense: ev.detail.value })} value={formData["businessLicense"]} style={{ border: "0" }} label="企业营业执照" placeholder="注册号、统一社会信用代码、组织机构代码" required  />
         <View onClick={() => handleUploadImage("business_license_url")} className="certification-upload">
           {(formData as any)?.business_license_url ?
             <>

src/pages/index/index.tsx

@@ -8,6 +8,7 @@ import ShopCart from '@/components/shopCart'
 import { goLink } from '@/common/common'
 import styles from './index.module.scss'
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useSelector } from "@/reducers/hooks";
 import Taro, { Events, useDidShow, usePullDownRefresh } from '@tarojs/taro'
 import { GetProductKindListApi, GetProductListApi } from '@/api/material'
 import useLogin from '@/use/useLogin'
@@ -50,6 +51,7 @@ export default () => {
   }
   //监听查询条件
   useEffect(() => {
+
     if (filtrate.product_kind_id)
       getProductList()
   }, [filtrate])
@@ -98,8 +100,67 @@ export default () => {
     return dataLoadingStatus({ list: productData.list, total: productData.total, status: productState.loading })
   }, [productData, productState.loading])
 
+  useEffect(() => {
+    getShow()
+  }, [])
+  // const [time, setShow] = useState(false)
+  //拿状态存储的东西判断
+  const { adminUserInfo } = useSelector(state => state.userInfo);
+  const getShow = () => {
+    if (adminUserInfo?.authentication_status === 0 || adminUserInfo?.authentication_status === 1 || adminUserInfo?.authentication_status === 2 || adminUserInfo?.authentication_status === 3) {
+      //倒计时弹出去认证
+      const countTime: any = 60
+      //获取倒计时的变量
+      var time = parseInt(countTime);
+      const countDown = setInterval(() => {
+        if (time == 0) {
+          Taro.showModal({
+            title: '提示',
+            content: '你还未认证,认证后解锁更多功能',
+            cancelText: '稍后认证',
+            confirmText: '去认证',
+            success: function (res) {
+              if (res.confirm) {
+                Taro.navigateTo({ url: '/pages/certification/index' })
+              } else if (res.cancel) {
+                console.log('用户点击取消')
+              }
+            }
+          })
+          //清除定时器
+          clearInterval(countDown);
+        } else {
+          time--;
+        }
+      }, 1000)
+    }
+  }
+
+  //检查认证是否认证
+  const checkShow = () => {
+    if (adminUserInfo.authentication_status === 0 || adminUserInfo.authentication_status === 1 || adminUserInfo.authentication_status === 2 || adminUserInfo.authentication_status === 3) {
+      Taro.showModal({
+        title: '提示',
+        content: '你还未认证,认证后解锁更多功能',
+        cancelText: '稍后认证',
+        confirmText: '去认证',
+        success: function (res) {
+          if (res.confirm) {
+            Taro.navigateTo({ url: '/pages/certification/index' })
+          } else if (res.cancel) {
+            console.log('用户点击取消')
+          }
+        }
+      })
+    } else {
+      setShowShopCart(!showShopCart)
+    }
+
+  }
+
+
   return (
-    <MoveBtn onClick={() => setShowShopCart(!showShopCart)}>
+    <MoveBtn onClick={() => checkShow()}>
       <View className={styles.main}>
         <Banner />
         <View className={styles.search}>

src/pages/user/index.module.scss

@@ -4,23 +4,31 @@
   display: flex;
   flex-direction: column;
   position: relative;
+
   .header {
     background: #68b4ff;
     background-size: cover;
     height: 560px;
     position: relative;
+
     .card-main {
       margin-top: 10px;
     }
   }
+
   .auth-suspension {
     position: absolute;
-    z-index: 1;inset: 0;
+    z-index: 1;
+    inset: 0;
   }
+
   .header-card {
-    position: absolute;left: 50%;bottom: -18%;
+    position: absolute;
+    left: 50%;
+    bottom: -18%;
     transform: translateX(-50%);
   }
+
   .crad {
     width: 702px;
     background: rgba(255, 255, 255, 0.95);
@@ -29,16 +37,24 @@
     box-sizing: border-box;
     box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.05);
   }
+
   .card-info {
-      display: flex;justify-content: space-between;
+    display: flex;
-      position: absolute;top: -15%;left: 0;right: 0;
+    justify-content: space-between;
+    position: absolute;
+    top: -15%;
+    left: 0;
+    right: 0;
     width: 702px;
     padding: 0 30px;
     box-sizing: border-box;
   }
+
   .arcd-info-left {
-    display: flex;align-items: flex-end;
+    display: flex;
+    align-items: flex-end;
   }
+
   .arcd-info-left-portrait {
     width: 170px;
     height: 170px;
@@ -47,14 +63,17 @@
     border-radius: 50%;
     overflow: hidden;
   }
+
   .arcd-info-left-portrait image {
     width: 100%;
     height: 100%;
     object-fit: cover;
   }
+
   .arcd-info-left-desc {
     margin-left: 24px;
   }
+
   .arcd-info-left-nickname {
     font-size: 44px;
     font-weight: 700;
@@ -62,11 +81,13 @@
     display: flex;
     align-items: center;
   }
+
   .arcd-info-left-phone {
     font-size: 24px;
     font-weight: 400;
     color: #707070;
   }
+
   .arcd-info-left-phone button {
     padding: 0 10px;
     height: 42px;
@@ -76,38 +97,49 @@
     font-size: 22px;
     font-weight: 400;
     color: #007aff;
-    display: flex;align-items: center;justify-content: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
   }
+
   .card-info-right {
     font-size: 26px;
-      display: flex;align-items: flex-end;
+    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;
+    right: 0;
+    top: 0;
   }
 
   .card-main {
     margin: 20px auto 0;
   }
+
   .card-main-title {
-      display: flex;justify-content: space-between;
+    display: flex;
+    justify-content: space-between;
     align-items: center;
     border-bottom: 2px solid #dddddd;
     padding: 0 5px 15px;
     box-sizing: border-box;
   }
+
   .card-main-title text {
     font-size: 22px;
     font-weight: 400;
@@ -116,10 +148,12 @@
     text-align: right;
     width: 150px;
   }
+
   .card-main-title-content {
     display: grid;
     grid-template-columns: repeat(5, 1fr);
   }
+
   .card-main-title-content-item {
     font-size: 24px;
     font-weight: 400;
@@ -128,10 +162,12 @@
     margin-top: 30px;
     position: relative;
   }
+
   .card-main-title-content-item Text {
     font-size: 56px;
     color: #3C3C3C;
   }
+
   .card-main-title-content-item-badge {
     padding: 0 10px;
     height: 32px;
@@ -143,8 +179,12 @@
     font-size: 18px;
     font-weight: 700;
     color: #ffffff;
-    display: flex;align-items: center;justify-content: center;
+    display: flex;
-    position: absolute;top: -10px;right: 0;
+    align-items: center;
+    justify-content: center;
+    position: absolute;
+    top: -10px;
+    right: 0;
   }
 
   .assets-title {
@@ -153,26 +193,34 @@
     color: #3c3c3c;
     margin-bottom: 20px;
   }
+
   .assets-content {
     display: grid;
     grid-template-columns: repeat(3, 1fr);
   }
-  .assets-content>view,.assets-content>navigator{
+
+  .assets-content>view,
+  .assets-content>navigator {
     text-align: center;
   }
+
   .assets-content-item-top {
     color: #007aff;
     font-weight: 400;
   }
+
   .assets-content-item-top-before {
     font-size: 20px;
   }
+
   .assets-content-item-top-content {
     font-size: 36px;
   }
+
   .assets-content-item-top-after {
     font-size: 20px;
   }
+
   .assets-content-item-tips {
     font-size: 24px;
     font-weight: 400;
@@ -182,26 +230,33 @@
   .main-card {
     margin: 131px auto 0;
   }
+
   .card-feature {
     margin-bottom: 50px;
   }
+
   .card-main-list-content-item {
-    display: flex;align-items: center;
+    display: flex;
+    align-items: center;
     justify-content: space-between;
     height: 90px;
   }
+
   .card-main-list-content-item-left {
     font-size: 26px;
     font-weight: 400;
     text-align: left;
     color: #707070;
-    display: flex;align-items: center;
+    display: flex;
+    align-items: center;
   }
+
   .card-main-list-content-item-left text {
     margin-right: 35px;
     font-size: 56px;
     color: #707070;
   }
+
   .card-main-list-content-item-right text {
     font-size: 30px;
   }
@@ -209,39 +264,54 @@
   .auth {
     margin-top: 115px;
   }
+
   .auth-top {
-    display: flex;align-items: center;justify-content: space-between;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
   }
+
   .auth-status {
     padding: 0 10px;
     height: 30px;
     background: #dddddd;
     border-radius: 10px 4px 0px 0px;
-    display: flex;align-items: center;justify-content: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     font-size: 18px;
     font-weight: 400;
     color: #707070;
   }
-  .auth-status,.auth-status-ongoing{
+
+  .auth-status,
+  .auth-status-ongoing {
     color: #EE7500;
     background-color: #FFE6CE;
   }
-  .auth-status,.auth-status-adopt{
+
+  .auth-status,
+  .auth-status-adopt {
     color: #007AFF;
     background-color: #CDE5FF;
   }
+
   .auth-tips {
     font-size: 18px;
     font-weight: 400;
     color: #007aff;
     text-align: right;
   }
-  .auth-tips,.auth-tips-adopt{
+
+  .auth-tips,
+  .auth-tips-adopt {
     color: #ABABAB;
   }
+
   .auth-tips text {
     font-size: 17px;
   }
+
   .auth-company {
     height: 70px;
     width: 100%;
@@ -251,19 +321,27 @@
     font-size: 26px;
     font-weight: 700;
     color: #707070;
-    display: flex;align-items: center;justify-content: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
   }
-  .auth-company,.auth-company-adopt{
+
+  .auth-company,
+  .auth-company-adopt {
     background: #ecf5ff;
     border: 2px solid #cde5ff;
   }
 
   .tips-modal {
     background: rgba(0, 0, 0, 0.6);
-    position: fixed;inset: 0;
+    position: fixed;
-    display: flex;justify-content: center;align-items: center;
+    inset: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     z-index: 2;
   }
+
   .tips-modal-content {
     width: 598px;
     background: #ffffff;
@@ -271,14 +349,17 @@
     animation: enlargeK 0.2s linear;
     overflow: hidden;
   }
+
   @keyframes enlargeK {
     0% {
       transform: scale(0);
     }
+
     100% {
       transform: scale(1);
     }
   }
+
   .tips-modal-title {
     font-size: 32px;
     font-weight: 700;
@@ -287,6 +368,7 @@
     margin-bottom: 58px;
     padding-top: 48px;
   }
+
   .tips-modal-letter {
     font-size: 26px;
     font-weight: 400;
@@ -294,32 +376,41 @@
     padding: 0 30px;
     line-height: 50px;
   }
+
   .tips-modal-letter-text {
     text-indent: 60px;
   }
+
   .tips-modal-letter-beginn {
     font-size: 28px;
     font-weight: 400;
     color: #000000;
     margin-bottom: 25px;
   }
+
   .tips-modal-letter-end {
     font-size: 26px;
     font-weight: 400;
     text-align: right;
     margin-top: 61px;
   }
+
   .tips-modal-button {
     display: flex;
     border-top: 1px solid #DDDDDD;
     margin-top: 45px;
   }
-  .tips-modal-button button, .tips-modal-button view{
+
-    display: flex;align-items: center;justify-content: center;
+  .tips-modal-button button,
+  .tips-modal-button view {
+    display: flex;
+    align-items: center;
+    justify-content: center;
     width: 50%;
     height: 90px;
     background-color: white;
   }
+
   .tips-modal-button button {
     font-size: 26px;
     font-weight: 400;
@@ -327,13 +418,116 @@
     border-radius: 0;
     border-right: 1px solid #DDDDDD;
   }
+
   .tips-modal-button button::after {
     border: 0;
     border-radius: 0;
   }
+
   .tips-modal-button view {
     font-size: 26px;
     font-weight: 400;
     color: #007aff;
   }
+
+  .auth-box {
+    width: 614px;
+    height: 70px;
+    background: #f6f6f6;
+    border-radius: 10px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding-left: 18px;
+    padding-right: 16px;
+
+    .auth-left-box {
+      display: flex;
+      align-items: center;
+
+      .auth-tag {
+        width: 86px;
+        height: 34px;
+        background: #dddddd;
+        border-radius: 10px;
+        font-size: 22px;
+        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+        font-weight: 400;
+        text-align: center;
+        color: #707070;
+        text-align: center;
+        line-height: 34px;
+        margin-right: 28px;
+      }
+
+      .auth-tagone {
+        width: 86px;
+        height: 34px;
+        background: #ffe6ce;
+        border-radius: 10px;
+        font-size: 22px;
+        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+        font-weight: 400;
+        text-align: center;
+        color: #707070;
+        text-align: center;
+        line-height: 34px;
+        margin-right: 28px;
+      }
+
+      .auth-tagtwo {
+        display: flex;
+        align-items: center;
+        overflow: hidden;
+        padding-left: 10px;
+        width: 100px;
+        height: 32px;
+        background: #cde5ff;
+        border-radius: 10px;
+
+        .iconFont-color {
+          display: flex;
+          align-items: center;
+          font-size: 30px;
+          margin-right: 3px;
+          color: #007aff;
+        }
+
+        .auth-font {
+          font-size: 20px;
+          font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+          font-weight: 400;
+          color: #007aff;
+        }
+      }
+
+      .tagthree {
+        display: flex;
+        align-items: center;
+        overflow: hidden;
+        padding-left: 10px;
+        width: 100px;
+        height: 32px;
+        background: rgba(255, 0, 0, 0.10);
+        border-radius: 10px;
+        color: #ff0000;
+      }
+
+      .auth-cont {
+        margin-left: 16px;
+        font-size: 26px;
+        font-family: Microsoft YaHei, Microsoft YaHei-Bold;
+        font-weight: 700;
+        color: #ababab;
+      }
+
+      .auth-contone {
+        margin-left: 16px;
+        font-size: 26px;
+        font-family: Microsoft YaHei, Microsoft YaHei-Bold;
+        font-weight: 700;
+        color: #3c3c3c;
+      }
+    }
+  }
 }

src/pages/user/index.tsx

@@ -6,7 +6,9 @@ import { useSelector } from "@/reducers/hooks";
 import { alert, goLink } from "@/common/common";
 import useLogin from '@/use/useLogin'
 import { BASE_URL } from '@/common/constant'
-
+import Taro from "@tarojs/taro";
+import { userassets } from "@/api/mine"
+import { formatPriceDiv } from "@/common/fotmat"
 export default () => {
 	// 用户信息
 	const { getSelfUserInfo } = useLogin();
@@ -21,13 +23,16 @@ export default () => {
 			alert.none("授权失败，请授权后再使用");
 		});
 	}
-
+	const { fetchData, state } = userassets()
+	useEffect(() => {
+		fetchData();
+	}, [])
 	return (
 		<View className={styles.main}>
 			<Header data={adminUserInfo} />
-			<Assets />
+			<Assets data={state} />
 			<Main />
-			{(adminUserInfo as any)?.authentication_status==1&&<Modal data={adminUserInfo}/>}
+			{/* {(adminUserInfo as any)?.authentication_status==1&&<Modal data={adminUserInfo}/>} */}
 			{/* 测试暂时添加 */}
 			<View style={{ fontSize: '26rpx', textAlign: 'center' }}>{BASE_URL}</View>
 			{!adminUserInfo.is_authorize_name && <View onClick={handleAuth} className={styles["auth-suspension"]}></View>}
@@ -76,6 +81,11 @@ const Header = memo((props:any) => {
 			alert.none("绑定失败!");
 		}
 	}
+	const navTo = () => {
+		Taro.navigateTo({
+			url: '/pages/certification/index'
+		})
+	}
 	return (
 		<View className={styles.header}>
 			<View className={`${styles.crad} ${styles['header-card']}`}>
@@ -106,7 +116,62 @@ const Header = memo((props:any) => {
 					</View>
 				</View>
 				<View className={styles['auth']}>
-					<View className={`${styles['auth-top']} ${data?.authentication_status==4&&"auth-tips-adopt"}`}>
+					{(data?.authentication_status == 0 || data?.authentication_status == 1) &&
+						<View className={styles['auth-box']} onClick={() => navTo()}>
+							<View className={styles['auth-left-box']}>
+								<View className={styles['auth-tag']}>
+									未认证
+								</View>
+								<View className={styles['auth-cont']}>
+									暂未加入或注册组织
+								</View>
+							</View>
+							<Text className="iconfont icon-a-moreback"></Text>
+						</View>
+					}
+					{(data?.authentication_status == 3) &&
+						<View className={styles['auth-box']} onClick={() => navTo()}>
+							<View className={styles['auth-left-box']}>
+								<View className={styles['auth-tagthree']}>
+									认证失败
+								</View>
+								<View className={styles['auth-cont']}>
+									暂未加入或注册组织
+								</View>
+							</View>
+							<Text className="iconfont icon-a-moreback"></Text>
+						</View>
+					}
+					{data?.authentication_status == 2 &&
+						<View className={styles['auth-box']} onClick={() => navTo()}>
+							<View className={styles['auth-left-box']}>
+								<View className={styles['auth-tagone']}>
+									认证中
+								</View>
+								<View className={styles['auth-contone']}>
+									暂未加入或注册组织
+								</View>
+							</View>
+							<Text className="iconfont icon-a-moreback"></Text>
+						</View>
+					}
+					{data?.authentication_status == 4 &&
+						<View className={styles['auth-box']} onClick={() => navTo()}>
+							<View className={styles['auth-left-box']}>
+								<View className={styles['auth-tagtwo']}>
+									<View className={styles['iconFont-color']}>
+										<Text className="iconfont icon-xtianzhangqi"></Text>
+									</View>
+									<View className={styles['auth-font']}>已认证</View>
+								</View>
+								<View className={styles['auth-contone']}>
+									暂未加入或注册组织
+								</View>
+							</View>
+							<Text className="iconfont icon-a-moreback"></Text>
+						</View>
+					}
+					{/* <View className={`${styles['auth-top']} ${data?.authentication_status==4&&"auth-tips-adopt"}`}>
 						<View className={`${styles['auth-status']} ${data?.authentication_status==2&&styles['auth-status-ongoing']} ${data?.authentication_status==4&&styles['auth-status-adopt']}`}>
 							<Text>1</Text>
 							{data?.authentication_status==1&&"未认证"}
@@ -118,13 +183,13 @@ const Header = memo((props:any) => {
 						{data?.authentication_status==2&&<Navigator hoverClass="none" url="/pages/certification/index" className={styles['auth-tips']}>1-3个工作日，审核完成 <Text className="iconfont icon-a-moreback"/></Navigator>}
 						{data?.authentication_status==3&&<Navigator hoverClass="none" url="/pages/certification/index" className={styles['auth-tips']}>重新认证 <Text className="iconfont icon-a-moreback"/></Navigator>}
 						{data?.authentication_status==4&&<View className={styles['auth-tips']}>认证通过，可以下单啦 <Text className="iconfont icon-a-moreback"/></View>}
-					</View>
+					</View> */}
-					<View className={`${styles['auth-company']} ${data?.authentication_status==4&&"auth-tips-adopt"}`}>
+					{/* <View className={`${styles['auth-company']} ${data?.authentication_status==4&&"auth-tips-adopt"}`}>
 						{data?.authentication_status==1&&"暂未加入或注册组织"}
 						{data?.authentication_status==2&&data?.company_name}
 						{data?.authentication_status==3&&data?.company_name}
 						{data?.authentication_status==4&&data?.company_name}
-					</View>
+					</View> */}
 				</View>
 				<View className={styles['card-main']}>
 					<View className={styles['card-main-title']}>
@@ -149,9 +214,9 @@ const Header = memo((props:any) => {
 		</View>
 	)
 })
-
 // 我的资产
-const Assets = () => {
+const Assets = (props: any) => {
+	console.log(props, 'propsprops')
 	return (
 		<View className={`${styles.assets} ${styles.crad} ${styles['main-card']}`}>
 			<View className={`${styles['assets-title']}`}>我的资产</View>
@@ -159,14 +224,14 @@ const Assets = () => {
 				<Navigator hoverClass="none" url="/pages/depositBeforehand/index">
 					<View className={`${styles['assets-content-item-top']}`}>
 						<Text className={`${styles['assets-content-item-top-before']}`}>¥</Text>
-						<Text className={`${styles['assets-content-item-top-content']}`}>0</Text>
+						<Text className={`${styles['assets-content-item-top-content']}`}>{formatPriceDiv(props.data.data.wallet_money || 0)}</Text>
-						<Text className={`${styles['assets-content-item-top-after']}`}>.20</Text>
+						{/* <Text className={`${styles['assets-content-item-top-after']}`}>{props.wallet_money || 0}</Text> */}
 					</View>
 					<Text className={`${styles['assets-content-item-tips']}`}>预存款</Text>
 				</Navigator>
 				<View>
 					<View className={`${styles['assets-content-item-top']}`}>
-						<Text className={`${styles['assets-content-item-top-content']}`}>4</Text>
+						<Text className={`${styles['assets-content-item-top-content']}`}>{props.data.data.coupon_count || 0}</Text>
 						<Text className={`${styles['assets-content-item-top-after']}`}>张</Text>
 					</View>
 					<Text className={`${styles['assets-content-item-tips']}`}>优惠券</Text>
@@ -174,8 +239,8 @@ const Assets = () => {
 				<Navigator hoverClass="none" url="/pages/creditLine/index">
 					<View className={`${styles['assets-content-item-top']}`}>
 						<Text className={`${styles['assets-content-item-top-before']}`}>¥</Text>
-						<Text className={`${styles['assets-content-item-top-content']}`}>99999</Text>
+						<Text className={`${styles['assets-content-item-top-content']}`}>{formatPriceDiv(props.data.data.credit_line || 0)}</Text>
-						<Text className={`${styles['assets-content-item-top-after']}`}>.-00</Text>
+						{/* <Text className={`${styles['assets-content-item-top-after']}`}>.-00</Text> */}
 					</View>
 					<Text className={`${styles['assets-content-item-tips']}`}>授信额度</Text>
 				</Navigator>

src/pages/userEdit/index.tsx

@@ -172,9 +172,9 @@ export default ()=>{
             <Text className="iconfont " /> {(formData as any)?.authentication_status == 4 ? "已认证" : "未认证"}
           </View>
         </UserEditList>
-        <UserEditList label="创建人" data={(formData as any)?.founder_user_name} placeholder="完善公司/组织信息" icon=""/>
+        <UserEditList label="创建人" data={(formData as any)?.founder_user_name} placeholder="完善公司/组织信息" icon="" useIcon="true" />
       </View>
-      <Button hoverClass="none" className="user-edit-logout">退出当前账号</Button>
+      {/* <Button hoverClass="none" className="user-edit-logout">退出当前账号</Button> */}
 
       <ModifyModal title="修改昵称" ref={ModifyIcknameEl} value={(formData as any)?.user_name} save={(value) => handleTextareaSave(value, "Ickname")} />
       <ModifyModal title="修改名称" ref={ModifyCompanyNameEl} value={(formData as any)?.company_name} save={(value) => handleTextareaSave(value, "companyName")} />
@@ -197,7 +197,10 @@ const UserEditList = memo((props:any)=>{
                 <View className="user-edit-list-right-placeholder">{props.placeholder}</View>
           }
         </View>
+        {
+          !props.useIcon &&
           <Text className="iconfont icon-a-moreback"></Text>
+        }
       </View>
     </View>
   )

src/reducers/userInfo.ts

@@ -40,6 +40,7 @@ export type UserAdminParam = {
     is_authorize_name?: false|true,
     is_authorize_phone?: false|true,
     phone?:string,
+    authentication_status?:number
 }
 
 export type SortCodeParam = {