xxxx

GuangZuan/miniprogram/app.json

@@ -110,7 +110,6 @@
     "van-skeleton": "@vant/weapp/skeleton/index",
     "van-tab": "@vant/weapp/tab/index",
     "van-tabs": "@vant/weapp/tabs/index",
-    "nav-bar": "/components/nav-bar/nav-bar",
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
     "van-loading": "@vant/weapp/loading/index",
@@ -119,7 +118,8 @@
     "cat-section": "/components/section/index",
     "cat-button-back": "/components/button-back/index",
     "cat-statusbar": "/components/statusbar/index",
-    "cat-navbar": "/components/navbar/index"
+    "cat-navbar": "/components/navbar/index",
+    "nav-bar": "/components/nav-bar/nav-bar"
   },
   "window": {
     "backgroundTextStyle": "dark",

GuangZuan/miniprogram/app.ts

@@ -7,14 +7,20 @@ App({
     safeBottom: 0.0,
     /// 窗口高度
     windowHeight: 0,
+    /// 导航栏高度
+    navHeight: 0,
+    /// 状态栏高度
+    statusBarHeight: 0
   },
 
   onLaunch() {
     /// 获取iPhone底部安全区域
     wx.getSystemInfo({
-      success: res=> {
+      success: res => {
         this.globalData.safeBottom = res.screenHeight-res.safeArea.bottom
         this.globalData.windowHeight = res.windowHeight
+        this.globalData.navHeight = res.screenHeight - res.windowHeight - res.statusBarHeight
+        this.globalData.statusBarHeight = res.statusBarHeight
       },
       fail: () => {}
     })

GuangZuan/miniprogram/components/nav-bar/nav-bar.json

@@ -2,5 +2,6 @@
   "component": true,
   "usingComponents": {
     "van-nav-bar": "@vant/weapp/nav-bar/index"
-  }
+  },
+  "styleIsolation": "apply-shared"
 }

GuangZuan/miniprogram/components/nav-bar/nav-bar.ts

@@ -12,6 +12,14 @@ Component({
     left: {
       type: Boolean,
       value: true
+    },
+    bgColor: {
+      type: String,
+      value: '#fff'
+    },
+    titleColor: {
+      type: String,
+      value: '#333'
     }
   },
 

GuangZuan/miniprogram/components/nav-bar/nav-bar.wxml

@@ -1,4 +1,4 @@
-<van-nav-bar custom-style="background-color: #fff">
-  <van-icon wx:if="{{left}}" slot="left" name="arrow-left" size="25px" color="#333"/>
-  <text slot="title" style="color: #333;">{{title}}</text>
+<van-nav-bar custom-style="background-color: {{ bgColor }}">
+  <van-icon wx:if="{{ left }}" slot="left" name="arrow-left" size="25px" color="#333"/>
+  <text slot="title" style="color: {{ titleColor }};">{{ title }}</text>
 </van-nav-bar>

GuangZuan/miniprogram/components/navbar/index.wxml

@@ -3,13 +3,13 @@
     <view class="cat-navbar__container">
         <view class="left">
             <view class="block">
-                <cat-button-back wx:if="{{showBackButton}}"></cat-button-back>
+                <cat-button-back wx:if="{{ showBackButton }}"></cat-button-back>
                 <slot name="left"></slot>
             </view>
         </view>
         <view class="center">
             <view class="block">
-                <span wx:if="{{title}}">{{title}}</span>
+                <span wx:if="{{title}}">{{ title }}</span>
                 <slot wx:else></slot>
             </view>
         </view>

GuangZuan/miniprogram/mCircle/pages/contrast/index.ts

@@ -1,4 +1,3 @@
-// mCircle/pages/contrast/index.ts
 Page({
 
   /**

GuangZuan/miniprogram/mHome/pages/calculator/index.ts

@@ -2,7 +2,6 @@ import { priceCalc } from "../../../services/api/orders/index"
 import { getEnumList } from "../../../services/utils"
 import { hideLoading, showLoading } from "../../../utils/message/index"
 
-// mHome/pages/calculator/index.ts
 Page({
 
   /**
@@ -19,11 +18,11 @@ Page({
     /// 选中形状         
     zsshape: 1,
     /// 颜色
-    zscolors: [ {id: 1, name: 'D', isCheck: true} ],
+    zscolors: [ { id: 1, name: 'D', isCheck: true } ],
     /// 选中形状
     zscolor: 'D',
     /// 净度
-    zsclaritys: [ {id: 1, name: 'IF', isCheck: true} ],
+    zsclaritys: [ { id: 1, name: 'IF', isCheck: true } ],
     /// 选中净度
     zsclarity: 'IF',
     /// 重量

GuangZuan/miniprogram/mHome/pages/cerserach/index.ts

@@ -1,8 +1,6 @@
-import Toast from "../../../miniprogram_npm/@vant/weapp/toast/toast"
 import { gzCertAddressConfig, gzCertAddressParam } from "../../../services/api/orders/index"
 import { hideLoading, showLoading, showToast } from "../../../utils/message/index"
 
-// mHome/pages/cerserach/index.ts
 Page({
 
   /**

GuangZuan/miniprogram/mHome/pages/jewelry/list/index.ts

@@ -2,7 +2,6 @@ import { querySellOrder } from "../../../../services/api/orders/index";
 import { userid } from "../../../../services/utils";
 import { hideLoading, showLoading } from "../../../../utils/message/index";
 
-// mHome/pages/jewelry/index.ts
 Page({
 
   /**

GuangZuan/miniprogram/mHome/pages/msg/msgdetail/index.ts

@@ -1,4 +1,3 @@
-// pages/msg/msgdetail/index.ts
 Page({
 
   /**

GuangZuan/miniprogram/mHome/pages/msg/msglist/index.ts

@@ -2,7 +2,6 @@ import { queryNotice } from "../../../../services/api/common/index"
 import { loginid } from '../../../../services/utils'
 import { hideLoading, showLoading } from "../../../../utils/message/index"
 
-// pages/msg/msglist/index.ts
 Page({
 
   /**

GuangZuan/miniprogram/mHome/pages/msg/search/index.ts

@@ -1,6 +1,5 @@
 import { getEnumList } from "../../../../services/utils"
 
-// pages/search/index.ts
 Page({
 
   /**

GuangZuan/miniprogram/mHome/pages/search/index.ts

@@ -1,6 +1,5 @@
 import { getEnumList } from "../../../services/utils"
 
-// pages/search/index.ts
 Page({
 
   /**

GuangZuan/miniprogram/mMine/pages/myorders/dlistingsdetail/index.ts

@@ -1,4 +1,3 @@
-// mMine/pages/myorders/dlistingsdetail/index.ts
 Page({
 
   /**

GuangZuan/miniprogram/mMine/pages/myorders/mydelistingapplydetail/index.ts

@@ -4,7 +4,7 @@ import Dialog from "../../../../miniprogram_npm/@vant/weapp/dialog/dialog"
 import { sendMsgToMQ } from "../../../../services/api/common/index"
 import { queryWrPerformancePlanStep } from "../../../../services/api/orders/index"
 import { accountid, clientType, getErrorMsg, isEncrypted, marketid, protoHeader, timetample, userid } from "../../../../services/utils"
-import { hideLoading, showLoading } from "../../../../utils/message/index"
+import { hideLoading, showLoading, showModel, showToast } from "../../../../utils/message/index"
 import { encryptBody } from "../../../../utils/websocket/crypto"
 
 Page({
@@ -29,31 +29,22 @@ Page({
   onButtonPressed(e: any) {
     switch (e.target.id) {
       case 'agree':  /// 同意
-        Dialog.confirm({
-          title: '提示',
-          message: '确定要同意吗？'
-        }).then(() => {
+        showModel(() => {
           /// 同意
           this.doZZSSellOrderDestingApplyOperate(3)
-        })
+        }, '提示', '确定要同意吗？')
         break;
       case 'refuse': /// 拒绝
-        Dialog.confirm({
-          title: '提示',
-          message: '确定要拒绝吗？'
-        }).then(() => {
-          /// 同意
+        showModel(() => {
+          /// 拒绝
           this.doZZSSellOrderDestingApplyOperate(2)
-        })
+        }, '提示', '确定要拒绝吗？')
         break;
-      default:
-        Dialog.confirm({
-          title: '提示',
-          message: '确定要撤销吗？'
-        }).then(() => {
-          /// 同意
+      default:    /// 撤销
+        showModel(()=>{
+          /// 撤销
           this.doZZSSellOrderDestingApplyOperate(1)
-        })
+        }, '提示', '确定要撤销吗？')
         break;
     }
   },

GuangZuan/miniprogram/pages/circle/index.less

@@ -3,6 +3,22 @@
   top: 0px;
   z-index: 999;
 
+  .nav-view {
+    background-color: #407DB8;
+    width: 100%;
+    padding-bottom: 10px;
+
+    .nav-tabview {
+      background-color: #407DB8;
+      width: 70%;
+
+      .tab-view {
+        background-color: #407DB8;
+        width: 100%;
+      }
+    }
+  }
+
   .title-view {
     margin: 10px;
     background-color: #f0f0f0;

GuangZuan/miniprogram/pages/circle/index.ts

@@ -13,6 +13,10 @@ Page({
    * 页面的初始数据
    */
   data: {
+    /// 状态栏高度
+    statusBarHeight: getApp().globalData.statusBarHeight,
+    /// 导航栏高度
+    navHeight: getApp().globalData.navHeight,
     /// 底部安全区域
     safeBottom: getApp().globalData.safeBottom,
     /// 窗口高度

GuangZuan/miniprogram/pages/circle/index.wxml

@@ -1,13 +1,13 @@
 <!-- 头部视图 -->
 <view class="top-view" style="position: sticky; top: 0; z-index: 999;"> 
   <!-- 导航栏 -->
-  <nav-bar title="钻石圈" left="{{false}}"></nav-bar>
-
-  <!-- tabs -->
-  <view class="tab-view">
-    <van-tabs sticky animated bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#2270D9">
-      <van-tab wx:for="{{tabs}}" wx:for-item="itm" wx:key="id" id="{{itm.id}}" title="{{itm.name}}"/>
-    </van-tabs>  
+  <view class="nav-view" style="padding-top: {{ statusBarHeight }}px; height: {{ navHeight }}px;">
+    <view class="nav-tabview">
+      <!-- tabs -->
+      <van-tabs nav-class="tab-view" sticky animated bind:change="onTabChange" color="#fff" line-width="20px" title-inactive-color="#CAE5FF" title-active-color="#fff">
+        <van-tab wx:for="{{ tabs }}" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" title="{{ itm.name }}"/>
+      </van-tabs>  
+    </view>
   </view>
 
   <!-- 列头 --> 
@@ -48,7 +48,7 @@
 
 <!--  底部视图  -->
 <view class="buttom_view" style="padding-bottom: {{ safeBottom+48 }}px;">
-    <van-button id="new" round color="#226FD9" block style="width: 90%;" bind:click="onButtonPressed">对比</van-button>
+    <van-button id="new" round color="#407DB8" block style="width: 90%;" bind:click="onButtonPressed">对比</van-button>
 </view>
 
 <!-- toast --> 

GuangZuan/miniprogram/pages/home/index.less

@@ -1,10 +1,28 @@
 /* pages/home/index.less */
 
-.banner {
-  height: 210px;
- 
-  .swiper-item, image {
-    width: 100%;
+.banner-bg {
+  display: flex;
+  flex-direction: column;
+  align-content: center;
+  align-items: center;
+
+  &__top {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    padding: 5px;
+    align-content: center;
+    width: 95%;
+  }
+
+  .banner {
+    height: 210px;
+    width: 95%;
+
+    .swiper-item, image {
+      width: 100%;
+    }
   }
 }
 
@@ -13,10 +31,7 @@
   flex-direction: row;
   justify-content: space-between;
   margin: 10px;
-  background-color: #f0f0f0;
   padding: 15px;
-  border-radius: 10px;
-  box-shadow: 5px 5px 5px #aaa;
 
   .statistics-item {
     display: flex;
@@ -38,131 +53,7 @@
       text-align: center;
       padding-right: 10px;
     }
-
-    .exchangerate:nth-child(1) {
-      color: #fff;
-      font-size: 30rpx;
-      font-weight: bold;
-      text-align: center;
-      padding-left: 10px;
-    }
-    .exchangerate:nth-child(2) {
-      font-size: 22rpx;
-      color: #fff;
-      text-align: center;
-      padding-left: 10px;
-    }
-  }
-}
-
-.gird-view {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  align-content: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #f0f0f0;
-  padding: 10px 0px;
-
-  &__item {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    align-content: center;
-    width: 100%;
-
-    &__icon {
-      width: 60px;
-      height: 60px;
-    }
-
-    &__title {
-      color: #4D565D;
-      font-size: 24rpx;
-      width: 100%;
-      text-align: center;
-    }
   }
 }
 
-.msg-view {
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  align-content: center;
-  justify-content: center;
-
-  &__top {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    width: 95%;
-    align-items: center;
-    align-content: center;
-
-    van-tabs {
-      width: 100px;
-    }
-
-    &__more {
-      width: 20px;
-      height: 20px;
-    }
-  }
-
-  .view_top_content {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-  
-    .msg_date {
-      font-size: 22rpx;
-      color: #999999;
-      text-align: left;
-      width: 120px;
-    }
-  
-    .msg_title {
-      font-size: 28rpx;
-      color: #333333;
-      text-align: left;
-    }
-  }
-}
-
-.certsearch, .calculator {
-  display: flex;
-  align-items: center;
-  margin: 3px;
-  border-radius: 5px;
-  position: fixed;
-  z-index: 999; 
-  bottom: 10%; 
-  
-  background-image: url('../../images/home-zscx.png');
-  background-size: 100% 100%;
-  height: 50px;
-  width: 50px;
-}
-
-.certsearch, .calculator {
-  background-size: 100% 100%; 
-  width: 50px; 
-  height: 50px;
-}
-
-.certsearch {
-  right: 5px; 
-  bottom: 18%;
-}
-
-.calculator {
-  right: 5px;
-}
-
-
 

GuangZuan/miniprogram/pages/home/index.ts

@@ -17,11 +17,17 @@ Page({
     /// banner轮播图
     banners: [''],
     /// 功能菜单
-    menus: [{id: 1, icon: 'home-zsss', title: '钻石搜索', path: '/mHome/pages/search/index'}, 
-            {id: 2, icon: 'home-gpdt', title: '挂牌大厅', path: '/pages/trade/index'}, 
-            {id: 3, icon: 'home-ss', title: '钻石首饰', path: '/mHome/pages/jewelry/list/index'}, 
-            {id: 4, icon: 'home-cjjc', title: '出境检测', path: '/mHome/pages/inspection/list/index'}, 
-            {id: 5, icon: 'home-bsfw', title: '保税服务', path: '/mHome/pages/bond/list/index'}],
+    menus: [{id: 1, icon: 'home-gpdt', title: '挂牌大厅', path: '/pages/trade/index'}, 
+            {id: 2, icon: 'home-ss', title: '钻石首饰', path: '/mHome/pages/jewelry/list/index'},
+            {id: 3, icon: 'home-cjjc', title: '出境检测', path: '/mHome/pages/inspection/list/index'}, 
+            {id: 4, icon: 'home-bsfw', title: '保税服务', path: '/mHome/pages/bond/list/index'}, 
+            {id: 5, icon: 'home-bscyw', title: '保税仓业务', path: '/pages/trade/index'}, 
+            {id: 6, icon: 'home-zsss', title: '钻石搜索', path: '/mHome/pages/search/index'}, 
+            {id: 7, icon: 'home-jsq', title: '钻石计算器', path: '/mHome/pages/calculator/index'}, 
+            {id: 8, icon: 'home-zscx', title: '证书查询', path: '/mHome/pages/cerserach/index'}, 
+            {id: 9, icon: 'home-jjjy', title: '竞价交易', path: '/mHome/pages/bond/list/index'}, 
+            {id: 10, icon: 'home-cnys', title: '产能预售', path: '/mHome/pages/bond/list/index'}, 
+            {id: 11, icon: 'home-jcyj', title: '集采交易', path: '/mHome/pages/bond/list/index'}],
     /// 统计
     statistics: [{id: 1, title: '出售中', value: 0, class: ''}],
     /// tabs

GuangZuan/miniprogram/pages/home/index.wxml

@@ -1,21 +1,25 @@
 <!-- 导航栏 -->
-<nav-bar title="首页" left="{{ false }}"></nav-bar>
+<nav-bar title="广州钻石交易中心" left="{{ false }}"></nav-bar>
 
 <scroll-view style="padding-bottom: 80px;" scroll-y>
-  <!-- banner轮播图 -->
-  <swiper class="banner" wx:if="{{banners.count != 0}}" indicator-active-color="orange" indicator-dots autoplay interval="5000" circular>
-    <swiper-item class="banner_item" wx:for="{{banners}}" wx:key="index" id="{{item}}">
-      <view class="swiper-item">
-        <image src='{{item}}' mode="widthFix"></image>
-      </view>
-    </swiper-item>
-  </swiper>
-
-  <!-- 通知栏 -->
-  <van-notice-bar wx:if="{{msgs.length != 0}}" left-icon="volume-o" mode="link" bind:click="goToMsg" color="#333" background="#f3f3f3" text="{{notice.title}}" scrollable></van-notice-bar>
+  <!-- banner视图 -->
+  <view class="banner-bg">
+    <view class="banner-bg__top">
+      <image style="width: 60%;" mode="widthFix" src="http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/login_logo.png">logo</image>
+      <van-button type="info" round icon="search">证书号搜索钻石</van-button>
+    </view>
+    <!-- banner轮播图 -->
+    <swiper class="banner" wx:if="{{ banners.count != 0 }}" indicator-active-color="orange" indicator-dots autoplay interval="5000" circular>
+      <swiper-item class="banner_item" wx:for="{{ banners }}" wx:key="index" id="{{ item }}">
+        <view class="swiper-item">
+          <image src='{{ item }}' mode="widthFix"></image>
+        </view>
+      </swiper-item>
+    </swiper>
+  </view>
 
   <!-- 统计 -->
-  <view class="statistics" style="background-image: url('http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/huilv_bg.png'); background-size: 105%;">
+  <view class="statistics">
     <view class="statistics-item" wx:for="{{ statistics }}" wx:key="id" wx:for-index="idx" wx:for-item="itm">
       <text class="{{ itm.class }}">{{ itm.value }}</text>
       <text class="{{ itm.class }}">{{ itm.title }}</text>
@@ -23,36 +27,15 @@
   </view>
 
   <!-- 功能菜单 -->
-  <view class="gird-view">
-    <view class="gird-view__item" wx:for="{{ menus }}" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{ itm.id }}" data-url="{{ itm.path }}" bindtap="onGirdClick">
-      <image class="gird-view__item__icon" mode="aspectFit" src="http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/{{ itm.icon }}.png"></image>
-      <text class="gird-view__item__title">{{ itm.title }}</text>
-    </view>
-  </view>
+  <van-grid column-num="4" border="{{ false }}" icon-size="{{ 50 }}">
+    <van-grid-item wx:for="{{ menus }}" wx:for-item="index" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{ itm.id }}" url="{{ itm.path }}" text="{{ itm.title }}" icon="http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/{{ itm.icon }}.png"/>
+  </van-grid>
 
-  <!-- 公告消息 -->
-  <view class="msg-view">
-    <view class="msg-view__top">
-      <van-tabs custom-class="msg-view__menus" bind:change="onChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#2270D9" bind:change="onTabChange">
-        <van-tab wx:for="{{ tabs }}" wx:for-item="itm" wx:for-index="idx" wx:key="id" title="{{ itm.title }}" />
-      </van-tabs>
-      <image class="msg-view__top__more" src="http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/home-more.png" bindtap="goToMsg"></image>
-    </view>
-    <van-cell-group wx:if="{{ !isEmpty }}">
-      <van-cell custom-class="msg-item" wx:for="{{msgs}}" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{idx}}" bind:click="goToMsgDetail">
-        <view solt="title" class="view_top_content">
-          <text class="msg_date" user-select>{{ itm.scheduletime }}</text>
-          <text class="msg_title" user-select>{{ itm.title }}</text>
-        </view>
-      </van-cell>
-    </van-cell-group>
-  </view>
+  <!-- 通知栏 -->
+  <van-notice-bar wx:if="{{ msgs.length != 0 }}" left-icon="volume-o" mode="link" bind:click="goToMsg" color="#333" background="#f3f3f3" text="{{ notice.title }}" scrollable />
 </scroll-view>
 
-<!-- 证书查询  -->
-<view class="certsearch" style="background-image: url('http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/home-zscx.png');" bindtap="goToCerserach"></view>
-<!-- 计算器  -->
-<view class="calculator" style="background-image: url('http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/home-jsq.png');" bindtap="goToCalculator" ></view>
+
 <!-- toast --> 
 <van-toast id="van-toast" />
 <!-- 无数据 --> 

GuangZuan/miniprogram/pages/mine/index.less

@@ -9,7 +9,6 @@
     display: flex;
     flex-direction: column;
     align-items: center;
-    padding: 20px 0px;
 
     .taaccount-info {
       display: flex;
@@ -17,7 +16,7 @@
       justify-content: space-around;
       align-items: center;
       align-content: center;
-      width: 90%;
+      width: 100%;
 
       .item {
         display: flex;
@@ -29,13 +28,13 @@
         }
 
         text:nth-child(1) {
-          color: #666;
-          font-size: 14px;
+          color: #AAAAAA;
+          font-size: 12px;
         }
 
         text:nth-child(2) {
-          color: #333;
-          font-size: 18px;
+          color: #000;
+          font-size: 15px;
         }
       }
     }
@@ -76,7 +75,7 @@
     .button-view {
       display: flex;
       justify-content: space-around;
-      margin: 10px;
+      margin: 20px 10px;
       width: 100%;
       
       .into-gold, .out-gold {
@@ -102,7 +101,7 @@
     .loginOut {
       width: 360px;
       font-size: 28rpx;
-      background-color: #226FD9;
+      background-color: #407DB8;
       color: white;
     }
   }

GuangZuan/miniprogram/pages/mine/index.ts

@@ -33,7 +33,11 @@ Page({
     /// 是否脱敏显示
     isOpenEye: false,
     /// 签约信息
-    sign: <GuangZuan.BankAccountSign>({})
+    sign: <GuangZuan.BankAccountSign>({}),
+    /// 状态栏高度
+    statusBarHeight: getApp().globalData.statusBarHeight,
+    /// 导航栏高度
+    navHeight: getApp().globalData.navHeight
   },
 
   onEye() {

GuangZuan/miniprogram/pages/mine/index.wxml

@@ -1,14 +1,13 @@
 <view class="container">
-  <!-- 导航栏 -->
-  <nav-bar title="我的" left="{{false}}"></nav-bar>
   <!-- 我的顶部视图 -->
   <view class="minetop" style="background-image: url('http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/mine-bg.png'); background-size: 100% 100%; width: 100%; ">
-    <view class="user-info">
-      <van-image src="{{avatarUrl}}" round width="50" height="50"></van-image>
+    <text style="color: #000; font-size: 36rpx; height: {{ navHeight }}px; padding-top: {{ statusBarHeight }}px; align-content: center; align-items: center; display: flex; flex-direction: row;">我的</text>
+    <view class="user-info" style="padding-top: 30px;">
+      <van-image src="{{ avatarUrl }}" round width="50" height="50"></van-image>
       <view class="userinfo">
         <view class="userinfo-vip">
           <text>{{ isOpenEye ? nickName : '******' }}</text>
-          <text>资金账户</text>
+          <text style="color: #AAAAAA;">资金账户</text>
         </view>
         <view class="userinfo-account">
           <text>{{ isOpenEye ? loginid : '******' }}</text>
@@ -34,8 +33,8 @@
     </view>
     <!-- 出金 入金 -->
     <view class="button-view">
-      <van-button custom-class="into-gold" round id="into-gold" color="#F7A657" bind:click="onButtonPressed">充值</van-button>
-      <van-button custom-class="out-gold" round id="out-gold" color="#226FD9" bind:click="onButtonPressed">提现</van-button>
+      <van-button custom-class="into-gold" round id="into-gold" color="#407DB8" bind:click="onButtonPressed">充值</van-button>
+      <van-button custom-class="out-gold" round id="out-gold" color="#F55656" bind:click="onButtonPressed">提现</van-button>
     </view>
   </view>
 
@@ -47,16 +46,18 @@
     </van-grid-item>
   </van-grid>
 
+  <view style="background-color: #f0f0f0; height: 20px;"></view>
+
   <!-- 列表菜单项 -->
   <van-cell-group>
-    <van-cell clickable title-class="cell-title" size="large" center is-link border wx:for="{{ tablelists }}" clickable wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{itm.id}}" title="{{itm.title}}" link-type="navigateTo" url="{{itm.path}}">
+    <van-cell clickable title-class="cell-title" size="large" center is-link border wx:for="{{ tablelists }}" clickable wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{itm.id}}" title="{{ itm.title }}" link-type="navigateTo" url="{{itm.path}}">
       <image slot="icon" style="width: 25px; height: 25px;" src="http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/{{ itm.iconfont }}.png"></image>
     </van-cell>
   </van-cell-group>
 
   <!-- 登出按钮  -->
   <view class="loginOut-view">
-    <van-button custom-class="loginOut" round bindtap="onLoginOut">退出登录</van-button>
+    <van-button custom-class="loginOut" size="large" round bindtap="onLoginOut">退出登录</van-button>
   </view>
 </view>
 

GuangZuan/miniprogram/pages/trade/index.json

@@ -2,7 +2,9 @@
   "usingComponents": {
     "van-dropdown-menu": "@vant/weapp/dropdown-menu/index",
     "van-dropdown-item": "@vant/weapp/dropdown-item/index",
-    "van-search": "@vant/weapp/search/index"
+    "van-search": "@vant/weapp/search/index",
+    "van-grid": "@vant/weapp/grid/index",
+    "van-grid-item": "@vant/weapp/grid-item/index"
   },
   "navigationBarTitleText": "钻石交易",
   "navigationStyle": "custom"

GuangZuan/miniprogram/pages/trade/index.less

@@ -3,20 +3,60 @@
   top: 0px;
   z-index: 999;
 
-  .tab-view {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-content: center;
-    align-items: center;
-    margin-right: 12px;
+  .nav-view {
+    background-color: #407DB8;
+    width: 100%;
+
+    .tab-view {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-content: center;
+      align-items: center;
+      margin-right: 12px;
+      width: 75%;
+      background-color: #407DB8;
+      padding-bottom: 10px;
+  
+      van-tabs {
+        width: 180px;
+      }
 
-    van-tabs {
-      width: 300px;
+      .van-tabs__nav {
+        background-color: #407DB8;
+      }
+  
+      image {
+        margin-left: 10px;
+      }
     }
 
-    image {
-      margin-left: 10px;
+    .gird-view {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      align-content: center;
+
+      &__item {
+
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-content: center;
+        width: 40px;
+        height: 40px;
+
+        text {
+          color: #CAE5FF;
+          font-size: 12px;text-align: center;
+        }
+
+        image {
+          width: 40px;
+          height: 20px;
+        }
+      }
     }
   }
 

GuangZuan/miniprogram/pages/trade/index.ts

@@ -12,10 +12,20 @@ Page({
    * 页面的初始数据
    */
   data: {
+    /// 状态栏高度
+    statusBarHeight: getApp().globalData.statusBarHeight,
+    /// 导航栏高度
+    navHeight: getApp().globalData.navHeight,
     /// 底部安全区域
     safeBottom: getApp().globalData.safeBottom,
+    /// 窗口高度
+    windowHeight: getApp().globalData.windowHeight,
     /// tabs
     tabs: [{id: 1, name: '出售大厅'}, {id: 2, name: '求购大厅'}],
+    /// 功能菜单
+    menus: [{id: "listing-buy", icon: 'trade-listingbuy', title: '求购', path: '/mTrade/pages/listingbuy/index'}, 
+            {id: "listing-sell", icon: 'trade-listingsell', title: '出售', path: '/mTrade/pages/listingsell/index'},
+            {id: "search", icon: 'trade-search', title: '筛选', path: '/mHome/pages/search/index'}],
     /// tab索引
     active: 0,
     /// 出售大厅列头
@@ -106,7 +116,7 @@ Page({
     /// 获取对应的id
     const ids = (<string> e.target.id).split(' ')
     let id = (<string> e.target.id).split(' ')[0]
-    const index = <number> <unknown>ids[1]
+    const index = <number><unknown>ids[1]
 
     switch (id) {
       case 'favorite':    /// 添加收藏
@@ -139,22 +149,15 @@ Page({
   onIconClick(e: any) {
     switch (e.currentTarget.id) {
       case 'listing-buy':   /// 挂买
-        wx.navigateTo({
-          url: '/mTrade/pages/listingbuy/index'
-        })
+        wx.navigateTo({ url: '/mTrade/pages/listingbuy/index' })
         break;
       case 'listing-sell':  /// 挂卖
-        wx.navigateTo({
-          url: '/mTrade/pages/listingsell/index'
-        })
+        wx.navigateTo({ url: '/mTrade/pages/listingsell/index' })
         break;
       case 'search':        /// 搜索
-        wx.navigateTo({
-          url: '/mHome/pages/search/index'
-        })
-        break;
-      default:
+        wx.navigateTo({ url: '/mHome/pages/search/index' })
         break;
+      default: break;
     }
   },
 

GuangZuan/miniprogram/pages/trade/index.wxml

@@ -1,16 +1,21 @@
 <!-- 头部视图 -->
 <view class="top-view" style="position: sticky; top: 0; z-index: 999;"> 
-  <!-- 导航栏 -->
-  <nav-bar title="挂牌大厅" left="{{false}}"></nav-bar>
+  <!-- 导航视图 --> 
+  <view class="nav-view" style="height: {{ statusBarHeight + navHeight + 10}}px;">
+    <!-- tabs -->
+    <view class="tab-view" style="padding-top: {{ statusBarHeight }}px; height: {{ navHeight }}px;">
+      <van-tabs custom-class="van-tabs" nav-class="van-tabs__nav" sticky animated bind:change="onTabChange" color="#fff" line-width="20px" title-active-color="#fff" title-inactive-color="#CAE5FF">
+        <van-tab wx:for="{{ tabs }}" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" title="{{ itm.name }}"/>
+      </van-tabs>  
 
-  <!-- tabs -->
-  <view class="tab-view">
-    <van-tabs custom-class="van-tabs" sticky animated bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#2270D9">
-      <van-tab wx:for="{{tabs}}" wx:for-item="itm" wx:key="id" id="{{itm.id}}" title="{{itm.name}}"/>
-    </van-tabs>  
-    <image id="listing-buy" style="width: 25px; height: 25px;" src="http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/trade-listingbuy.png" bindtap="onIconClick"/>
-    <image id="listing-sell" style="width: 25px; height: 25px;" src="http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/trade-listingsell.png" bindtap="onIconClick"/>
-    <image id="search" style="width: 25px; height: 25px;" src="http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/trade-search.png" bindtap="onIconClick"/>
+      <!-- 功能区 -->
+      <view class="gird-view">
+        <view class="gird-view__item" wx:for="{{ menus }}" wx:for-index="idx" wx:for-item="itm" wx:key="{{ id }}" id="{{ itm.id }}" bindtap="onIconClick">
+          <image src="http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/{{ itm.icon }}.png" mode="heightFix"></image>
+          <text>{{ itm.title }}</text>
+        </view>
+      </view>
+    </view>
   </view>
 
   <!-- 下拉菜单 -->

GuangZuan/project.private.config.json

@@ -6,24 +6,5 @@
     "urlCheck": false
   },
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "condition": {
-    "miniprogram": {
-      "list": [
-        {
-          "name": "首页",
-          "pathName": "pages/home/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "保税",
-          "pathName": "mHome/pages/bond/list/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        }
-      ]
-    }
-  }
+  "condition": {}
 }