diff --git a/iconfont.json b/iconfont.json index c8c7f71..143a62b 100644 --- a/iconfont.json +++ b/iconfont.json @@ -1,5 +1,5 @@ { - "symbol_url": "//at.alicdn.com/t/c/font_3786318_gquep5m0ohd.js", + "symbol_url": "//at.alicdn.com/t/c/font_3786318_isejgadt4t.js", "save_dir": "./src/components/iconfont", "use_typescript": false, "use_rpx": true, diff --git a/src/api/user.ts b/src/api/user.ts index 4f4e86a..437c5d4 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -65,7 +65,8 @@ export const portraitUpdateApi = () => { */ export const BindingCompanyApi = () => { return useRequest({ - url: '/v1/mall/user/binding/company', + // url: '/v1/mall/user/binding/company', + url: '/v3/mallCherry/user/binding/company', method: 'put', }) } diff --git a/src/common/constant.ts b/src/common/constant.ts index 26695db..e9845e8 100644 --- a/src/common/constant.ts +++ b/src/common/constant.ts @@ -5,14 +5,14 @@ // 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://pre.zzfzyc.com/lymarket' // 预发布 +export const BASE_URL = 'https://pre.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` // 发 // 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.7:50002/lymarket' // 添 +// export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添 // export const BASE_URL = 'http://192.168.1.28:50001/lymarket' // 婷 // export const BASE_URL = 'http://192.168.1.42:50002/lymarket' // 杰 diff --git a/src/components/iconfont/iconfont.tsx b/src/components/iconfont/iconfont.tsx index d622f62..d7a78f4 100644 --- a/src/components/iconfont/iconfont.tsx +++ b/src/components/iconfont/iconfont.tsx @@ -24,7 +24,7 @@ function hex2rgb(hex) { return "rgb(" + rgb.join(",") + ")"; } -export type IconNames = 'icon-dingwei' | 'icon-xuanzhongyanse' | 'icon-sekajianyanglingqu' | 'icon-lingseka' | 'icon-lingjianyang' | 'icon-gerenzhongxin-dianji' | 'icon-shouye-dianji' | 'icon-gouwuche-weidianji' | 'icon-gerenzhongxin-weidianji' | 'icon-gouwuche-dianji' | 'icon-shouye-weidianji' | 'icon-paixu1' | 'icon-zhankai' | 'icon-shouqi' | 'icon-tips' | 'icon-dianhua' | 'icon-paixu' | 'icon-shaixuan' | 'icon-bodakehujingli' | 'icon-guanfangweixinkefu' | 'icon-tuijianbiaoqian' | 'icon-rukou' | 'icon-renzhengchenggong' | 'icon-wodekefu' | 'icon-yanseduibi' | 'icon-dizhiguanli' | 'icon-weixin' | 'icon-riqi' | 'icon-shuru' | 'icon-a-0tianzhangqi' | 'icon-huodaofukuan' | 'icon-huozhuziti' | 'icon-saomazhifu' | 'icon-xianxiahuikuan' | 'icon-yufukuan' | 'icon-xinzengshoucangjia' | 'icon-qingchusousuo' | 'icon-xuanzechenggong' | 'icon-gongnengtubiao-saomiao' | 'icon-bianjizidingyimadan' | 'icon-zidingyimadanyulan' | 'icon-yuanshimadanyulan' | 'icon-xiala' | 'icon-shangla' | 'icon-qingchuxinxi' | 'icon-sousuo' | 'icon-guanli' | 'icon-bianji' | 'icon-shoucangjia' | 'icon-shezhi' | 'icon-tishi' | 'icon-erweima' | 'icon-dianjishoucang' | 'icon-gouwuche' | 'icon-shoucangchenggong' | 'icon-fenxiangshangpin' | 'icon-kefu' | 'icon-xinzenganniu' | 'icon-jianshaoanniu' | 'icon-daifahuo2' | 'icon-daishouhuo2' | 'icon-tuikuan-shouhou' | 'icon-daipeibu2' | 'icon-daifukuan2'; +export type IconNames = 'icon-weixinyijiandenglu' | 'icon-nanzhuang' | 'icon-zhuanyefenlei' | 'icon-tongzhuang' | 'icon-chaoliumianliao' | 'icon-nvzhuang' | 'icon-dingwei' | 'icon-xuanzhongyanse' | 'icon-sekajianyanglingqu' | 'icon-lingseka' | 'icon-lingjianyang' | 'icon-gerenzhongxin-dianji' | 'icon-shouye-dianji' | 'icon-gouwuche-weidianji' | 'icon-gerenzhongxin-weidianji' | 'icon-gouwuche-dianji' | 'icon-shouye-weidianji' | 'icon-paixu1' | 'icon-zhankai' | 'icon-shouqi' | 'icon-tips' | 'icon-dianhua' | 'icon-paixu' | 'icon-shaixuan' | 'icon-bodakehujingli' | 'icon-guanfangweixinkefu' | 'icon-tuijianbiaoqian' | 'icon-rukou' | 'icon-renzhengchenggong' | 'icon-wodekefu' | 'icon-yanseduibi' | 'icon-dizhiguanli' | 'icon-weixin' | 'icon-riqi' | 'icon-shuru' | 'icon-a-0tianzhangqi' | 'icon-huodaofukuan' | 'icon-huozhuziti' | 'icon-saomazhifu' | 'icon-xianxiahuikuan' | 'icon-yufukuan' | 'icon-xinzengshoucangjia' | 'icon-qingchusousuo' | 'icon-xuanzechenggong' | 'icon-gongnengtubiao-saomiao' | 'icon-bianjizidingyimadan' | 'icon-zidingyimadanyulan' | 'icon-yuanshimadanyulan' | 'icon-xiala' | 'icon-shangla' | 'icon-qingchuxinxi' | 'icon-sousuo' | 'icon-guanli' | 'icon-bianji' | 'icon-shoucangjia' | 'icon-shezhi' | 'icon-tishi' | 'icon-erweima' | 'icon-dianjishoucang' | 'icon-gouwuche' | 'icon-shoucangchenggong' | 'icon-fenxiangshangpin' | 'icon-kefu' | 'icon-xinzenganniu' | 'icon-jianshaoanniu' | 'icon-daifahuo2' | 'icon-daishouhuo2' | 'icon-tuikuan-shouhou' | 'icon-daipeibu2' | 'icon-daifukuan2'; type PropsType = { name: IconNames; @@ -84,7 +84,25 @@ const IconFont:FC = ({ className={classnames(icon, customClassName)} /> )} */} - {/* icon-dingwei */} + {/* icon-weixinyijiandenglu */} + + { name === 'icon-weixinyijiandenglu' && () } +{/* icon-nanzhuang */} + + { name === 'icon-nanzhuang' && () } +{/* icon-zhuanyefenlei */} + + { name === 'icon-zhuanyefenlei' && () } +{/* icon-tongzhuang */} + + { name === 'icon-tongzhuang' && () } +{/* icon-chaoliumianliao */} + + { name === 'icon-chaoliumianliao' && () } +{/* icon-nvzhuang */} + + { name === 'icon-nvzhuang' && () } +{/* icon-dingwei */} { name === 'icon-dingwei' && () } {/* icon-xuanzhongyanse */} diff --git a/src/pages/login/components/remind/index.module.scss b/src/pages/login/components/remind/index.module.scss new file mode 100644 index 0000000..18b4afc --- /dev/null +++ b/src/pages/login/components/remind/index.module.scss @@ -0,0 +1,35 @@ +.remind_con { + height: 430px; + .title { + width: 100%; + text-align: center; + margin-top: 32px; + font-weight: 500; + } + .regulations_text { + color: rgba(0, 0, 0, 0.6); + font-size: 22px; + text-align: center; + margin-top: 80px; + text { + color: #1245b0; + font-size: 22px; + } + } + .btn_con { + width: 100%; + justify-content: center; + display: flex; + margin-top: 88px; + text { + display: inline-block; + width: 612px; + height: 80px; + background: linear-gradient(90deg, #4581ff 0%, #0d56fa 100%); + border-radius: 43px; + color: #fff; + text-align: center; + line-height: 80px; + } + } +} diff --git a/src/pages/login/components/remind/index.tsx b/src/pages/login/components/remind/index.tsx new file mode 100644 index 0000000..3179642 --- /dev/null +++ b/src/pages/login/components/remind/index.tsx @@ -0,0 +1,15 @@ +import { Text, View } from '@tarojs/components' +import styles from './index.module.scss' +import Popup from '@/components/popup' + +export default () => { + return + + 请阅读并同意以下条款 + 《面料优选服务条例》和《面料优选隐私政策》 + + 同意并继续 + + + +} diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx index 393cfe8..f6d5a57 100644 --- a/src/pages/login/index.tsx +++ b/src/pages/login/index.tsx @@ -1,22 +1,30 @@ import { Image, Text, View } from '@tarojs/components' +import { useState } from 'react' import styles from './index.module.scss' -import logo from '@/styles/image/lgo@2x.png' +import Remind from './components/remind' +import logo from '@/styles/image/logo.png' import IconFont from '@/components/iconfont/iconfont' import Checkbox from '@/components/checkbox' +import Popup from '@/components/popup' export default () => { + const [selected, setSelected] = useState(false) return - + 打造面料爆品 专注客户服务 - - 微信一键登录 + + + 微信一键登录 + + - - 我已阅读并同意 + setSelected(true)} onClose={() => setSelected(false)} /> + 我已阅读并同意《面料优选服务条例》和《面料优选隐私政策》 + } diff --git a/src/styles/image/lgo@2x.png b/src/styles/image/lgo@2x.png deleted file mode 100644 index 33e3dfe..0000000 Binary files a/src/styles/image/lgo@2x.png and /dev/null differ diff --git a/src/styles/image/logo.png b/src/styles/image/logo.png new file mode 100644 index 0000000..7b86cd5 Binary files /dev/null and b/src/styles/image/logo.png differ