xxxxxx

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

@@ -41,9 +41,7 @@
     }
 
     .attribute-info__item, .content__item {
-      width: 100%;
       padding-left: 15px;
-      height: 44px;
       border-bottom: 1px solid #f0f0f0;
       display: flex;
       flex-direction: row;
@@ -63,6 +61,11 @@
       }
     }
 
+    .attribute-info__item {
+      height: 44px;
+      width: 100%;
+    }
+
     .content {
       width: 95%;
       background-color: #f0f0f0;
@@ -70,7 +73,6 @@
       padding: 10px 0px;
       
       &__item {
-        height: 35px;
         padding-left: 5px;
 
         &__step {
@@ -79,8 +81,7 @@
           justify-content: start;
           align-items: center;
           align-content: center;
-          width: 100%;
-          margin: 5px 0px;
+          padding: 0px 2.5px;
     
           &__item {
             display: flex;

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

@@ -3,7 +3,7 @@ import { EOrderSrc } from "../../../constants/enum/index"
 import services from "../../../services/index"
 import { sendMsgToMQ } from "../../../services/api/common/index"
 import { getGoods, queryPermancePlanTmp } from "../../../services/api/orders/index"
-import { accountid, clientType, getErrorMsg, isEncrypted, loginid, marketid, protoHeader, timetample, userid } from "../../../services/utils"
+import { accountid, clientType, getErrorMsg, isEncrypted, loginid, marketid, protoHeader, timetample, userid, loginQuery } from "../../../services/utils"
 import { hideLoading, showLoading, showModel, showToast } from "../../../utils/message/index"
 import { encryptBody } from "../../../utils/websocket/crypto"
 import { isnullstr } from "../../../utils/util"
@@ -29,7 +29,15 @@ Page({
     /// 操作
     operator: 1,
     /// 委托时间
-    ordertime: ''
+    ordertime: '',
+    /// 汇率
+    exchangerate: loginQuery().exchangeRateConfigs[0].exchangerate,
+    /// 显示价格
+    price: '0.0',
+    /// 克拉单价
+    priceper: '0.0',
+    /// 显示单位
+    unit: ''
   },
 
   /**
@@ -55,7 +63,17 @@ Page({
             var obj = res.data
             obj.imagepath = (services.config.openApiUrl+obj.imagepath).replace('./uploadFile', '/uploadFile')
             obj.mobile = isnullstr(res.data.mobile)
-            this.setData({ goods: obj })
+            this.setData({ 
+              goods: obj,
+              /// 显示单位
+              unit: obj.zscurrencytypedisplayunit,
+              /// 克拉单价
+              priceper: Number(obj.priceper).toFixed(2),
+              /// 显示价格
+              price: (obj.zscurrencytype === 1 ? obj.price : obj.price*this.data.exchangerate).toFixed(2)
+             })
+            /// 查询履约模板信息
+            this.queryPermancePlanTmp(obj.performancetemplateid)
           })
         },
         fail: (emsg) => {
@@ -66,7 +84,7 @@ Page({
   },
 
    /// 获取履约模板信息
-   queryPermancePlanTmp() {
+   queryPermancePlanTmp(performancetemplateid: number) {
     /// showLoading
     showLoading(() => {
       queryPermancePlanTmp({
@@ -74,8 +92,7 @@ Page({
           /// 获取数据
           this.setData({ 
             tmps: res.data,
-            tmp: res.data[0],
-            actions: res.data.map(obj => { return obj.templatename })
+            tmp: res.data.filter(obj => { return obj.autoid === performancetemplateid })[0]
            })
         },
         complete: () => {
@@ -196,8 +213,6 @@ Page({
     this.setData({ goodsno: options.goodsno, ordertime: options.ordertime })
     /// 获取商品数据
     this.getGoods()
-    /// 查询履约模板信息
-    this.queryPermancePlanTmp()
     /// 单据信息
     const item = JSON.parse(options.item)
     if (item) { this.setData({ order: item }) }

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

@@ -19,19 +19,27 @@
   <!-- 价格信息 -->
   <view class="price-info">
     <view class="content__item">
-        <text class="content__item__price" style="font-size: 18px; font-weight: bolder; color: #D91123;">￥{{ goods.price }}</text>
-        <text class="content__item__rate" wx:if="{{ goods.zscurrencytype === 2 }}">汇率: 6.9762</text>
+        <text class="content__item__price" style="font-size: 18px; font-weight: bolder; color: #D91123;">¥{{ price }}</text>
+        <text class="content__item__rate" wx:if="{{ goods.zscurrencytype === 2 }}">汇率: {{ exchangerate }}</text>
       </view>
       <view class="content__item">
         <text class="content__item__name">【{{ goods.zscategorydisplay }}】商品编号：{{ goods.goodsno }}</text>
       </view>
-      <view class="content__item">
+      <view class="content__item" wx:if="{{ goods.zscategory === 4 }}">
         <text class="content__item__weight">款式：{{ goods.zsstyletypedisplay }}</text>
-        <text class="content__item__ordertime">主石重量：{{ goods.weightavg }}克拉</text>
+        <text class="content__item__ordertime">主石重量：{{ goods.weight }}克拉</text>
       </view>
-      <view class="content__item">
-        <text class="content__item__gprice">克拉单价：{{ goods.zscurrencytypedisplayunit+goods.priceper }}</text>
-        <text class="content__item__price">市场价：{{ goods.zscurrencytypedisplayunit+goods.marketprice }}</text>
+      <view class="content__item" wx:if="{{ goods.zscategory === 4 }}">
+        <text class="content__item__gprice">克拉单价：{{ unit+priceper }}</text>
+        <text class="content__item__price">市场价：{{ unit+goods.marketprice }}</text>
+      </view>
+      <view class="content__item" wx:if="{{ goods.zscategory != 4 }}">
+        <text class="content__item__weight">重量：{{ goods.weight }}克拉</text>
+        <text class="content__item__ordertime">克拉单价：{{ unit+priceper }}</text>
+      </view>
+      <view class="content__item" wx:if="{{ goods.zscategory !== 4 }}">
+        <text class="content__item__price">市场价：{{ unit+goods.marketprice }}</text>
+        <text class="content__item__price">挂牌时间：{{ ordertime }}</text>
       </view>
   </view>
 
@@ -53,6 +61,8 @@
       </view>
       <view class="content__item">
         <text class="title">履约：</text>
+      </view>
+      <view class="content__item">
         <view class="content__item__step">
           <view class="content__item__step__item" wx:for="{{ tmp.LstStep }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx"> 
             <text style="color: white; background-color: {{ colors[idx] }};">{{ itm.stepinfo }}</text>

GuangZuan/miniprogram/mHome/pages/presell/detail/index.less

@@ -34,19 +34,46 @@
         text-align: left;
         width: 100%;
       }
+
+      .qty {
+        text-align: center;
+      }
     }
 
     :first-child {
       text {
-        font-size: 18px;
+        font-size: 16px;
       }
 
       text:nth-child(3) {
         color: #f00;
       }
     }
-  }
 
+    .container__top__row__step {
+      display: flex;
+      flex-direction: row;
+      justify-content: start;
+      align-items: center;
+      align-content: center;
+      margin: 0px 10px;
+
+      &__item {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        align-content: center;
+        padding-top: 10px;
+        margin-bottom: 5px;
+
+        .value {
+          font-size: 12px;
+          padding: 2.5px 5px;
+          text-align: center;
+        }
+      }
+    }
+  }
 
   &__diamondinfo {
     display: flex;

GuangZuan/miniprogram/mHome/pages/presell/detail/index.wxml

@@ -1,6 +1,6 @@
 <view class="container" style="padding-bottom: {{ safeBottom }}px;">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #407DB8">
+  <van-nav-bar custom-style="background-color: #407DB8" style="position: sticky; z-index: 999; top: 0;">
     <van-icon slot="left" name="arrow-left" size="25px" color="#fff" bind:click="backToParent"/>
     <text slot="title" style="color: #fff;">{{ navTitle }}</text>
   </van-nav-bar>
@@ -18,13 +18,13 @@
 
   <view class="container__top">
     <view class="container__top__row">
-      <text selectable="false">钻石1001</text>
-      <text selectable="false">2000克拉</text>
+      <text selectable="false">{{ item.wrstandardname }}</text>
+      <text class="qty" selectable="false">{{ item.surplusqty }}</text>
       <text selectable="false">{{ item.price }}</text>
     </view>
     <view class="container__top__row">
-      <text selectable="false">预售总量：{{ item.presaleqty }}</text>
-      <text selectable="false">已认购数量：10000克拉</text>
+      <text selectable="false">卖方：{{ item.customername }}</text>
+      <text selectable="false">已认购数量：{{ item.presaleqty }}</text>
     </view>
     <view class="container__top__row">
       <text selectable="false">最小采购单位：{{ item.minbuyqty }}</text>
@@ -40,7 +40,16 @@
     </view>
     <view class="container__top__row">
       <text selectable="false">状态：{{ item.status }}</text>
-      <text selectable="false">已认购数量：2000</text>
+      <text selectable="false">已认购数量：{{ item.placeqty }}</text>
+    </view>
+    <view class="container__top__row">
+      <text selectable="false">履约方式：</text>
+    </view>
+    <view class="container__top__row__step" scroll-x="true">
+      <view class="container__top__row__step__item" wx:for="{{ tmp.LstStep }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx"> 
+        <text class="value" style="color: white; background-color: {{ colors[idx] }};">{{ itm.stepinfo }}</text>
+        <text class="value">{{ itm.stepdate }}</text>
+      </view>
     </view>
     <view class="container__top__row">
       <text selectable="false">备注：{{ item.remark }}</text>
@@ -57,13 +66,13 @@
     <text selectable="false">颜色：{{ item.zscolortypestr }} </text>
     <text selectable="false">净度：{{ item.zsclaritytypestr }} </text>
     <text selectable="false">尺寸：{{ item.sizestr }} </text>
-    <text selectable="false">成品率：{{  }} </text>
-    <text selectable="false">重量：{{  }} </text>
-    <text selectable="false">数量：{{  }} </text>
-    <text selectable="false">生产方式：{{  }} </text>
+    <text selectable="false">成品率：{{ item.yieldrate }} </text>
+    <text selectable="false">重量：{{ item.weightdesc }} </text>
+    <text selectable="false">数量：{{ item.qtydesc }} </text>
+    <text selectable="false">生产方式：{{ item.ysproductionmode === 1 ? 'HPHT' : 'CVD' }} </text>
   </view>
 
-   <view class="button-view">
+   <view class="button-view" wx:if="{{ item.presalestatus != 1 }}">
     <van-button block color="linear-gradient(to right, #4bb0ff, #666)" bind:click="doSubmit" round>立即购买</van-button>
   </view>
 

GuangZuan/miniprogram/mHome/pages/presell/list/index.ts

@@ -92,7 +92,10 @@ Page({
                   zsshapetypestr: isnullstr(obj.zsshapetypestr),
                   zssymmetrytypestr: isnullstr(obj.zssymmetrytypestr),
                   sizestr: isnullstr(obj.sizestr),
-                  remark: isnullstr(obj.remark)
+                  remark: isnullstr(obj.remark),
+                  placeqty: obj.placeqty,
+                  qtydesc: isnullstr(obj.qtydesc),
+                  weightdesc: isnullstr(obj.weightdesc)
                 }
               })
             })
@@ -164,7 +167,10 @@ Page({
                   zsshapetypestr: isnullstr(obj.zsshapetypestr),
                   zssymmetrytypestr: isnullstr(obj.zssymmetrytypestr),
                   sizestr: isnullstr(obj.sizestr),
-                  remark: isnullstr(obj.remark)
+                  remark: isnullstr(obj.remark),
+                  placeqty: obj.placeqty,
+                  qtydesc: isnullstr(obj.qtydesc),
+                  weightdesc: isnullstr(obj.weightdesc)
                 }
               })
             })

GuangZuan/miniprogram/mHome/pages/purchase/detail/index.less

@@ -34,17 +34,45 @@
         text-align: left;
         width: 100%;
       }
+
+      .qty {
+        text-align: center;
+      }
     }
 
     :first-child {
       text {
-        font-size: 18px;
+        font-size: 16px;
       }
 
       text:nth-child(3) {
         color: #f00;
       }
     }
+
+    .container__top__row__step {
+      display: flex;
+      flex-direction: row;
+      justify-content: start;
+      align-items: center;
+      align-content: center;
+      margin: 0px 10px;
+
+      &__item {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        align-content: center;
+        padding-top: 10px;
+        margin-bottom: 5px;
+
+        .value {
+          font-size: 12px;
+          padding: 2.5px 5px;
+          text-align: center;
+        }
+      }
+    }
   }
 
 

GuangZuan/miniprogram/mHome/pages/purchase/detail/index.wxml

@@ -1,6 +1,6 @@
 <view class="container" style="padding-bottom: {{ safeBottom }}px;">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #407DB8">
+  <van-nav-bar custom-style="background-color: #407DB8"  style="position: sticky; z-index: 999; top: 0;">
     <van-icon slot="left" name="arrow-left" size="25px" color="#fff" bind:click="backToParent"/>
     <text slot="title" style="color: #fff;">{{ navTitle }}</text>
   </van-nav-bar>
@@ -19,12 +19,12 @@
   <view class="container__top">
     <view class="container__top__row">
       <text selectable="false">{{ item.wrstandardname }}</text>
-      <text selectable="false">2000克拉</text>
+      <text class="qty" selectable="false">{{ item.surplusqty }}</text>
       <text selectable="false">{{ item.price }}</text>
     </view>
     <view class="container__top__row">
-      <text selectable="false">预售总量：{{ item.presaleqty }}</text>
-      <text selectable="false">已认购数量：10000克拉</text>
+      <text selectable="false">卖方：{{ item.customername }}</text>
+      <text selectable="false">已认购数量：{{ item.presaleqty }}</text>
     </view>
     <view class="container__top__row">
       <text selectable="false">最小采购单位：{{ item.minbuyqty }}</text>
@@ -40,7 +40,16 @@
     </view>
     <view class="container__top__row">
       <text selectable="false">状态：{{ item.status }}</text>
-      <text selectable="false">已认购数量：2000</text>
+      <text selectable="false">已认购数量：{{ item.placeqty }}</text>
+    </view>
+    <view class="container__top__row">
+      <text selectable="false">履约方式：</text>
+    </view>
+    <view class="container__top__row__step">
+      <view class="container__top__row__step__item" wx:for="{{ tmp.LstStep }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx"> 
+        <text class="value" style="color: white; background-color: {{ colors[idx] }};">{{ itm.stepinfo }}</text>
+        <text class="value">{{ itm.stepdate }}</text>
+      </view>
     </view>
     <view class="container__top__row">
       <text selectable="false">备注：{{ item.remark }}</text>
@@ -64,10 +73,7 @@
      <text selectable="false">荧光：{{ item.zsfluorescencetypestr }} </text>
    </view>
 
-   <view class="button-view">
+   <view class="button-view" wx:if="{{ item.presalestatus != 1 }}">
     <van-button block color="linear-gradient(to right, #4bb0ff, #666)" bind:click="doSubmit" round>立即购买</van-button>
   </view>
-</view>
-
-
-
+</view>

GuangZuan/miniprogram/mHome/pages/purchase/list/index.ts

@@ -92,7 +92,8 @@ Page({
                   zsshapetypestr: isnullstr(obj.zsshapetypestr),
                   zssymmetrytypestr: isnullstr(obj.zssymmetrytypestr),
                   sizestr: isnullstr(obj.sizestr),
-                  remark: isnullstr(obj.remark)
+                  remark: isnullstr(obj.remark),
+                  placeqty: obj.placeqty
                 }
               })
             })
@@ -164,7 +165,8 @@ Page({
                   zsshapetypestr: isnullstr(obj.zsshapetypestr),
                   zssymmetrytypestr: isnullstr(obj.zssymmetrytypestr),
                   sizestr: isnullstr(obj.sizestr),
-                  remark: isnullstr(obj.remark)
+                  remark: isnullstr(obj.remark),
+                  placeqty: obj.placeqty
                 }
               })
             })

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

@@ -8,8 +8,8 @@
 
   <!-- tabs -->
   <view class="tab-view">
-    <van-tabs swipeable bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#407DB8">
-      <van-tab wx:for="{{ tabs }}" active="{{ active }}" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" title="{{ itm.name }}"/>
+    <van-tabs active="{{ active }}" swipeable bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#407DB8">
+      <van-tab wx:for="{{ tabs }}" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" title="{{ itm.name }}"/>
     </van-tabs>  
   </view>
 </view>

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

@@ -7,8 +7,8 @@
 
   <!-- tabs -->
   <view class="tab-view">
-    <van-tabs swipeable bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#407DB8">
-      <van-tab wx:for="{{tabs}}" active="{{ active }}" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" title="{{ itm.name }}"/>
+    <van-tabs active="{{ active }}" swipeable bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#407DB8">
+      <van-tab wx:for="{{tabs}}" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" title="{{ itm.name }}"/>
     </van-tabs>  
   </view>
 

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

@@ -8,7 +8,7 @@
   <!-- 过滤条件 -->
   <view class="result-view" style="background-color: white;">
     <van-tabs custom-class="buyOrSell" type="card" sticky animated bind:change="onDTabChange" line-height="0px" color="#2270D9" title-inactive-color="#333" title-active-color="#fff">
-      <van-tab wx:for="{{ ['买', '卖'] }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx" active="{{ idx }}" title="{{ itm }}"/>
+      <van-tab wx:for="{{ ['买', '卖'] }}" wx:for-item="itm" wx:for-index="idx" wx:key="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>

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

@@ -554,7 +554,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    
   },
 
   /**

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

@@ -7,15 +7,15 @@
 
   <!-- tabs -->
   <view class="tab-view">
-    <van-tabs swipeable bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#407DB8">
-      <van-tab wx:for="{{ tabs }}" active="{{ active }}" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" title="{{ itm.name }}"/>
+    <van-tabs swipeable active="{{ active }}" bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#407DB8">
+      <van-tab wx:for="{{ tabs }}" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" title="{{ itm.name }}"/>
     </van-tabs>  
   </view>
 
   <!-- 我的摘牌 -->
   <view class="dtab-view" wx:if="{{ active == 2 }}">
-    <van-tabs swipeable bind:change="onDTabChange" color="#2270D9" line-width="20px"title-inactive-color="#333" title-active-color="#407DB8">
-      <van-tab wx:for="{{ dtabs }}" active="{{ active }}" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" title="{{ itm.name }}"/>
+    <van-tabs active="{{ dactive }}" swipeable bind:change="onDTabChange" color="#2270D9" line-width="20px"title-inactive-color="#333" title-active-color="#407DB8">
+      <van-tab wx:for="{{ dtabs }}" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" title="{{ itm.name }}"/>
     </van-tabs> 
     <view id="his" bindtap="onButtonPressed">历史订单</view>
   </view>

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

@@ -8,7 +8,7 @@
   <!-- tabs -->
   <view class="tab-view">
     <van-tabs animated color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#407DB8">
-      <van-tab wx:for="{{ tabs }}" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" active="{{ itm.id }}" title="{{ itm.name }}"/>
+      <van-tab wx:for="{{ tabs }}" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" title="{{ itm.name }}"/>
     </van-tabs>  
   </view>
 

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

@@ -8,7 +8,7 @@
   <!-- tabs -->
   <view class="tab-view">
     <van-tabs sticky animated bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#407DB8">
-      <van-tab wx:for="{{ tabs }}" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" active="{{ itm.id }}" title="{{ itm.name }}"/>
+      <van-tab wx:for="{{ tabs }}" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" title="{{ itm.name }}"/>
     </van-tabs>  
   </view>
 

GuangZuan/miniprogram/mTrade/pages/delistingsell/index.ts

@@ -23,7 +23,7 @@ Page({
     /// 备注信息
     remark: '',
     /// 申请价格
-    applyPrice: 0.0,
+    applyPrice: '',
     /// 汇率
     rate: loginQuery().exchangeRateConfigs[0].exchangerate,
     /// 列头
@@ -102,7 +102,7 @@ Page({
           WRStandardID: this.data.wrPositon.wrstandardid,
           WRFactorTypeID: 0,
           ApplyQty: this.data.wrPositon.ftotalqty,
-          ApplyPrice: this.data.applyPrice,
+          ApplyPrice: Number(this.data.applyPrice),
           LadingBillID: this.data.wrPositon.ladingbillid,
           SubNum: this.data.wrPositon.subnum,
           ApplyRemark: this.data.remark,
@@ -147,7 +147,7 @@ Page({
     }
 
     /// 请输入价格
-    if (this.data.applyPrice === 0) {
+    if (this.data.applyPrice === '' || Number(this.data.applyPrice) === 0) {
       showToast('请输入价格!')
       return false
     }

GuangZuan/miniprogram/mTrade/pages/orderdetail/index.ts

@@ -41,7 +41,7 @@ Page({
   
 
   /// 获取履约模板信息
-  queryPermancePlanTmp() {
+  queryPermancePlanTmp(performancetemplateid: number) {
     /// showLoading
     showLoading(() => {
       queryPermancePlanTmp({
@@ -49,7 +49,7 @@ Page({
           /// 获取数据
           this.setData({ 
             tmps: res.data,
-            tmp: res.data[0],
+            tmp: res.data.filter(obj => { return obj.autoid === performancetemplateid })[0],
             actions: res.data.map(obj => { return obj.templatename })
            })
         },
@@ -115,12 +115,12 @@ Page({
       const item = JSON.parse(options.item)
       if (item) {
         this.setData({ order: item })
+        /// 获取履约模板信息
+        this.queryPermancePlanTmp(this.data.order.performancetemplateid)
       }
     } catch (error) {
       console.log(error)
     }
-    /// 获取履约模板信息
-    this.queryPermancePlanTmp()
   },
 
   /**

GuangZuan/miniprogram/mTrade/pages/orderdetail/index.wxml

@@ -19,6 +19,8 @@
       </view>
       <view class="content__item">
         <text class="title">履约规则：</text>
+      </view>
+      <view class="content__item">
         <view class="content__item__step">
           <view class="content__item__step__item" wx:for="{{ tmp.LstStep }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx"> 
             <text style="background-color: {{ colors[idx] }}; color: white;">{{ itm.stepinfo }}</text>
@@ -34,7 +36,7 @@
     <text class="title">【钻石属性】</text>
     <view class="attribute-info__item">
       <text class="title">形状：</text>
-      <text class="value">{{ order.zstabledisplay }}</text>
+      <text class="value">{{ order.zsshapetypedisplay }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">颜色：</text>
@@ -53,6 +55,10 @@
       <text class="value">{{ order.zspolishtypedisplay }}</text>
     </view>
     <view class="attribute-info__item">
+      <text class="title">对称：</text>
+      <text class="value">{{ order.zssymmetrytypedisplay }}</text>
+    </view>
+    <view class="attribute-info__item">
       <text class="title">荧光：</text>
       <text class="value">{{ order.zsfluorescencetypedisplay }}</text>
     </view>

GuangZuan/miniprogram/pages/home/index.ts

@@ -73,10 +73,11 @@ Page({
         this.setData({ 
           statistics: { 
             top:[
-            { id: 1, title: '出售中', value: res.data.transactionssold, class: 'transactionssold' },
+            { id: 1, title: '出售中', value: res.data.transactionsonsale, class: 'transactionssold' },
             { id: 2, title: '求购中', value: res.data.transactioninpurchase, class: 'transactioninpurchase' },
             { id: 3, title: '已购买', value: res.data.purchasedtransactions, class: 'purchasedtransactions' },
-            { id: 4, title: '已出售', value: res.data.transactionsonsale, class: 'transactionsonsale' }], 
+            { id: 4, title: '已出售', value: res.data.transactionssold, class: 'transactionsonsale' },
+            { id: 5, title: '未处理消息', value: res.data.unhandledmessage, class: 'unhandledmessage' }], 
             rate: '今日汇率   '+loginQuery().exchangeRateConfigs[0].exchangerate.toString()
           }
         })
@@ -84,20 +85,25 @@ Page({
     })
   },
 
+  /**
+   * 统计信息点击
+   */
   onStatisticsClikc(e: any) {
-    const id = e.currentTarget.id
-    switch (id) {
+    switch (e.currentTarget.id) {
       case "transactionssold":       /// 出售中
-        wx.switchTab({ url: '/pages/trade/index' })
+        wx.switchTab({ url: '/pages/trade/index?active=0' })
         break;
       case "transactioninpurchase":  /// 求购中
-        wx.switchTab({ url: '/pages/trade/index' })
+        wx.switchTab({ url: '/pages/trade/index?active=1' })
         break;
       case "purchasedtransactions":  /// 已购买
-        wx.navigateTo({ url: '/mMine/pages/myorders/list/index' })
+        wx.navigateTo({ url: '/mMine/pages/myperformance/list/index?active=0' })
+        break;
+      case "transactionsonsale":     /// 已出售
+        wx.navigateTo({ url: '/mMine/pages/myperformance/list/index?active=1' })
         break;
-      default:                       /// 已出售
-        wx.navigateTo({ url: '/mMine/pages/myorders/list/index' })
+      default:                      /// 未处理消息
+        wx.navigateTo({ url: '/mMine/pages/myorders/list/index?active=4' })
         break;
     }
   },

GuangZuan/miniprogram/pages/trade/index.wxml

@@ -36,7 +36,7 @@
 <!-- 内容滚动视图 --> 
 <scroll-view wx:if="{{ active === 0 ? sellOrders.length != 0 : askOrders.length != 0 }}" class="content-view" style="padding-bottom: {{ sellOrders.length > 3 ? safeBottom+navHeight+15 : 15 }}px;">
   <!-- 数据 --> 
-  <van-swipe-cell wx:for="{{ active === 0 ? sellOrders : askOrders }}" wx:for-item="itm" wx:for-index="idx" wx:key="wrtradeorderid" right-width="50">
+  <van-swipe-cell wx:for="{{ active === 0 ? sellOrders : askOrders }}" wx:for-item="itm" wx:for-index="idx" wx:key="wrtradeorderid" id="detail {{ idx }}" right-width="50" >
     <view class="vanSwipeCell-item">
       <view class="vanSwipeCell-item__top">
         <text>{{ itm.zsshapetypedisplay }}</text>
@@ -53,8 +53,8 @@
         <view class="vanSwipeCell-item__mid__mid">
           <text wx:if="{{ active === 1 }}">净度：{{ itm.zsclaritytypedisplay }}</text>
           <text>对称：{{ active === 0 ? itm.zssymmetrytype1display : itm.zssymmetrytypedisplay }}</text>
-          <text>荧光：{{ active === 0 ? itm.zsfluorescencetype1display  : itm.zsfluorescencetypedisplay }}</text>
-          <text wx:if="{{ active === 0 }}">证书：--</text>
+          <text>荧光：{{ active === 0 ? itm.zsfluorescencetype1display : itm.zsfluorescencetypedisplay }}</text>
+          <text wx:if="{{ active === 0 }}">证书：{{ itm.zscerttypedisplay }}</text>
         </view>
         <view class="vanSwipeCell-item__mid__right" id="favorite {{ idx }}" wx:if="{{ active === 0 }}" bindtap="onButtonPressed">
           <van-icon name="star" id="favorite {{ idx }}" color="#407DB8" bind:click="onButtonPressed" />

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

@@ -2792,6 +2792,8 @@ declare namespace GuangZuan {
     performancetemplateid: number
     /// 详情图片(逗号分隔)
     pictureurls: string
+    /// 已配售量
+    placeqty: number
     /// 预售申请ID(184+Unix秒时间戳(10位)+xxxxxx)
     presaleapplyid: string
     /// 数量描述 [2:毛坯钻石]