update

.env.qxst

@@ -1,5 +1,5 @@
 VUE_APP_ENV = 'qxst'
-VUE_APP_TITLE = 黔鑫生态
+VUE_APP_TITLE = 贵茶数字化
 VUE_APP_ROOT = src/packages/qxst/
 VUE_APP_OEM = oem/qxst/
 VUE_APP_HOST = localhost

.env.qxst@pc

@@ -1,5 +1,5 @@
 VUE_APP_ENV = 'pc'
-VUE_APP_TITLE = 黔鑫生态
+VUE_APP_TITLE = 贵州茶交数字化中心
 VUE_APP_ROOT = src/packages/pc/
 VUE_APP_OEM = oem/qxst/
 VUE_APP_HOST = localhost

doc/android/fxgl.txt

@@ -20,7 +20,7 @@ cn.muchinfo.gstj_release_v1.0.0.apk
 http://8.130.36.162:8280/cfg?key=mtp_20
 
 
-黔鑫生态
+贵茶数字化
 实盘
 cn.muchinfo.qxst_release_v1.0.0.apk
 http://8.130.72.213:8280/cfg?key=mtp_20
@@ -31,4 +31,9 @@ http://8.130.132.95:8280/cfg?key=mtp_20
 
 中融文遗通
 cn.muchinfo.zrwyt_demo_v1.0.0.apk
-http://122.5.68.230:52004/cfg?key=mtp_20
+http://122.5.68.230:52004/cfg?key=mtp_20
+
+
+青岛海商
+cn.muchinfo.qdhs_demo_v1.0.0.apk
+http://47.104.156.140:8280/cfg?key=qdsp_demo

oem/qdhs/manifest.json

@@ -2,7 +2,7 @@
     "@platforms" : [ "android", "iPhone", "iPad" ],
     "id" : "H5E4A9458",
     /*应用的标识*/
-    "name" : "甘肃碳交",
+    "name" : "青岛海商",
     /*应用名称，程序桌面图标名称*/
     "version" : {
         "name" : "1.0.0",

oem/qxst/config/appconfig.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0",
-  "versionCode": "100000",
+  "version": "1.0.5",
+  "versionCode": "100005",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204"
 }

oem/qxst/manifest.json

@@ -2,7 +2,7 @@
     "@platforms" : [ "android", "iPhone", "iPad" ],
     "id" : "H5E4A9458",
     /*应用的标识*/
