代码提交；

GuangZuan/miniprogram/app.json

@@ -5,7 +5,8 @@
     "pages/register/register",
     "pages/circle/circle",
     "pages/trade/trade",
-    "pages/mine/mine"
+    "pages/mine/mine",
+    "pages/forgetpwd/forgetpwd"
   ],
   "preloadRule": {
     "pages/mine/mine": {
@@ -56,7 +57,6 @@
       "name": "mMine",
       "pages": [
         "pages/myinventorys/list/list",
-        "pages/realauth/realauth",
         "pages/myorders/list/list",
         "pages/myorders/his/his",
         "pages/bank/bank",
@@ -70,7 +70,9 @@
         "pages/myperformance/his/his",
         "pages/myperformance/detail/detail",
         "pages/myperformance/modify/modify",
-        "pages/myperformance/breach/breach"
+        "pages/myperformance/breach/breach",
+        "pages/modifypwd/modifypwd",
+        "pages/inoutgold/inoutgold"
       ]
     },
     {

GuangZuan/miniprogram/mCircle/pages/contrast/contrast.json

@@ -1,3 +1,4 @@
 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "钻石对比"
 }

GuangZuan/miniprogram/mCircle/pages/contrast/contrast.less

@@ -1 +1,65 @@
-/* mCircle/pages/contrast/contrast.wxss */
+/* mCircle/pages/contrast/contrast.wxss */
+
+.top-view {
+  position: sticky;
+  top: 0;
+  z-index: 999;
+  background-color: white;
+
+  .image-view {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    align-content: center;
+    margin-top: 10px;
+    border-bottom: 1px solid #f0f0f0;
+
+    .item-image-view {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      width: 150px;
+
+      .goodsno {
+        height: 30px;
+        margin-top: 5px;
+        color: #333;
+        font-size: 14px;
+        text-align: center;
+        width: 100%;
+      }
+    }
+  }
+}
+
+.container {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  align-content: center;
+  align-items: center;
+
+  .item {
+    width: 95%;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    align-content: center;
+    height: 45px;
+    border-bottom: 1px solid #f0f0f0;
+
+    text {
+      font-size: 14px;
+      color: #333;
+      text-align: center;
+      width: 150px;
+    }
+
+    text:nth-child(1) {
+      width: 80px;
+      text-align: left;
+    }
+  }
+}

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

@@ -5,7 +5,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    /// 钻石数据
+    values: <GuangZuan.MyFavorite[]>[]
   },
 
   /**
@@ -19,8 +20,10 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad() {
-
+  onLoad(options: any) {
+    /// 解析上层传过来的参数
+    const objs = <GuangZuan.MyFavorite[]>JSON.parse(options.params)
+    this.setData({ values: objs })
   },
 
   /**

GuangZuan/miniprogram/mCircle/pages/contrast/contrast.wxml

@@ -7,8 +7,104 @@
     <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
     <text slot="title" style="color: white;">钻石比对</text>
   </van-nav-bar>
+
+  <!-- 图片区域 -->
+  <view class="image-view">
+    <!-- 空白处 -->
+    <view style="width: 80px;"></view>
+    
+    <view class="item-image-view" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">
+      <!-- 图片 -->
+      <van-image src="https://img.yzcdn.cn/vant/cat.jpeg" width="50" height="50"></van-image>
+      <!-- 商品编号 -->
+      <text class="goodsno">{{itm.goodsno}}</text>
+    </view>
+  </view>
 </view>
 
+ <!-- 内容区域 -->
 <view class="container">
-  
+  <!-- 重量 -->
+  <view class="item weight">
+    <text class="title">重量</text>
+    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.weight}}ct</text>
+  </view>
+
+  <!-- 价格 -->
+  <view class="item price">
+    <text class="title">价格</text>
+    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">￥{{itm.price}}</text>
+  </view>
+
+  <!-- 克拉单价 -->
+  <view class="item priceper">
+    <text class="title">克拉单价</text>
+    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">￥{{itm.priceper}}</text>
+  </view>
+
+  <!-- 市场价 -->
+  <view class="item marketprice">
+    <text class="title">市场价</text>
+    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">￥{{itm.marketprice}}</text>
+  </view>
+
+  <!-- 仓库 -->
+  <view class="item warehousenamedisplay">
+    <text class="title">仓库</text>
+    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.warehousenamedisplay}}</text>
+  </view>
+
+  <!-- 卖家 -->
+  <view class="item sellusername">
+    <text class="title">卖家</text>
+    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.sellusername}}</text>
+  </view>
+
+  <!-- 形状 -->
+  <view class="item zsshapetypedisplay">
+    <text class="title">形状</text>
+    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.zsshapetypedisplay}}</text>
+  </view>
+
+  <!-- 颜色 -->
+  <view class="item zscolortype1display">
+    <text class="title">颜色</text>
+    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.zscolortype1display}}</text>
+  </view>
+
+  <!-- 净度 -->
+  <view class="item zsclaritytype1display">
+    <text class="title">净度</text>
+    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.zsclaritytype1display}}</text>
+  </view>
+
+  <!-- 切工 -->
+  <view class="item zscuttype1display">
+    <text class="title">切工</text>
+    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.zscuttype1display}}</text>
+  </view>
+
+  <!-- 对称 -->
+  <view class="item zsfluorescencetype1display">
+    <text class="title">对称</text>
+    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.zsfluorescencetype1display}}</text>
+  </view>
+
+  <!-- 荧光 -->
+  <view class="item zspolishtype1display">
+    <text class="title">荧光</text>
+    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.zspolishtype1display}}</text>
+  </view>
+
+  <!-- 尺寸 -->
+  <view class="item sizedisplay">
+    <text class="title">尺寸</text>
+    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.sizedisplay}}</text>
+  </view>
+
+  <!-- 证书 -->
+  <view class="item zscerttypedisplay">
+    <text class="title">证书</text>
+    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.zscerttypedisplay}}</text>
+  </view>
 </view>

GuangZuan/miniprogram/mHome/pages/bond/list/list.less

@@ -8,7 +8,7 @@
   .title-view {
     margin: 10px;
     background-color: #f0f0f0;
-    height: 100px;
+    height: 80px;
     border-radius: 10px;
     display: flex;
     align-items: center;
@@ -16,7 +16,7 @@
     flex-direction: column;
     padding: 5px 10px;
   
-    .title-view-up, .title-view-mid, .title-view-down {
+    .title-view-up, .title-view-mid, .title-view-dwn {
       display: flex;
       flex-direction: row;
       justify-content: space-between;
@@ -24,6 +24,7 @@
       height: 50%;
       width: 100%;
       align-content: center;
+      padding: 5px 0px;
   
       text {
         color: #666;
@@ -31,7 +32,7 @@
       }
     }
   
-    .title-view-up, .title-view-mid {
+    .title-view-up {
       border-bottom: 1px solid #ddd;
     }
   }
@@ -39,7 +40,6 @@
 
 .item-view {
   margin: 10px;
-  height: 90px;
   border-radius: 10px;
   display: flex;
   align-items: center;
@@ -48,7 +48,7 @@
   padding: 5px 10px;
   border: 1px solid #ddd;
 
-  .item-view-up, .item-view-mid, .item-view-down {
+  .item-view-up, .item-view-mid, .item-view-dwn {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
@@ -56,20 +56,36 @@
     height: 50%;
     width: 100%;
     align-content: center;
+    height: 25px;
 
     text {
       color: #333;
       font-size: 13px;
+      /*超出隐藏*/
+      overflow: hidden;
+        /*溢出不换行*/
+      white-space: nowrap;
+      /*溢出显示用省略号*/
+      text-overflow: ellipsis;
+      text-align: center;
     }
 
