代码提交；

GuangZuan/miniprogram/app.json

@@ -40,14 +40,15 @@
       "pages": [
         "pages/bond/bond",
         "pages/inspection/inspection",
-        "pages/goldprice/goldprice",
-        "pages/exchangeRate/exchangeRate",
+        "pages/dayRate/dayRate",
         "pages/calculator/calculator",
         "pages/search/search",
         "pages/msg/msglist/msglist",
         "pages/msg/msgdetail/msgdetail",
         "pages/news/news",
-        "pages/goodsdetail/goodsdetail"
+        "pages/goodsdetail/goodsdetail",
+        "pages/cerserach/cerserach",
+        "pages/jewelry/jewelry"
       ]
     },
     {

GuangZuan/miniprogram/config/index.ts

@@ -1,4 +1,4 @@
 export const appConfig = {
   version: '1.0.0',
-  apiUrl: 'http://192.168.31.204:8080/cfg?key=test_204'
+  apiUrl: 'http://192.168.31.201:8080/cfg?key=test_201'
 }

GuangZuan/miniprogram/constants/enum/index.ts

@@ -1,6 +1,7 @@
 export * from './funcode'
 export * from './echarts'
 export * from './theme'
+export * from './language'
 
 /**
  * 枚举类型

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

@@ -32,7 +32,7 @@
       <text>国际报价</text>
       <input placeholder="请输入价格" value="{{price}}" type="digit"></input>
     </view>
-    <view class="exchangerate"> 
+    <view class="dayRate"> 
       <text>汇率</text>
       <input placeholder="请输入汇率" value="{{erate}}" type="digit"></input>
     </view>

GuangZuan/miniprogram/mHome/pages/cerserach/cerserach.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "钻石证书查询"
+}

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

@@ -0,0 +1,40 @@
+/* mHome/pages/cerserach/cerserach.wxss */
+
+.tab-view {
+  position: sticky;
+  top: 0;
+  z-index: 999;
+}
+
+.cers {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  margin-top: 15px;
+  justify-content: space-between;
+
+  button {
+    width: 23%;
+    font-size: 13px;
+    margin-bottom: 10px;
+  }
+
+  /* 选中时添加这个 样式 */
+  .active {
+    background: #dae9fd;
+  }
+  
+   /* 三角形 */
+  .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; 
+  }
+
+}

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

