代码提交；

GuangZuan/miniprogram/app.json

@@ -38,8 +38,10 @@
       "root": "mHome",
       "name": "mHome",
       "pages": [
-        "pages/bond/bond",
-        "pages/inspection/inspection",
+        "pages/bond/list/list",
+        "pages/bond/detail/detail",
+        "pages/inspection/list/list",
+        "pages/inspection/detail/detail",
         "pages/calculator/calculator",
         "pages/search/search",
         "pages/msg/msglist/msglist",
@@ -55,15 +57,20 @@
       "pages": [
         "pages/myinventorys/list/list",
         "pages/realauth/realauth",
-        "pages/myorders/myorders",
-        "pages/myreports/myreports",
+        "pages/myorders/list/list",
+        "pages/myorders/his/his",
         "pages/bank/bank",
         "pages/listingdetail/listingdetail",
-        "pages/myperformance/myperformance",
         "pages/address/list/list",
         "pages/address/operate/operate",
         "pages/invoice/list/list",
-        "pages/invoice/operate/operate"
+        "pages/invoice/operate/operate",
+        "pages/about/about/about",
+        "pages/myperformance/list/list",
+        "pages/myperformance/his/his",
+        "pages/myperformance/detail/detail",
+        "pages/myperformance/modify/modify",
+        "pages/myperformance/breach/breach"
       ]
     },
     {
@@ -83,8 +90,7 @@
       "root": "mCircle",
       "name": "mCircle",
       "pages": [
-        "pages/comparison/comparison",
-        "pages/favorite/favorite"
+        "pages/contrast/contrast"
       ]
     }
   ],
@@ -103,7 +109,8 @@
     "nav-bar": "/components/nav-bar/nav-bar",
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
-    "van-loading": "@vant/weapp/loading/index"
+    "van-loading": "@vant/weapp/loading/index",
+    "van-swipe-cell": "@vant/weapp/swipe-cell/index"
   },
   "window": {
     "backgroundTextStyle": "dark",

GuangZuan/miniprogram/mCircle/pages/comparison/comparison.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText": "对比"
-}

GuangZuan/miniprogram/mCircle/pages/comparison/comparison.less

@@ -1,44 +0,0 @@
-/* mCircle/pages/comparison/comparison.wxss */
-
-.dia-top {
-  display: flex;
-  justify-content: space-between;
-  margin: 10px 15px;
-
-  .dia-top-item {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    align-content: center;
-  }
-
-  .dia-top-item-text {
-    font-size: 13px;
-    color: #333;
-  }
-}
-
-.dia-comparison {
-  display: flex;
-  flex-direction: column;
-  margin: 0px 10px;
-
-  view:nth-child(1) {
-    border-top: 1px solid #f0f0f0;
-  }
-
-  .dia-comparison-item {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    align-content: center;
-    border-bottom: 1px solid #f0f0f0;
-    height: 44px;
-
-    text {
-      font-size: 14px;
-      color: #333;
-      text-align: center;
-    }
-  }
-}

GuangZuan/miniprogram/mCircle/pages/comparison/comparison.ts

@@ -1,90 +0,0 @@
-// mCircle/pages/comparison/comparison.ts
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    /// 底部安全区域
-    safeBottom: getApp().globalData.safeBottom,
-    /// 钻石数据
-    diamonds: [{id: 1}, {id: 2}, {id: 3}],
-    /// 对比数据
-    datas: [['总重量', '223.23CT', '423.23CT', '600.23CT'], 
-            ['总重量', '223.23CT', '423.23CT', '600.23CT'], 
-            ['总重量', '223.23CT', '423.23CT', '600.23CT'], 
-            ['总重量', '223.23CT', '423.23CT', '600.23CT'], 
-            ['总重量', '223.23CT', '423.23CT', '600.23CT'], 
-            ['总重量', '223.23CT', '423.23CT', '600.23CT'], 
-            ['总重量', '223.23CT', '423.23CT', '600.23CT'], 
-            ['总重量', '223.23CT', '423.23CT', '600.23CT'], 
-            ['总重量', '223.23CT', '423.23CT', '600.23CT'], 
-            ['总重量', '223.23CT', '423.23CT', '600.23CT'],
-            ['总重量', '223.23CT', '423.23CT', '600.23CT'], 
-            ['总重量', '223.23CT', '423.23CT', '600.23CT'], 
-            ['总重量', '223.23CT', '423.23CT', '600.23CT'], 
-            ['总重量', '223.23CT', '423.23CT', '600.23CT'], 
-            ['总重量', '223.23CT', '423.23CT', '600.23CT'], 
-            ['总重量', '223.23CT', '423.23CT', '600.23CT'], 
-            ['总重量', '223.23CT', '423.23CT', '600.23CT'], 
-            ['总重量', '223.23CT', '423.23CT', '600.23CT'], 
-            ['总重量', '223.23CT', '423.23CT', '600.23CT'], 
-            ['总重量', '223.23CT', '423.23CT', '600.23CT']]
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

GuangZuan/miniprogram/mCircle/pages/comparison/comparison.wxml

@@ -1,16 +0,0 @@
-<!--mCircle/pages/comparison/comparison.wxml-->
-
-<!-- 顶部 -->
-<view class="dia-top">
-  <view class="dia-top-item" wx:for="{{diamonds}}" wx:key="id">
-    <van-image width="80" height="80" lazy-load radius="10px" class="dia-top=item-img" src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fp6.itc.cn%2Fimages01%2F20201013%2F4742c373ba044538a0b9dc0dec93f5b8.jpeg&refer=http%3A%2F%2Fp6.itc.cn&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1662619772&t=af033b0c014ea50ff71b10a28c332b60"></van-image>
-    <text class="dia-top-item-text">CSZS00000001</text>
-  </view>
-</view>
-
-<!-- 对比内容 -->
-<view class="dia-comparison" style="padding-bottom: {{safeBottom}}px;">
-  <view class="dia-comparison-item" wx:for="{{datas}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">
-    <text wx:for="{{itm}}" wx:for-item="data" wx:for-index="idx" wx:key="idx">{{data}}</text>
-  </view>
-</view>

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

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

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

@@ -0,0 +1 @@
+/* mCircle/pages/contrast/contrast.wxss */

GuangZuan/miniprogram/mMine/pages/myreports/myreports.ts → GuangZuan/miniprogram/mCircle/pages/contrast/contrast.ts

