xxxx

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

@@ -23,7 +23,7 @@ Page({
     /// 状态
     status: '',
     /// 显示的值
-    values: [{ up: [''], dwn: [''] }]
+    values: <{}[]>[]
   },
 
    /**
@@ -59,7 +59,7 @@ Page({
               isEmpty: res.data.length === 0,
               /// 显示的值
               values: res.data.map(obj => {
-                return {up: [obj.netweigthct.toString()+' | '+ 
+                return { up: [obj.netweigthct.toString()+' | '+ 
                             obj.netweigthgm.toString()+' | '+
                             obj.grossweightgm.toString()+' | '+'--'+' | '+
                             obj.perprice.toString()], 

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

@@ -26,7 +26,7 @@ Page({
     /// 数据信息
     bonds: <GuangZuan.GZBSFWOrder[]>[],
     /// 显示的值
-    values: [{ up: [''], mid: [''], dwn: [''], width: 100 }]
+    values: <{}[]>[]
   },
 
   /**
@@ -100,7 +100,7 @@ Page({
                 if (obj.gzbsstatus === 5 || obj.gzbsstatus === 11) {
                   width = 100.0
                 }
-                return {up: [obj.totalnetweigthct.toString()+' | '+ 
+                return { up: [obj.totalnetweigthct.toString()+' | '+ 
                             obj.totalnetweightgm.toString()+' | '+
                             obj.totalgrossweightgm.toString(),
                             isnullstr(obj.orderno)], 

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

@@ -13,7 +13,7 @@
   }
 
   .banner {
-    height: 210px;
+    height: 240px;
     width: 100%;
 
     .swiper-item, image {

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

@@ -220,6 +220,15 @@ Page({
     }
   },
 
+  /// 查看大图
+  previewImage() {
+    /// 查看大图
+    wx.previewImage({
+      urls: [this.data.goods.imagepath],
+      current: ''
+    })
+  },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

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

@@ -11,7 +11,7 @@
   <swiper class="banner" wx:if="{{ banners.count != 0 }}" indicator-active-color="orange" indicator-dots autoplay interval="5000" circular>
     <swiper-item class="banner_item" wx:for="1" wx:key="index" id="{{ item }}">
       <view class="swiper-item">
-        <image src='{{ goods.imagepath }}' mode="widthFix" />
+        <image src='{{ goods.imagepath }}' mode="aspectFill" bindtap="previewImage"/>
       </view>
     </swiper-item>
   </swiper>

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

@@ -1,8 +1,4 @@
 .top-view {
-  position: sticky;
-  top: 0px;
-  z-index: 999;
-
   .orderinfo {
     display: flex;
     flex-direction: column;

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

@@ -9,6 +9,8 @@ Page({
    * 页面的初始数据
    */
   data: {
+    /// 底部安全区域
+    safeBottom: getApp().globalData.safeBottom,
     /// 列头
     titles: [['货物编号', '形状 | 重量（ct）| 参考货值（USD）'],
               ['刻印服务 | 是否披露 | 服务类别 | 原证书号'],
@@ -18,7 +20,7 @@ Page({
     /// 数据信息
     orders: <GuangZuan.GZCJJCOrderDetail[]>[],
     /// 显示的值
-    values: [{ up: [''], mid: [''], dwn: [''] }],
+    values: <{}[]>[],
   },
 
   /**
@@ -56,11 +58,12 @@ Page({
               isEmpty: res.data.length === 0,
               /// 显示的值
               values: res.data.map(obj => {
-                return {up: [obj.gzno, 
-                        getEnumdicValue('GZCJShapeType', obj.gzcjshapetype)+' | '+obj.weight.toString()+' | '+obj.amount.toFixed(2)], 
-                        mid: [getEnumdicValue('GZCJMarkType', obj.gzcjmarktype)+' | '+getEnumdicValue('GZCJPublishType', obj.gzcjpublishtype)+' | '+getEnumdicValue('GZCJServiceType', obj.gzcjservicetype)+' | '+isnullstr(obj.origincertno)],
-                        dwn: [isnullstr(obj.colorinfo)+' | '+
-                              isnullstr(obj.remark)]}
+                return { up: [obj.gzno, 
+                              getEnumdicValue('GZCJShapeType', obj.gzcjshapetype)+' | '+obj.weight.toString()+' | '+obj.amount.toFixed(2)], 
+                        mid: [getEnumdicValue('GZCJMarkType', 
+                              obj.gzcjmarktype)+' | '+getEnumdicValue('GZCJPublishType', 
+                              obj.gzcjpublishtype)+' | '+getEnumdicValue('GZCJServiceType', obj.gzcjservicetype)+' | '+isnullstr(obj.origincertno)],
+                        dwn: [isnullstr(obj.colorinfo)+' | '+ isnullstr(obj.remark)]}
               })
             })
           })

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

@@ -1,13 +1,15 @@
-<!-- top-view -->
-<view class="top-view">
+<view style="position: sticky; top: 0; z-index: 999;">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #407DB8">
+  <van-nav-bar custom-style="background-color: #407DB8" >
     <van-icon slot="left" name="arrow-left" size="25px" color="#fff" bind:click="backToParent"/>
     <text slot="title" style="color: #fff;">出境详情</text>
   </van-nav-bar>
+</view>
 
+<!-- top-view -->
+<view class="top-view">
   <!-- 单据信息 -->
-  <view class="orderinfo">
+  <view class="orderinfo" style="padding-bottom: {{ safeBottom }}px;">
     <view class="title_item" style="margin-left: -10px;">
       <text class="ordertitle" style="font-size: 18px;">【单据信息】</text>
       <text>{{ order.orderid }}</text>

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

@@ -24,7 +24,7 @@ Page({
     /// 数据信息
     orders: <GuangZuan.GZCJJCOrder[]>[],
     /// 显示的值
-    values: [{ up: [''], dwn: [''], width: 100 }],
+    values: <{}[]>[],
   },
 
   /**
@@ -114,7 +114,7 @@ Page({
                 if (obj.gzcjstatus === 1 || obj.gzcjstatus === 22 || obj.gzcjstatus === 2 || obj.gzcjstatus === 8 || obj.gzcjstatus === 10 || obj.gzcjstatus === 13) {
                   width = 100.0
                 }
-                return {up: [obj.gzcjcategorytypedisplay, 
+                return { up: [obj.gzcjcategorytypedisplay, 
                             obj.gzcjaccount, 
                             isnullstr(obj.orderno)], 
                         dwn: [obj.totalnumber.toString()+'(粒)'+' | '+

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

@@ -64,6 +64,8 @@
       }
 
       &__top {
+        margin-top: 10px;
+        
         text {
           text-align: center;
         }

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

@@ -1,5 +1,5 @@
 import { queryGZMyTradingPreSell, queryGZPreSell } from "../../../../services/api/orders/index"
-import { getEnumdicValue, marketid, userid } from "../../../../services/utils"
+import { getEnumdicValue, marketID, userid } from "../../../../services/utils"
 import { hideLoading, showLoading } from "../../../../utils/message/index"
 import { isnullstr } from "../../../../utils/util"
 
@@ -20,11 +20,11 @@ Page({
       /// tabs
       tabs: [{id: 1, name: '预售大厅'}, {id: 2, name: '我的预售'}, {id: 3, name: '我参与的预售'}],
       /// subtabs
-      subtabs: [{id: 1, name: '未开始'}, {id: 2, name: '执行中'}],
+      subtabs: [{id: 2, name: '执行中'}, {id: 1, name: '未开始'}],
       /// 类别
       active: 0,
       /// 状态
-      status: 1,
+      status: 2,
       /// 是否空数据
       isEmpty: false,
       /// 预售大厅/我的预售/集采大厅/我的集采 列表查询
@@ -46,7 +46,7 @@ Page({
       queryGZPreSell({
         data: {
           presalestatus: presalestatus,
-          marketid: marketid()
+          marketid: marketID(63)
         },
         success: (res) => {
           /// 请求失败
@@ -73,13 +73,13 @@ Page({
                   status: getEnumdicValue('WRPresaleStatus', obj.presalestatus),
                   startdate: isnullstr(obj.startdate),
                   enddate: isnullstr(obj.enddate),
-                  minsuccessqty: obj.minsuccessqty.toFixed(0),
-                  minbuyqty: obj.minbuyqty.toFixed(0),
-                  maxbuyqty: obj.maxbuyqty.toFixed(0),
-                  presaleqty: obj.presaleqty.toFixed(0)+'克拉',
+                  minsuccessqty: obj.minsuccessqty.toFixed(2),
+                  minbuyqty: obj.minbuyqty.toFixed(2),
+                  maxbuyqty: obj.maxbuyqty.toFixed(2),
+                  presaleqty: obj.presaleqty.toFixed(2)+'克拉',
                   buymarginvalue: (obj.buymarginvalue*100).toFixed(2)+'%',
-                  surplusqty: (obj.presaleqty-obj.placeqty).toFixed(0)+'克拉',
-                  price: '¥'+obj.unitprice.toFixed(2)+'(元/克拉)',
+                  surplusqty: (obj.presaleqty-obj.placeqty).toFixed(2)+'克拉',
+                  price: obj.unitprice.toFixed(2)+'(元/克拉)',
                   presalestatus: obj.presalestatus,
                   ysproductionmode: obj.ysproductionmode,
                   yszscategory: obj.yszscategory,
@@ -123,7 +123,7 @@ Page({
       queryGZMyTradingPreSell({
         data: {
           userid: userid(),
-          marketid: marketid(),
+          marketid: marketID(63),
           status: status
         },
         success: (res) => {
@@ -150,11 +150,11 @@ Page({
                   wrstandardname: isnullstr(obj.wrstandardname),
                   customername: isnullstr(obj.customername),
                   tradeamount: obj.tradeamount.toFixed(2),
-                  status: obj.status,
+                  status: this.data.subtabs.filter(itm => { return itm.id === status })[0].name,
                   ordertime: isnullstr(obj.ordertime),
                   freezemargin: obj.freezemargin.toFixed(2),
                   marginvalue: (obj.marginvalue*100).toFixed(2)+'%',
-                  tradeprice: '¥'+obj.tradeprice.toFixed(2)+'(元/克拉)',
+                  tradeprice: obj.tradeprice.toFixed(2)+'(元/克拉)',
                   orderqty: obj.orderqty.toFixed(2),
                   ysproductionmode: obj.ysproductionmode,
                   yszscategory: obj.yszscategory,
@@ -216,18 +216,18 @@ Page({
    */
   onTabChange(e: any) {
     if (e.target.id === "category") {
-        /// 重置状态
-      this.setData({ status: 1, active: e.detail.name })
+      /// 重置状态
+      this.setData({ active: e.detail.name })
       /// 数据重置
       switch (e.detail.name) {
         case 1: /// 预售大厅
-          this.setData({ subtabs: [{id: 1, name: '未开始'}, {id: 2, name: '执行中'}] })
+          this.setData({ subtabs: [{id: 2, name: '执行中'}, {id: 1, name: '未开始'}], status: 2 })
           break;
         case 2: /// 我的预售
-          this.setData({ subtabs: [{id: 1, name: '未开始'}, {id: 2, name: '执行中'}, {id: 3, name: '已结束'}] })
+          this.setData({ subtabs: [{id: 2, name: '执行中'}, {id: 1, name: '未开始'}, {id: 3, name: '已结束'}], status: 2 })
           break;
         default: /// 我参与的预售
-          this.setData({ subtabs: [{id: 1, name: '预售中'}, {id: 2, name: '执行中'}, {id: 3, name: '已完成'}] })
+          this.setData({ subtabs: [{id: 1, name: '预售中'}, {id: 2, name: '执行中'}, {id: 3, name: '已完成'}], status: 1 })
           break;
       }
     } else {

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

@@ -12,7 +12,7 @@
     </van-tabs> 
 
     <view class="filter-view">
-      <van-tabs id="subCategory" active="{{ status }}" bind:change="onTabChange" line-height="0px" title-inactive-color="#333" title-active-color="#DC203D">
+      <van-tabs id="subCategory" active="{{ status }}" bind:change="onTabChange" line-height="0px" title-inactive-color="#333" title-active-color="#407DB8">
         <van-tab wx:for="{{ subtabs }}" wx:for-item="itm" wx:key="id" name="{{ itm.id }}" title="{{ itm.name }}"/>
       </van-tabs>
       <van-icon name="add-o" size="25px" color="#387BDC" bind:click="addPreSell"/>
@@ -21,7 +21,7 @@
 
   <!-- 数据内容 -->
   <view class="container__list">
-    <view wx:if="{{ active != 3 }}" class="container__list__item" wx:for="{{ values }}" wx:key="presaleapplyid" wx:for-item="itm" wx:for-index="idx" id="{{ idx }}" bindtap="onItemClick">
+    <view wx:if="{{ active != 3 }}" class="container__list__item" wx:for="{{ values }}" wx:for-item="itm" wx:for-index="idx" id="{{ idx }}" wx:key="idx" bindtap="onItemClick">
       <view class="container__list__item__top">
         <text>{{ itm.wrstandardname }}</text>
         <text>{{ itm.surplusqty }}</text>
@@ -46,7 +46,7 @@
       </view>
     </view>
 
-    <view wx:if="{{ active === 3 }}" class="container__list__item" wx:for="{{ values }}" wx:key="presaleapplyid" wx:for-item="itm" wx:for-index="idx" bindtap="onItemClick">
+    <view wx:if="{{ active === 3 }}" class="container__list__item" wx:for="{{ values }}"  wx:for-item="itm" wx:for-index="idx" wx:key="idx" bindtap="onItemClick">
       <view class="container__list__item__top">
         <text>{{ itm.wrstandardname }}</text>
         <text>{{ itm.orderqty }}</text>
@@ -58,7 +58,7 @@
         <text>货款：{{ itm.tradeamount }}</text>
       </view>
       <view class="container__list__item__row">
-        <text>采购保证金：{{ itm.buymarginvalue*100.0 }}%</text>
+        <text>采购保证金：{{ itm.marginvalue }}</text>
         <text>已付保证金：{{ itm.freezemargin }}</text>
       </view>
       <view class="container__list__item__row">

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

@@ -62,6 +62,8 @@
       }
 
       &__top {
+        margin-top: 10px;
+        
         text {
           text-align: center;
         }

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

@@ -1,5 +1,5 @@
 import { queryGZMyTradingPreSell, queryGZPreSell } from "../../../../services/api/orders/index"
-import { getEnumdicValue, marketid, userid } from "../../../../services/utils"
+import { getEnumdicValue, marketID, userid } from "../../../../services/utils"
 import { hideLoading, showLoading } from "../../../../utils/message/index"
 import { isnullstr } from "../../../../utils/util"
 
@@ -20,11 +20,11 @@ Page({
       /// tabs
       tabs: [{id: 1, name: '集采大厅'}, {id: 2, name: '我的集采'}, {id: 3, name: '我参与的集采'}],
       /// subtabs
-      subtabs: [{id: 1, name: '未开始'}, {id: 2, name: '执行中'}],
+      subtabs: [{id: 2, name: '执行中'}, {id: 1, name: '未开始'}],
       /// 类别
       active: 0,
       /// 状态
-      status: 1,
+      status: 2,
       /// 是否空数据
       isEmpty: false,
       /// 预售大厅/我的预售/集采大厅/我的集采 列表查询
@@ -46,7 +46,7 @@ Page({
       queryGZPreSell({
         data: {
           presalestatus: presalestatus,
-          marketid: marketid()
+          marketid: marketID(62)
         },
         success: (res) => {
           /// 请求失败
@@ -73,13 +73,13 @@ Page({
                   status: getEnumdicValue('WRPresaleStatus', obj.presalestatus),
                   startdate: isnullstr(obj.startdate),
                   enddate: isnullstr(obj.enddate),
-                  minsuccessqty: obj.minsuccessqty.toFixed(0),
-                  minbuyqty: obj.minbuyqty.toFixed(0),
-                  maxbuyqty: obj.maxbuyqty.toFixed(0),
-                  presaleqty: obj.presaleqty.toFixed(0)+'克拉',
+                  minsuccessqty: obj.minsuccessqty.toFixed(2),
+                  minbuyqty: obj.minbuyqty.toFixed(2),
+                  maxbuyqty: obj.maxbuyqty.toFixed(2),
+                  presaleqty: obj.presaleqty.toFixed(2)+'克拉',
                   buymarginvalue: (obj.buymarginvalue*100).toFixed(2)+'%',
-                  surplusqty: (obj.presaleqty-obj.placeqty).toFixed(0)+'克拉',
-                  price: '¥'+obj.unitprice.toFixed(2)+'(元/克拉)',
+                  surplusqty: (obj.presaleqty-obj.placeqty).toFixed(2)+'克拉',
+                  price: obj.unitprice.toFixed(2)+'(元/克拉)',
                   presalestatus: obj.presalestatus,
                   ysproductionmode: obj.ysproductionmode,
                   yszscategory: obj.yszscategory,
@@ -121,7 +121,7 @@ Page({
       queryGZMyTradingPreSell({
         data: {
           userid: userid(),
-          marketid: marketid(),
+          marketid: marketID(62),
           status: status
         },
         success: (res) => {
@@ -148,11 +148,11 @@ Page({
                   wrstandardname: isnullstr(obj.wrstandardname),
                   customername: isnullstr(obj.customername),
                   tradeamount: obj.tradeamount.toFixed(2),
-                  status: obj.status,
+                  status: this.data.subtabs.filter(itm => { return itm.id === status })[0].name,
                   ordertime: isnullstr(obj.ordertime),
                   freezemargin: obj.freezemargin.toFixed(2),
                   marginvalue: (obj.marginvalue*100).toFixed(2)+'%',
-                  tradeprice: '¥'+obj.tradeprice.toFixed(2)+'(元/克拉)',
+                  tradeprice: obj.tradeprice.toFixed(2)+'(元/克拉)',
                   orderqty: obj.orderqty.toFixed(2),
                   ysproductionmode: obj.ysproductionmode,
                   yszscategory: obj.yszscategory,
@@ -213,18 +213,22 @@ Page({
    */
   onTabChange(e: any) {
     if (e.target.id === "category") {
-      /// 重置状态
-      this.setData({ status: 1, active: e.detail.name })
       /// 数据重置
       switch (e.detail.name) {
         case 1: /// 预售大厅
-          this.setData({ subtabs: [{id: 1, name: '未开始'}, {id: 2, name: '执行中'}] })
+          this.setData({ subtabs: [{id: 2, name: '执行中'}, {id: 1, name: '未开始'}] })
+          /// 重置状态
+          this.setData({ status: 2, active: e.detail.name })
           break;
         case 2: /// 我的预售
-          this.setData({ subtabs: [{id: 1, name: '未开始'}, {id: 2, name: '执行中'}, {id: 3, name: '已结束'}] })
+          this.setData({ subtabs: [ {id: 2, name: '执行中'}, {id: 1, name: '未开始'}, {id: 3, name: '已结束'}] })
+          /// 重置状态
+          this.setData({ status: 2, active: e.detail.name })
           break;
         default: /// 我参与的预售
           this.setData({ subtabs: [{id: 1, name: '预售中'}, {id: 2, name: '执行中'}, {id: 3, name: '已完成'}] })
+          /// 重置状态
+          this.setData({ status: 1, active: e.detail.name })
           break;
       }
     } else {

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

@@ -13,7 +13,7 @@
     </van-tabs> 
 
     <view class="filter-view">
-      <van-tabs id="subCategory" bind:change="onTabChange" line-height="0px"	title-inactive-color="#333" title-active-color="#DC203D">
+      <van-tabs id="subCategory" bind:change="onTabChange" line-height="0px"	title-inactive-color="#333" title-active-color="#407DB8">
         <van-tab wx:for="{{ subtabs }}" wx:for-item="itm" wx:key="id" name="{{ itm.id }}" title="{{ itm.name }}"/>
       </van-tabs>
       <van-icon name="add-o" size="25px" color="#387BDC" bind:click="addPurchase"/>
@@ -22,7 +22,7 @@
 
   <!-- 数据内容 -->
   <view class="container__list">
-    <view wx:if="{{ active != 3 }}" class="container__list__item" wx:for="{{ values }}" wx:key="presaleapplyid" wx:for-item="itm" wx:for-index="idx" id="{{ idx }}" bindtap="onItemClick">
+    <view wx:if="{{ active != 3 }}" class="container__list__item" wx:for="{{ values }}" wx:for-item="itm" wx:for-index="idx" id="{{ idx }}" wx:key="idx" bindtap="onItemClick">
       <view class="container__list__item__top">
         <text>{{ itm.wrstandardname }}</text>
         <text>{{ itm.surplusqty }}</text>
@@ -47,7 +47,7 @@
       </view>
     </view>
 
-    <view wx:if="{{ active === 3 }}" class="container__list__item" wx:for="{{ values }}" wx:key="presaleapplyid" wx:for-item="itm" wx:for-index="idx" bindtap="onItemClick">
+    <view wx:if="{{ active === 3 }}" class="container__list__item" wx:for="{{ values }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx" bindtap="onItemClick">
       <view class="container__list__item__top">
         <text>{{ itm.wrstandardname }}</text>
         <text>{{ itm.orderqty }}</text>
@@ -59,7 +59,7 @@
         <text>货款：{{ itm.tradeamount }}</text>
       </view>
       <view class="container__list__item__row">
-        <text>采购保证金：{{ itm.buymarginvalue*100.0 }}%</text>
+        <text>采购保证金：{{ itm.marginvalue }}</text>
         <text>已付保证金：{{ itm.freezemargin }}</text>
       </view>
       <view class="container__list__item__row">

GuangZuan/miniprogram/mHome/pages/settle/list/index.less

@@ -6,15 +6,18 @@
     flex-direction: column;
     width: 100%;
     background-color: #f0f0f0;
+    align-items: center;
+      align-content: center;
 
     &__item {
       display: flex;
       flex-direction: column;
-      width: 100%;
+      width: 96%;
       background-color: #fff;
-      margin-bottom: 5px;
-      padding-top: 10px 0px;
-    
+      margin: 5px 0px;
+      border-radius: 10px;
+      padding: 10px 0px;
+      
       &__row {
         display: flex;
         flex-direction: row;
@@ -27,6 +30,7 @@
           text-align: left;
           color: #333;
           font-size: 14px;
+          width: 90%;
         }
       }
     }

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

@@ -3,6 +3,7 @@ import { sendMsgToMQ } from "../../../../services/api/common/index"
 import { queryGzbscReckonOrder } from "../../../../services/api/orders/index"
 import { getEnumdicValue, getErrorMsg, isEncrypted, protoHeader, timetample, userid } from "../../../../services/utils"
 import { hideLoading, showLoading, showModel } from "../../../../utils/message/index"
+import { isnullstr } from "../../../../utils/util"
 import { encryptBody } from "../../../../utils/websocket/crypto"
 
 Page({
@@ -96,7 +97,7 @@ Page({
               return { 
                 servicefee: obj.servicefee,
                 paystatusdesc: getEnumdicValue('GZBSCPayStatus', obj.paystatus),
-                paytradedate: obj.paytradedate,
+                paytradedate: isnullstr(obj.paytradedate),
                 totalfee: obj.totalfee,
                 storagefee: obj.storagefee,
                 powerfee: obj.powerfee,

GuangZuan/miniprogram/mHome/pages/settle/list/index.wxml

@@ -14,7 +14,7 @@
   <view class="list-view">
     <view class="list-view__item" wx:for="{{ values }}" wx:key="orderid" wx:for-item="itm" wx:for-index="idx">
       <view class="list-view__item__row">
-        <text selectable="false">{{ itm.paytradedate }}</text>
+        <text selectable="false">日期：{{ itm.paytradedate }}</text>
         <text selectable="false">总费用：{{ itm.totalfee }}</text>
       </view>
       <view class="list-view__item__row">
@@ -28,7 +28,7 @@
       <view class="list-view__item__row">
         <text selectable="false">报送费{{ itm.customsfee }}</text>
         <text selectable="false" wx:if="{{ itm.paystatus === 3 }}">支付时间：{{ itm.paytime }}</text>
-        <van-button id="{{ itm.orderid }}" wx:if="{{ itm.paystatus === 2 }}" type="primary" bind:click="doPayment" size="mini">支付</van-button>
+        <van-button id="{{ itm.orderid }}" wx:if="{{ itm.paystatus === 2 }}" type="info" bind:click="doPayment" size="small" round>支付</van-button>
       </view>
     </view>
   </view>

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

@@ -21,7 +21,7 @@ Page({
     /// 查询数据
     datas: <GuangZuan.MyWRPosition[]>[],
     /// 显示的值
-    values: [{ up: [''], dwn: [''] }],
+    values: <{}[]>[],
     /// 数据是否为空
     isEmpty: false,
     /// 左滑宽度

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

@@ -15,7 +15,7 @@ Page({
     /// 我的摘牌
     datas: <GuangZuan.MyDeListing[]>[],
     /// 显示的值
-    values: [{ up: [''], dwn: [''] }],
+    values: <{}[]>[],
     /// 页签
     page: 1,
     /// 是否显示日期

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

@@ -40,7 +40,7 @@ Page({
     /// 我的询价和询价消息
     myDelistingApplys: <GuangZuan.MyDelistingApply[]>[],
     /// 显示的值
-    values: [{ up: [''], mid:[''], dwn: [''] }],
+    values: <{}[]>[],
     /// 页签
     page: 1,
     /// 是否显示日期

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

@@ -19,7 +19,7 @@ Page({
     titles: [['重量 | 形状 | 款式 | 尺寸', ' 编号'], 
              ['颜色 | 净度 | 对称 | 抛光 | 荧光 | 证书', '价格']],
     /// 显示的值
-    values: [{ up: [''], dwn: [''] }],
+    values: <{}[]>[],
     /// 履约单据信息
     order: <GuangZuan.MyPerformanc>({}),
     /// 延期备注

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

@@ -23,7 +23,7 @@ Page({
     /// 查询数据
     datas: <GuangZuan.MyPerformanc[]>[],
     /// 显示的值
-    values: [{ up: [''], dwn: [''] }],
+    values: <{}[]>[],
     /// 左滑宽度
     width: 50
   },
@@ -53,12 +53,12 @@ Page({
               /// 显示的值
               values: res.data.map(obj => {
                 return {up: [obj.zscurrencytypedisplayunit+obj.price.toString()+' | '+ 
-                            obj.zscurrencytypedisplayunit+(this.data.active == 0 ? obj.buypaidamount : obj.sellreceivedamount).toString()+' | '+ 
-                            obj.zscurrencytypedisplayunit+(this.data.active == 0 ? obj.buyerfreezeamount : obj.sellerfreezeamount).toString(), 
+                            (this.data.active == 0 ? obj.buypaidamount : obj.sellreceivedamount).toFixed(2)+' | '+ 
+                            (this.data.active == 0 ? obj.buyerfreezeamount : obj.sellerfreezeamount).toFixed(2), 
                             getSteptype(obj.steptypeid)+' | '+ obj.remaindays.toString()+'天'], 
                         dwn: [isnullstr(obj.zsshapetypedisplay)+' | '+
                               isnullstr(obj.zscolortype1display)+' | '+
-                              '--'+' | '+
+                              (obj.weight === 0 ? '--' : obj.weight.toFixed(2))+' | '+
                               isnullstr(obj.accountname),
                             getPerformancestatus(obj.performancestatus)]}
               })

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

@@ -52,13 +52,13 @@ Page({
               isEmpty: res.data.length === 0,
               /// 显示的值
               values: res.data.map(obj => {
-                return {up: [obj.zscurrencytypedisplayunit+obj.amount.toFixed(2)+' | '+ 
-                            obj.zscurrencytypedisplayunit+(this.data.active == 0 ? obj.buypaidamount : obj.sellreceivedamount).toFixed(2)+' | '+
-                            obj.zscurrencytypedisplayunit+(this.data.active == 0 ? obj.buyerfreezeamountremain : obj.sellerfreezeamountremain).toFixed(2), 
+                return {up: [obj.amount.toFixed(2)+' | '+ 
+                            (this.data.active == 0 ? obj.buypaidamount : obj.sellreceivedamount).toFixed(2)+' | '+
+                            (this.data.active == 0 ? obj.buyerfreezeamountremain : obj.sellerfreezeamountremain).toFixed(2), 
                             getSteptype(obj.steptypeid)+' | '+  obj.remaindays.toString()+"天"], 
                         dwn: [isnullstr(obj.zsshapetypedisplay)+' | '+
                               isnullstr(obj.zscolortype1display)+' | '+
-                              obj.weight.toFixed(2)+' | '+
+                              (obj.weight === 0 ? '--' : obj.weight.toFixed(2))+' | '+
                               isnullstr(obj.accountname),
                             getPerformancestatus(obj.performancestatus)], isChecked: false}
               })

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

@@ -148,7 +148,7 @@ Page({
   check(): boolean {
     /// 请选择仓单数据
     if (this.data.wrPositon.ladingbillid === undefined ) {
-      showToast('请选择仓单数据!')
+      showToast('请选择商品!')
       return false
     }
 

GuangZuan/miniprogram/pages/circle/index.ts

@@ -1,10 +1,9 @@
 import { queryMyFavorite } from "../../services/api/orders/index"
-import Toast from "../../miniprogram_npm/@vant/weapp/toast/toast"
 import { clientType, isEncrypted, marketid, protoHeader, userid, timetample, getErrorMsg, saveMyFavorites } from "../../services/utils";
 import { sendMsgToMQ } from "../../services/api/common/index";
 import { FunCode } from "../../constants/enum/funcode";
 import { isnullstr } from "../../utils/util";
-import { hideLoading, showLoading } from "../../utils/message/index";
+import { hideLoading, showLoading, showToast } from "../../utils/message/index";
 import { encryptBody } from "../../utils/websocket/crypto";
 import services from "../../services/index";
 
@@ -69,7 +68,7 @@ Page({
     })
     /// 对比最多不能超过3项
     if (objs.length < 2 || objs.length > 3) {
-      Toast('对比不能少于2项、最多不能超过3项')
+      showToast('对比不能少于2项、最多不能超过3项')
       return
     }
     /// 页面跳转
@@ -150,7 +149,7 @@ Page({
             return
           }
           /// 保存我的收藏
-          // saveMyFavorites(res.data)
+          saveMyFavorites(res.data)
           /// hideLoading
           hideLoading(()=>{
             /// 数据赋值

GuangZuan/miniprogram/pages/circle/index.wxml

@@ -41,15 +41,12 @@
       <view class="item detail" id="detail {{ idx }}" style="background-color: #407DB8; color: white;" bindtap="onCancelFavorite">取消</view>
     </view>
   </van-swipe-cell>
-</scroll-view>
 
-<!-- 无数据 --> 
-<van-empty wx:if="{{ isEmpty }}" class="custom-image" description="无数据"/>
+  <!-- 无数据 --> 
+  <van-empty wx:if="{{ isEmpty }}" class="custom-image" description="无数据"/>
+</scroll-view>
 
 <!--  底部视图  -->
-<view class="buttom_view" style="padding-bottom: {{ safeBottom+48 }}px;">
-    <van-button id="new" round color="#407DB8" block style="width: 90%;" bind:click="onButtonPressed">对比</van-button>
-</view>
-
-<!-- toast --> 
-<van-toast id="van-toast" />
+<view class="buttom_view" style="padding-bottom: {{ safeBottom+48 }}px;" wx:if="{{ values.length >= 2}}">
+  <van-button id="new" round color="#407DB8" block style="width: 90%;" bind:click="onButtonPressed">对比</van-button>
+</view>

GuangZuan/miniprogram/pages/home/index.less

@@ -67,8 +67,9 @@
       }
   
       text:nth-child(2) {
+        margin-top: 5px;
         color: #333;
-        font-size: 24rpx;
+        font-size: 22rpx;
         text-align: center;
         padding-right: 10px;
       }
@@ -96,6 +97,13 @@
   }
 }
 
+van-grid-item {
+  .van-grid-item__content {
+    padding: 16px 0px;
+  }
+}
+
+
 .memberinfo {
   display: flex;
   flex-direction: column;

GuangZuan/miniprogram/pages/login/index.wxml

@@ -16,8 +16,7 @@
 <van-button loading="{{ isLoding }}" round color="#407DB8" block style="width: 90%; padding-top: 5px;" loading-text="登录中..." bind:click="onLogin">登录</van-button>
 
 <!--  版权信息  -->
-<van-divider contentPosition="center" style="position: absolute; bottom: {{ safeBottom+20 }}px;" customStyle="color: #407DB8; font-size: 10px;">Copyright 2022-2023 GuangZuan. ALL Right Reserved.版本号V{{ version }}
-</van-divider>
+<van-divider contentPosition="center" style="position: absolute; bottom: {{ safeBottom }}px;" customStyle="color: #407DB8; font-size: 10px;">Copyright 2022-2023 GuangZuan. ALL Right Reserved.版本号V{{ version }}</van-divider>
 
 <!-- toast -->
 <van-toast id="van-toast" />

GuangZuan/miniprogram/pages/mine/index.less

@@ -101,11 +101,8 @@
     justify-content: center;
     margin-top: 20px;
 
-    .loginOut {
-      width: 360px;
-      font-size: 28rpx;
-      background-color: #407DB8;
-      color: white;
+    van-button {
+      width: 90%;
     }
   }
 }

GuangZuan/miniprogram/pages/mine/index.wxml

@@ -57,7 +57,7 @@
 
   <!-- 登出按钮  -->
   <view class="loginOut-view" style="padding-bottom: 60px;">
-    <van-button custom-class="loginOut" size="large" round bindtap="onLoginOut">退出登录</van-button>
+    <van-button custom-class="loginOut" size="large" color="#407DB8" block round bind:click="onLoginOut">退出登录</van-button>
   </view>
 </view>
 

GuangZuan/miniprogram/pages/trade/index.less

@@ -39,7 +39,6 @@
       align-content: center;
 
       &__item {
-
         display: flex;
         flex-direction: column;
         justify-content: center;
@@ -49,7 +48,8 @@
 
         text {
           color: #CAE5FF;
-          font-size: 12px;text-align: center;
+          font-size: 12px;
+          text-align: center;
         }
 
         image {

GuangZuan/miniprogram/pages/trade/index.ts

@@ -85,8 +85,8 @@ Page({
    */
   onButtonPressed(e: any){
     /// 获取对应的id
-    const ids = (<string> e.target.id).split(' ')
-    let id = (<string> e.target.id).split(' ')[0]
+    const ids = (<string> e.currentTarget.id).split(' ')
+    let id = (<string> e.currentTarget.id).split(' ')[0]
     const index = <number><unknown>ids[1]
 
     switch (id) {

GuangZuan/miniprogram/pages/trade/index.wxml

@@ -36,7 +36,7 @@
 <!-- 内容滚动视图 --> 
 <scroll-view wx:if="{{ !isEmpty }}" 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" id="detail {{ idx }}" right-width="50" >
+  <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>
@@ -44,17 +44,18 @@
         <text>{{ active === 0 ? itm.zscurrencytypedisplayunit+itm.price : '' }}</text>
       </view>
       <view class="vanSwipeCell-item__mid">
-        <view class="vanSwipeCell-item__mid__left">
+        <view class="vanSwipeCell-item__mid__left" id="detail {{ idx }}" bindtap="onButtonPressed">
           <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>尺寸：{{ active === 0 ? itm.sizedisplay : itm.zssize }}</text>
         </view>
-        <view class="vanSwipeCell-item__mid__mid">
+        <view class="vanSwipeCell-item__mid__mid" id="detail {{ idx }}" bindtap="onButtonPressed">
           <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 }}">证书：{{ itm.zscerttypedisplay }}</text>
+          <text wx:if="{{ active === 1 }}" style="height: 20px;"></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" />
@@ -75,10 +76,10 @@
       <view class="item detail" id="detail {{ idx }}" style="background-color: #407DB8;" bindtap="onButtonPressed">详情</view>
     </view>
   </van-swipe-cell>
+  <!-- 无数据 --> 
+  <van-empty wx:if="{{ isEmpty }}" class="custom-image" description="无数据"/>
   <!-- 求购大厅 -->
 </scroll-view>
 
-<!-- 无数据 --> 
-<van-empty wx:if="{{ isEmpty }}" class="custom-image" description="无数据"/>
 <!-- toast --> 
 <van-toast id="van-toast" />

GuangZuan/miniprogram/services/utils.ts

@@ -184,6 +184,10 @@ export function marketid() {
   return wx.getStorageSync('MarketID')
 }
 
+export function marketID(mode: number) {
+  return loginQuery().markets.filter(obj => { return obj.trademode === mode})[0].marketid
+}
+
 /// 是否加密
 export function isEncrypted() {
   return false