@@ -0,0 +1,127 @@
+// mHome/pages/cerserach/cerserach.ts
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    /// tabs
+    tabs: [{id: 1, name: '国际'}, 
+           {id: 2, name: '国内'}],
+    /// tab索引
+    active: 0,
+    /// 国际证书
+    ncers: [{id: 1, name: 'GIA', isCheck: true}, 
+            {id: 2, name: 'IGI', isCheck: false}, 
+            {id: 3, name: 'EGL', isCheck: false}, 
+            {id: 4, name: 'HRD', isCheck: false}, 
+            {id: 5, name: 'GRS', isCheck: false}, 
+            {id: 6, name: 'AGS', isCheck: false}, 
+            {id: 7, name: 'Gubelin', isCheck: false}, 
+            {id: 8, name: 'LOTUS', isCheck: false}, 
+            {id: 9, name: 'AIGS', isCheck: false}],
+    /// 国内证书
+    icers: [{id: 1, name: 'NGTC', isCheck: true}, 
+            {id: 2, name: 'BEIDA', isCheck: false}, 
+            {id: 3, name: 'GTC', isCheck: false}, 
+            {id: 4, name: 'GIC', isCheck: false}, 
+            {id: 5, name: 'NJQSIC', isCheck: false}, 
+            {id: 6, name: 'CCGTC', isCheck: false}, 
+            {id: 7, name: 'NGSTC', isCheck: false}, 
+            {id: 8, name: 'GDTC', isCheck: false}, 
+            {id: 9, name: 'NGDTC', isCheck: false}, 
+            {id: 10, name: 'CQT', isCheck: false}, 
+            {id: 11, name: 'GIB', isCheck: false}, 
+            {id: 12, name: 'CGJC', isCheck: false}, 
+            {id: 13, name: 'GGC', isCheck: false}]
+  },
+
+  /**
+   * tab触发事件
+   */
+  onTabChange(e: any) {
+    this.setData({
+      active: e.detail.index
+    })
+  },
+
+  /// 形状按钮点击事件
+  onButtonPressed(e: any) {
+    const index = e.target.id
+    this.data.active == 0 ? this.setData({
+      ncers: this.data.ncers.map(item => {
+        if (item.id == index) {
+          item.isCheck = true
+        } else {
+          item.isCheck = false
+        }
+        return item
+      }) 
+    }) : this.setData({
+      icers: this.data.icers.map(item => {
+        if (item.id == index) {
+          item.isCheck = true
+        } else {
+          item.isCheck = false
+        }
+        return item
+      }) 
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

GuangZuan/miniprogram/mHome/pages/cerserach/cerserach.wxml

@@ -0,0 +1,13 @@
+<!--mHome/pages/cerserach/cerserach.wxml-->
+
+<!-- tabs -->
+<view class="tab-view">
+  <van-tabs swipeable bind:change="onTabChange">
+    <van-tab wx:for="{{tabs}}" wx:for-item="itm" wx:key="id" id="{{itm.id}}" title="{{itm.name}}"/>
+  </van-tabs>  
+</view>
+
+<!-- 证书 -->
+<view class="cers">
+  <button wx:for="{{active == 0 ? ncers : icers}}" wx:for-item="itm" wx:for-index="idx" wx:key="id" class="cers-button {{itm.isCheck ? 'active' : ''}}" id="{{itm.id}}" bindtap="onButtonPressed">{{itm.name}}</button>
+</view>

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

@@ -1,4 +1,4 @@
-/* mHome/pages/exchangeRate/exchangeRate.wxss */
+/* mHome/pages/dayRate/dayRate.wxss */
 
 .base-currency {
   display: grid;

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

@@ -0,0 +1,71 @@
+// 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/exchangeRate/exchangeRate.wxml → GuangZuan/miniprogram/mHome/pages/dayRate/dayRate.wxml

@@ -1,4 +1,4 @@
-<!--mHome/pages/exchangeRate/exchangeRate.wxml-->
+<!--mHome/pages/dayRate/dayRate.wxml-->
 <view class="base-currency">
   <view class="title">
    <text>基准货币</text>
@@ -8,7 +8,7 @@
     <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="0" input-align="right"></van-field>
+      <van-field placeholder="请输入金额" input-align="right" bind:change="fieldChange" model:value="{{rate}}"></van-field>
       <text>人民币￥</text>
     </view>
   </view>
@@ -18,12 +18,12 @@
   <view class="title">
    <text>货币换算</text>
   </view>
-  <view class="ex-rate" wx:for="{{rates}}" wx:for-item="itm" wx:for-index="idx">
+  <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>USD</text>
+    <text>{{itm.name}}</text>
     <van-icon name="play"></van-icon>
     <view class="ex-result-rate">
-      <text>0.00</text>
+      <text>{{itm.value}}</text>
       <text>美元$</text>
     </view>
   </view>

GuangZuan/miniprogram/mHome/pages/goldPrice/goldPrice.json

@@ -1,5 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText": "黄金铂金价格查询",
-  "enablePullDownRefresh": true
-}

GuangZuan/miniprogram/mHome/pages/goldPrice/goldPrice.less

@@ -1,36 +0,0 @@
-/* mHome/pages/goldPrice/goldPrice.wxss */
-
-.container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-
-  .title {
-    font-size: 20px;
-    color: #333;
-    margin: 20px;
-  }
-
-  .scroll-view {
-    width: 90%;
-    border-radius: 20px;
-    height: 700px;
-  
-    .table_header, .table_content {
-      height: 44px;
-      display: flex;
-      border-bottom: 1px solid #f0f0f0;  
-      align-items: center;
-  }
-  
-    text {
-      font-size: 26rpx;
-      color: #333;
-      width: 25%;
-      text-align: center;
-    }
-  }
-}
-
-
-

GuangZuan/miniprogram/mHome/pages/goldPrice/goldPrice.ts

@@ -1,105 +0,0 @@
-// mHome/pages/goldPrice/goldPrice.ts
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    /// 底部安全区域
-    safeBottom: getApp().globalData.safeBottom,
-    /// 列头
-    headers: ['产品', '最新价', '涨跌价', '更新时间'],
-    /// 列表内容
-    values: [['黄金999', '373.15', '0.19', '2022-07-20'], 
-             ['黄金T+D', '373.15', '0.19', '2022-07-20'], 
-             ['m黄金T+D', '373.15', '0.19', '2022-07-20'], 
-             ['白银T+D', '373.15', '0.19', '2022-07-20'], 
-             ['黄金9995', '373.15', '0.19', '2022-07-20'], 
-             ['白金100g', '373.15', '0.19', '2022-07-20'],
-             ['黄金999', '373.15', '0.19', '2022-07-20'], 
-             ['黄金T+D', '373.15', '0.19', '2022-07-20'], 
-             ['m黄金T+D', '373.15', '0.19', '2022-07-20'], 
-             ['白银T+D', '373.15', '0.19', '2022-07-20'], 
-             ['黄金9995', '373.15', '0.19', '2022-07-20'], 
-             ['白金100g', '373.15', '0.19', '2022-07-20'],
-             ['黄金999', '373.15', '0.19', '2022-07-20'], 
-             ['黄金T+D', '373.15', '0.19', '2022-07-20'], 
-             ['m黄金T+D', '373.15', '0.19', '2022-07-20'], 
-             ['白银T+D', '373.15', '0.19', '2022-07-20'], 
-             ['黄金9995', '373.15', '0.19', '2022-07-20'], 
-             ['白金100g', '373.15', '0.19', '2022-07-20'],
-             ['黄金999', '373.15', '0.19', '2022-07-20'], 
-             ['黄金T+D', '373.15', '0.19', '2022-07-20'], 
-             ['m黄金T+D', '373.15', '0.19', '2022-07-20'], 
-             ['白银T+D', '373.15', '0.19', '2022-07-20'], 
-             ['黄金9995', '373.15', '0.19', '2022-07-20'], 
-             ['白金100g', '373.15', '0.19', '2022-07-20'],
-             ['黄金999', '373.15', '0.19', '2022-07-20'], 
-             ['黄金T+D', '373.15', '0.19', '2022-07-20'], 
-             ['m黄金T+D', '373.15', '0.19', '2022-07-20'], 
-             ['白银T+D', '373.15', '0.19', '2022-07-20'], 
-             ['黄金9995', '373.15', '0.19', '2022-07-20'], 
-             ['白金100g', '373.15', '0.19', '2022-07-20'],
-             ['黄金999', '373.15', '0.19', '2022-07-20'], 
-             ['黄金T+D', '373.15', '0.19', '2022-07-20'], 
-             ['m黄金T+D', '373.15', '0.19', '2022-07-20'], 
-             ['白银T+D', '373.15', '0.19', '2022-07-20'], 
-             ['黄金9995', '373.15', '0.19', '2022-07-20']]
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

GuangZuan/miniprogram/mHome/pages/goldPrice/goldPrice.wxml

@@ -1,20 +0,0 @@
-<!--mHome/pages/goldPrice/goldPrice.wxml-->
-
-<!-- container -->
-<view class="container">
-  <!-- title -->
-  <view class="title"><text>最新黄金铂金价格查询</text></view>
-  <!-- 滚动视图 -->
-  <scroll-view class="scroll-view" style="margin-bottom: {{safeBottom}}px;" scroll-y scroll-with-animation>
-    <!-- 列头 -->
-    <view class="table_header"><text wx:for="{{headers}}" wx:key="index">{{item}}</text></view>
-
-    <!-- 内容 -->
-    <view class="table_content" wx:for="{{values}}" wx:for-item="row" wx:key="index">
-      <text wx:for="{{row}}" wx:for-item="value" wx:key="index">{{value}}</text>
-    </view>
-  </scroll-view>
-</view>
-
-
-

GuangZuan/miniprogram/mHome/pages/goodsdetail/goodsdetail.less

@@ -13,7 +13,7 @@
     display: flex;
     flex-direction: column;
     width: 100%;
-    margin-top: 20px;
+    margin-top: 10px;
     background-color: #eee;
 
     view:nth-child(1) {

GuangZuan/miniprogram/mHome/pages/goodsdetail/goodsdetail.ts

@@ -1,4 +1,5 @@
 // mHome/pages/goodsdetail/goodsdetail.ts
+
 Page({
 
   /**
@@ -10,44 +11,34 @@ Page({
   },
 
   /// 返回上层视图
-  backToParent(){
+  backToParent() {
     wx.navigateBack()
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad() {
-
-  },
+  onLoad() {},
 
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady() {
-
-  },
+  onReady() {},
 
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow() {
-
-  },
+  onShow() {},
 
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide() {
-
-  },
+  onHide() {},
 
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload() {
-
-  },
+  onUnload() {},
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作

GuangZuan/miniprogram/mHome/pages/goodsdetail/goodsdetail.wxml

@@ -5,7 +5,7 @@
   <image class="goods-img" mode="widthFix" src="https://t7.baidu.com/it/u=963301259,1982396977&fm=193&f=GIF"></image>
 
   <!-- 成批裸钻CSZS001000001 -->
-  <view class="bulk-diamond" wx:if="{{true}}">
+  <view class="bulk-diamond" wx:if="{{false}}">
     <!-- 形状 -->
     <view class="bulk-diamond-type">
       <view>
@@ -47,7 +47,7 @@
   </view>
 
   <!-- 单颗裸钻CSZS001000001 -->
-  <view class="single-diamond" wx:if="{{true}}">
+  <view class="single-diamond" wx:if="{{false}}">
     <!-- 形状 -->
     <view class="single-diamond-type">
       <view>
@@ -89,7 +89,7 @@
   </view>
 
   <!-- 成批毛坯CSZS001000001 -->
-  <view class="bulk-workblank-diamond" wx:if="{{true}}">
+  <view class="bulk-workblank-diamond" wx:if="{{false}}">
     <!-- 形状 -->
     <view class="bulk-workblank-diamond-type">
       <view>
@@ -134,7 +134,7 @@
   </view>
 
    <!-- 钻石首饰CSZS001000001 -->
-   <view class="jewelry-diamond">
+  <view class="jewelry-diamond" wx:if="{{true}}">
     <!-- 形状 -->
     <view class="jewelry-diamond-type">
       <view>
@@ -183,7 +183,7 @@
   </view>
 
   <!-- 彩色裸钻CSZS001000001 -->
-  <view class="color-diamond" wx:if="{{true}}">
+  <view class="color-diamond" wx:if="{{false}}">
     <!-- 形状 -->
     <view class="color-diamond-type">
       <view>

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

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "van-search": "@vant/weapp/search/index"
+  },
+  "navigationBarTitleText": "全部首饰"
+}

GuangZuan/miniprogram/mHome/pages/jewelry/jewelry.less

@@ -0,0 +1,46 @@
+/* mHome/pages/jewelry/jewelry.wxss */
+
+Page {
+  background-color: #f6f6f6;
+}
+
+.goodscard {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  flex-wrap: wrap;
+  align-items: center;
+  align-content: center;
+  
+  .goodscard-item {
+    width: 47%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    background-color: white;
+    border-radius: 10px;
+    margin-top: 15px;
+    box-shadow: 10px 10px 10px #ddd;
+
+    .goods-icon {
+      width: 100%;
+      height: 600px;
+      border-radius: 10px 10px 0px 0px;
+    }
+
+    .goods-title {
+      font-size: 13px;
+      color: #333;
+      margin: 10px 10px 0px 10px;
+      text-align: left;
+      height: 50px;
+    }
+
+    .goods-price {
+      font-size: 16px;
+      color: orange;
+      margin: 10px 0px 20px 10px;
+    }
+  }
+}
+

GuangZuan/miniprogram/mHome/pages/exchangeRate/exchangeRate.ts → GuangZuan/miniprogram/mHome/pages/jewelry/jewelry.ts

@@ -1,12 +1,12 @@
-// mHome/pages/exchangeRate/exchangeRate.ts
+// mHome/pages/jewelry/jewelry.ts
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-     /// 汇率数据 
-     rates: ['', '', '', '', '', '', '']
+    /// 底部安全区域
+    safeBottom: getApp().globalData.safeBottom,
   },
 
   /**

GuangZuan/miniprogram/mHome/pages/jewelry/jewelry.wxml

@@ -0,0 +1,55 @@
+<!--mHome/pages/jewelry/jewelry.wxml-->
+<!-- 搜索视图 -->
+<view class="search-view">
+  <van-search model:value="{{GIA}}" shape="round" placeholder="搜索首饰" bind:change="onChange" bind:search="onSearch"></van-search>  
+</view> 
+
+<view class="goodscard" style="padding-bottom: {{safeBottom}}px;">
+ <view class="goodscard-item">
+   <image class="goods-icon" mode="widthFix" src="https://img.yzcdn.cn/vant/cat.jpeg"></image>
+   <text class="goods-title">发贺卡好烦人康复科热凤凰卡热咖啡柯荣峰热咖啡</text>
+   <text class="goods-price">￥98898.00</text>
+ </view>
+
+ <view class="goodscard-item">
+   <image class="goods-icon" mode="widthFix" src="https://img.yzcdn.cn/vant/cat.jpeg"></image>
+   <text class="goods-title">发贺卡好烦人发贺卡好烦人康复科热凤凰卡发贺人康</text>
+   <text class="goods-price">￥98898.00</text>
+ </view>
+
+ <view class="goodscard-item">
+   <image class="goods-icon" mode="widthFix" src="https://img.yzcdn.cn/vant/cat.jpeg"></image>
+   <text class="goods-title">发贺卡好烦人发贺卡好烦人康复科热凤凰卡发贺人康</text>
+   <text class="goods-price">￥98898.00</text>
+ </view>
+
+ <view class="goodscard-item">
+   <image class="goods-icon" mode="widthFix" src="https://img.yzcdn.cn/vant/cat.jpeg"></image>
+   <text class="goods-title">发贺卡好烦人发贺卡好烦人康复科热凤凰卡发贺人康</text>
+   <text class="goods-price">￥98898.00</text>
+ </view>
+
+ <view class="goodscard-item">
+   <image class="goods-icon" mode="widthFix" src="https://img.yzcdn.cn/vant/cat.jpeg"></image>
+   <text class="goods-title">发贺卡好烦人康复科热凤凰卡热咖啡柯荣峰热咖啡</text>
+   <text class="goods-price">￥98898.00</text>
+ </view>
+
+ <view class="goodscard-item">
+   <image class="goods-icon" mode="widthFix" src="https://img.yzcdn.cn/vant/cat.jpeg"></image>
+   <text class="goods-title">发贺卡好烦人发贺卡好烦人康复科热凤凰卡发贺人康</text>
+   <text class="goods-price">￥98898.00</text>
+ </view>
+
+ <view class="goodscard-item">
+   <image class="goods-icon" mode="widthFix" src="https://img.yzcdn.cn/vant/cat.jpeg"></image>
+   <text class="goods-title">发贺卡好烦人发贺卡好烦人康复科热凤凰卡发贺人康</text>
+   <text class="goods-price">￥98898.00</text>
+ </view>
+
+ <view class="goodscard-item">
+   <image class="goods-icon" mode="widthFix" src="https://img.yzcdn.cn/vant/cat.jpeg"></image>
+   <text class="goods-title">发贺卡好烦人发贺卡好烦人康复科热凤凰卡发贺人康</text>
+   <text class="goods-price">￥98898.00</text>
+ </view>
+</view>

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

@@ -119,8 +119,6 @@ Page({
   onChange(e: any) {
     console.log(e)
     switch (e.target.id) {
-      case 'shape':   /// 形状
-        break;
       default:
         break;
     }

GuangZuan/miniprogram/mHome/pages/search/search.wxml

@@ -92,7 +92,7 @@
    <view class="cell-view currency"> 
     <text>货币</text>
     <view class="currency-radio">
-      <van-radio-group value="{{ currency }}" direction="horizontal" bind:change="onChange">
+      <van-radio-group value="{{currency}}" direction="horizontal" bind:change="onChange">
         <van-radio name="RMB">人民币</van-radio>
         <van-radio name="DOLLAR">美元</van-radio>
       </van-radio-group>

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

@@ -18,44 +18,32 @@ Page({
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady() {
-
-  },
+  onReady() {},
 
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow() {
-
-  },
+  onShow() {},
 
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide() {
-
-  },
+  onHide() {},
 
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload() {
-
-  },
+  onUnload() {},
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh() {
-
-  },
+  onPullDownRefresh() {},
 
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom() {
-
-  },
+  onReachBottom() {},
 
   /**
    * 用户点击右上角分享

GuangZuan/miniprogram/mMine/pages/myinventorys/myinventorys.less

@@ -23,7 +23,6 @@
   flex-direction: row;
   align-content: center;
   align-items: center;
-  height: 110px;
   border-bottom: 1px solid #ddd;
 
   .list-item-left, .list-item-right {
@@ -31,10 +30,11 @@
     flex-direction: column;
     align-items: center;
     align-content: center;
+    padding-bottom: 10px;
   }
 
   .list-item-left {
-    width: 60%;
+    width: 80%;
   }
 
   .list-item-right {

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

@@ -1,3 +1,5 @@
+import { queryMyWRPosition } from "../../../services/api/orders/index";
+
 // moduleMine/pages/myinventorys/myinventorys.ts
 Page({
 
@@ -5,54 +7,81 @@ Page({
    * 页面的初始数据
    */
   data: {
+    /// 底部安全区域
+    safeBottom: getApp().globalData.safeBottom,
     /// tab激活索引
     active: 0,
     /// tabs
-    tabs: [{id: 1, name: '成批裸钻'}, 
-           {id: 2, name: '单颗裸钻'}, 
-           {id: 3, name: '成批毛坯'}, 
-           {id: 4, name: '钻石首饰'}, 
-           {id: 5, name: '彩色钻石'}],
+    tabs: [{id: 1, name: '单颗裸钻'}, 
+           {id: 2, name: '钻石首饰'}, 
+           {id: 3, name: '彩色钻石'}],
     /// 列头
-    titles: ['形状', '总价', '克拉单价', '颜色', '净度', '仓库', '总重量', '库存重量'],
+    titles: ['形状', '价格', '克拉单价', '颜色', '净度', '克拉重量', '冻结重量'],
+    /// 查询数据
+    datas: [{}],
+    /// 数据是否为空
+    isEmpty: false
   },
 
   /**
    * tab触发事件
    */
   onTabChange(e: any) {
+    /// 设置激活项
+    this.setData({
+      active: e.detail.index
+    })
     switch (e.detail.index) {
-      case 0:  /// 成批裸钻
-        this.setData({
-          /// 列头  
-          titles: ['形状', '总价', '克拉单价', '颜色', '净度', '仓库', '总重量', '库存重量'],
-          active: e.detail.index
-        })
-        break;
-      case 1 || 4:  /// 单颗裸钻 彩色钻石
+      case 0 || 2:  /// 单颗裸钻 彩色钻石
         this.setData({
           /// 列头  
           titles: ['形状', '价格', '克拉单价', '颜色', '净度', '克拉重量', '冻结重量'],
           active: e.detail.index
         })
         break;
-      case 2:  /// 成批毛坯
-        this.setData({
-          /// 列头  
-          titles: ['晶型', '总价', '克拉单价', '颜色', '净度', '仓库', '总重量', '库存重量'],
-          active: e.detail.index
-        })
-        break;
-      case 3:  /// 首饰
+      default: /// 首饰
         this.setData({
           /// 列头  
           titles: ['主石形状', '款式', '价格', '主石颜色', '主石净度', '主石切工', '主石重量'],
           active: e.detail.index
         })
         break;
-      default:
-        break;
     }
+    /// 查询我的库存
+    this.queryMyWRPosition(e.detail.index+1)
+  },
+
+  /// 查询我的库存
+  queryMyWRPosition(zscategory: number) {
+    /// loding
+    wx.showLoading({ title: '数据请求中' })
+    /// 查询我的库存
+    queryMyWRPosition({
+      data: {
+        zscategory: zscategory,
+        wruserid: wx.getStorageSync('UserId')
+      },
+      success: (res) => {
+        console.log(res)
+        /// 请求失败
+        if (res.code != 200) {
+          wx.showToast({ icon: 'error', title: '请求失败，原因：'+res.msg })
+          return
+        }
+        /// 设置数据
+        this.setData({
+          /// 数据信息
+          datas: res.data,
+          isEmpty: res.data.length == 0
+        })
+      },
+      fail: () => {
+        wx.showToast({title: '查询失败', icon: 'error'})
+      },
+      complete: () => {
+        wx.hideLoading()
+      }
+    })
   },
 
   /**
@@ -73,7 +102,8 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    /// 查询我的库存
+    this.queryMyWRPosition(1)
   },
 
   /**
@@ -94,7 +124,8 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh() {
-
+    /// 查询我的库存
+    this.queryMyWRPosition(this.data.active+1)
   },
 
   /**

GuangZuan/miniprogram/mMine/pages/myinventorys/myinventorys.wxml

@@ -13,22 +13,36 @@
     <text class="title-view-text" wx:for="{{titles}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx" id="idx">{{itm}}</text>
   </view>
 
-  <!-- 列表项 --> 
-  <view class="list-item">
+  <!-- 单颗裸钻 彩色钻石 --> 
+  <view class="list-item" wx:for="{{datas}}" wx:for-item="data" wx:key="ladingbillid" wx:if="{{active != 1}}">
     <view class="list-item-left">
-      <text>公主方形(Princess)</text>
-      <text>￥21,002.00</text>
-      <text>￥21,002.00</text>
+      <text>{{data.zsshapetypedisplay}}</text>
+      <text>￥{{data.price}}</text>
+      <text>￥{{data.priceper}}</text>
     </view>
     <view class="list-item-right">
-      <text>E-J | FL-VS1 | SZ001 | 10.00 | 10.00</text>
-      <text>平均单颗重量：0.50</text>
-      <text>冻结重量       ：0.00</text>
-      <text>商品编号: a0031D001</text>
+      <text>{{data.zscolortype1display}} | {{data.zscolortype2display}} | {{data.zsclaritytype1display}} | {{data.zsclaritytype2display}}</text>
+      <text>平均单颗重量：{{data.weightavg}}</text>
+      <text>冻结重量: {{data.ffreezeqty}}</text>
+      <text>商品编号: {{data.goodsno}}</text>
     </view>
   </view>
 
-
+  <!-- 钻石首饰 --> 
+<view class="list-item" wx:for="{{datas}}" wx:for-item="data" wx:key="ladingbillid" wx:if="{{active == 1}}">
+    <view class="list-item-left">
+      <text>{{data.zsshapetypedisplay}}</text>
+      <text>{{data.zsshapetypedisplay}}</text>
+      <text>￥{{data.price}}</text>
+    </view>
+    <view class="list-item-right">
+      <text>{{data.zscolortype1display}} | {{data.zsclaritytype1display}} | {{data.zscuttype1display}} | {{data.weight}} </text>
+      <text>冻结重量：{{data.ffreezeqty}}</text>
+      <text>仓库：{{data.warehousenamedisplay}}</text>
+      <text>卖家       ：xxx</text>
+      <text>商品编号: {{data.goodsno}}</text>
+    </view>
+  </view>
 </scroll-view>
 
-<van-empty wx:if="{{false}}" class="custom-image" description="无数据"/>
+<van-empty wx:if="{{isEmpty}}" class="custom-image" description="无数据"/>

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

@@ -1,10 +1,15 @@
 // pages/mine/myorders/myorders.ts
+
+import {queryMySellOrder, queryMyBuyOrder, queryMyDeListing} from '../../../services/api/orders/index'
+
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
+    /// 底部安全区域
+    safeBottom: getApp().globalData.safeBottom,
     /// 列头
     tabs: [{id: 1, name: '我的出售'}, 
            {id: 2, name: '我的求购'}, 
@@ -16,19 +21,173 @@ Page({
     selectRow: -1,
     /// 列表总宽度
     totalWidth: 0,
+    /// 查询数据
+    datas: [{}],
     /// 列表宽度
-    widths: [60, 60, 80, 110, 80, 80, 80],
+    widths: [0],
     /// 列头
-    titles: ['状态', '挂牌方', '商品分类/编号', '委托量', '委托价', '成交数量'],
+    titles: [''],
     /// 内容
-    values: [['圆形', 'E-J', 'FL-VS1', '￥21002.00', '10.04', '0.51']],
+    values: <any>[[]]
+  },
+
+  /// 查询我的求购
+  queryMyBuyOrder() {
+    /// loding
+    wx.showLoading({ title: '数据请求中' })
+
+    /// 数据查询请求
+    queryMyBuyOrder({
+      data: {
+        userid: wx.getStorageSync('UserId')
+      },
+      success: (res) => {
+        /// 请求失败
+        if (res.code != 200) {
+          wx.showToast({ icon: 'error', title: '请求失败，原因：'+res.msg })
+          return
+        }
+        /// 设置数据
+        this.setData({
+          /// 设置列头
+          titles: ['会员', '商品分类', '求购信息', '状态', '有效日'],
+          /// 重置宽度
+          widths: [80, 80, 150, 80, 120],
+          /// 数据信息
+          datas: res.data,
+          /// 设置数值
+          values: res.data.map(obj => {
+            return ['xxxx',
+                    obj.zscategorydisplay, 
+                    obj.zssymmetrytypedisplay, 
+                    obj.wrtradeorderstatus, 
+                    obj.validtime]
+          }),
+          isEmpty: res.data.length == 0
+        })
+        /// 计算整个宽度
+        this.calculateTotalWidth()
+      },
+      fail: () => {
+        wx.showToast({ icon: 'error', title: '请求失败，原因：接口请求失败' })
+      },
+      complete: () => { wx.hideLoading() }
+    })
+  },
+
+  /// 查询我的出售
+  queryMySellOrder() {
+    /// loding
+    wx.showLoading({ title: '数据请求中' })
+
+    /// 数据查询请求
+    queryMySellOrder({
+      data: {
+        userid: wx.getStorageSync('UserId')
+      },
+      success: (res) => {
+        console.log(res)
+        /// 请求失败
+        if (res.code != 200) {
+          wx.showToast({ icon: 'error', title: '请求失败，原因：'+res.msg })
+          return
+        }
+        /// 设置数据
+        this.setData({
+          /// 设置列头
+          titles: ['状态', '挂牌方', '商品分类/编号', '委托量', '委托价', '成交数量', '委托时间'],
+          /// 重置宽度
+          widths: [60, 60, 100, 110, 90, 90, 150],
+          /// 数据信息
+          datas: res.data,
+          /// 设置数值
+          values: res.data.map(obj => {
+            return [obj.wrtradeorderstatus, 
+                    'xxx', 
+                    obj.zscategorydisplay+'\n'+obj.goodsno, 
+                    obj.totalqty, 
+                    obj.tradeprice, 
+                    obj.selledqty, 
+                    obj.ordertime]
+          }),
+          isEmpty: res.data.length == 0
+        })
+        /// 计算整个宽度
+        this.calculateTotalWidth()
+      },
+      fail: (er) => {
+        console.log(er)
+        wx.showToast({ icon: 'error', title: '请求失败，原因：接口请求失败' })
+      },
+      complete: () => { wx.hideLoading() }
+    })
+  },
+
+  /// 查询我的摘牌
+  queryMyDeListing() {
+    /// loding
+    wx.showLoading({ title: '数据请求中' })
+
+    /// 数据查询请求
+    queryMyDeListing({
+      data: {
+        userid: wx.getStorageSync('UserId')
+      },
+      success: (res) => {
+        console.log(res)
+        /// 请求失败
+        if (res.code != 200) {
+          wx.showToast({ icon: 'error', title: '请求失败，原因：'+res.msg })
+          return
+        }
+        
+        /// 设置数据
+        this.setData({
+          /// 设置列头
+          titles: ['商品分类', '商品编号', '方向', '对手方', '成交重量', '成交价格', '成交金额'],
+          /// 重置宽度
+          widths: [80, 100, 80, 80, 80, 80, 80],
+          /// 数据信息
+          datas: res.data,
+          /// 设置数值
+          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()
+      },
+      fail: () => {
+        wx.showToast({ icon: 'error', title: '请求失败，原因：接口请求失败' })
+      },
+      complete: () => { wx.hideLoading() }
+    })
   },
 
   /**
    * tabbar点击事件
    */
   onTabChange(e: any) {
-    console.log(e)
+    switch (e.detail.index) {
+      case 0: /// 查询我的出售
+        this.queryMySellOrder()
+        break;
+      case 1: /// 查询我的求购
+        this.queryMyBuyOrder()
+        break;
+      case 2: /// 查询我的摘牌
+        this.queryMyDeListing()
+        break;
+      default:
+        break;
+    }
   },
 
   /**
@@ -62,68 +221,55 @@ Page({
     }
   },
 
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad() {
+  /// 计算整个宽度
+  calculateTotalWidth() {
     /// 计算总高度
     let num = 0.0
-    this.data.widths.forEach(function(v) {
-      num += v
-    })
-
-    this.setData({
-      /// 设置总高度
-      totalWidth: num
-    })
+    this.data.widths.forEach(function(v) { num += v })
+    /// 设置总高度
+    this.setData({ totalWidth: num })
   },
 
   /**
-   * 生命周期函数--监听页面初次渲染完成
+   * 生命周期函数--监听页面加载
    */
-  onReady() {
+  onLoad() {},
 
-  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {},
 
   /**
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    /// 查询我的出售
+    this.queryMySellOrder()
   },
 
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide() {
-
-  },
+  onHide() {},
 
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload() {
-
-  },
+  onUnload() {},
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh() {
-
-  },
+  onPullDownRefresh() {},
 
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom() {
-
-  },
+  onReachBottom() {},
 
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage() {
-
-  }
+  onShareAppMessage() {}
 })

GuangZuan/miniprogram/mMine/pages/myorders/myorders.wxml

@@ -7,7 +7,7 @@
   </van-tabs>  
 </view>
 
-<scroll-view class="scroll-view" scroll-x enable-flex>
+<scroll-view class="scroll-view" scroll-x enable-flex style="padding-bottom: {{safeBottom}}px;">
   <!-- 列头 -->
   <view 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>

GuangZuan/miniprogram/mMine/pages/settings/settings.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-dialog": "@vant/weapp/dialog/index"
   },
   "navigationBarTitleText": "系统设置"
 }

GuangZuan/miniprogram/mMine/pages/settings/settings.ts

@@ -1,5 +1,7 @@
 // moduleMine/pages/settings/settings.ts
 
+import Dialog from '@vant/weapp/dialog/dialog';
+
 Page({
 
   /**
@@ -13,60 +15,53 @@ Page({
    * 系统登出响应
    */
   onLoginOut() {
-    // on confirm
-    wx.reLaunch({
-      url: '/pages/login/login'
-    })
+    Dialog.confirm({
+      title: '提示',
+      message: '确定要退出系统吗？',
+    }).then(() => {
+        // on confirm
+        wx.reLaunch({
+          url: '/pages/login/login'
+        })
+    }).catch(() => {
+        // on cancel
+    });
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad() {
-
-  },
+  onLoad() {},
 
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady() {
-
-  },
+  onReady() {},
 
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow() {
-
-  },
+  onShow() {},
 
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide() {
-
-  },
+  onHide() {},
 
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload() {
-
-  },
+  onUnload() {},
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh() {
-
-  },
+  onPullDownRefresh() {},
 
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom() {
-
-  },
+  onReachBottom() {},
 
   /**
    * 用户点击右上角分享

GuangZuan/miniprogram/mTrade/pages/listingbuy/listingbuy.json

@@ -2,7 +2,9 @@
   "usingComponents": {
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
-    "num-range": "/components/num-range/num-range"
+    "num-range": "/components/num-range/num-range",
+    "van-radio": "@vant/weapp/radio/index",
+    "van-radio-group": "@vant/weapp/radio-group/index"
   },
   "navigationBarTitleText": "我要求购",
   "enablePullDownRefresh": false

GuangZuan/miniprogram/mTrade/pages/listingbuy/listingbuy.less

@@ -1,10 +1,22 @@
 /* pages/trade/listingbuy/listingbuy.wxss */
 
+.container {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+}
+
+.tab-view {
+  position: sticky;
+  top: 0;
+  z-index: 999;
+}
+
 .cell-view {
   display: flex;
   border-bottom: 1px solid #f0f0f0;
   align-items: center;
-  margin: 0px 10px 0px 15px;
+  margin: 0px 10px;
 
   text {
     width: 90px;
@@ -13,102 +25,94 @@
     font-size: 26rpx;
   }
 
-  view {
+  .content {
     display: flex;
+    flex-direction: row;
     flex-wrap: wrap;
     width: 100%;
+    align-content: center;
 
     button {
       margin: 5px;
-      height: 36px;
+      height: 33px;
       color: #333;
-      width: 21.3%;
+      width: 21.8%;
+      border-radius: 5px;
+    }
+
+    /* 选中时添加这个 样式 */
+    .active {
+      background: #dae9fd;
+    }
+    
+     /* 三角形 */
+    .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: 24rpx;
-    border-radius: 5px;
   }
 }
 
+.size view {
+  flex-wrap: nowrap;
+  text-align: center;
+}
+
 .shape, .color {
-  height: 150px;
+  height: 140px;
 }
 
-.neatness, .certificate {
+.neatness, .jingxing {
   height: 100px;
 }
 
-.qiegong, .duicheng, .polishing, .yingguang, .tradeaccount, .weight, .price, .huoqi, .amunt, .margin, .kanai {
+.qiegong, .duicheng, .polishing, .yingguang, .prestyle, .currency, .size, .product {
   height: 60px;
 }
 
-.huoqi-left, .huoqi-right {
-  height: 100%;
-
-  input{
-    font-size: 14px;
-    color: #333;
-  }
-}
-
-.huoqi-left {
-  text {
-    width: 90px;
-  }
-}
-
-.huoqi-right {
-  text {
-    width: 40px;
-  }
-}
-
-.huoqi view {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  justify-content: start;
-  align-items: center;
-  align-content: center;
-}
-
-.weight, .price {
-  view {
-    flex-wrap: nowrap;
-    text-align: center;
+.prestyle {
+  button {
+    border: 1rpx solid #f0f0f0;
   }
 }
 
 .submit-view {
   display: flex;
   flex-direction: row;
-  justify-content: space-around;
-  align-items: center;
+  justify-content: space-between;
   margin-top: 20px;
 
   button {
     width: 45%;
-    font-size: 28rpx;
-    color: #fff;
-    padding: 10rpx;
+    color: white;
   }
 
-
-button:nth-child(1) {
-  background-color: red;
-}
-
-button:nth-child(2) {
-  background-color: green;
-}
+  button:nth-child(1) {
+    background-color: red;
+  }
+  
+  button:nth-child(2) {
+    background-color: purple;
+  }
 }
 
 num-range {
   width: 100%;
   height: 100%;
   display: flex;
+  flex-direction: row;
   align-items: center;
-}
+  align-content: center;
+}

GuangZuan/miniprogram/mTrade/pages/listingbuy/listingbuy.ts

@@ -8,60 +8,216 @@ Page({
   data: {
     /// 底部安全区域
     safeBottom: getApp().globalData.safeBottom,
+    /// tabs
+    tabs: [{id: 1, name: '成批裸钻'}, 
+           {id: 2, name: '单颗裸钻'}, 
+           {id: 3, name: '成批毛坯'}, 
+           {id: 4, name: '钻石首饰'}, 
+           {id: 5, name: '彩色钻石'}],
+    /// tab索引
+    active: 0,
+    /// 款式
+    styles: [{id: 1, name: '戒指', isCheck: true}, 
+             {id: 2, name: '吊坠', isCheck: false}, 
+             {id: 3, name: '耳环', isCheck: false}, 
+             {id: 4, name: '手镯', isCheck: false}, 
+             {id: 5, name: '其他', isCheck: false}],
+    /// 选中形状         
+    style: '戒指',
     /// 形状
-    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: '马眼'}],
+    shapes: [{id: 1, name: '圆形', isCheck: true}, 
+             {id: 2, name: '公主方', isCheck: false}, 
+             {id: 3, name: '祖母绿', isCheck: false}, 
+             {id: 4, name: '垫形', isCheck: false}, 
+             {id: 5, name: '阿斯切', isCheck: false}, 
+             {id: 6, name: '心形', isCheck: false}, 
+             {id: 7, name: '梨形', isCheck: false}, 
+             {id: 8, name: '雷迪恩', isCheck: false}, 
+             {id: 9, name: '椭圆', isCheck: false}, 
+             {id: 10, name: '马眼', isCheck: false}],
     /// 选中形状         
     shape: '圆形',
     /// 颜色
-    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'}],
-    /// 选中形状
+    colors: [{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: '',
-    /// 切工 对称 抛光
-    qiegongs: [{id: 1, name: 'EX'}, 
-              {id: 2, name: 'VG'}, 
-              {id: 3, name: 'G'}],
-    /// 选中切工 对称 抛光
+    /// 切工 
+    qiegongs: [{id: 1, name: 'EX', isCheck: true}, 
+              {id: 2, name: 'VG', isCheck: false}, 
+              {id: 3, name: 'G', isCheck: false}],
+    /// 选中切工
     qiegong: '',
+    /// 晶体 
+    jingxings: [{id: 1, name: 'Makeable', isCheck: true}, 
+                {id: 2, name: 'Sawable', isCheck: false}, 
+                {id: 3, name: 'Heart', isCheck: false},
+                {id: 4, name: 'Melee', isCheck: false}, 
+                {id: 5, name: 'Trilliant', isCheck: false}, 
+                {id: 6, name: 'Mixed', isCheck: false},
+                {id: 7, name: 'Others', isCheck: false}],
+    /// 选中晶体
+    jingxing: '',
+    /// 对称
+    duichengs: [{id: 1, name: 'EX', isCheck: true}, 
+              {id: 2, name: 'VG', isCheck: false}, 
+              {id: 3, name: 'G', isCheck: false}],
+    /// 选中对称
     duicheng: '',
+    ///  抛光
+    paoguangs: [{id: 1, name: 'EX', isCheck: true}, 
+                {id: 2, name: 'VG', isCheck: false}, 
+                {id: 3, name: 'G', isCheck: false}],
+    /// 选中抛光
     paoguang: '',
     /// 莹光
-    yingguangs: [{id: 1, name: 'N'}, 
-                 {id: 2, name: 'VSL/F'}, 
-                 {id: 3, name: 'M'}, 
-                 {id: 4, name: 'S'}],
+    yingguangs: [{id: 1, name: 'N', isCheck: true}, 
+                 {id: 2, name: 'VSL/F', isCheck: false}, 
+                 {id: 3, name: 'M', isCheck: false}, 
+                 {id: 4, name: 'S', isCheck: false}],
     /// 选中莹光
     yingguang: '',
     /// 净度
-    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: 'l1'}],
+    neatness: [{id: 1, name: 'FL/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: 'l1', isCheck: false}],
     /// 选中净度
     neatnes: '',
   },
 
   /**
+   * tab触发事件
+   */
+  onTabChange(e: any) {
+    this.setData({
+      active: e.detail.index
+    })
+  },
+
+  /// 单选框
+  onChange(e: any) {
+    console.log(e)
+    switch (e.target.id) {
+      default:
+        break;
+    }
+  },
+
+  /// 形状按钮点击事件
+  onButtonPressed(e: any) {
+    const ids = (<string> e.target.id).split(' ')
+    let id = (<string> e.target.id).split(' ')[0]
+    const index = <number> <unknown>ids[1]
+    console.log(ids)
+    switch (id) {
+      case 'shape':   /// 形状
+        this.setData({ shapes: this.data.shapes.map(item => {
+          if (item.id == index) {
+            item.isCheck = true
+          } else {
+            item.isCheck = false
+          }
+          return item
+        }) })
+        break;
+      case 'color':   /// 颜色
+        this.setData({ colors: this.data.colors.map(item => {
+          if (item.id == index) {
+            item.isCheck = true
+          } else {
+            item.isCheck = false
+          }
+          return item
+        }) })
+        break;
+      case 'jingxing':   /// 晶型
+        this.setData({ jingxings: this.data.jingxings.map(item => {
+          if (item.id == index) {
+            item.isCheck = true
+          } else {
+            item.isCheck = false
+          }
+          return item
+        }) })
+        break;
+      case 'style':   /// 款式
+        this.setData({ styles: this.data.styles.map(item => {
+          if (item.id == index) {
+            item.isCheck = true
+          } else {
+            item.isCheck = false
+          }
+          return item
+        }) })
+        break;
+      case 'neatness':   /// 净度
+        this.setData({ neatness: this.data.neatness.map(item => {
+          if (item.id == index) {
+            item.isCheck = true
+          } else {
+            item.isCheck = false
+          }
+          return item
+        }) })
+        break;
+      case 'qiegong':   /// 切工
+        this.setData({ qiegongs: this.data.qiegongs.map(item => {
+          if (item.id == index) {
+            item.isCheck = true
+          } else {
+            item.isCheck = false
+          }
+          return item
+        }) })
+        break;
+      case 'duicheng':   /// 对称
+        this.setData({ duichengs: this.data.duichengs.map(item => {
+          if (item.id == index) {
+            item.isCheck = true
+          } else {
+            item.isCheck = false
+          }
+          return item
+        }) })
+        break;
+      case 'polishing':   /// 抛光
+        this.setData({ paoguangs: this.data.paoguangs.map(item => {
+          if (item.id == index) {
+            item.isCheck = true
+          } else {
+            item.isCheck = false
+          }
+          return item
+        }) })
+        break;
+      case 'yingguang':   /// 荧光
+        this.setData({ yingguangs: this.data.yingguangs.map(item => {
+          if (item.id == index) {
+            item.isCheck = true
+          } else {
+            item.isCheck = false
+          }
+          return item
+        }) })
+        break;
+      default:
+        break;
+    }
+  },
+
+  /**
    * 按钮点击响应事件
    */
   toSubmit() {

GuangZuan/miniprogram/mTrade/pages/listingbuy/listingbuy.wxml

@@ -2,133 +2,122 @@
 
 <!-- TabBar选项 -->
 <view style="position: sticky; top:0; z-index: 999;">
-  <van-tabs animated>
-    <van-tab title="买挂牌"></van-tab>
-    <van-tab title="卖挂牌"></van-tab>
+  <van-tabs animated swipeable bind:change="onTabChange">
+    <van-tab wx:for="{{tabs}}" wx:for-item="itm" wx:key="id" id="{{itm.id}}" title="{{itm.name}}"/>
   </van-tabs>
 </view>
 
-<view class="container"> 
-  <!-- 交易账户 -->
-  <view class="cell-view tradeaccount"> 
-    <text>交易账户</text>
-    <view class="tradeaccount-content">
-      <button style="width: 100%;">-----------</button>
+<view class="container" style="position: relative; padding-bottom: {{safeBottom}}px;"> 
+
+  <!-- 货币 -->
+  <view class="cell-view currency"> 
+    <text>货币</text>
+    <view class="currency-radio">
+      <van-radio-group value="{{ currency }}" direction="horizontal" bind:change="onChange">
+        <van-radio name="RMB">人民币</van-radio>
+        <van-radio name="DOLLAR">美元</van-radio>
+      </van-radio-group>
     </view>
   </view>
 
-  <!-- 形状 -->
-  <view class="cell-view shape"> 
-    <text>形状</text>
-    <view class="shape-content">
-      <button wx:for="{{shapes}}" wx:for-item="itm" wx:for-index="idx" wx:key="id">{{itm.name}}</button>
+  <!-- 履约方式 -->
+  <view class="cell-view prestyle"> 
+    <text>履约方式</text>
+    <view class="content prestyle">
+      <button style="width: 95%;">---全部---</button>
     </view>
   </view>
 
-  <!-- 重量 -->
-  <view class="cell-view weight"> 
-    <text>重量</text>
-    <num-range unit="RB"></num-range>
+  <!-- 尺寸 -->
+  <view class="cell-view size"> 
+    <text>尺寸</text>
+    <num-range unit="mm"></num-range>
   </view>
 
-   <!-- 价格 -->
-   <view class="cell-view price"> 
-    <text>价格</text>
-    <num-range></num-range>
+  <!-- 款式 -->
+  <view class="cell-view style" wx:if="{{active === 3 || active === 4}}"> 
+    <text>款式</text>
+    <view class="content style">
+      <button wx:for="{{styles}}" wx:for-item="itm" wx:for-index="idx" wx:key="id" class="{{itm.isCheck ? 'active' : ''}}" id="style {{itm.id}}" bindtap="onButtonPressed">{{itm.name}}</button>
+    </view>
+  </view>
+
+  <!-- 形状 -->
+  <view class="cell-view shape" wx:if="{{active !== 2}}"> 
+    <text>形状</text>
+    <view class="content shape">
+      <button wx:for="{{shapes}}" wx:for-item="itm" wx:for-index="idx" class="{{itm.isCheck ? 'active' : ''}}" id="shape {{itm.id}}" wx:key="id" bindtap="onButtonPressed">{{itm.name}}</button>
+    </view>
+  </view>
+
+  <!-- 晶型 -->
+  <view class="cell-view jingxing" wx:if="{{active === 2}}"> 
+    <text>晶型</text>
+    <view class="content jingxing">
+      <button wx:for="{{jingxings}}" wx:for-item="itm" wx:for-index="idx" wx:key="id" class="{{itm.isCheck ? 'active' : ''}}" id="jingxing {{itm.id}}" bindtap="onButtonPressed">{{itm.name}}</button>
+    </view>
   </view>
 
   <!-- 颜色 -->
   <view class="cell-view color"> 
     <text>颜色</text>
-    <view class="color-content">
-      <button wx:for="{{colors}}" wx:for-item="itm" wx:for-index="idx" wx:key="id">{{itm.name}}</button>
+    <view class="content color">
+      <button wx:for="{{colors}}" wx:for-item="itm" wx:for-index="idx" wx:key="id" class="{{itm.isCheck ? 'active' : ''}}" id="color {{itm.id}}" bindtap="onButtonPressed">{{itm.name}}</button>
     </view>
   </view>
 
   <!-- 净度 -->
   <view class="cell-view neatness"> 
     <text>净度</text>
-    <view class="neatness-content">
-      <button wx:for="{{neatness}}" wx:for-item="itm" wx:for-index="idx" wx:key="id">{{itm.name}}</button>
+    <view class="content neatness">
+      <button wx:for="{{neatness}}" wx:for-item="itm" wx:for-index="idx" wx:key="id" class="{{itm.isCheck ? 'active' : ''}}" id="neatness {{itm.id}}" bindtap="onButtonPressed">{{itm.name}}</button>
     </view>
   </view>
 
   <!-- 切工 -->
-  <view class="cell-view qiegong"> 
+  <view class="cell-view qiegong" wx:if="{{(active != 2)}}"> 
     <text>切工</text>
-    <view class="qiegong-content">
-      <button wx:for="{{qiegongs}}" wx:for-item="itm" wx:for-index="idx" wx:key="id">{{itm.name}}</button>
+    <view class="content qiegong">
+      <button wx:for="{{qiegongs}}" wx:for-item="itm" wx:for-index="idx" wx:key="id" class="{{itm.isCheck ? 'active' : ''}}" id="qiegong {{itm.id}}" bindtap="onButtonPressed">{{itm.name}}</button>
     </view>
   </view>
 
   <!-- 对称 -->
-  <view class="cell-view duicheng"> 
+  <view class="cell-view duicheng" wx:if="{{active !== 2}}"> 
     <text>对称</text>
-    <view class="duicheng-content">
-      <button wx:for="{{qiegongs}}" wx:for-item="itm" wx:for-index="idx" wx:key="id">{{itm.name}}</button>
+    <view class="content duicheng">
+      <button wx:for="{{duichengs}}" wx:for-item="itm" wx:for-index="idx" wx:key="id" class="{{itm.isCheck ? 'active' : ''}}" id="duicheng {{itm.id}}" bindtap="onButtonPressed">{{itm.name}}</button>
     </view>
   </view>
 
   <!-- 抛光 -->
-  <view class="cell-view polishing"> 
+  <view class="cell-view polishing" wx:if="{{active !== 2}}"> 
     <text>抛光</text>
-    <view class="polishing-content">
-      <button wx:for="{{qiegongs}}" wx:for-item="itm" wx:for-index="idx" wx:key="id">{{itm.name}}</button>
+    <view class="content polishing">
+      <button wx:for="{{paoguangs}}" wx:for-item="itm" wx:for-index="idx" wx:key="id" class="{{itm.isCheck ? 'active' : ''}}" id="polishing {{itm.id}}" bindtap="onButtonPressed">{{itm.name}}</button>
     </view>
   </view>
 
   <!-- 荧光 -->
   <view class="cell-view yingguang"> 
     <text>荧光</text>
-    <view class="yingguang-content">
-      <button wx:for="{{yingguangs}}" wx:for-item="itm" wx:for-index="idx" wx:key="id">{{itm.name}}</button>
-    </view>
-  </view>  
-
-  <!-- 咖奶 -->
-  <view class="cell-view kanai"> 
-    <text>咖奶</text>
-    <view class="kanai-content">
-      <button style="width: 50%;">不咖不奶</button>
+    <view class="content yingguang">
+      <button wx:for="{{yingguangs}}" wx:for-item="itm" wx:for-index="idx" wx:key="id" class="{{itm.isCheck ? 'active' : ''}}" id="yingguang {{itm.id}}" bindtap="onButtonPressed">{{itm.name}}</button>
     </view>
   </view>
 
-  <!-- 货期 -->
-  <view class="cell-view huoqi"> 
-    <view class="huoqi-left">
-      <text>货期</text>
-      <input placeholder="请输入货期"></input>
-    </view>
-    <!-- 证书 -->
-    <view class="huoqi-right">
-      <text>证书</text>
-      <input placeholder="请输入证书编号"></input>
-    </view>
-  </view> 
-
-  <!-- 货期 -->
-  <view class="cell-view amunt"> 
-    <text>挂牌金额</text>
-    <text>0.00</text>
+  <!-- 原产地 -->
+  <view class="cell-view product" wx:if="{{active === 2}}"> 
+    <text>原产地</text>
+    <van-field placeholder="请输入原产地"></van-field>
   </view>
 
-  <view class="cell-view margin"> 
-    <view class="margin-left">
-      <text>履约保证金</text>
-      <text>0.00</text>
-    </view>
-    <view class="margin-right">
-      <text>可用资金</text>
-      <text>0.00</text>
-    </view>
+  <!-- 提交按钮视图 -->
+  <view class="submit-view" style="position: relative; padding-bottom: {{safeBottom}}px;">
+    <button bindtap="toSubmit">卖出</button>
+    <button bindtap="toSubmit">取消</button>
   </view>
 </view>
 
-<!-- 提交按钮视图 -->
-<view class="submit-view" style="position: relative; padding-bottom: {{safeBottom}}px;">
-  <button bindtap="toSubmit">卖出</button>
-  <button bindtap="toSubmit">取消</button>
-</view>
-
 <!-- toast -->
 <van-toast id="van-toast"/>

GuangZuan/miniprogram/mTrade/pages/listingsell/listingsell.less

@@ -1 +1,75 @@
-/* mTrade/pages/listingsell/listingsell.wxss */
+/* mTrade/pages/listingsell/listingsell.wxss */
+
+.title-view {
+  background-color: #f0f0f0;
+  padding: 10px 0px;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  border-bottom: 1px solid #f0f0f0;
+
+  .title-view-text {
+    font-size: 12px;
+    color: #666;
+    text-align: center;
+    border-right: 1px solid #f0f0f0;
+  }
+}
+
+.list-item {
+  display: flex;
+  justify-content: space-between;
+  margin: 5px 10px 15px 10px;
+  flex-direction: row;
+  align-content: center;
+  align-items: center;
+  height: 110px;
+  border-bottom: 1px solid #ddd;
+
+  .list-item-left, .list-item-right {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    align-content: center;
+  }
+
+  .list-item-left {
+    width: 60%;
+  }
+
+  .list-item-right {
+    border-left: 1px solid #ddd;
+    padding-left: 15px;
+    width: 100%;
+  }
+
+  .list-item-left, .list-item-right {
+    text {
+      margin: 2.5px;
+      width: 100%;
+      text-align: left;
+      font-size: 14px;
+      color: #333;
+    }
+  }
+}
+
+.submit-view {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  margin-top: 20px;
+
+  button {
+    width: 45%;
+    color: white;
+  }
+
+  button:nth-child(1) {
+    background-color: red;
+  }
+  
+  button:nth-child(2) {
+    background-color: purple;
+  }
+}

GuangZuan/miniprogram/mTrade/pages/listingsell/listingsell.ts

@@ -5,7 +5,54 @@ Page({
    * 页面的初始数据
    */
   data: {
+    /// tabs
+    tabs: [{id: 1, name: '成批裸钻'}, 
+           {id: 2, name: '单颗裸钻'}, 
+           {id: 3, name: '成批毛坯'}, 
+           {id: 4, name: '钻石首饰'}, 
+           {id: 5, name: '彩色钻石'}],
+    /// tab索引
+    active: 0,
+    /// 列头
+    titles: ['形状', '颜色', '进度', '总价', '总重量', '单颗均重', '克拉单价', '库存重量', '冻结重量'],
+  },
 
+  /**
+   * tab触发事件
+   */
+  onTabChange(e: any) {
+    switch (e.detail.index) {
+      case 0:  /// 成批裸钻
+        this.setData({
+          /// 列头  
+          titles: ['形状', '颜色', '进度', '总价', '总重量', '单颗均重', '克拉单价', '库存重量', '冻结重量'],
+          active: e.detail.index
+        })
+        break;
+      case 1 || 4:  /// 单颗裸钻 彩色钻石
+        this.setData({
+          /// 列头  
+          titles: ['形状', '颜色', '净度', '颜色', '价格', '克拉重量', '克拉单价'],
+          active: e.detail.index
+        })
+        break;
+      case 2:  /// 成批毛坯
+        this.setData({
+          /// 列头  
+          titles: ['晶型', '颜色', '净度', '总价', '总重量', '单颗均重', '克拉单价', '库存重量', '冻结重量'],
+          active: e.detail.index
+        })
+        break;
+      case 3:  /// 首饰
+        this.setData({
+          /// 列头  
+          titles: ['款式', '主石形状', '价格', '主石重量', '克拉单价', '颜色', '净度', '切工', '对称度'],
+          active: e.detail.index
+        })
+        break;
+      default:
+        break;
+    }
   },
 
   /**

GuangZuan/miniprogram/mTrade/pages/listingsell/listingsell.wxml

@@ -1 +1,35 @@
 <!--mTrade/pages/listingsell/listingsell.wxml-->
+<!-- tabs -->
+<view class="tab-view">
+  <van-tabs swipeable bind:change="onTabChange">
+    <van-tab wx:for="{{tabs}}" wx:for-item="itm" wx:key="id" id="{{itm.id}}" title="{{itm.name}}"/>
+  </van-tabs>  
+</view>
+
+<scroll-view class="scroll-view" scroll-x enable-flex>
+  <!-- 列头 -->
+  <view class="title-view" style="width: 100%;">
+    <text class="title-view-text" wx:for="{{titles}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx" id="idx">{{itm}}</text>
+  </view>
+
+  <!-- 列表项 --> 
+  <view class="list-item">
+    <view class="list-item-left">
+      <text>公主方形(Princess)</text>
+      <text>￥21,002.00</text>
+      <text>￥21,002.00</text>
+    </view>
+    <view class="list-item-right">
+      <text>E-J | FL-VS1 | SZ001 | 10.00 | 10.00</text>
+      <text>平均单颗重量：0.50</text>
+      <text>冻结重量       ：0.00</text>
+      <text>商品编号: a0031D001</text>
+    </view>
+  </view>
+
+  <!-- 提交按钮视图 -->
+  <view class="submit-view" style="position: relative; padding-bottom: {{safeBottom}}px;">
+    <button bindtap="toSubmit">卖出</button>
+    <button bindtap="toSubmit">取消</button>
+  </view>
+</scroll-view>

GuangZuan/miniprogram/pages/home/home.less

@@ -72,14 +72,6 @@
     border-radius: 10px;
     color: #fff;
   }
-  
-  .goldprice, .exchangerate {
-    width: 40px;
-    height: 80px;
-    font-size: 14px;
-    color: #444;
-    text-align: center;
-  }
 }
 
 .search-view {
@@ -106,13 +98,11 @@
   }
 }
 
-.goldprice, .exchangerate, .calculator {
+.dayRate, .calculator {
   width: 23px;
   text-align: center;
   display: flex;
-  justify-content: center;
   align-items: center;
-  align-content: center;
   font-size: 12px;
   margin: 3px;
   color: #fff;
@@ -120,25 +110,16 @@
   position: fixed;
   z-index: 1; 
   box-shadow: 3px 3px 3px #aaa;
+  bottom: 12%; 
+  height: 90px;
 }
 
-.goldprice {
-  height: 60px;
-  bottom: 90px; 
-  left: 5px;
-  background-color: navy;
-}
-
-.exchangerate {
-  height: 90px;
-  bottom: 23%; 
-  right: 5px; 
+.dayRate {
+  left: 5px; 
   background-color: lightcoral;
 }
 
 .calculator {
-  height: 90px;
-  bottom: 90px; 
   right: 5px;
   background-color: hotpink;
 }

GuangZuan/miniprogram/pages/home/home.ts

@@ -17,7 +17,7 @@ Page({
     /// 功能菜单
     menus: [[{id: 1, title: '钻石搜索', path: '/mHome/pages/search/search'}, 
              {id: 2, title: '出镜检测', path: '/mHome/pages/inspection/inspection'}], 
-            [{id: 1, title: '最新饰品', path: '/mHome/pages/inspection/inspection'}, 
+            [{id: 1, title: '最新饰品', path: '/mHome/pages/jewelry/jewelry'}, 
              {id: 2, title: '保税服务', path: '/mHome/pages/bond/bond'}]],
     /// 统计
     statistics: [{id: 1, title: '累积成交', value: 2000}, 

GuangZuan/miniprogram/pages/home/home.wxml

@@ -46,10 +46,8 @@
   </view>
 </scroll-view>
 
-<!-- 金价  -->
-<navigator class="goldprice" url="/mHome/pages/goldprice/goldprice">金价</navigator>
 <!-- 今日汇率  -->
-<navigator class="exchangerate" url="/mHome/pages/exchangeRate/exchangeRate">今日汇率</navigator>
+<navigator class="dayRate" url="/mHome/pages/dayRate/dayRate">今日汇率</navigator>
 <!-- 计算器  -->
 <navigator class="calculator" url="/mHome/pages/calculator/calculator">计算器</navigator>
 

GuangZuan/miniprogram/pages/login/login.ts

@@ -1,4 +1,5 @@
 // pages/login/login.ts
+// import {login} from '../../services/api/account/index'
 
 Page({
 
@@ -40,7 +41,7 @@ Page({
    * 用户登录请求方法
    */
   onLogin() {
-    /// 合规性校验
+    // /// 合规性校验
     // if (!this.check()) return
     // /// loding.....
     // this.setData({ isLoding: true })
@@ -48,40 +49,41 @@ Page({
     // /// 进行账户登录
     // login({
     //   data: {
-    //     userName: '110000000001',
-    //     password: 'BgAAAPir1cgH1bw5xgrywoXpw8l/s5auAXn8MA==',
+    //     userName: this.data.username,
+    //     password: this.data.pwd,
     //     clientType: 5
     //   },
-    //   success: (res) => {
-    //     console.log(res)
-    //     /// 登录失败
-    //     if (res.code != 200) { 
-    //       wx.showToast({
-    //         icon: 'error',
-    //         title: '登录失败，原因:'+res.msg
-    //       })
-    //       console.log('failure')
-    //       return 
-    //     }
-    //     /// showToast
-    //     wx.showToast({
-    //       title: '登录成功',
-    //       complete: () => {
+    //   enableAuthorization: false,
+      // success: (res) => {
+      //   console.log(res)
+      //   /// 登录失败
+      //   if (res.code != 0) { 
+      //     wx.showToast({icon: 'error', title: '登录失败，原因:'+res.msg})
+      //     return 
+      //   }
+
+      //   /// 存储Token以及Loginid
+      //   wx.setStorageSync('Authorization', res.data.token)
+      //   wx.setStorageSync('LoginID', res.data.loginId)
+      //   wx.setStorageSync('UserId', res.data.userId)
+
+      wx.setStorageSync('Authorization', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJMb2dpbklEIjoxMTAwMDAwMDAwMDEsIkdyb3VwIjo1LCJTZXNzaW9uSUQiOjkwMDAxLCJCdWZmZXJUaW1lIjo4NjQwMCwiaXNzIjoiTXVjaGluZm8iLCJleHAiOjE2NjI1MjA3NzUsIm5iZiI6MTY2MjUyMDc3NSwiaWF0IjoxNjYyNTIwNzc1fQ.-k95mFfW6b-WAdpg3chtW1-2RJKd4gGHtsIuSLKLAjo')
+      wx.setStorageSync('LoginID', '110000000001')
+      wx.setStorageSync('UserId', '1000')
+
+      //   /// showToast
+      //   wx.showToast({
+      //     title: '登录成功',
+      //     complete: () => {
             /// 跳转到首页
             wx.reLaunch({ url: '/pages/home/home' })
     //       }
     //     })
     //   },
-    //   fail: (er) => {
-    //     console.log(er)
-    //     wx.showToast({
-    //       icon: 'error',
-    //       title: '登录失败，原因:网络请求失败'
-    //     })
+    //   fail: () => {
+    //     wx.showToast({icon: 'error', title: '登录失败，原因:网络请求失败'})
     //   },
-    //   complete: () => {
-    //     this.setData({ isLoding: false })
-    //   }
+    //   complete: () => { this.setData({ isLoding: false }) }
     // })
   },
 

GuangZuan/miniprogram/pages/trade/trade.ts

@@ -13,17 +13,17 @@ Page({
     /// 选中行数
     selectRow: -1,
     /// 列头
-    titles: ['商品编号', '卖方', '商品分类', '总重量', '克拉单价', '成交重量', '委托状态'],
+    titles: ['形状', '尺寸', '颜色', '荧光', '净度', '对称度', '抛光度', '仓库'],
     /// 列表总宽度
     totalWidth: 0,
     /// 列表宽度
-    widths: [110, 100, 80, 110, 80, 80, 80],
+    widths: [110, 100, 80, 110, 80, 80, 80, 80],
     /// 内容
-    values: [['CPLZ00000001', 'yyyy企业', '单颗裸钻', '10.23', '￥ 200.00', '1.23', '委托成功'],           
-             ['CPLZ00000001', 'yyyy企业', '单颗裸钻', '10.23', '￥ 200.00', '1.23', '委托成功'], 
-             ['CPLZ00000001', 'yyyy企业', '单颗裸钻', '10.23', '￥ 200.00', '1.23', '委托成功'], 
-             ['CPLZ00000001', 'yyyy企业', '单颗裸钻', '10.23', '￥ 200.00', '1.23', '委托成功'],
-             ['CPLZ00000001', 'yyyy企业', '单颗裸钻', '10.23', '￥ 200.00', '1.23', '委托成功']]
+    values: [['CPLZ00000001', 'yyyy企业', '单颗裸钻', '10.23', '￥ 200.00', '1.23', '委托成功', '委托成功'],           
+             ['CPLZ00000001', 'yyyy企业', '单颗裸钻', '10.23', '￥ 200.00', '1.23', '委托成功', '委托成功'], 
+             ['CPLZ00000001', 'yyyy企业', '单颗裸钻', '10.23', '￥ 200.00', '1.23', '委托成功', '委托成功'], 
+             ['CPLZ00000001', 'yyyy企业', '单颗裸钻', '10.23', '￥ 200.00', '1.23', '委托成功', '委托成功'],
+             ['CPLZ00000001', 'yyyy企业', '单颗裸钻', '10.23', '￥ 200.00', '1.23', '委托成功', '委托成功']]
   },
 
   /**
@@ -41,40 +41,31 @@ Page({
   onButtonPressed(e: any){
     console.log(e)
     switch (e.currentTarget.id) {
-      case "goods-info":  /// 商品详情
-        wx.navigateTo({
-          url: '/mHome/pages/goodsdetail/goodsdetail'
-        })
+      case 'goods-info':  /// 商品详情
+        wx.navigateTo({ url: '/mHome/pages/goodsdetail/goodsdetail' })
         break;
-      case "delisting": /// 摘牌
+      case 'search':
+        wx.navigateTo({ url: '/mHome/pages/search/search' })
+        break;
+      case 'delisting': /// 摘牌
         wx.navigateTo({
           url: this.data.active == 0 ? '/mTrade/pages/delistingbuy/delistingbuy' : '/mTrade/pages/delistingsell/delistingsell'
         })
         break;
-      case "listing-buy":  /// 我要求购
-        wx.navigateTo({
-          url: '/mTrade/pages/listingbuy/listingbuy'
-        })
+      case 'listing-buy':  /// 我要求购
+        wx.navigateTo({ url: '/mTrade/pages/listingbuy/listingbuy' })
         break;
-      case "listing-sell": /// 我要出售
-        wx.navigateTo({
-          url: '/mTrade/pages/listingsell/listingsell'
-        })
+      case 'listing-sell': /// 我要出售
+        wx.navigateTo({ url: '/mTrade/pages/listingsell/listingsell' })
         break; 
-      case "buy-inquiry": /// 我要询价
-        wx.navigateTo({
-          url: '/mTrade/pages/buyinquiry/buyinquiry'
-        })
+      case 'buy-inquiry': /// 我要询价
+        wx.navigateTo({ url: '/mTrade/pages/buyinquiry/buyinquiry' })
         break;
-      case "order-detail": /// 挂牌详情 
-        wx.navigateTo({
-          url: '/mTrade/pages/orderdetail/orderdetail'
-        })
+      case 'order-detail': /// 挂牌详情 
+        wx.navigateTo({ url: '/mTrade/pages/orderdetail/orderdetail' })
         break;
-      case "ask-buy": /// 求购信息
-        wx.navigateTo({
-          url: '/mTrade/pages/orderdetail/orderdetail'
-        })
+      case 'ask-buy': /// 求购信息
+        wx.navigateTo({ url: '/mTrade/pages/orderdetail/orderdetail' })
         break;
       default:
         break;

GuangZuan/miniprogram/pages/trade/trade.wxml

@@ -9,6 +9,7 @@
 
 <!-- 挂牌信息 -->
 <view class="listing">
+  <van-button id="search" type="info" size="mini" bind:click="onButtonPressed">搜索</van-button>
   <van-button id="listing-buy" type="primary" size="mini" bind:click="onButtonPressed">我要求购</van-button>
   <van-button id="listing-sell" type="danger" size="mini" bind:click="onButtonPressed">我要出售</van-button>
 </view>

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

@@ -1,12 +1,11 @@
-
 import { httpRequest } from '../../../services/http/index'
 import { HttpRequest } from '../../../services/http/interface'
-import service from '../../../services'
+// import service from '../../../services'
 
 /**
  * 用户登录
  * 
  */
 export function login(params: HttpRequest<{req: GuangZuan.LoginReq, rsp: GuangZuan.LoginRsp}>) {
-  return httpRequest(service.config.goAccess+'/Account/Login', 'POST', params)
+  return httpRequest('http://192.168.31.201:8888/api'+'/Account/Login', 'POST', params)
 }

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

@@ -0,0 +1,13 @@
+import { httpRequest } from '../../../services/http/index'
+import { HttpRequest } from '../../../services/http/interface'
+import service from '../../../services'
+
+/* 查询汇率信息 */
+export function queryRates(params: HttpRequest<{req: GuangZuan.RatesReq, rsp: GuangZuan.Rates[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Common/QueryRates', 'GET', params)
+}
+
+/* 通知公告系统消息查询 */
+export function queryNotice(params: HttpRequest<{req: GuangZuan.NoticeReq, rsp: GuangZuan.Notice[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Common/QueryNotice', 'GET', params)
+}

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

@@ -3,6 +3,56 @@ import { HttpRequest } from '../../../services/http/interface'
 import service from '../../../services'
 
 /* 查询求购大厅委托单 */
-export function queryBuyOrder(params: HttpRequest<{req: GuangZuan.LoginReq, rsp: GuangZuan.LoginRsp}>) {
+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 querySellOrder(params: HttpRequest<{req: GuangZuan.SellOrderReq, rsp: GuangZuan.SellOrder[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QuerySellOrder', 'GET', params)
+}
+
+/* 查询我的库存 */
+export function queryMyWRPosition(params: HttpRequest<{req: GuangZuan.MyWRPositionReq, rsp: GuangZuan.MyWRPosition[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryMyWRPosition', 'GET', params)
+}
+
+/* 查询我的出售 */
+export function queryMySellOrder(params: HttpRequest<{req: GuangZuan.MySellOrderReq, rsp: GuangZuan.MySellOrder[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryMySellOrder', 'GET', params)
+}
+
+/* 查询我的询价-出售 */
+export function queryMyDelistingApply(params: HttpRequest<{req: GuangZuan.MyDelistingApplyReq, rsp: GuangZuan.MyDelistingApply[]}>) {
+  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 queryMyBuyOrder(params: HttpRequest<{req: GuangZuan.MyBuyOrderReq, rsp: GuangZuan.MyBuyOrder[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryMyBuyOrder', 'GET', params)
+}
+
+/* 查询我的询价-求购 */
+export function queryMyBargainApply(params: HttpRequest<{req: GuangZuan.MyBargainApplyReq, rsp: GuangZuan.MyBargainApply[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryMyBargainApply', 'GET', params)
+}
+
+/* 钻石搜索 */
+export function queryDiamond(params: HttpRequest<{req: GuangZuan.DiamondReq, rsp: GuangZuan.Diamond[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryDiamond', 'POST', params)
+}
+
+/* 获取钻石详 */
+export function getGoods(params: HttpRequest<{req: GuangZuan.GetGoodsReq, rsp: GuangZuan.GetGoods}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/GetGoods', 'GET', params)
 }

GuangZuan/miniprogram/services/index.ts

@@ -1,16 +1,12 @@
 import { appConfig } from '../config/index'
 import { httpRequest } from './http/index'
-import socket from './socket/index'
+// import socket from './socket/index'
 
 export default new (class {
   /** 服务配置信息 */
   config = {
     commSearchUrl: '',
     goCommonSearchUrl: '',
-    hsbyBankSignZone: '',
-    hsbyRegister: '',
-    hsbyPayUrlWeb: '',
-    hsbySignUp: '',
     mobileAuthUrl: '',
     mobileOpenUrl: '',
     newsUrl: '',
@@ -23,8 +19,6 @@ export default new (class {
     tradeUrl: '',
     uploadUrl: '',
     oem: '',
-    iOS: '',
-    android: '',
     pcNewsUrl: '',
     pcMangerUrl: '',
     goAccess: ''
@@ -55,7 +49,7 @@ export default new (class {
           resolve();
 
           // 连接交易服务
-          socket.connectTrade();
+          // socket.connectTrade();
         },
         fail: () => {
           reject('获取服务配置地址失败');

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

@@ -1,23 +0,0 @@
-declare namespace GuangZuan {
-    /// 登录请求
-   interface LoginReq {
-     /// 用户名，可以是LoginID/LoginCode/手机号码
-     userName: string,
-     /// 密码
-     password: string,
-     /// 客户端类型，2-PC交易端 3-手机客户端安卓 4-网页客户端 5-微信客户端 6-手机客户端苹果
-     clientType: number
-   }
- 
-   /// 登录回应信息
-   interface LoginRsp {
-     /// 过期时间
-     expiresAt: number
-     /// 登录ID
-     loginId: number
-     /// 新服务Token
-     token	: string,
-     /// 用户ID
-     userId: number
-   }
-}

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

@@ -0,0 +1,1260 @@
+declare namespace GuangZuan {
+
+  /// 登录请求
+  export interface LoginReq {
+    /// 用户名，可以是LoginID/LoginCode/手机号码
+    userName: string,
+    /// 密码
+    password: string,
+    /// 客户端类型，2-PC交易端 3-手机客户端安卓 4-网页客户端 5-微信客户端 6-手机客户端苹果
+    clientType: number
+  }
+
+   /// 登录回应信息
+  export interface LoginRsp {
+    /// 过期时间
+    expiresAt: number
+    /// 登录ID
+    loginId: number
+    /// 新服务Token
+    token: string,
+    /// 用户ID
+    userId: number
+  }
+   
+  /** 查询仓库信息 */
+  interface WarehouseInfoReq {
+    /// 页码
+    page?: number; 
+    /// 每页条数
+    pagesize?: number; 
+    /// 登录用户ID
+    userid: number; 
+    /// 仓库状态(可多项,逗号隔开) 1:正常 2:注销 3:待审核 4:审核拒绝
+    status?: string; 
+    /// 是返回交易所仓库
+    isincludeexchange?: boolean; 
+  }
+
+  /// 仓库信息
+  interface WarehouseInfo {
+    /// 详细地址
+    address: string
+    /// 所属机构
+    areauserid: number
+    /// 自增ID
+    autoid: number
+    /// 市
+    cityid: number
+    /// 联系人
+    contactname: string
+    /// 联系电话
+    contactnum: string
+    /// 国家   
+    countryid: number
+    /// 创建时间
+    createtime: string
+    /// 区
+    districtid: number
+    /// 是否有视频 - 0:无 1:有
+    hasvideo: number
+    /// 省
+    provinceid: number
+    /// 审核备注
+    remark: string
+    /// 视频地址
+    videourl: string
+    /// 仓库代码
+    warehousecode: string
+    /// 仓库名称
+    warehousename: string
+    /// 仓库状态 - 1:正常 2:注销 3:待审核 4:审核拒绝
+    warehousestatus: number
+    /// 仓库类型 - 1 厂库 2 自有库 3 合作库
+    warehousetype: number  
+  }
+
+  /** 查询出售大厅委托单 */
+  interface SellOrderReq {
+    /// 页码
+    page?: number; 
+    /// 每页条数
+    pagesize?: number; 
+    /// 商品(查询字段-模糊查询)
+    zsallproperties?: string; 
+    /// 钻石分类枚举ID
+    zscategory?: string; 
+    /// 委托单号
+    wrtradeorderid?: number; 
+    /// 卖方(查询字段-模糊查询)
+    buyusername?: number; 
+  }
+  
+  /// 出售大厅委托单
+  interface SellOrder {
+    /// 资金账号
+    accountid: number
+    /// 申请单ID
+    applyid: number
+    /// 附件1
+    attachment1:	string
+    /// 附件2
+    attachment2:	string
+    /// 买卖 - 0:买 1:卖
+    buyorsell: number
+    /// 是否可议价 - 0:不可 1:可
+    canbargain: number
+    /// 撤销数量
+    cancelqty: number
+    /// 撤销时间
+    canceltime:	string
+    /// 手续费收取方式 1：比率 2：固定
+    chargealgorithm: number
+    /// 手续费设置值(交易所部分)
+    chargealgorithmvalue:	number
+    /// 手续费设置值(会员部分)
+    chargealgorithmvalue2:	number
+    /// 客户端委托时间
+    clientordertime:	string
+    /// 汇率[67]
+    exchangerate: number
+    /// 首付比率 - [挂牌时指定,摘牌时使用]
+    firstratio: number
+    /// 固定价格 - [挂牌]
+    fixedprice: number
+    /// 冻结手续费
+    freezecharge: number
+    /// 冻结首付金额 - [摘牌]
+    freezefirstamount: number
+    /// 冻结保证金
+    freezemargin: number
+    /// 商品编号
+    goodsno:	string
+    /// 是否钻石查询
+    isQueryDiamond: boolean
+    /// 是否指定对手 - 0:不指定 1:指定好友(贸易圈) 2:指定对手 - [挂牌]
+    isspecified: number
+    /// 保证金方式 - 1：比率 2：固定
+    marginalgorithm: number
+    /// 保证金设置值
+    marginvalue: number
+    /// 市场ID
+    marketid: number
+    /// 挂牌金额[账户] [67]= OrderQty * FixedPrice * ExchangeRate /100
+    orderamount: number
+    /// 委托数量
+    orderqty: number
+    /// 委托时间
+    ordertime:	string
+    /// 履约计划模板ID
+    performancetemplateid: number
+    /// 价格系数(浮动价时填写) - [挂牌]
+    pricefactor: number
+    /// 升贴水(浮动价时填写) - [挂牌]
+    pricemove: number
+    /// 关联委托单号(摘牌委托关联挂牌委托单ID)
+    relatedwrtradeorderid: number
+    /// 错误代码
+    retcode: number
+    /// 卖方(查询字段-模糊查询)
+    sellusername:	string
+    /// 交易日(yyyyMMdd)
+    tradedate: string
+    /// 成交价格 - [摘牌] (浮动价 (（商品1价格商品1价格系数+升贴水） 商品1重量系数 + 商品2价格商品2价格系数+商品2升贴水） 商品2重量系数 …)* 委托单价格系数 +　委托单升贴水)
+    tradeprice: number
+    /// 成交数量
+    tradeqty: number
+    /// 解冻手续费
+    unfreezecharge: number
+    /// 解冻首付金额 - [摘牌]
+    unfreezefirstamount: number
+    /// 解冻保证金
+    unfreezemargin: number
+    /// 用户ID
+    userid: number
+    /// 发起端唯一id
+    uuid:	string
+    /// 有效期限
+    validtime: string
+    /// 有效类型 - 1当日有效 2本周有效 3指定日期有效 4一直有效
+    validtype: number
+    /// 议价申请单ID
+    wrbargainid: number
+    /// 仓单要素类型ID/商品ID(77)
+    wrfactortypeid: number
+    /// 价格方式 - 1:固定价 2-浮动价 - [挂牌]
+    wrpricetype: number
+    /// 现货商品ID
+    wrstandardid: number
+    /// 仓单贸易委托单ID(320+Unix秒时间戳(10位)+xxxxxx)
+    wrtradeorderid: number
+    /// 委托状态 - 参考枚举’WRTradeOrderStatus’ - 1:委托请求 2:待冻结 3:委托成功 4:委托失败 5:配对成功 6:已撤 7:部成 8:已成 9:部成部撤 10:成交失败 11:委托拒绝 12:经过摘牌(先摘后挂专用) 13:冻结成功(通道交易专用) 14:通道已撤 15:通道部成部撤 16:成交失败违约(荷兰式竞拍专用) 17:冻结PD成功 18:冻结PD失败 19:冻结能量成功 20:冻结能量失败 21:预约已报价 22:过期未付 23:优惠券处理中 24:仓单生成失败 25:首付扣款失败 26:履约失败 27:撤单解冻贷款失败
+    wrtradeorderstatus: number
+    /// 仓单贸易类型 - 1:挂牌 2:摘牌 3:提货卖(文化中国) 4:提货买(文化中国)
+    wrtradetype: number
+    /// 仓单受让用户 - [摘牌]
+    wrtransferuserid: number
+    /// 钻石分类 - 枚举”ZSCategory“
+    zscategory: number
+    /// 货币类型 - 枚举“ZSCurrencyType”
+    zscurrencytype: number
+  }
+
+  /** 查询我的库存请求 */
+  interface MyWRPositionReq {
+    /// 页码
+    page?: number; 
+    /// 每页条数
+    pagesize?: number; 
+    /// 登录用户ID
+    wruserid: number; 
+    /// 商品(查询字段-模糊查询)
+    zsallproperties?: string; 
+    /// 钻石分类枚举ID
+    zscategory?: number; 
+    /// 仓库ID
+    warehouseid?: number; 
+  }
+  
+  /// 我的库存
+  interface MyWRPosition {
+    /// 证书编号 - 类型：2，4，5
+    cerno: string
+    /// 金伯利证书编号 - 类型：3
+    cpcertno: string
+    /// 冻结数量：WRPosition表：FREEZEQTY/100 , 保留两位小数
+    ffreezeqty: number
+    /// 库存数量：WRPosition表：TOTALQTY /100 , 保留两位小数
+    ftotalqty: number
+    /// 商品编号
+    goodsno: string
+    /// 商品照片(相对地址)
+    imagepath: string
+    /// 是否有效 - 0:无效 1:有效
+    isvalid: number
+    /// 金伯利证书图片(相对地址) - 类型：3
+    kppath: string
+    /// 金伯利证书重量 - 类型：3
+    kpweight: string
+    /// 市场价
+    marketprice: string
+    /// 原产地 - 类型：3
+    origin: string
+    /// 总价(价格) - 类型：1，2，3，4，5
+    price: number
+    /// 克拉单价 - 类型：1，2，3，5
+    priceper: string
+    /// 备注
+    remark: string
+    /// 手机号码(加密存储)
+    sellmobile: string
+    /// 账户名称(机构名称)
+    sellusername: string
+    /// 镶嵌材料 - 类型：4
+    settingmaterial: string
+    /// 尺寸1 - 类型：2，4，5
+    size1: string
+    /// 尺寸2 - 类型：2，4，5
+    size2: string
+    /// 尺寸3 - 类型：2，4，5
+    size3: string
+    /// 配石描述 - 类型：4
+    stonedesc: string
+    /// 用户ID
+    userid: number
+    /// 仓库ID
+    warehouseid: number
+    ///  warehousenamedisplay
+    warehousenamedisplay: string
+    /// 总重量(克拉重量) - 类型：1，2，3，4，5
+    weight: number
+    /// 平均单颗重量 - 类型：1，3
+    weightavg: number
+    /// 仓单扫描件(相对地址)
+    wrpath: string
+    /// 现货商品ID
+    wrstandardid: number
+    /// 登录用户ID
+    wruserid: number
+    /// 钻石分类 - 枚举”ZSCategory“
+    zscategory: number
+    /// 
+    zscategorydisplay: string
+    /// 证书类型 - 枚举”ZSCertType“ - 类型：2，4，5
+    zscerttype: number
+    /// 
+    zscerttypedisplay: string
+    /// 净度1 - 枚举”ZSClarityType“ - 类型：1，2，3，4，5
+    zsclaritytype1: number
+    /// 
+    zsclaritytype1display: string
+    /// 净度2 - 枚举”ZSClarityType“ - 类型：1，3
+    zsclaritytype2: number
+    /// 
+    zsclaritytype2display: string
+    /// 颜色1 - 枚举”ZSColorType“ - 类型：1，2，3，4
+    zscolortype1: number
+    /// 
+    zscolortype1display: string
+    /// 颜色2 - 枚举”ZSColorType“ - 类型：1，3
+    zscolortype2: number
+    /// 
+    zscolortype2display: string
+    /// 晶型范围 - 枚举“ZSCrystalType“ - 类型：3， 多个，逗号分隔
+    zscrystaltype: string
+    /// 
+    zscrystaltypedisplay: string
+    /// 货币类型 - 枚举“ZSCurrencyType”
+    zscurrencytype: number
+    /// 
+    zscurrencytypedisplay: string
+    /// 
+    zscurrencytypedisplayunit: string
+    /// 切工1 - 枚举”ZSCutType“ - 类型：1，2，4，5
+    zscuttype1: number
+    /// 
+    zscuttype1display: string
+    /// 切工2 - 枚举”ZSCutType“ - 类型：1
+    zscuttype2: number
+    /// 
+    zscuttype2display: string
+    /// 彩钻颜色1 - 枚举”ZSCZColor1Type“ - 类型：5
+    zsczcolor1type: number
+    /// 
+    zsczcolor1typedisplay: string
+    /// /// 彩钻颜色2 - 枚举”ZSCZColor2Type“ - 类型：5
+    zsczcolor2type: number
+    /// 
+    zsczcolor2typedisplay: string
+    /// 彩钻颜色3 - 枚举”ZSCZColor3Type“ - 类型：5
+    zsczcolor3type: number
+    /// 
+    zsczcolor3typedisplay: string
+    /// 荧光1 - 枚举”ZSFluorescenceType“ - 类型：1，2，3，4，5
+    zsfluorescencetype1: number
+    /// 
+    zsfluorescencetype1display: string
+    /// 荧光2 - 枚举”ZSFluorescenceType” - 类型：1，3
+    zsfluorescencetype2: number
+    /// 
+    zsfluorescencetype2display: string
+    /// 抛光度1 - 枚举”ZSPolishType“ - 类型：1，2，4，5
+    zspolishtype1: number
+    /// 
+    zspolishtype1display: string
+    /// 抛光度2 - 枚举”ZSPolishType“ - 类型：1
+    zspolishtype2: number
+    /// 
+    zspolishtype2display: string
+    /// 形状 - 枚举”ZSShapeType“ - 类型：1，2，4，5 ；(1为多个，逗号分隔)
+    zsshapetype: string
+    /// 
+    zsshapetypedisplay: string
+    /// 款式 - 类型：4
+    zsstyletype: number
+    /// 
+    zsstyletypedisplay: string
+    /// 对称度1 - 枚举”ZSSymmetryType“ - 类型：1，2，4，5
+    zssymmetrytype1: number
+    /// 
+    zssymmetrytype1display: string
+    /// 对称度2 - 枚举”ZSSymmetryType“ - 类型：1
+    zssymmetrytype2: number
+    /// 
+    zssymmetrytype2display: string
+  }
+
+  /// 查询我的出售
+  interface MySellOrderReq {
+    /// 用户ID
+    userid: number 
+    /// 页码
+    page?: number
+    /// 每页条数
+    pagesize?: number 
+    /// 商品(查询字段-模糊查询)
+    zsallproperties?: string 
+    /// 钻石分类枚举ID
+    zscategory?: string 
+    /// 委托单号
+    wrtradeorderid?: string 
+    /// 买方(查询字段-模糊查询)
+    buyusername?: string 
+  }
+
+  /// 我的出售
+  interface MySellOrder {
+    /// 资金账号
+    accountid: number
+    /// 申请单ID
+    applyid: number
+    /// 附件1
+    attachment1: string
+    /// 附件2
+    attachment2: string
+    /// 买卖 - 0:买 1:卖
+    buyorsell: number
+    /// 是否可议价 - 0:不可 1:可
+    canbargain: number
+    /// 撤销数量
+    cancelqty: number
+    /// 撤销时间
+    canceltime: string
+    /// 手续费收取方式 1：比率 2：固定
+    chargealgorithm: number
+    /// 手续费设置值(交易所部分)
+    chargealgorithmvalue: number
+    /// 手续费设置值(会员部分)
+    chargealgorithmvalue2: number
+    /// 客户端委托时间
+    clientordertime: string
+    /// 汇率[67]
+    exchangerate: number
+    /// 首付比率 - [挂牌时指定,摘牌时使用]
+    firstratio: number
+    /// [克拉单价]固定价格 - [挂牌]
+    fixedprice: number
+    /// 冻结手续费
+    freezecharge: number
+    /// 冻结首付金额 - [摘牌]
+    freezefirstamount: number
+    /// 冻结保证金
+    freezemargin: number
+    /// 商品编号
+    goodsno: number
+    /// 是否指定对手 - 0:不指定 1:指定好友(贸易圈) 2:指定对手 - [挂牌]
+    isspecified: number
+    /// 保证金方式 - 1：比率 2：固定
+    marginalgorithm: number
+    /// 保证金设置值
+    marginvalue: number
+    /// 市场ID
+    marketid: number
+    /// 挂牌金额[账户] [67]= OrderQty * FixedPrice * ExchangeRate /100
+    orderamount: number
+    /// 委托时间
+    ordertime: string
+    /// 履约计划模板ID
+    performancetemplateid: number
+    /// 价格系数(浮动价时填写) - [挂牌]
+    pricefactor: number
+    /// 升贴水(浮动价时填写) - [挂牌]
+    pricemove: number
+    /// 关联委托单号(摘牌委托关联挂牌委托单ID)
+    relatedwrtradeorderid: number
+    /// 错误代码
+    retcode: number
+    /// 成交重量
+    selledqty: number
+    /// 总重量
+    totalqty: number
+    /// 交易日(yyyyMMdd)
+    tradedate: string
+    /// 成交价格 - [摘牌] (浮动价 (（商品1价格商品1价格系数+升贴水） 商品1重量系数 + 商品2价格商品2价格系数+商品2升贴水） 商品2重量系数 …)* 委托单价格系数 +　委托单升贴水)
+    tradeprice: number
+    /// 解冻手续费
+    unfreezecharge: number
+    /// 解冻首付金额 - [摘牌]
+    unfreezefirstamount: number
+    /// 解冻保证金
+    unfreezemargin: number
+    /// 用户ID
+    userid: number
+    /// 发起端唯一id
+    uuid: string
+    /// 有效期限
+    validtime: string
+    /// 有效类型 - 1当日有效 2本周有效 3指定日期有效 4一直有效
+    validtype: number
+    /// 议价申请单ID
+    wrbargainid: number
+    /// 仓单要素类型ID/商品ID(77)
+    wrfactortypeid: number
+    /// 价格方式 - 1:固定价 2-浮动价 - [挂牌]
+    wrpricetype: number
+    /// 现货商品ID
+    wrstandardid: number
+    /// 仓单贸易委托单ID(320+Unix秒时间戳(10位)+xxxxxx)
+    wrtradeorderid: string
+    /// 委托状态 - 参考枚举’WRTradeOrderStatus’ - 1:委托请求 2:待冻结 3:委托成功 4:委托失败 5:配对成功 6:已撤 7:部成 8:已成 9:部成部撤 10:成交失败 11:委托拒绝 12:经过摘牌(先摘后挂专用) 13:冻结成功(通道交易专用) 14:通道已撤 15:通道部成部撤 16:成交失败违约(荷兰式竞拍专用) 17:冻结PD成功 18:冻结PD失败 19:冻结能量成功 20:冻结能量失败 21:预约已报价 22:过期未付 23:优惠券处理中 24:仓单生成失败 25:首付扣款失败 26:履约失败 27:撤单解冻贷款失败
+    wrtradeorderstatus: number
+    /// 仓单贸易类型 - 1:挂牌 2:摘牌 3:提货卖(文化中国) 4:提货买(文化中国)
+    wrtradetype: number
+    /// 仓单受让用户 - [摘牌]
+    wrtransferuserid: number
+    /// 钻石分类 - 枚举”ZSCategory“
+    zscategory: number
+    /// 钻石分类 - 描述
+    zscategorydisplay: string
+    /// 货币类型 - 枚举“ZSCurrencyType”
+    zscurrencytype: number
+  }
+
+  /// 查询求购大厅委托单
+  interface BuyOrderReq {
+    /// 页码
+    page?: number
+    /// 每页条数
+    pagesize?: number 
+    /// 商品(查询字段-模糊查询)
+    zsallproperties?: string 
+    /// 钻石分类枚举ID
+    zscategory?: string 
+    /// 委托单号
+    wrtradeorderid?: string 
+    /// 买方(查询字段-模糊查询)
+    buyusername?: string 
+  }
+
+  /// 求购大厅委托单
+  interface BuyOrder {
+    /// 资金账户ID
+    accountid: number
+    /// 买方
+    buyusername: string
+    /// 市场ID
+    marketid: number
+    /// 原产地
+    origin: string
+    /// 备注
+    remark: string
+    /// 用户ID
+    userid: number
+    /// 仓库ID - 多个, 逗号分隔
+    warehouseids: string
+    /// 
+    warehouseinfosdisplay: string
+    /// [委托单号]买委托单ID(320+Unix秒时间戳(10位)+xxxxxx)
+    wrtradeorderid: number
+    /// 钻石分类 - 枚举”ZSCategory“
+    zscategory: number
+    /// 
+    zscategorydisplay: string
+    /// 净度 - 两个, 逗号分隔
+    zsclaritytype: string
+    /// 
+    zsclaritytypedisplay: string
+    /// 颜色 - 两个, 逗号分隔
+    zscolortype: string
+    /// 
+    zscolortypedisplay: string
+    /// 晶型 - 多个,逗号分隔
+    zscrystaltype: string
+    /// 
+    zscrystaltypedisplay: string
+    /// 货币类型 - 多个, 逗号分隔
+    zscurrencytype: string
+    /// 
+    zscurrencytypedisplay: string
+    /// 切工 - 两个, 逗号分隔
+    zscuttype: string
+    /// 
+    zscuttypedisplay: string
+    /// 彩钻颜色1, 逗号分隔
+    zsczcolor1type: string
+    /// 
+    zsczcolor1typedisplay: string
+    /// 彩钻颜色2, 逗号分隔
+    zsczcolor2type: string
+    /// 
+    zsczcolor2typedisplay: string
+    /// 彩钻颜色3, 逗号分隔
+    zsczcolor3type: string
+    /// 
+    zsczcolor3typedisplay: string
+    /// 荧光 - 多个, 逗号分隔
+    zsfluorescencetype: string
+    ///
+    zsfluorescencetypedisplay: string
+    /// 抛光度 - 两个, 逗号分隔
+    zspolishtype: string
+    /// 
+    zspolishtypedisplay: string
+    /// 形状 - 多个, 逗号分隔
+    zsshapetype: string
+    /// 
+    zsshapetypedisplay: string
+    /// 尺寸 - 两个小数, 逗号分隔
+    zssize: string
+    /// 款式 - 多个, 逗号分隔
+    zsstyletype: string
+    ///
+    zsstyletypedisplay: string
+    /// 对称度 - 两个, 逗号分隔
+    zssymmetrytype: string
+    /// 
+    zssymmetrytypedisplay: string
+    /// 求购信息
+    zstabledisplay: string
+  }
+
+  /// 钻石搜索
+  interface DiamondReq {
+    /// 总条数
+    total?: number; 
+    /// 原产地
+    origin?: string;
+    /// 页码
+    page?: number; 
+    /// 每页大小
+    pagesize?: number; 
+    /// 仓库ID
+    warehouseid?: number; 
+    /// 总重量(克拉重量)-从
+    weight1?: number; 
+    /// 总重量(克拉重量)-至
+    weight2?: number; 
+    /// 平均单颗重量-从
+    weightavg1?: number; 
+    /// 平均单颗重量-至
+    weightavg2?: number; 
+    /// 钻石分类 - 枚举”ZSCategory“
+    zscategory: number; 
+    /// [证书类型string]
+    zscerttype?: string[];
+    /// [净度integer]
+    zsclaritytype?: number[]; 
+    /// [颜色integer]
+    zscolortype?: number[]; 
+    /// [货币类型 - 枚举“ZSCurrencyType”string]
+    zscurrencytype?: string[]; 
+    /// [切工integer]
+    zscuttype?: number[]; 
+    /// [彩钻颜色1string]
+    zsczcolor1type?: string[]; 
+    /// [荧光integer]
+    zsfluorescencetype?: number[]; 
+    /// [抛光度integer]
+    zspolishtype?: number[]; 
+    /// [形状 - 枚举”ZSShapeType“ - 类型：1，2，4，5 ；(1为多个，逗号分隔)string]
+    zsshapetype?: string[]; 
+    /// [款式string]
+    zsstyletype?: string[]; 
+    /// [对称度integer]
+    zssymmetrytype?: number[]; 
+  }
+
+  /// 钻石搜索
+  interface Diamond {
+    /// 资金账号
+    accountid: number
+    /// 申请单ID
+    applyid: number
+    /// 附件1
+    attachment1: string
+    /// 附件2
+    attachment2: string
+    /// 买卖 - 0:买 1:卖
+    buyorsell: number
+    /// 是否可议价 - 0:不可 1:可
+    canbargain: number
+    /// 撤销数量
+    cancelqty: number
+    /// 撤销时间
+    canceltime: string
+    /// 手续费收取方式 1：比率 2：固定
+    chargealgorithm: number
+    /// 手续费设置值(交易所部分)
+    chargealgorithmvalue: number
+    /// 手续费设置值(会员部分)
+    chargealgorithmvalue2: number
+    /// 客户端委托时间
+    clientordertime: string
+    /// 汇率[67]
+    exchangerate: number
+    /// 首付比率 - [挂牌时指定,摘牌时使用]
+    firstratio: number
+    /// 固定价格 - [挂牌]
+    fixedprice: number
+    /// 冻结手续费
+    freezecharge: number
+    /// 冻结首付金额 - [摘牌]
+    freezefirstamount: number
+    /// 冻结保证金
+    freezemargin: number
+    /// 商品编号
+    goodsno: string
+    /// 是否钻石查询
+    isQueryDiamond: boolean
+    /// 是否指定对手 - 0:不指定 1:指定好友(贸易圈) 2:指定对手 - [挂牌]
+    isspecified: number
+    /// 保证金方式 - 1：比率 2：固定
+    marginalgorithm: number
+    /// 保证金设置值
+    marginvalue: number
+    /// 市场ID
+    marketid: number
+    /// 挂牌金额[账户] [67]= OrderQty * FixedPrice * ExchangeRate /100
+    orderamount: number
+    /// 委托数量
+    orderqty: number
+    /// 委托时间
+    ordertime: string
+    /// 履约计划模板ID
+    performancetemplateid: number
+    /// 价格系数(浮动价时填写) - [挂牌]
+    pricefactor: number
+    /// 升贴水(浮动价时填写) - [挂牌]
+    pricemove: number
+    /// 关联委托单号(摘牌委托关联挂牌委托单ID)
+    relatedwrtradeorderid: number
+    /// 错误代码
+    retcode: number
+    /// 卖方(查询字段-模糊查询)
+    sellusername: string
+    /// 交易日(yyyyMMdd)
+    tradedate: string
+    /// 成交价格 - [摘牌] (浮动价 (（商品1价格商品1价格系数+升贴水） 商品1重量系数 + 商品2价格商品2价格系数+商品2升贴水） 商品2重量系数 …)* 委托单价格系数 +　委托单升贴水)
+    tradeprice: number
+    /// 成交数量
+    tradeqty: number
+    /// 解冻手续费
+    unfreezecharge: number
+    /// 解冻首付金额 - [摘牌]
+    unfreezefirstamount: number
+    /// 解冻保证金
+    unfreezemargin: number
+    /// 用户ID
+    userid: number
+    /// 发起端唯一id
+    uuid: string
+    /// 有效期限
+    validtime: string
+    /// 有效类型 - 1当日有效 2本周有效 3指定日期有效 4一直有效
+    validtype: number
+    /// 议价申请单ID
+    wrbargainid: number
+    /// 仓单要素类型ID/商品ID(77)
+    wrfactortypeid: number
+    /// 价格方式 - 1:固定价 2-浮动价 - [挂牌]
+    wrpricetype: number
+    /// 现货商品ID
+    wrstandardid: number
+    /// 仓单贸易委托单ID(320+Unix秒时间戳(10位)+xxxxxx)
+    wrtradeorderid: number
+    /// 委托状态 - 参考枚举’WRTradeOrderStatus’ - 1:委托请求 2:待冻结 3:委托成功 4:委托失败 5:配对成功 6:已撤 7:部成 8:已成 9:部成部撤 10:成交失败 11:委托拒绝 12:经过摘牌(先摘后挂专用) 13:冻结成功(通道交易专用) 14:通道已撤 15:通道部成部撤 16:成交失败违约(荷兰式竞拍专用) 17:冻结PD成功 18:冻结PD失败 19:冻结能量成功 20:冻结能量失败 21:预约已报价 22:过期未付 23:优惠券处理中 24:仓单生成失败 25:首付扣款失败 26:履约失败 27:撤单解冻贷款失败
+    wrtradeorderstatus: number
+    /// 仓单贸易类型 - 1:挂牌 2:摘牌 3:提货卖(文化中国) 4:提货买(文化中国)
+    wrtradetype: number
+    /// 仓单受让用户 - [摘牌]
+    wrtransferuserid: number
+    /// 钻石分类 - 枚举”ZSCategory“
+    zscategory: number
+    /// 货币类型 - 枚举“ZSCurrencyType”
+    zscurrencytype: number
+  }
+
+  /// 查询我的询价-求购
+  interface MyBargainApplyReq {
+    /// 用户ID
+    userid: number 
+    /// 页码
+    page?: number; 
+    /// 每页条数
+    pagesize?: number; 
+    /// 申请状态(不传查全部) - 1:待确认 2:已确认 3:已拒绝 4:已撤销 5:系统撤销 6:处理失败 7:确认中
+    applystatus?: number
+  }
+
+  /// 我的询价-求购
+  interface MyBargainApply {
+    /// 摘牌资金账号
+    accountid: number
+    /// 申请价格
+    applyprice: string
+    /// 摘牌数量
+    applyqty: number
+    /// 申请备注
+    applyremark: string
+    /// 申请状态 - 1:待确认 2:已确认 3:已拒绝 4:已撤销 5:系统撤销 6:处理失败 7:确认中
+    applystatus: number
+    /// 申请时间
+    applytime: string
+    /// 买卖 - 0:买 1:卖
+    buyorsell: number
+    /// 可接受价格(拒绝时填写)-作废
+    confirmprice: number
+    /// 可接受数量(拒绝时填写)-作废
+    confirmqty: number
+    /// 确认备注
+    confirmremark: string
+    /// 确认时间
+    confirmtime: string
+    /// 确认人
+    confirmuserid: number
+    /// 处理状态
+    handlestatus: number
+    /// 摘牌方提单ID [卖]
+    ladingbillid: number
+    /// 市场ID
+    marketid: number
+    /// 挂牌方资金账号
+    matchaccountid: number
+    /// 挂牌方用户ID
+    matchuserid: number
+    /// 参考价格
+    refprice: string
+    /// 委托返回代码
+    retcode: number
+    /// 卖方
+    sellusername: string
+    /// 摘牌方提单子单号 [卖]
+    subnum: number
+    /// 交易日(yyyyMMdd)
+    tradedate: string
+    /// 摘牌人用户ID
+    userid: number
+    /// [询价单号]议价申请单ID(327+Unix秒时间戳(10位)+xxxxxx)
+    wrbargainid: number
+    /// 关联委托单ID
+    wrtradeorderid: number
+  }
+
+  /// 查询我的求购
+  interface MyBuyOrderReq {
+    /// 用户ID
+    userid: number 
+    /// 页码
+    page?: number
+    /// 每页条数
+    pagesize?: number
+    /// 商品(查询字段-模糊查询)
+    zsallproperties?: string
+    /// 钻石分类枚举ID
+    zscategory?: number 
+    /// 委托单号
+    wrtradeorderid?: number
+    /// 是否历史查询
+    ishis?: boolean
+  }
+  /// 我的求购
+  interface MyBuyOrder {
+    /// 资金账户ID
+    accountid: number
+    /// 市场ID
+    marketid: number
+    /// 委托时间
+    ordertime: string
+    /// 原产地
+    origin: string
+    /// 备注
+    remark: string
+    /// 用户ID
+    userid: number
+    /// 有效期限
+    validtime: string
+    /// 仓库ID - 多个, 逗号分隔
+    warehouseids: string
+    warehouseinfosdisplay: string
+    /// [委托单号]买委托单ID(320+Unix秒时间戳(10位)+xxxxxx)
+    wrtradeorderid: string
+    /// 委托状态 - 参考枚举’WRTradeOrderStatus’ - 1:委托请求 2:待冻结 3:委托成功 4:委托失败 5:配对成功 6:已撤 7:部成 8:已成 9:部成部撤 10:成交失败 11:委托拒绝 12:经过摘牌(先摘后挂专用) 13:冻结成功(通道交易专用) 14:通道已撤 15:通道部成部撤 16:成交失败违约(荷兰式竞拍专用) 17:冻结PD成功 18:冻结PD失败 19:冻结能量成功 20:冻结能量失败 21:预约已报价 22:过期未付 23:优惠券处理中 24:仓单生成失败 25:首付扣款失败 26:履约失败 27:撤单解冻贷款失败WRTrade_OrderDetail、
+    wrtradeorderstatus: number
+    /// 钻石分类 - 枚举”ZSCategory“
+    zscategory: number
+    zscategorydisplay: string
+    /// 净度 - 两个, 逗号分隔
+    zsclaritytype: string
+    zscolortype: string
+    zsclaritytypedisplay: string
+    /// 颜色 - 两个, 逗号分隔
+    zscolortypedisplay: string
+    /// 晶型 - 多个,逗号分隔
+    zscrystaltype: string
+    zscrystaltypedisplay: string
+    /// 货币类型 - 多个, 逗号分隔
+    zscurrencytype: string
+    zscurrencytypedisplay: string
+    /// 切工 - 两个, 逗号分隔
+    zscuttype: string
+    zscuttypedisplay: string
+    /// 彩钻颜色1, 逗号分隔
+    zsczcolor1type: string
+    zsczcolor1typedisplay: string
+    zsczcolor2type: string
+    /// 彩钻颜色2, 逗号分隔
+    zsczcolor2typedisplay: string
+    /// 彩钻颜色3, 逗号分隔
+    zsczcolor3type: string
+    zsczcolor3typedisplay: string
+    /// 荧光 - 多个, 逗号分隔
+    zsfluorescencetype: string
+    zsfluorescencetypedisplay: string
+    /// 抛光度 - 两个, 逗号分隔
+    zspolishtype: string
+    zspolishtypedisplay: string
+    /// 形状 - 多个, 逗号分隔
+    zsshapetype: string
+    zssize: string
+    /// 尺寸 - 两个小数, 逗号分隔
+    zsshapetypedisplay: string
+    /// 款式 - 多个, 逗号分隔
+    zsstyletype: string
+    zssymmetrytype: string
+    /// 对称度 - 两个, 逗号分隔
+    zsstyletypedisplay: string
+    zssymmetrytypedisplay: string
+    /// 求购信息
+    zstabledisplay: string
+  }
+
+  /// 查询我的摘牌
+  interface MyDeListingReq {
+    /// 用户ID
+    userid: number 
+    /// 页码
+    page?: number
+    /// 每页条数
+    pagesize?: number
+    /// 商品(查询字段-模糊查询)
+    zsallproperties?: string
+    /// 钻石分类枚举ID
+    zscategory?: number 
+    /// 成交单号
+    wrtradedetailid?: number
+    /// 方向，0-全部(可不传) 1-购买 2-出售
+    buyorsell?: number
+    /// 开始交易日(yyyymmdd)
+    begindate?: string
+    /// 结束交易日(yyyymmdd)
+    enddate?: string
+  }
+
+  /// 我的摘牌
+  interface MyDeListing {
+    /// 买方账号ID
+    buyaccountid: number
+    /// 买方手续费
+    buychargevalue: number
+    /// 方向 - 0:全部 1:买 2:卖
+    buyorsell: number
+    /// 买方用户ID
+    buyuserid: number
+    /// 现货品种ID
+    deliverygoodsid: number
+    /// 汇率
+    exchangerate: number
+    /// 商品编号
+    goodsno: string
+    /// 市场ID
+    marketid: number
+    /// 对手方
+    matchusername: string
+    /// 成交金额[商品币种]
+    oritradeamount: number
+    /// 履约计划ID/合同ID
+    performanceplanid: number
+    /// 卖方账号ID
+    sellaccountid: number
+    /// 卖方手续费
+    sellchargevalue: number
+    /// 卖方用户ID
+    selluserid: number
+    /// 成交金额
+    tradeamount: number
+    /// 交易日(yyyyMMdd)
+    tradedate: string
+    /// 成交价格
+    tradeprice: number
+    /// 成交数量
+    tradeqty: number
+    /// 成交时间
+    tradetime: string
+    /// 用户ID
+    userid: number
+    /// 仓单要素类型ID
+    wrfactortypeid: number
+    /// 现货商品ID
+    wrstandardid: number
+    /// 仓单贸易成交单ID(321+Unix秒时间戳(10位)+xxxxxx)
+    wrtradedetailid: number
+    /// 钻石分类 - 枚举”ZSCategory“
+    zscategory: number
+    ///
+    zscategorydisplay: string
+    /// 货币类型 - 枚举“ZSCurrencyType”
+    zscurrencytype: number
+  }
+
+  /// 查询我的询价-出售
+  interface MyDelistingApplyReq {
+    /// 用户ID
+    userid: number 
+    /// 页码
+    page?: number
+    /// 每页条数
+    pagesize?: number
+    /// 申请状态(不传查全部) - 1:待确认 2:已确认 3:已拒绝 4:已撤销 5:系统撤销 6:处理失败 7:确认中
+    applystatus?: number
+  }
+
+  /// 我的询价-出售
+  interface MyDelistingApply {
+    /// 申请价格
+    applyprice: number
+    /// 申请数量
+    applyqty: number
+    /// 申请备注
+    applyremark: string
+    /// 申请状态 - 1:待确认 2:已确认 3:已拒绝 4:已撤销 5:系统撤销 6:处理失败 7:确认中
+    applystatus: number
+    /// 申请时间
+    applytime: string
+    /// 确认备注
+    auditremark: string
+    /// 确认时间
+    audittime: string
+    /// 买方用户ID
+    buyuserid	: number
+    /// 买方
+    buyusername: string
+    /// 买委托单ID
+    buywrtradeorderid: number
+    /// 卖方提单ID
+    ladingbillid: number
+    /// 市场ID
+    marketid: number
+    /// 卖方账户ID
+    sellaccountid: number
+    /// [询价单号]卖摘牌申请ID(916+Unix秒时间戳(10位)+xxxxxx)
+    selldelistingapplyid: number
+    /// 卖方委托ID（买方确认成交后更新）
+    selltradeorderid: number
+    /// 卖方用户ID
+    selluserid: number
+    /// 卖方提单子单号
+    subnum: number
+    /// 仓单要素类型ID
+    wrfactortypeid: number
+    /// 现货商品ID
+    wrstandardid: number
+  }
+
+    /// 获取钻石详情
+  interface GetGoodsReq {
+    /// 商品编号
+    goodsno: string
+  }
+
+  /// 获取钻石详情
+  interface GetGoods {
+    /// 证书编号 - 类型：2，4，5
+    cerno: string
+    /// 金伯利证书编号 - 类型：3
+    cpcertno:	string
+    /// 商品编号
+    goodsno: string
+    /// 商品照片(相对地址)
+    imagepath: string
+    /// 是否有效 - 0:无效 1:有效
+    isvalid: number
+    /// 金伯利证书图片(相对地址) - 类型：3
+    kppath: string
+    /// 金伯利证书重量 - 类型：3
+    kpweight: string
+    /// 市场价
+    marketprice: string
+    /// 原产地 - 类型：3
+    origin: string
+    /// 总价(价格) - 类型：1，2，3，4，5
+    price: number
+    /// 克拉单价 - 类型：1，2，3，5
+    priceper: string
+    /// 备注
+    remark: string
+    /// 手机号码(加密存储)
+    sellmobile: string
+    /// 账户名称(机构名称)
+    sellusername: string
+    /// 镶嵌材料 - 类型：4
+    settingmaterial: string
+    /// 尺寸1 - 类型：2，4，5
+    size1: string
+    /// 尺寸2 - 类型：2，4，5
+    size2: string
+    /// 尺寸3 - 类型：2，4，5
+    size3: string
+    /// 配石描述 - 类型：4
+    stonedesc: string
+    /// 用户ID
+    userid: number
+    /// 仓库ID
+    warehouseid: number
+    ///
+    warehousenamedisplay: string
+    /// 总重量(克拉重量) - 类型：1，2，3，4，5
+    weight: number
+    /// 平均单颗重量 - 类型：1，3
+    weightavg: number
+    /// 仓单扫描件(相对地址)
+    wrpath: string
+    /// 现货商品ID
+    wrstandardid: number
+    /// 钻石分类 - 枚举”ZSCategory“
+    zscategory: number
+    ///
+    zscategorydisplay: string
+    /// 证书类型 - 枚举”ZSCertType“ - 类型：2，4，5
+    zscerttype: number
+    /// 
+    zscerttypedisplay: string
+    /// 净度1 - 枚举”ZSClarityType“ - 类型：1，2，3，4，5
+    zsclaritytype1: number
+    /// 
+    zsclaritytype1display: string
+    /// 净度2 - 枚举”ZSClarityType“ - 类型：1，3
+    zsclaritytype2: number
+    /// 
+    zsclaritytype2display: string
+    /// 颜色1 - 枚举”ZSColorType“ - 类型：1，2，3，4
+    zscolortype1: number
+    /// 
+    zscolortype1display: string
+    /// 颜色2 - 枚举”ZSColorType“ - 类型：1，3
+    zscolortype2: number
+    ///
+    zscolortype2display: string
+    /// 晶型范围 - 枚举“ZSCrystalType“ - 类型：3， 多个，逗号分隔
+    zscrystaltype: string
+    /// 
+    zscrystaltypedisplay: string
+    /// 货币类型 - 枚举“ZSCurrencyType”
+    zscurrencytype: number
+    ///
+    zscurrencytypedisplay: string
+    ///
+    zscurrencytypedisplayunit: string
+    /// 切工1 - 枚举”ZSCutType“ - 类型：1，2，4，5
+    zscuttype1: number
+    /// 
+    zscuttype1display: string
+    /// 切工2 - 枚举”ZSCutType“ - 类型：1
+    zscuttype2: number
+    ///
+    zscuttype2display: string
+    /// 彩钻颜色1 - 枚举”ZSCZColor1Type“ - 类型：5
+    zsczcolor1type: number
+    /// 
+    zsczcolor1typedisplay: string
+    /// 彩钻颜色2 - 枚举”ZSCZColor2Type“ - 类型：5
+    zsczcolor2type: number
+    /// 
+    zsczcolor2typedisplay: string
+    /// /// 彩钻颜色3 - 枚举”ZSCZColor3Type“ - 类型：5
+    zsczcolor3type: number
+    ///
+    zsczcolor3typedisplay: string
+    /// 荧光1 - 枚举”ZSFluorescenceType“ - 类型：1，2，3，4，5
+    zsfluorescencetype1: number
+    /// 
+    zsfluorescencetype1display: string
+    /// 荧光2 - 枚举”ZSFluorescenceType” - 类型：1，3
+    zsfluorescencetype2: number
+    ///
+    zsfluorescencetype2display: string
+    /// 抛光度1 - 枚举”ZSPolishType“ - 类型：1，2，4，5
+    zspolishtype1: number
+    /// 
+    zspolishtype1display: string
+    /// 抛光度2 - 枚举”ZSPolishType“ - 类型：1
+    zspolishtype2: number
+    /// 
+    zspolishtype2display: string
+    /// 形状 - 枚举”ZSShapeType“ - 类型：1，2，4，5 ；(1为多个，逗号分隔)
+    zsshapetype: string
+    /// 
+    zsshapetypedisplay: string
+    /// 款式 - 类型：4
+    zsstyletype: number
+    /// 
+    zsstyletypedisplay: string
+    /// 对称度1 - 枚举”ZSSymmetryType“ - 类型：1，2，4，5
+    zssymmetrytype1: number
+    /// 
+    zssymmetrytype1display: string
+    /// 对称度2 - 枚举”ZSSymmetryType“ - 类型：1
+    zssymmetrytype2: number
+    /// 
+    zssymmetrytype2display: string
+  }
+
+  /// 查询汇率信息
+  interface RatesReq {
+    /// 源币种ID
+    oricurrencyid?: number 
+    /// 页码
+    page?: number
+    /// 每页条数
+    pagesize?: number
+    /// 目标币种ID
+    descurrencyid?: number
+  }
+
+  /// 汇率信息
+  interface Rates {
+    /// 目标币种ID
+    descurrencyid: number
+    /// 汇率
+    exchangerate: number
+    /// 源币种ID
+    oricurrencyid: number
+    /// 备注
+    remark: string
+  }
+
+  /// 通知公告系统消息查询
+  interface NoticeReq {
+    /// 登录账号
+    loginID: number 
+    /// 页码
+    page?: number
+    /// 每页条数
+    pagesize?: number
+    /// 消息类型 - 1:公告通知 2:系统消息
+    msgType?: number
+    /// 是否只获取未读信息
+    onlyUnRead?: boolean
+    /// 自增ID，传入后会返回这个ID后面的记录
+    lastID?: number
+  }
+
+  /// 通知公告系统消息
+  interface Notice {
+    /// 审核人
+    auditoruserid: number
+    /// 审核备注
+    auditremark: string
+    /// 审核日期
+    audittime: string
+    /// 自增ID
+    autoid: number
+    /// 内容
+    content: string
+    /// 创建时间
+    createtime: string
+    /// 建仓人
+    creatorid: number
+    /// 结束时间
+    endtime: string
+    /// 是否置顶 - 0:不置顶 1:置顶
+    istop: number
+    /// 消息图标Url
+    msgiconurl: string
+    /// 消息类型 - 1:公告通知 2:系统消息 3:商品到期提货通知
+    msgtype: number
+    /// 消息发布者
+    publisher: string
+    /// 是否已读
+    readed:	boolean
+    /// 计划发送时间
+    scheduletime: string
+    /// 推送方式 - 1：全体广播 2：按会员广播 3：个人推送 4:按会员广播(仅会员)
+    sendtype: number
+    /// 推送状态 - 0:未推送 1:已推送 2:审核拒绝
+    sentstatus: number
+    /// 标题
+    title: string
+    /// 会员/投资者ID推送方式 为 个人时，填写投资者ID
+    userid: number
+  }
+}

GuangZuan/project.config.json

@@ -13,7 +13,7 @@
       "less"
     ],
     "ignoreDevUnusedFiles": false,
-    "ignoreUploadUnusedFiles": false,
+    "ignoreUploadUnusedFiles": true,
     "urlCheck": true,
     "coverView": true,
     "es6": true,

GuangZuan/project.private.config.json

@@ -24,22 +24,15 @@
           "scene": null
         },
         {
-          "name": "钻石交易",
-          "pathName": "pages/trade/trade",
+          "name": "商品详情",
+          "pathName": "mHome/pages/goodsdetail/goodsdetail",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "钻石圈",
-          "pathName": "pages/circle/circle",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "收藏",
-          "pathName": "mCircle/pages/favorite/favorite",
+          "name": "全部首饰",
+          "pathName": "mHome/pages/jewelry/jewelry",
           "query": "",
           "launchMode": "default",
           "scene": null