@@ -1,4 +1,4 @@
-// pages/mine/myreports/myreports.ts
+// mCircle/pages/contrast/contrast.ts
 Page({
 
   /**
@@ -9,25 +9,25 @@ Page({
   },
 
   /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad() {
-
-  },
-
-  /**
    * 返回上层视图
    */
   backToParent() {
     /// 返回上层视图
     wx.navigateBack()
   },
+  
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad() {
+
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady() {
-  
+
   },
 
   /**

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

@@ -0,0 +1,14 @@
+<!--mCircle/pages/contrast/contrast.wxml-->
+
+<!-- top-view -->
+<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>
+
+<view class="container">
+  
+</view>

GuangZuan/miniprogram/mCircle/pages/favorite/favorite.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText": "钻石收藏"
-}

GuangZuan/miniprogram/mCircle/pages/favorite/favorite.less

@@ -1,33 +0,0 @@
-/* mCircle/pages/favorite/favorite.wxss */
-
-.title-view {
-  background-color: #f0f0f0;
-
-  .title-view-text {
-
-    font-size: 12px;
-    color: #666;
-    text-align: center;
-    border-right: 1px solid #f0f0f0;
-  }
-}
-
-.title-view, .order-list-item-row {
-  padding: 12px 0px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  align-content: center;
-  border-bottom: 1px solid #f0f0f0;
-}
-
-.order-list-item {
-  display: flex;
-
-  text {
-    font-size: 14px;
-    color: #333;
-    text-align: center;
-    border-right: 1px solid #f0f0f0;
-  }
-}

GuangZuan/miniprogram/mCircle/pages/favorite/favorite.ts

@@ -1,99 +0,0 @@
-// mCircle/pages/favorite/favorite.ts
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    /// tabs
-    tabs: [{id: 1, name: '成批裸钻'}, 
-           {id: 2, name: '单颗裸钻'}, 
-           {id: 3, name: '成批毛坯'}, 
-           {id: 4, name: '钻石首饰'}, 
-           {id: 5, name: '彩色钻石'}],
-    /// 列头
-    titles: ['委托单号', '时间', '挂牌会员', '委托重量', '委托价格', '成交重量', '委托状态', '交易日'],
-    /// 列表宽度
-    widths: [60, 60, 80, 110, 80, 80, 80, 80],
-    /// 列表总宽度
-    totalWidth: 0,
-    /// 内容
-    values: [['圆形', 'E-J', 'FL-VS1', '￥21002.00', '10.04', '0.51', '0.51', '0.51'], 
-             ['圆形', 'E-J', 'FL-VS1', '￥21002.00', '10.04', '0.51', '0.51', '0.51'], 
-             ['圆形', 'E-J', 'FL-VS1', '￥21002.00', '10.04', '0.51', '0.51', '0.51'], 
-             ['圆形', 'E-J', 'FL-VS1', '￥21002.00', '10.04', '0.51', '0.51', '0.51'], 
-             ['圆形', 'E-J', 'FL-VS1', '￥21002.00', '10.04', '0.51', '0.51', '0.51'], 
-             ['圆形', 'E-J', 'FL-VS1', '￥21002.00', '10.04', '0.51', '0.51', '0.51'], 
-             ['圆形', 'E-J', 'FL-VS1', '￥21002.00', '10.04', '0.51', '0.51', '0.51'], 
-             ['圆形', 'E-J', 'FL-VS1', '￥21002.00', '10.04', '0.51', '0.51', '0.51'], 
-             ['圆形', 'E-J', 'FL-VS1', '￥21002.00', '10.04', '0.51', '0.51', '0.51'], 
-             ['圆形', 'E-J', 'FL-VS1', '￥21002.00', '10.04', '0.51', '0.51', '0.51'], 
-             ['圆形', 'E-J', 'FL-VS1', '￥21002.00', '10.04', '0.51', '0.51', '0.51'], 
-             ['圆形', 'E-J', 'FL-VS1', '￥21002.00', '10.04', '0.51', '0.51', '0.51']]
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad() {
-    /// 计算总高度
-    let num = 0.0
-    this.data.widths.forEach(function(v) {
-      num += v
-    })
-
-    this.setData({
-      /// 设置总高度
-      totalWidth: num
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

GuangZuan/miniprogram/mCircle/pages/favorite/favorite.wxml

@@ -1,22 +0,0 @@
-<!--mCircle/pages/favorite/favorite.wxml-->
-<view class="top-view" style="position: sticky; top: 0; z-index: 999;">
-  <!-- tabs -->
-  <van-tabs animated>
-    <van-tab wx:for="{{tabs}}" wx:key="id" title="{{item.name}}"></van-tab>
-  </van-tabs>
-</view>
-
-<scroll-view class="scroll-view" scroll-x enable-flex>
-  <!-- 列头 -->
-  <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>
-  </view>
-
-  <!-- 数据内容 -->
-  <view class="order-list-item" wx:for="{{values}}" wx:for-item="lists" wx:key="lists" id="{{index}}" bindtap="onListItemClick">
-      <!-- 数据体 -->
-      <view class="order-list-item-row" style="width: {{totalWidth}}px;">
-        <text wx:for="{{lists}}" wx:for-index="idx" wx:for-item="itm" wx:key="itm" style="width: {{widths[idx]}}px;">{{itm}}</text>
-      </view>
-    </view>
-</scroll-view>

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

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

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

@@ -1,6 +0,0 @@
-<!--mHome/pages/bond/bond.wxml-->
-<!-- 导航栏 -->
-<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>

GuangZuan/miniprogram/mHome/pages/bond/detail/detail.json

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

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

@@ -0,0 +1,38 @@
+/* mHome/pages/bond/detail/detail.wxss */
+
+.top-view {
+  position: sticky;
+  top: 0px;
+  z-index: 999;
+
+  .title-view {
+    margin: 10px;
+    background-color: #f0f0f0;
+    height: 100px;
+    border-radius: 10px;
+    display: flex;
+    align-items: center;
+    align-content: center;
+    flex-direction: column;
+    padding: 5px 10px;
+  
+    .title-view-up, .title-view-down {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      height: 50%;
+      width: 100%;
+      align-content: center;
+  
+      text {
+        color: #666;
+        font-size: 13px;
+      }
+    }
+  
+    .title-view-up {
+      border-bottom: 1px solid #ddd;
+    }
+  }
+}

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

@@ -0,0 +1,78 @@
+// mHome/pages/bond/detail/detail.ts
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    /// 列头
+    titles: [['净重（ct）', '净重（g）', '毛重（g）', '总量（USD', '单价（USD/ct）'],
+              ['内容', '备注', '彩钻颜色']],
+              
+  },
+
+   /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

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

@@ -0,0 +1,19 @@
+<!--mHome/pages/bond/detail/detail.wxml-->
+<!-- top-view -->
+<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 class="title-view">
+    <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">
+      <text wx:for="{{titles[1]}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">{{itm}}</text>
+    </view>
+  </view>
+</view>

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

@@ -0,0 +1,90 @@
+/* mHome/pages/bond/list/list.wxss */
+
+.top-view {
+  position: sticky;
+  top: 0px;
+  z-index: 999;
+
+  .title-view {
+    margin: 10px;
+    background-color: #f0f0f0;
+    height: 100px;
+    border-radius: 10px;
+    display: flex;
+    align-items: center;
+    align-content: center;
+    flex-direction: column;
+    padding: 5px 10px;
+  
+    .title-view-up, .title-view-mid, .title-view-down {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      height: 50%;
+      width: 100%;
+      align-content: center;
+  
+      text {
+        color: #666;
+        font-size: 13px;
+      }
+    }
+  
+    .title-view-up, .title-view-mid {
+      border-bottom: 1px solid #ddd;
+    }
+  }
+}
+
+.item-view {
+  margin: 10px;
+  height: 90px;
+  border-radius: 10px;
+  display: flex;
+  align-items: center;
+  align-content: center;
+  flex-direction: column;
+  padding: 5px 10px;
+  border: 1px solid #ddd;
+
+  .item-view-up, .item-view-mid, .item-view-down {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    height: 50%;
+    width: 100%;
+    align-content: center;
+
+    text {
+      color: #333;
+      font-size: 13px;
+    }
+
+    .price {
+      color: red;
+      font-size: 15px;
+    }
+  }
+
+  .item-view-up, .item-view-mid {
+    border-bottom: 1px solid #ddd;
+  }
+}
+
+.right {
+  height: inherit;
+  width: 130px;
+  color: white;
+  display: flex;
+
+  .item {
+    width: 65px;
+    text-align: center;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 12px;
+  }
+}

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

@@ -0,0 +1,134 @@
+// mHome/pages/bond/list/list.ts
+
+import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
+import { queryGZBSFWOrder } from "../../../../services/api/trade/index"
+import { userid } from "../../../../services/utils"
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    /// tabs
+    tabs: [{id: 0, name: '待处理'}, {id: 1, name: '进行中'}, {id: 2, name: '已结束'}],
+    /// tab索引
+    active: 0,
+    /// 列头
+    titles: [['总净重（ct）', '总净重（g）', '总毛重（g）', '单据编号'],
+             ['总值（USD）', '单价（USD/ct）', '状态'],
+             ['内容', '备注']],
+    /// 是否空数据
+    isEmpty: true,
+    /// 数据信息
+    bonds: <GuangZuan.GZBSFWOrder[]>[]
+  },
+
+  /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+  /**
+   * tab触发事件
+   */
+  onTabChange(e: any) {
+    /// 设置激活项
+    this.setData({ active: e.detail.index })
+    /// 查询保税服务单据
+    this.queryGZBSFWOrder()
+  },
+
+  /**
+   * 查询保税服务单据
+   */
+  queryGZBSFWOrder() {
+    /// loding.....
+    Toast.loading({message: '加载中...'})
+    /// 发送查询
+    queryGZBSFWOrder({
+      data: {
+        /// 模糊搜索
+        userid: userid()
+      },
+      /// 加载成功
+      success: (res) => {
+        if (res.code != 200) {
+          /// 加载失败
+          Toast.success({ message: '加载失败...'});
+          return
+        }
+        /// 数据赋值
+        this.setData({ 
+          bonds: res.data,
+          isEmpty: res.data.length == 0
+        })
+      },
+      fail: (emsg) => {
+        /// 加载失败
+        Toast.fail({ message: '加载失败...'+emsg});
+      },
+      complete: () => {}
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad() {
+    /// 查询保税服务单据
+    this.queryGZBSFWOrder()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

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

@@ -0,0 +1,57 @@
+<!--mHome/pages/bond/list/list.wxml-->
+<!-- top-view -->
+<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>
+
+  <!-- tabs -->
+  <view class="tab-view">
+    <van-tabs sticky animated 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="title-view">
+    <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-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">
+      <text wx:for="{{titles[2]}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">{{itm}}</text>
+    </view>
+  </view>
+</view>
+
+<!-- 内容滚动视图 --> 
+<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">
+    <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>
+      </view>
+      <view class="item-view-mid">
+        <text>{{data.totalamount}}</text>
+        <text>{{data.priceper}}</text>
+        <text>{{data.executestatus}}</text>
+      </view>
+      <view class="item-view-down">
+        <text>{{data.contentrange}}</text>
+      </view>
+    </view>
+  </van-swipe-cell>
+</scroll-view>
+
+<!-- 无数据 --> 
+<van-empty wx:if="{{isEmpty}}" class="custom-image" description="无数据"/>
+<!-- toast --> 
+<van-toast id="van-toast" />

GuangZuan/miniprogram/mHome/pages/inspection/detail/detail.json

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

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

@@ -0,0 +1,38 @@
+/* mHome/pages/inspection/detail/detail.wxss */
+
+.top-view {
+  position: sticky;
+  top: 0px;
+  z-index: 999;
+
+  .title-view {
+    margin: 10px;
+    background-color: #f0f0f0;
+    height: 100px;
+    border-radius: 10px;
+    display: flex;
+    align-items: center;
+    align-content: center;
+    flex-direction: column;
+    padding: 5px 10px;
+  
+    .title-view-up, .title-view-down {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      height: 50%;
+      width: 100%;
+      align-content: center;
+  
+      text {
+        color: #666;
+        font-size: 13px;
+      }
+    }
+  
+    .title-view-up {
+      border-bottom: 1px solid #ddd;
+    }
+  }
+}

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

@@ -0,0 +1,77 @@
+// mHome/pages/inspection/detail/detail.ts
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    /// 列头
+    titles: [['货物编号', '形状', '重量（ct）', '参考货值（USD）'],
+              ['彩钻信息', '其他']],
+  },
+
+  /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

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

@@ -0,0 +1,28 @@
+<!--mHome/pages/inspection/detail/detail.wxml-->
+<!-- top-view -->
+<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 class="title-view">
+    <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">
+      <text wx:for="{{titles[1]}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">{{itm}}</text>
+    </view>
+  </view>
+</view>
+
+<!-- 内容 --> 
+<scroll-view class="container">
+
+  
+</scroll-view>
+
+ <!--  无数据  -->
+ <van-empty wx:if="{{isEmpty}}" class="custom-image" description="无数据"/>

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

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

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

@@ -1,6 +0,0 @@
-<!--mHome/pages/inspection/inspection.wxml-->
-<!-- 导航栏 -->
-<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>

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

@@ -0,0 +1,74 @@
+/* mHome/pages/inspection/list/list.wxss */
+
+.top-view {
+  position: sticky;
+  top: 0px;
+  z-index: 999;
+
+  .title-view {
+    margin: 10px;
+    background-color: #f0f0f0;
+    height: 70px;
+    border-radius: 10px;
+    display: flex;
+    align-items: center;
+    align-content: center;
+    flex-direction: column;
+    padding: 5px 10px;
+  
+    .title-view-up, .title-view-down {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      height: 50%;
+      width: 100%;
+      align-content: center;
+  
+      text {
+        color: #666;
+        font-size: 13px;
+      }
+    }
+  
+    .title-view-up {
+      border-bottom: 1px solid #ddd;
+    }
+  }
+}
+
+.item-view {
+  margin: 10px;
+  height: 90px;
+  border-radius: 10px;
+  display: flex;
+  align-items: center;
+  align-content: center;
+  flex-direction: column;
+  padding: 5px 10px;
+  border: 1px solid #ddd;
+
+  .item-view-up, .item-view-down {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    height: 50%;
+    width: 100%;
+    align-content: center;
+
+    text {
+      color: #333;
+      font-size: 13px;
+    }
+
+    .price {
+      color: red;
+      font-size: 15px;
+    }
+  }
+
+  .item-view-up {
+    border-bottom: 1px solid #ddd;
+  }
+}

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

@@ -0,0 +1,133 @@
+import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
+import { queryGZCJJCOrder } from "../../../../services/api/trade/index"
+import { userid } from "../../../../services/utils"
+
+
+// mHome/pages/inspection/list/list.ts
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    /// tabs
+    tabs: [{id: 0, name: '待处理'}, {id: 1, name: '进行中'}, {id: 2, name: '已结束'}],
+    /// tab索引
+    active: 0,
+    /// 列头
+    titles: [['货物品类', '送检账户', '单据编号'],
+             ['总重量（粒）', '总重量（ct）', '总参考值（USD）', '状态']],
+    /// 是否空数据
+    isEmpty: true,
+    /// 数据信息
+    orders: <GuangZuan.GZCJJCOrder[]>[]
+  },
+
+  /**
+   * tab触发事件
+   */
+  onTabChange(e: any) {
+    /// 设置激活项
+    this.setData({ active: e.detail.index })
+    /// 查询出境检测单据
+    this.queryGZCJJCOrder()
+  },
+
+   /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+/**
+   * 查询出境检测单据
+   */
+  queryGZCJJCOrder() {
+    /// loding.....
+    Toast.loading({message: '加载中...'})
+    /// 发送查询
+    queryGZCJJCOrder({
+      data: {
+        /// 模糊搜索
+        userid: userid()
+      },
+      /// 加载成功
+      success: (res) => {
+        if (res.code != 200) {
+          /// 加载失败
+          Toast.success({ message: '加载失败...'});
+          return
+        }
+        /// 数据赋值
+        this.setData({ 
+          orders: res.data,
+          isEmpty: res.data.length == 0
+        })
+      },
+      fail: (emsg) => {
+        /// 加载失败
+        Toast.fail({ message: '加载失败...'+emsg});
+      },
+      complete: () => {}
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad() {
+    /// 查询出境检测单据
+    this.queryGZCJJCOrder()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

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

@@ -0,0 +1,51 @@
+<!--mHome/pages/inspection/list/list.wxml-->
+<!-- top-view -->
+<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>
+
+  <!-- tabs -->
+  <view class="tab-view">
+    <van-tabs sticky animated 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="title-view">
+    <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">
+      <text wx:for="{{titles[1]}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">{{itm}}</text>
+    </view>
+  </view>
+</view>
+
+<!-- 内容滚动视图 --> 
+<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">
+    <view class="item-view">
+      <view class="item-view-up">
+        <text>{{data.gzcjcategorytype}}</text>
+        <text>{{data.gzcjaccount}}</text>
+        <text>{{data.orderno}}</text>
+      </view>
+      <view class="item-view-down">
+        <text>{{data.totalnumber}}</text>
+        <text>{{data.totalgrossweight}}</text>
+        <text>{{data.totalweightgm}}</text>
+        <text>{{data.executestatus}}</text>
+      </view>
+    </view>
+  </van-swipe-cell>
+</scroll-view>
+
+<!-- 无数据 --> 
+<van-empty wx:if="{{isEmpty}}" class="custom-image" description="无数据"/>
+<!-- toast --> 
+<van-toast id="van-toast" />

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

@@ -4,16 +4,23 @@ Page {
   background-color: #f6f6f6;
 }
 
+.top-view {
+  position: sticky;
+  z-index: 999;
+  top: 0;
+}
+
 .goodscard {
   display: flex;
   flex-direction: row;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
   align-items: center;
   align-content: center;
+  margin: 10px;
   
   .goodscard-item {
-    width: 47%;
+    width: 48%;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
@@ -33,7 +40,6 @@ Page {
       color: #333;
       margin: 10px 10px 0px 10px;
       text-align: left;
-      height: 50px;
     }
 
     .goods-price {

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

@@ -1,3 +1,6 @@
+import Toast from "../../../miniprogram_npm/@vant/weapp/toast/toast";
+import { querySellOrder } from "../../../services/api/orders/index";
+
 // mHome/pages/jewelry/jewelry.ts
 Page({
 
@@ -7,6 +10,16 @@ Page({
   data: {
     /// 底部安全区域
     safeBottom: getApp().globalData.safeBottom,
+    /// 买大厅数据
+    sellOrders: <GuangZuan.SellOrder[]>[],
+    /// 数据是否为空
+    isEmpty: true,
+    /// 搜索结果
+    result: '',
+    /// 页码
+    page: 1,
+    /// 每页条数
+    pagesize: 20,
   },
 
   /**
@@ -16,12 +29,58 @@ Page({
     /// 返回上层视图
     wx.navigateBack()
   },
+  /**
+   * 搜索
+   */
+  onSearch() {
+    /// 充值页码
+    this.setData({ page: 1 })
+    /// 搜索钻石
+    this.queryDiamond()
+  },
+
+  /// 查询出售大厅委托单
+  queryDiamond() {
+    /// loding.....
+    Toast.loading({message: '加载中...'});
+   
+    /// 钻石查询
+    querySellOrder({
+      data: {
+        /// 钻石分类
+        zscategorys: '4',
+        /// 商品(查询字段-模糊查询)
+        zsallproperties: this.data.result,
+        page: this.data.page,
+        pagesize: this.data.pagesize
+      },
+      /// 加载成功
+      success: (res) => {
+        if (res.code != 200) {
+          /// 加载失败
+          Toast.fail({ message: '加载失败，原因：'+res.msg});
+          return
+        }
+        /// 数据赋值
+        this.setData({ 
+          sellOrders: this.data.page == 1 ? res.data : this.data.sellOrders.concat(res.data),
+          isEmpty: this.data.page == 1 ? res.data.length == 0 : this.data.sellOrders.length == 0
+        })
+      },
+      fail: (emsg) => {
+        /// 加载失败
+        Toast.fail({ message: '加载失败，原因：'+emsg});
+      },
+      complete: () => {}
+    })
+  },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad() {
-
+    /// 查询出售大厅委托单
+    this.queryDiamond()
   },
 
   /**
@@ -56,14 +115,20 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh() {
-
+    /// 充值页码
+    this.setData({ page: 1 })
+    /// 查询出售大厅委托单
+    this.queryDiamond()
   },
 
   /**
    * 页面上拉触底事件的处理函数
    */
   onReachBottom() {
-
+    /// 充值页码
+    this.setData({ page: this.data.page+1 })
+    /// 查询出售大厅委托单
+    this.queryDiamond()
   },
 
   /**

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

@@ -1,21 +1,29 @@
 <!--mHome/pages/jewelry/jewelry.wxml-->
+ 
+<!-- top-view -->
+<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>
 
-<!-- 导航栏 -->
-<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 class="search-view">
-  <van-search model:value="{{GIA}}" shape="round" placeholder="搜索首饰" bind:change="onChange" bind:search="onSearch"></van-search>  
-</view> 
+  <!-- 搜索视图 -->
+  <van-search model:value="{{result}}" use-action-slot background="#4fc08d" shape="round" placeholder="搜索首饰" bind:change="onChange">
+    <view slot="action" bind:tap="onSearch" style="color: white;">搜索</view>
+  </van-search> 
+</view>
 
 <!-- 商品卡片 -->
 <view class="goodscard" style="padding-bottom: {{safeBottom}}px;">
-  <view class="goodscard-item">
+  <view class="goodscard-item" wx:for="{{sellOrders}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">
     <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>
+    <text class="goods-title">{{itm.zsstyletypedisplay}}{{itm.totalqty}}ct{{itm.stonedesc}}</text>
+    <text class="goods-price">￥{{itm.price}}</text>
   </view>
-</view>
+</view>
+
+<!-- 无数据 --> 
+<van-empty wx:if="{{isEmpty}}" class="custom-image" description="无数据"/>
+<!-- toast --> 
+<van-toast id="van-toast" />

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

@@ -1,3 +1,5 @@
+import { it } from "node:test"
+
 // pages/search/search.ts
 Page({
 
@@ -27,7 +29,7 @@ Page({
              {id: 12, name: '阿斯切形', isCheck: false}, 
              {id: 13, name: '其他', isCheck: false}],
     /// 选中形状         
-    shape: 1,
+    shape: ['1'],
     /// 颜色
     colors: [{id: 1, name: 'D', isCheck: true}, 
              {id: 2, name: 'E', isCheck: false}, 
@@ -54,7 +56,7 @@ Page({
              {id: 23, name: 'Z', isCheck: false}, 
              {id: 24, name: '彩色', isCheck: false}],
     /// 选中形状
-    color: 1,
+    color: ['1'],
     /// 净度
     neatness: [{id: 1, name: 'FL', isCheck: true}, 
               {id: 2, name: 'IF', isCheck: false}, 
@@ -152,15 +154,13 @@ Page({
     switch (id) {
       case 'shape':   /// 形状
         this.setData({ shapes: this.data.shapes.map(item => {
-          if (item.id == index) {
-            item.isCheck = true
-            /// 赋值
-            this.setData({ shape: item.id })
-          } else {
-            item.isCheck = false
-          }
+          if (item.id == index) { item.isCheck = !item.isCheck } 
           return item
         }) })
+        /// 赋值
+        this.setData({ shape: this.data.shapes.map(item => {
+          return item.id.toString()
+        }) })
         break;
       case 'currency': 
         this.setData({ currencys: this.data.currencys.map(item => {
@@ -176,15 +176,13 @@ Page({
         break;
       case 'color':   /// 颜色
         this.setData({ colors: this.data.colors.map(item => {
-          if (item.id == index) {
-            item.isCheck = true
-            /// 赋值
-            this.setData({ color: item.id })
-          } else {
-            item.isCheck = false
-          }
+          if (item.id == index) { item.isCheck = !item.isCheck } 
           return item
         }) })
+        /// 赋值
+        this.setData({ color: this.data.colors.map(item => {
+          return item.id.toString()
+        }) })
         break;
       case 'neatness':   /// 净度
         this.setData({ neatness: this.data.neatness.map(item => {

GuangZuan/miniprogram/mMine/pages/about/about/about.json

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

GuangZuan/miniprogram/mMine/pages/about/about/about.less

@@ -0,0 +1,13 @@
+/* mMine/pages/about/about/about.wxss */
+
+.container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  align-content: center;
+
+  van-image {
+    margin-top: 15%;
+    margin-bottom: 20px;
+  }
+}

GuangZuan/miniprogram/mMine/pages/about/about/about.ts

@@ -0,0 +1,77 @@
+import { appConfig } from "../../../../config/index"
+
+// mMine/pages/about/about/about.ts
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    /// 版本号
+    version: appConfig.version,
+  },
+
+  /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

GuangZuan/miniprogram/mMine/pages/about/about/about.wxml

@@ -0,0 +1,24 @@
+<!--mMine/pages/about/about/about.wxml-->
+
+<!-- top-view -->
+<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>
+
+<view class="container" style="margin-bottom: 20px;">
+  <!--  logo图片  -->
+  <van-image width="100" height="100" lazy-load radius="10px" src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fp6.itc.cn%2Fimages01%2F20201013%2F4742c373ba044538a0b9dc0dec93f5b8.jpeg&refer=http%3A%2F%2Fp6.itc.cn&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1662619772&t=af033b0c014ea50ff71b10a28c332b60">
+    <van-loading slot="loading" type="spinner" size="20" vertical />
+  </van-image>
+  <text style="color: #666; font-size: 14px;">版本号：{{version}}</text>
+</view>
+
+<!-- van-cell-group -->
+<van-cell-group>
+    <van-cell title="隐私政策" is-link />
+    <van-cell title="用户协议" is-link />
+  </van-cell-group>

GuangZuan/miniprogram/mMine/pages/invoice/list/list.json

@@ -1,6 +1,4 @@
 {
-  "usingComponents": {
-    "van-swipe-cell": "@vant/weapp/swipe-cell/index"
-  },
+  "usingComponents": {},
   "navigationStyle": "custom"
 }

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

@@ -37,8 +37,6 @@
   }
 }
 
-
-
 .item-view {
   margin: 10px;
   height: 70px;

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

@@ -37,6 +37,7 @@ Page({
   onTabChange(e: any) {
     /// 设置激活项
     this.setData({ active: e.detail.index })
+    /// 类型
     const zscategory = this.data.tabs[this.data.active].id
 
     switch (zscategory) {

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

@@ -31,11 +31,10 @@
   <van-swipe-cell wx:for="{{datas}}" wx:for-item="data" wx:key="ladingbillid" right-width="{{ 65 }}" left-width="{{ 65 }}">
     <view class="item-view">
       <view class="item-view-up">
-        <text>{{data.kpweight}}</text>
-        <text>{{data.zspolishtype2display}}</text>
-        <text wx:if="{{active == 2}}">￥{{data.zsshapetypedisplay}}</text>
+        <text>{{data.qty}}ct</text>
+        <text>{{data.zsshapetypedisplay}}</text>
+        <text>--</text>
         <text>{{data.sizedisplay}}</text>
-        <text>{{data.cerno}}</text>
         <text>{{data.goodsno}}</text>
       </view>
       <view class="item-view-down">

GuangZuan/miniprogram/mMine/pages/myorders/his/his.json

@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "van-calendar": "@vant/weapp/calendar/index"
+  },
+  "navigationBarTitleText": "历史订单",
+  "navigationStyle": "custom"
+}

GuangZuan/miniprogram/mMine/pages/myorders/his/his.less

@@ -0,0 +1,98 @@
+/* mMine/pages/myorders/his/his.wxss */
+
+.topView {
+  position: sticky;
+  top: 0;
+  z-index: 1;
+
+  .result-view {
+    display: flex;
+    justify-content: space-between;
+    padding: 5px 10px;
+    align-items: center;
+    align-content: center;
+
+    text {
+      color: #666;
+      font-size: 12px;
+      width: 20px;
+    }
+  }
+
+  .title-view {
+    margin: 10px;
+    background-color: #f0f0f0;
+    height: 70px;
+    border-radius: 10px;
+    display: flex;
+    align-items: center;
+    align-content: center;
+    flex-direction: column;
+    padding: 5px 10px;
+  
+    .title-view-up, .title-view-down {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      height: 50%;
+      width: 100%;
+      align-content: center;
+  
+      text {
+        color: #666;
+        font-size: 13px;
+      }
+    }
+  
+    .title-view-up {
+      border-bottom: 1px solid #ddd;
+    }
+  }
+}
+
+.item-view {
+  margin: 10px;
+  height: 70px;
+  border-radius: 10px;
+  display: flex;
+  align-items: center;
+  align-content: center;
+  flex-direction: column;
+  padding: 5px 10px;
+  border: 1px solid #ddd;
+
+  .item-view-up, .item-view-down {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    height: 50%;
+    width: 100%;
+    align-content: center;
+
+    text {
+      color: #333;
+      font-size: 13px;
+    }
+  }
+
+  .item-view-up {
+    border-bottom: 1px solid #ddd;
+  }
+}
+
+.van-swipe-cell__right {
+  height: inherit;
+  color: white;
+  display: flex;
+
+  .item {
+    width: 65px;
+    text-align: center;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 12px;
+  }
+}

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

@@ -0,0 +1,186 @@
+import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
+import { queryMyDeListing } from "../../../../services/api/orders/index"
+import { userid } from "../../../../services/utils"
+import { formatDate, isnullstr } from "../../../../utils/util"
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    titles: [['重量', '形状', '款式', '尺寸', '编号'], ['颜色 | 净度 | 切工 | 对称 | 抛光 | 荧光 | 证书', '价格']],
+    /// 是否空数据
+    isEmpty: false,
+    /// 我的摘牌
+    datas: <GuangZuan.MyDeListing[]>[],
+    /// 显示的值
+    values: [{ up: [''], dwn: [''] }],
+    /// 页签
+    page: 1,
+    /// 是否显示日期
+    show: false,
+    /// 买卖方向
+    buyOrSell: 0,
+    /// 开始日期
+    startdate: formatDate(new Date()),
+    /// 结束日期
+    enddate: formatDate(new Date()),
+    /// 最小日期
+    minDate: new Date(2010, 10, 1).getTime(),
+    /// 是否开始日期
+    isstart: true
+  },
+
+  /**
+   * 按钮点击响应事件
+   */
+  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:
+        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)
+      })
+    }
+  },
+
+  /// 查询我的摘牌
+  queryMyDeListing() {
+    /// loding
+    Toast.loading({ message: '加载中....' })
+
+    /// 数据查询请求
+    queryMyDeListing({
+      data: {
+        userid: userid(),
+        page: this.data.page,
+        pagesize: 20,
+        begindate: this.data.startdate,
+        enddate: this.data.enddate
+      },
+      success: (res) => {
+        /// 请求失败
+        if (res.code != 200) {
+          Toast('请求失败，原因：'+res.msg)
+          return
+        }
+        
+        /// 设置数据
+        this.setData({
+          /// 设置列头
+          datas: res.data,
+          /// 显示的值
+          values: res.data.map(obj => {
+            return {up: [obj.qty+'ct', 
+                        isnullstr(obj.zsshapetypedisplay), 
+                        '--', 
+                        isnullstr(obj.sizedisplay), 
+                        isnullstr(obj.goodsno)], 
+                    dwn: [isnullstr(obj.zsczcolor1typedisplay)+' | '+isnullstr(obj.zsclaritytype1display)+' | '+isnullstr(obj.zscuttype1display)+' | '+isnullstr(obj.zssymmetrytype1display)+' | '+isnullstr(obj.zspolishtype1display)+' | '+isnullstr(obj.zsfluorescencetype1display)+' | '+isnullstr(obj.zscerttypedisplay),
+                        obj.zscurrencytypedisplayunit+obj.price]}
+          })
+        })
+      },
+      fail: (emsg) => {
+        Toast('请求失败，原因：'+emsg)
+      },
+      complete: () => { 
+        /// 判断数据是否为空
+        this.setData({ isEmpty: this.data.datas.length == 0 })
+      }
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad() {
+    /// 查询我的摘牌
+    this.queryMyDeListing()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+    // 设置页签
+    this.setData({ page: 1 })
+    /// 查询我的摘牌
+    this.queryMyDeListing()
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+    /// 设置页签
+    this.setData({ page: +1 })
+    /// 查询我的摘牌
+    this.queryMyDeListing()
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

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

@@ -0,0 +1,54 @@
+<!--mMine/pages/myorders/his/his.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 class="result-view" style="background-color: white;">
+    <van-tabs custom-class="buyOrSell" type="card" sticky animated bind:change="onDTabChange" line-height="0px">
+      <van-tab wx:for="{{['买', '卖']}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx" active="{{idx}}" title="{{itm}}"/>
+    </van-tabs>  
+    <text>从</text>
+    <van-button size="normal" id="startdate" custom-class="sell" plain type="default" bind:click="onButtonPressed">{{startdate}}</van-button>
+    <text>到</text>
+    <van-button size="normal" id="enddate" custom-class="sell" plain type="default" bind:click="onButtonPressed">{{enddate}}</van-button>
+  </view>
+
+  <!-- 列头 --> 
+  <view class="title-view">
+    <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">
+      <text wx:for="{{titles[1]}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">{{itm}}</text>
+    </view>
+  </view>
+</view>
+
+<!-- 内容滚动视图 --> 
+<scroll-view class="content-view">
+  <!-- 数据 --> 
+  <van-swipe-cell wx:for="{{values}}" wx:for-item="itm" wx:key="wrtradedetailid" right-width="{{ 50 }}">
+    <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>
+      </view>
+      <view class="item-view-down">
+        <text wx:for="{{itm.dwn}}" wx:for-item="data" wx:for-index="idx" wx:key="idx">{{data}}</text>
+      </view>
+    </view>
+    <view slot="right" class="van-swipe-cell__right">
+      <view class="item detail" id="detail {{idx}}" style="background-color: yellowgreen; color: white;" bindtap="onButtonPressed">详情</view>
+    </view>
+  </van-swipe-cell>
+</scroll-view>
+
+<!-- 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/list.json

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

GuangZuan/miniprogram/mMine/pages/myorders/list/list.less

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

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

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

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

@@ -0,0 +1,2 @@
+<!--mMine/pages/myorders/list/list.wxml-->
+<text>mMine/pages/myorders/list/list.wxml</text>

GuangZuan/miniprogram/mMine/pages/myorders/myorders.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText": "我的订单"
-}

GuangZuan/miniprogram/mMine/pages/myorders/myorders.less

@@ -1,74 +0,0 @@
-/* mMine/pages/myorders/myorders.wxss */
-
-.top-view {
-  position: sticky;
-  z-index: 999;
-  top: 0;
-}
-
-.title-view {
-  background-color: #f0f0f0;
-  .title-view-text {
-    font-size: 12px;
-    color: #666;
-    text-align: center;
-    border-right: 1px solid #f0f0f0;
-  }
-}
-
-.title-view, .order-list-item-row {
-  padding: 12px 0px;
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-  border-bottom: 1px solid #f0f0f0;
-}
-
-.order-list-item {
-  display: flex;
-  flex-direction: column;
-
-  text {
-    font-size: 14px;
-    color: #333;
-    text-align: center;
-    border-right: 1px solid #f0f0f0;
-  }
-}
-
-.order-list-item-btn {
-  padding: 7.5px 0px;
-  display: flex;
-  height: 30px;
-  width: 530px;
-
-  button {
-    font-size: 12px;
-    color: white;
-    width: 80px;
-  }
-
-  .goods-detail {
-    background-color: rebeccapurple;
-  }
-
-  .listing-detail {
-    background-color: yellowgreen;
-  }
-
-  .cancel {
-    background-color: chocolate;
-  }
-
-  .sale-detail {
-    background-color: sandybrown;
-  }
-
-  .sale-order {
-    background-color: darkgoldenrod;
-  }
-
-  .buy-order {
-    background-color: teal;
-  }
-}

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

@@ -1,302 +0,0 @@
-// pages/mine/myorders/myorders.ts
-
-import {queryMySellOrder, queryMyBuyOrder, queryMyDeListing} from '../../../services/api/orders/index'
-import { userid } from '../../../services/utils'
-
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    /// 底部安全区域
-    safeBottom: getApp().globalData.safeBottom,
-    /// 列头
-    tabs: [{id: 1, name: '我的出售'}, 
-           {id: 2, name: '我的求购'}, 
-           {id: 3, name: '我的摘牌'}, 
-           {id: 4, name: '我的询价'}],
-    /// 是否空数据
-    isEmpty: false,
-    /// 选中行数
-    selectRow: -1,
-    /// 列表总宽度
-    totalWidth: 0,
-    /// 查询数据
-    datas: [{}],
-    /// 列表宽度
-    widths: [0],
-    /// 列头
-    titles: [''],
-    /// 内容
-    values: <any>[[]]
-  },
-
-  /// 查询我的求购
-  queryMyBuyOrder() {
-    /// loding
-    wx.showLoading({ title: '数据请求中' })
-
-    /// 数据查询请求
-    queryMyBuyOrder({
-      data: {
-        userid: 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]
-          }),
-        })
-        /// 计算整个宽度
-        this.calculateTotalWidth()
-      },
-      /// 加载失败
-      fail: () => {
-        wx.showToast({ icon: 'error', title: '请求失败，原因：接口请求失败' })
-      },
-      complete: () => { 
-        ///  hideLoading
-        wx.hideLoading()
-        /// 判断数据是否为空
-        this.setData({
-          isEmpty: this.data.values.length == 0
-        })
-      }
-    })
-  },
-
-  /// 查询我的出售
-  queryMySellOrder() {
-    /// loding
-    wx.showLoading({ title: '数据请求中' })
-
-    /// 数据查询请求
-    queryMySellOrder({
-      data: {
-        userid: 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]
-          }),
-        })
-        /// 计算整个宽度
-        this.calculateTotalWidth()
-      },
-      fail: (er) => {
-        console.log(er)
-        wx.showToast({ icon: 'error', title: '请求失败，原因：接口请求失败' })
-      },
-      complete: () => { 
-        ///  hideLoading
-        wx.hideLoading() 
-        /// 判断数据是否为空
-        this.setData({
-          isEmpty: this.data.values.length == 0
-        })
-      }
-    })
-  },
-
-  /// 查询我的摘牌
-  queryMyDeListing() {
-    /// loding
-    wx.showLoading({ title: '数据请求中' })
-
-    /// 数据查询请求
-    queryMyDeListing({
-      data: {
-        userid: 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.matchusername, 
-                    '', 
-                    obj.tradeprice, 
-                    obj.tradeamount]
-          }),
-        })
-        /// 计算整个宽度
-        this.calculateTotalWidth()
-      },
-      fail: () => {
-        wx.showToast({ icon: 'error', title: '请求失败，原因：接口请求失败' })
-      },
-      complete: () => { 
-        /// hideLoading
-        wx.hideLoading() 
-        /// 判断数据是否为空
-        this.setData({
-          isEmpty: this.data.values.length == 0
-        })
-      }
-    })
-  },
-
-  /**
-   * tabbar点击事件
-   */
-  onTabChange(e: any) {
-    switch (e.detail.index) {
-      case 0: /// 查询我的出售
-        this.queryMySellOrder()
-        break;
-      case 1: /// 查询我的求购
-        this.queryMyBuyOrder()
-        break;
-      case 2: /// 查询我的摘牌
-        this.queryMyDeListing()
-        break;
-      default:
-        break;
-    }
-  },
-
-  /**
-   * 返回上层视图
-   */
-  backToParent() {
-    /// 返回上层视图
-    wx.navigateBack()
-  },
-
-  /**
-   * 点击每行触发事件
-   */
-  onListItemClick(e: any) {
-    this.setData({
-      selectRow: this.data.selectRow == e.currentTarget.id ? -1 : e.currentTarget.id
-    })
-    console.log(this.data.selectRow)
-  },
-
-  /**
-   * 按钮点击响应事件
-   */
-  onButtonPressed(e: any){
-    switch (e.currentTarget.id) {
-      case "goods-detail":    /// 商品详情
-        wx.navigateTo({
-          url: '/mHome/pages/goodsdetail/goodsdetail'
-        })
-        break;
-      case "listing-detail":  /// 商品详情
-        wx.navigateTo({
-          url: '/mMine/pages/listingdetail/listingdetail'
-        })
-        break;
-      default:
-        break;
-    }
-  },
-
-  /// 计算整个宽度
-  calculateTotalWidth() {
-    /// 计算总高度
-    let num = 0.0
-    this.data.widths.forEach(function(v) { num += v })
-    /// 设置总高度
-    this.setData({ totalWidth: num })
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad() {},
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {},
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-    /// 查询我的出售
-    this.queryMySellOrder()
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {},
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {},
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {},
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {},
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {}
-})

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