-    .price {
-      color: red;
-      font-size: 15px;
+    :first-child {
+      text-align: left;
+    }
+
+    :last-child {
+      text-align: right;
     }
   }
 
-  .item-view-up, .item-view-mid {
+  .item-view-up {
     border-bottom: 1px solid #ddd;
+    padding-bottom: 5px;
+
+    text {
+      width: 25%;
+    }
   }
 }
 

GuangZuan/miniprogram/mHome/pages/bond/list/list.ts

@@ -2,7 +2,8 @@
 
 import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
 import { queryGZBSFWOrder } from "../../../../services/api/trade/index"
-import { userid } from "../../../../services/utils"
+import { getExecutestatus, userid } from "../../../../services/utils"
+import { isnullstr } from "../../../../utils/util"
 
 Page({
 
@@ -15,13 +16,15 @@ Page({
     /// tab索引
     active: 0,
     /// 列头
-    titles: [['总净重（ct）', '总净重（g）', '总毛重（g）', '单据编号'],
-             ['总值（USD）', '单价（USD/ct）', '状态'],
-             ['内容', '备注']],
+    titles: [['总净重（ct）| 总净重（g）| 总毛重（g）', '单据编号'],
+             ['总值（USD）| 单价（USD/ct）', '状态'],
+             ['内容 | 备注']],
     /// 是否空数据
     isEmpty: true,
     /// 数据信息
-    bonds: <GuangZuan.GZBSFWOrder[]>[]
+    bonds: <GuangZuan.GZBSFWOrder[]>[],
+    /// 显示的值
+    values: [{ up: [''], mid: [''], dwn: [''] }]
   },
 
   /**
@@ -64,14 +67,30 @@ Page({
         /// 数据赋值
         this.setData({ 
           bonds: res.data,
-          isEmpty: res.data.length == 0
+          /// 显示的值
+          values: res.data.map(obj => {
+            return {up: [obj.totalnetweigthct.toString()+' | '+ 
+                         obj.totalnetweightgm.toString()+' | '+
+                         obj.totalgrossweightgm.toString(),
+                        isnullstr(obj.orderno)], 
+                    mid:[obj.totalamount.toString(), 
+                         obj.priceper.toString(), 
+                         getExecutestatus(obj.executestatus)],
+                    dwn: [obj.contentrange.toString()+' | '+ '--',
+                          '']}
+          })
         })
       },
       fail: (emsg) => {
         /// 加载失败
         Toast.fail({ message: '加载失败...'+emsg});
       },
-      complete: () => {}
+      complete: () => {
+        /// 数据赋值
+        this.setData({  isEmpty: this.data.values.length == 0 })
+        /// 停止下拉刷新
+        wx.stopPullDownRefresh()
+      }
     })
   },
 

GuangZuan/miniprogram/mHome/pages/bond/list/list.wxml

@@ -22,7 +22,7 @@
     <view class="title-view-mid">
       <text wx:for="{{titles[1]}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">{{itm}}</text>
     </view>
-    <view class="title-view-down">
+    <view class="title-view-dwn">
       <text wx:for="{{titles[2]}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">{{itm}}</text>
     </view>
   </view>
@@ -31,21 +31,16 @@
 <!-- 内容滚动视图 --> 
 <scroll-view class="content-view" style="padding-bottom: {{safeBottom+48}}px;">
   <!-- 数据 --> 
-  <van-swipe-cell wx:for="{{bonds}}" wx:for-item="data" wx:for-index="idx" wx:key="applyid">
+  <van-swipe-cell wx:for="{{values}}" wx:for-item="itm" wx:for-index="idx" wx:key="applyid">
     <view class="item-view">
       <view class="item-view-up">
-        <text>{{data.totalnetweigthct}}</text>
-        <text>{{data.totalnetweightgm}}</text>
-        <text>{{data.totalgrossweightgm}}</text>
-        <text>{{data.orderno}}</text>
+        <text wx:for="{{itm.up}}" wx:for-item="data" wx:for-index="idx" wx:key="idx">{{data}}</text>
       </view>
       <view class="item-view-mid">
-        <text>{{data.totalamount}}</text>
-        <text>{{data.priceper}}</text>
-        <text>{{data.executestatus}}</text>
+        <text wx:for="{{itm.mid}}" wx:for-item="data" wx:for-index="idx" wx:key="idx">{{data}}</text>
       </view>
-      <view class="item-view-down">
-        <text>{{data.contentrange}}</text>
+      <view class="item-view-dwn">
+        <text wx:for="{{itm.dwn}}" wx:for-item="data" wx:for-index="idx" wx:key="idx">{{data}}</text>
       </view>
     </view>
   </van-swipe-cell>

GuangZuan/miniprogram/mHome/pages/inspection/list/list.less

@@ -16,7 +16,7 @@
     flex-direction: column;
     padding: 5px 10px;
   
-    .title-view-up, .title-view-down {
+    .title-view-up, .title-view-dwn {
       display: flex;
       flex-direction: row;
       justify-content: space-between;
@@ -39,7 +39,6 @@
 
 .item-view {
   margin: 10px;
-  height: 90px;
   border-radius: 10px;
   display: flex;
   align-items: center;
@@ -48,7 +47,7 @@
   padding: 5px 10px;
   border: 1px solid #ddd;
 
-  .item-view-up, .item-view-down {
+  .item-view-up, .item-view-dwn {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
@@ -56,19 +55,35 @@
     height: 50%;
     width: 100%;
     align-content: center;
+    height: 25px;
 
     text {
       color: #333;
       font-size: 13px;
+      /*超出隐藏*/
+      overflow: hidden;
+        /*溢出不换行*/
+      white-space: nowrap;
+      /*溢出显示用省略号*/
+      text-overflow: ellipsis;
+      text-align: center;
     }
 
-    .price {
-      color: red;
-      font-size: 15px;
+    :first-child {
+      text-align: left;
+    }
+
+    :last-child {
+      text-align: right;
     }
   }
 
   .item-view-up {
     border-bottom: 1px solid #ddd;
+    padding-bottom: 5px;
+
+    text {
+      width: 25%;
+    }
   }
 }

GuangZuan/miniprogram/mHome/pages/inspection/list/list.ts

@@ -1,7 +1,7 @@
 import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
 import { queryGZCJJCOrder } from "../../../../services/api/trade/index"
-import { userid } from "../../../../services/utils"
-
+import { userid, getExecutestatus } from "../../../../services/utils"
+import { isnullstr } from "../../../../utils/util"
 
 // mHome/pages/inspection/list/list.ts
 Page({
@@ -16,11 +16,13 @@ Page({
     active: 0,
     /// 列头
     titles: [['货物品类', '送检账户', '单据编号'],
-             ['总重量（粒）', '总重量（ct）', '总参考值（USD）', '状态']],
+             ['总重量（粒） 总重量（ct） 总参考值（USD）', '状态']],
     /// 是否空数据
     isEmpty: true,
     /// 数据信息
-    orders: <GuangZuan.GZCJJCOrder[]>[]
+    orders: <GuangZuan.GZCJJCOrder[]>[],
+    /// 显示的值
+    values: [{ up: [''], dwn: [''] }]
   },
 
   /**
@@ -57,20 +59,34 @@ Page({
       success: (res) => {
         if (res.code != 200) {
           /// 加载失败
-          Toast.success({ message: '加载失败...'});
+          Toast.success({ message: '加载失败，原因：'+res.msg});
           return
         }
         /// 数据赋值
         this.setData({ 
           orders: res.data,
-          isEmpty: res.data.length == 0
+          /// 显示的值
+          values: res.data.map(obj => {
+            return {up: [obj.gzcjcategorytypedisplay, 
+                         obj.gzcjaccount, 
+                        isnullstr(obj.orderno)], 
+                    dwn: [obj.totalnumber.toString()+'粒'+' '+
+                          obj.totalgrossweight.toString()+'ct'+' | '+
+                          obj.totalweightgm.toString()+'USD',
+                          getExecutestatus(obj.executestatus)]}
+          })
         })
       },
       fail: (emsg) => {
         /// 加载失败
         Toast.fail({ message: '加载失败...'+emsg});
       },
-      complete: () => {}
+      complete: () => {
+        /// 数据赋值
+        this.setData({  isEmpty: this.data.values.length == 0 })
+        /// 停止下拉刷新
+        wx.stopPullDownRefresh()
+      }
     })
   },
 

GuangZuan/miniprogram/mHome/pages/inspection/list/list.wxml

@@ -19,7 +19,7 @@
     <view class="title-view-up">
       <text wx:for="{{titles[0]}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">{{itm}}</text>
     </view>
-    <view class="title-view-down">
+    <view class="title-view-dwn">
       <text wx:for="{{titles[1]}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">{{itm}}</text>
     </view>
   </view>
@@ -28,18 +28,13 @@
 <!-- 内容滚动视图 --> 
 <scroll-view class="content-view" style="padding-bottom: {{safeBottom+48}}px;">
   <!-- 数据 --> 
-  <van-swipe-cell wx:for="{{bonds}}" wx:for-item="data" wx:for-index="idx" wx:key="applyid">
+  <van-swipe-cell wx:for="{{values}}" wx:for-item="itm" wx:for-index="idx" wx:key="applyid">
     <view class="item-view">
       <view class="item-view-up">
-        <text>{{data.gzcjcategorytype}}</text>
-        <text>{{data.gzcjaccount}}</text>
-        <text>{{data.orderno}}</text>
+        <text wx:for="{{itm.up}}" wx:for-item="data" wx:for-index="idx" wx:key="idx">{{data}}</text>
       </view>
-      <view class="item-view-down">
-        <text>{{data.totalnumber}}</text>
-        <text>{{data.totalgrossweight}}</text>
-        <text>{{data.totalweightgm}}</text>
-        <text>{{data.executestatus}}</text>
+      <view class="item-view-dwn">
+        <text wx:for="{{itm.dwn}}" wx:for-item="data" wx:for-index="idx" wx:key="idx">{{data}}</text>
       </view>
     </view>
   </van-swipe-cell>

GuangZuan/miniprogram/mMine/pages/address/list/list.ts

@@ -43,7 +43,7 @@ Page({
       },
       complete: () => {
         /// hideLoading
-        wx.hideLoading()
+        Toast.clear()
         /// 结束下拉刷新
         wx.stopPullDownRefresh()
         /// 判断数据是否为空

GuangZuan/miniprogram/mMine/pages/bank/bank.less

@@ -1 +1,6 @@
-/* mMine/pages/bank/bank.wxss */
+/* mMine/pages/bank/bank.wxss */
+
+.button-view {
+  margin: 20px;
+  border-radius: 10px;
+}

GuangZuan/miniprogram/mMine/pages/bank/bank.ts

@@ -5,6 +5,28 @@ Page({
    * 页面的初始数据
    */
   data: {
+    /// 开户银行
+    bankName: '',
+    /// 银行卡号
+    bankNo: '',
+    /// 姓名
+    accountName: '',
+    /// 支行名称
+    branchBankName: ''
+  },
+
+   /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+  /**
+   * 按钮点击响应事件
+   */
+  onButtonPressed() {
 
   },
 

GuangZuan/miniprogram/mMine/pages/bank/bank.wxml

@@ -1,2 +1,27 @@
 <!--pages/mine/bank/bank.wxml-->
 
+<view class="topView">
+  <!-- 导航栏 -->
+  <van-nav-bar custom-style="background-color: #E92020">
+    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
+    <text slot="title" style="color: white;">添加签约账户</text>
+  </van-nav-bar>
+</view>
+
+<!-- 内容 -->
+<van-cell-group>
+  <!-- 开户银行 -->
+  <van-field model:value="{{ mobile }}" disabled is-link label="开户银行" required clearable placeholder="请选择开户银行">
+  </van-field>
+  <!-- 银行卡号 -->
+  <van-field model:value="{{ code }}" type="number" label="银行卡号" required clearable placeholder="请输入银行卡号"/>
+  <!-- 姓名 -->
+  <van-field model:value="{{ code }}" label="姓名" required clearable placeholder="请输入姓名"/>
+  <!-- 支行名称 -->
+  <van-field model:value="{{ code }}" label="支行名称" required clearable placeholder="请填写开户支行名称"/>
+</van-cell-group>
+
+<!-- 按钮 -->
+<view class="button-view">
+  <van-button custom-class="submit" color="linear-gradient(to right, #4bb0ff, #6149f6)" block bind:click="onButtonPressed">提交</van-button>
+</view>

GuangZuan/miniprogram/mMine/pages/inoutgold/inoutgold.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "van-uploader": "@vant/weapp/uploader/index"
+  },
+  "navigationBarTitleText": "充值提现"
+}

GuangZuan/miniprogram/mMine/pages/inoutgold/inoutgold.less

@@ -0,0 +1,140 @@
+/* mMine/pages/inoutgold/inoutgold.wxss */
+
+.container {
+  display: flex;
+  flex-direction: column;
+  align-content: center;
+  align-items: center;
+  justify-content: space-between;
+
+  .out-gold-view, .into-gold-view {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: center;
+    align-content: center;
+    width: 96%;
+
+    .item {
+      width: 100%;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-content: center;
+      align-items: center;
+      height: 50px;
+      border-bottom: 1px solid #f0f0f0;
+
+      .title {
+        width: 150px;
+        font-size: 14px;
+        color: #666;
+        text-align: left;
+      }
+
+      .value {
+        font-size: 14px;
+        color: #333;
+        text-align: left;
+        width: 100%;
+      }
+    }
+
+    .credentials {
+      height: 150px;
+
+      .credentials-top-view {
+        display: flex;
+        flex-direction: column;
+        width: 100%;
+        height: 80%;
+        
+        .value {
+          width: 100%;
+          height: 30px;
+        }
+
+        .upload {
+          padding-top: 10px 0px;
+          display: flex;
+          justify-content: left;
+          align-items: center;
+        }
+      }
+    }
+  }
+
+  #into-amount-field {
+    width: 112%;
+    color: #333;
+    font-size: 14px;
+  }
+
+  #item-out-amount {
+    height: 80px;
+    border-top: 1px solid #f0f0f0;
+
+    .out-amount-view {
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      align-content: center;
+      align-items: center;
+
+      #out-amount-field {
+        width: 112%;
+        color: #333;
+        font-size: 14px;
+      }
+
+      .enable-out-amount-view {
+        width: 100%;
+        height: 30px;
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+        align-content: center;
+        padding-bottom: 5px;
+
+        .enable-out-amount {
+          font-size: 14px;
+          color: #666;
+          text-align: left;
+          width: 100%;
+        }
+
+        #allamount {
+          color: #333;
+          font-size: 12px;
+          padding: 10px;
+        }
+      }
+    }
+  }
+  
+  .inout-time-view {
+    padding-top: 20px;
+    height: 45px;
+    width: 100%;
+    align-items: center;
+    display: flex;
+    justify-content: space-around;
+  
+    .inout-time {
+      width: 95%;
+      font-size: 13px;
+      color: #666;
+      text-align: left;
+    }
+  }
+
+  
+  .button-view {
+    border-radius: 10px;
+    width: 95%;
+    padding-top: 15px;
+  }
+}
+

