代码提交；

GuangZuan/miniprogram/app.json

@@ -40,7 +40,6 @@
       "pages": [
         "pages/bond/bond",
         "pages/inspection/inspection",
-        "pages/dayRate/dayRate",
         "pages/calculator/calculator",
         "pages/search/search",
         "pages/msg/msglist/msglist",
@@ -48,9 +47,7 @@
         "pages/news/news",
         "pages/goodsdetail/goodsdetail",
         "pages/cerserach/cerserach",
-        "pages/jewelry/jewelry",
-        "pages/bonddetail/bonddetail",
-        "pages/inspectiondetail/inspectiondetail"
+        "pages/jewelry/jewelry"
       ]
     },
     {
@@ -60,12 +57,8 @@
         "pages/settings/settings",
         "pages/myinventorys/myinventorys",
         "pages/realauth/realauth",
-        "pages/storage/storage",
-        "pages/tradeserver/tradeserver",
-        "pages/assets/assets",
         "pages/myorders/myorders",
         "pages/myreports/myreports",
-        "pages/ordersearch/ordersearch",
         "pages/bank/bank",
         "pages/listingdetail/listingdetail",
         "pages/myperformance/myperformance"
@@ -130,5 +123,6 @@
       }
     ]
   },
-  "sitemapLocation": "sitemap.json"
+  "sitemapLocation": "sitemap.json",
+  "debug": false
 }

GuangZuan/miniprogram/constants/enum/funcode.ts

@@ -16,6 +16,59 @@ export enum FunCode {
     QuoteBeat = 0x12, // 心跳
     QuoteSubscribeReq = 0x20, // 实时行情订阅请求
     QuoteSubscribeRsp = 0x21, // 实时行情订阅响应
-    QueryQuoteReq = 0x22, // 盘面查询请求
-    QueryQuoteRsp = 0x23, // 盘面查询应答
+    QueryQuoteReq = 0x22,     // 盘面查询请求
+    QueryQuoteRsp = 0x23,     // 盘面查询应答
+
+    ModifyPwdReq            = 65543,   // 修改账户密码请求
+    ModifyPwdRsp            = 65544,   // 修改账户密码应答
+    UserReceiveInfoReq      = 1900545, // 新增修改收货地址请求
+    UserReceiveInfoRsp      = 1900546, // 新增修改收货地址请求响应
+    DelUserReceiveInfoReq   = 1900547, // 删除收货地址请求
+    DelUserReceiveInfoRsp   = 1900548, // 删除收货地址请求响应
+    UserReceiveIsDefaultReq = 1900570, // 设置默认收货地址请求
+    UserReceiveIsDefaultRsp = 1900571, // 设置默认收货地址应答
+    UserReceiptInfoReq      = 1900549, // 新增修改用户发票信息请求
+    UserReceiptInfoRsp      = 1900550, // 新增修改用户发票信息请求响应
+    DelUserReceiptInfoReq   = 1900551, // 删除用户发票信息请求
+    DelUserReceiptInfoRsp   = 1900552, // 删除用户发票信息请求响应
+
+    T2bBankSignReq       = 589825,     // 签约请求
+    T2bBankSignRsp       = 589826,     // 签约应答
+    T2bBankCancelSignReq = 589827,     // 解约请求
+    T2bBankCancelSignRsp = 589828,     // 解约应答
+    T2bBankWithdrawReq   = 589837,     // 出金请求
+    T2bBankWithdrawRsp   = 589838,     // 出金应答
+    T2bBankDepositReq    = 589843,     // 入金请求
+    T2bBankDepositRsp    = 589844,     // 入金应答
+
+    WarehouseApplyReq                   = 1900685, // 仓库申请请求
+    WarehouseApplyRsp                   = 1900686, // 仓库申请应答
+    PerformanceContractedApplyReq       = 1310729, // 违约申请请求
+    PerformanceContractedApplyRsp       = 1310730, // 违约申请应答
+    PerformanceDelayApplyReq            = 1310725, // 延期申请请求
+    PerformanceDelayApplyRsp            = 1310726, // 延期申请应答
+    PerformanceManualConfirmReq         = 1310723, // 履约手动确认请求
+    PerformanceManualConfirmRsp         = 1310724, // 履约手动确认应答
+    PerformanceModifyContactReq         = 1310735, // 履约修改联络信息请求
+    PerformanceModifyContactRsp         = 1310736, // 履约修改联络信息回应
+    GoodsFavoriteOperateReq             = 1441843, // 商品收藏操作接口请求
+    GoodsFavoriteOperateRsp             = 1441844, // 商品收藏操作接口应答
+    ZSBuyOrderListingReq                = 1441837, // 钻石买挂牌接口请求
+    ZSBuyOrderListingRsp                = 1441838, // 钻石买挂牌接口应答
+    ZSSellOrderListingReq               = 1441829, // 钻石卖挂牌接口请求
+    ZSSellOrderListingRsp               = 1441830, // 钻石卖挂牌接口响应
+    ZSBuyOrderDestingReq                = 1441831, // 钻石买摘牌接口请求
+    ZSBuyOrderDestingRsp                = 1441832, // 钻石买摘牌接口响应
+    ZSSellOrderDestingApplyReq          = 1441839, // 钻石卖摘牌申请接口请求
+    ZSSellOrderDestingApplyRsp          = 1441840, // 钻石卖摘牌申请接口响应
+    ZSSellOrderDestingApplyOperateReq   = 1441841, // 钻石卖摘牌申请操作接口请求
+    ZSSellOrderDestingApplyOperateRsp   = 1441842, // 钻石卖摘牌申请操作接口应答
+    ZSBuyOrderDestingNegPriceReq        = 1441833, // 买摘牌询价接口请求
+    ZSBuyOrderDestingNegPriceRsp        = 1441834, // 买摘牌询价接口应答
+    ZSBuyOrderDestingNegPriceOperateReq = 1441835, // 买摘牌询价操作接口请求
+    ZSBuyOrderDestingNegPriceOperateRsp = 1441836, // 买摘牌询价操作接口应答
+    WRListingCancelOrderReq             = 1441796, // 挂牌撤单请求
+    WRListingCancelOrderRsp             = 1441797, // 挂牌撤单应答
+    ReceiptZSOutApplyReq                = 1376463, // 钻石出库申请接口请求
+    ReceiptZSOutApplyRsp                = 1376464, // 钻石出库申请接口响应
 }

GuangZuan/miniprogram/constants/enum/index.ts

@@ -10,3 +10,15 @@ export interface EnumType {
   label: string;
   value: number;
 }
+
+
+/**
+ * 钻石类型
+ */
+export enum Category {
+  Diamonds = 1, // 成批裸钻
+  Diamond = 2, // 单颗裸钻
+  Rough = 3, // 成批毛坯
+  Jewelry = 4, // 钻石首饰
+  Fancy = 5, // 单颗彩钻
+}

GuangZuan/miniprogram/mHome/pages/bonddetail/bonddetail.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

GuangZuan/miniprogram/mHome/pages/bonddetail/bonddetail.less

@@ -1 +0,0 @@
-/* mHome/pages/bonddetail/bonddetail.wxss */

GuangZuan/miniprogram/mHome/pages/bonddetail/bonddetail.ts

@@ -1,66 +0,0 @@
-// mHome/pages/bonddetail/bonddetail.ts
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

GuangZuan/miniprogram/mHome/pages/bonddetail/bonddetail.wxml

@@ -1,2 +0,0 @@
-<!--mHome/pages/bonddetail/bonddetail.wxml-->
-<text>mHome/pages/bonddetail/bonddetail.wxml</text>

GuangZuan/miniprogram/mHome/pages/calculator/calculator.json

@@ -1,7 +1,7 @@
 {
   "usingComponents": {
-    
+    "van-field": "@vant/weapp/field/index"
   },
-  "navigationBarTitleText": "计算器",
+  "navigationBarTitleText": "钻石价格计算器",
   "enablePullDownRefresh": false
 }

GuangZuan/miniprogram/mHome/pages/calculator/calculator.less