@@ -1,52 +0,0 @@
-<!--pages/mine/myorders/myorders.wxml-->
-
-<!-- top-view -->
-<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>
-
-  <!-- tabs -->
-  <view class="tab-view">
-    <van-tabs sticky animated bind:change="onTabChange">
-      <van-tab wx:for="{{tabs}}" wx:for-item="itm" wx:key="id" id="{{itm.id}}" active="{{itm.id}}" title="{{itm.name}}"/>
-    </van-tabs>  
-  </view>
-</view>
-
-<scroll-view class="scroll-view" scroll-x enable-flex  style="padding-bottom: {{safeBottom+48}}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>
-  </view>
-
-  <!-- 数据内容 -->
-  <view class="order-list">
-    <view class="order-list-item" wx:for="{{values}}" wx:for-item="lists" wx:key="lists" id="{{index}}" bindtap="onListItemClick">
-      <!-- 数据体 -->
-      <view class="order-list-item-row" style="width: {{totalWidth}}px;">
-        <text wx:for="{{lists}}" wx:for-index="idx" wx:for-item="itm" wx:key="itm" style="width: {{widths[idx]}}px;">{{itm}}</text>
-      </view>
-      <!-- 按钮 -->
-      <view class="order-list-item-btn" wx:if="{{selectRow != -1 && selectRow == index}}">
-        <!-- 商品详情 -->
-        <button class="goods-detail" id="goods-detail" bindtap="onButtonPressed">商品详情</button>
-        <!-- 出售详情 -->
-        <button class="sale-detail" id="sale-detail" bindtap="onButtonPressed">出售详情</button>
-        <!-- 挂牌详情 -->
-        <button class="listing-detail" id="listing-detail" bindtap="onButtonPressed">挂牌详情</button>
-        <!-- 买委托单 -->
-        <button class="buy-order" id="buy-order" bindtap="onButtonPressed">买委托单</button>
-        <!-- 卖委托单 -->
-        <button class="sale-order" id="sale-order" bindtap="onButtonPressed">卖委托单</button>
-        <!-- 撤销 -->
-        <button class="cancel" id="cancel" bindtap="onButtonPressed">撤销</button>
-      </view>
-    </view>
-  </view>
-</scroll-view>
-
-<!-- empty -->
-<van-empty wx:if="{{isEmpty}}" class="custom-image" description="无数据"/>