GuangZuan/miniprogram/mMine/pages/inoutgold/inoutgold.ts

@@ -0,0 +1,92 @@
+// mMine/pages/inoutgold/inoutgold.ts
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    /// tab激活索引
+    active: 0,
+    /// tabs
+    tabs: [{id: 0, name: '充值'},  {id: 1, name: '提现'}],
+  },
+
+  /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+  /**
+   * tab触发事件
+   */
+  onTabChange(e: any) {
+    /// 设置激活项
+    this.setData({ active: e.detail.index })
+  },
+
+  /**
+   * 按钮点击响应事件
+   */
+  onButtonPressed() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad() {
+    
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

GuangZuan/miniprogram/mMine/pages/inoutgold/inoutgold.wxml

@@ -0,0 +1,86 @@
+<!--mMine/pages/inoutgold/inoutgold.wxml-->
+
+<view class="topView">
+  <!-- 导航栏 -->
+  <van-nav-bar custom-style="background-color: #E92020">
+    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
+    <text slot="title" style="color: white;">充值提现</text>
+  </van-nav-bar>
+
+  <!-- tabs -->
+  <view class="tab-view">
+    <van-tabs swipeable bind:change="onTabChange">
+      <van-tab wx:for="{{tabs}}" active="{{active}}" wx:for-item="itm" wx:key="id" id="{{itm.id}}" title="{{itm.name}}"/>
+    </van-tabs>  
+  </view>
+</view>
+
+<!-- 内容视图 -->
+<view class="container">
+  <!-- 入金视图 -->
+  <view class="into-gold-view" wx:if="{{active == 0}}">
+
+    <!-- 充值金额 -->
+    <view class="item amount">
+      <text class="title">充值金额</text>
+      <van-field id="into-amount-field" type="number" border="{{false}}" placeholder="请输入充值金额"></van-field>
+    </view>
+
+    <!-- 凭证 -->
+    <view class="item credentials">
+      <text class="title">凭证</text>
+      <view class="credentials-top-view">
+        <text class="value">请上传银行充值流水截图</text>
+        <!-- 凭证图片 -->
+        <view class="upload"><van-uploader></van-uploader></view> 
+      </view>
+    </view>
+  </view>
+
+  <!-- 出金视图 -->
+  <view class="out-gold-view" wx:if="{{active == 1}}">
+    <!-- 提现金额 -->
+    <view class="item out-amount" id="item-out-amount">
+      <text class="title">提现金额</text>
+      <view class="out-amount-view">
+        <van-field id="out-amount-field" type="number" border="{{false}}" placeholder="请输入提现金额"></van-field>
+        <view class="enable-out-amount-view">
+          <text class="enable-out-amount">可提现金额0.00</text>
+          <van-button id="allamount" type="small" bind:click="onButtonPressed">全部</van-button>
+        </view>
+      </view>
+    </view>
+
+    <!-- 开户银行 -->
+    <view class="item bankName">
+      <text class="title">开户银行</text>
+      <text class="value">工商银行</text>
+    </view>
+
+    <!-- 银行卡号 -->
+    <view class="item banNo">
+      <text class="title">银行卡号</text>
+      <text class="value">88888888888888</text>
+    </view>
+
+    <!-- 姓名 -->
+    <view class="item accountName">
+      <text class="title">姓名</text>
+      <text class="value">1100744</text>
+    </view>
+
+    <!-- 支行名称 -->
+    <view class="item branchBankName">
+      <text class="title">支行名称</text>
+      <text class="value">深圳市支行</text>
+    </view>
+  </view>
+
+  <!-- 提现时间 -->
+  <view class="inout-time-view"><text class="inout-time">提现时间：07：00-22：00</text></view>
+
+  <!-- 按钮 -->
+  <view class="button-view">
+    <van-button custom-class="submit" color="linear-gradient(to right, #4bb0ff, #6149f6)" block bind:click="onButtonPressed">确定</van-button>
+  </view>
+</view>

GuangZuan/miniprogram/mMine/pages/invoice/operate/operate.ts

@@ -148,7 +148,7 @@ Page({
         Toast.fail('删除操作失败，原因：'+emsg)
       }, complete: () => {
         /// hideLoading
-        wx.hideLoading()
+        Toast.clear()
       }
     })
   },

