xxxx

GuangZuan/miniprogram/app.json

@@ -85,7 +85,9 @@
         "pages/modifypwd/index",
         "pages/inoutgold/index",
         "pages/myorders/mydelistingapplydetail/index",
-        "pages/about/protocol/index"
+        "pages/about/protocol/index",
+        "pages/funds/list/index",
+        "pages/funds/his/index"
       ]
     },
     {

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

@@ -62,20 +62,19 @@
   }
   
   .zsshape, .weight, .rate, .discount {
-    height: 50px
+    height: 50px;
   }
   
   .buttom_view {
     display: flex;
     flex-direction: row;
     justify-content: center;
-    margin-top: 20px;
-    width: 95%;
+    margin-top: 10px;
     align-content: center;
     align-items: center;
   
     van-button {
-      width: 90%;
+      width: 80%;
       color: white;
     }
   }  

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

@@ -1,5 +1,4 @@
 import { priceCalc } from "../../../services/api/orders/index"
-import { getEnumList } from "../../../services/utils"
 import { hideLoading, showLoading } from "../../../utils/message/index"
 
 Page({
@@ -18,34 +17,45 @@ Page({
     /// 选中形状         
     zsshape: 1,
     /// 颜色
-    zscolors: [ { id: 1, name: 'D', isCheck: true } ],
+    zscolors: [ { id: 1, name: 'D', isCheck: true }, 
+                { id: 2, name: 'E', isCheck: false }, 
+                { id: 3, name: 'F', isCheck: false }, 
+                { id: 4, name: 'G', isCheck: false }, 
+                { id: 5, name: 'H', isCheck: false }, 
+                { id: 6, name: 'I', isCheck: false }, 
+                { id: 7, name: 'J', isCheck: false }, 
+                { id: 8, name: 'K', isCheck: false }, 
+                { id: 9, name: 'L', isCheck: false }, 
+                { id: 10, name: 'M', isCheck: false }, 
+                { id: 11, name: 'N', isCheck: false }],
     /// 选中形状
     zscolor: 'D',
     /// 净度
-    zsclaritys: [ { id: 1, name: 'IF', isCheck: true } ],
+    zsclaritys: [ { id: 2, name: 'IF', isCheck: true }, 
+                  { id: 3, name: 'VVS1', isCheck: false }, 
+                  { id: 4, name: 'VVS2', isCheck: false }, 
+                  { id: 5, name: 'VS1', isCheck: false }, 
+                  { id: 6, name: 'VS2', isCheck: false }, 
+                  { id: 7, name: 'SI1', isCheck: false }, 
+                  { id: 8, name: 'SI2', isCheck: false }, 
+                  { id: 9, name: 'SI3', isCheck: false }, 
+                  { id: 10, name: 'I1', isCheck: false }, 
+                  { id: 11, name: 'I2', isCheck: false }, 
+                  { id: 12, name: 'I3', isCheck: false }],
     /// 选中净度
     zsclarity: 'IF',
     /// 重量
-    weight: 1.0,
+    weight: 0.0,
     /// 汇率
-    dayrate: 1.0,
+    dayrate: 0.0,
     /// 折扣
     discount: 0.0,
     /// 国际报价
     doller: '0.0',
     /// 国际人民币报价
     rmb: '0.0',
-    /// 美元
-    disdoller: '0.0',
-    /// 人民币
-    disrmb: '0.0',
-    /// 选项
-    options: [
-      { text: '-', value: 0 },
-      { text: '+', value: 1 }
-    ],
     /// 选项值
-    value: 0
+    value: 1
   },
 
   /// 钻石价格计算器
@@ -53,7 +63,7 @@ Page({
     /// showLoding....
     showLoading(()=>{
       /// 折扣
-      const discount = Number((this.data.value === 0 ? '-' : '+')+this.data.discount.toString())/100
+      const discount = Number((this.data.value === 0 ? '-' : '+')+this.data.discount.toString())
       const rate = Number(this.data.dayrate)
       const weight = Number(this.data.weight)
       /// 进行查询
@@ -63,7 +73,8 @@ Page({
           zscolor: this.data.zscolor,
           zsclarity: this.data.zsclarity,
           weight: weight,
-          rate: 1.0
+          rate: rate,
+          discount: discount
         },
         /// 查询成功
         success: (res) => {
@@ -76,8 +87,6 @@ Page({
             this.setData({
               doller: dollar.toFixed(2),
               rmb: (dollar*rate).toFixed(2),
-              disdoller: (dollar*(1+discount)*weight).toFixed(2),
-              disrmb: (dollar*(1+discount)*weight*rate).toFixed(2)
             })
           })
         },
@@ -89,6 +98,14 @@ Page({
     }, '计算中....')
   },
 
+  setDisAccount() {
+    if (this.data.value === 1) {
+      this.setData({ value: 0 })
+    } else {
+      this.setData({ value: 1 })
+    }
+  },
+  
   /**
    * 返回上层视图
    */
@@ -157,19 +174,7 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad() {
-    /// 显示默认数据
-    this.setData({
-      /// 颜色
-      zscolors: getEnumList('ZSColorType').map(obj => {
-        return { id: obj.enumitemname, name: obj.enumdicname, isCheck: obj.enumdicname === this.data.zscolor }
-      }),
-      /// 净度
-      zsclaritys: getEnumList('ZSClarityType').map(obj => {
-        return { id: obj.enumitemname, name: obj.enumdicname, isCheck: obj.enumdicname === this.data.zsclarity }
-      }),
-    })
-  },
+  onLoad() {},
 
   /**
    * 生命周期函数--监听页面初次渲染完成

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

@@ -34,7 +34,7 @@
   <view class="cell-view weight"> 
     <text>重量</text>
     <view class="content weight">
-      <van-field model:value="{{ weight }}" clearable placeholder="请输入重量" type="number" adjust-position />
+      <van-field model:value="{{ weight }}" clearable placeholder="请输入重量" type="digit" adjust-position />
     </view>
   </view>
 
@@ -48,12 +48,12 @@
 
   <!-- 折扣 -->
   <view class="cell-view discount"> 
-    <text>折扣</text>
+    <text>折扣(%)</text>
     <view class="content discount">
-      <!-- 折扣选项 -->
-      <van-dropdown-menu>
-        <van-dropdown-item model:value="{{ value }}" options="{{ options }}" />
-      </van-dropdown-menu>
+      <view style="display: flex; align-items: center; padding-top: -5px;">
+        <text style="font-size: 16px; width: 20px;" bindtap="setDisAccount">{{ value === 0 ? '-' : '+'}}</text>
+        <van-icon name="arrow-down" size="10"></van-icon>
+      </view>
        <!-- 输入框 -->
       <van-field model:value="{{ discount }}" clearable placeholder="请输入折扣" type="digit" adjust-position />
     </view>
@@ -61,12 +61,8 @@
 
   <!-- result -->
   <view class="result">
-    <view class="result__top">
-      <text class="value">国际报价：${{ doller }}/ct </text>
-      <text class="value">￥{{ rmb }}/ct</text>
-    </view>
-    <text class="value">美元：{{ disdoller }}</text>
-    <text class="value">人民币：{{ disrmb }}</text>
+    <text class="value">美元：{{ doller }}</text>
+    <text class="value">人民币：{{ rmb }}</text>
   </view>
 
   <!--  底部视图  -->

GuangZuan/miniprogram/mMine/pages/address/list/index.less

@@ -21,10 +21,12 @@
 
       .phonenum {
         width: 75%;
+        font-size: 14px;
         margin-left: 30px;
       }
 
       .receivername {
+        font-size: 14px;
         width: 110px;
       }
     }

GuangZuan/miniprogram/mMine/pages/address/operate/index.wxml

@@ -6,7 +6,7 @@
 
 <van-cell-group>
   <!-- 收货人 --> 
-  <van-field model:value="{{ username }}" adjust-position required clearable label="收货人" placeholder="请输入收货人" />
+  <van-field model:value="{{ username }}" adjust-position maxlength="12" required clearable label="收货人" placeholder="请输入收货人" />
   <!-- 联系电话 --> 
   <van-field model:value="{{ mobile }}" adjust-position type="number" required clearable label="联系电话" placeholder="请输入收货人联系电话"/>
   <!-- 收货地区 --> 

GuangZuan/miniprogram/mMine/pages/funds/his/index.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "van-calendar": "@vant/weapp/calendar/index"
+  }
+}

GuangZuan/miniprogram/mMine/pages/funds/his/index.less

@@ -0,0 +1,64 @@
+.container {
+  .result-view {
+    display: flex;
+    justify-content: space-between;
+    padding: 5px 10px;
+    align-items: center;
+    align-content: center;
+
+    text {
+      color: #666;
+      font-size: 12px;
+    }
+  }
+
+  &__list-top {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    background-color: #f0f0f0;
+    height: 35px;
+    align-items: center;
+
+    &__row {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      align-content: center;
+      width: 100%;
+
+      text {
+        font-size: 13px;
+        color: #666;
+        text-align: center;
+        width: 100%;
+      }
+    }
+  }
+
+  &__list-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    align-content: center;
+    width: 100%;
+
+    &__row {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      align-content: center;
+      width: 100%;
+      height: 45px;
+      border-bottom: 1px solid #f0f0f0;
+      justify-content: space-between;
+
+      text {
+        font-size: 14px;
+        color: #333;
+        text-align: center;
+        width: 100%;
+      }
+    }
+  }
+}

GuangZuan/miniprogram/mMine/pages/funds/his/index.ts

@@ -0,0 +1,196 @@
+import { queryHisAmountLog } from "../../../../services/api/account/index"
+import { accountid } from "../../../../services/utils"
+import { hideLoading, showLoading } from "../../../../utils/message/index"
+import { formatDate, formatDateString } from "../../../../utils/util"
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    /// 底部安全区域
+    safeBottom: getApp().globalData.safeBottom,
+    /// 是否显示日期
+    show: false,
+    /// 开始日期
+    startdate: formatDate(new Date()),
+    /// 结束日期
+    enddate: formatDate(new Date()),
+    /// 最小日期
+    minDate: new Date(2010, 10, 1).getTime(),
+    /// 是否开始日期
+    isstart: true,
+    /// 是否空数据
+    isEmpty: true,
+    /// 页签
+    page: 1,
+    /// 数据信息
+    datas: <GuangZuan.AmountLog[]>[],
+    /// 列头
+    titles: ['时间', '操作类型', '金额']
+  },
+
+   /**
+   * 按钮点击响应事件
+   */
+  onButtonPressed(e: any) {
+    switch (e.target.id) {
+      case 'startdate':  /// 开始日期
+        this.setData({ 
+          show: true,
+          isstart: true
+        })
+        break;
+      case 'enddate':   /// 结束日期
+        this.setData({ 
+          show: true,
+          isstart: false
+        })
+        break
+      default:
+        /// 查询数据
+        this.queryHisAmountLog()
+        break;
+    }
+  },
+
+    /// 日期关闭触发
+    onClose() {
+      this.setData({ show: false })
+    },
+
+      /// 日期确定触发
+  onConfirm(e: any) {
+    this.setData({ show: false })
+    /// 开始日期
+    if (this.data.isstart) {
+      this.setData({
+        startdate: formatDate(e.detail)
+      })
+    } else {
+      this.setData({
+        enddate: formatDate(e.detail)
+      })
+    }
+  },
+
+  /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+  /**
+   * 查询历史资金流水信息
+   */
+  queryHisAmountLog() {
+    /// showLoading
+    showLoading(()=>{
+      /// 发送查询请求
+      queryHisAmountLog({
+        data: { 
+          page: this.data.page,
+          pagesize: 10,
+          accountID: accountid().toString(),
+          startDate: this.data.startdate,
+          endDate: this.data.enddate
+        },
+        success: (res) => {
+          /// 加载失败
+          if (res.code != 200) {
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg)
+            return
+          }
+          hideLoading(()=>{
+            /// 数据信息
+            this.setData({ 
+              datas: this.data.page === 1 ? res.data.map(obj => {
+                var item = obj
+                obj.createtime = formatDateString(obj.createtime, 'YYYY-MM-DD')
+                return item
+              }) : this.data.datas.concat(res.data.map(obj => {
+                var item = obj
+                obj.createtime = formatDateString(obj.createtime, 'YYYY-MM-DD')
+                return item
+              })),
+              isEmpty: res.data.length === 0
+             })
+          })
+        },
+        fail: (emsg) => {
+          hideLoading(()=>{}, emsg)
+        },
+        complete: () => {
+          /// 结束下拉刷新
+          wx.stopPullDownRefresh()
+        }
+      })
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad() {
+    /// 查询历史资金流水信息
+    this.queryHisAmountLog()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+    // 设置页签
+    this.setData({ page: 1 })
+    /// 查询历史资金流水信息
+    this.queryHisAmountLog()
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+    /// 设置页签
+    this.setData({ page: this.data.page+1 })
+    /// 查询历史资金流水信息
+    this.queryHisAmountLog()
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

GuangZuan/miniprogram/mMine/pages/funds/his/index.wxml

@@ -0,0 +1,37 @@
+<view class="container" style="padding-bottom: {{ safeBottom }}px;">
+  <view class="container__top" style="position: sticky; top: 0; z-index: 999;">
+    <!-- 导航栏 -->
+    <van-nav-bar custom-style="background-color: #407DB8">
+      <van-icon slot="left" name="arrow-left" size="25px" color="#fff" bind:click="backToParent"/>
+      <text slot="title" style="color: #fff;">历史资金流水</text>
+    </van-nav-bar>
+  </view>
+
+  <!-- 过滤条件 -->
+  <view class="result-view" style="background-color: white;">
+    <text>开始日期：</text>
+    <van-button size="small" id="startdate" custom-class="startdate" plain type="default" bind:click="onButtonPressed">{{ startdate }}</van-button>
+    <text>结束日期：</text>
+    <van-button size="small" id="enddate" custom-class="enddate" plain type="default" bind:click="onButtonPressed" >{{ enddate }}</van-button>
+    <van-button size="small" id="search" custom-class="search" type="info" bind:click="onButtonPressed" >查询</van-button>
+  </view>
+
+  <view class="container__list-top">
+    <view class="container__list-top__row" wx:for="{{ titles }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">
+     <text class="title">{{ itm}}</text>
+    </view>
+  </view>
+
+  <view class="container__list-content">
+    <view class="container__list-content__row" wx:for="{{ datas }}" wx:for-item="itm" wx:for-index="idx" wx:key="createtime">
+     <text class="createtime">{{ itm.createtime }}</text>
+     <text class="operatetypename">{{ itm.operatetypename }}</text>
+     <text class="amount">{{ itm.amount }}</text>
+    </view>
+  </view>
+</view>
+
+<!-- empty -->
+<van-empty wx:if="{{ isEmpty }}" class="custom-image" description="无数据"/>
+<!-- 选择日期 -->  
+<van-calendar show="{{ show }}" min-date="{{ minDate }}" bind:close="onClose" bind:confirm="onConfirm" />

GuangZuan/miniprogram/mMine/pages/funds/list/index.json

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

GuangZuan/miniprogram/mMine/pages/funds/list/index.less

@@ -0,0 +1,60 @@
+.container {
+
+  .his-amount-log {
+    width: 97%;
+    font-size: 12px;
+    color: #666;
+    text-align: right;
+    padding: 10px 0px;
+  }
+
+  &__list-top {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    background-color: #f0f0f0;
+    height: 35px;
+    align-items: center;
+
+    &__row {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      align-content: center;
+      width: 100%;
+
+      text {
+        font-size: 13px;
+        color: #666;
+        text-align: center;
+        width: 100%;
+      }
+    }
+  }
+
+  &__list-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    align-content: center;
+    width: 100%;
+
+    &__row {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      align-content: center;
+      width: 100%;
+      height: 45px;
+      border-bottom: 1px solid #f0f0f0;
+      justify-content: space-between;
+
+      text {
+        font-size: 14px;
+        color: #333;
+        text-align: center;
+        width: 100%;
+      }
+    }
+  }
+}

GuangZuan/miniprogram/mMine/pages/funds/list/index.ts

@@ -0,0 +1,136 @@
+import { queryAmountLog } from "../../../../services/api/account/index"
+import { accountid } from "../../../../services/utils"
+import { hideLoading, showLoading } from "../../../../utils/message/index"
+import { formatDateString } from "../../../../utils/util"
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    /// 底部安全区域
+    safeBottom: getApp().globalData.safeBottom,
+    /// 是否空数据
+    isEmpty: true,
+    /// 数据信息
+    datas: <GuangZuan.AmountLog[]>[],
+    /// 列头
+    titles: ['时间', '操作类型', '金额']
+  },
+
+  /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+  /**
+   * 历史资金流水
+   */
+  goToHisAmountLog() {
+    wx.navigateTo({
+      url: '/mMine/pages/funds/his/index'
+    })
+  },
+
+  /**
+   * 查询当前资金流水信息
+   */
+  queryAmountLog(){
+    /// showLoading
+    showLoading(()=>{
+      /// 发送查询请求
+      queryAmountLog({
+        data: { 
+          accountID: accountid().toString() 
+        },
+        success: (res) => {
+          /// 加载失败
+          if (res.code != 200) {
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg)
+            return
+          }
+          hideLoading(()=>{
+            /// 数据信息
+            this.setData({ 
+              datas: res.data.map(obj => {
+                var item = obj
+                obj.createtime = formatDateString(obj.createtime, 'HH:MM:SS')
+                return item
+              }),
+              isEmpty: res.data.length === 0
+             })
+          })
+        },
+        fail: (emsg) => {
+          hideLoading(()=>{}, emsg)
+        },
+        complete: () => {
+          /// 结束下拉刷新
+          wx.stopPullDownRefresh()
+        }
+      })
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad() {
+    /// 查询当前资金流水信息
+    this.queryAmountLog()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+    /// 查询当前资金流水信息
+    this.queryAmountLog()
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

GuangZuan/miniprogram/mMine/pages/funds/list/index.wxml

@@ -0,0 +1,28 @@
+<view class="container" style="padding-bottom: {{ safeBottom }}px;">
+  <view class="container__top" style="position: sticky; top: 0; z-index: 999;">
+    <!-- 导航栏 -->
+    <van-nav-bar custom-style="background-color: #407DB8">
+      <van-icon slot="left" name="arrow-left" size="25px" color="#fff" bind:click="backToParent"/>
+      <text slot="title" style="color: #fff;">资金流水</text>
+    </van-nav-bar>
+  </view>
+
+  <view class="his-amount-log" bindtap="goToHisAmountLog">历史流水</view>
+
+  <view class="container__list-top">
+    <view class="container__list-top__row" wx:for="{{ titles }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">
+     <text class="title">{{ itm}}</text>
+    </view>
+  </view>
+
+  <view class="container__list-content">
+    <view class="container__list-content__row" wx:for="{{ datas }}" wx:for-item="itm" wx:for-index="idx" wx:key="createtime">
+     <text class="createtime">{{ itm.createtime }}</text>
+     <text class="operatetypename">{{ itm.operatetypename }}</text>
+     <text class="amount">{{ itm.amount }}</text>
+    </view>
+  </view>
+</view>
+
+<!-- empty -->
+<van-empty wx:if="{{ isEmpty }}" class="custom-image" description="无数据"/>

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

@@ -2,5 +2,6 @@
   "usingComponents": {
     "van-uploader": "@vant/weapp/uploader/index"
   },
+  "enablePullDownRefresh": false,
   "navigationBarTitleText": "充值提现"
 }

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

@@ -86,6 +86,8 @@ Page({
   onLoginOut() {
     /// loding....
     showLoading(()=>{
+      /// 清楚所有的缓存数据
+      wx.clearStorage()
       /// 登出
       setTimeout(function () {
         hideLoading(()=>{

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

@@ -118,18 +118,18 @@ Page({
                           isnullstr(obj.goodsno)], 
                       dwn: [isnullstr(obj.zsczcolor1typedisplay)+' | '+isnullstr(obj.zsclaritytype1display)+' | '+isnullstr(obj.zscuttype1display)+' | '+isnullstr(obj.zspolishtype1display)+' | '+isnullstr(obj.zssymmetrytype1display)+' | '+isnullstr(obj.zsfluorescencetype1display)+' | '+isnullstr(obj.zscerttypedisplay),
                           obj.zscurrencytypedisplayunit+obj.price]}
+              })
             })
           })
-        })
-      },
-      fail: (emsg) => {
-        hideLoading(()=>{}, emsg)
-      },
-      complete: () => { 
-        /// 停止下拉刷新
-        wx.stopPullDownRefresh()
-      }
-    })
+        },
+        fail: (emsg) => {
+          hideLoading(()=>{}, emsg)
+        },
+        complete: () => { 
+          /// 停止下拉刷新
+          wx.stopPullDownRefresh()
+        }
+      })
     })
     
   },
@@ -185,7 +185,7 @@ Page({
    */
   onReachBottom() {
     /// 设置页签
-    this.setData({ page: +1 })
+    this.setData({ page: this.data.page+1 })
     /// 查询我的摘牌
     this.queryMyDeListing()
   },

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

@@ -47,7 +47,5 @@
 
 <!-- empty -->
 <van-empty wx:if="{{ isEmpty }}" class="custom-image" description="无数据"/>
-<!-- toast --> 
-<van-toast id="van-toast" />
 <!-- 选择日期 -->  
 <van-calendar show="{{ show }}" min-date="{{ minDate }}" bind:close="onClose" bind:confirm="onConfirm" />

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

@@ -45,8 +45,6 @@ Page({
     page: 1,
     /// 是否显示日期
     show: false,
-    /// 左滑的宽度
-    width: 100
   },
 
   /**
@@ -69,16 +67,14 @@ Page({
         this.setData({
           /// 列头  
           titles: [['重量 ｜形状 ｜款式 ｜ 尺寸', '编号'], 
-                   ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光 | 证书', '价格']],
-          width: 100
+                   ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光 | 证书', '价格']]
         })
         break;
       case 1:  /// 求购挂牌
         this.setData({
           /// 列头  
           titles: [['形状 ｜ 尺寸', '分类'], 
-                   ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光', '']],
-          width: 100
+                   ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光', '']]
         })
         break;
       case 2:  /// 我的摘牌
@@ -86,7 +82,6 @@ Page({
           /// 列头  
           titles: [['重量 ｜ 形状 ｜ 款式 ｜ 尺寸', '编号'], 
                    ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光 | 证书', '价格']],
-          width: 50
         })
         break;
       case 3:  /// 我的询价
@@ -94,16 +89,14 @@ Page({
           /// 列头  
           titles: [['形状 ｜ 尺寸', '分类'], 
                    ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光', ''], 
-                   ['买方', '我的钻石']],
-          width: 100
+                   ['买方', '我的钻石']]
         })
         break;
       default: /// 询价消息
         this.setData({
           /// 列头  
           titles: [['重量 ｜ 形状 ｜ 尺寸', '分类'], 
-                   ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光', '价格'], ['', '卖方 | 联系电话']],
-          width: 50
+                   ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光', '价格'], ['', '卖方 | 联系电话']]
         })
         break;
     }
@@ -150,7 +143,7 @@ Page({
             break;
           case 2:  /// 我的摘牌
             wx.navigateTo({
-              url: '/mHome/pages/goodsdetail/index?goodsno='+this.data.dlistings[index].goodsno+'&showTrade='+true
+              url: '/mHome/pages/goodsdetail/index?goodsno='+this.data.dlistings[index].goodsno+'&showTrade='+0
             })
             break;
           case 1:  /// 求购挂牌
@@ -161,7 +154,7 @@ Page({
             break;
           case 0:  /// 出售挂牌
             wx.navigateTo({
-              url: '/mHome/pages/goodsdetail/index?goodsno='+this.data.sellorders[index].goodsno+'&ordertime='+formatDateString(this.data.sellorders[index].ordertime, 'YYYY/MM/DD')+'&showTrade='+1
+              url: '/mHome/pages/goodsdetail/index?goodsno='+this.data.sellorders[index].goodsno+'&ordertime='+formatDateString(this.data.sellorders[index].ordertime, 'YYYY/MM/DD')+'&showTrade='+0
             })
             break;
           default:
@@ -257,7 +250,7 @@ Page({
                               isnullstr(obj.zsfluorescencetype1display)+' | '+
                               isnullstr(obj.zscerttypedisplay),
                             obj.zscurrencytypedisplayunit+obj.price.toFixed(2)], 
-                        dwn: []}
+                        dwn: [], width: 50}
               })
             })
           })
@@ -300,7 +293,7 @@ Page({
               /// 显示的值
               values: res.data.map(obj => {
                 return {up: [isnullstr(obj.zsshapetypedisplay)+' ｜ '+ 
-                            isnullstr(obj.zssize),
+                            isnullstr(obj.zssizedisplay),
                             isnullstr(obj.zscategorydisplay)], 
                         mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
                               isnullstr(obj.zsclaritytypedisplay)+' | '+
@@ -309,7 +302,7 @@ Page({
                               isnullstr(obj.zssymmetrytypedisplay)+' | '+
                               isnullstr(obj.zsfluorescencetypedisplay),
                             ''], 
-                        dwn: []}
+                        dwn: [], width: 100 }
               })
             })
           })
@@ -354,7 +347,7 @@ Page({
               return {up: [obj.totalqty+'ct'+' ｜ '+ 
                           isnullstr(obj.zsshapetypedisplay)+' ｜ '+ 
                           '--'+' ｜ '+
-                          isnullstr(obj.size1),
+                          isnullstr(obj.sizedisplay),
                           obj.goodsno], 
                       mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
                             isnullstr(obj.zsclaritytype1display)+' | '+
@@ -364,7 +357,7 @@ Page({
                             isnullstr(obj.zsfluorescencetype1display)+' | '+
                             isnullstr(obj.zscerttypedisplay),
                           obj.zscurrencytypedisplayunit+obj.price.toFixed(2)], 
-                      dwn: []}
+                      dwn: [], width: (obj.wrtradeorderstatus === 3 || obj.wrtradeorderstatus === 7) ? 100 : 50 }
             })
           })
         })
@@ -418,7 +411,7 @@ Page({
                               isnullstr(obj.zssymmetrytypedisplay)+' | '+
                               isnullstr(obj.zsfluorescencetypedisplay),
                           ''], 
-                        dwn: [obj.buyusername, obj.goodsno]}
+                        dwn: [obj.buyusername, obj.goodsno], width: applytype === 0 ? 100 : 50}
               }) : res.data.map(obj => {
                 return {up: [obj.applyqty+'ct'+' ｜ '+
                             isnullstr(obj.zsshapetypedisplay)+' ｜ '+
@@ -431,7 +424,7 @@ Page({
                               isnullstr(obj.zssymmetrytypedisplay)+' | '+
                               isnullstr(obj.zsfluorescencetypedisplay),
                             obj.zscurrencytypedisplayunit+obj.applyprice.toFixed(2)], 
-                        dwn: ['', obj.sellusername+' | --']}
+                        dwn: ['', obj.sellusername+' | --'], width: applytype === 0 ? 100 : 50}
               })
             })
           })

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

@@ -37,7 +37,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 }}">
+  <van-swipe-cell wx:for="{{ values }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx" right-width="{{ itm.width }}">
     <view class="item-view">
       <view class="item-view-up">
         <text wx:for="{{ itm.up }}" wx:for-item="data" wx:for-index="idx" wx:key="idx">{{ data }}</text>
@@ -51,7 +51,7 @@
     </view>
     <view slot="right" class="van-swipe-cell__right">
       <view class="item detail" id="detail {{ idx }}" style="background-color: #407DB8; color: white;" bindtap="onButtonPressed">详情</view>
-      <view wx:if="{{ active === 0 }}" class="item shelves" id="shelves {{ idx }}" style="background-color: #6B3288; color: white;" bindtap="onButtonPressed">下架</view>
+      <view wx:if="{{ active === 0 && (sellorders[idx].wrtradeorderstatus === 3 || sellorders[idx].wrtradeorderstatus === 7) }}" class="item shelves" id="shelves {{ idx }}" style="background-color: #6B3288; color: white;" bindtap="onButtonPressed">下架</view>
       <view wx:if="{{ active === 1 || active === 3 }}" class="item cancel" id="cancel {{ idx }}" style="background-color: #F7A657; color: white;" bindtap="onButtonPressed">撤销</view>
     </view>
   </van-swipe-cell>

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

@@ -11,7 +11,7 @@ Page({
    */
   data: {
     /// 单据信息
-    order: <GuangZuan.MyPerformanc>({}),
+    order: <GuangZuan.MyPerformanc>{},
     /// 联系信息
     contract: '',
     /// 地址信息
@@ -117,7 +117,8 @@ Page({
    */
   onLoad(options: any) {
     /// 数据解析
-    const obj: GuangZuan.MyPerformanc = JSON.parse(options.id ?? '')
+    const obj = JSON.parse(options.id ?? '')
+    this.setData({ order: obj })
     if (obj) {
       const infos = JSON.parse(obj.buyorsell === 0 ? obj.buyerinfo : obj.sellerinfo)
       /// 买方信息
@@ -129,7 +130,6 @@ Page({
           invoice: ReceiptInfo
         })
       }
-      this.setData({ order: obj })
     }
   },
 

GuangZuan/miniprogram/pages/mine/index.less

@@ -70,6 +70,15 @@
           font-size: 14px;
         }
       }
+
+      .icon-view {
+        display: flex;
+        justify-content: space-between;
+        align-content: center;
+        align-items: center;
+        flex-direction: row;
+        width: 80px;
+      }
     }
 
     .button-view {

GuangZuan/miniprogram/pages/mine/index.ts

@@ -58,6 +58,15 @@ Page({
   },
 
   /**
+   * 资金流水
+   */
+  goToFunds() {
+    wx.navigateTo({
+      url: '/mMine/pages/funds/list/index'
+    })
+  },
+
+  /**
    * 按钮点击响应事件
    */
   onButtonPressed(e: any) {
@@ -138,31 +147,31 @@ Page({
    */
   queryBankAccountSign() {
     /// loding.....
-    // showLoading(() => {
-    //   /// 发送请求
-    //   queryBankAccountSign({
-    //     data: {
-    //       userid: userid()
-    //     },
-    //     success: (res) => {
-    //       /// 请求失败
-    //       if (res.code != 200) {
-    //         hideLoading(() => {}, '用户签约信息请求失败，原因：'+res.msg)
-    //         return
-    //       }
-    //       hideLoading(() => {
-    //         const sign = res.data.filter(obj => {
-    //           return obj.signstatus === 2 || obj.signstatus === 3 || obj.signstatus === 4
-    //         })[0]
-    //         /// 数据赋值
-    //         this.setData({  sign: sign })
-    //       })
-    //     },
-    //     fail: (emsg) => {
-    //       hideLoading(() => {}, emsg)
-    //     }
-    //   })
-    // })
+    showLoading(() => {
+      /// 发送请求
+      queryBankAccountSign({
+        data: {
+          userid: userid()
+        },
+        success: (res) => {
+          /// 请求失败
+          if (res.code != 200) {
+            hideLoading(() => {}, '用户签约信息请求失败，原因：'+res.msg)
+            return
+          }
+          hideLoading(() => {
+            const sign = res.data.filter(obj => {
+              return obj.signstatus === 2 || obj.signstatus === 3 || obj.signstatus === 4
+            })[0]
+            /// 数据赋值
+            this.setData({  sign: sign })
+          })
+        },
+        fail: (emsg) => {
+          hideLoading(() => {}, emsg)
+        }
+      })
+    })
   },
 
   /**

GuangZuan/miniprogram/pages/mine/index.wxml

@@ -14,8 +14,12 @@
           <text>{{ isOpenEye ? ta.accountid : secret }}</text>
         </view>
       </view>
-      <!-- 闭眼 -->
-      <van-icon id="eye" name="{{ isOpenEye ? 'eye-o' : 'closed-eye'}}" size="25" bind:click="onEye"/>
+      <view class="icon-view">
+        <!-- 闭眼 -->
+        <van-icon id="eye" name="{{ isOpenEye ? 'eye-o' : 'closed-eye'}}" size="25" bind:click="onEye"/>
+        <!-- 资金流水 -->
+        <van-icon id="funds" name="description" size="25" bind:click="goToFunds"/>
+      </view>
     </view>
     <view class="taaccount-info">
       <view class="item">

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

@@ -69,4 +69,20 @@ export function queryBankAccountSign(params: HttpRequest<{req: GuangZuan.QueryUs
  */
 export function getLoginID(params: HttpRequest<{req: GuangZuan.GetLoginIDReq, rsp: GuangZuan.GetLoginIDRsp}>) {
   return httpRequest(service.config.goCommonSearchUrl+'/User/GetLoginID', 'GET', params)
+}
+
+/**
+ * 资金流水查询（当前）
+ * 
+ */
+export function queryAmountLog(params: HttpRequest<{req: GuangZuan.AmountLogReq, rsp: GuangZuan.AmountLog[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/TaAccount/QueryAmountLog', 'GET', params)
+}
+
+/**
+ * 资金流水查询（历史）
+ * 
+ */
+export function queryHisAmountLog(params: HttpRequest<{req: GuangZuan.HisAmountLogReq, rsp: GuangZuan.AmountLog[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/TaAccount/QueryHisAmountLog', 'GET', params)
 }

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

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

GuangZuan/miniprogram/services/utils.ts

@@ -180,6 +180,11 @@ export function xtoken() {
   return wx.getStorageSync('Authorization')
 }
 
+/// 清除用户Token
+export function clearXtoken() {
+  wx.removeStorageSync('Authorization')
+}
+
 /// 获取市场id
 export function marketid() {
   return wx.getStorageSync('MarketID')

GuangZuan/project.private.config.json

@@ -10,22 +10,8 @@
     "miniprogram": {
       "list": [
         {
-          "name": "预售大厅",
-          "pathName": "mHome/pages/presell/list/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "集采详情",
-          "pathName": "mHome/pages/purchase/detail/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "预售详情",
-          "pathName": "mHome/pages/presell/detail/index",
+          "name": "资金流水",
+          "pathName": "mMine/pages/funds/list/index",
           "query": "",
           "launchMode": "default",
           "scene": null

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

@@ -888,5 +888,89 @@ declare namespace GuangZuan {
 
   /// 获取登录ID - 回应
   interface GetLoginIDRsp {}
+
+  /// 资金流水查询（当前）
+  interface AmountLogReq {
+    /// 页码
+    page?: number
+    /// 每页条数
+    pagesize?: number
+    /// 分页标志 0-page从0开始 1-page从1开始
+    pageflag?: number
+    /// 资金账户 - 格式：1,2,3
+    accountID: string
+    /// 资金操作类型 - 格式：1,2,3
+    OperateType?: string
+  }
+
+  /// 资金流水查询（当前）
+  interface HisAmountLogReq {
+    /// 页码
+    page?: number
+    /// 每页条数
+    pagesize?: number
+    /// 分页标志 0-page从0开始 1-page从1开始
+    pageflag?: number
+    /// 资金账户 - 格式：1,2,3
+    accountID: string
+    /// 资金操作类型 - 格式：1,2,3
+    OperateType?: string
+    /// 开始时间 - 闭区间，格式：yyyy-MM-dd
+    startDate?: string
+    /// 结束时间 - 闭区间，格式：yyyy-MM-dd
+    endDate?: string
+  }
+
+  /// 资金流水查询
+  interface AmountLog {
+    /// 资金账户ID
+    accountid: number
+    /// 竞拍商品代码
+    agoodscode: string
+    /// 竞拍商品名称
+    agoodsname: string
+    /// 资金金额
+    amount: number
+    /// 资金调整类型(默认值为0) - 0：系统 1:单边账调整 2:人工调整
+    amountadjusttype: number
+    /// 流水ID(220+Unix秒时间戳(10位)+xxxxxx)
+    autoid: number
+    /// 期初余额
+    balance: number
+    /// 业务编号
+    businesscode: number
+    /// 发生时间
+    createtime: string
+    /// 币种ID
+    currencyid: number
+    /// 期末余额(变动后金额)
+    currentbalance: number
+    /// 交割商品代码
+    dgoodscode: string
+    /// 交割商品名称
+    dgoodsname: string
+    /// 商品代码
+    goodscode: string
+    /// 商品ID
+    goodsid: number
+    /// 商品名称
+    goodsname: string
+    /// 市场ID
+    marketid: number
+    /// 市场名称
+    marketname: string
+    /// 资金流水号：银行端流水号
+    moneyticket: number
+    /// 资金操作类型 (AccountFundCmdOp)- 101:入金 102:入金手续费 103:出金 104:出金冻结 105:出金解冻 106:出金手续费 107:出金手续费冻结 108:出金手续费解冻 201:交易冻结 202:交易解冻 203:交易占用 204:交易解占用 205:交易手续费冻结 206:交易手续费解冻 207:交易手续费 208:交易货款 209:交易盈亏 301:交割冻结 302:交割解冻 303:交割手续费 304:交割手续费冻结 305:交割手续费解冻 306:交割货款 307:交割税款 401:结算盈亏 402:结算递延费 403:分润收入 404:延期分润 501:授信增加 502:授信减少 503:转积分 504:转入 505:转出 506:转出冻结 507:转出解冻 601:履约金额冻结 602:履约最大冻结 603:履约金额解冻 604:履约扣款 605:履约收款 606:履约违约手续费 607:履约违约收入 608:履约最大扣款 701:供应链金融冻结 702:供应链金融解冻 703:供应链金融最大冻结 704:供应链金融利息 705:供应链金融货款 706:供应链金融押金 707:供应链金融最大扣款 801:仓单贸易冻结 802:仓单贸易解冻 803:仓单贸易首付款 804:仓单贸易最大扣款 901:商城扣款冻结 902:商城扣款解冻 903:商城扣款 904:商城收款 1001:期权冻结 1002:期权解冻 1003:期权权力金 1004:期权手续费冻结 1005:期权手续费解冻 1006:期权手续费 1007:期权盈亏 1101:营销扣款 1102:营销收款
+    operatetype: number
+    /// 资金操作类型名称(显示)
+    operatetypename: string
+    /// 关联单号
+    relationorderid: string
+    /// 备注
+    remark: string
+    /// 交易模式
+    trademode: number
+  }
 }
 

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

@@ -599,6 +599,8 @@ declare namespace GuangZuan {
     zsshapetypedisplay: string
     /// 尺寸 - 两个小数, 逗号分隔
     zssize: string
+    /// 尺寸 - 两个小数, 逗号分隔
+    zssizedisplay: string
     /// 款式 - 多个, 逗号分隔
     zsstyletype: string
     ///