xxxxxxx

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

@@ -78,8 +78,7 @@
           flex-direction: column;
           align-items: center;
           align-content: center;
-          padding-top: 10px;
-          margin-bottom: 5px;
+          padding: 5px 0px;
   
           text {
             font-size: 12px;
@@ -104,7 +103,7 @@
           font-size: 13px;
           /*超出隐藏*/
           overflow: hidden;
-            /*溢出不换行*/
+          /*溢出不换行*/
           white-space: nowrap;
           /*溢出显示用省略号*/
           text-overflow: ellipsis;
@@ -119,6 +118,10 @@
           text-align: right;
         }
       }
+
+      .item-view-dwn {
+        padding-top: 5px;
+      }
     
       .item-view-up {
         border-bottom: 1px solid #ddd;

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

@@ -178,7 +178,7 @@ Page({
               values: res.data.map(obj => {
                 return {up: [obj.weight+'ct', 
                             isnullstr(obj.zsshapetypedisplay), 
-                            isnullstr(obj.size1), 
+                            isnullstr(obj.sizedisplay), 
                             isnullstr(obj.goodsno)], 
                         dwn: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
                               isnullstr(obj.zsclaritytype1display)+' | '+

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

@@ -35,6 +35,7 @@
         </view>
       </view>
     </view>
+    <van-icon name="arrow"></van-icon>
   </view>
 
   <!-- 货币 -->

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

@@ -148,7 +148,7 @@ Page({
               values: res.data.map(obj => {
                 return { up: [obj.totalqty+'ct', 
                             isnullstr(obj.zsshapetypedisplay), 
-                            isnullstr(obj.size1),
+                            isnullstr(obj.sizedisplay),
                             obj.goodsno], 
                           dwn: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
                               isnullstr(obj.zsclaritytype1display)+' | '+

GuangZuan/miniprogram/pages/circle/index.less

@@ -73,6 +73,12 @@
   padding: 10px 10px;
   background-color: #fff;
 
+  .item-view-up {
+    text:nth-child(3) {
+      width: 120px;
+    }
+  }
+
   .item-view-up, .item-view-dwn {
     display: flex;
     flex-direction: row;
@@ -84,7 +90,7 @@
     height: 25px;
 
     text {
-      color: #000000;
+      color: #333;
       font-size: 14px;
       /*超出隐藏*/
       overflow: hidden;

GuangZuan/miniprogram/pages/circle/index.ts

@@ -163,7 +163,7 @@ Page({
                 return {up: [obj.weight.toString()+'ct', 
                             isnullstr(obj.zsshapetypedisplay), 
                             isnullstr(obj.sizedisplay), 
-                            isnullstr(obj.zscategorydisplay)], 
+                            isnullstr(obj.goodsno)], 
                         dwn: [isnullstr(obj.zscolortype1display)+' | '+
                               isnullstr(obj.zsclaritytype1display)+' | '+
                               isnullstr(obj.zscuttype1display)+' | '+

GuangZuan/miniprogram/pages/trade/index.ts

@@ -224,16 +224,22 @@ Page({
           return
         }
         /// 数据赋值
-        this.setData({ 
-          sellOrders: res.data,
-          isEmpty: res.data.length === 0,
-        })
+        this.setData({ sellOrders: res.data.map(itm => {
+          var obj = itm
+          obj.zscuttype1display = isnullstr(itm.zscuttype1display)
+          obj.zspolishtype1display = isnullstr(itm.zspolishtype1display)
+          obj.zsfluorescencetype1display = isnullstr(itm.zsfluorescencetype1display)
+          obj.zssymmetrytype1display = isnullstr(itm.zssymmetrytype1display)
+          return obj
+        }) })
       },
       fail: (emsg) => {
         /// 加载失败
         showToast(emsg)
       },
       complete: () => {
+        /// 数据赋值
+        this.setData({ isEmpty: this.data.sellOrders.length === 0 })
         /// 停止下拉刷新
         wx.stopPullDownRefresh()
       }
@@ -260,13 +266,20 @@ Page({
           hideLoading(()=>{
             /// 数据赋值
             this.setData({ 
+              isEmpty: res.data.length === 0,
               askOrders: res.data.map(itm => {
                 var obj = itm
                 obj.zscuttypedisplay = isnullstr(itm.zscuttypedisplay)
                 obj.zssize = itm.zssize.replace(',', '-')
+                obj.zsfluorescencetypedisplay = isnullstr(itm.zsfluorescencetypedisplay)
+                obj.zssymmetrytypedisplay = isnullstr(itm.zssymmetrytypedisplay)
+                obj.zsclaritytypedisplay = isnullstr(itm.zsclaritytypedisplay)
+                obj.zscuttypedisplay = isnullstr(itm.zscuttypedisplay)
+                obj.zscolortypedisplay = isnullstr(itm.zscolortypedisplay)
+                obj.zspolishtypedisplay = isnullstr(itm.zspolishtypedisplay)
+                obj.zssize = isnullstr(itm.zssize)
                 return obj
-              }),
-              isEmpty: res.data.length === 0
+              })
             })
           })
         },

GuangZuan/miniprogram/pages/trade/index.wxml

@@ -34,22 +34,24 @@
 </view>
 
 <!-- 内容滚动视图 --> 
-<scroll-view class="content-view" style="padding-bottom: 10px;">
+<scroll-view wx:if="{{ active === 0 ? sellOrders.length != 0 : askOrders.length != 0 }}" class="content-view" style="padding-bottom: {{ safeBottom+navHeight+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">
     <view class="vanSwipeCell-item">
       <view class="vanSwipeCell-item__top">
         <text>{{ itm.zsshapetypedisplay }}</text>
-        <tetx>{{ active === 0 ? itm.remainqty+"ct"+"｜"+itm.zscolortype1display+"｜"+itm.zsclaritytype1display : itm.zstabledisplay }}</tetx>
+        <tetx>{{ active === 0 ? itm.remainqty+"ct"+"｜"+itm.zscolortype1display+"｜"+itm.zsclaritytype1display : '' }}</tetx>
         <text>{{ active === 0 ? itm.zscurrencytypedisplayunit+itm.price : '' }}</text>
       </view>
       <view class="vanSwipeCell-item__mid">
         <view class="vanSwipeCell-item__mid__left">
+          <text wx:if="{{ active === 1 }}">颜色：{{ itm.zscolortypedisplay }}</text>
           <text>切工：{{ active === 0 ? itm.zscuttype1display : itm.zscuttypedisplay }}</text>
           <text>抛光：{{ active === 0 ? itm.zspolishtype1display : itm.zspolishtypedisplay }}</text>
           <text>尺寸：{{ itm.zssize }}</text>
         </view>
         <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>

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

@@ -1169,6 +1169,8 @@ declare namespace GuangZuan {
     size2: string
     /// 
     size3: string
+    /// 尺寸信息
+    sizedisplay: string
     /// 
     stonedesc: string
     /// 总重量