GuangZuan/miniprogram/mMine/pages/modifypwd/modifypwd.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "修改密码"
+}

GuangZuan/miniprogram/mMine/pages/modifypwd/modifypwd.less

@@ -0,0 +1,6 @@
+/* mMine/pages/modifypwd/modifypwd.wxss */
+
+.button-view {
+  margin: 20px;
+  border-radius: 10px;
+}

GuangZuan/miniprogram/mMine/pages/modifypwd/modifypwd.ts

@@ -0,0 +1,86 @@
+// mMine/pages/modifypwd/modifypwd.ts
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    /// 旧密码
+    oldpwd: '',
+    /// 新密码
+    newpwd: '',
+    /// 确认新密码
+    confirmpwd: ''
+  },
+
+   /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+   /**
+   * 按钮点击响应事件
+   */
+  onButtonPressed() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

GuangZuan/miniprogram/mMine/pages/modifypwd/modifypwd.wxml

@@ -0,0 +1,27 @@
+<!--mMine/pages/modifypwd/modifypwd.wxml-->
+
+<view class="topView">
+  <!-- 导航栏 -->
+  <van-nav-bar custom-style="background-color: #E92020">
+    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
+    <text slot="title" style="color: white;">登录密码修改</text>
+  </van-nav-bar>
+</view>
+
+
+ <!-- 内容 -->
+<van-cell-group>
+  <!-- 原密码 -->
+  <van-field model:value="{{ oldpwd }}" label="原密码" required clearable placeholder="请输入原密码">
+    <navigator slot="button" style="font-size: 12px; color: #666;" url="/pages/forgetpwd/forgetpwd">忘记密码？</navigator>
+  </van-field>
+  <!-- 新密码 -->
+  <van-field model:value="{{ newpwd }}" label="新密码" required clearable placeholder="请输入6-20个字符的新密码"/>
+  <!-- 确认新密码 -->
+  <van-field model:value="{{ confirmpwd }}" label="确认新密码" required clearable placeholder="请再次确认新密码"/>
+</van-cell-group>
+
+<!-- 按钮 -->
+<view class="button-view">
+  <van-button custom-class="submit" color="linear-gradient(to right, #4bb0ff, #6149f6)" block bind:click="onButtonPressed">提交</van-button>
+</view>