-    "name" : "多元世纪",
+    "name" : "甘肃碳交",
     /*应用名称，程序桌面图标名称*/
     "version" : {
         "name" : "1.0.0",

src/packages/gstj/assets/themes/base/animation.less

@@ -1,14 +0,0 @@
-//导航图标动画Demo
-@keyframes icon-scale {
-    0% {
-        transform: scale3d(1.3, 1.3, 1.3);
-    }
-
-    50% {
-        transform: scale3d(.5, .5, .5);
-    }
-
-    100% {
-        transform: scale3d(1, 1, 1);
-    }
-}

src/packages/gstj/assets/themes/base/mixin-resize.less

@@ -1,77 +0,0 @@
-/*!
- * ©teamwei.com
- * author: teamwei
- * date: 2021-09-07
- */
-
-
-/* 移动设备 */
-@phone: ~"screen and (max-width: 575px)";
-
-/* 移动设备 (横屏) */
-@phone-h: ~"screen and (min-width: 576px) and (max-width: 767px)";
-
-/* 平板设备 */
-@tablet: ~"screen and (min-width: 768px) and (max-width: 991px)";
-
-/* 电脑设备 */
-@pc: ~"screen and (min-width: 992px)";
-
-/* 
-    根据不同设备适配属性单位
-    @device 设备代码
-*/
-.mixin-property-rules(@property, @value, @device) {
-    @n: length(@value);
-
-    .each(@i, @parent: "") when (@i < @n + 1) {
-        @arg: extract(@value, @i);
-
-        /* 手机 */
-        .ifNumber() when (isnumber(@arg) = true) and (@device = 001) {
-            @child: unit(@arg * 2 / 100, rem);
-        }
-        /* 平板、电脑 */
-        .ifNumber() when (isnumber(@arg) = true) and (@device = 002) {
-            @child: unit(@arg, px);
-        }
-        /* 非数值 */
-        .ifNumber() when (isnumber(@arg) = false) {
-            @child: @arg;
-        }
-
-        .ifNumber();
-        @newValue: ~"@{parent} @{child}";
-
-        .ifLast() when (@i = @n) {
-            @{property}: @newValue;
-        }
-
-        .ifLast();
-        .each(@i + 1, @newValue);
-    }
-
-    .each(1);
-}
-
-.mixin-property(@property, @value) {
-    @media @phone,@phone-h {
-        .mixin-property-rules(@property, @value, 001);
-    }
-
-    @media @pc,@tablet {
-        .mixin-property-rules(@property, @value, 002);
-    }
-}
-
-html {
-    font-size: 14px;
-
-    @media @phone {
-        font-size: ~"calc(100vw / 750 * 100)";
-    }
-
-    @media @phone-h {
-        font-size: ~"calc(100vw / 1344 * 100)";
-    }
-}

src/packages/gstj/assets/themes/base/mixin.less

@@ -1,149 +0,0 @@
-/*!
- * ©teamwei.com
- * author: teamwei
- * date: 2021-08-28
- */
-
-@border-color: #eee;
-@arrow-color : #aaa;
-
-/* 移动端1px边框修复 */
-.mixin-border() {
-    position   : relative;
-    line-height: normal;
-
-    &:before {
-        content         : '';
-        position        : absolute;
-        transform-origin: 0 0;
-        box-sizing      : border-box;
-    }
-}
-
-/* 左边框 */
-.mixin-border-left(@width: 1px, @rgb: @border-color, @type: solid) {
-    .mixin-border();
-
-    &:before {
-        top        : 0;
-        bottom     : 0;
-        left       : 0;
-        width      : @width;
-        border-left: @width @type @rgb;
-        transform  : scaleX(0.5);
-    }
-}
-
-/* 右边框 */
-.mixin-border-right(@width: 1px, @rgb: @border-color, @type: solid) {
-    .mixin-border();
-
-    &:before {
-        top         : 0;
-        bottom      : 0;
-        right       : 0;
-        width       : @width;
-        border-right: @width @type @rgb;
-        transform   : scaleX(0.5);
-    }
-}
-
-/* 上边框 */
-.mixin-border-top(@width: 1px, @rgb: @border-color, @type: solid) {
-    .mixin-border();
-
-    &:before {
-        top       : 0;
-        left      : 0;
-        right     : 0;
-        height    : @width;
-        border-top: @width @type @rgb;
-        transform : scaleY(0.5);
-    }
-}
-
-/* 下边框 */
-.mixin-border-bottom(@width: 1px, @rgb: @border-color, @type: solid) {
-    .mixin-border();
-
-    &:before {
-        bottom       : 0;
-        left         : 0;
-        right        : 0;
-        height       : @width;
-        border-bottom: @width @type @rgb;
-        transform    : scaleY(0.5);
-    }
-}
-
-.mixin-arrow() {
-    position    : relative;
-    font-size   : 0;
-    border-style: solid;
-
-    &:after {
-        content     : '';
-        position    : absolute;
-        border-style: solid;
-    }
-}
-
-.mixin-arrow-left(@size: 9px, @color: @arrow-color, @maskcolor: #fff) {
-    .mixin-arrow();
-    border-width: @size @size @size 0;
-    border-color: transparent @color transparent;
-
-    &:after {
-        left        : 2px;
-        top         : -@size;
-        border-width: @size @size @size 0;
-        border-color: transparent @maskcolor transparent;
-    }
-}
-
-.mixin-arrow-right(@size: 9px, @color: @arrow-color, @maskcolor: #fff) {
-    .mixin-arrow();
-    border-width: @size 0 @size @size;
-    border-color: transparent transparent transparent @color;
-
-    &:after {
-        right       : 2px;
-        top         : -@size;
-        border-width: @size 0 @size @size;
-        border-color: transparent transparent transparent @maskcolor;
-    }
-}
-
-.mixin-arrow-up(@size: 9px, @color: @arrow-color, @maskcolor: #fff) {
-    .mixin-arrow();
-    border-width: 0 @size @size;
-    border-color: transparent transparent @color;
-
-    &:after {
-        left        : -@size;
-        top         : 2px;
-        border-width: 0 @size @size;
-        border-color: transparent transparent @maskcolor;
-    }
-}
-
-.mixin-arrow-down(@size: 9px, @color: @arrow-color, @maskcolor: #fff) {
-    .mixin-arrow();
-    border-width: @size @size 0;
-    border-color: @color transparent transparent;
-
-    &:after {
-        left        : -@size;
-        bottom      : 2px;
-        border-width: @size @size 0;
-        border-color: @maskcolor transparent transparent;
-    }
-}
-
-.mixin-text-overflow(@row: 1) {
-    overflow          : hidden;
-    text-overflow     : ellipsis;
-    display           : -webkit-box;
-    -webkit-line-clamp: @row;
-    -webkit-box-orient: vertical;
-}

src/packages/gstj/assets/themes/base/reset.less

@@ -1,116 +0,0 @@
-@import './animation.less';
-
-* {
-    font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", "Helvetica Neue", STHeiti, "Microsoft Yahei", Tahoma, Simsun, sans-serif;
-    margin: 0;
-    padding: 0;
-    box-sizing: border-box;
-    background-repeat: no-repeat;
-    background-position: center center;
-    background-size: contain;
-    outline: none;
-    -webkit-tap-highlight-color: transparent;
-
-    //-webkit-appearance: none;
-    &::-webkit-input-placeholder {
-        color: #ccc;
-    }
-}
-
-html {
-    height: 100%;
-}
-
-body {
-    position: relative;
-    height: inherit;
-    font-size: .28rem;
-    color: #333;
-    background-color: #666;
-    margin: auto !important;
-    overflow: hidden;
-    -webkit-overflow-scrolling: touch;
-
-    a {
-        text-decoration: none;
-        color: #333;
-
-        &:hover {
-            color: inherit;
-            text-decoration: underline;
-        }
-
-        &:focus {
-            outline: none;
-        }
-    }
-
-    p,
-    label,
-    h1,
-    h2,
-    h3,
-    h4,
-    h5,
-    h6 {
-        margin: 0;
-        font-weight: normal;
-    }
-
-    img {
-        border: 0;
-        max-width: 100%;
-    }
-
-    button,
-    input,
-    textarea,
-    select {
-        line-height: initial;
-        border: 0;
-        background-color: transparent;
-        outline: none;
-
-        &:focus {
-            outline: none;
-        }
-    }
-
-    button {
-        display: inline-flex;
-        justify-content: center;
-        align-items: center;
-        cursor: pointer;
-
-        span {
-            display: inline-block;
-        }
-    }
-
-    input::-webkit-outer-spin-button,
-    input::-webkit-inner-spin-button {
-        -webkit-appearance: none;
-    }
-
-    input[type="number"] {
-        -moz-appearance: textfield;
-    }
-
-    ul,
-    ol,
-    dl {
-        list-style-type: none;
-    }
-}
-
-.app {
-    position: relative;
-    width: 100%;
-    height: 100%;
-    background-color: #fff;
-    overflow-x: hidden;
-    padding-bottom: constant(safe-area-inset-bottom);
-    /* 兼容 iOS<11.2 */
-    padding-bottom: env(safe-area-inset-bottom);
-    /* 兼容iOS>= 11.2 */
-}

src/packages/gstj/assets/themes/global/global.less

@@ -111,11 +111,14 @@
 /* 导航列表 */
 .g-navmenu {
     .app-iconfont {
-        height: 100%;
+        .g-icon {
+            width: .36rem;
+            height: .36rem;
+            font-size: .36rem;
+        }
 
-        &__icon {
-            font-size: .32rem;
-            margin-right: .24rem;
+        &__label {
+            margin-left: .24rem;
         }
     }
 }

src/packages/gstj/assets/themes/style.less

@@ -1,4 +1,4 @@
-@import './base/reset.less';
+@import '@mobile/assets/themes/base/reset.less';
 @import './global/global.less';
 @import './default/default.less';
 @import './light/light.less';

src/packages/gstj/main.ts

@@ -8,7 +8,6 @@ import directives from '@/directives' // 自定义指令集
 import '@/utils/h5plus' // 加载html5+
 import layouts from '@mobile/components/layouts' // 全局布局组件
 import 'vant/lib/index.css'
-import '@mobile/assets/iconfont/iconfont.js'
 import './assets/themes/style.less' // 主题样式
 import { timerInterceptor } from '@/utils/timer'
 import { useGlobalStore } from '@/stores'

src/packages/gstj/router/index.ts

@@ -42,8 +42,8 @@ const routes: Array<RouteRecordRaw> = [
             },
           },
           {
-            path: 'goods',
-            name: 'home-goods',
+            path: '50101',
+            name: 'home-50101',
             component: () => import('@mobile/views/goods/list/Index.vue'),
             props: {
               title: '协议转让',
@@ -51,8 +51,8 @@ const routes: Array<RouteRecordRaw> = [
             }
           },
           {
-            path: 'forward',
-            name: 'home-forward',
+            path: '50102',
+            name: 'home-50102',
             component: () => import('@mobile/views/goods/list/Index.vue'),
             props: {
               title: '订单挂牌',
@@ -236,20 +236,6 @@ const routes: Array<RouteRecordRaw> = [
     ],
   },
   {
-    path: '/forward',
-    component: Page,
-    children: [
-      {
-        path: '',
-        name: 'forward-list',
-        component: () => import('@mobile/views/goods/list/Index.vue'),
-        props: {
-          marketId: 50102
-        }
-      },
-    ],
-  },
-  {
     path: '/mine',
     component: Page,
     children: [

src/packages/gstj/views/home/Index.vue

@@ -35,32 +35,32 @@ const tabList: Tabbar[] = [
   {
     name: 'home-index',
     label: '首页',
-    icon: 'icon-a-zu826',
-    activeIcon: 'icon-a-zu753',
+    icon: 'g-icon-home--line',
+    activeIcon: 'g-icon-home--fill',
   },
   {
-    name: 'home-forward',
+    name: 'home-50102',
     label: '订单挂牌',
-    icon: 'icon-a-zu820',
-    activeIcon: 'icon-a-zu825',
+    icon: 'g-icon-listing--line',
+    activeIcon: 'g-icon-listing--fill',
   },
   {
     name: 'home-spot',
     label: '现货挂牌',
-    icon: 'icon-a-zu8201',
-    activeIcon: 'icon-a-zu824',
+    icon: 'g-icon-spot--line',
+    activeIcon: 'g-icon-spot--fill',
   },
   {
-    name: 'home-goods',
+    name: 'home-50101',
     label: '协议转让',
-    icon: 'icon-a-zu821',
-    activeIcon: 'icon-a-zu818',
+    icon: 'g-icon-transfer--line',
+    activeIcon: 'g-icon-transfer--fill',
   },
   {
     name: 'home-mine',
     label: '我的',
-    icon: 'icon-a-zu823',
-    activeIcon: 'icon-a-zu819',
+    icon: 'g-icon-mine--line',
+    activeIcon: 'g-icon-mine--fill',
   }
 ]
 

src/packages/gstj/views/home/index.less

@@ -3,26 +3,11 @@
         background: var(--tabbar-background) !important;
         margin-top: auto;
 
-        &__item {
-            font-size: .24rem;
+        .app-iconfont {
             color: var(--tabbar-icon);
 
             &.is-active {
                 color: var(--tabbar-icon-active);
-
-                // .app-iconfont__icon {
-                //     animation: icon-scale 300ms;
-                // }
-            }
-
-            .app-iconfont {
-                &__icon {
-                    font-size: .48rem;
-                }
-
-                &__label {
-                    margin-top: .04rem;
-                }
             }
         }
     }

src/packages/gstj/views/home/main/Index.vue

@@ -10,12 +10,7 @@
       </app-block>
       <app-block class="home-main__news">
         <CellGroup class="article">
-          <Cell class="home-main__titlebar" value="更多" :to="{ name: 'news-list' }" is-link>
-            <template #title>
-              <img src="../../../assets/icons/fire.png" />
-              <span>市场资讯</span>
-            </template>
-          </Cell>
+          <Cell class="home-main__titlebar" title="市场资讯" value="更多" icon="fire" :to="{ name: 'news-list' }" is-link />
           <template v-for="(item, index) in newsList" :key="index">
             <Cell class="article-item" :title="item.title" :value="formatDate(item.publishdate, 'MM/DD')"
               :to="{ name: 'news-detail', query: { id: item.id } }" />

src/packages/gstj/views/home/main/index.less

@@ -1,4 +1,4 @@
-@import '../../../assets/themes/base/mixin.less';
+@import '@mobile/assets/themes/base/mixin.less';
 
 .home-main {
     &__header {
@@ -39,26 +39,8 @@
 
     &__titlebar {
         .van-cell__title {
-            display: flex;
-            align-items: center;
-            line-height: 1;
             font-size: .32rem;
             font-weight: bold;
-
-            img {
-                width: .32rem;
-                height: .32rem;
-                margin-right: .1rem;
-            }
-
-            span {
-                +span {
-                    color: #999;
-                    font-size: .26rem;
-                    font-weight: normal;
-                    margin-left: .1rem;
-                }
-            }
         }
 
         .van-cell__value {

src/packages/gstj/views/mine/Index.vue

@@ -54,16 +54,16 @@
         <app-block class="mine-iconbar">
             <ul>
                 <li @click="routerTo('order-position')">
-                    <Iconfont label-direction="bottom" icon="icon-a-zu746">我的持仓</Iconfont>
+                    <Iconfont label-direction="bottom" icon="g-icon-position--line">我的持仓</Iconfont>
                 </li>
                 <li @click="routerTo('order-list')">
-                    <Iconfont label-direction="bottom" icon="icon-a-zu771defuben">我的订单</Iconfont>
+                    <Iconfont label-direction="bottom" icon="g-icon-order--line">我的订单</Iconfont>
                 </li>
                 <li @click="routerTo('order-delivery')">
-                    <Iconfont label-direction="bottom" icon="icon-a-zu803">交货提货</Iconfont>
+                    <Iconfont label-direction="bottom" icon="g-icon-delivery--line">交货提货</Iconfont>
                 </li>
                 <li @click="routerTo('order-performance')">
-                    <Iconfont label-direction="bottom" icon="icon-a-zu802">履约信息</Iconfont>
+                    <Iconfont label-direction="bottom" icon="g-icon-performance--line">履约信息</Iconfont>
                 </li>
             </ul>
         </app-block>
@@ -71,42 +71,42 @@
             <CellGroup>
                 <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
                     <template #title>
-                        <Iconfont icon="icon-shimingrenzheng">实名认证</Iconfont>
+                        <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'bank-sign' }" v-if="authStatus === AuthStatus.Certified">
                     <template #title>
-                        <Iconfont icon="icon-qianyuezhanghu">签约账户</Iconfont>
+                        <Iconfont icon="g-icon-sign">签约账户</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'mine-profile' }">
                     <template #title>
-                        <Iconfont icon="icon-fapiaoshuoming">个人信息</Iconfont>
+                        <Iconfont icon="g-icon-profile">个人信息</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-zcxy' }">
                     <template #title>
-                        <Iconfont icon="icon-yonghuzhucexieyi">用户注册协议</Iconfont>
+                        <Iconfont icon="g-icon-zcxy">用户注册协议</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-yszc' }">
                     <template #title>
-                        <Iconfont icon="icon-guanyuzhengce">关于隐私</Iconfont>
+                        <Iconfont icon="g-icon-yszc">关于隐私</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-fwrx' }">
                     <template #title>
-                        <Iconfont icon="icon-kefurexian">服务热线</Iconfont>
+                        <Iconfont icon="g-icon-fwrx">服务热线</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'mine-setting' }">
                     <template #title>
-                        <Iconfont icon="icon-shezhi">设置</Iconfont>
+                        <Iconfont icon="g-icon-setting">设置</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-gywm' }">
                     <template #title>
-                        <Iconfont icon="icon-guanyuwomen">关于我们</Iconfont>
+                        <Iconfont icon="g-icon-gywm">关于我们</Iconfont>
                     </template>
                 </Cell>
             </CellGroup>

src/packages/gstj/views/mine/index.less

@@ -1,4 +1,4 @@
-@import '../../assets/themes/base/mixin.less';
+@import '@mobile/assets/themes/base/mixin.less';
 
 .mine {
     @backgroundImage: linear-gradient(var(--navbar-background), var(--navbar-background) 3rem, transparent 3rem);
@@ -148,15 +148,9 @@
                 flex-direction: column;
                 align-items: center;
 
-                .app-iconfont {
-                    &__icon {
-                        font-size: .8rem;
-                    }
-
-                    &__label {
-                        font-size: .24rem;
-                        margin-top: .1rem;
-                    }
+                .g-icon {
+                    font-size: .56rem;
+                    margin-bottom: .04rem;
                 }
             }
         }

src/packages/mobile/assets/themes/base/reset.less

@@ -1,3 +1,4 @@
+@import './iconfont.less';
 @import './animation.less';
 
 * {

src/packages/mobile/assets/themes/global/global.less

@@ -111,11 +111,14 @@
 /* 导航列表 */
 .g-navmenu {
     .app-iconfont {
-        height: 100%;
+        .g-icon {
+            width: .36rem;
+            height: .36rem;
+            font-size: .36rem;
+        }
 
-        &__icon {
-            font-size: .32rem;
-            margin-right: .24rem;
+        &__label {
+            margin-left: .24rem;
         }
     }
 }

src/packages/mobile/components/base/iconfont/index.less

@@ -1,17 +1,10 @@
 .app-iconfont {
-    display        : inline-flex;
+    display: inline-flex;
     justify-content: center;
-    align-items    : center;
-
-    &__icon {
-        width         : 1em;
-        height        : 1em;
-        vertical-align: -0.15em;
-        fill          : currentColor;
-        overflow      : hidden;
-    }
+    align-items: center;
 
     &__label {
-        line-height: 1;
+        font-size: .24rem;
+        line-height: normal;
     }
 }

src/packages/mobile/components/base/iconfont/index.vue

@@ -1,11 +1,8 @@
 <template>
-    <div ref="iconfontRef" class="app-iconfont">
-        <svg :class="['app-iconfont__icon', active && 'is-active']" aria-hidden="true" :style="iconStyles">
-            <use :xlink:href="activeIconName" :fill="activeColor" v-if="active" />
-            <use :xlink:href="iconName" :fill="color" v-else />
-        </svg>
-        <span class="app-iconfont__label">
-            <slot></slot>
+    <div ref="iconfontRef" :class="['app-iconfont', active && 'is-active']">
+        <span :class="iconClass" :style="iconStyles"></span>
+        <span class="app-iconfont__label" v-if="label || $slots.default">
+            <slot>{{ label }}</slot>
         </span>
     </div>
 </template>
@@ -23,6 +20,7 @@ const props = defineProps({
     active: Boolean,
     activeIcon: String,
     activeColor: String,
+    label: String,
     // 标签方向
     labelDirection: {
         type: String as PropType<'left' | 'right' | 'top' | 'bottom'>,
@@ -31,11 +29,20 @@ const props = defineProps({
 })
 
 const iconfontRef = shallowRef<HTMLDivElement>()
-const iconName = computed(() => '#' + props.icon)
-const activeIconName = computed(() => '#' + (props.activeIcon ?? props.icon))
+
+const iconClass = computed(() => {
+    const classList = ['g-icon']
+    if (props.active) {
+        classList.push(props.activeIcon ?? props.icon)
+    } else {
+        classList.push(props.icon)
+    }
+    return classList
+})
 
 const iconStyles = computed(() => ({
-    fontSize: props.size
+    fontSize: props.size,
+    color: props.activeColor ?? props.color
 }))
 
 onMounted(() => {
@@ -59,6 +66,6 @@ onMounted(() => {
 })
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
 @import './index.less';
 </style>

src/packages/mobile/components/base/tabbar/index.less

@@ -1,46 +1,43 @@
 .app-tabbar {
-    height          : 1rem;
+    height: 1rem;
     background-color: #fff;
 
     &__wrapper {
-        bottom    : 0;
-        display   : flex;
-        width     : 100%;
-        height    : ~"calc(1rem - 1px)";
+        bottom: 0;
+        display: flex;
+        width: 100%;
+        height: ~"calc(1rem - 1px)";
         border-top: 1px solid #eee;
         box-sizing: content-box;
     }
 
     &__item {
-        flex           : 1;
-        display        : flex;
-        flex-direction : column;
+        flex: 1;
+        display: flex;
+        flex-direction: column;
         justify-content: center;
-        align-items    : center;
-        height         : inherit;
-        cursor         : pointer;
+        align-items: center;
+        height: inherit;
+        cursor: pointer;
 
         [class^='g-icon'] {
-            display        : flex;
-            flex-direction : column;
+            display: flex;
+            flex-direction: column;
             justify-content: center;
-            align-items    : center;
+            align-items: center;
 
             img {
-                width     : .44rem;
-                height    : .44rem;
+                width: .52rem;
+                height: .52rem;
                 object-fit: contain;
             }
 
             span {
-                font-size : .24rem;
-                margin-top: .05rem;
+                font-size: .24rem;
             }
 
             &:before {
-                width    : .44rem;
-                height   : .44rem;
-                font-size: .44rem;
+                font-size: .52rem;
             }
         }
     }

src/packages/mobile/components/base/tabbar/index.vue

@@ -7,15 +7,15 @@
           <slot :item="item" :index="index">
             <!--判断是否图片图标-->
             <template v-if="item.iconType === 'image'">
-              <div :class="['g-icon', dataIndex === index && 'active']">
+              <div :class="['g-icon', dataIndex === index && 'is-active']">
                 <img :src="item.activeIcon" v-if="dataIndex === index" />
                 <img :src="item.icon" v-else />
                 <span>{{ item.label }}</span>
               </div>
             </template>
             <template v-else>
-              <app-iconfont label-direction="bottom" :icon="item.icon" :active-icon="item.activeIcon"
-                :active="dataIndex === index">{{ item.label }}</app-iconfont>
+              <app-iconfont label-direction="bottom" :label="item.label" :icon="item.icon" :active-icon="item.activeIcon"
+                :active="dataIndex === index" />
             </template>
           </slot>
         </div>
@@ -64,6 +64,6 @@ const onClick = (index: number) => {
 }
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
 @import './index.less';
 </style>

src/packages/mobile/main.ts

@@ -8,7 +8,6 @@ import directives from '@/directives' // 自定义指令集
 import '@/utils/h5plus' // 加载html5+
 import layouts from './components/layouts' // 全局布局组件
 import 'vant/lib/index.css'
-import './assets/iconfont/iconfont.js'
 import './assets/themes/style.less' // 主题样式
 import { timerInterceptor } from '@/utils/timer'
 import { useGlobalStore } from '@/stores'

src/packages/mobile/views/home/Index.vue

@@ -8,7 +8,7 @@
         </keep-alive>
       </RouterTransition>
     </router-view>
-    <app-tabbar class="home-tabbar" :data-list="tabList" :data-index="currentTab" @click="onTabClick" />
+    <app-tabbar :data-list="tabList" :data-index="currentTab" @click="onTabClick" />
   </div>
 </template>
 
@@ -35,32 +35,32 @@ const tabList: Tabbar[] = [
   {
     name: 'home-index',
     label: '首页',
-    icon: 'icon-a-zu826',
-    activeIcon: 'icon-a-zu753',
+    icon: 'g-icon-home--line',
+    activeIcon: 'g-icon-home--fill',
   },
   {
     name: 'home-ballot',
     label: '预售中签',
-    icon: 'icon-a-zu820',
-    activeIcon: 'icon-a-zu825',
+    icon: 'g-icon-presale--line',
+    activeIcon: 'g-icon-presale--fill',
   },
   {
     name: 'home-transfer',
     label: '定金转让',
-    icon: 'icon-a-zu8201',
-    activeIcon: 'icon-a-zu824',
+    icon: 'g-icon-transfer--line',
+    activeIcon: 'g-icon-transfer--fill',
   },
   {
     name: 'home-16201',
     label: '全款挂牌',
-    icon: 'icon-a-zu821',
-    activeIcon: 'icon-a-zu818',
+    icon: 'g-icon-listing--line',
+    activeIcon: 'g-icon-listing--fill',
   },
   {
     name: 'home-mine',
     label: '我的',
-    icon: 'icon-a-zu823',
-    activeIcon: 'icon-a-zu819',
+    icon: 'g-icon-mine--line',
+    activeIcon: 'g-icon-mine--fill',
   }
 ]
 

src/packages/mobile/views/home/index.less

@@ -3,26 +3,11 @@
         background: var(--tabbar-background) !important;
         margin-top: auto;
 
-        &__item {
-            font-size: .24rem;
+        .app-iconfont {
             color: var(--tabbar-icon);
 
             &.is-active {
                 color: var(--tabbar-icon-active);
-
-                // .app-iconfont__icon {
-                //     animation: icon-scale 300ms;
-                // }
-            }
-
-            .app-iconfont {
-                &__icon {
-                    font-size: .48rem;
-                }
-
-                &__label {
-                    margin-top: .04rem;
-                }
             }
         }
     }

src/packages/mobile/views/home/main/Index.vue

@@ -8,55 +8,50 @@
       <app-block>
         <Cell title="通知公告" value="更多" :to="{ name: 'notice-list' }" icon="volume" is-link />
       </app-block>
-      <app-block class="home-main__iconbar bg">
+      <app-block class="home-main__iconbar">
         <ul>
           <li @click="routerTo('goods-50101')">
-            <Iconfont label-direction="bottom" icon="icon-a-zu771">日清挂牌</Iconfont>
+            <Iconfont label-direction="bottom" icon="g-icon-listing--line m50101">日清挂牌</Iconfont>
           </li>
           <li @click="routerTo('goods-50103')">
-            <Iconfont label-direction="bottom" icon="icon-a-zu771">周清挂牌</Iconfont>
+            <Iconfont label-direction="bottom" icon="g-icon-listing--line m50103">周清挂牌</Iconfont>
           </li>
           <li @click="routerTo('goods-50104')">
-            <Iconfont label-direction="bottom" icon="icon-a-zu771">月清挂牌</Iconfont>
+            <Iconfont label-direction="bottom" icon="g-icon-listing--line m50104">月清挂牌</Iconfont>
           </li>
           <li @click="routerTo('goods-50102')">
-            <Iconfont label-direction="bottom" icon="icon-dingjinzhuanrang">中远期挂牌</Iconfont>
+            <Iconfont label-direction="bottom" icon="g-icon-listing--line m50102">中远期挂牌</Iconfont>
           </li>
           <!-- <li @click="switchTab(1)">
-            <Iconfont label-direction="bottom" icon="icon-zhongqian">预售中签</Iconfont>
+            <Iconfont label-direction="bottom" icon="g-icon-presale--line">预售中签</Iconfont>
           </li> -->
           <!-- <li @click="switchTab(2)">
-            <Iconfont label-direction="bottom" icon="icon-dingjinzhuanrang">定金转让</Iconfont>
+            <Iconfont label-direction="bottom" icon="g-icon-transfer--line">定金转让</Iconfont>
           </li> -->
         </ul>
         <ul>
           <li @click="routerTo('presale-list')">
-            <Iconfont label-direction="bottom" icon="icon-yushoujingpai">预售竞拍</Iconfont>
+            <Iconfont label-direction="bottom" icon="g-icon-auction--line">预售竞拍</Iconfont>
           </li>
           <li @click="routerTo('spot-list')">
-            <Iconfont label-direction="bottom" icon="icon-xianhuomaoyi">现货贸易</Iconfont>
+            <Iconfont label-direction="bottom" icon="g-icon-spot--line">现货贸易</Iconfont>
           </li>
           <li @click="routerTo('pricing-list')">
-            <Iconfont label-direction="bottom" icon="icon-guapaidianjia">挂牌点价</Iconfont>
+            <Iconfont label-direction="bottom" icon="g-icon-pricing--line">挂牌点价</Iconfont>
           </li>
           <li @click="routerTo('swap-list')">
-            <Iconfont label-direction="bottom" icon="icon-diaoqimaoyi">掉期贸易</Iconfont>
+            <Iconfont label-direction="bottom" icon="g-icon-swap--line">掉期贸易</Iconfont>
           </li>
         </ul>
         <ul>
           <li @click="routerTo('market-list')">
-            <Iconfont label-direction="bottom" icon="icon-cankaohangqing">参考行情</Iconfont>
+            <Iconfont label-direction="bottom" icon="g-icon-quote--line">参考行情</Iconfont>
           </li>
         </ul>
       </app-block>
       <app-block class="home-main__news">
         <CellGroup class="article">
-          <Cell class="home-main__titlebar" value="更多" :to="{ name: 'news-list' }" is-link>
-            <template #title>
-              <img src="../../../assets/icons/fire.png" />
-              <span>市场资讯</span>
-            </template>
-          </Cell>
+          <Cell class="home-main__titlebar" title="市场资讯" value="更多" icon="fire" :to="{ name: 'news-list' }" is-link />
           <template v-for="(item, index) in newsList" :key="index">
             <Cell class="article-item" :title="item.title" :value="formatDate(item.publishdate, 'MM/DD')"
               :to="{ name: 'news-detail', query: { id: item.id } }" />

src/packages/mobile/views/home/main/index.less

@@ -23,14 +23,50 @@
                 width: calc(~'100% / 4');
                 text-align: center;
 
-                .app-iconfont {
-                    &__icon {
-                        font-size: .8rem;
+                .g-icon {
+                    width: .72rem;
+                    height: .72rem;
+                    font-size: .44rem;
+                    color: #fff;
+                    border-radius: 50%;
+                    margin-bottom: .08rem;
+
+                    &-listing--line {
+                        &.m50101 {
+                            background-color: #96b7d1;
+                        }
+
+                        &.m50102 {
+                            background-color: #2b455b;
+                        }
+
+                        &.m50103 {
+                            background-color: #72a2c9;
+                        }
+
+                        &.m50104 {
+                            background-color: #42739b;
+                        }
+                    }
+
+                    &-auction--line {
+                        background-color: #72c990;
+                    }
+
+                    &-spot--line {
+                        background-color: #9d6969;
+                    }
+
+                    &-pricing--line {
+                        background-color: #8272c9;
+                    }
+
+                    &-swap--line {
+                        background-color: #ebc413;
                     }
 
-                    &__label {
-                        font-size: .24rem;
-                        margin-top: .1rem;
+                    &-quote--line {
+                        background-color: #df4343;
                     }
                 }
             }
@@ -39,26 +75,8 @@
 
     &__titlebar {
         .van-cell__title {
-            display: flex;
-            align-items: center;
-            line-height: 1;
             font-size: .32rem;
             font-weight: bold;
-
-            img {
-                width: .32rem;
-                height: .32rem;
-                margin-right: .1rem;
-            }
-
-            span {
-                +span {
-                    color: #999;
-                    font-size: .26rem;
-                    font-weight: normal;
-                    margin-left: .1rem;
-                }
-            }
         }
 
         .van-cell__value {

src/packages/mobile/views/mine/Index.vue

@@ -54,16 +54,16 @@
         <app-block class="mine-iconbar">
             <ul>
                 <li @click="routerTo('order-position')">
-                    <Iconfont label-direction="bottom" icon="icon-a-zu746">我的持仓</Iconfont>
+                    <Iconfont label-direction="bottom" icon="g-icon-position--line">我的持仓</Iconfont>
                 </li>
                 <li @click="routerTo('order-list')">
-                    <Iconfont label-direction="bottom" icon="icon-a-zu771defuben">我的订单</Iconfont>
+                    <Iconfont label-direction="bottom" icon="g-icon-order--line">我的订单</Iconfont>
                 </li>
                 <li @click="routerTo('order-delivery')">
-                    <Iconfont label-direction="bottom" icon="icon-a-zu803">交货提货</Iconfont>
+                    <Iconfont label-direction="bottom" icon="g-icon-delivery--line">交货提货</Iconfont>
                 </li>
                 <li @click="routerTo('order-performance')">
-                    <Iconfont label-direction="bottom" icon="icon-a-zu802">履约信息</Iconfont>
+                    <Iconfont label-direction="bottom" icon="g-icon-performance--line">履约信息</Iconfont>
                 </li>
             </ul>
         </app-block>
@@ -71,42 +71,42 @@
             <CellGroup>
                 <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
                     <template #title>
-                        <Iconfont icon="icon-shimingrenzheng">实名认证</Iconfont>
+                        <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'bank-sign' }" v-if="authStatus === AuthStatus.Certified">
                     <template #title>
-                        <Iconfont icon="icon-qianyuezhanghu">签约账户</Iconfont>
+                        <Iconfont icon="g-icon-sign">签约账户</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'mine-profile' }">
                     <template #title>
-                        <Iconfont icon="icon-fapiaoshuoming">个人信息</Iconfont>
+                        <Iconfont icon="g-icon-profile">个人信息</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-zcxy' }">
                     <template #title>
-                        <Iconfont icon="icon-yonghuzhucexieyi">用户注册协议</Iconfont>
+                        <Iconfont icon="g-icon-zcxy">用户注册协议</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-yszc' }">
                     <template #title>
-                        <Iconfont icon="icon-guanyuzhengce">关于隐私</Iconfont>
+                        <Iconfont icon="g-icon-yszc">关于隐私</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-fwrx' }">
                     <template #title>
-                        <Iconfont icon="icon-kefurexian">服务热线</Iconfont>
+                        <Iconfont icon="g-icon-fwrx">服务热线</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'mine-setting' }">
                     <template #title>
-                        <Iconfont icon="icon-shezhi">设置</Iconfont>
+                        <Iconfont icon="g-icon-setting">设置</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-gywm' }">
                     <template #title>
-                        <Iconfont icon="icon-guanyuwomen">关于我们</Iconfont>
+                        <Iconfont icon="g-icon-gywm">关于我们</Iconfont>
                     </template>
                 </Cell>
             </CellGroup>

src/packages/mobile/views/mine/index.less

@@ -148,15 +148,9 @@
                 flex-direction: column;
                 align-items: center;
 
-                .app-iconfont {
-                    &__icon {
-                        font-size: .8rem;
-                    }
-
-                    &__label {
-                        font-size: .24rem;
-                        margin-top: .1rem;
-                    }
+                .g-icon {
+                    font-size: .56rem;
+                    margin-bottom: .04rem;
                 }
             }
         }

src/packages/mobile/views/mine/setting/Index.vue

@@ -7,12 +7,12 @@
             <CellGroup>
                 <Cell is-link :to="{ name: 'user-password' }">
                     <template #title>
-                        <app-iconfont icon="icon-yonghuzhucexieyi">修改密码</app-iconfont>
+                        <app-iconfont icon="g-icon-password">修改密码</app-iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'user-cancel' }">
                     <template #title>
-                        <app-iconfont icon="icon-zhuxiaofuwu">注销服务</app-iconfont>
+                        <app-iconfont icon="g-icon-cancel">注销服务</app-iconfont>
                     </template>
                 </Cell>
             </CellGroup>

src/packages/pc/components/layouts/sidebar/index.less

@@ -44,7 +44,7 @@
                 content: '';
                 width: 32px;
                 height: 32px;
-                background-image: url('@pc/assets/logo.svg');
+                background-image: url('@pc/assets/logo.png');
                 margin-right: 10px;
             }
         }

src/packages/pc/views/auth/components/layout/index.less

@@ -29,6 +29,7 @@
             padding: 60px 80px;
 
             &-logo {
+                text-align: center;
                 margin-bottom: 50px;
 
                 img {

src/packages/pc/views/auth/components/layout/index.vue

@@ -15,9 +15,9 @@
         </div>
       </div>
     </div>
-    <!-- <div class="sign-layout__footer">
+    <div class="sign-layout__footer" v-if="false">
       <span>Copyright ©{{ year }} 深圳市多元世纪信息技术股份有限公司 版权所有 粤ICP备00000000号</span>
-    </div> -->
+    </div>
   </div>
 </template>
 
@@ -29,7 +29,7 @@ defineProps({
   },
 })
 
-//const year = new Date().getFullYear()
+const year = new Date().getFullYear()
 </script>
 
 <style lang="less">

src/packages/qdhs/assets/themes/base/animation.less

@@ -1,14 +0,0 @@
-//导航图标动画Demo
-@keyframes icon-scale {
-    0% {
-        transform: scale3d(1.3, 1.3, 1.3);
-    }
-
-    50% {
-        transform: scale3d(.5, .5, .5);
-    }
-
-    100% {
-        transform: scale3d(1, 1, 1);
-    }
-}

src/packages/qdhs/assets/themes/base/mixin-resize.less

@@ -1,77 +0,0 @@
-/*!
- * ©teamwei.com
- * author: teamwei
- * date: 2021-09-07
- */
-
-
-/* 移动设备 */
-@phone: ~"screen and (max-width: 575px)";
-
-/* 移动设备 (横屏) */
-@phone-h: ~"screen and (min-width: 576px) and (max-width: 767px)";
-
-/* 平板设备 */
-@tablet: ~"screen and (min-width: 768px) and (max-width: 991px)";
-
-/* 电脑设备 */
-@pc: ~"screen and (min-width: 992px)";
-
-/* 
-    根据不同设备适配属性单位
-    @device 设备代码
-*/
-.mixin-property-rules(@property, @value, @device) {
-    @n: length(@value);
-
-    .each(@i, @parent: "") when (@i < @n + 1) {
-        @arg: extract(@value, @i);
-
-        /* 手机 */
-        .ifNumber() when (isnumber(@arg) = true) and (@device = 001) {
-            @child: unit(@arg * 2 / 100, rem);
-        }
-        /* 平板、电脑 */
-        .ifNumber() when (isnumber(@arg) = true) and (@device = 002) {
-            @child: unit(@arg, px);
-        }
-        /* 非数值 */
-        .ifNumber() when (isnumber(@arg) = false) {
-            @child: @arg;
-        }
-
-        .ifNumber();
-        @newValue: ~"@{parent} @{child}";
-
-        .ifLast() when (@i = @n) {
-            @{property}: @newValue;
-        }
-
-        .ifLast();
-        .each(@i + 1, @newValue);
-    }
-
-    .each(1);
-}
-
-.mixin-property(@property, @value) {
-    @media @phone,@phone-h {
-        .mixin-property-rules(@property, @value, 001);
-    }
-
-    @media @pc,@tablet {
-        .mixin-property-rules(@property, @value, 002);
-    }
-}
-
-html {
-    font-size: 14px;
-
-    @media @phone {
-        font-size: ~"calc(100vw / 750 * 100)";
-    }
-
-    @media @phone-h {
-        font-size: ~"calc(100vw / 1344 * 100)";
-    }
-}

src/packages/qdhs/assets/themes/base/mixin.less

@@ -1,149 +0,0 @@
-/*!
- * ©teamwei.com
- * author: teamwei
- * date: 2021-08-28
- */
-
-@border-color: #eee;
-@arrow-color : #aaa;
-
-/* 移动端1px边框修复 */
-.mixin-border() {
-    position   : relative;
-    line-height: normal;
-
-    &:before {
-        content         : '';
-        position        : absolute;
-        transform-origin: 0 0;
-        box-sizing      : border-box;
-    }
-}
-
-/* 左边框 */
-.mixin-border-left(@width: 1px, @rgb: @border-color, @type: solid) {
-    .mixin-border();
-
-    &:before {
-        top        : 0;
-        bottom     : 0;
-        left       : 0;
-        width      : @width;
-        border-left: @width @type @rgb;
-        transform  : scaleX(0.5);
-    }
-}
-
-/* 右边框 */
-.mixin-border-right(@width: 1px, @rgb: @border-color, @type: solid) {
-    .mixin-border();
-
-    &:before {
-        top         : 0;
-        bottom      : 0;
-        right       : 0;
-        width       : @width;
-        border-right: @width @type @rgb;
-        transform   : scaleX(0.5);
-    }
-}
-
-/* 上边框 */
-.mixin-border-top(@width: 1px, @rgb: @border-color, @type: solid) {
-    .mixin-border();
-
-    &:before {
-        top       : 0;
-        left      : 0;
-        right     : 0;
-        height    : @width;
-        border-top: @width @type @rgb;
-        transform : scaleY(0.5);
-    }
-}
-
-/* 下边框 */
-.mixin-border-bottom(@width: 1px, @rgb: @border-color, @type: solid) {
-    .mixin-border();
-
-    &:before {
-        bottom       : 0;
-        left         : 0;
-        right        : 0;
-        height       : @width;
-        border-bottom: @width @type @rgb;
-        transform    : scaleY(0.5);
-    }
-}
-
-.mixin-arrow() {
-    position    : relative;
-    font-size   : 0;
-    border-style: solid;
-
-    &:after {
-        content     : '';
-        position    : absolute;
-        border-style: solid;
-    }
-}
-
-.mixin-arrow-left(@size: 9px, @color: @arrow-color, @maskcolor: #fff) {
-    .mixin-arrow();
-    border-width: @size @size @size 0;
-    border-color: transparent @color transparent;
-
-    &:after {
-        left        : 2px;
-        top         : -@size;
-        border-width: @size @size @size 0;
-        border-color: transparent @maskcolor transparent;
-    }
-}
-
-.mixin-arrow-right(@size: 9px, @color: @arrow-color, @maskcolor: #fff) {
-    .mixin-arrow();
-    border-width: @size 0 @size @size;
-    border-color: transparent transparent transparent @color;
-
-    &:after {
-        right       : 2px;
-        top         : -@size;
-        border-width: @size 0 @size @size;
-        border-color: transparent transparent transparent @maskcolor;
-    }
-}
-
-.mixin-arrow-up(@size: 9px, @color: @arrow-color, @maskcolor: #fff) {
-    .mixin-arrow();
-    border-width: 0 @size @size;
-    border-color: transparent transparent @color;
-
-    &:after {
-        left        : -@size;
-        top         : 2px;
-        border-width: 0 @size @size;
-        border-color: transparent transparent @maskcolor;
-    }
-}
-
-.mixin-arrow-down(@size: 9px, @color: @arrow-color, @maskcolor: #fff) {
-    .mixin-arrow();
-    border-width: @size @size 0;
-    border-color: @color transparent transparent;
-
-    &:after {
-        left        : -@size;
-        bottom      : 2px;
-        border-width: @size @size 0;
-        border-color: @maskcolor transparent transparent;
-    }
-}
-
-.mixin-text-overflow(@row: 1) {
-    overflow          : hidden;
-    text-overflow     : ellipsis;
-    display           : -webkit-box;
-    -webkit-line-clamp: @row;
-    -webkit-box-orient: vertical;
-}

src/packages/qdhs/assets/themes/base/reset.less

@@ -1,116 +0,0 @@
-@import './animation.less';
-
-* {
-    font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", "Helvetica Neue", STHeiti, "Microsoft Yahei", Tahoma, Simsun, sans-serif;
-    margin: 0;
-    padding: 0;
-    box-sizing: border-box;
-    background-repeat: no-repeat;
-    background-position: center center;
-    background-size: contain;
-    outline: none;
-    -webkit-tap-highlight-color: transparent;
-
-    //-webkit-appearance: none;
-    &::-webkit-input-placeholder {
-        color: #ccc;
-    }
-}
-
-html {
-    height: 100%;
-}
-
-body {
-    position: relative;
-    height: inherit;
-    font-size: .28rem;
-    color: #333;
-    background-color: #666;
-    margin: auto !important;
-    overflow: hidden;
-    -webkit-overflow-scrolling: touch;
-
-    a {
-        text-decoration: none;
-        color: #333;
-
-        &:hover {
-            color: inherit;
-            text-decoration: underline;
-        }
-
-        &:focus {
-            outline: none;
-        }
-    }
-
-    p,
-    label,
-    h1,
-    h2,
-    h3,
-    h4,
-    h5,
-    h6 {
-        margin: 0;
-        font-weight: normal;
-    }
-
-    img {
-        border: 0;
-        max-width: 100%;
-    }
-
-    button,
-    input,
-    textarea,
-    select {
-        line-height: initial;
-        border: 0;
-        background-color: transparent;
-        outline: none;
-
-        &:focus {
-            outline: none;
-        }
-    }
-
-    button {
-        display: inline-flex;
-        justify-content: center;
-        align-items: center;
-        cursor: pointer;
-
-        span {
-            display: inline-block;
-        }
-    }
-
-    input::-webkit-outer-spin-button,
-    input::-webkit-inner-spin-button {
-        -webkit-appearance: none;
-    }
-
-    input[type="number"] {
-        -moz-appearance: textfield;
-    }
-
-    ul,
-    ol,
-    dl {
-        list-style-type: none;
-    }
-}
-
-.app {
-    position: relative;
-    width: 100%;
-    height: 100%;
-    background-color: #fff;
-    overflow-x: hidden;
-    padding-bottom: constant(safe-area-inset-bottom);
-    /* 兼容 iOS<11.2 */
-    padding-bottom: env(safe-area-inset-bottom);
-    /* 兼容iOS>= 11.2 */
-}

src/packages/qdhs/assets/themes/global/global.less

@@ -111,11 +111,14 @@
 /* 导航列表 */
 .g-navmenu {
     .app-iconfont {
-        height: 100%;
+        .g-icon {
+            width: .36rem;
+            height: .36rem;
+            font-size: .36rem;
+        }
 
-        &__icon {
-            font-size: .32rem;
-            margin-right: .24rem;
+        &__label {
+            margin-left: .24rem;
         }
     }
 }

src/packages/qdhs/assets/themes/style.less

@@ -1,4 +1,4 @@
-@import './base/reset.less';
+@import '@mobile/assets/themes/base/reset.less';
 @import './global/global.less';
 @import './default/default.less';
 @import './light/light.less';

src/packages/qdhs/main.ts

@@ -8,7 +8,6 @@ import directives from '@/directives' // 自定义指令集
 import '@/utils/h5plus' // 加载html5+
 import layouts from '@mobile/components/layouts' // 全局布局组件
 import 'vant/lib/index.css'
-import '@mobile/assets/iconfont/iconfont.js'
 import './assets/themes/style.less' // 主题样式
 import { timerInterceptor } from '@/utils/timer'
 import { useGlobalStore } from '@/stores'

src/packages/qdhs/router/index.ts

@@ -160,8 +160,8 @@ const routes: Array<RouteRecordRaw> = [
     component: Page,
     children: [
       {
-        path: '',
-        name: 'goods-list',
+        path: '50102',
+        name: 'goods-50102',
         component: () => import('@mobile/views/goods/list/Index.vue'),
         props: {
           title: '中远期挂牌',

src/packages/qdhs/views/home/Index.vue

@@ -35,32 +35,32 @@ const tabList: Tabbar[] = [
   {
     name: 'home-index',
     label: '首页',
-    icon: 'icon-a-zu826',
-    activeIcon: 'icon-a-zu753',
+    icon: 'g-icon-home--line',
+    activeIcon: 'g-icon-home--fill',
   },
   {
     name: 'home-50101',
     label: '日清挂牌',
-    icon: 'icon-a-zu820',
-    activeIcon: 'icon-a-zu825',
+    icon: 'g-icon-listing--line',
+    activeIcon: 'g-icon-listing--fill',
   },
   {
     name: 'home-50103',
     label: '周清挂牌',
-    icon: 'icon-a-zu8201',
-    activeIcon: 'icon-a-zu824',
+    icon: 'g-icon-listing--line',
+    activeIcon: 'g-icon-listing--fill',
   },
   {
     name: 'home-50104',
     label: '月清挂牌',
-    icon: 'icon-a-zu821',
-    activeIcon: 'icon-a-zu818',
+    icon: 'g-icon-listing--line',
+    activeIcon: 'g-icon-listing--fill',
   },
   {
     name: 'home-mine',
     label: '我的',
-    icon: 'icon-a-zu823',
-    activeIcon: 'icon-a-zu819',
+    icon: 'g-icon-mine--line',
+    activeIcon: 'g-icon-mine--fill',
   }
 ]
 

src/packages/qdhs/views/home/index.less

@@ -3,26 +3,11 @@
         background: var(--tabbar-background) !important;
         margin-top: auto;
 
-        &__item {
-            font-size: .24rem;
+        .app-iconfont {
             color: var(--tabbar-icon);
 
             &.is-active {
                 color: var(--tabbar-icon-active);
-
-                // .app-iconfont__icon {
-                //     animation: icon-scale 300ms;
-                // }
-            }
-
-            .app-iconfont {
-                &__icon {
-                    font-size: .48rem;
-                }
-
-                &__label {
-                    margin-top: .04rem;
-                }
             }
         }
     }

src/packages/qdhs/views/home/main/Index.vue

@@ -11,27 +11,22 @@
       <app-block class="home-main__iconbar bg">
         <ul>
           <li @click="switchTab(1)">
-            <Iconfont label-direction="bottom" icon="icon-yushoujingpai">日清挂牌</Iconfont>
+            <Iconfont label-direction="bottom" icon="g-icon-listing--line m50101">日清挂牌</Iconfont>
           </li>
           <li @click="switchTab(2)">
-            <Iconfont label-direction="bottom" icon="icon-xianhuomaoyi">周清挂牌</Iconfont>
+            <Iconfont label-direction="bottom" icon="g-icon-listing--line m50103">周清挂牌</Iconfont>
           </li>
           <li @click="switchTab(3)">
-            <Iconfont label-direction="bottom" icon="icon-a-zu771">月清挂牌</Iconfont>
+            <Iconfont label-direction="bottom" icon="g-icon-listing--line m50104">月清挂牌</Iconfont>
           </li>
-          <li @click="routerTo('goods-list')">
-            <Iconfont label-direction="bottom" icon="icon-dingjinzhuanrang">中远期挂牌</Iconfont>
+          <li @click="routerTo('goods-50102')">
+            <Iconfont label-direction="bottom" icon="g-icon-listing--line m50102">中远期挂牌</Iconfont>
           </li>
         </ul>
       </app-block>
       <app-block class="home-main__news">
         <CellGroup class="article">
-          <Cell class="home-main__titlebar" value="更多" :to="{ name: 'news-list' }" is-link>
-            <template #title>
-              <img src="../../../assets/icons/fire.png" />
-              <span>市场资讯</span>
-            </template>
-          </Cell>
+          <Cell class="home-main__titlebar" title="市场资讯" value="更多" icon="fire" :to="{ name: 'news-list' }" is-link />
           <template v-for="(item, index) in newsList" :key="index">
             <Cell class="article-item" :title="item.title" :value="formatDate(item.publishdate, 'MM/DD')"
               :to="{ name: 'news-detail', query: { id: item.id } }" />

src/packages/qdhs/views/home/main/index.less

@@ -1,4 +1,4 @@
-@import '../../../assets/themes/base/mixin.less';
+@import '@mobile/assets/themes/base/mixin.less';
 
 .home-main {
     &__header {
@@ -23,14 +23,30 @@
                 width: calc(~'100% / 4');
                 text-align: center;
 
-                .app-iconfont {
-                    &__icon {
-                        font-size: .8rem;
-                    }
+                .g-icon {
+                    width: .72rem;
+                    height: .72rem;
+                    font-size: .44rem;
+                    color: #fff;
+                    border-radius: 50%;
+                    margin-bottom: .08rem;
+
+                    &-listing--line {
+                        &.m50101 {
+                            background-color: #72c990;
+                        }
+
+                        &.m50102 {
+                            background-color: #9d6969;
+                        }
 
-                    &__label {
-                        font-size: .24rem;
-                        margin-top: .1rem;
+                        &.m50103 {
+                            background-color: #8272c9;
+                        }
+
+                        &.m50104 {
+                            background-color: #ebc413;
+                        }
                     }
                 }
             }
@@ -39,26 +55,8 @@
 
     &__titlebar {
         .van-cell__title {
-            display: flex;
-            align-items: center;
-            line-height: 1;
             font-size: .32rem;
             font-weight: bold;
-
-            img {
-                width: .32rem;
-                height: .32rem;
-                margin-right: .1rem;
-            }
-
-            span {
-                +span {
-                    color: #999;
-                    font-size: .26rem;
-                    font-weight: normal;
-                    margin-left: .1rem;
-                }
-            }
         }
 
         .van-cell__value {

src/packages/qdhs/views/mine/Index.vue

@@ -54,13 +54,13 @@
         <app-block class="mine-iconbar">
             <ul>
                 <li @click="routerTo('order-position')">
-                    <Iconfont label-direction="bottom" icon="icon-a-zu746">我的持仓</Iconfont>
+                    <Iconfont label-direction="bottom" icon="g-icon-position--line">我的持仓</Iconfont>
                 </li>
                 <li @click="routerTo('order-list')">
-                    <Iconfont label-direction="bottom" icon="icon-a-zu771defuben">我的订单</Iconfont>
+                    <Iconfont label-direction="bottom" icon="g-icon-order--line">我的订单</Iconfont>
                 </li>
                 <li @click="routerTo('order-delivery')">
-                    <Iconfont label-direction="bottom" icon="icon-a-zu803">交货提货</Iconfont>
+                    <Iconfont label-direction="bottom" icon="g-icon-delivery--line">交货提货</Iconfont>
                 </li>
             </ul>
         </app-block>
@@ -68,42 +68,42 @@
             <CellGroup>
                 <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
                     <template #title>
-                        <Iconfont icon="icon-shimingrenzheng">实名认证</Iconfont>
+                        <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'bank-sign' }" v-if="authStatus === AuthStatus.Certified">
                     <template #title>
-                        <Iconfont icon="icon-qianyuezhanghu">签约账户</Iconfont>
+                        <Iconfont icon="g-icon-sign">签约账户</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'mine-profile' }">
                     <template #title>
-                        <Iconfont icon="icon-fapiaoshuoming">个人信息</Iconfont>
+                        <Iconfont icon="g-icon-profile">个人信息</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-zcxy' }">
                     <template #title>
-                        <Iconfont icon="icon-yonghuzhucexieyi">用户注册协议</Iconfont>
+                        <Iconfont icon="g-icon-zcxy">用户注册协议</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-yszc' }">
                     <template #title>
-                        <Iconfont icon="icon-guanyuzhengce">关于隐私</Iconfont>
+                        <Iconfont icon="g-icon-yszc">关于隐私</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-fwrx' }">
                     <template #title>
-                        <Iconfont icon="icon-kefurexian">服务热线</Iconfont>
+                        <Iconfont icon="g-icon-fwrx">服务热线</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'mine-setting' }">
                     <template #title>
-                        <Iconfont icon="icon-shezhi">设置</Iconfont>
+                        <Iconfont icon="g-icon-setting">设置</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-gywm' }">
                     <template #title>
-                        <Iconfont icon="icon-guanyuwomen">关于我们</Iconfont>
+                        <Iconfont icon="g-icon-gywm">关于我们</Iconfont>
                     </template>
                 </Cell>
             </CellGroup>

src/packages/qdhs/views/mine/index.less

@@ -1,4 +1,4 @@
-@import '../../assets/themes/base/mixin.less';
+@import '@mobile/assets/themes/base/mixin.less';
 
 .mine {
     @backgroundImage: linear-gradient(var(--navbar-background), var(--navbar-background) 3rem, transparent 3rem);
@@ -148,15 +148,9 @@
                 flex-direction: column;
                 align-items: center;
 
-                .app-iconfont {
-                    &__icon {
-                        font-size: .8rem;
-                    }
-
-                    &__label {
-                        font-size: .24rem;
-                        margin-top: .1rem;
-                    }
+                .g-icon {
+                    font-size: .56rem;
+                    margin-bottom: .04rem;
                 }
             }
         }

src/packages/qxst/assets/themes/base/animation.less

@@ -1,14 +0,0 @@
-//导航图标动画Demo
-@keyframes icon-scale {
-    0% {
-        transform: scale3d(1.3, 1.3, 1.3);
-    }
-
-    50% {
-        transform: scale3d(.5, .5, .5);
-    }
-
-    100% {
-        transform: scale3d(1, 1, 1);
-    }
-}

src/packages/qxst/assets/themes/base/mixin-resize.less

@@ -1,77 +0,0 @@
-/*!
- * ©teamwei.com
- * author: teamwei
- * date: 2021-09-07
- */
-
-
-/* 移动设备 */
-@phone: ~"screen and (max-width: 575px)";
-
-/* 移动设备 (横屏) */
-@phone-h: ~"screen and (min-width: 576px) and (max-width: 767px)";
-
-/* 平板设备 */
-@tablet: ~"screen and (min-width: 768px) and (max-width: 991px)";
-
-/* 电脑设备 */
-@pc: ~"screen and (min-width: 992px)";
-
-/* 
-    根据不同设备适配属性单位
-    @device 设备代码
-*/
-.mixin-property-rules(@property, @value, @device) {
-    @n: length(@value);
-
-    .each(@i, @parent: "") when (@i < @n + 1) {
-        @arg: extract(@value, @i);
-
-        /* 手机 */
-        .ifNumber() when (isnumber(@arg) = true) and (@device = 001) {
-            @child: unit(@arg * 2 / 100, rem);
-        }
-        /* 平板、电脑 */
-        .ifNumber() when (isnumber(@arg) = true) and (@device = 002) {
-            @child: unit(@arg, px);
-        }
-        /* 非数值 */
-        .ifNumber() when (isnumber(@arg) = false) {
-            @child: @arg;
-        }
-
-        .ifNumber();
-        @newValue: ~"@{parent} @{child}";
-
-        .ifLast() when (@i = @n) {
-            @{property}: @newValue;
-        }
-
-        .ifLast();
-        .each(@i + 1, @newValue);
-    }
-
-    .each(1);
-}
-
-.mixin-property(@property, @value) {
-    @media @phone,@phone-h {
-        .mixin-property-rules(@property, @value, 001);
-    }
-
-    @media @pc,@tablet {
-        .mixin-property-rules(@property, @value, 002);
-    }
-}
-
-html {
-    font-size: 14px;
-
-    @media @phone {
-        font-size: ~"calc(100vw / 750 * 100)";
-    }
-
-    @media @phone-h {
-        font-size: ~"calc(100vw / 1344 * 100)";
-    }
-}

src/packages/qxst/assets/themes/base/mixin.less

@@ -1,149 +0,0 @@
-/*!
- * ©teamwei.com
- * author: teamwei
- * date: 2021-08-28
- */
-
-@border-color: #eee;
-@arrow-color : #aaa;
-
-/* 移动端1px边框修复 */
-.mixin-border() {
-    position   : relative;
-    line-height: normal;
-
-    &:before {
-        content         : '';
-        position        : absolute;
-        transform-origin: 0 0;
-        box-sizing      : border-box;
-    }
-}
-
-/* 左边框 */
-.mixin-border-left(@width: 1px, @rgb: @border-color, @type: solid) {
-    .mixin-border();
-
-    &:before {
-        top        : 0;
-        bottom     : 0;
-        left       : 0;
-        width      : @width;
-        border-left: @width @type @rgb;
-        transform  : scaleX(0.5);
-    }
-}
-
-/* 右边框 */
-.mixin-border-right(@width: 1px, @rgb: @border-color, @type: solid) {
-    .mixin-border();
-
-    &:before {
-        top         : 0;
-        bottom      : 0;
-        right       : 0;
-        width       : @width;
-        border-right: @width @type @rgb;
-        transform   : scaleX(0.5);
-    }
-}
-
-/* 上边框 */
-.mixin-border-top(@width: 1px, @rgb: @border-color, @type: solid) {
-    .mixin-border();
-
-    &:before {
-        top       : 0;
-        left      : 0;
-        right     : 0;
-        height    : @width;
-        border-top: @width @type @rgb;
-        transform : scaleY(0.5);
-    }
-}
-
-/* 下边框 */
-.mixin-border-bottom(@width: 1px, @rgb: @border-color, @type: solid) {
-    .mixin-border();
-
-    &:before {
-        bottom       : 0;
-        left         : 0;
-        right        : 0;
-        height       : @width;
-        border-bottom: @width @type @rgb;
-        transform    : scaleY(0.5);
-    }
-}
-
-.mixin-arrow() {
-    position    : relative;
-    font-size   : 0;
-    border-style: solid;
-
-    &:after {
-        content     : '';
-        position    : absolute;
-        border-style: solid;
-    }
-}
-
-.mixin-arrow-left(@size: 9px, @color: @arrow-color, @maskcolor: #fff) {
-    .mixin-arrow();
-    border-width: @size @size @size 0;
-    border-color: transparent @color transparent;
-
-    &:after {
-        left        : 2px;
-        top         : -@size;
-        border-width: @size @size @size 0;
-        border-color: transparent @maskcolor transparent;
-    }
-}
-
-.mixin-arrow-right(@size: 9px, @color: @arrow-color, @maskcolor: #fff) {
-    .mixin-arrow();
-    border-width: @size 0 @size @size;
-    border-color: transparent transparent transparent @color;
-
-    &:after {
-        right       : 2px;
-        top         : -@size;
-        border-width: @size 0 @size @size;
-        border-color: transparent transparent transparent @maskcolor;
-    }
-}
-
-.mixin-arrow-up(@size: 9px, @color: @arrow-color, @maskcolor: #fff) {
-    .mixin-arrow();
-    border-width: 0 @size @size;
-    border-color: transparent transparent @color;
-
-    &:after {
-        left        : -@size;
-        top         : 2px;
-        border-width: 0 @size @size;
-        border-color: transparent transparent @maskcolor;
-    }
-}
-
-.mixin-arrow-down(@size: 9px, @color: @arrow-color, @maskcolor: #fff) {
-    .mixin-arrow();
-    border-width: @size @size 0;
-    border-color: @color transparent transparent;
-
-    &:after {
-        left        : -@size;
-        bottom      : 2px;
-        border-width: @size @size 0;
-        border-color: @maskcolor transparent transparent;
-    }
-}
-
-.mixin-text-overflow(@row: 1) {
-    overflow          : hidden;
-    text-overflow     : ellipsis;
-    display           : -webkit-box;
-    -webkit-line-clamp: @row;
-    -webkit-box-orient: vertical;
-}

src/packages/qxst/assets/themes/base/reset.less

@@ -1,116 +0,0 @@
-@import './animation.less';
-
-* {
-    font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", "Helvetica Neue", STHeiti, "Microsoft Yahei", Tahoma, Simsun, sans-serif;
-    margin: 0;
-    padding: 0;
-    box-sizing: border-box;
-    background-repeat: no-repeat;
-    background-position: center center;
-    background-size: contain;
-    outline: none;
-    -webkit-tap-highlight-color: transparent;
-
-    //-webkit-appearance: none;
-    &::-webkit-input-placeholder {
-        color: #ccc;
-    }
-}
-
-html {
-    height: 100%;
-}
-
-body {
-    position: relative;
-    height: inherit;
-    font-size: .28rem;
-    color: #333;
-    background-color: #666;
-    margin: auto !important;
-    overflow: hidden;
-    -webkit-overflow-scrolling: touch;
-
-    a {
-        text-decoration: none;
-        color: #333;
-
-        &:hover {
-            color: inherit;
-            text-decoration: underline;
-        }
-
-        &:focus {
-            outline: none;
-        }
-    }
-
-    p,
-    label,
-    h1,
-    h2,
-    h3,
-    h4,
-    h5,
-    h6 {
-        margin: 0;
-        font-weight: normal;
-    }
-
-    img {
-        border: 0;
-        max-width: 100%;
-    }
-
-    button,
-    input,
-    textarea,
-    select {
-        line-height: initial;
-        border: 0;
-        background-color: transparent;
-        outline: none;
-
-        &:focus {
-            outline: none;
-        }
-    }
-
-    button {
-        display: inline-flex;
-        justify-content: center;
-        align-items: center;
-        cursor: pointer;
-
-        span {
-            display: inline-block;
-        }
-    }
-
-    input::-webkit-outer-spin-button,
-    input::-webkit-inner-spin-button {
-        -webkit-appearance: none;
-    }
-
-    input[type="number"] {
-        -moz-appearance: textfield;
-    }
-
-    ul,
-    ol,
-    dl {
-        list-style-type: none;
-    }
-}
-
-.app {
-    position: relative;
-    width: 100%;
-    height: 100%;
-    background-color: #fff;
-    overflow-x: hidden;
-    padding-bottom: constant(safe-area-inset-bottom);
-    /* 兼容 iOS<11.2 */
-    padding-bottom: env(safe-area-inset-bottom);
-    /* 兼容iOS>= 11.2 */
-}

src/packages/qxst/assets/themes/global/global.less

@@ -111,11 +111,14 @@
 /* 导航列表 */
 .g-navmenu {
     .app-iconfont {
-        height: 100%;
+        .g-icon {
+            width: .36rem;
+            height: .36rem;
+            font-size: .36rem;
+        }
 
-        &__icon {
-            font-size: .32rem;
-            margin-right: .24rem;
+        &__label {
+            margin-left: .24rem;
         }
     }
 }

src/packages/qxst/assets/themes/style.less

@@ -1,4 +1,4 @@
-@import './base/reset.less';
+@import '@mobile/assets/themes/base/reset.less';
 @import './global/global.less';
 @import './default/default.less';
 @import './light/light.less';

src/packages/qxst/main.ts

@@ -8,7 +8,6 @@ import directives from '@/directives' // 自定义指令集
 import '@/utils/h5plus' // 加载html5+
 import layouts from '@mobile/components/layouts' // 全局布局组件
 import 'vant/lib/index.css'
-import '@mobile/assets/iconfont/iconfont.js'
 import './assets/themes/style.less' // 主题样式
 import { timerInterceptor } from '@/utils/timer'
 import { useGlobalStore } from '@/stores'

src/packages/qxst/router/index.ts

@@ -42,8 +42,8 @@ const routes: Array<RouteRecordRaw> = [
             },
           },
           {
-            path: 'goods',
-            name: 'home-goods',
+            path: '50101',
+            name: 'home-50101',
             component: () => import('@mobile/views/goods/list/Index.vue'),
             props: {
               marketId: 50101

src/packages/qxst/views/home/Index.vue

@@ -35,20 +35,20 @@ const tabList: Tabbar[] = [
   {
     name: 'home-index',
     label: '首页',
-    icon: 'icon-a-zu826',
-    activeIcon: 'icon-a-zu753',
+    icon: 'g-icon-home--line',
+    activeIcon: 'g-icon-home--fill',
   },
   {
-    name: 'home-goods',
+    name: 'home-50101',
     label: '订单挂牌',
-    icon: 'icon-a-zu821',
-    activeIcon: 'icon-a-zu818',
+    icon: 'g-icon-listing--line',
+    activeIcon: 'g-icon-listing--fill',
   },
   {
     name: 'home-mine',
     label: '我的',
-    icon: 'icon-a-zu823',
-    activeIcon: 'icon-a-zu819',
+    icon: 'g-icon-mine--line',
+    activeIcon: 'g-icon-mine--fill',
   }
 ]
 

src/packages/qxst/views/home/index.less

@@ -3,26 +3,11 @@
         background: var(--tabbar-background) !important;
         margin-top: auto;
 
-        &__item {
-            font-size: .24rem;
+        .app-iconfont {
             color: var(--tabbar-icon);
 
             &.is-active {
                 color: var(--tabbar-icon-active);
-
-                // .app-iconfont__icon {
-                //     animation: icon-scale 300ms;
-                // }
-            }
-
-            .app-iconfont {
-                &__icon {
-                    font-size: .48rem;
-                }
-
-                &__label {
-                    margin-top: .04rem;
-                }
             }
         }
     }

src/packages/qxst/views/home/main/Index.vue

@@ -10,12 +10,7 @@
       </app-block>
       <app-block class="home-main__news">
         <CellGroup class="article">
-          <Cell class="home-main__titlebar" value="更多" :to="{ name: 'news-list' }" is-link>
-            <template #title>
-              <img src="../../../assets/icons/fire.png" />
-              <span>市场资讯</span>
-            </template>
-          </Cell>
+          <Cell class="home-main__titlebar" title="市场资讯" value="更多" icon="fire" :to="{ name: 'news-list' }" is-link />
           <template v-for="(item, index) in newsList" :key="index">
             <Cell class="article-item" :title="item.title" :value="formatDate(item.publishdate, 'MM/DD')"
               :to="{ name: 'news-detail', query: { id: item.id } }" />

src/packages/qxst/views/home/main/index.less

@@ -1,4 +1,4 @@
-@import '../../../assets/themes/base/mixin.less';
+@import '@mobile/assets/themes/base/mixin.less';
 
 .home-main {
     &__header {
@@ -39,26 +39,8 @@
 
     &__titlebar {
         .van-cell__title {
-            display: flex;
-            align-items: center;
-            line-height: 1;
             font-size: .32rem;
             font-weight: bold;
-
-            img {
-                width: .32rem;
-                height: .32rem;
-                margin-right: .1rem;
-            }
-
-            span {
-                +span {
-                    color: #999;
-                    font-size: .26rem;
-                    font-weight: normal;
-                    margin-left: .1rem;
-                }
-            }
         }
 
         .van-cell__value {

src/packages/qxst/views/mine/Index.vue

@@ -54,10 +54,10 @@
         <app-block class="mine-iconbar">
             <ul>
                 <li @click="routerTo('order-position')">
-                    <Iconfont label-direction="bottom" icon="icon-a-zu746">我的持仓</Iconfont>
+                    <Iconfont label-direction="bottom" icon="g-icon-position--line">我的持仓</Iconfont>
                 </li>
                 <li @click="routerTo('order-list')">
-                    <Iconfont label-direction="bottom" icon="icon-a-zu771defuben">我的订单</Iconfont>
+                    <Iconfont label-direction="bottom" icon="g-icon-order--line">我的订单</Iconfont>
                 </li>
             </ul>
         </app-block>
@@ -65,42 +65,42 @@
             <CellGroup>
                 <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
                     <template #title>
-                        <Iconfont icon="icon-shimingrenzheng">实名认证</Iconfont>
+                        <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'bank-sign' }" v-if="authStatus === AuthStatus.Certified">
                     <template #title>
-                        <Iconfont icon="icon-qianyuezhanghu">签约账户</Iconfont>
+                        <Iconfont icon="g-icon-sign">签约账户</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'mine-profile' }">
                     <template #title>
-                        <Iconfont icon="icon-fapiaoshuoming">个人信息</Iconfont>
+                        <Iconfont icon="g-icon-profile">个人信息</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-zcxy' }">
                     <template #title>
-                        <Iconfont icon="icon-yonghuzhucexieyi">用户注册协议</Iconfont>
+                        <Iconfont icon="g-icon-zcxy">用户注册协议</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-yszc' }">
                     <template #title>
-                        <Iconfont icon="icon-guanyuzhengce">关于隐私</Iconfont>
+                        <Iconfont icon="g-icon-yszc">关于隐私</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-fwrx' }">
                     <template #title>
-                        <Iconfont icon="icon-kefurexian">服务热线</Iconfont>
+                        <Iconfont icon="g-icon-fwrx">服务热线</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'mine-setting' }">
                     <template #title>
-                        <Iconfont icon="icon-shezhi">设置</Iconfont>
+                        <Iconfont icon="g-icon-setting">设置</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-gywm' }">
                     <template #title>
-                        <Iconfont icon="icon-guanyuwomen">关于我们</Iconfont>
+                        <Iconfont icon="g-icon-gywm">关于我们</Iconfont>
                     </template>
                 </Cell>
             </CellGroup>

src/packages/qxst/views/mine/index.less

@@ -1,4 +1,4 @@
-@import '../../assets/themes/base/mixin.less';
+@import '@mobile/assets/themes/base/mixin.less';
 
 .mine {
     @backgroundImage: linear-gradient(var(--navbar-background), var(--navbar-background) 3rem, transparent 3rem);
@@ -148,15 +148,9 @@
                 flex-direction: column;
                 align-items: center;
 
-                .app-iconfont {
-                    &__icon {
-                        font-size: .8rem;
-                    }
-
-                    &__label {
-                        font-size: .24rem;
-                        margin-top: .1rem;
-                    }
+                .g-icon {
+                    font-size: .56rem;
+                    margin-bottom: .04rem;
                 }
             }
         }

src/packages/qxst/views/user/login/index.less

@@ -14,7 +14,7 @@
         padding: 1rem 0;
 
         img {
-            height: .9rem;
+            height: 1.3rem;
         }
     }