@@ -2,78 +2,85 @@
 
 .container {
   display: flex;
-  flex-direction: row;
+  flex-direction: column;
   width: 100%;
-  align-items: flex-start;
-  
-  .shape {
-    width: 16%;
-  }
-  .shape-item, .color-item, .neatness-item {
-    display: grid;
+
+  .cell-view {
+    display: flex;
+    border-bottom: 1px solid #f0f0f0;
     align-items: center;
-    align-content: center;
-    justify-content: center;
-    text-align: center;
-    border-bottom: 1px solid #ccc;
-    border-right: 1px solid #ccc;
-    height: 80px;
+    margin: 0px 10px;
   
     text {
-      margin-top: 5px;
-      font-size: 22rpx;
+      width: 90px;
+      text-align: left;
       color: #333;
+      font-size: 22rpx;
     }
-  }
-
-  .color, .neatness {
-    width: 13%;
-    font-size: 14px;
-  }
-
-  .right-content {
-    display: flex;
-    flex-wrap: wrap;
-    flex-direction: row;
-    width: 58%;
-    position: relative;
   
-    view {
-      width: 50%;
-      height: 100px;
-      display: grid;
+    .content {
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      width: 100%;
       align-content: center;
-      border-bottom: 1px solid #ddd;
-      justify-content: start;
   
-      text {
-        margin: 10px;
+      button {
+        margin: 5px;
+        height: 30px;
         color: #333;
+        width: 21.3%;
+        border-radius: 5px;
       }
   
-      text:nth-child(1) {
-        font-size: 13px;
-        height: 15px;
-      }
-      
-      text:nth-child(2) {
-        font-size: 16px;
-        color: #333;
-        height: 10px;
+      /* 选中时添加这个 样式 */
+      .active {
+        background: #dae9fd;
       }
       
-      text:nth-child(3) {
-        font-size: 12px;
-        color: #999;
-        height: 15px;
+       /* 三角形 */
+      .active::before {
+        content: '';
+        display: inline-block;
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        width: 0;
+        height: 0;
+        border-bottom: 15px solid rebeccapurple;
+        border-left: 14px solid transparent; 
       }
     }
+  
+    button {
+      color: #000;
+      font-size: 22rpx;
+    }
+  }
+  
+  .rate view, .weight view, .discount view {
+    flex-wrap: nowrap;
+    text-align: center;
+  }
+  
+  .zsshape, .weight, .rate, .discount, .result {
+    height: 50px
   }
-}
 
-input {
-  margin: 0px 0px 0px 10px;
-  background-color: white;
-  height: 40px;
-  font-size: 14px;
+  .zsclarity, .zscolor {
+    height: 130px;
+  }
+  
+  .buttom_view {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    margin-top: 20px;
+  
+    button {
+      width: 70%;
+      color: white;
+      background-color: red;
+    }
+  }  
 }

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

@@ -1,3 +1,5 @@
+import { priceCalc } from "../../../services/api/orders/index"
+
 // mHome/pages/calculator/calculator.ts
 Page({
 
@@ -10,56 +12,137 @@ Page({
     /// 窗口高度
     windowHeight: getApp().globalData.windowHeight,
     /// 形状
-    shapes: [{id: 1, name: '圆形'}, 
-             {id: 2, name: '公主方'}, 
-             {id: 3, name: '祖母绿'}, 
-             {id: 4, name: '垫形'}, 
-             {id: 5, name: '阿斯切'}, 
-             {id: 6, name: '心形'}, 
-             {id: 7, name: '梨形'}, 
-             {id: 8, name: '雷迪恩'}, 
-             {id: 9, name: '椭圆'}, 
-             {id: 10, name: '马眼'}],
+    zsshapes: [{id: 1, name: '圆形', isCheck: true}, 
+               {id: 2, name: '异性', isCheck: false}],
     /// 选中形状         
-    shape: '圆形',
+    zsshape: 1,
+    /// 当前日期
+    date: Date(),
     /// 颜色
-    colors: [{id: 1, name: 'D'}, 
-             {id: 2, name: 'E'}, 
-             {id: 3, name: 'F'}, 
-             {id: 4, name: 'G'}, 
-             {id: 5, name: 'H'}, 
-             {id: 6, name: 'I'}, 
-             {id: 7, name: 'J'}, 
-             {id: 8, name: 'K'}, 
-             {id: 9, name: 'L'}, 
-             {id: 10, name: 'M-N'}],
+    zscolors: [{id: 1, name: 'D', isCheck: true}, 
+               {id: 2, name: 'E', isCheck: false}, 
+               {id: 3, name: 'F', isCheck: false}, 
+               {id: 4, name: 'G', isCheck: false}, 
+               {id: 5, name: 'H', isCheck: false}, 
+               {id: 6, name: 'I', isCheck: false}, 
+               {id: 7, name: 'J', isCheck: false}, 
+               {id: 8, name: 'K', isCheck: false}, 
+               {id: 9, name: 'L', isCheck: false}],
     /// 选中形状
-    color: '',
+    zscolor: 'D',
     /// 净度
-    neatness: [{id: 1, name: 'FL/IF'}, 
-              {id: 2, name: 'VVS1'}, 
-              {id: 3, name: 'VVS2'}, 
-              {id: 4, name: 'VS1'}, 
-              {id: 5, name: 'VS2'}, 
-              {id: 6, name: 'Sl1'}, 
-              {id: 7, name: 'Sl2'},  
-              {id: 8, name: 'Sl3'},
-              {id: 9, name: 'l1'},
-              {id: 10, name: 'l2'}],
+    zsclaritys: [{id: 1, name: 'IF', isCheck: true}, 
+                 {id: 2, name: 'VVS1', isCheck: false}, 
+                 {id: 3, name: 'VVS2', isCheck: false}, 
+                 {id: 4, name: 'VS1', isCheck: false}, 
+                 {id: 5, name: 'VS2', isCheck: false}, 
+                 {id: 6, name: 'SL1', isCheck: false}, 
+                 {id: 7, name: 'SL2', isCheck: false},  
+                 {id: 8, name: 'SL3', isCheck: false},
+                 {id: 9, name: 'I1', isCheck: false},
+                 {id: 10, name: 'I2', isCheck: false},
+                 {id: 11, name: 'I3', isCheck: false}],
     /// 选中净度
-    neatnes: '',
+    zsclarity: 'IF',
     /// 重量
-    weight: 0.0,
-    /// 价格
-    price: 0.0,
+    weight: 1.0,
     /// 汇率
-    erate: 0.0,
+    dayrate: 1.0,
     /// 折扣
-    discount: 0.0,
+    discount: 10.0,
     /// 美元
     doller: 0.0,
     /// 人民币
-    rmb: 0.0
+    rmb: 0.0,
+    /// 克拉单价
+    unitPrice: 0.0,
+  },
+
+  /// 钻石价格计算器
+  priceCalc() {
+    /// showLoding....
+    wx.showLoading({ title: '计算中....' })
+    /// 进行查询
+    priceCalc({
+      data: {
+        zsshape: this.data.zsshape,
+        zscolor: 'D',
+        zsclarity: this.data.zsclarity,
+        weight: this.data.weight,
+        rate: this.data.dayrate,
+        discount: this.data.discount
+      },
+      /// 查询成功
+      success: (res) => {
+        console.log(res)
+      },
+      /// 查询失败
+      fail: (emsg) => {
+        wx.showToast({
+          title: '请求失败，原因：' + emsg,
+          icon: 'error'
+        })
+      },
+      complete: () => {
+        /// hideLoading
+        wx.hideLoading()
+      }
+    })
+  },
+
+  /**
+   * 按钮点击响应事件
+   */
+  /// 形状按钮点击事件
+  onButtonPressed(e: any) {
+    /// 获取对应的id
+    const ids = (<string> e.target.id).split(' ')
+    let id = (<string> e.target.id).split(' ')[0]
+    const index = <number> <unknown>ids[1]
+
+    switch (id) {
+      case 'zsshape':   /// 形状
+        this.setData({ 
+          zsshapes: this.data.zsshapes.map(item => {
+            if (item.id == index) {
+              item.isCheck = true
+              /// 设置形状
+              this.setData({ zsshape: item.id })
+            } else {
+              item.isCheck = false
+            }
+            return item
+          }) 
+        })
+        break;
+      case 'zscolor':   /// 颜色
+        this.setData({ colors: this.data.zscolors.map(item => {
+          if (item.id == index) {
+            item.isCheck = true
+            /// 设置形状
+            this.setData({ zscolor: item.name })
+          } else {
+            item.isCheck = false
+          }
+          return item
+        }) })
+        break;
+      case 'zsclarity':   /// 净度
+        this.setData({ neatness: this.data.zsclaritys.map(item => {
+          if (item.id == index) {
+            item.isCheck = true
+            /// 设置形状
+            this.setData({ zsclarity: item.name })
+          } else {
+            item.isCheck = false
+          }
+          return item
+        }) })
+        break;
+      default:  /// 计算
+        this.priceCalc()
+        break;
+    }
   },
 
   /**

GuangZuan/miniprogram/mHome/pages/calculator/calculator.wxml

@@ -1,62 +1,63 @@
 <!--mHome/pages/calculator/calculator.wxml-->
 
 <view class="container" style="position: relative; height: {{windowHeight-safeBottom}}px;">
-  <!--  形状  -->
-  <scroll-view scroll-y class="shape">
-    <view class="shape-item" wx:for="{{shapes}}" wx:key="id" wx:for-index="idx" wx:for-item="itm">
-      <image src="https://img.yzcdn.cn/vant/cat.jpeg" style="width: 40px; height: 40px;"></image>
-      <text>{{itm.name}}</text>
+ <!-- 形状 -->
+ <view class="cell-view zsshape" wx:if="{{active !== 2}}"> 
+    <text>形状</text>
+    <view class="content zsshape">
+      <button wx:for="{{zsshapes}}" wx:for-item="itm" wx:for-index="idx" class="{{itm.isCheck ? 'active' : ''}}" id="zsshape {{itm.id}}" wx:key="id" bindtap="onButtonPressed">{{itm.name}}</button>
     </view>
-  </scroll-view>
+  </view>
 
-  <!--  颜色  -->
-  <scroll-view scroll-y class="color">
-   <view class="color-item" wx:for="{{colors}}" wx:key="id" wx:for-index="idx" wx:for-item="itm">
-     <text>{{itm.name}}</text>
+  <!-- 颜色 -->
+  <view class="cell-view zscolor"> 
+    <text>颜色</text>
+    <view class="content zscolor">
+      <button wx:for="{{zscolors}}" wx:for-item="itm" wx:for-index="idx" wx:key="id" class="{{itm.isCheck ? 'active' : ''}}" id="zscolor {{itm.id}}" bindtap="onButtonPressed">{{itm.name}}</button>
     </view>
-  </scroll-view>
+  </view>
 
-  <!--  净度  -->
-  <scroll-view scroll-y class="neatness">
-    <view class="neatness-item" wx:for="{{neatness}}" wx:key="id" wx:for-index="idx" wx:for-item="itm">
-      <text>{{itm.name}}</text>
+  <!-- 净度 -->
+  <view class="cell-view zsclarity"> 
+    <text>净度</text>
+    <view class="content zsclarity">
+      <button wx:for="{{zsclaritys}}" wx:for-item="itm" wx:for-index="idx" wx:key="id" class="{{itm.isCheck ? 'active' : ''}}" id="zsclarity {{itm.id}}" bindtap="onButtonPressed">{{itm.name}}</button>
     </view>
-  </scroll-view>
+  </view>
 
-  <view class="right-content">
-    <view class="weight"> 
-      <text>重量（ct）</text>
-      <input placeholder="请输入重量" value="{{weight}}" type="digit"></input>
-    </view>
-    <view class="price"> 
-      <text>国际报价</text>
-      <input placeholder="请输入价格" value="{{price}}" type="digit"></input>
+  <!-- 重量 -->
+  <view class="cell-view weight"> 
+    <text>重量</text>
+    <view class="content weight">
+      <van-field model:value="{{ weight }}" clearable placeholder="请输入重量" type="number" border="{{ false }}"/>
     </view>
-    <view class="dayRate"> 
-      <text>汇率</text>
-      <input placeholder="请输入汇率" value="{{erate}}" type="digit"></input>
-    </view>
-    <view class="discount"> 
-      <text>折扣（%）</text>
-      <input placeholder="请输入折扣" value="{{discount}}" type="digit"></input>
-    </view>
-    <view class="doller"> 
-      <text>美元</text>
-      <input placeholder="请输入美元" value="{{doller}}" type="digit"></input>
+  </view>
+
+  <!-- 汇率 -->
+  <view class="cell-view rate"> 
+    <text>汇率</text>
+    <view class="content rate">
+      <van-field model:value="{{ dayrate }}" clearable placeholder="请输入汇率" type="number" border="{{ false }}"/>
     </view>
-    <view class="rmb"> 
-      <text>人民币</text>
-      <input placeholder="请输入人民币" value="{{rmb}}" type="digit"></input>
+  </view>
+
+  <!-- 折扣 -->
+  <view class="cell-view discount"> 
+    <text>折扣</text>
+    <view class="content discount">
+      <van-field model:value="{{ discount }}" clearable placeholder="请输入折扣" type="number" border="{{ false }}"/>
     </view>
-    <view class="dollerrate"> 
-      <text>美元</text>
-      <text>0.00</text>
-      <text>0.00/ct</text>
+  </view>
+
+  <!--  底部视图  -->
+  <view class="buttom_view">
+    <button bindtap="onButtonPressed" id="calculate">计算</button>
+  </view>
+
+  <!-- result -->
+  <view class="cell-view result"> 
+    <view class="content result">
+      <text>{{result}}</text>
     </view>
-    <view class="rmbrate"> 
-      <text>人民币</text>
-      <text>0.00</text>
-      <text>0.00/ct</text>
-    </view>  
   </view>
 </view>

GuangZuan/miniprogram/mHome/pages/cerserach/cerserach.less

@@ -11,7 +11,7 @@
   flex-direction: row;
   flex-wrap: wrap;
   margin-top: 15px;
-  justify-content: space-between;
+  justify-content: space-around;
 
   button {
     width: 23%;

GuangZuan/miniprogram/mHome/pages/dayRate/dayRate.json

@@ -1,5 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText": "汇率查询",
-  "enablePullDownRefresh": false
-}

GuangZuan/miniprogram/mHome/pages/dayRate/dayRate.less

@@ -1,111 +0,0 @@
-/* mHome/pages/dayRate/dayRate.wxss */
-
-.base-currency {
-  display: grid;
-  width: 100%;
-
-  .title {
-    display: flex;
-    justify-content: space-between;
-    background-color: #f0f0f0;
-
-    text {
-      font-size: 10px;
-      color: #666;
-      padding: 10px 10px;
-    }
-  }
-}
-
-.base-rate {
-  display: flex;
-  justify-content: space-between;
-  align-content: center;
-  align-items: center;
-  width: 95%;
-  padding-left: 10px;
-  margin-top: 5px;
-
-  text {
-    width: 80px;
-    font-size: 16px;
-    color: #333;
-    text-align: left;
-    padding-left: 10px;
-    margin-bottom: 10px;
-  }
-}
-
-
-
-.input-rate {
-  display: grid;
-  width: 100%;
-
-  text {
-    font-size: 10px;
-    color: #666;
-    text-align: right;
-    width: 95%;
-    margin-top: 10px;
-  }
-}
-
-
-
-.ex-currency .title {
-  display: flex;
-  justify-content: space-between;
-  background-color: #f0f0f0;
-
-  text {
-    font-size: 10px;
-    color: #666;
-    padding: 10px 10px;
-  }
-}
-
-
-
-.ex-rate {
-  display: flex;
-  justify-content: space-between;
-  align-content: center;
-  align-items: center;
-  width: 95%;
-  padding-left: 10px;
-  margin-top: 5px;
-
-  text {
-    width: 60px;
-    font-size: 16px;
-    color: #333;
-    text-align: left;
-    padding-left: 10px;
-    margin-bottom: 10px;
-  }
-}
-
-.ex-result-rate {
-  display: grid;
-  width: 100%;
-
-  text:nth-child(1) {
-    font-size: 16px;
-    color: #333;
-    text-align: right;
-    width: 95%;
-    margin-top: 10px;
-  }
-
-  text:nth-child(2) {
-    font-size: 10px;
-    color: #666;
-    text-align: right;
-    width: 95%;
-    margin-top: 10px;
-  }
-}
-
-
-

GuangZuan/miniprogram/mHome/pages/dayRate/dayRate.ts

@@ -1,71 +0,0 @@
-// mHome/pages/dayRate/dayRate.ts
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-     /// 汇率数据 
-     rates: [{id: 1, name: 'USD', rate: 3.0, value: 0.0}, 
-             {id: 2, name: 'JUR', rate: 1.2, value: 0.0}, 
-             {id: 3, name: 'NME', rate: 1.3, value: 0.0}, 
-             {id: 4, name: 'RMB', rate: 3.9, value: 0.0}, 
-             {id: 5, name: 'DFG', rate: 14.4, value: 0.0}, 
-             {id: 6, name: 'DOR', rate: 23.3, value: 0.0}, 
-             {id: 7, name: 'JDP', rate: 13.44, value: 0.0}],
-    /// 当前汇率
-    rate: 0.0 
-  },
-
-  /**
-   * 输入框值发生变化
-   */
-  fieldChange() {
-    this.data.rates.forEach(obj => {
-      obj.value = this.data.rate*obj.rate
-    });
-    this.setData({
-      rates: this.data.rates
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad() {},
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {},
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {}, 
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {},
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {},
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {},
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {},
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {}
-})

GuangZuan/miniprogram/mHome/pages/dayRate/dayRate.wxml

@@ -1,30 +0,0 @@
-<!--mHome/pages/dayRate/dayRate.wxml-->
-<view class="base-currency">
-  <view class="title">
-   <text>基准货币</text>
-   <text>更换</text>
-  </view>
-  <view class="base-rate">
-    <image src="https://img.yzcdn.cn/vant/cat.jpeg" style="width: 50px; height: 40px;" mode="heightFix"></image>
-    <text>CNY</text>
-    <view class="input-rate">
-      <van-field placeholder="请输入金额" input-align="right" bind:change="fieldChange" model:value="{{rate}}"></van-field>
-      <text>人民币￥</text>
-    </view>
-  </view>
-</view>
-
-<view class="ex-currency">
-  <view class="title">
-   <text>货币换算</text>
-  </view>
-  <view class="ex-rate" wx:for="{{rates}}" wx:for-item="itm" wx:for-index="idx" wx:key="id">
-    <image src="https://img.yzcdn.cn/vant/cat.jpeg" style="width: 50px; height: 40px;" mode="heightFix"></image>
-    <text>{{itm.name}}</text>
-    <van-icon name="play"></van-icon>
-    <view class="ex-result-rate">
-      <text>{{itm.value}}</text>
-      <text>美元$</text>
-    </view>
-  </view>
-</view>

GuangZuan/miniprogram/mHome/pages/inspectiondetail/inspectiondetail.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

GuangZuan/miniprogram/mHome/pages/inspectiondetail/inspectiondetail.less

@@ -1 +0,0 @@
-/* mHome/pages/inspectiondetail/inspectiondetail.wxss */

GuangZuan/miniprogram/mHome/pages/inspectiondetail/inspectiondetail.ts

@@ -1,66 +0,0 @@
-// mHome/pages/inspectiondetail/inspectiondetail.ts
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

GuangZuan/miniprogram/mHome/pages/inspectiondetail/inspectiondetail.wxml

@@ -1,2 +0,0 @@
-<!--mHome/pages/inspectiondetail/inspectiondetail.wxml-->
-<text>mHome/pages/inspectiondetail/inspectiondetail.wxml</text>

GuangZuan/miniprogram/mHome/pages/jewelry/jewelry.json

@@ -2,5 +2,5 @@
   "usingComponents": {
     "van-search": "@vant/weapp/search/index"
   },
-  "navigationBarTitleText": "全部首饰"
+  "navigationBarTitleText": "钻石首饰"
 }

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

@@ -13,6 +13,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    console.log(options)
     /// 传参信息
     this.setData({
       msg: JSON.parse(options.id ?? '')

GuangZuan/miniprogram/mHome/pages/msg/msgdetail/msgdetail.wxml

@@ -3,6 +3,6 @@
 <!-- title -->
 <text class="title">{{msg.title}}</text>
 <!-- date -->
-<text class="date">{{msg.date}}</text>
+<text class="date">{{msg.scheduletime}}</text>
 <!-- content -->
 <text class="content">{{msg.content}}</text>

GuangZuan/miniprogram/mHome/pages/msg/msglist/msglist.json

@@ -1,7 +1,8 @@
 {
   "usingComponents": {
     "van-cell": "@vant/weapp/cell/index",
-    "van-cell-group": "@vant/weapp/cell-group/index"
+    "van-cell-group": "@vant/weapp/cell-group/index",
+    "van-loading": "@vant/weapp/loading/index"
   },
   "navigationBarTitleText": "公告消息"
 }

GuangZuan/miniprogram/mHome/pages/msg/msglist/msglist.less

@@ -36,6 +36,11 @@
   color: #333;
 }
 
+.loding {
+  position: absolute;
+  padding-top: 75%;
+  padding-left: 45%;
+}
 
 
 

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

@@ -1,3 +1,5 @@
+import { queryNotice } from "../../../../services/api/common/index"
+
 // pages/msg/msglist/msglist.ts
 Page({
 
@@ -5,25 +7,63 @@ Page({
    * 页面的初始数据
    */
   data: {
-    msgs: [{id: '0', title: '加入钻石交易所联盟', content: '    在2020年9月14日举行的第39届世界钻石大会（World Diamond Congress）上，审议了中国的广州钻石交易中心加入该联盟的申请，认为广钻中心符合联盟章程等规则要求。与会的世界钻石交易所联盟（WFDB）成员一致表决通过了广州钻石交易中心加入该联盟的申请，广钻中心正式成为世界钻石交易所联盟第30个成员交易所。由世界钻石交易所联盟（WFDB）和国际钻石制造商协会(IDMA)联合主办的第39届世界钻石大会于9月14日至15日以线上形式举行。在这个两年一度的行业盛会上，世界钻石交易所联盟代理总裁、以色列钻石交易所总裁约拉姆·迪瓦希（Yoram Dvash）主持了世界钻石交易所联盟的工作会议，来自世界各主要钻石产业国和地区的26个钻石交易所的总裁及高管共70多位代表参加了会议。会议还表决通过了对联盟章程和内部规则的修订议案，同意增设一名联盟副总裁；会议选举以色列钻石交易所总裁约拉姆·迪瓦希（Yoram Dvash）为联盟总裁，罗尼·安迪曼（Rony Unterman）被确认为联盟秘书长。', date: '2021/12/12'}, 
-           {id: '1', title: '调整通知', content: '待付款发货的福克eff阮菲菲问问二分厂递四方速递斯的，额雾非雾好疯狂潍坊， 威锋网客服问客服， 呃呃我热我热我热我认为热我认为惹我', date: '2021/12/12'}, 
-           {id: '2', title: '手续通知', content: '待付款发货的冯瑞文凤王府福克斯的，额雾非雾好疯狂潍坊， 威锋网客服问客服， 呃呃我热我热我热我认为热我认为惹我', date: '2021/12/12'}]
+    /// 公告消息
+    msgs: [{}],
+    /// tabs
+    tabs: [{id: 1, title: '公告'}, {id: 2, title: '消息'}],
+    /// 是否空数据
+    isEmpty: false,
   },
 
   /// 进入公告消息详情页
   goToMsgDetail(r: any) {
-    console.log(r)
     let jsonStr = JSON.stringify(this.data.msgs[r.currentTarget.id])
     wx.navigateTo({
       url: '/mHome/pages/msg/msgdetail/msgdetail?id='+jsonStr
     })
   },
 
+  /// onChange
+  onChange(e: any) {
+    this.queryNotice(e.detail.index+1)
+  },
+
+  /// 查询公告消息信息
+  queryNotice(msgtype: number){
+    /// loding.....
+    wx.showLoading({ title: '加载中....'})
+    /// 发送查询请求
+    queryNotice({
+      data: {
+        msgType: msgtype,
+        loginID: wx.getStorageSync('LoginID')
+      },
+      success:(res) => {
+        /// 加载成功
+        this.setData({ msgs: res.data })
+      },
+      fail: (emsg) => {
+        /// 加载失败
+        wx.showToast({
+          title: '公告消息请求失败, 原因:：'+emsg,
+          icon: 'error',
+        })
+      },
+      complete: () => {
+        /// hide loding.....
+        wx.hideLoading()
+        /// 判断数据是否为空
+        this.setData({ isEmpty: this.data.msgs.length == 0 })
+      }
+    })
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad() {
-    
+    /// 查询公告消息
+    this.queryNotice(1)
   },
 
   /**

GuangZuan/miniprogram/mHome/pages/msg/msglist/msglist.wxml

@@ -1,13 +1,20 @@
 <!--pages/msg/msglist/msglist.wxml-->
 
+<!-- tabs -->
+<van-tabs animated bind:change="onChange">
+  <van-tab wx:for="{{tabs}}" wx:key="id" title="{{item.title}}"></van-tab>
+</van-tabs>
+
 <van-cell-group>
   <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_title">{{itm.title}}</text>
-      <text class="msg_date">{{itm.date}}</text>
+      <text class="msg_title" user-select>{{itm.title}}</text>
+      <text class="msg_date" user-select>{{itm.scheduletime}}</text>
     </view>
     <view class="content">
-      <text>{{itm.content}}</text>
+      <text user-select>{{itm.content}}</text>
     </view>
   </van-cell>
-</van-cell-group>
+</van-cell-group>
+
+<van-empty wx:if="{{isEmpty}}" class="custom-image" description="无数据"/>

GuangZuan/miniprogram/mMine/pages/assets/assets.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText": "资金资产"
-}

GuangZuan/miniprogram/mMine/pages/assets/assets.less

@@ -1 +0,0 @@
-/* mMine/pages/assets/assets.wxss */

GuangZuan/miniprogram/mMine/pages/assets/assets.ts

@@ -1,54 +0,0 @@
-// pages/mine/assets/assets.ts
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {},
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {},
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {},
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {},
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {},
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {},
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

GuangZuan/miniprogram/mMine/pages/assets/assets.wxml

@@ -1 +0,0 @@
-<!--pages/mine/assets/assets.wxml-->

GuangZuan/miniprogram/mMine/pages/myinventorys/myinventorys.ts

@@ -12,9 +12,9 @@ Page({
     /// tab激活索引
     active: 0,
     /// tabs
-    tabs: [{id: 1, name: '单颗裸钻'}, 
-           {id: 2, name: '钻石首饰'}, 
-           {id: 3, name: '彩色钻石'}],
+    tabs: [{id: 2, name: '单颗裸钻'}, 
+           {id: 5, name: '单颗彩钻'}, 
+           {id: 4, name: '钻石首饰'}],
     /// 列头
     titles: ['形状', '价格', '克拉单价', '颜色', '净度', '克拉重量', '冻结重量'],
     /// 查询数据
@@ -28,27 +28,33 @@ Page({
    */
   onTabChange(e: any) {
     /// 设置激活项
-    this.setData({
-      active: e.detail.index
-    })
-    switch (e.detail.index) {
-      case 0 || 2:  /// 单颗裸钻 彩色钻石
+    this.setData({ active: e.detail.index })
+    const zscategory = this.data.tabs[this.data.active].id
+    console.log(zscategory)
+    switch (zscategory) {
+      case 2:  /// 单颗裸钻
         this.setData({
           /// 列头  
           titles: ['形状', '价格', '克拉单价', '颜色', '净度', '克拉重量', '冻结重量'],
           active: e.detail.index
         })
         break;
-      default: /// 首饰
+      case 5:  /// 单颗彩钻
         this.setData({
           /// 列头  
-          titles: ['主石形状', '款式', '价格', '主石颜色', '主石净度', '主石切工', '主石重量'],
+          titles: ['形状', '价格', '克拉单价', '颜色', '净度', '克拉重量', '冻结重量'],
           active: e.detail.index
         })
         break;
+      default: /// 钻石首饰
+        this.setData({
+          /// 列头  
+          titles: ['主石形状', '款式', '价格', '主石颜色', '主石净度', '主石切工', '主石重量'],
+          active: e.detail.index
+        })
     }
     /// 查询我的库存
-    this.queryMyWRPosition(e.detail.index+1)
+    this.queryMyWRPosition(zscategory)
   },
 
   /// 查询我的库存
@@ -62,7 +68,6 @@ Page({
         wruserid: wx.getStorageSync('UserId')
       },
       success: (res) => {
-        console.log(res)
         /// 请求失败
         if (res.code != 200) {
           wx.showToast({ icon: 'error', title: '请求失败，原因：'+res.msg })

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

@@ -63,15 +63,22 @@ Page({
                     obj.wrtradeorderstatus, 
                     obj.validtime]
           }),
-          isEmpty: res.data.length == 0
         })
         /// 计算整个宽度
         this.calculateTotalWidth()
       },
+      /// 加载失败
       fail: () => {
         wx.showToast({ icon: 'error', title: '请求失败，原因：接口请求失败' })
       },
-      complete: () => { wx.hideLoading() }
+      complete: () => { 
+        ///  hideLoading
+        wx.hideLoading()
+        /// 判断数据是否为空
+        this.setData({
+          isEmpty: this.data.values.length == 0
+        })
+      }
     })
   },
 
@@ -110,7 +117,6 @@ Page({
                     obj.selledqty, 
                     obj.ordertime]
           }),
-          isEmpty: res.data.length == 0
         })
         /// 计算整个宽度
         this.calculateTotalWidth()
@@ -119,7 +125,14 @@ Page({
         console.log(er)
         wx.showToast({ icon: 'error', title: '请求失败，原因：接口请求失败' })
       },
-      complete: () => { wx.hideLoading() }
+      complete: () => { 
+        ///  hideLoading
+        wx.hideLoading() 
+        /// 判断数据是否为空
+        this.setData({
+          isEmpty: this.data.values.length == 0
+        })
+      }
     })
   },
 
@@ -153,13 +166,12 @@ Page({
           values: res.data.map(obj => {
             return [obj.zscategorydisplay, 
                     obj.goodsno, 
-                    obj.buyorsell, 
+                    '', 
                     obj.matchusername, 
-                    obj.tradeqty, 
+                    '', 
                     obj.tradeprice, 
                     obj.tradeamount]
           }),
-          isEmpty: res.data.length == 0
         })
         /// 计算整个宽度
         this.calculateTotalWidth()
@@ -167,7 +179,14 @@ Page({
       fail: () => {
         wx.showToast({ icon: 'error', title: '请求失败，原因：接口请求失败' })
       },
-      complete: () => { wx.hideLoading() }
+      complete: () => { 
+        /// hideLoading
+        wx.hideLoading() 
+        /// 判断数据是否为空
+        this.setData({
+          isEmpty: this.data.values.length == 0
+        })
+      }
     })
   },
 

GuangZuan/miniprogram/mMine/pages/myperformance/myperformance.ts

@@ -1,3 +1,6 @@
+import { queryMyPerformanc } from "../../../services/api/orders/index"
+import { getPerformancestatus, getSteptype } from "../../../services/utils"
+
 // mMine/pages/myperformance/myperformance.ts
 Page({
 
@@ -8,21 +11,64 @@ Page({
     /// tab激活索引
     active: 0,
     /// tabs
-    tabs: [{id: 1, name: '买履约'},  {id: 2, name: '卖履约'}],
+    tabs: [{id: 0, name: '买履约'},  {id: 1, name: '卖履约'}],
     /// 列头
-    titles: ['成交单号', '付款方式', '总金额', '已付金额', '履约冻结金额', '约剩余冻结', '卖方', '履约状态', '当前步骤', '剩余天数'],
+    titles: ['付款方式', '总金额', '已付金额', '履约冻结金额', '约剩余冻结', '买卖方', '履约状态', '当前步骤', '剩余天数'],
     /// 列表总宽度
     totalWidth: 0,
     /// 是否空数据
     isEmpty: false,
     /// 列表宽度
-    widths: [170, 80, 80, 80, 80, 80, 80, 80, 80, 80],
+    widths: [80, 80, 80, 80, 80, 80, 80, 80, 80],
     /// 内容
-    values: [['3211658830087490001', '冻结', '200.00', '0.00', '2.00', '2.00', 'a1000', '正常', '买方支付', '1']],
+    values: <any>[[]],
     /// 选中行数
     selectRow: -1,
   },
 
+  /// 查询我的履约
+  queryMyPerformanc(buyOrSell: number) {
+    /// loding.....
+    wx.showLoading({ title: '数据请求中....' })
+    /// 发送请求
+    queryMyPerformanc({
+      data: {
+        userid: wx.getStorageSync('UserId'),
+        buyorsell: buyOrSell
+      },
+      success: (res) => {
+        this.setData({
+          values: res.data.map(obj => {
+            return [obj.paymenttype == 1 ? '冻结' : '扣款', 
+                    obj.amount, 
+                    obj.buyorsell == 0 ? obj.buypaidamount : obj.sellreceivedamount,
+                    obj.buyorsell == 0 ? obj.buyerfreezeamount : obj.sellerfreezeamount, 
+                    obj.buyorsell == 0 ? obj.buyerfreezeamountremain : obj.sellerfreezeamountremain,
+                    obj.buyorsell == 0 ? obj.sellerinfo : obj.buyerinfo, 
+                    getPerformancestatus(obj.performancestatus),
+                    getSteptype(obj.steptypeid), 
+                    obj.remaindays]
+          })
+        })
+      },
+      fail: (emsg) => {
+        /// showToast
+        wx.showToast({
+          title: '数据请求失败, 原因：'+emsg,
+          icon: 'error'
+        })
+      },
+      complete: () => {
+        /// hideLoading
+        wx.hideLoading()
+        /// 判断数据是否为空
+        this.setData({
+          isEmpty: this.data.values.length == 0
+        })
+      }
+    })
+  },
+
   /**  
    * tabbar点击事件
    */
@@ -67,7 +113,8 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    /// 查询我的买履约
+    this.queryMyPerformanc(0)
   },
 
   /**
@@ -88,7 +135,8 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh() {
-
+    /// 查询我的买卖履约
+    this.queryMyPerformanc(this.data.active)
   },
 
   /**

GuangZuan/miniprogram/mMine/pages/myperformance/myperformance.wxml

@@ -8,7 +8,7 @@
 
 <scroll-view class="scroll-view" scroll-x enable-flex>
   <!-- 列头 -->
-  <view class="title-view" style="width: {{totalWidth}}px;">
+  <view wx:if="{{!isEmpty}}" class="title-view" style="width: {{totalWidth}}px;">
     <text class="title-view-text" wx:for="{{titles}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx" id="idx" style="width: {{widths[idx]}}px;">{{itm}}</text>
   </view>
 

GuangZuan/miniprogram/mMine/pages/ordersearch/ordersearch.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "van-nav-bar": "@vant/weapp/nav-bar/index"
-  },
-  "navigationBarTitleText": "单据查询"
-}

GuangZuan/miniprogram/mMine/pages/ordersearch/ordersearch.less

@@ -1 +0,0 @@
-/* mMine/pages/ordersearch/ordersearch.wxss */

GuangZuan/miniprogram/mMine/pages/ordersearch/ordersearch.ts

@@ -1,66 +0,0 @@
-// pages/mine/ordersearch/ordersearch.ts
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

GuangZuan/miniprogram/mMine/pages/ordersearch/ordersearch.wxml

@@ -1,4 +0,0 @@
-<!--pages/mine/ordersearch/ordersearch.wxml-->
-
-<van-empty class="custom-image" description="无数据"/>
-

GuangZuan/miniprogram/mMine/pages/storage/storage.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText": "仓储服务"
-}

GuangZuan/miniprogram/mMine/pages/storage/storage.less

@@ -1 +0,0 @@
-/* mMine/pages/storage/storage.wxss */

GuangZuan/miniprogram/mMine/pages/storage/storage.ts

@@ -1,66 +0,0 @@
-// pages/mine/storage/storage.ts
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

GuangZuan/miniprogram/mMine/pages/storage/storage.wxml

@@ -1,3 +0,0 @@
-<!--pages/mine/storage/storage.wxml-->
-
-<van-empty class="custom-image" description="无数据"/>

GuangZuan/miniprogram/mMine/pages/tradeserver/tradeserver.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText": "交易服务"
-}

GuangZuan/miniprogram/mMine/pages/tradeserver/tradeserver.less

@@ -1 +0,0 @@
-/* mMine/pages/tradeserver/tradeserver.wxss */

GuangZuan/miniprogram/mMine/pages/tradeserver/tradeserver.ts

@@ -1,66 +0,0 @@
-// pages/mine/tradeserver/tradeserver.ts
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

GuangZuan/miniprogram/mMine/pages/tradeserver/tradeserver.wxml

@@ -1,3 +0,0 @@
-<!--pages/mine/tradeserver/tradeserver.wxml-->
-
-<van-empty class="custom-image" description="无数据"/>

GuangZuan/miniprogram/pages/home/home.json

@@ -1,9 +1,11 @@
 {
   "usingComponents": {
     "van-notice-bar": "@vant/weapp/notice-bar/index",
-    "van-search": "@vant/weapp/search/index",
     "van-nav-bar": "@vant/weapp/nav-bar/index",
-    "news-item": "/components/news-item/news-item"
+    "van-grid": "@vant/weapp/grid/index",
+    "van-grid-item": "@vant/weapp/grid-item/index",
+    "van-cell": "@vant/weapp/cell/index",
+    "van-cell-group": "@vant/weapp/cell-group/index"
   },
   "navigationBarTitleText": "首页"
 }

GuangZuan/miniprogram/pages/home/home.less

@@ -30,75 +30,27 @@
   }
 }
 
-.menus {
+.view_top_content {
   display: flex;
   flex-direction: row;
-  margin: 15px 7.5px 10px;
-  align-items: center;
-
-  .menu-item {
-    display: grid;
-    justify-content: space-around;
-    width: 100%;
-  }
-
-  .menus-item1 {
-    display: grid;
-    justify-content: center;
-    font-size: 26rpx;
-    text-align: center;
-
-    text {
-      margin-bottom: 10px;
-      color: #666;
-    }
-
-    image {
-      border-radius: 5px;
-      width: 60px; 
-      height:60px;
-    }
-  }
-
-  .menus-item2 {
-    margin-top: 15px;
-    background-color: lightcoral;
-    text-align: center;
-    align-content: center;
-    display: grid;
-    font-size: 26rpx;
-    height: 30px;
-    width: 90px;
-    border-radius: 10px;
-    color: #fff;
-  }
-}
-
-.search-view {
-  display: flex; 
-  justify-content: space-around;
+  justify-content: space-between;
   align-items: center;
-  align-content: center;
 
-  van-search {
-    width: 100%;
+  .msg_date {
+    font-size: 22rpx;
+    color: #999999;
+    text-align: left;
+    width: 120px;
   }
-}
-
-.news-lists {
-  display: grid;
-  padding: 10px;
-  align-items: center;
-  align-content: center;
 
-  .title {
-    font-size: 20px;
-    color: rebeccapurple;
-    margin: 5px 0px;
+  .msg_title {
+    font-size: 28rpx;
+    color: #333333;
+    text-align: left;
   }
 }
 
-.dayRate, .calculator {
+.certsearch, .calculator {
   width: 23px;
   text-align: center;
   display: flex;
@@ -114,9 +66,10 @@
   height: 90px;
 }
 
-.dayRate {
-  left: 5px; 
+.certsearch {
+  right: 5px; 
   background-color: lightcoral;
+  bottom: 25%;
 }
 
 .calculator {

GuangZuan/miniprogram/pages/home/home.ts

@@ -1,5 +1,9 @@
 // pages/home/home.ts
 
+import services from "../../services/index"
+import { queryImageConfigs, queryNotice } from "../../services/api/common/index"
+import { homeData } from "../../services/api/orders/index"
+
 Page({
 
   /**
@@ -11,38 +15,99 @@ Page({
     /// 窗口高度
     windowHeight: getApp().globalData.windowHeight,
     /// banner轮播图
-    banners: [{id: 1, url: "https://img.yzcdn.cn/vant/cat.jpeg"}, 
-              {id: 2, url: "https://img.yzcdn.cn/vant/cat.jpeg"}, 
-              {id: 3, url: "https://img.yzcdn.cn/vant/cat.jpeg"}],
+    banners: [''],
     /// 功能菜单
-    menus: [[{id: 1, title: '钻石搜索', path: '/mHome/pages/search/search'}, 
-             {id: 2, title: '出镜检测', path: '/mHome/pages/inspection/inspection'}], 
-            [{id: 1, title: '最新饰品', path: '/mHome/pages/jewelry/jewelry'}, 
-             {id: 2, title: '保税服务', path: '/mHome/pages/bond/bond'}]],
+    menus: [{id: 1, icon: '', title: '挂牌大厅', path: 'pages/trade/trade'}, 
+            {id: 2, icon: '', title: '钻石首饰', path: '/mHome/pages/jewelry/jewelry'}, 
+            {id: 3, icon: '', title: '出境检测', path: '/mHome/pages/inspection/inspection'}, 
+            {id: 4, icon: '', title: '报税服务', path: '/mHome/pages/bond/bond'}],
     /// 统计
-    statistics: [{id: 1, title: '累积成交', value: 2000}, 
-                 {id: 2, title: '钻石总数', value: 20200}, 
-                 {id: 3, title: '已注册会员', value: 200}],
-    /// 新闻资讯内容
-    news: [{id: 1, title: '培育vvv钻品牌fff有了新玩法', content: '培育钻品牌有了新玩', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 2, title: '培育钻品ffddsdsfdsf牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 3, title: '培育', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 4, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 5, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 6, title: '培育钻品牌有了新玩法', content: '培育', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 7, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 8, title: '培育钻品牌有了新玩法', content: '培育钻品牌有了新玩法上游技术升级和下游消费者教育走向成熟，两到三年的快速增长后走向成熟。输入框。该组件是原生组件，使用时请注意相关限制', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}, 
-           {id: 9, title: '培育钻品牌有了新玩法', content: '培', date: '2021/12/12', img: 'https://img.yzcdn.cn/vant/cat.jpeg'}],
-    /// GIA证书
-    GIA: 'xxxxx'
+    statistics: [{id: 1, title: '出售中', value: 0}, 
+                 {id: 2, title: '求购中', value: 0}, 
+                 {id: 3, title: '已购买', value: 0}, 
+                 {id: 4, title: '已出售', value: 0}, 
+                 {id: 5, title: '今日汇率', value: 0}],
+    /// 首页数据
+    homedata: [0, 0, 0, 0, 0],
+    /// 公告消息
+    notice: {},
+    /// 公告系XO
+    msgs: [{}]
   },
 
   /**
-   * 跳转新闻详情页面方法
+   * 获取首页轮播图数据
    */
-  goToNews(e: any) {
-    wx.navigateTo({
-      url: '/mHome/pages/news/news?id='+JSON.stringify(this.data.news[e.currentTarget.id])
+  queryImageConfigs() {
+    /// 获取首页轮播图数据
+    queryImageConfigs({
+      data: { imageType: 1 },
+      success:(res) => {
+        /// 数据设置
+        this.setData({
+          banners: res.data.map(item => {
+             return (services.config.openApiUrl+item.imagepath).replace('./uploadFile', '/uploadFile')
+          })
+        })
+      },
+      fail:(emsg) => {
+        console.log('首页数据获取失败，原因：'+emsg)
+      },
+      complete:() => {}
+    })
+  },
+
+  /**
+   * 获取首页数据信息
+   */
+  homeData() {
+    /// 获取新闻首页数据
+    homeData({
+      data: { userid: wx.getStorageSync('UserId') },
+      success:(res) => {
+        /// 数据设置
+        var array = [res.data.transactionssold, 
+                     res.data.transactioninpurchase, 
+                     res.data.purchasedtransactions, 
+                     res.data.transactionsonsale, 
+                     wx.getStorageSync('LoginQuery').exchangeRateConfigs[0].exchangerate]
+        this.setData({ homedata: array })
+      },
+      fail:(emsg) => {
+        console.log('首页数据获取失败，原因：'+emsg)
+      },
+      complete:() => {}
+    })
+  },
+
+  /**
+   * 查询通知公告消息
+   */
+  queryNotice(){
+    /// 发送查询请求
+    queryNotice({
+      data: {
+        loginID: wx.getStorageSync('LoginID')
+      },
+      success:(res) => {
+        /// 数据为空
+        if (res.data.length == 0) {
+          return
+        }
+        /// 加载成功 数据复制
+        this.setData({ 
+          notice: res.data[0],
+          msgs: res.data
+        })
+      },
+      fail: (emsg) => {
+        /// 加载失败
+        wx.showToast({
+          title: '公告消息请求失败, 原因:：'+emsg,
+          icon: 'error'
+        })
+      },
+      complete: () => {}
     })
   },
 
@@ -55,11 +120,38 @@ Page({
     })
   },
 
+  /// 进入公告消息详情页
+  goToMsgDetail(r: any) {
+    console.log(r)
+    let jsonStr = JSON.stringify(this.data.msgs[r.currentTarget.id])
+    wx.navigateTo({
+      url: '/mHome/pages/msg/msgdetail/msgdetail?id='+jsonStr
+    })
+  },
+
+  /// onGirdClick
+  onGirdClick(e: any) {
+    switch (e.target.id) {
+      case "挂牌大厅":
+        wx.switchTab({
+          url: '/pages/trade/trade'
+        })
+        break;
+      default:
+        break;
+    }
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad() {
-
+    /// 获取新闻首页数据
+    this.homeData()
+    /// 查询新闻资讯
+    this.queryNotice()
+    /// 查询轮播图数据
+    this.queryImageConfigs()
   },
 
   /**

GuangZuan/miniprogram/pages/home/home.wxml

@@ -2,52 +2,42 @@
 
 <scroll-view style="padding-bottom: 80px;" scroll-y>
   <!-- banner轮播图 -->
-  <swiper class="banner" wx:if="{{banners.count != 0}}" indicator-active-color="white" indicator-dots autoplay interval="5000" circular>
-    <swiper-item class="banner_item" wx:for="{{banners}}" wx:key="id" id="{{item.id}}">
+  <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.url}}" mode="scaleToFill">第{{item.id}}张图片</image>
+        <image src='{{item}}' mode="scaleToFill"></image>
       </view>
     </swiper-item>
   </swiper>
 
   <!-- 通知栏 -->
-  <van-notice-bar left-icon="volume-o" mode="link" bind:click="goToMsg" color="#333" background="#f3f3f3" text="在代码阅读过程中人们说脏话的频率是衡量代码质量的唯一标准。" scrollable></van-notice-bar>
+  <van-notice-bar left-icon="volume-o" mode="link" bind:click="goToMsg" color="#333" background="#f3f3f3" text="{{notice.title}}" scrollable></van-notice-bar>
 
   <!-- 统计 -->
   <view class="statistics" style="background-color: firebrick;">
     <view class="statistics-item" wx:for="{{statistics}}" wx:key="id" wx:for-index="idx" wx:for-item="itm">
       <text>{{itm.title}}</text>
-      <text>{{itm.value}}</text>
+      <text>{{homedata[idx]}}</text>
     </view>
   </view>
 
   <!-- 功能菜单 -->
-  <view class="menus" wx:if="{{menus.count != 0}}">
-    <view class="menu-item" wx:for="{{menus}}" wx:key="id" wx:for-index="idx" wx:for-item="itm">
-      <!-- 钻石菜单项 -->
-      <navigator class="menus-item1" url="{{itm[0].path}}">
-        <text class="title" user-select>{{itm[0].title}}</text>
-        <image src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fimg.zcool.cn%2Fcommunity%2F01c4345ddd132ca80120686b55207b.jpg%401280w_1l_2o_100sh.jpg&refer=http%3A%2F%2Fimg.zcool.cn&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1662538505&t=b7bfa2b5dabf7ebf57690aa0989b1688" mode="aspectFill"></image>
-      </navigator>
-      <!-- 功能菜单项 -->
-      <navigator class="menus-item2" url="{{itm[1].path}}">{{itm[1].title}}</navigator>
-    </view>
-  </view>
-
-  <!-- 搜索视图 -->
-  <view class="search-view">
-    <van-search label="GIA" model:value="{{GIA}}" shape="round" placeholder="搜索GIA证书" bind:change="onChange" bind:search="onSearch"></van-search>  
-  </view> 
-
-  <!-- 新闻视图 -->
-  <view class="news-lists" wx:if="{{news.count != 0}}">
-    <text class="title" user-select>资讯</text>
-    <news-item class="new-lists-item" wx:for="{{news}}" wx:key="id" wx:for-item="itm" wx:for-index="idx" id="{{idx}}" bindtap="goToNews" title="{{itm.title}}" content="{{itm.content}}" imgUrl="{{itm.img}}"></news-item>
-  </view>
+  <van-grid clickable>
+    <van-grid-item wx:for="{{menus}}" wx:key="id" wx:for-index="idx" wx:for-item="itm" url="{{itm.path}}" icon="send-gift" id="{{itm.title}}" text="{{itm.title}}" bind:click="onGirdClick"/>
+  </van-grid>
+
+  <van-cell-group>
+    <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>
 </scroll-view>
 
-<!-- 今日汇率  -->
-<navigator class="dayRate" url="/mHome/pages/dayRate/dayRate">今日汇率</navigator>
+<!-- 证书查询  -->
+<navigator class="certsearch" url="/mHome/pages/cerserach/cerserach">证书查询</navigator>
 <!-- 计算器  -->
 <navigator class="calculator" url="/mHome/pages/calculator/calculator">计算器</navigator>
 

GuangZuan/miniprogram/pages/login/login.ts

@@ -1,5 +1,5 @@
 // pages/login/login.ts
-import {login} from '../../services/api/account/index'
+import {login, loginQuery} from '../../services/api/account/index'
 import { appConfig } from '../../config/index'
 
 Page({
@@ -56,7 +56,6 @@ Page({
       },
       enableAuthorization: false,
       success: (res) => {
-        console.log(res)
         /// 登录失败
         if (res.code != 0) { 
           wx.showToast({icon: 'error', title: '登录失败，原因:'+res.msg})
@@ -68,6 +67,34 @@ Page({
         wx.setStorageSync('LoginID', res.data.loginId)
         wx.setStorageSync('UserId', res.data.userId)
 
+        /// 登录查询
+        this.loginQuery()
+      },
+      fail: (emsg) => { 
+        const msg = '登录失败，原因：'+emsg
+        wx.showToast({icon: 'error', title: msg}) 
+      },
+      complete: () => { this.setData({ isLoding: false }) }
+    })
+  },
+
+  /// 登录查询
+  loginQuery() {
+    /// showLoading
+    wx.showLoading({ title: '数据查询中.....'})
+    /// 发送查询请求
+    loginQuery({
+      data: {
+        loginID: wx.getStorageSync('LoginID')
+      },
+      success: (res) => {
+        /// 数据存储
+        wx.setStorageSync('LoginQuery', res.data)
+        /// 登录失败
+        if (res.code != 200) { 
+          wx.showToast({icon: 'error', title: '登录查询失败，原因:'+res.msg})
+          return 
+        }
         /// showToast
         wx.showToast({
           title: '登录成功',
@@ -77,8 +104,16 @@ Page({
           }
         })
       },
-      fail: () => { wx.showToast({icon: 'error', title: '登录失败，原因:网络请求失败'}) },
-      complete: () => { this.setData({ isLoding: false }) }
+      fail: (emsg) => {
+        /// showToast
+        wx.showToast({ title: '登录查询失败，原因：'+emsg, icon: 'error'})
+      },
+      complete: () => {
+        /// hideLoading
+        wx.hideLoading()
+        /// isLoding
+        this.setData({ isLoding: false })
+      }
     })
   },
 

GuangZuan/miniprogram/pages/mine/mine.ts

@@ -7,19 +7,18 @@ Page({
    */
   data: {
     // 功能菜单项
-    menulists: [{id: 1, title: '资金资产', img: 'medal', path: "/mMine/pages/assets/assets"}, 
-                {id: 2, title: "交易服务", img: 'invitation',  path: "/mMine/pages/tradeserver/tradeserver"}, 
-                {id: 3, title: '现货挂牌', img: 'underway',    path: "/mTrade/pages/listing/listing"}, 
-                {id: 4, title: '仓储服务', img: 'hot',         path: "/mMine/pages/storage/storage"}],
+    menulists: [{id: 1, title: '我的库存', img: 'medal', path: "/mMine/pages/myinventorys/myinventorys"}, 
+                {id: 2, title: "我的订单", img: 'invitation',  path: "/mMine/pages/myorders/myorders"}, 
+                {id: 3, title: '我的履约', img: 'underway',    path: "/mMine/pages/myperformance/myperformance"}, 
+                {id: 4, title: '我的出境', img: 'hot',         path: "/mHome/pages/inspection/inspection"}, 
+                {id: 5, title: '我的保税', img: 'fire-o',      path: "/mHome/pages/bond/bond"}],
 
     // 列表菜单项
-    tablelists: [{id: 1, title: '实名认证',    path: "/mMine/pages/realauth/realauth"}, 
-                 {id: 2, title: '签约解约管理', path: "/mMine/pages/bank/bank"}, 
-                 {id: 3, title: '我的库存',    path: "/mMine/pages/myinventorys/myinventorys"}, 
-                 {id: 4, title: '单据查询',    path: "/mMine/pages/ordersearch/ordersearch"}, 
-                 {id: 5, title: '我的订单',    path: "/mMine/pages/myorders/myorders"}, 
-                 {id: 6, title: '我的报表',    path: "/mMine/pages/myreports/myreports"}, 
-                 {id: 7, title: '我的履约',    path: "/mMine/pages/myperformance/myperformance"}],
+    tablelists: [{id: 1, title: '签约账户',    path: "/mMine/pages/bank/bankh"}, 
+                 {id: 2, title: '收货地址',    path: ""}, 
+                 {id: 3, title: '发票信息',    path: ""}, 
+                 {id: 4, title: '账户安全',    path: ""}, 
+                 {id: 5, title: '关于我们',    path: ""}],
     /// 微信头像 
     avatarUrl: "",
     /// 微信昵称

GuangZuan/miniprogram/pages/mine/mine.wxml

@@ -19,7 +19,7 @@
 </view>
 
 <!-- 功能菜单项 -->
-<van-grid column-num="4" wx:if="{{menulists.count != 0}}">
+<van-grid column-num="5" wx:if="{{menulists.count != 0}}">
   <van-grid-item wx:for="{{menulists}}" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{itm.id}}" icon="{{itm.img}}" icon-color="red" dot link-type="navigateTo" url="{{itm.path}}">
     <text slot="text" style="font-size: 13px;">{{itm.title}}</text>
   </van-grid-item>

GuangZuan/miniprogram/services/api/account/index.ts

@@ -1,6 +1,6 @@
 import { httpRequest } from '../../../services/http/index'
 import { HttpRequest } from '../../../services/http/interface'
-import service from '../../../services'
+import service from '../../../services/index'
 
 /**
  * 用户登录
@@ -8,4 +8,20 @@ import service from '../../../services'
  */
 export function login(params: HttpRequest<{req: GuangZuan.LoginReq, rsp: GuangZuan.LoginRsp}>) {
   return httpRequest(service.config.goAccess+'/Account/Login', 'POST', params)
+}
+
+/**
+ * 账户登录后信息查询
+ * 
+ */
+export function loginQuery(params: HttpRequest<{req: GuangZuan.LoginQueryReq, rsp: GuangZuan.LoginQuery}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/User/LoginQuery', 'GET', params)
+}
+
+/**
+ * 获取资金账户信息
+ * 
+ */
+export function getTaAccounts(params: HttpRequest<{req: GuangZuan.TaAccountReq, rsp: GuangZuan.TaAccount}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/TaAccount/GetTaAccounts', 'GET', params)
 }

GuangZuan/miniprogram/services/api/common/index.ts

@@ -1,6 +1,6 @@
 import { httpRequest } from '../../../services/http/index'
 import { HttpRequest } from '../../../services/http/interface'
-import service from '../../../services'
+import service from '../../../services/index'
 
 /* 查询汇率信息 */
 export function queryRates(params: HttpRequest<{req: GuangZuan.RatesReq, rsp: GuangZuan.Rates[]}>) {
@@ -10,4 +10,9 @@ export function queryRates(params: HttpRequest<{req: GuangZuan.RatesReq, rsp: Gu
 /* 通知公告系统消息查询 */
 export function queryNotice(params: HttpRequest<{req: GuangZuan.NoticeReq, rsp: GuangZuan.Notice[]}>) {
   return httpRequest(service.config.goCommonSearchUrl+'/Common/QueryNotice', 'GET', params)
+}
+
+/* 查询轮播图配置信息 */
+export function queryImageConfigs(params: HttpRequest<{req: GuangZuan.QueryImageConfigsReq, rsp: GuangZuan.QueryImageConfigs[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Common/QueryImageConfigs', 'GET', params)
 }

GuangZuan/miniprogram/services/api/orders/index.ts

@@ -1,30 +1,55 @@
 import { httpRequest } from '../../../services/http/index'
 import { HttpRequest } from '../../../services/http/interface'
-import service from '../../../services'
+import service from '../../../services/index'
+
+/* 获取钻石详情 */
+export function getGoods(params: HttpRequest<{req: GuangZuan.GetGoodsReq, rsp: GuangZuan.GetGoods}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/GetGoods', 'GET', params)
+}
+
+/* Rapaport最新报价表(广钻) */
+export function gzCertAddressConfig(params: HttpRequest<{req: GuangZuan.GzCertAddressConfigReq, rsp: GuangZuan.GzCertAddressConfig[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/GzCertAddressConfig', 'GET', params)
+}
+
+/* 钻石证书地址参数 */
+export function gzCertAddressParam(params: HttpRequest<{req: GuangZuan.GzCertAddressParamReq, rsp: GuangZuan.GzCertAddressParam[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/GzCertAddressParam', 'GET', params)
+}
+
+/* 首页统计数据 */
+export function homeData(params: HttpRequest<{req: GuangZuan.HomeDataReq, rsp: GuangZuan.HomeData}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/HomeData', 'GET', params)
+}
+
+/* 钻石价格计算器 */
+export function priceCalc(params: HttpRequest<{req: GuangZuan.PriceCalcReq, rsp: GuangZuan.Gzrapaportprice[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/PriceCalc', 'GET', params)
+}
 
 /* 查询求购大厅委托单 */
 export function queryBuyOrder(params: HttpRequest<{req: GuangZuan.BuyOrderReq, rsp: GuangZuan.BuyOrder[]}>) {
   return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryBuyOrder', 'GET', params)
 }
 
-/* 查询仓库信息 */
-export function queryWarehouseInfo(params: HttpRequest<{req: GuangZuan.WarehouseInfoReq, rsp: GuangZuan.WarehouseInfo[]}>) {
-  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryWarehouseInfo', 'GET', params)
+/* 钻石搜索 */
+export function queryDiamond(params: HttpRequest<{req: GuangZuan.DiamondReq, rsp: GuangZuan.SellOrder[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryDiamond', 'POST', params)
 }
 
-/* 查询出售大厅委托单 */
-export function querySellOrder(params: HttpRequest<{req: GuangZuan.SellOrderReq, rsp: GuangZuan.SellOrder[]}>) {
-  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QuerySellOrder', 'GET', params)
+/* 查询我的询价-求购 */
+export function queryMyBargainApply(params: HttpRequest<{req: GuangZuan.MyBargainApplyReq, rsp: GuangZuan.MyBargainApply[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryMyBargainApply', 'GET', params)
 }
 
-/* 查询我的库存 */
-export function queryMyWRPosition(params: HttpRequest<{req: GuangZuan.MyWRPositionReq, rsp: GuangZuan.MyWRPosition[]}>) {
-  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryMyWRPosition', 'GET', params)
+/* 查询我的求购 */
+export function queryMyBuyOrder(params: HttpRequest<{req: GuangZuan.MyBuyOrderReq, rsp: GuangZuan.MyBuyOrder[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryMyBuyOrder', 'GET', params)
 }
 
-/* 查询我的出售 */
-export function queryMySellOrder(params: HttpRequest<{req: GuangZuan.MySellOrderReq, rsp: GuangZuan.MySellOrder[]}>) {
-  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryMySellOrder', 'GET', params)
+/* 查询我的摘牌 */
+export function queryMyDeListing(params: HttpRequest<{req: GuangZuan.MyDeListingReq, rsp: GuangZuan.MyDeListing[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryMyDeListing', 'GET', params)
 }
 
 /* 查询我的询价-出售 */
@@ -32,27 +57,48 @@ export function queryMyDelistingApply(params: HttpRequest<{req: GuangZuan.MyDeli
   return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryMyDelistingApply', 'GET', params)
 }
 
-/* 查询我的摘牌 */
-export function queryMyDeListing(params: HttpRequest<{req: GuangZuan.MyDeListingReq, rsp: GuangZuan.MyDeListing[]}>) {
-  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryMyDeListing', 'GET', params)
+/* 查询我的收藏 */
+export function queryMyFavorite(params: HttpRequest<{req: GuangZuan.MyFavoriteReq, rsp: GuangZuan.MyFavorite[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryMyFavorite', 'GET', params)
 }
 
-/* 查询我的求购 */
-export function queryMyBuyOrder(params: HttpRequest<{req: GuangZuan.MyBuyOrderReq, rsp: GuangZuan.MyBuyOrder[]}>) {
-  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryMyBuyOrder', 'GET', params)
+/* 查询我的履约 */
+export function queryMyPerformanc(params: HttpRequest<{req: GuangZuan.MyPerformancReq, rsp: GuangZuan.MyPerformanc[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryMyPerformanc', 'GET', params)
 }
 
-/* 查询我的询价-求购 */
-export function queryMyBargainApply(params: HttpRequest<{req: GuangZuan.MyBargainApplyReq, rsp: GuangZuan.MyBargainApply[]}>) {
-  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryMyBargainApply', 'GET', params)
+/* 查询我的出售 */
+export function queryMySellOrder(params: HttpRequest<{req: GuangZuan.MySellOrderReq, rsp: GuangZuan.MySellOrder[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryMySellOrder', 'GET', params)
 }
 
-/* 钻石搜索 */
-export function queryDiamond(params: HttpRequest<{req: GuangZuan.DiamondReq, rsp: GuangZuan.Diamond[]}>) {
-  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryDiamond', 'POST', params)
+/* 查询我的库存 */
+export function queryMyWRPosition(params: HttpRequest<{req: GuangZuan.MyWRPositionReq, rsp: GuangZuan.MyWRPosition[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryMyWRPosition', 'GET', params)
 }
 
-/* 获取钻石详 */
-export function getGoods(params: HttpRequest<{req: GuangZuan.GetGoodsReq, rsp: GuangZuan.GetGoods}>) {
-  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/GetGoods', 'GET', params)
-}
+/* 查询出售大厅委托单 */
+export function querySellOrder(params: HttpRequest<{req: GuangZuan.SellOrderReq, rsp: GuangZuan.SellOrder[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QuerySellOrder', 'GET', params)
+}
+
+/* 查询仓库信息 */
+export function queryWarehouseInfo(params: HttpRequest<{req: GuangZuan.WarehouseInfoReq, rsp: GuangZuan.WarehouseInfo[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryWarehouseInfo', 'GET', params)
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

GuangZuan/miniprogram/services/http/index.ts

@@ -44,8 +44,7 @@ function httpMiddleware<T>(config: HttpConfig<T>) {
         resolve(res.data)
       },
       fail: (err) => {
-        console.log(err)
-        reject('请求异常，请稍后再试')
+        reject('请求异常，请稍后再试'+err)
       },
       complete: () => {
         // 在请求结束后，移除本次请求
@@ -73,12 +72,15 @@ export async function httpRequest<T extends { req?: unknown, rsp?: unknown }>(ur
     const data = res as HttpResponse<T['rsp']>
     switch (data.code) {
       case ResultCode.InvalidToken:
-        //退出登录
-        //logout();
+        // 退出登录
+        // logout();
         return Promise.reject('令牌无效')
       case ResultCode.Success:
         success && success(data)
         return Promise.resolve()
+      case ResultCode.Code:
+        success && success(data)
+        return Promise.resolve()
       default:
         return Promise.reject(data.msg)
     }

GuangZuan/miniprogram/services/http/interface.ts

@@ -36,7 +36,8 @@ export interface HttpRequest<T extends { req?: unknown, rsp?: unknown } = object
  * Http响应结果状态码
  */
 export enum ResultCode {
-  Success = 200, //成功
-  Error = 7, //失败
-  InvalidToken = 8, //令牌无效
+  Success = 200,    // 成功
+  Code = 0,         // 请求成功
+  Error = 7,        // 失败
+  InvalidToken = 8, // 令牌无效
 }

GuangZuan/miniprogram/services/index.ts

@@ -17,7 +17,6 @@ export default new (class {
     tradePort: '',
     tradeUrl: '',
     uploadUrl: '',
-    oem: '',
     goAccess: ''
   }
 

GuangZuan/miniprogram/services/model/account.d.ts

@@ -0,0 +1,630 @@
+declare namespace GuangZuan {
+
+  /// 登录查询请求
+  export interface LoginQueryReq {
+    /// 登录账号
+    loginID: number
+  }
+
+  /// 用户登录查询回应信息
+  export interface LoginQuery {
+    /// 所属角色信息
+    areaRoles: [AreaRole]
+    /// 外部交易所
+    externalExchanges: [ExternalExchange]
+    /// 商品组
+    goodsgroups: [GoodsGroup]
+    /// 用户登录账号信息
+    loginAccount: LoginAccount
+    /// 市场
+    markets: [Market]
+    /// 系统参数
+    systemParams: [SystemParam]
+    /// 用户账户信息
+    userAccount: UserAccount
+    /// 用户信息
+    userInfo: UserInfo
+    /// 用户姓名
+    username: string
+    /// 汇率信息
+    exchangeRateConfigs: [ExchangeRateConfig]
+  }
+
+  /// 用户信息
+  export interface UserInfo {
+    /// 地址
+    address: string
+    /// 附件1
+    attachment1: string
+    /// 附件2
+    attachment2: string
+    /// 银行帐号 (加密存储)
+    bankaccount: string
+    /// 收款人名称
+    bankaccountname: string
+    /// 银行卡正面照地址
+    bankcardfrontphotourl: string
+    /// 银行编码
+    bankid: string
+    /// 银行名称
+    bankname: string
+    /// 企业性质( 企业) - 1:国有控股企业 2:集体控股企业 3:私人控股企业 4:港澳台商控股企业 5:外商控股企业 6:其它
+    biznature: number
+    /// 企业经营范围(企业)
+    bizscope: string
+    /// 证件背面图片地址
+    cardbackphotourl: string
+    /// 证件正面图片地址
+    cardfrontphotourl: string
+    /// 证件号码(加密存储)
+    cardnum: string
+    /// 证件类型ID
+    cardtypeid: number
+    /// 市
+    cityid: number
+    /// 公司(个人)
+    company: string
+    /// 联系人
+    contactname: string
+    /// 国家
+    countryid: number
+    /// 创建时间
+    createtime: string
+    /// 创建人
+    creatorid: number
+    /// 客户名称(企业名称)
+    customername: string
+    /// 地区
+    districtid: number
+    /// 邮件(加密存储)
+    email: string
+    /// 传真(加密存储)
+    fax: string
+    /// 半身照地址
+    halfbodyphotourl: string
+    /// 数据是否已加密 - 0:未加密 1:已加密
+    hasencrypt: number
+    /// 头像地址
+    headurl: string
+    /// 法人身份证背面照地址
+    legalcardbackphotourl: string
+    /// 法人身份证正面照地址
+    legalcardfrontphotourl: string
+    /// 法人姓名(企业)
+    legalpersonname: string
+    /// 手机号码(加密存储)
+    mobile: string
+    /// 手机号码[明文-尚志]
+    mobile2: string
+    /// 修改人
+    modifierid: number
+    /// 修改时间
+    modifiertime: string
+    /// 是否需要发票 - 0:不需要 1:需要
+    needinvoice: number
+    /// 昵称：默认为名称脱敏(张**) 或 手机号脱敏(139****9999)
+    nickname: string
+    /// 开户方式 - 1:管理端开户 2:网上开户注册(会员官网) 3:微信开户 4:网页交易端注册 5:安卓手机端注册 6:苹果手机端注册 7:PC交易端注册 8:微信快速开户 9:支付宝快速开户 10:手机号快速开户
+    openmode: number
+    /// 其它图片地址[使用分号分隔]
+    otherurl: string
+    /// 邮政编码
+    postalcode: string
+    /// 省
+    provinceid: number
+    /// QQ(加密存储
+    qq: string
+    /// 备注
+    remark: string
+    /// 用户性别 0: 女 1: 男
+    sex: number
+    /// 签约pdf文件
+    signpdfurl: string
+    /// 联系电话(加密存储)
+    telphone: string
+    /// 用户ID
+    userid: number
+    /// 用户信息类型 - 1:个人 2:企业
+    userinfotype: number
+    /// 用户状态 - 1：正常 2：注销
+    userstatus: number
+    /// 账户类型 - 1:交易所 2:机构 3:会员子机构 4:经纪人 5:投资者 6:客户
+    usertype: number
+    /// 微信(加密存储)
+    wechat: string
+    /// 开户申请信息(JSON)
+    wskhinfo: string
+  }
+
+  /// 用户账户信息
+  export interface UserAccount {
+    /// 账户名称(机构名称)
+    accountname: string
+    /// 账户状态 - 1:待激活 2:待审核 3:待复审 4:正常 5:审核拒绝 6:停用(注销) 7:注销(删除)
+    accountstatus: number
+    /// 申请来源 - 1:管理端 2:终端
+    applysrc: number
+    /// 审核备注
+    auditremark: string
+    /// 审核来源 - 1:管理端 2:终端
+    auditsrc: number
+    /// 审核时间
+    audittime: string
+    /// 审核人
+    audituserid: number
+    /// 所属经纪人ID
+    broker: number
+    /// 销户时间
+    canceltime: string
+    /// 销户人
+    canceluserid: number
+    /// 是否可推荐 - 0:不可 1;可
+    canrecommend: number
+    /// 创建时间
+    createtime: string
+    /// 创建人
+    creatorid: number
+    /// 是否已实名认证 - 0:未认证 1:已认证 2:已提交(待审核) 3:已拒绝
+    hasauth: number
+    /// 是否匿名下单 - 0:否 1:是
+    isanonymous: number
+    /// 最大用户数(经纪会员下投资者个数)
+    maxinvestornum: number
+    /// 所属会员ID
+    memberuserid: number
+    /// 修改人
+    modifierid: number
+    /// 变更备注
+    modifyremark: string
+    /// 变更状态 1 未变更 2 变更中 3 变更待审核 4 变更待复核(投资者)
+    modifystatus: number
+    /// 修改时间
+    modifytime: string
+    /// 上级顶级机构 [092=0,1时，默认为1， 092=2时若自已为顶级，则填入自己，自己不为顶级，填入ParentUserID的"ParentTopUser"]
+    parenttopuser: string
+    /// 所属机构ID
+    parentuserid: number
+    /// 默认结算资金账号ID(机构分润使用) 作废
+    reckonaccountid: number
+    /// 推荐总人数
+    refercount: number
+    /// 推荐人ID
+    refereeuserid: number
+    /// 推荐码
+    refernum: string
+    /// 根用户ID
+    rootuserid: number
+    /// 子账户层数
+    subaccountlevel: number
+    /// 子机构层级路径(逗号分隔,首尾加逗号)
+    subarealevelpath: string
+    /// 用户ID
+    userid: number
+    /// 账户类型 - 1:交易所 2:机构 3:会员子机构 4:经纪人 5:投资者 6:客户 7:企业成员(云平台)
+    usertype: number
+  }
+
+  /// 系统参数
+  export interface SystemParam {
+    /// 更新用户账号,登录账号
+    loginid: string
+    /// 修改标志0 不允许修改 1 允许修改
+    modifyflag: number
+    /// 参数代码
+    paramcode: string
+    /// 参数名
+    paramname: string
+    /// 参数类型 0-通用 1-管理端 2-终端 3-后台 4-商城
+    paramtype: number
+    /// 参数值
+    paramvalue: string
+    /// 参数值(CLOB)
+    paramvalue2: string
+    /// 正则表达式
+    regexpress: string
+    /// 备注
+    remark: string
+    /// 限制服务器IP,备份参数，现在界面不用显示0.0.0.0则无限制，是通用参数192.168.0.211 指定服务器的参数配置
+    serverip: string
+    /// 是否显示0 不显示 1 显示
+    showflag: number
+    /// 更新时间
+    updatetime: string
+    /// 更新用户ID
+    userid: number
+  }
+
+  /// 市场
+  export interface Market {
+    /// 竞拍仓单类型 - 1:无仓单 2:有仓单 3;有无仓单均可
+    auctionwrtype: number
+    /// 确认行权是否接收行情 - 0:不接受 1:接受 [可确认权的挂牌期权市场可配置]
+    canacceptquote: number
+    /// [期权]是否可现货行权- 0:否 1:是
+    cangoodsexercise: number
+    /// 可现货行权期权类型 - 1:认购 2认沽 3:认购认沽 [CanGoodsExercise = 1时可设置]
+    cangoodsexercisetype: number
+    /// 是否可手动报行权价- 0:否 1:是 [期权]
+    canmanualquotestrike: number
+    /// 是否可多段运行 – 0:不可 1:可 [挂牌期权]
+    canmutistage: number
+    /// [期权]是否可预申报- 0:否 1:是
+    canpreexercise: number
+    /// 待开市间隔(交易市场开盘前多久发市场待开市信号(单位分钟))
+    clearinterval: number
+    /// 合同模板[荷兰式][竞价式][仓单贸易]
+    contracttmp: string
+    /// 所属交易所，可以没有
+    exchareaid: number
+    /// 商品类型 - 1:交易商品 2:仓单商品
+    goodstype: number
+    /// 是否返利[竞价式] 0:不返，1:返利 – 根据系统参数088显示或隐藏
+    hasrebate: number
+    /// 是否交易授信[做市收益权] - 0:不授信 1:授信
+    hastradecredit: number
+    /// [竞拍]是否需要仓单 - 0:不需要 1:需要-作废
+    haswr: number
+    /// 竞拍违约是否扣除保证金[竞拍-降价式] - 0:不扣 1:扣除
+    isdeductmargin: number
+    /// 是否记录成交源 - 0:不记录 1:记录 [所有权]
+    isrecordsource: number
+    /// 成交参与保证金是否释放[竞价式] - 0:不释放 1释放
+    isreleasemargin: number
+    /// 持仓保证金公式 - 1:双边收 2:净头寸收 3:大小边差异收 4:大边收 5:卖持仓收(仅期权)
+    marginformula: number
+    /// 持仓保证金公式(仅受托竞价) - 1:双边收 2:净头寸收 3:大小边差异收 4:大边收 5:卖持仓收(仅期权)
+    marginformula2: number
+    ///  市场ID正常5位，前三位固定：两位表示交易模式， 一位表示交易属性(1:收益权，2：所有权) 其它特殊市场：0-系统 1-交割服务 2-账户服务3-履约服务 4-仓单服务 5-积分服务 6-银行服务
+    marketid: number
+    /// 市场名称
+    marketname: string
+    /// 市场服务ID
+    marketserviceid: number
+    /// 生效状态(ValidStatus枚举): 1:待生效 2:正常 3:注销
+    marketstatus: number
+    /// 市场类型- 1:非交易服务 2:交易服务
+    markettype: number
+    /// 指定对手模式[仓单贸易模式专用] - 1:任意对手
+    matchermode: number
+    /// 开盘模式 - 0 自动 1手动
+    openmethod: number
+    /// 场外期权做市商[场外期权]
+    otcuserid: number
+    /// 外部同步时间点(h24:mi:ss)[场外期权]
+    outersynctime: string
+    /// 待开市时间标识[通道交易-对冲] - 0:当日 1:上日
+    pendingflag: number
+    /// 待开市时间通道交易-对冲
+    pendingtime: string
+    /// 履约计划模板ID - 作废
+    performancetempid: number
+    /// 权利金报价方式 - 1:自动 2:手动
+    premiumquotemode: number
+    /// 返利比率[竞价式]
+    rebateratio: number
+    /// 结算顺序
+    reckonorder: number
+    /// 结算价算法: 1:最后多少笔成交价加权平均 2:最后多少秒成交价加权平均 3:全天加权平均 4:最后一口价 5.买一价 6.卖一价 7.买一卖一均价 8.外部结算价
+    reckonpricealgorithm: number
+    /// 结算价参数
+    reckonpriceparam: number
+    /// 结算时间通道交易-对冲
+    reckontime: string
+    /// 角色优先类型 - 1:无 2:报价商优先 3:非报价商优先 [16:挂牌点选]
+    roleprioritytype: number
+    /// 卖挂牌是否需要审核(仓单贸易) - 0:不需要 1:需要
+    selllistingauditflag: number
+    /// 交易市场类型 - 1:合约市场 2:外部市场 3:仓单市场
+    trademarkettype: number
+    /// 交易模式 - 10:做市 13:竞价 15:通道交易 16:挂牌点选 17:仓单贸易 18:期权 19:竞拍-降价式 20:竞拍-竞价式 21:竞拍-大宗式 22:受托竞价
+    trademode: number
+    /// 交易属性 - 1:收益权(可做空) 2:所有权(不可做空) 3:期权 4:现货 5:参考行情 6:通道交易 7:币交易 8:场外期权
+    tradeproperty: number
+    /// 下单方式[通道交易] - 1:直接转单 2:净头寸下单
+    tradetype: number
+  }
+
+  /// 登录账户
+  export interface LoginAccount {
+    /// 账户名称
+    accountname: string
+    /// 是否可出入金 - 0:不可 1:可
+    canoutin: number
+    /// 终端角色ID
+    clientroleid: number
+    /// 是否已登录 - 0:未登录 1:已登录
+    haslogined: number
+    /// 是否已更改密码 - 0:未修改 1:已修改
+    hasupdatedpwd: number
+    /// 最新登录地址
+    lastloginip: string
+    /// 最新登录方式(客户端类型) - 0:保留为未填终端类型 1:PC管理端 2:PC交易端 3:手机客户端安卓 4:网页客户端 5:微信客户端 6:手机客户端苹果 7:网上开户客户端 8:无效终端编号 9:报价终端(中江)
+    lastloginmode: number
+    /// 最新登录描述
+    lastloginremark: string
+    /// 最新登录时间
+    lastlogintime: string
+    /// 登录代码
+    logincode: string
+    /// 连续登录失败次数(登录成功时清零)
+    loginfailnum: number
+    /// 登陆账号
+    loginid: number
+    /// 最新登录端口
+    loginport: number
+    /// 登录账号状态 1:正常 2:冻结(停用) 3:无效(注销)
+    loginstatus: number
+    /// 登录账号类型 - 1:投资者 2:机构交易员
+    loginusertype: number
+    /// 手机号码(加密存储)
+    mobile: string
+    /// 修改人
+    modifierid: number
+    /// 审核来源 - 1:管理端 2:终端
+    modifysrc: number
+    /// 修改时间
+    modifytime: string
+    /// 密码错误次数
+    pwdwrongcount: number
+    /// 关联用户ID(机构)
+    relateduserid: number
+    /// 资金账号权限类型 - 1:不选默认为所有权限 2:不选默认为无权限
+    taaccountrighttype: number
+    /// 账户解冻时间
+    unfreezetime: string
+    /// 用户ID
+    userid: number
+  }
+
+  /// 商品组
+  export interface GoodsGroup {
+    /// 合约单位
+    agreeunit: number
+    /// 是否允许做空[通道交易] - 0:不能做空 1:可以做空
+    canshort: number
+    /// 强平价格方式 - 1:市价 2:最新价 3:涨跌停（未实现）
+    closepricemode: number
+    /// 强平最新价浮动比例 - 方式为2时使用
+    closepriceparam: number
+    /// 创建时间
+    createtime: string
+    /// 创建人
+    creatorid: number
+    /// 报价货币ID
+    currencyid: number
+    /// 报价小数位
+    decimalplace: number
+    /// 行权类型[场外期权]-1:欧式期权 2:美式期权
+    exercisetype: number
+    /// 外部交易所ID[通道交易]
+    exexchangeid: number
+    /// 商品组ID(自增ID)
+    goodsgroupid: number
+    /// 商品组名称
+    goodsgroupname: string
+    /// 商品组状态 - 1:正常 2:注销
+    goodsgroupstatus: number
+    /// 报价单位ID
+    goodunitid: number
+    /// 内部成交方式[通道交易] - 1:净头寸 2:开平 3:平今
+    innerdealmode: number
+    /// 是否限制建仓量 - 0:不限制 1:限制
+    isbuylimited: number
+    /// 所属市场ID
+    marketid: number
+    /// 修改人
+    modifierid: number
+    /// 修改时间
+    modifytime: string
+    /// 外部成交方式[通道交易]- 1:净头寸 2:开平 3:平今
+    outerdealmode: number
+    /// 外部商品组代码[通道交易]
+    outergroupcode: string
+    /// 权利金小数位[场外期权]
+    premiumdecimalplace: number
+    /// 权利金点差方式[场外期权] 1:比率 2:固定
+    premiumspreadalgorithm: number
+    /// 权利金点差值[场外期权]
+    premiumspreadvalue: number
+    /// 成交量小数位
+    qtydecimalplace: number
+    /// 行情档位(1-10)
+    quotegear: number
+    /// 行情最小变动单位 [整数，报价小数位一起使用]
+    quoteminunit: number
+    /// 报价商ID[场外期权]
+    quoterid: number
+    /// 所属行情源分组ID[参考行情市场用\通道交易]
+    quotesourcegroupid: number
+    /// 同步合约数[通道交易-投资管理用] - 0表示不限
+    syncgoodsqty: number
+  }
+
+  /// 外部交易所
+  export interface ExternalExchange {
+    /// AutoID - SEQ_EXTERNALEXCHANGE
+    autoid: number
+    /// 外部交易所全称
+    exchangefullname: string
+    /// 外部交易所代码
+    exexchangecode: string
+    /// 外部交易所名称(简称)
+    exexchangename: string
+    /// 是否支持市价 - 0:不支持 1:支持
+    ismarketprice: number
+    /// 行情档位(1-10)
+    quotegear: number
+    /// 是否显示买卖经纪盘 - 0:不显示 1:显示
+    showbrokerflag: number
+    /// 更新时间
+    updatetime: string
+  }
+
+  /// 所属角色信息
+  export interface AreaRole {
+    /// 创建时间
+    createtime: string
+    /// 创建人ID
+    creatorid: number
+    /// 所属机构(组织机构)( OrgType = 1时为自己， = 2\3时取上级机构的所属机构)
+    fromuserid: number
+    /// 是否返还积分 [经纪会员-辽东湾] - 0:不返还 1:返还
+    isreturnscore: number
+    /// 修改人ID
+    modifierid: number
+    /// 修改时间
+    modifytime: string
+    /// 组织机构类型 1:机构\分支节点 2:交易员\叶子节点 3:部门\分支节点
+    orgtype: number
+    /// 外部账户[场外期权做市商]
+    outuserid: string
+    /// 上级组织机构(组织机构)
+    parentuserid: number
+    /// 角色类型 - 1:交易所 2:运营机构 3:营销中心 4:仓库机构 5:三方服务机构 6:自营会员 7:经纪会员 8:做市会员 9:产业会员 10:金融机构 11:商城店铺 12:子机构 13:报价商 14:积分服务商 15:供货商 16:圈内会员 17:物流机构 18:报价配置机构 19:场外期权做市商 20:组织机构 21:顶级机构 22:业务员 23:跟单员 24:交易员 25:客户 98:代理 99:门店
+    roletype: number
+    /// 顶级组织机构用户ID(组织机构)
+    rootuserid: number
+    /// 商城店铺登陆密码(商城店铺角色使用)
+    shoppassword: string
+    /// 组织机构层级路径(逗号分隔,首尾加逗号)
+    sublevelpath: string
+    /// 子机构类型(千海金) - 0:机构 1:代理 2:门店
+    suborgtype: number
+    /// 默认交易资金账号ID(做市会员被动接单使用、商城店铺默认资金账 号、圈内会员默认资金账号) - 作废， 使用UserReckonAccount
+    tradeaccountid: number
+    /// 物流地址(物流机构)
+    transurl: string
+    /// 机构用户ID其他做市关系，都设置为 1
+    userid: number
+  }
+
+  /// 资金账户信息请求
+  export interface TaAccountReq {
+    /// 登录账户
+    loginID: number
+    /// 账号类型 - 1:外部账号 2:内部账号 3:内部做市自营账号 4:内部做市接单账号
+    taAccountType?: number
+  }
+
+  /// 资金账户信息
+  export interface TaAccount {
+    /// 账户标识 - 0\1 (默认为0， 当上级账户与本账户的关联用户均为自己时更新为1)
+    accountflag: number
+    /// 资金账户ID
+    accountid: number
+    /// 账户名称
+    accountname: string
+    /// 期初余额
+    balance: number
+    /// 本金余额[外部子账户实际出入金余额]
+    capitalbalance: number
+    /// 变动标志(当前账户资金有任何变动更新为1系统结算时更新0;供清算时使用) 0：无变动 1：有变动
+    changeflag: number
+    /// 账户状态变更时间
+    changetime: string
+    /// 今日平仓盈亏
+    closepl: number
+    /// 今日授信减少
+    creditdecrease: number
+    /// 今日授信增加
+    creditincrease: number
+    /// 总市值(从持仓中统计)
+    curamount: number
+    /// 货币ID
+    currencyid: number
+    /// 期末余额
+    currentbalance: number
+    /// 手续费冻结
+    freezecharge: number
+    /// 冻结保证金
+    freezemargin: number
+    /// 所属上级账户
+    fromaccountid: number
+    /// 今日入金金额(包括三方入金)
+    inamount: number
+    /// 是否母账号 0:不是母账户 1:是母账户
+    ismain: number
+    /// 是否机构接单账号 0:不是 1:是
+    ismarketaccount: number
+    /// 是否机构分润账号 0:不是 1:是
+    isreckonaccount: number
+    /// 授信金额
+    mortgagecredit: number
+    /// 期初手续费冻结
+    orifreezecharge: number
+    /// 期初冻结保证金
+    orifreezemargin: number
+    /// 期初授信金额
+    orimortgagecredit: number
+    /// 期初其它授信金额
+    oriothercredit: number
+    /// 期初其他冻结保证金(出金冻结资金 交割买方冻结 申购冻结 全款买入 商城买入)
+    oriotherfreezemargin: number
+    /// 期初出金冻结
+    orioutamountfreeze: number
+    /// 期初占用保证金
+    oriusedmargin: number
+    /// 其它授信金额
+    othercredit: number
+    /// 今日其它授信减少
+    othercreditdecrease: number
+    /// 今日其它授信增加
+    othercreditincrease: number
+    /// 其他冻结保证金(交割买方冻结 申购冻结 全款买入 商城买入)
+    otherfreezemargin: number
+    /// 其他收入(交割收款 申购收款 全款卖出 商城卖出 买家退货 会员手续费收入)
+    otherincome: number
+    /// 其他支出(交割付款 申购付款 全款买入 商城买入 卖家退货)
+    otherpay: number
+    /// 今日出金金额(包括三方出金)
+    outamount: number
+    /// 出金冻结
+    outamountfreeze: number
+    /// 出金阈值
+    outthreshold: number
+    /// 所属根账号
+    parentaccountid: number
+    /// 今日手续费支出
+    paycharge: number
+    /// 关联用户交易权限状态 - 1:正常(可交易) 2:受限(可平仓，不可建仓) 3:冻结(不可交易)
+    relatedaccountstatus: number
+    /// 关联用户
+    relateduserid: number
+    /// 融资额(从融资合同中统计)
+    remainamount: number
+    /// 服务分组
+    serivcegroup: number
+    /// 签约状态 - 1:未签约 2:签约待审核 3:签约中 4:已签约 5:解约待审核 6:解约中 7:已解约 8:已解绑 9:绑卡中
+    signstatus: number
+    /// 账号层级路径(逗号分隔,首尾加逗号)
+    sublevelpath: string
+    /// 账号类型 - 1:外部账号 2:内部账号 3:内部做市自营账号 4:内部做市接单账号
+    taaccounttype: number
+    /// 今日三方入金
+    thirdinamount: number
+    /// 今日三方出金
+    thirdoutamount: number
+    /// 交易状态 - 1:正常 2:受限 3:冻结 4:禁止建仓(人工受限) 5:禁止交易(人工冻结) 6:待激活 7:已注销
+    tradestatus: number
+    /// 激活时间
+    tradestatuschangetime: string
+    /// 今日划转金额(母子账号资金划转，从划入账号为正，从账号划出为负)
+    transferamount: number
+    /// 占用保证金
+    usedmargin: number
+    /// 用户ID
+    userid: number
+  }
+
+  /// 汇率信息
+  export interface ExchangeRateConfig {
+    /// 目标币种ID
+    descurrencyid: number
+    /// 汇率
+    exchangerate: number
+    /// 源币种ID
+    oricurrencyid: number
+    /// 备注
+    remark: string
+  }
+}

GuangZuan/miniprogram/services/model/common.d.ts

@@ -0,0 +1,46 @@
+declare namespace GuangZuan {
+
+  /// 轮播图请求
+  export interface QueryImageConfigsReq {
+    /// 用户id
+    userId?: number,
+    /// 类型 - 1:App首页轮播 2:我的 3:首页(PC) 4:首页推广(移动-新会)
+    imageType?: number
+  }
+
+  /// 轮播图
+  export interface QueryImageConfigs {
+    /// 所属机构ID
+    areauserid: number
+    /// 配置ID(SEQ_SZDZ2_IMAGECONFIG)
+    configid: number
+    /// 创建时间
+    createdate: string
+    /// 创建人
+    creatorid: number
+    /// 详情图片 [UrlType = 3时 有且必填，其它类型不需要]
+    imagedetailpath: string
+    /// 图片
+    imagepath: string
+    /// 类型 - 1:首页轮播(移动) 2:我的(移动)
+    imagetype: number
+    /// 是否展示 - 0:不展示 1:展示
+    isshow: number
+    /// 市场ID
+    marketid: number
+    /// 操作人
+    modifierid: number
+    /// 排序
+    sort: number
+    /// 标题
+    title: string
+    /// 交易模式
+    trademode: number
+    /// 修改时间
+    updatedate: string
+    /// 链接(地址或商品ID)
+    url: string
+    /// 链接类型 - 1:直接地址 2:商品ID
+    urltype: number
+  }
+}

GuangZuan/miniprogram/services/utils.ts

@@ -0,0 +1,86 @@
+/// 获取履约步骤类型ID
+export function getSteptype(typeid: number): string {
+  switch (typeid) {
+    case 1:
+      return '买方支付'
+      break;
+    case 2:
+        return '卖方收款'
+        break;
+    case 3:
+      return '买方自提'
+      break;
+    case 4:
+      return '卖方发货'
+      break;
+    case 5:
+        return '买方确认货'
+        break;
+    case 6:
+      return '卖方发票'
+      break;
+    case 7:
+      return '买方确认票'
+      break;
+    case 8:
+        return '卖仓单转移'
+        break;
+    case 9:
+      return '释放卖方冻结'
+      break;
+    case 10:
+      return '货款溢短'
+      break;
+    case 11:
+        return '生成合同[中江]'
+        break;
+    case 12:
+      return '运费'
+      break;
+    case 90:
+      return '确认支付'
+      break;
+    case 91:
+        return '确认放行'
+        break;
+    default:
+      return '买方支付(直接扣款)'
+      break;
+  }
+}
+
+/// 获取履约状态
+export function getPerformancestatus(status: number): string {
+  switch (status) {
+    case 1:
+      return '待激活'
+      break;
+    case 2:
+        return '正常'
+        break;
+    case 3:
+      return '处理错误'
+      break;
+    case 4:
+      return '违约待处理'
+      break;
+    case 5:
+        return '违约处理中'
+        break;
+    case 6:
+      return '完成'
+      break;
+    case 7:
+      return '违约已完成'
+      break;
+    case 8:
+        return '释放冻结失败 '
+        break;
+    case 9:
+      return '超时待处理'
+      break;
+    default:
+      return '超时关闭'
+      break;
+  }
+}

GuangZuan/project.private.config.json

@@ -10,32 +10,26 @@
     "miniprogram": {
       "list": [
         {
-          "name": "我的",
-          "pathName": "pages/mine/mine",
+          "name": "钻石价格计算器",
+          "pathName": "mHome/pages/calculator/calculator",
           "query": "",
           "launchMode": "default",
-          "scene": null
+          "scene": null,
+          "partialCompile": {
+            "enabled": true,
+            "pages": []
+          }
         },
         {
-          "name": "购买询价",
-          "pathName": "mTrade/pages/buyinquiry/buyinquiry",
+          "name": "钻石搜索",
+          "pathName": "mHome/pages/search/search",
           "query": "",
           "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "商品详情",
-          "pathName": "mHome/pages/goodsdetail/goodsdetail",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "全部首饰",
-          "pathName": "mHome/pages/jewelry/jewelry",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
+          "scene": null,
+          "partialCompile": {
+            "enabled": true,
+            "pages": []
+          }
         }
       ]
     }