GuangZuan/miniprogram/mMine/pages/realauth/realauth.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText": "实名认证"
-}

GuangZuan/miniprogram/mMine/pages/realauth/realauth.less

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

GuangZuan/miniprogram/mMine/pages/realauth/realauth.wxml

@@ -1 +0,0 @@
-<!--moduleMine/pages/realauth/realauth.wxml-->

GuangZuan/miniprogram/pages/circle/circle.less

@@ -101,6 +101,11 @@
   }
 }
 
+/* 选中时添加这个 样式 */
+.active {
+  background: #f0f0f0;
+}
+
 .van-swipe-cell__right {
   height: inherit;
   color: white;

GuangZuan/miniprogram/pages/circle/circle.ts

@@ -34,6 +34,17 @@ Page({
   },
 
   /**
+   * 每行选中触发事件
+   */
+  onSelectItem(e: any) {
+    var obj = this.data.favorites[e.currentTarget.id]
+    obj.isChecked = !obj.isChecked
+    this.data.favorites[e.currentTarget.id] = obj
+    /// 数据赋值
+    this.setData({ favorites: this.data.favorites })
+  },
+
+  /**
    * tab触发事件
    */
   onTabChange(e: any) {
@@ -45,11 +56,19 @@ Page({
   /**
    * 按钮点击事件
    */
-  onButtonPressed(e: any) {
-    console.log(e)
+  onButtonPressed() {
+    /// 数据过滤
+    const objs = this.data.favorites.filter(itm => {
+      return itm.isChecked
+    })
+    /// 对比最多不能超过3项
+    if (objs.length < 2 || objs.length > 3) {
+      Toast('对比不能少于2项、最多不能超过3项')
+      return
+    }
     /// 页面跳转
     wx.navigateTo({
-      url: '/mCircle/pages/contrast/contrast'
+      url: '/mCircle/pages/contrast/contrast?params='+JSON.stringify(objs)
     })
   },
   
@@ -98,14 +117,15 @@ Page({
       fail: (emsg) => {
         /// 操作失败
         Toast.fail({ message: '请求失败，原因：'+emsg})
-      }, complete: () => {}
+      }, complete: () => {
+        /// 清楚Toast
+        Toast.clear()
+      }
     })
   },
 
   /// 查询我的收藏数据信息
   queryMyFavorite() {
-    /// loding.....
-    Toast.loading({message: '加载中...'});
     /// 发送查询
     queryMyFavorite({
       data: {
@@ -125,14 +145,15 @@ Page({
           /// 显示的值
           values: res.data.map(obj => {
             return {up: [obj.weight.toString()+'ct', 
-                        obj.zsshapetypedisplay, 
-                        obj.sizedisplay, 
-                        obj.zscategorydisplay], 
+                        isnullstr(obj.zsshapetypedisplay), 
+                        isnullstr(obj.sizedisplay), 
+                        isnullstr(obj.zscategorydisplay)], 
                     dwn: [isnullstr(obj.zscolortype1display)+' | '+
                           isnullstr(obj.zsclaritytype1display)+' | '+
                           isnullstr(obj.zscuttype1display)+' | '+
-                          isnullstr(obj.zssymmetrytype1display)+' | '+obj.zspolishtype1display+' | '+
-                          obj.zsfluorescencetype1display,
+                          isnullstr(obj.zssymmetrytype1display)+' | '+
+                          isnullstr(obj.zspolishtype1display)+' | '+
+                          isnullstr(obj.zsfluorescencetype1display),
                         obj.zscurrencytypedisplayunit+obj.price]}
           })
         })
@@ -142,8 +163,6 @@ Page({
         Toast.fail({ message: '加载失败...'+emsg});
       },
       complete: () => {
-        /// Toast
-        Toast.clear()
         /// 数据赋值
         this.setData({ isEmpty: this.data.values.length == 0 })
         /// 停止下拉刷新

GuangZuan/miniprogram/pages/circle/circle.wxml

@@ -27,7 +27,7 @@
 <scroll-view class="content-view">
   <!-- 出售大厅数据 --> 
   <van-swipe-cell wx:for="{{values}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx" right-width="{{ width }}">
-    <view class="item-view">
+    <view class="item-view" id="{{idx}}" bindtap="onSelectItem">
       <view class="item-view-up">
         <text wx:for="{{itm.up}}" wx:for-item="data" wx:for-index="idx" wx:key="idx">{{data}}</text>
       </view>

GuangZuan/miniprogram/pages/forgetpwd/forgetpwd.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "忘记密码"
+}

GuangZuan/miniprogram/pages/forgetpwd/forgetpwd.less

@@ -0,0 +1,6 @@
+/* pages/forgetpwd/forgetpwd.wxss */
+
+.button-view {
+  margin: 20px;
+  border-radius: 10px;
+}

GuangZuan/miniprogram/mMine/pages/realauth/realauth.ts → GuangZuan/miniprogram/pages/forgetpwd/forgetpwd.ts

@@ -1,10 +1,28 @@
-// moduleMine/pages/realauth/realauth.ts
+// pages/forgetpwd/forgetpwd.ts
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
+    /// 手机号码
+    mobile: '',
+    /// 短信验证码
+    code: ''
+  },
+
+  /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+  /**
+   * 按钮点击响应事件
+   */
+  onButtonPressed() {
 
   },
 

GuangZuan/miniprogram/pages/forgetpwd/forgetpwd.wxml

@@ -0,0 +1,23 @@
+<!--pages/forgetpwd/forgetpwd.wxml-->
+<view class="top-view">
+  <!-- 导航栏 -->
+  <van-nav-bar custom-style="background-color: #E92020">
+    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
+    <text slot="title" style="color: white;">忘记密码</text>
+  </van-nav-bar>
+</view>
+
+ <!-- 内容 -->
+ <van-cell-group>
+  <!-- 手机号码 -->
+  <van-field model:value="{{ mobile }}" type="number" label="手机号码" required clearable placeholder="请输入手机号码">
+    <van-button slot="button" size="small" type="primary" bind:click="onButtonPressed">获取验证码</van-button >
+  </van-field>
+  <!-- 短信验证码 -->
+  <van-field model:value="{{ code }}" label="短信验证码" required clearable placeholder="请输入短信验证码"/>
+</van-cell-group>
+
+<!-- 按钮 -->
+<view class="button-view">
+  <van-button custom-class="submit" color="linear-gradient(to right, #4bb0ff, #6149f6)" block bind:click="onButtonPressed">提交</van-button>
+</view>

GuangZuan/miniprogram/pages/login/login.ts

@@ -48,7 +48,8 @@ Page({
     if (!this.check()) return
     /// loding.....
     this.setData({ isLoding: true })
-
+    /// loding......
+    wx.showLoading({title: '登录中.....'})
     /// 进行账户登录
     login({
       data: {
@@ -81,7 +82,8 @@ Page({
       },
       complete: () => { 
         /// 清除Toast
-        Toast.clear()
+        wx.hideLoading()
+        /// isLoding
         this.setData({ isLoding: false }) 
       }
     })
@@ -90,12 +92,10 @@ Page({
   /// 登录查询
   loginQuery() {
     /// showLoading
-    Toast.loading({message: '数据查询中.....'})
+    Toast.loading({ message: '数据查询中.....' })
     /// 发送查询请求
     loginQuery({
-      data: {
-        loginID: loginid()
-      },
+      data: { loginID: loginid() },
       success: (res) => {
         /// 数据存储
         wx.setStorageSync('LoginQuery', res.data)
@@ -109,13 +109,9 @@ Page({
         }
 
         /// showToast
-        Toast.success({
-          message: '登录成功',
-          onClose: () => {
-            /// 跳转到首页
-            wx.reLaunch({ url: '/pages/home/home' })
-          }
-        })
+        Toast.success({ message: '登录成功' })
+        /// 跳转到首页
+        wx.reLaunch({ url: '/pages/home/home' })
       },
       fail: (emsg) => {
         /// showToast
@@ -123,7 +119,7 @@ Page({
       },
       complete: () => {
         /// hideLoading
-        wx.hideLoading()
+        Toast.clear()
         /// isLoding
         this.setData({ isLoding: false })
       }

GuangZuan/miniprogram/pages/login/login.wxml

@@ -14,7 +14,7 @@
 <!--  用户注册  忘记密码 -->
 <view class="btn-view">
   <navigator url="/pages/register/register">用户注册</navigator>
-  <navigator url="/pages/register/register">忘记密码</navigator>
+  <navigator url="/pages/forgetpwd/forgetpwd">忘记密码</navigator>
 </view>
 
 <!--  登录按钮  -->

GuangZuan/miniprogram/pages/mine/mine.less

@@ -38,6 +38,25 @@
   }
 }
 
+.button-view {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  align-content: center;
+  width: 100%;
+  padding-bottom: 15px;
+
+  .into-gold {
+    border-radius: 10px;
+    width: 150px;
+  }
+
+  .out-gold {
+    border-radius: 10px;
+    width: 150px;
+  }
+}
+
 .cell-title {
   color: #333;
   font-size: 14px;

GuangZuan/miniprogram/pages/mine/mine.ts

@@ -16,10 +16,10 @@ Page({
                 {id: 5, title: '我的保税', img: 'fire-o',      path: '/mHome/pages/bond/list/list'}],
 
     // 列表菜单项
-    tablelists: [{id: 1, title: '签约账户',    path: '/mMine/pages/bank/bankh'}, 
+    tablelists: [{id: 1, title: '签约账户',    path: '/mMine/pages/bank/bank'}, 
                  {id: 2, title: '收货地址',    path: '/mMine/pages/address/list/list'}, 
                  {id: 3, title: '发票信息',    path: '/mMine/pages/invoice/list/list'}, 
-                 {id: 4, title: '账户安全',    path: ''}, 
+                 {id: 4, title: '账户安全',    path: '/mMine/pages/modifypwd/modifypwd'}, 
                  {id: 5, title: '关于我们',    path: '/mMine/pages/about/about/about'}],
     /// 微信头像 
     avatarUrl: "",
@@ -28,6 +28,22 @@ Page({
   },
 
   /**
+   * 按钮点击响应事件
+   */
+  onButtonPressed(e: any) {
+    switch (e.target.id) {
+      case 'into-gold':  /// 充值
+        wx.navigateTo({ url: '/mMine/pages/inoutgold/inoutgold' })
+        break;
+      case 'out-gold':   /// 提现
+        wx.navigateTo({ url: '/mMine/pages/inoutgold/inoutgold' })
+        break;
+      default:
+        break;
+    }
+  },
+
+  /**
    * 进入系统设置
    */
   goToSettings() {
@@ -64,7 +80,7 @@ Page({
 
         /// 登出
         setTimeout(function () {
-          wx.hideLoading()
+          Toast.clear()
           // on confirm
           wx.reLaunch({ url: '/pages/login/login' })
         }, 2000)

GuangZuan/miniprogram/pages/mine/mine.wxml

@@ -20,6 +20,12 @@
  </view>
 </view>
 
+<!-- 出金 入金 -->
+<view class="button-view">
+  <van-button custom-class="into-gold" id="into-gold" icon="https://img.yzcdn.cn/vant/logo.png" color="linear-gradient(to right, #4bb0ff, #6149f6)" bind:click="onButtonPressed">充值</van-button>
+  <van-button custom-class="out-gold" id="out-gold" icon="https://img.yzcdn.cn/vant/logo.png" color="linear-gradient(to right, #4bb0ff, #FF7252)" bind:click="onButtonPressed">提现</van-button>
+</view>
+
 <!-- 功能菜单项 -->
 <van-grid column-num="5" wx:if="{{menulists.count != 0}}">
   <van-grid-item wx:for="{{menulists}}" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{itm.id}}" icon="{{itm.img}}" icon-color="red" dot link-type="navigateTo" url="{{itm.path}}">

GuangZuan/miniprogram/pages/register/register.ts

@@ -35,6 +35,14 @@ Page({
   },
 
   /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+  /**
    * 立即注册
    */
   registerNow() {

GuangZuan/miniprogram/pages/register/register.wxml

@@ -1,5 +1,13 @@
 <!--pages/register/register.wxml-->
 
+<view class="top-view">
+  <!-- 导航栏 -->
+  <van-nav-bar custom-style="background-color: #E92020">
+    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
+    <text slot="title" style="color: white;">会员注册</text>
+  </van-nav-bar>
+</view>
+
 <van-cell-group style="padding-top: 40px;">
   <!-- 营业执照图片 -->
   <view class="upload">

GuangZuan/miniprogram/services/utils.ts

@@ -91,6 +91,21 @@ export function getPerformancestatus(status: number): string {
   }
 }
 
+/// 获取出境检测执行状态
+export function getExecutestatus(status: number) {
+  switch (status) {
+    case 1:
+      return '未生效'
+      break;
+    case 2:
+      return '进行中'
+      break;
+    default:
+      return '已结束'
+      break;
+  }
+}
+
 /// 获取地区区域信息
 export function getDivisions() {
   /// 发送请求

GuangZuan/project.private.config.json

@@ -10,22 +10,8 @@
     "miniprogram": {
       "list": [
         {
-          "name": "买卖大厅",
-          "pathName": "pages/trade/trade",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "我的库存",
-          "pathName": "mMine/pages/myinventorys/list/list",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "我的订单",
-          "pathName": "mMine/pages/myorders/list/list",
+          "name": "钻石对比",
+          "pathName": "mCircle/pages/contrast/contrast",
           "query": "",
           "launchMode": "default",
           "scene": null

GuangZuan/typings/types/model/order.d.ts

@@ -857,15 +857,19 @@ declare namespace GuangZuan {
     goodsno: string
     /// 市场ID
     marketid: number
+    /// 市场价
+    marketprice: number
     /// 价格
     price: number
     /// 克拉单价
     priceper: string
+    /// 卖家
+    sellusername: string
     /// 尺寸
     sizedisplay: string
     /// 用户ID
     userid: number
-    ///
+    /// 仓库名称
     warehousenamedisplay: string
     /// 总重量(克拉重量) - 类型：1，2，3，4，5
     weight: number
@@ -879,6 +883,8 @@ declare namespace GuangZuan {
     wrtradeorderid: string
     /// 钻石分类 - 枚举”ZSCategory“
     zscategory: number
+    /// 是否被选中
+    isChecked: boolean
     /// 
     zscategorydisplay: string
     ///