feats

config/dev.js

@@ -5,7 +5,7 @@ module.exports = {
   defineConstants: {
     HOST: '"https://xlk.njyz.tech"',
     // HOST: '"http://127.0.0.1:8081"',
-    WSS_HOST: '"ws://127.0.0.1:8081"',
+    WSS_HOST: '"ws://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',

src/components/Cell/style.scss

@@ -3,9 +3,10 @@
   width: 100%;
   position: relative;
   display: flex;
-  border-bottom: 1px solid #eee;
-  padding: 0.5em 1em;
+  padding: 32px 1em;
   box-sizing: border-box;
+  font-size: 27px;
+  color: #000;
 
   &-header, &-footer {
     flex: none;

src/components/Tabs/index.jsx

@@ -24,9 +24,13 @@ export default (props) => {
               <View
                 key={item}
                 id={`${idPreRef.current}-${index}`}
-                className={`yz-tabs-tab ${activeClass}`}
+                className='yz-tabs-tab'
                 onClick={() => handleTabClick(index)}
-              >{item}</View>
+              >
+                <view className={`yz-tabs-tab-title ${activeClass}`}>
+                  {item}
+                </view>
+              </View>
             )
           })
         }

src/components/Tabs/style.scss

@@ -2,8 +2,8 @@
   width: 100%;
   background: #fff;
   position: relative;
