update

public/config/appconfig.json

@@ -1,4 +1,4 @@
 {
   "version": "3.0.0",
-  "apiUrl": "http://218.17.158.45:23015/cfg?key=test_201"
+  "apiUrl": "http://218.17.158.45:23015/cfg?key=test_gzzs"
 }

src/mock/router.ts

@@ -14,7 +14,7 @@ const appmenu = {
                 url: '/home',
                 urlType: 1,
                 component: 'views/home/main/index.vue',
-                icon: 'HomeFilled',
+                icon: 'g-icon--home-filled',
             },
             {
                 authType: 1,
@@ -24,7 +24,7 @@ const appmenu = {
                 url: '/search',
                 urlType: 1,
                 component: 'Main',
-                icon: 'TrendCharts',
+                icon: 'g-icon--search-filled',
                 children: [
                     {
                         authType: 1,
@@ -90,7 +90,7 @@ const appmenu = {
                 url: '/search/jewelry',
                 urlType: 1,
                 component: 'views/search/jewelry/index.vue',
-                icon: 'TrendCharts',
+                icon: 'g-icon--diamond-filled',
             },
             {
                 authType: 1,
@@ -100,7 +100,7 @@ const appmenu = {
                 url: '/trade',
                 urlType: 1,
                 component: 'Main',
-                icon: 'List',
+                icon: 'g-icon--listing-filled',
                 children: [
                     {
                         authType: 1,
@@ -284,7 +284,7 @@ const appmenu = {
                 url: '/favorite',
                 urlType: 1,
                 component: 'views/favorite/main/index.vue',
-                icon: 'List',
+                icon: 'g-icon--favorite-filled',
                 children: [
                     {
                         authType: 3,
@@ -312,7 +312,7 @@ const appmenu = {
                 url: '/order',
                 urlType: 1,
                 component: 'Main',
-                icon: 'List',
+                icon: 'g-icon--order-filled',
                 children: [
                     {
                         authType: 1,
@@ -426,7 +426,7 @@ const appmenu = {
                 url: '/customs',
                 urlType: 1,
                 component: 'Main',
-                icon: 'List',
+                icon: 'g-icon--trade-filled',
                 children: [
                     {
                         authType: 1,
@@ -580,7 +580,7 @@ const appmenu = {
                 url: '/warehousing',
                 urlType: 1,
                 component: 'Main',
-                icon: 'Platform',
+                icon: 'g-icon--warehousing-filled',
                 children: [
                     {
                         authType: 1,
@@ -678,7 +678,7 @@ const appmenu = {
                 url: '/mine',
                 urlType: 1,
                 component: 'Main',
-                icon: 'UserFilled',
+                icon: 'g-icon--member-filled',
                 children: [
                     {
                         authType: 1,
@@ -848,7 +848,7 @@ const appmenu = {
                 url: '/report',
                 urlType: 1,
                 component: 'Main',
-                icon: 'TrendCharts',
+                icon: 'g-icon--chart-filled',
                 children: [
                     {
                         authType: 1,
@@ -887,7 +887,7 @@ const appmenu = {
                 url: '/bargain',
                 urlType: 1,
                 component: 'Main',
-                icon: 'ChatDotRound',
+                icon: 'Comment',
                 hidden: true,
                 children: [
                     {
@@ -949,6 +949,16 @@ const appmenu = {
             {
                 authType: 1,
                 sort: 12,
+                title: '帮助支持',
+                code: 'help',
+                url: '/help',
+                urlType: 1,
+                component: 'views/help/main/index.vue',
+                icon: 'g-icon--help-filled',
+            },
+            {
+                authType: 1,
+                sort: 13,
                 title: '系统管理',
                 code: 'system',
                 url: '/system',

src/packages/pc/assets/themes/default/default.less

@@ -20,7 +20,7 @@
     --tabbar-hover: #eee;
     --tabbar-close-hover: red;
     /* 侧边栏 */
-    --sidebar-width: 160px;
+    --sidebar-width: 180px;
     --sidebar-background: #2270d9;
     --sidebar-header-height: 56px;
     --sidebar-menu-inline: #fff;

src/packages/pc/components/base/icon/index.less

@@ -0,0 +1,54 @@
+/*首页*/
+.g-icon--home-filled::before {
+    content: '\e867';
+}
+
+/*钻石搜索*/
+.g-icon--search-filled::before {
+    content: '\e7a2';
+}
+
+/*钻石首饰*/
+.g-icon--diamond-filled::before {
+    content: '\e87e';
+}
+
+/*挂牌大厅*/
+.g-icon--listing-filled::before {
+    content: '\e7c3';
+}
+
+/*我的收藏*/
+.g-icon--favorite-filled::before {
+    content: '\e68a';
+}
+
+/*订单管理*/
+.g-icon--order-filled::before {
+    content: '\e63d';
+}
+
+/*交易服务*/
+.g-icon--trade-filled::before {
+    content: '\e6ca';
+}
+
+/*我的仓储*/
+.g-icon--warehousing-filled::before {
+    content: '\e980';
+}
+
+/*会员中心*/
+.g-icon--member-filled::before {
+    content: '\e78f';
+}
+
+/*报表*/
+.g-icon--chart-filled::before {
+    content: '\e88e';
+}
+
+/*帮助支持*/
+.g-icon--help-filled::before {
+    content: '\e603';
+}

src/packages/pc/components/base/icon/index.vue

@@ -13,4 +13,8 @@ const props = defineProps({
 })
 
 const isComponent = computed(() => props.icon && typeof resolveDynamicComponent(props.icon) !== 'string')
-</script>
+</script>
+
+<style lang="less">
+@import './index.less';
+</style>

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

@@ -26,12 +26,13 @@
         .iconbar {
             display: flex;
             align-items: center;
+            gap: 20px;
 
             [class^='g-icon'] {
                 cursor: pointer;
 
                 &:before {
-                    font-size: 20px;
+                    font-size: 22px;
                 }
             }
 
@@ -40,6 +41,18 @@
                     content: var(--icon-notice);
                 }
 
+                &--message::before {
+                    content: var(--icon-message);
+                }
+
+                &--counter::before {
+                    content: var(--icon-counter);
+                }
+
+                &--certificate::before {
+                    content: var(--icon-certificate);
+                }
+
                 &--minimize::before {
                     content: var(--icon-minimize);
                 }
@@ -48,18 +61,11 @@
                     content: var(--icon-maximize);
                 }
             }
-
-            .el-icon {
-                cursor: pointer;
-                font-size: 20px;
-            }
-
-            >* {
-                margin-right: 16px;
-            }
         }
 
         .user-dropdown {
+            margin-left: 20px;
+
             &__link {
                 display: flex;
                 align-items: center;

src/packages/pc/components/layouts/header/index.vue

@@ -18,9 +18,9 @@
                 <el-badge type="danger" :is-dot="unreadList.length > 0">
                     <app-icon icon="g-icon--notice" @click="openComponent('notice')" />
                 </el-badge>
-                <app-icon icon="ChatDotRound" @click="routerTo('bargain_buy')" />
-                <app-icon icon="SetUp" @click="openComponent('calculator')" />
-                <app-icon icon="Collection" @click="openComponent('certificate')" />
+                <app-icon icon="g-icon--message" @click="routerTo('bargain_buy')" />
+                <app-icon icon="g-icon--counter" @click="openComponent('calculator')" />
+                <app-icon icon="g-icon--certificate" @click="openComponent('certificate')" />
                 <app-icon icon="g-icon--minimize" @click="exitFullSreen" v-if="fullScreen" />
                 <app-icon icon="g-icon--maximize" @click="setFullSreen" v-else />
             </div>

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

@@ -95,6 +95,11 @@
                     color: #fff;
                     background-color: var(--sidebar-menu-item-active);
                 }
+
+                .g-icon::before {
+                    font-size: 20px;
+                    margin-right: 8px;
+                }
             }
         }
     }

src/packages/pc/views/help/main/index.less

@@ -0,0 +1,30 @@
+.help {
+    padding: 20px;
+
+    .el-card {
+        width: 400px;
+
+        ul {
+            li {
+                display: flex;
+                justify-content: space-between;
+
+                &:not(:first-child) {
+                    margin-top: 20px;
+                }
+
+                >span {
+                    &:first-child {
+                        width: 120px;
+                        color: #94A0AF;
+                    }
+
+                    &:last-child {
+                        flex: 1;
+                        text-align: right;
+                    }
+                }
+            }
+        }
+    }
+}

src/packages/pc/views/help/main/index.vue

@@ -0,0 +1,34 @@
+<template>
+    <div class="help">
+        <el-card shadow="never">
+            <template #header>
+                <h4>平台会员服务中心</h4>
+            </template>
+            <ul>
+                <li>
+                    <span>服务时间</span>
+                    <span>周一至周五 9:00-18:00</span>
+                </li>
+                <li>
+                    <span>服务电话</span>
+                    <span>020-xxxxxxxx</span>
+                </li>
+                <li>
+                    <span>手机号</span>
+                    <span>13899998888</span>
+                </li>
+                <li>
+                    <span>邮箱</span>
+                    <span>13899998888@aaa.com</span>
+                </li>
+            </ul>
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup>
+</script>
+
+<style lang="less">
+@import './index.less';
+</style>

src/packages/pc/views/order/main/components/details/index.less

@@ -0,0 +1,49 @@
+.trade-details {
+    padding: 20px;
+
+    .card-header {
+        display: flex;
+        align-items: center;
+        font-size: 16px;
+        color: #999;
+        cursor: pointer;
+
+        h4 {
+            margin-left: 10px;
+        }
+    }
+
+    .el-aside {
+        min-width: 400px;
+
+        .el-card {
+            ul {
+                li {
+                    display: flex;
+                    justify-content: space-between;
+
+                    &:not(:first-child) {
+                        margin-top: 20px;
+                    }
+
+                    >span {
+                        &:first-child {
+                            width: 120px;
+                            color: #94A0AF;
+                        }
+
+                        &:last-child {
+                            flex: 1;
+                            text-align: right;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    .el-main {
+        margin-left: 20px;
+        padding: 0;
+    }
+}

src/packages/pc/views/order/main/components/details/index.vue

@@ -1,53 +1,115 @@
 <!-- 订单管理-详情 -->
 <template>
     <teleport :to="teleportTo">
-        <app-view class="app-details" v-bind="$attrs">
-            <template #header>
-                <div>
-                    <el-button @click="$emit('closed')">返回</el-button>
-                </div>
-            </template>
-            <el-descriptions title="基本信息" :column="2">
-                <el-descriptions-item label="关联单号">{{ selectedRow.relatedorderid }}</el-descriptions-item>
-                <el-descriptions-item label="履约商品">{{ selectedRow.goodsno }}</el-descriptions-item>
-                <el-descriptions-item label="履约金额">{{ selectedRow.amount }}</el-descriptions-item>
-                <el-descriptions-item label="付款方式">{{ selectedRow.paymenttype }}</el-descriptions-item>
-                <el-descriptions-item label="对手方">{{ selectedRow.accountname }}</el-descriptions-item>
-                <el-descriptions-item label="买方冻结">{{ selectedRow.buyerfreezeamount }}</el-descriptions-item>
-                <el-descriptions-item label="卖方冻结">{{ selectedRow.sellerfreezeamount }}</el-descriptions-item>
-                <el-descriptions-item label="买方冻结剩余">{{ selectedRow.buyerfreezeamountremain }}</el-descriptions-item>
-                <el-descriptions-item label="卖方冻结剩余">{{ selectedRow.sellerfreezeamountremain }}</el-descriptions-item>
-                <el-descriptions-item label="买方今日付款">{{ selectedRow.buytodayamount }}</el-descriptions-item>
-                <el-descriptions-item label="卖方今日收款">{{ selectedRow.selltodayamount }}</el-descriptions-item>
-                <el-descriptions-item label="买方联络信息">{{ selectedRow.buyerinfo }}</el-descriptions-item>
-                <el-descriptions-item label="卖方联络信息">{{ selectedRow.sellerinfo }}</el-descriptions-item>
-            </el-descriptions>
-            <app-table :data="dataList" :columns="columns" :show-header="false" :row-style="rowStyle" border>
-                <!-- 步骤值 -->
-                <template #stepvalue="{ value }">
-                    {{ (value * 100).toFixed(1) }}
-                </template>
-                <template #isauto="{ value }">
-                    {{ value ? '是' : '否' }}
-                </template>
-                <!-- 启动类型 -->
-                <template #steplanchtype="{ value }">
-                    {{ value === 1 ? '系统自动' : '手动' }}
-                </template>
-                <!-- 步骤状态 -->
-                <template #stepstatus="{ value }">
-                    {{ getStepStatusName(value) }}
-                </template>
-            </app-table>
-        </app-view>
+        <el-container class="trade-details">
+            <el-aside>
+                <el-card shadow="never">
+                    <template #header>
+                        <div class="card-header" @click="$emit('closed')">
+                            <app-icon icon="ArrowLeftBold" />
+                            <h4>基本信息</h4>
+                        </div>
+                    </template>
+                    <ul>
+                        <li>
+                            <span>关联单号</span>
+                            <span>{{ selectedRow.relatedorderid }}</span>
+                        </li>
+                        <li>
+                            <span>履约商品</span>
+                            <span>{{ selectedRow.goodsno }}</span>
+                        </li>
+                        <li>
+                            <span>履约金额</span>
+                            <span>{{ selectedRow.amount }}</span>
+                        </li>
+                        <li>
+                            <span>付款方式</span>
+                            <span>{{ selectedRow.paymenttype === 1 ? '冻结' : '扣款' }}</span>
+                        </li>
+                        <li>
+                            <span>对手方</span>
+                            <span>{{ selectedRow.accountname }}</span>
+                        </li>
+                        <li>
+                            <span>买方冻结</span>
+                            <span>{{ handleNumberValue(selectedRow.buyerfreezeamount) }}</span>
+                        </li>
+                        <li>
+                            <span>卖方冻结</span>
+                            <span>{{ handleNumberValue(selectedRow.sellerfreezeamount) }}</span>
+                        </li>
+                        <li>
+                            <span>买方冻结剩余</span>
+                            <span>{{ handleNumberValue(selectedRow.buyerfreezeamountremain) }}</span>
+                        </li>
+                        <li>
+                            <span>卖方冻结剩余</span>
+                            <span>{{ handleNumberValue(selectedRow.sellerfreezeamountremain) }}</span>
+                        </li>
+                        <li>
+                            <span>买方今日付款</span>
+                            <span>{{ handleNumberValue(selectedRow.buytodayamount) }}</span>
+                        </li>
+                        <li>
+                            <span>卖方今日收款</span>
+                            <span>{{ handleNumberValue(selectedRow.selltodayamount) }}</span>
+                        </li>
+                        <li>
+                            <span>买方联络信息</span>
+                            <span>{{ buyerInfo }}</span>
+                        </li>
+                        <li>
+                            <span>卖方联络信息</span>
+                            <span>{{ sellerInfo }}</span>
+                        </li>
+                    </ul>
+                </el-card>
+            </el-aside>
+            <el-main>
+                <el-card shadow="never">
+                    <template #header>
+                        <div class="card-header">
+                            <span>步骤列表</span>
+                        </div>
+                    </template>
+                    <app-table :data="dataList" :columns="columns" :show-header="false" :row-style="rowStyle" border>
+                        <!-- 步骤值 -->
+                        <template #stepvalue="{ value }">
+                            {{ (value * 100).toFixed(1) }}
+                        </template>
+                        <template #isauto="{ value }">
+                            {{ value ? '是' : '否' }}
+                        </template>
+                        <!-- 启动类型 -->
+                        <template #steplanchtype="{ value }">
+                            {{ value === 1 ? '系统自动' : '手动' }}
+                        </template>
+                        <!-- 步骤状态 -->
+                        <template #stepstatus="{ value }">
+                            {{ getStepStatusName(value) }}
+                        </template>
+                    </app-table>
+                </el-card>
+            </el-main>
+        </el-container>
     </teleport>
 </template>
 
+<script lang="ts">
+import { defineComponent } from 'vue'
+export default defineComponent({
+    inheritAttrs: false,
+})
+</script>
+
 <script lang="ts" setup>
 import { PropType, computed } from 'vue'
+import { handleNumberValue } from '@/filters'
 import { getStepStatusName } from '@/constants/order'
 import { usePerformancePlanStep } from '@/business/order'
 import AppTable from '@pc/components/base/table/index.vue'
+import AppIcon from '@pc/components/base/icon/index.vue'
 
 const props = defineProps({
     code: String,
@@ -63,6 +125,8 @@ const props = defineProps({
 
 const { dataList, columns, getPlanStepList } = usePerformancePlanStep(props.selectedRow.performanceplanid)
 const currentStepIndex = computed(() => dataList.value.findIndex((e) => e.performancestepid === props.selectedRow.curstepid)) // 当前步骤索引位置
+const buyerInfo = JSON.parse(props.selectedRow.buyerinfo)
+const sellerInfo = JSON.parse(props.selectedRow.sellerinfo)
 
 const rowStyle = ({ rowIndex }: { rowIndex: number }) => {
     if (currentStepIndex.value > rowIndex) {
@@ -78,4 +142,8 @@ const rowStyle = ({ rowIndex }: { rowIndex: number }) => {
 }
 
 getPlanStepList()
-</script>
+</script>
+
+<style lang="less">
+@import './index.less';
+</style>

src/packages/pc/views/trade/bargain/components/details/index.less

@@ -28,7 +28,7 @@
 
                     >span {
                         &:first-child {
-                            width: 100px;
+                            width: 120px;
                             color: #94A0AF;
                         }
 

src/packages/pc/views/trade/buy/components/details/index.less

@@ -28,7 +28,7 @@
 
                     >span {
                         &:first-child {
-                            width: 100px;
+                            width: 120px;
                             color: #94A0AF;
                         }
 

src/packages/pc/views/trade/delisting/components/details/index.less

@@ -28,7 +28,7 @@
 
                     >span {
                         &:first-child {
-                            width: 100px;
+                            width: 120px;
                             color: #94A0AF;
                         }
 

src/packages/pc/views/trade/purchase/components/details/index.less

@@ -28,7 +28,7 @@
 
                     >span {
                         &:first-child {
-                            width: 100px;
+                            width: 120px;
                             color: #94A0AF;
                         }
 

src/packages/pc/views/trade/sale/components/details/index.less

@@ -28,7 +28,7 @@
 
                     >span {
                         &:first-child {
-                            width: 100px;
+                            width: 120px;
                             color: #94A0AF;
                         }