GuangZuan/miniprogram/mMine/pages/myperformance/breach/breach.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {},
+  "navigationStyle": "custom",
+  "navigationBarTitleText": "违约申请"
+}

GuangZuan/miniprogram/mMine/pages/myperformance/breach/breach.less

@@ -0,0 +1,7 @@
+/* mMine/pages/myperformance/breach/breach.wxss */
+
+.topView {
+  position: sticky;
+  top: 0;
+  z-index: 999;
+}

GuangZuan/miniprogram/mHome/pages/bond/bond.ts → GuangZuan/miniprogram/mMine/pages/myperformance/breach/breach.ts

@@ -1,4 +1,4 @@
-// mHome/pages/bond/bond.ts
+// mMine/pages/myperformance/breach/breach.ts
 Page({
 
   /**

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

@@ -0,0 +1,8 @@
+<!--mMine/pages/myperformance/breach/breach.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>

GuangZuan/miniprogram/mMine/pages/myperformance/detail/detail.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {},
+  "navigationStyle": "custom",
+  "navigationBarTitleText": "履约详情"
+}

GuangZuan/miniprogram/mMine/pages/myperformance/detail/detail.less

@@ -0,0 +1,7 @@
+/* mMine/pages/myperformance/detail/detail.wxss */
+
+.topView {
+  position: sticky;
+  top: 0;
+  z-index: 999;
+}

GuangZuan/miniprogram/mHome/pages/inspection/inspection.ts → GuangZuan/miniprogram/mMine/pages/myperformance/detail/detail.ts

@@ -1,4 +1,4 @@
-// mHome/pages/inspection/inspection.ts
+// mMine/pages/myperformance/detail/detail.ts
 Page({
 
   /**
@@ -8,7 +8,7 @@ Page({
 
   },
 
-   /**
+  /**
    * 返回上层视图
    */
   backToParent() {

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

@@ -0,0 +1,8 @@
+<!--mMine/pages/myperformance/detail/detail.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>

GuangZuan/miniprogram/mMine/pages/myperformance/his/his.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {},
+  "navigationStyle": "custom",
+  "navigationBarTitleText": "历史履约"
+}

GuangZuan/miniprogram/mMine/pages/myperformance/his/his.less

@@ -0,0 +1,86 @@
+/* mMine/pages/myperformance/his/his.wxss */
+
+
+.topView {
+  position: sticky;
+  top: 0;
+  z-index: 999;
+
+  .title-view {
+    margin: 10px;
+    background-color: #f0f0f0;
+    height: 70px;
+    border-radius: 10px;
+    display: flex;
+    align-items: center;
+    align-content: center;
+    flex-direction: column;
+    padding: 5px 10px;
+  
+    .title-view-up, .title-view-down {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      height: 50%;
+      width: 100%;
+      align-content: center;
+  
+      text {
+        color: #666;
+        font-size: 13px;
+      }
+    }
+  
+    .title-view-up {
+      border-bottom: 1px solid #ddd;
+    }
+  }
+}
+
+.item-view {
+  margin: 10px;
+  height: 70px;
+  border-radius: 10px;
+  display: flex;
+  align-items: center;
+  align-content: center;
+  flex-direction: column;
+  padding: 5px 10px;
+  border: 1px solid #ddd;
+
+  .item-view-up, .item-view-down {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    height: 50%;
+    width: 100%;
+    align-content: center;
+
+    text {
+      color: #333;
+      font-size: 13px;
+    }
+  }
+
+  .item-view-up {
+    border-bottom: 1px solid #ddd;
+  }
+}
+
+.van-swipe-cell__right {
+  height: inherit;
+  color: white;
+  display: flex;
+
+  .item {
+    width: 50px;
+    text-align: center;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 12px;
+    color: white;
+  }
+}

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

@@ -0,0 +1,164 @@
+// mMine/pages/myperformance/his/his.ts
+
+import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
+import { queryMyPerformanc } from "../../../../services/api/orders/index"
+import { userid } from "../../../../services/utils"
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    /// tab激活索引
+    active: 0,
+    /// tabs
+    tabs: [{id: 0, name: '买履约'},  {id: 1, name: '卖履约'}],
+    /// 是否空数据
+    isEmpty: false,
+    /// 当前页签
+    page: 1,
+    /// 列头
+    titles: [['价格', '已付金额', '剩余冻结金额', '当前步骤', '剩余天数'], 
+             ['形状', '颜色', '重量', '对手方', '状态']],
+    /// 查询数据
+    datas: <GuangZuan.MyPerformanc[]>[],
+  },
+
+  /// 查询我的履约
+  queryMyPerformanc(buyOrSell: number) {
+    /// loding.....
+    Toast.loading({ message: '数据请求中....' })
+    /// 发送请求
+    queryMyPerformanc({
+      data: {
+        userid: userid(),
+        buyorsell: buyOrSell,
+        ishis: true,
+        page: this.data.page
+      },
+      success: (res) => {
+        if (res.code != 200) {
+          Toast.fail({ message: '查询失败，原因：'+res.msg })
+          return
+        }
+        /// 查询成功
+        this.setData({ 
+          datas: res.data
+        })
+      },
+      fail: (emsg) => {
+        /// showToast
+        Toast.fail({ message: '查询失败，原因：'+emsg })
+      },
+      complete: () => {
+        /// hideLoading
+        Toast.clear()
+        /// 判断数据是否为空
+        this.setData({
+          isEmpty: this.data.datas.length == 0
+        })
+      }
+    })
+  },
+
+  /**  
+   * tabbar点击事件
+   */
+  onTabChange(e: any) {
+    console.log(e)
+    /// 设置激活项
+    this.setData({ active: e.detail.index })
+    /// 查询履约数据
+    this.queryMyPerformanc(this.data.active)
+  },
+
+  /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+  /**
+   * 按钮点击响应事件
+   */
+  onButtonPressed(e: any) {
+    /// 获取对应的id
+    const ids = (<string> e.target.id).split(' ')
+    let id = (<string> e.target.id).split(' ')[0]
+    const index = <number> <unknown>ids[1]
+
+    switch (id) {
+      case "detail":  /// 详情
+        wx.navigateTo({
+          url: '/mMine/pages/myperformance/detail/detail?id='+JSON.stringify(this.data.datas[index])
+        })
+        break;
+      default:
+        break;
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad() {
+    /// 查询我的买履约
+    this.queryMyPerformanc(0)
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {},
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+    /// 设置页签
+    this.setData({ page: 1 })
+    /// 查询我的买卖履约
+    this.queryMyPerformanc(this.data.active)
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+    /// 设置页签
+    this.setData({ page: this.data.page+1 })
+    /// 查询我的买卖履约
+    this.queryMyPerformanc(this.data.active)
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

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

@@ -0,0 +1,56 @@
+<!--mMine/pages/myperformance/his/his.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 sticky animated bind:change="onTabChange">
+      <van-tab wx:for="{{tabs}}" wx:for-item="itm" wx:key="id" id="{{itm.id}}" active="{{itm.id}}" title="{{itm.name}}"/>
+    </van-tabs>  
+  </view>
+
+  <!-- 列头 --> 
+  <view class="title-view">
+    <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">
+      <text wx:for="{{titles[1]}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">{{itm}}</text>
+    </view>
+  </view>
+</view>
+
+<!-- 内容滚动视图 --> 
+<scroll-view class="content-view">
+  <!-- 数据 --> 
+  <van-swipe-cell wx:for="{{datas}}" wx:for-item="data" wx:key="ladingbillid" right-width="{{ 50 }}">
+    <view class="item-view">
+      <view class="item-view-up">
+        <text>￥{{data.price}}</text>
+        <text>￥{{data.buyorsell == 0 ? data.buypaidamount : data.sellreceivedamount}}</text>
+        <text>￥{{data.buyorsell == 0 ? data.buyerfreezeamount : data.sellerfreezeamount}}</text>
+        <text>{{data.steptypeid}}</text>
+        <text>{{data.remaindays}}</text>
+      </view>
+      <view class="item-view-down">
+        <text>{{data.zsshapetypedisplay}}-</text>
+        <text>{{data.zscolortype1display}}-</text>
+        <text>--</text>
+        <text>{{data.accountname}}</text>
+        <text>{{data.performancestatus}}</text>
+      </view>
+    </view>
+    <view slot="right" class="van-swipe-cell__right">
+      <view class="item detail" id="detail {{idx}}" style="background-color: yellowgreen;" bindtap="onButtonPressed">详情</view>
+    </view>
+  </van-swipe-cell>
+</scroll-view>
+
+<!-- empty -->
+<van-empty wx:if="{{isEmpty}}" class="custom-image" description="无数据"/>
+<!-- toast --> 
+<van-toast id="van-toast" />

GuangZuan/miniprogram/mMine/pages/myperformance/myperformance.json → GuangZuan/miniprogram/mMine/pages/myperformance/list/list.json

@@ -1,4 +1,5 @@
 {
   "usingComponents": {},
+  "navigationStyle": "custom",
   "navigationBarTitleText": "我的履约"
 }

GuangZuan/miniprogram/mMine/pages/myperformance/list/list.less

@@ -0,0 +1,93 @@
+/* mMine/pages/myperformance/list/list.wxss */
+
+.topView {
+  position: sticky;
+  top: 0;
+  z-index: 999;
+
+  .title-view {
+    margin: 10px;
+    background-color: #f0f0f0;
+    height: 70px;
+    border-radius: 10px;
+    display: flex;
+    align-items: center;
+    align-content: center;
+    flex-direction: column;
+    padding: 5px 10px;
+  
+    .title-view-up, .title-view-down {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      height: 50%;
+      width: 100%;
+      align-content: center;
+  
+      text {
+        color: #666;
+        font-size: 13px;
+      }
+    }
+  
+    .title-view-up {
+      border-bottom: 1px solid #ddd;
+    }
+  }
+
+  .his {
+    color: blueviolet; 
+    font-size: 12px; 
+    width: 95%; 
+    text-align: right;
+    height: 25px;
+  }
+}
+
+.item-view {
+  margin: 10px;
+  height: 70px;
+  border-radius: 10px;
+  display: flex;
+  align-items: center;
+  align-content: center;
+  flex-direction: column;
+  padding: 5px 10px;
+  border: 1px solid #ddd;
+
+  .item-view-up, .item-view-down {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    height: 50%;
+    width: 100%;
+    align-content: center;
+
+    text {
+      color: #333;
+      font-size: 13px;
+    }
+  }
+
+  .item-view-up {
+    border-bottom: 1px solid #ddd;
+  }
+}
+
+.van-swipe-cell__right {
+  height: inherit;
+  color: white;
+  display: flex;
+
+  .item {
+    width: 50px;
+    text-align: center;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 12px;
+    color: white;
+  }
+}

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

@@ -0,0 +1,180 @@
+// mMine/pages/myperformance/list/list.ts
+
+import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
+import { queryMyPerformanc } from "../../../../services/api/orders/index"
+import { userid } from "../../../../services/utils"
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    /// tab激活索引
+    active: 0,
+    /// tabs
+    tabs: [{id: 0, name: '买履约'},  {id: 1, name: '卖履约'}],
+    /// 是否空数据
+    isEmpty: false,
+    /// 当前页签
+    page: 1,
+    /// 列头
+    titles: [['价格', '已付金额', '剩余冻结金额', '当前步骤', '剩余天数'], 
+             ['形状', '颜色', '重量', '对手方', '状态']],
+    /// 查询数据
+    datas: <GuangZuan.MyPerformanc[]>[],
+  },
+
+  /// 查询我的履约
+  queryMyPerformanc(buyOrSell: number) {
+    /// loding.....
+    Toast.loading({ message: '数据请求中....' })
+    /// 发送请求
+    queryMyPerformanc({
+      data: {
+        userid: userid(),
+        buyorsell: buyOrSell,
+        ishis: false,
+        page: this.data.page
+      },
+      success: (res) => {
+        if (res.code != 200) {
+          Toast.fail({ message: '查询失败，原因：'+res.msg })
+          return
+        }
+        /// 查询成功
+        this.setData({ 
+          datas: res.data
+        })
+      },
+      fail: (emsg) => {
+        /// showToast
+        Toast.fail({ message: '查询失败，原因：'+emsg })
+      },
+      complete: () => {
+        /// hideLoading
+        Toast.clear()
+        /// 判断数据是否为空
+        this.setData({
+          isEmpty: this.data.datas.length == 0
+        })
+      }
+    })
+  },
+
+  /**  
+   * tabbar点击事件
+   */
+  onTabChange(e: any) {
+    console.log(e)
+    /// 设置激活项
+    this.setData({ active: e.detail.index })
+    /// 查询履约数据
+    this.queryMyPerformanc(this.data.active)
+  },
+
+  /**
+   * 按钮点击响应事件
+   */
+  onButtonPressed(e: any) {
+    /// 获取对应的id
+    const ids = (<string> e.target.id).split(' ')
+    let id = (<string> e.target.id).split(' ')[0]
+    const index = <number> <unknown>ids[1]
+
+    switch (id) {
+      case 'his':    /// 历史履约
+        wx.navigateTo({
+          url: '/mMine/pages/myperformance/his/his'
+        })
+        break;
+      case "detail":  /// 履约详情
+        wx.navigateTo({
+          url: '/mMine/pages/myperformance/detail/detail?id='+JSON.stringify(this.data.datas[index])
+        })
+        break;
+      case "modify":  /// 修改信息
+        wx.navigateTo({
+          url: '/mMine/pages/myperformance/modify/modify?id='+JSON.stringify(this.data.datas[index])
+        })
+        break;
+      case "breach":  /// 违约申请
+        wx.navigateTo({
+          url: '/mMine/pages/myperformance/breach/breach?id='+JSON.stringify(this.data.datas[index])
+        })
+        break;
+      default:
+        break;
+    }
+  },
+
+
+  /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad() {
+    /// 查询我的买履约
+    this.queryMyPerformanc(0)
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {},
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+    /// 设置页签
+    this.setData({ page: 1 })
+    /// 查询我的买卖履约
+    this.queryMyPerformanc(this.data.active)
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+    /// 设置页签
+    this.setData({ page: this.data.page+1 })
+    /// 查询我的买卖履约
+    this.queryMyPerformanc(this.data.active)
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

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

@@ -0,0 +1,61 @@
+<!--mMine/pages/myperformance/list/list.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 sticky animated bind:change="onTabChange">
+      <van-tab wx:for="{{tabs}}" wx:for-item="itm" wx:key="id" id="{{itm.id}}" active="{{itm.id}}" title="{{itm.name}}"/>
+    </van-tabs>  
+  </view>
+
+  <!-- 更多履约 -->
+  <view class="his" id="his" bindtap="onButtonPressed">更多履约</view>
+
+  <!-- 列头 --> 
+  <view class="title-view">
+    <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">
+      <text wx:for="{{titles[1]}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">{{itm}}</text>
+    </view>
+  </view>
+</view>
+
+<!-- 内容滚动视图 --> 
+<scroll-view class="content-view">
+  <!-- 数据 --> 
+  <van-swipe-cell wx:for="{{datas}}" wx:for-item="data" wx:key="ladingbillid" right-width="{{ 150 }}">
+    <view class="item-view">
+      <view class="item-view-up">
+        <text>￥{{data.price}}</text>
+        <text>￥{{data.buyorsell == 0 ? data.buypaidamount : data.sellreceivedamount}}</text>
+        <text>￥{{data.buyorsell == 0 ? data.buyerfreezeamount : data.sellerfreezeamount}}</text>
+        <text>{{data.steptypeid}}</text>
+        <text>{{data.remaindays}}</text>
+      </view>
+      <view class="item-view-down">
+        <text>{{data.zsshapetypedisplay}}-</text>
+        <text>{{data.zscolortype1display}}-</text>
+        <text>--</text>
+        <text>{{data.accountname}}</text>
+        <text>{{data.performancestatus}}</text>
+      </view>
+    </view>
+    <view slot="right" class="van-swipe-cell__right">
+      <view class="item detail" id="detail {{idx}}" style="background-color: yellowgreen;" bindtap="onButtonPressed">详情</view>
+      <view class="item breach" id="breach {{idx}}" style="background-color: red;" bindtap="onButtonPressed">违约</view>
+      <view class="item modify" id="modify {{idx}}" style="background-color: olivedrab;" bindtap="onButtonPressed">修改</view>
+    </view>
+  </van-swipe-cell>
+</scroll-view>
+
+<!-- empty -->
+<van-empty wx:if="{{isEmpty}}" class="custom-image" description="无数据"/>
+<!-- toast --> 
+<van-toast id="van-toast" />

GuangZuan/miniprogram/mMine/pages/myperformance/modify/modify.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {},
+  "navigationStyle": "custom",
+  "navigationBarTitleText": "修改信息"
+}

GuangZuan/miniprogram/mMine/pages/myperformance/modify/modify.less

@@ -0,0 +1,7 @@
+/* mMine/pages/myperformance/modify/modify.wxss */
+
+.topView {
+  position: sticky;
+  top: 0;
+  z-index: 999;
+}

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

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

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

@@ -0,0 +1,8 @@
+<!--mMine/pages/myperformance/modify/modify.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>

GuangZuan/miniprogram/mMine/pages/myperformance/myperformance.less

@@ -1,65 +0,0 @@
-/* mMine/pages/myperformance/myperformance.wxss */
-
-.title-view {
-  background-color: #f0f0f0;
-
-  .title-view-text {
-    font-size: 12px;
-    color: #666;
-    text-align: center;
-    border-right: 1px solid #f0f0f0;
-  }
-}
-
-.title-view, .order-list-item-row {
-  padding: 12px 0px;
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-  border-bottom: 1px solid #f0f0f0;
-}
-
-.order-list-item {
-  display: flex;
-  flex-direction: column;
-
-  text {
-    font-size: 14px;
-    color: #333;
-    text-align: center;
-    border-right: 1px solid #f0f0f0;
-  }
-
-  .order-list-item-btn {
-    padding: 7.5px 0px;
-    display: flex;
-    height: 30px;
-  
-    button {
-      font-size: 12px;
-      color: white;
-      width: 80px;
-    }
-  
-    .per-detail {
-      background-color: rebeccapurple;
-    }
-  
-    .per-manual {
-      background-color: yellowgreen;
-    }
-  
-    .apply-dely {
-      background-color: chocolate;
-    }
-  
-    .apply-default {
-      background-color: sandybrown;
-    }
-  
-    .edit {
-      background-color: darkgoldenrod;
-    }
-  }  
-}
-

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

@@ -1,163 +0,0 @@
-import { queryMyPerformanc } from "../../../services/api/orders/index"
-import { getPerformancestatus, getSteptype, userid } from "../../../services/utils"
-
-// mMine/pages/myperformance/myperformance.ts
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    /// tab激活索引
-    active: 0,
-    /// tabs
-    tabs: [{id: 0, name: '买履约'},  {id: 1, name: '卖履约'}],
-    /// 列头
-    titles: ['付款方式', '总金额', '已付金额', '履约冻结金额', '约剩余冻结', '买卖方', '履约状态', '当前步骤', '剩余天数'],
-    /// 列表总宽度
-    totalWidth: 0,
-    /// 是否空数据
-    isEmpty: false,
-    /// 列表宽度
-    widths: [80, 80, 80, 80, 80, 80, 80, 80, 80],
-    /// 内容
-    values: <any>[[]],
-    /// 选中行数
-    selectRow: -1,
-  },
-
-  /// 查询我的履约
-  queryMyPerformanc(buyOrSell: number) {
-    /// loding.....
-    wx.showLoading({ title: '数据请求中....' })
-    /// 发送请求
-    queryMyPerformanc({
-      data: {
-        userid: userid(),
-        buyorsell: buyOrSell
-      },
-      success: (res) => {
-        this.setData({
-          values: res.data.map(obj => {
-            return [obj.paymenttype == 1 ? '冻结' : '扣款', 
-                    obj.amount, 
-                    obj.buyorsell == 0 ? obj.buypaidamount : obj.sellreceivedamount,
-                    obj.buyorsell == 0 ? obj.buyerfreezeamount : obj.sellerfreezeamount, 
-                    obj.buyorsell == 0 ? obj.buyerfreezeamountremain : obj.sellerfreezeamountremain,
-                    obj.buyorsell == 0 ? obj.sellerinfo : obj.buyerinfo, 
-                    getPerformancestatus(obj.performancestatus),
-                    getSteptype(obj.steptypeid), 
-                    obj.remaindays]
-          })
-        })
-      },
-      fail: (emsg) => {
-        /// showToast
-        wx.showToast({
-          title: '数据请求失败, 原因：'+emsg,
-          icon: 'error'
-        })
-      },
-      complete: () => {
-        /// hideLoading
-        wx.hideLoading()
-        /// 判断数据是否为空
-        this.setData({
-          isEmpty: this.data.values.length == 0
-        })
-      }
-    })
-  },
-
-  /**  
-   * tabbar点击事件
-   */
-  onTabChange(e: any) {
-    console.log(e)
-  },
-
-  /**
-   * 返回上层视图
-   */
-  backToParent() {
-    /// 返回上层视图
-    wx.navigateBack()
-  },
-
-  /**
-   * 点击每行触发事件
-   */
-  onListItemClick(e: any) {
-    this.setData({
-      selectRow: this.data.selectRow == e.currentTarget.id ? -1 : e.currentTarget.id
-    })
-    console.log(this.data.selectRow)
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad() {
-    /// 计算总高度
-    let num = 0.0
-    this.data.widths.forEach(function(v) {
-      num += v
-    })
-
-    this.setData({
-      /// 设置总高度
-      totalWidth: num
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-    /// 查询我的买履约
-    this.queryMyPerformanc(0)
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-    /// 查询我的买卖履约
-    this.queryMyPerformanc(this.data.active)
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

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

@@ -1,46 +0,0 @@
-<!--mMine/pages/myperformance/myperformance.wxml-->
-
-<!-- 导航栏 -->
-<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 sticky animated bind:change="onTabChange">
-    <van-tab wx:for="{{tabs}}" wx:for-item="itm" wx:key="id" id="{{itm.id}}" active="{{itm.id}}" title="{{itm.name}}"/>
-  </van-tabs>  
-</view>
-
-<scroll-view class="scroll-view" scroll-x enable-flex>
-  <!-- 列头 -->
-  <view wx:if="{{!isEmpty}}" class="title-view" style="width: {{totalWidth}}px;">
-    <text class="title-view-text" wx:for="{{titles}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx" id="idx" style="width: {{widths[idx]}}px;">{{itm}}</text>
-  </view>
-
-  <!-- 数据内容 -->
-  <view class="order-list">
-    <view class="order-list-item" wx:for="{{values}}" wx:for-item="lists" wx:key="lists" id="{{index}}" bindtap="onListItemClick">
-      <!-- 数据体 -->
-      <view class="order-list-item-row" style="width: {{totalWidth}}px;">
-        <text wx:for="{{lists}}" wx:for-index="idx" wx:for-item="itm" wx:key="itm" style="width: {{widths[idx]}}px;">{{itm}}</text>
-      </view>
-      <!-- 按钮 -->
-      <view class="order-list-item-btn" wx:if="{{selectRow != -1 && selectRow == index}}">
-        <!-- 履约详情 -->
-        <button class="per-detail" id="per-detail" bindtap="onButtonPressed">履约详情</button>
-        <!-- 手动执行 -->
-        <button class="per-manual" id="per-manual" bindtap="onButtonPressed">手动执行</button>
-        <!-- 延期申请 -->
-        <button class="apply-dely" id="apply-dely" bindtap="onButtonPressed">延期申请</button>
-        <!-- 违约申请 -->
-        <button class="apply-default" id="apply-default" bindtap="onButtonPressed">违约申请</button>
-        <!-- 卖委托单 -->
-        <button class="edit" id="edit" bindtap="onButtonPressed">修改信息</button>
-      </view>
-    </view>
-  </view>
-</scroll-view>
-
-<van-empty wx:if="{{isEmpty}}" class="custom-image" description="无数据"/>

GuangZuan/miniprogram/mMine/pages/myreports/myreports.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText": "我的报表"
-}

GuangZuan/miniprogram/mMine/pages/myreports/myreports.less

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

GuangZuan/miniprogram/mMine/pages/myreports/myreports.wxml

@@ -1,9 +0,0 @@
-<!--pages/mine/myreports/myreports.wxml-->
-
-<!-- 导航栏 -->
-<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>
-
-<van-empty class="custom-image" description="无数据"/>

GuangZuan/miniprogram/pages/circle/circle.json

@@ -1,7 +1,5 @@
 {
-  "usingComponents": {
-    "van-swipe-cell": "@vant/weapp/swipe-cell/index"
-  },
+  "usingComponents": {},
   "navigationBarTitleText": "钻石圈",
   "navigationStyle": "custom"
 }

GuangZuan/miniprogram/pages/circle/circle.less

@@ -83,6 +83,14 @@
   justify-content: center;
 }
 
+.buttom_view {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  margin-top: 20px;
+  align-items: center;
+  align-content: center;
+}
 
 
 

GuangZuan/miniprogram/pages/circle/circle.ts

@@ -36,6 +36,17 @@ Page({
     /// 查询数据
     this.queryMyFavorite()
   },
+
+  /**
+   * 按钮点击事件
+   */
+  onButtonPressed(e: any) {
+    console.log(e)
+    /// 页面跳转
+    wx.navigateTo({
+      url: '/mCircle/pages/contrast/contrast'
+    })
+  },
   
   /**
    * tab触发事件

GuangZuan/miniprogram/pages/circle/circle.wxml

@@ -24,7 +24,7 @@
 </view>
 
 <!-- 内容滚动视图 --> 
-<scroll-view class="content-view" style="padding-bottom: {{safeBottom+48}}px;">
+<scroll-view class="content-view">
   <!-- 出售大厅数据 --> 
   <van-swipe-cell wx:for="{{favorites}}" wx:for-item="data" wx:for-index="idx" wx:key="applyid" right-width="{{ 65 }}">
     <view class="item-view">
@@ -44,6 +44,11 @@
   </van-swipe-cell>
 </scroll-view>
 
+<!--  底部视图  -->
+<view class="buttom_view" style="padding-bottom: {{safeBottom+48}}px;">
+    <van-button id="new" round color="linear-gradient(to right, #FF7252, #55A154)" block style="width: 90%; padding-top: 5px; padding-top: 10px;" bind:click="onButtonPressed">对比</van-button>
+</view>
+
 <!-- 无数据 --> 
 <van-empty wx:if="{{isEmpty}}" class="custom-image" description="无数据"/>
 <!-- toast --> 

GuangZuan/miniprogram/pages/home/home.ts

@@ -21,8 +21,8 @@ Page({
     menus: [{id: 1, icon: '', title: '钻石搜索', path: '/mHome/pages/search/search'}, 
             {id: 2, icon: '', title: '挂牌大厅', path: 'pages/trade/trade'}, 
             {id: 3, icon: '', title: '钻石首饰', path: '/mHome/pages/jewelry/jewelry'}, 
-            {id: 4, icon: '', title: '出境检测', path: '/mHome/pages/inspection/inspection'}, 
-            {id: 5, icon: '', title: '报税服务', path: '/mHome/pages/bond/bond'}],
+            {id: 4, icon: '', title: '出境检测', path: '/mHome/pages/inspection/list/list'}, 
+            {id: 5, icon: '', title: '保税服务', path: '/mHome/pages/bond/list/list'}],
     /// 统计
     statistics: [{id: 1, title: '出售中', value: 0}, 
                  {id: 2, title: '求购中', value: 0}, 

GuangZuan/miniprogram/pages/mine/mine.ts

@@ -8,18 +8,18 @@ Page({
    */
   data: {
     // 功能菜单项
-    menulists: [{id: 1, title: '我的库存', img: 'medal', path: "/mMine/pages/myinventorys/list/list"}, 
-                {id: 2, title: "我的订单", img: 'invitation',  path: "/mMine/pages/myorders/myorders"}, 
-                {id: 3, title: '我的履约', img: 'underway',    path: "/mMine/pages/myperformance/myperformance"}, 
-                {id: 4, title: '我的出境', img: 'hot',         path: "/mHome/pages/inspection/inspection"}, 
-                {id: 5, title: '我的保税', img: 'fire-o',      path: "/mHome/pages/bond/bond"}],
+    menulists: [{id: 1, title: '我的库存', img: 'medal', path: '/mMine/pages/myinventorys/list/list'}, 
+                {id: 2, title: "我的订单", img: 'invitation',  path: '/mMine/pages/myorders/list/list'}, 
+                {id: 3, title: '我的履约', img: 'underway',    path: '/mMine/pages/myperformance/list/list'}, 
+                {id: 4, title: '我的出境', img: 'hot',         path: '/mHome/pages/inspection/list/list'}, 
+                {id: 5, title: '我的保税', img: 'fire-o',      path: '/mHome/pages/bond/list/list'}],
 
     // 列表菜单项
-    tablelists: [{id: 1, title: '签约账户',    path: "/mMine/pages/bank/bankh"}, 
-                 {id: 2, title: '收货地址',    path: "/mMine/pages/address/list/list"}, 
-                 {id: 3, title: '发票信息',    path: "/mMine/pages/invoice/list/list"}, 
-                 {id: 4, title: '账户安全',    path: ""}, 
-                 {id: 5, title: '关于我们',    path: ""}],
+    tablelists: [{id: 1, title: '签约账户',    path: '/mMine/pages/bank/bankh'}, 
+                 {id: 2, title: '收货地址',    path: '/mMine/pages/address/list/list'}, 
+                 {id: 3, title: '发票信息',    path: '/mMine/pages/invoice/list/list'}, 
+                 {id: 4, title: '账户安全',    path: ''}, 
+                 {id: 5, title: '关于我们',    path: '/mMine/pages/about/about/about'}],
     /// 微信头像 
     avatarUrl: "",
     /// 微信昵称

GuangZuan/miniprogram/pages/trade/trade.json

@@ -2,7 +2,6 @@
   "usingComponents": {
     "van-dropdown-menu": "@vant/weapp/dropdown-menu/index",
     "van-dropdown-item": "@vant/weapp/dropdown-item/index",
-    "van-swipe-cell": "@vant/weapp/swipe-cell/index",
     "van-search": "@vant/weapp/search/index"
   },
   "navigationBarTitleText": "钻石交易",

GuangZuan/miniprogram/pages/trade/trade.less

@@ -73,7 +73,7 @@
   }
 }
 
-.right {
+.van-swipe-cell__right {
   height: inherit;
   width: 130px;
   color: white;

GuangZuan/miniprogram/pages/trade/trade.ts

@@ -42,7 +42,7 @@ Page({
              { text: '雷迪恩形', value: '11' }, 
              { text: '阿斯切形', value: '12' }, 
              { text: '其他', value: '13' }],
-    shape: '1',
+    shape: ['1'],
     /// 净度
     claritys: [{ text: 'FL', value: 1 }, 
                { text: 'IF', value: 2 },
@@ -78,7 +78,9 @@ Page({
     /// 数据是否为空
     isEmpty: true,
     /// 商品(查询字段-模糊查询)
-    zsallproperties: ''
+    zsallproperties: '',
+    /// 数据缓存
+    storge: {}
   },
 
   /**
@@ -111,7 +113,7 @@ Page({
         break;
       case "shapes":     /// 形状
         this.setData({
-          shape: e.detail
+          shape: [e.detail.toString()]
         })
         break;
       case "claritys":   /// 钻石净度
@@ -223,35 +225,39 @@ Page({
   queryDiamond() {
     /// loding.....
     Toast.loading({message: '加载中...'});
+    /// 获取参数
+    const storge = wx.getStorageSync('TradeParams')
     /// 数据存储
-    // const info = JSON.parse(wx.getStorageSync('TradeParams'))
+    var info
+    if (this.data.storge) { info = JSON.parse(storge) }
+   
     /// 钻石查询
     queryDiamond({
       data: {
         /// 钻石分类
         zscategory: this.data.category,
-        // /// 形状
-        // zsshapetype: [this.data.shape.toString()],
-        // /// 净度
-        // zsclaritytype: [this.data.clarity],
-        // /// 切工
-        // zscuttype: [this.data.cut],
-        // /// 荧光
-        // zsfluorescencetype: [this.data.fluorescence],
-        // /// 颜色
-        // zscolortype: info ? [info.zscolortype] : [null],
-        // /// 货币类型
-        // zscurrencytype: info ? [info.zscurrencytype.toString()] : [null],
-        // /// 证书类型
-        // zscerttype: info ? [info.zscerttype.toString()] : [null],
-        // /// 抛光
-        // zspolishtype: info ? [info.zspolishtype] : [null],
-        // /// 对称
-        // zssymmetrytype: info ? [info.zssymmetrytype] : [null],
-        // /// 总重量(克拉重量)-从
-        // weight1: info ? info.weight1 : null,
-        // /// 总重量(克拉重量)-至
-        // weight2: info ? info.weight2 : null
+        /// 形状
+        zsshapetype: this.data.shape,
+        /// 净度
+        zsclaritytype: [this.data.clarity],
+        /// 切工
+        zscuttype: [this.data.cut],
+        /// 荧光
+        zsfluorescencetype: [this.data.fluorescence],
+        /// 颜色
+        zscolortype: info ? info.zscolortype : [null],
+        /// 货币类型
+        zscurrencytype: info ? [info.zscurrencytype.toString()] : [null],
+        /// 证书类型
+        zscerttype: info ? [info.zscerttype.toString()] : [null],
+        /// 抛光
+        zspolishtype: info ? [info.zspolishtype] : [null],
+        /// 对称
+        zssymmetrytype: info ? [info.zssymmetrytype] : [null],
+        /// 总重量(克拉重量)-从
+        weight1: info ? info.weight1 : null,
+        /// 总重量(克拉重量)-至
+        weight2: info ? info.weight2 : null
       },
       /// 加载成功
       success: (res) => {
@@ -311,19 +317,26 @@ Page({
   onLoad() {},
 
   onShow() {
-    try {
-      /// 数据存储
-      const info = JSON.parse(wx.getStorageSync('TradeParams'))
-      if (info) {
-        this.setData({
-          category: info.category,
-          cut: info.zscuttype,
-          shape: info.zsshapetype,
-          clarity: info.zsclaritytype,
-          fluorescence: info.zsfluorescencetype
-        })
-      }
-    } catch (error) {}
+    /// 获取参数
+    const storge = wx.getStorageSync('TradeParams')
+    if (storge) {
+      try {
+        /// 数据存储
+        const info = JSON.parse(storge)
+        /// 数据缓存
+        this.setData({ storge: info })
+        /// 数据赋值
+        if (info) {
+          this.setData({
+            category: info.category,
+            cut: info.zscuttype,
+            shape: info.zsshapetype,
+            clarity: info.zsclaritytype,
+            fluorescence: info.zsfluorescencetype
+          })
+        }
+      } catch (error) {}
+    } 
     
     /// 查询出售大厅委托单
     this.data.active == 0 ? this.queryDiamond() : this.queryBuyOrder()

GuangZuan/miniprogram/pages/trade/trade.wxml

@@ -72,7 +72,7 @@
         <text>￥{{data.price}}</text>
       </view>
     </view>
-    <view slot="right" class="right">
+    <view slot="right" class="van-swipe-cell__right">
       <view class="item detail" id="detail {{idx}}" style="background-color: yellowgreen; color: white;" bindtap="onButtonPressed">详情</view>
       <view class="item delisting" id="delisting {{idx}}" style="background-color: red; color: white;" bindtap="onButtonPressed">摘牌</view>
     </view>

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

@@ -1,6 +1,7 @@
 import { httpRequest } from '../../../services/http/index'
 import { HttpRequest } from '../../../services/http/interface'
 import service from '../../../services/index'
+import { loginid, xtoken } from '../../utils'
 
 /* 获取钻石详情 */
 export function getGoods(params: HttpRequest<{req: GuangZuan.GetGoodsReq, rsp: GuangZuan.GetGoods}>) {

GuangZuan/miniprogram/utils/util.ts

@@ -13,7 +13,18 @@ export const formatTime = (date: Date) => {
   )
 }
 
+/// 格式化日期
+export function formatDate(date: Date) {
+  date = new Date(date);
+  return `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`;
+}
+
 const formatNumber = (n: number) => {
   const s = n.toString()
   return s[1] ? s : '0' + s
 }
+
+/// 判断字符串是否为空
+export const isnullstr = (str: string) => {
+  return str == '' ? '--' : str
+}

GuangZuan/project.private.config.json

@@ -22,20 +22,6 @@
           "query": "",
           "launchMode": "default",
           "scene": null
-        },
-        {
-          "name": "钻石圈",
-          "pathName": "pages/circle/circle",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "钻石搜索",
-          "pathName": "mHome/pages/search/search",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
         }
       ]
     }

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

@@ -610,7 +610,7 @@ declare namespace GuangZuan {
     /// 商品(查询字段-模糊查询)
     zsallproperties?: string
     /// 钻石分类枚举ID
-    zscategory?: number 
+    zscategorys?: number 
     /// 成交单号
     wrtradedetailid?: number
     /// 方向，0-全部(可不传) 1-购买 2-出售
@@ -1428,7 +1428,7 @@ declare namespace GuangZuan {
     /// 商品(查询字段-模糊查询)
     zsallproperties?: string
     /// 钻石分类枚举ID
-    zscategory?: string  
+    zscategorys?: string  
     /// 委托单号
     wrtradeorderid?: number  
     /// 卖方(查询字段-模糊查询)