-  border-top: 1px solid #eee;
-  border-bottom: 1px solid #eee;
+  // border-top: 1px solid #eee;
+  // border-bottom: 1px solid #eee;
   box-sizing: border-box;
 
   .yz-tabs-nav {
@@ -14,20 +14,25 @@
   .yz-tabs-tab {
     text-align: center;
     flex: auto;
-    padding: 0.5em 0;
     outline: none;
     box-sizing: border-box;
     min-width: 20%;
-    border-bottom-width: 4px;
-    border-bottom-style: solid;
-    border-bottom-color: transparent;
 
-    & + .yz-tabs-tab {
-      border-left: 1px solid #eee;
-    }
+    .yz-tabs-tab-title {
+      display: inline-block;
+      border-bottom-width: 4px;
+      border-bottom-style: solid;
+      border-bottom-color: transparent;
+      font-size: 30px;
+      letter-spacing: 0.1em;
+      padding: .9em 0;
+      color: #777;
 
-    &.active {
-      border-bottom-color: #193C83;
+      &.active {
+        border-bottom-color: #193C83;
+        color: #193C83;
+        font-weight: 700;
+      }      
     }
   }
 }

src/pages/chat/chatDetail/index.jsx

@@ -117,6 +117,10 @@ export default withLayout((props) => {
         setReceiver(res)
         getChatHistory({ pageNumber: 1 })
       })
+
+      const unsubsribe = im.listen((message) => {
+
+      })
     } else {
       Taro.showToast({
         title: '无聊天对象，请退出重试',

src/pages/mine/mortgageCalc/components/Result.jsx

@@ -44,7 +44,7 @@ export default (props) => {
   const [summary, setSummary] = useState({})
   const [list, setList] = useState([])
 
-  const tipText = isMixed ? '贷款总额' : (current === 1 ? '每月还款' : '首月还款')
+  const tipText = current === 1 ? '每月还款' : '贷款总额'
 
   useEffect(() => {
     if (!dataSource[0] && !dataSource[1]) return;
@@ -91,15 +91,15 @@ export default (props) => {
       <view className='header-nav'>
         <InnerTabs tabs={tabs} current={current} onChange={setCurrent} />
         <view className='header-close' onClick={onClose}>
-          <text>×</text>
+          <text>重新计算</text>
         </view>
       </view>
 
       <view className='summary-card'>
         <view className='tip'>{tipText}</view>
         <view className='money'>
-          {isMixed ? Number(summary.money/10000).toFixed(0) : Number(summary.moneyOfFirstMonth||0).toFixed(2)}
-          <text className='small'>{isMixed ? '万元' : '元'}</text>
+          {current !== 1 ? Number(summary.money/10000).toFixed(0) : Number(summary.moneyOfFirstMonth||0).toFixed(2)}
+          <text className='small'>{current !== 1 ? '万元' : '元'}</text>
         </view>
         <view className='footer flex'>
           <view>
@@ -111,7 +111,7 @@ export default (props) => {
             <view className='label'>还款总额</view>
           </view>
           {
-            !isMixed && (
+            current === 1 && (
               <view>
                 <view>{`${Number(summary.money/10000).toFixed(0)}万`}</view>
                 <view className='label'>贷款金额</view>

src/pages/mine/mortgageCalc/components/style.scss

@@ -1,6 +1,7 @@
 .calc-result {
   .header-nav {
     display: flex;
+    align-items: center;
 
     & > view {
       &:first-child {
@@ -10,23 +11,24 @@
 
     .header-close {
       flex: none;
-      width: 3em;
-      text-align: center;
+      width: 150px;
       box-sizing: border-box;
-      border: 1px solid #eee;
-      line-height: 100%;
-      vertical-align: middle;
 
       text {
-        font-size: 2em;
-        line-height: 1.1em;
         display: inline-block;
+        font-size: 24px;
+        color: #fff;
+        line-height: 2em;
+        height: 2em;
+        border-top-left-radius: 24px;
+        border-bottom-left-radius: 24px;
+        padding: 0 1em;
+        background: #193c83;
       }
     }
   }
 
   .summary-card {
-    color: #fff;
     background: #193C83;
     border-radius: 24px;
     box-sizing: border-box;
@@ -34,11 +36,13 @@
     margin: 1em;
 
     .tip {
-      font-size: .8em;
+      font-size: 24px;
+      color: #fff;
     }
 
     .money {
-      font-size: 1.8em;
+      font-size: 60px;
+      color: #fff;
       line-height: 2.0em;
 
       .small {
@@ -51,14 +55,14 @@
 
     .footer {
       & > view {
+        font-size: 24px;
         color: #fff;
-        font-size: .8em;
         text-align: center;
         line-height: 1.6em;
       }
 
       .label {
-        color: rgba(255,255,255, .6);
+        color: #D3D3D3;
       }
     }
   }
@@ -71,7 +75,7 @@
   }
 
   .result-scroll {
-    height: calc(100vh - 560rpx);
+    height: calc(100vh - 600rpx);
   }
 
   .result-list {
@@ -79,19 +83,20 @@
     padding: 0 1em;
 
     .result-list-title {
-      background:rgba(25,60,131, .1) !important;
+      background:rgba(26,60,131, .12) !important;
     }
 
     .result-list-item {
-      font-size: .9em;
-      line-height: 2.4em;
+      font-size: 24px;
+      line-height: 68px;
       text-align: center;
+      color: #353535;
 
       &:nth-of-type(odd) {
         background: #fff;
       }
       &:nth-of-type(even) {
-        background:rgba(25,60,131, .1);
+        background:rgba(26,60,131, 0.12);
       }
     }
   }

src/pages/mine/mortgageCalc/index.jsx

@@ -1,9 +1,8 @@
 import { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import withLayout from '@/layout'
-import { RadioGroup, Label, Radio } from '@tarojs/components'
+import { ScrollView } from '@tarojs/components'
 import Tabs from '@/components/Tabs'
-import Cell from '@/components/Cell'
 import GJJForm from './components/GJJForm'
 import SYForm from './components/SYForm'
 import Result from './components/Result'
@@ -84,25 +83,28 @@ export default withLayout(() => {
           <Label style={{marginLeft: '1em'}}><Radio value='debj' /> 等额本金</Label>
         </RadioGroup>
       </Cell> */}
-      {
-        current !== 2 && (
-          <view className='container'>
-            {current === 3 && <view className='title'>商业贷款</view>}
-            <SYForm onChange={setSYFormData} />
-          </view>
-        )
-      }
-      {
-        current !== 1 && (
-          <view className='container'>
-            {current === 3 && <view className='title'>公积金贷款</view>}
-            <GJJForm onChange={setGJJFormData} />
-          </view>
-        )
-      }
-      <view className='Btn'>
-        <button loading={loading} onClick={handleCalc}>开始计算</button>
-      </view>
+      <ScrollView scrollY className='page-scroll' style={current === 3 ? { height: 'calc(100vh - 100rpx)' } : {}}>
+        {current === 3 && <view className='title'>商业贷款</view>}
+        {
+          current !== 2 && (
+            <view className='container'>
+              <SYForm onChange={setSYFormData} />
+            </view>
+          )
+        }
+
+        {current === 3 && <view className='title'>公积金贷款</view>}
+        {
+          current !== 1 && (
+            <view className='container'>
+              <GJJForm onChange={setGJJFormData} />
+            </view>
+          )
+        }
+        <view className='Btn'>
+          <button loading={loading} onClick={handleCalc}>开始计算</button>
+        </view>
+      </ScrollView>
       <page-modal show={visible} position='bottom'>
         <Result dataSource={result} isMixed={current === 3} onClose={() => setVisible(false)} />
       </page-modal>

src/pages/mine/mortgageCalc/index.scss

@@ -4,14 +4,17 @@
   width: 100%;
 
   .container {
-    margin-top: 1em;
+    margin-top: 40px;
+    padding: 20px 0;
     background: #fff;
   }
 
   .title {
+    margin-top: 60px;
     padding-left: 1em;
-    padding-bottom: .5em;
     background: #fafafa;
+    font-size: 30px;
+    font-weight: 700;
   }
 
   slider {
@@ -20,6 +23,7 @@
   }
 
   .Btn {
+    margin-top: 25px;
     padding: 40px;
     position: relative;
     overflow: hidden;