代码提交

GuangZuan/miniprogram/components/num-range/num-range.json

@@ -1,4 +1,6 @@
 {
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "van-field": "@vant/weapp/field/index"
+  }
 }

GuangZuan/miniprogram/components/num-range/num-range.ts

@@ -33,6 +33,7 @@ Component({
     * 输入框变化
     */
     valueInput(e: any) {
+      console.log(e)
       switch (e.target.id) {
         case 'min':
           this.setData({ min: e.detail.value })
@@ -41,7 +42,7 @@ Component({
           this.setData({ max: e.detail.value })
           break;
       } 
-      this.triggerEvent('sync', {value: [this.properties.min, this.properties.max]})
+      this.triggerEvent('sync', { value: [this.properties.min, this.properties.max] })
     }
   },
 

GuangZuan/miniprogram/components/num-range/num-range.wxml

@@ -1,13 +1,13 @@
 <view class="content">
   <!-- 左边视图 -->
   <view class="left">
-    <input id="min" value="{{ min }}" placeholder="请输入数值" input="digit" style="width: 100%; text-align: center;" bindinput="valueInput" />
+    <input id="min" value="{{ min }}" placeholder="请输入数值" type="digit" style="width: 100%; text-align: center;" bindinput="valueInput" />
     <text class="unit" style="width: 30px; font-size: 11px;">{{unit}}</text>
   </view>
   <text style="text-align: center; width: 30px;">~</text>
   <!-- 右边边视图 -->
   <view class="right">
-    <input id="max" value="{{ max }}" style="width: 100%; text-align: center;" placeholder="请输入数值" input="digit" bindinput="valueInput" />
+    <input id="max" value="{{ max }}" style="width: 100%; text-align: center;" placeholder="请输入数值" type="digit" bindinput="valueInput" />
     <text class="unit" style="width: 30px; font-size: 11px;">{{ unit }}</text>
   </view>
 </view>

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

@@ -12,7 +12,7 @@ Page({
     /// 底部安全区域
     safeBottom: getApp().globalData.safeBottom,
     /// 列头
-    titles: [['净重（ct）| 净重（g）| 毛重（g）| 总量（USD）| 单价（USD/ct）'], 
+    titles: [['净重（ct）| 净重（g）| 毛重（g）| 总值（USD）| 单价（USD/ct）'], 
              ['内容 | 备注 | 彩钻颜色']],
     /// 是否空数据
     isEmpty: true,
@@ -20,6 +20,8 @@ Page({
     details: <GuangZuan.GZBSFWOrderDetail[]>[],
     /// 单据信息
     orderid: '',
+    /// 单据编号
+    orderno: '',
     /// 状态
     status: '',
     /// 显示的值
@@ -61,9 +63,9 @@ Page({
               values: res.data.map(obj => {
                 return { up: [obj.netweigthct.toString()+' | '+ 
                             obj.netweigthgm.toString()+' | '+
-                            obj.grossweightgm.toString()+' | '+'--'+' | '+
+                            obj.grossweightgm.toString()+' | '+obj.totalamount.toFixed(2)+' | '+
                             obj.perprice.toString()], 
-                        dwn: [isnullstr(obj.ordercontent)+' | '+ isnullstr(obj.remark)+' | '+ obj.colorinfo]}
+                        dwn: [isnullstr(obj.ordercontent)+' | '+ isnullstr(obj.remark)+' | '+ isnullstr(obj.colorinfo)]}
               })
             })
           })
@@ -90,7 +92,8 @@ Page({
     if (options.orderid) {
       this.setData({ 
         orderid: options.orderid,
-        status: options.status
+        status: options.status,
+        orderno: options.orderno,
       })
     }
     /// 查询保税服务单据

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

@@ -8,7 +8,7 @@
 
   <!-- 单据信息 --> 
   <view class="order-info">
-    <text class="order-info--orderno">【单据信息】{{ orderid }}</text>
+    <text class="order-info--orderno">【单据信息】{{ orderno }}</text>
     <text class="order-info--status">{{ status }}</text>
   </view>
 

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

@@ -19,8 +19,8 @@ Page({
     /// tab索引
     active: 0,
     /// 列头
-    titles: [['总净重（ct）| 总净重（g）| 总毛重（g）', '单据编号'],
-             ['总值（USD）| 单价（USD/ct）', '状态'], ['内容 | 备注']],
+    titles: [['总净重(ct)| 总净重(g)| 总毛重(g)', '单据编号'],
+             ['总值(USD)| 单价(USD/ct)', '状态'], ['内容 | 备注']],
     /// 是否空数据
     isEmpty: true,
     /// 数据信息
@@ -43,16 +43,16 @@ Page({
     let id = String(e.target.id).split(' ')[0]
     const index = Number(ids[1])
     /// 传参
-    const { orderid, gzbsstatusdisplay, gzbsstatus } = this.data.bonds[index]
+    const { orderid, gzbsstatusdisplay, gzbsstatus, orderno } = this.data.bonds[index]
     switch (id) {
       case 'detail':     /// 详情
-        wx.navigateTo({ url: "/mHome/pages/bond/detail/index?orderid="+orderid+'&status='+gzbsstatusdisplay })
+        wx.navigateTo({ url: "/mHome/pages/bond/detail/index?orderid="+orderid+'&status='+gzbsstatusdisplay+'&orderno='+orderno })
         break;
       case 'confirmprepayment':  /// 确认预付款
-        wx.navigateTo({ url: '/mHome/pages/bond/prepayment/index?orderid='+orderid+'&statusdisplay='+gzbsstatusdisplay+'&status='+gzbsstatus })
+        wx.navigateTo({ url: '/mHome/pages/bond/prepayment/index?orderid='+orderid+'&statusdisplay='+gzbsstatusdisplay+'&status='+gzbsstatus+'&orderno='+orderno })
         break;
       case 'confirmpayment':     /// 确认付款
-        wx.navigateTo({ url: '/mHome/pages/bond/payment/index?orderid='+orderid+'&statusdisplay='+gzbsstatusdisplay+'&status='+gzbsstatus })
+        wx.navigateTo({ url: '/mHome/pages/bond/payment/index?orderid='+orderid+'&statusdisplay='+gzbsstatusdisplay+'&status='+gzbsstatus+'&orderno='+orderno })
         break;
       default:
         break;

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

@@ -13,6 +13,8 @@ Page({
   data: {
     /// 单据信息
     orderid: '',
+    /// 单据编号
+    orderno: '',
     /// 单据状态
     status: 0,
     /// 状态描述
@@ -20,7 +22,9 @@ Page({
     /// 操作信息
     operator: <GuangZuan.FworderoperateRsp>({}),
     /// 资金账户信息
-    ta: <GuangZuan.TaAccount>({})
+    ta: <GuangZuan.TaAccount>({}),
+    /// 当前余额
+    blance: '0.0'
   },
 
   /**
@@ -118,12 +122,17 @@ Page({
   onLoad(options: any) {
     /// 数据解析
     if (options.orderid) {
+      /// 计算余额
+      const {balance, orifreezecharge ,oriotherfreezemargin} = taAccount(accountid())
       this.setData({ 
         orderid: options.orderid,
         statusdisplay: options.statusdisplay,
         status: options.status,
+        orderno: options.orderno,
         /// 设置账户信息
-        ta: taAccount(accountid())
+        ta: taAccount(accountid()),
+        /// 当前余额
+        blance: (balance-orifreezecharge-oriotherfreezemargin).toFixed(2)
       })
     }
   },

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

@@ -10,7 +10,7 @@
 
   <view class="container__content" wx:if="{{ operator }}">
     <van-cell-group>
-      <van-cell title="单据编号" value="{{ orderid }}" />
+      <van-cell title="单据编号" value="{{ orderno }}" />
       <van-cell title="综合服务费" value="{{ operator.servicefee }}" />
       <van-cell title="代缴物流保险费" value="{{ operator.logisticsfee }}" />
       <van-cell title="税费保证金" value="{{ operator.taxmargin }}" />
@@ -19,12 +19,10 @@
       <van-cell title="总共应收" value="{{ operator.totalfee }}" />
       <van-cell title="预收款" value="{{ operator.advanceamount }}" />
       <van-cell title="应收\应退" value="{{ operator.settleamount-operator.advanceamount }}" />
-      <van-cell title="账户余额" value="{{ ta.currentbalance }}" />
+      <van-cell title="账户余额" value="{{ blance }}" />
     </van-cell-group>
   </view>
 
-  <view class="container__notify">付款通知书(预付款).pdf</view>
-
   <!-- 按钮 -->
   <view class="container__button-view">
     <van-button custom-class="confirm" id="confirm" round color="linear-gradient(to right, #4bb0ff, #666)" block bind:click="doBSFWOperator">确认</van-button>

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

@@ -13,6 +13,8 @@ Page({
   data: {
     /// 单据信息
     orderid: 0,
+    /// 单据编号
+    orderno: '',
     /// 单据状态
     status: 0,
     /// 状态描述
@@ -20,7 +22,9 @@ Page({
     /// 操作信息
     operator: <GuangZuan.FworderoperateRsp>({}),
     /// 资金账户信息
-    ta: <GuangZuan.TaAccount>({})
+    ta: <GuangZuan.TaAccount>({}),
+    /// 当前余额
+    blance: '0.0'
   },
 
   /**
@@ -118,12 +122,16 @@ Page({
   onLoad(options: any) {
     /// 数据解析
     if (options.orderid) {
+      const {balance, orifreezecharge ,oriotherfreezemargin} = taAccount(accountid())
       this.setData({ 
         orderid: options.orderid,
         statusdisplay: options.statusdisplay,
         status: options.status,
+        orderno: options.orderno,
         /// 设置账户信息
-        ta: taAccount(accountid()) 
+        ta: taAccount(accountid()),
+        /// 当前余额
+        blance: (balance-orifreezecharge-oriotherfreezemargin).toFixed(2)
       })
     }
     /// 查询保税服务单据操作

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

@@ -10,19 +10,17 @@
 
   <view class="container__content" wx:if="{{ operator }}">
     <van-cell-group>
-      <van-cell title="单据编号" value="{{ orderid }}" />
+      <van-cell title="单据编号" value="{{ orderno }}" />
       <van-cell title="税费保证金" value="{{ operator.taxmargin }}" />
       <van-cell title="汇款银行手续费" value="{{ operator.bankfee }}" />
       <van-cell title="代缴物流保险费" value="{{ operator.logisticsfee }}" />
       <van-cell title="综合服务费" value="{{ operator.servicefee }}" />
       <van-cell title="其它费用" value="{{ operator.otherfee }}" />
       <van-cell title="总共" value="{{ operator.totalfee }}" />
-      <van-cell title="账户可用余额" value="{{ ta.currentbalance }}" />
+      <van-cell title="账户可用余额" value="{{ blance }}" />
     </van-cell-group>
   </view>
 
-  <view class="container__notify">付款通知书(预付款).pdf</view>
-
   <!-- 按钮 -->
   <view class="container__button-view">
     <van-button custom-class="confirm" id="confirm" round color="linear-gradient(to right, #4bb0ff, #666)" block bind:click="doBSFWOperator">确认</van-button>

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

@@ -37,7 +37,9 @@ Page({
     /// 克拉单价
     priceper: '0.0',
     /// 显示单位
-    unit: ''
+    unit: '',
+    /// 资金账号信息
+    accountid: accountid()
   },
 
   /**
@@ -60,9 +62,12 @@ Page({
         },
         success: (res) => {
           hideLoading( ()=> {
+            /// 数据处理
             var obj = res.data
             obj.imagepath = (services.config.openApiUrl+obj.imagepath).replace('./uploadFile', '/uploadFile')
             obj.mobile = isnullstr(res.data.mobile)
+            obj.zscuttype1display = isnullstr(res.data.zscuttype1display)
+
             this.setData({ 
               goods: obj,
               /// 显示单位

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

@@ -23,7 +23,7 @@
         <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>
+        <text class="content__item__name">{{ goods.zscategorydisplay }} - 商品编号：{{ goods.goodsno }}</text>
       </view>
       <view class="content__item" wx:if="{{ goods.zscategory === 4 }}">
         <text class="content__item__weight">款式：{{ goods.zsstyletypedisplay }}</text>
@@ -56,7 +56,7 @@
         <text class="value">{{ goods.mobile }}</text>
       </view>
       <view class="content__item">
-        <text class="title">仓库地址：</text>
+        <text class="title">仓库：</text>
         <text class="value">{{ goods.provincename+goods.cityname+goods.districtname+goods.address }}</text>
       </view>
       <view class="content__item">
@@ -93,7 +93,7 @@
     <view class="attribute-info__item">
       <text class="title">切工：</text>
       <text class="value" wx:if="{{ goods.zscuttype2 === 0 }}">{{ goods.zscuttype1display }}</text>
-      <text class="value" wx:if="{{ goods.zscuttype2 != 0 }}">{{ goods.zscuttype1display }}~{{goods.zscuttype2display}}</text>
+      <text class="value" wx:if="{{ goods.zscuttype2 != 0 }}">{{ goods.zscuttype1display }}~{{ goods.zscuttype2display }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">抛光：</text>

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

@@ -16,7 +16,9 @@ Page({
     /// 查询出境检测单据操作
     operator: <GuangZuan.GzcjjcorderoperateRsp>({}),
     /// 资金账户信息
-    ta: <GuangZuan.TaAccount>({})
+    ta: <GuangZuan.TaAccount>({}),
+    /// 当前余额
+    blance: '0.0'
   },
 
   /**
@@ -110,10 +112,15 @@ Page({
     /// 数据解析
     const obj = JSON.parse(options.item)
     if (obj) {
+      /// 资金信息
+      const { balance, orifreezecharge ,oriotherfreezemargin } = taAccount(accountid())
+      
       this.setData({ 
         order: obj,
         /// 设置账户信息
-        ta: taAccount(accountid()) 
+        ta: taAccount(accountid()),
+        /// 当前余额
+        blance: (balance-orifreezecharge-oriotherfreezemargin).toFixed(2)
       })
     }
     /// 查询出境检测单据操作

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

@@ -20,12 +20,10 @@
       <van-cell title="总共" value="{{ operator.totalfee }}" />
       <van-cell title="预收款" value="{{ operator.advanceamount }}" />
       <van-cell title="应收\应退" value="{{ operator.settleamount-operator.advanceamount }}" />
-      <van-cell title="账户余额" value="{{ ta.currentbalance }}" />
+      <van-cell title="账户余额" value="{{ blance}}" />
     </van-cell-group>
   </view>
 
-  <view class="container__notify">付款通知书(预付款).pdf</view>
-
   <!-- 按钮 -->
   <view class="container__button-view">
     <van-button custom-class="confirm" id="confirm" round color="linear-gradient(to right, #4bb0ff, #666)" block bind:click="doCJJCOperator">确认</van-button>

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

@@ -16,7 +16,9 @@ Page({
     /// 查询出境检测单据操作
     operator: <GuangZuan.GzcjjcorderoperateRsp>({}),
     /// 资金账户信息
-    ta: <GuangZuan.TaAccount>({})
+    ta: <GuangZuan.TaAccount>({}),
+    /// 当前余额
+    blance: '0.0'
   },
 
   /**
@@ -111,10 +113,14 @@ Page({
     /// 数据解析
     const obj = JSON.parse(options.item)
     if (obj) {
+      /// 资金信息
+      const {balance, orifreezecharge ,oriotherfreezemargin} = taAccount(accountid())
       this.setData({ 
         order: obj,
         /// 设置账户信息
-        ta: taAccount(accountid()) 
+        ta: taAccount(accountid()),
+        /// 当前余额
+        blance: (balance-orifreezecharge-oriotherfreezemargin).toFixed(2)
       })
     }
     /// 查询出境检测单据操作

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

@@ -19,12 +19,10 @@
       <van-cell title="综合服务费" value="{{ operator.servicefee }}" />
       <van-cell title="其它费用" value="{{ operator.otherfee }}" />
       <van-cell title="总共" value="{{ operator.totalfee }}" />
-      <van-cell title="账户可用余额" value="{{ ta.currentbalance }}" />
+      <van-cell title="账户可用余额" value="{{ blance }}" />
     </van-cell-group>
   </view>
 
-  <view class="container__notify">付款通知书(预付款).pdf</view>
-
   <!-- 按钮 -->
   <view class="container__button-view">
     <van-button custom-class="confirm" id="confirm" round color="linear-gradient(to right, #4bb0ff, #666)" block bind:click="doCJJCOperator">确认</van-button>

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

@@ -2,6 +2,7 @@ import services from "../../../../services/index";
 import { querySellOrder } from "../../../../services/api/orders/index";
 import { userid } from "../../../../services/utils";
 import { hideLoading, showLoading } from "../../../../utils/message/index";
+import { formatDateString } from "../../../../utils/util";
 
 Page({
 
@@ -37,7 +38,7 @@ Page({
   onItemClick(e: any) {
     const { num } = e.currentTarget.dataset
     wx.navigateTo({
-      url: "/mHome/pages/goodsdetail/index?goodsno="+this.data.sellOrders[num].goodsno+'&item='+`${JSON.stringify(this.data.sellOrders[num])}`+'&ordertime='+this.data.sellOrders[num].ordertime
+      url: "/mHome/pages/goodsdetail/index?goodsno="+this.data.sellOrders[num].goodsno+'&item='+`${JSON.stringify(this.data.sellOrders[num])}`+'&ordertime='+formatDateString(this.data.sellOrders[num].ordertime, 'YYYY/MM/DD')
     })
   },
 

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

@@ -27,7 +27,7 @@ Page({
    /**
    * 获取会员风采表
    */
-  queryGZMemberInfo(){
+  queryGZMemberInfo() {
     /// loading
     showLoading(()=>{
       /// 发送查询请求
@@ -54,12 +54,15 @@ Page({
         fail: (emsg) => {
           /// 加载失败
           hideLoading(()=>{}, emsg)
+        }, 
+        complete: () => {
+          /// 停止下拉刷新
+          wx.stopPullDownRefresh()
         }
       })
     })
   },
 
-
   /**
    * 生命周期函数--监听页面加载
    */
@@ -100,7 +103,8 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh() {
-
+    /// 请求信息
+    this.queryGZMemberInfo()
   },
 
   /**

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

@@ -42,12 +42,18 @@ Page({
   queryGZPreSell(presalestatus: number) {
     /// loding
     showLoading(()=>{
+      /// 参数过滤
+      const params = this.data.active === 0 ? {
+        presalestatus: presalestatus,
+        marketid: marketID(63)
+      } : {
+        presalestatus: presalestatus,
+        marketid: marketID(63),
+        selluserid: userid()
+      }
       /// 数据查询请求
       queryGZPreSell({
-        data: {
-          presalestatus: presalestatus,
-          marketid: marketID(63)
-        },
+        data: params,
         success: (res) => {
           /// 请求失败
           if (res.code != 200) {

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

@@ -7,15 +7,15 @@
     </van-nav-bar>
 
     <!-- tabs -->
-    <van-tabs id="category" active="{{ active }}" swipeable bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#407DB8">
+    <van-tabs id="category" active="{{ active }}" swipeable bind:click="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" name="{{ itm.id }}" title="{{ itm.name }}"/>
     </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="#407DB8">
+      <van-tabs id="subCategory" active="{{ status }}" bind:click="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"/>
+      <van-icon name="add-o" size="20px" color="#387BDC" bind:click="addPreSell"/>
     </view>
   </view> 
 
@@ -26,7 +26,6 @@
         <text>{{ itm.wrstandardname }}</text>
         <text>{{ itm.surplusqty }}</text>
         <text>{{ itm.price }}</text>
-        <text>{{ itm.status }}</text>
       </view>
       <view class="container__list__item__row">
         <text>卖方：{{ itm.customername }}</text>

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

@@ -1,6 +1,5 @@
 
 .container {
-
   .sub-title {
     font-size: 20px;
     color: #333;
@@ -16,13 +15,16 @@
     align-items: center;
 
     .unit {
-      font-size: 14px;
+      font-size: 12px;
       color: #666;
       padding-right: 10px;
+      width: 60px;
+      text-align: right;
     }
   }
 
   .prestyle {
+    margin-top: 10px;
     display: flex;
     flex-direction: row;
     align-items: center;

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

@@ -44,17 +44,17 @@ Page({
     /// 商品名称
     wrstandname: '',
     /// 预售总量
-    pretotalqty: '0.0',
+    pretotalqty: '',
     /// 预售价格
-    preprice: '0.0',
+    preprice: '',
     /// 最小采购单位
-    minbuyqty: '0.0',
+    minbuyqty: '',
     /// 最大采购单位
-    maxbuyqty: '0.0',
+    maxbuyqty: '',
     /// 最低成团量
-    minsuccessqty: '0.0',
+    minsuccessqty: '',
     /// 采购保证金比例
-    buymarginvalue: '0.0',
+    buymarginvalue: '',
     /// 颜色
     zscolor: '',
     /// 净度

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

@@ -42,12 +42,18 @@ Page({
   queryGZPreSell(presalestatus: number) {
     /// loding
     showLoading(()=>{
+      /// 参数过滤
+      const params = this.data.active === 0 ? {
+        presalestatus: presalestatus,
+        marketid: marketID(62)
+      } : {
+        presalestatus: presalestatus,
+        marketid: marketID(62),
+        selluserid: userid()
+      }
       /// 数据查询请求
       queryGZPreSell({
-        data: {
-          presalestatus: presalestatus,
-          marketid: marketID(62)
-        },
+        data: params,
         success: (res) => {
           /// 请求失败
           if (res.code != 200) {

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

@@ -8,15 +8,15 @@
     </van-nav-bar>
 
     <!-- tabs -->
-    <van-tabs id="category" active="{{ active }}" swipeable bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#407DB8">
+    <van-tabs id="category" active="{{ active }}" swipeable bind:click="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" name="{{ itm.id }}" title="{{ itm.name }}"/>
     </van-tabs> 
 
     <view class="filter-view">
-      <van-tabs id="subCategory" bind:change="onTabChange" line-height="0px"	title-inactive-color="#333" title-active-color="#407DB8">
+      <van-tabs id="subCategory" bind:click="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"/>
+      <van-icon name="add-o" size="20px" color="#387BDC" bind:click="addPurchase"/>
     </view>
   </view> 
 
@@ -27,7 +27,6 @@
         <text>{{ itm.wrstandardname }}</text>
         <text>{{ itm.surplusqty }}</text>
         <text>{{ itm.price }}</text>
-        <text>{{ itm.status }}</text>
       </view>
       <view class="container__list__item__row">
         <text>卖方：{{ itm.customername }}</text>

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

@@ -15,9 +15,11 @@
     align-items: center;
     
     .unit {
-      font-size: 14px;
+      font-size: 12px;
       color: #666;
       padding-right: 10px;
+      width: 60px;
+      text-align: right;
     }
   }
 
@@ -27,14 +29,14 @@
     justify-content: space-between;
     align-items: center;
     align-content: center;
-    margin: 0px 15px;
+    margin: 0px 10px;
 
     &__item {
       width: 100%;
       height: 100%;
       background-color: #ddd;
       color: #333;
-      font-size: 13px;
+      font-size: 12px;
       text-align: center;
       padding: 7.5px 0px;
       border-right: 0.5px solid #aaa;
@@ -62,6 +64,7 @@
   }
 
   .prestyle {
+    margin-top: 10px;
     display: flex;
     flex-direction: row;
     align-items: center;

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

@@ -38,15 +38,15 @@ Page({
     /// 商品名称
     wrstandname: '',
     /// 预售总量
-    pretotalqty: '0.0',
+    pretotalqty: '',
     /// 最小采购单位
-    minbuyqty: '0.0',
+    minbuyqty: '',
     /// 最大采购单位
-    maxbuyqty: '0.0',
+    maxbuyqty: '',
     /// 最低成团量
-    minsuccessqty: '0.0',
+    minsuccessqty: '',
     /// 采购保证金比例
-    buymarginvalue: '0.0',
+    buymarginvalue: '',
     /// 形状
     zsshape: '',
     /// 颜色
@@ -65,15 +65,25 @@ Page({
     zsfluorescence: '',
     /// 备注
     remark: '',
+    /// 成品率
+    zsyield: '',
+    /// 重量描述
+    weightdesc: '',
+    /// 数量描述
+    qtydesc: '',
+     /// 生产方式条件
+     options: [{ text: 'HPHT', value: 1 }, { text: 'CVD', value: 2 }],
+     /// 生产方式
+     way: 1,
     /// 钻石分类
-    categorys: [{ text: '单颗裸钻', value: 2 }, { text: '单颗彩钻', value: 5 }],
-    category: 2,
+    categorys: [{ text: '成品裸钻', value: 1 }, { text: '毛坯钻石', value: 2 }],
+    category: 1,
     /// 列头
-    columns: ['序号', '数量 >=', '价格/(元/克拉)', '操作'],
+    columns: ['序号', '数量 >=', '价格(元/克拉)', '操作'],
     /// 显示信息
     actions: [''],
     /// 数据信息
-    datas: [{ price: 0.0, qty: 0.0, step: 1 }]
+    datas: [{ price: '', qty: '0.0', step: 1 }]
   },
 
    /**
@@ -285,6 +295,10 @@ Page({
           PictureUrls: this.data.filePath,
           Remark: this.data.remark,
           GZCenterPurchasePriceLists: list,
+          YieldRate: this.data.zsyield,
+          QtyDesc: this.data.qtydesc,
+          WeightDesc: this.data.weightdesc,
+          YSProductionMode: this.data.way,
           MarketID: marketid(),
           ClientType: clientType(),
           ClientSerialNo: timetample().toString()
@@ -346,7 +360,7 @@ Page({
    */
   addPrice() {
     this.setData({
-      datas: this.data.datas.concat([{price: 0.0, qty: 0.0, step: this.data.datas.length+1}]) 
+      datas: this.data.datas.concat([{ price: '', qty: '', step: this.data.datas.length+1 }]) 
     })
   },
 
@@ -356,7 +370,7 @@ Page({
   deleteRow(e: any) {
     const row = e.target.id
     var obj = this.data.datas[row-1]
-    if (obj.qty === 0.0 && row === '1') {
+    if ( Number(obj.qty) === 0 && row === '1') {
       showToast('第一条数据信息不能删除')
       return
     }

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

@@ -84,14 +84,24 @@
 
   <van-cell-group>
     <van-cell><view solt="title" class="sub-title">钻石参考信息</view></van-cell>
-    <van-field id="zsshape" label="形状：" size="large" clearable model:value="{{ zsshape }}" placeholder="请输入形状" />
+    <van-field id="zsshape" wx:if="{{ category === 1 }}" label="形状：" size="large" clearable model:value="{{ zsshape }}" placeholder="请输入形状" />
     <van-field id="zscolor" label="颜色：" size="large" clearable model:value="{{ zscolor }}" placeholder="请输入颜色" />
     <van-field id="zsclarity" label="净度：" size="large" clearable model:value="{{ zsclarity }}" placeholder="请输入净度" />
     <van-field id="zssize" label="尺寸：" size="large" clearable model:value="{{ zssize }}" placeholder="请输入尺寸" />
-    <van-field id="zspolish" label="抛光：" size="large" clearable model:value="{{ zspolish }}" placeholder="请输入抛光"/>
-    <van-field id="zssymmetry" label="对称：" size="large" clearable model:value="{{ zssymmetry }}" placeholder="请输入对称" />
-    <van-field id="zscut" label="切工：" size="large" clearable model:value="{{ zscut }}" placeholder="请输入切工" />
-    <van-field id="zsfluorescence" label="荧光：" size="large" clearable model:value="{{ zsfluorescence }}" placeholder="请输入荧光" />
+    <van-field id="zsyield" wx:if="{{ category === 2 }}" label="成品率：" size="large" clearable model:value="{{ zsyield }}" placeholder="请输入成品率" />
+    <van-field id="weightdesc" wx:if="{{ category === 2 }}" label="重量描述：" size="large" clearable model:value="{{ weightdesc }}" placeholder="请输入重量描述" />
+    <van-field id="qtydesc" wx:if="{{ category === 2 }}" label="数量描述：" size="large" clearable model:value="{{ qtydesc }}" placeholder="请输入数量描述" />
+    <van-field wx:if="{{ category === 2 }}" label="生产方式：" value="" size="large" readonly>
+      <view slot="input">
+        <van-radio-group solt="input" value="{{ way }}" bind:change="onChange" direction="horizontal" >
+          <van-radio wx:for="{{ options }}" wx:for-item="itm" wx:key="value" name="{{ itm.value }}">{{ itm.text }}</van-radio>
+        </van-radio-group>
+      </view>
+    </van-field>
+    <van-field id="zspolish" wx:if="{{ category === 1 }}" label="抛光：" size="large" clearable model:value="{{ zspolish }}" placeholder="请输入抛光"/>
+    <van-field id="zssymmetry" wx:if="{{ category === 1 }}" label="对称：" size="large" clearable model:value="{{ zssymmetry }}" placeholder="请输入对称" />
+    <van-field id="zscut" wx:if="{{ category === 1 }}" label="切工：" size="large" clearable model:value="{{ zscut }}" placeholder="请输入切工" />
+    <van-field id="zsfluorescence" wx:if="{{ category === 1 }}" label="荧光：" size="large" clearable model:value="{{ zsfluorescence }}" placeholder="请输入荧光" />
     <!-- 凭证 -->
     <view class="credentials-info" style="padding-top: 10px;">
       <text style="padding-left: 15px; font-size: 15px; width: 130px;">*附件</text>

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

@@ -42,11 +42,7 @@
       padding-bottom: 5px;
 
       text {
-        width: 25%;
-      }
-
-      text:nth-child(1) {
-        width: 40px;
+        width: 100%;
       }
     }
 
@@ -102,11 +98,7 @@
     padding-bottom: 5px;
 
     text {
-      width: 25%;
-    }
-    
-    text:nth-child(1) {
-      width: 40px;
+      width: 100%;
     }
   }
 }

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

@@ -16,7 +16,7 @@ Page({
     /// tabs
     tabs: [{id: 2, name: '单颗裸钻'},  {id: 5, name: '单颗彩钻'}, {id: 4, name: '钻石首饰'}],
     /// 列头
-    titles: [['重量', '形状', '尺寸', '编号'], 
+    titles: [['重量 | 形状 | 尺寸', '编号'], 
              ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光 | 证书', '价格']],
     /// 查询数据
     datas: <GuangZuan.MyWRPosition[]>[],
@@ -65,19 +65,19 @@ Page({
       case 2:  /// 单颗裸钻
         this.setData({
           /// 列头  
-          titles: [['重量', '形状', '尺寸', '编号'], ['颜色｜净度｜切工｜抛光｜对称｜荧光｜证书', '价格']]
+          titles: [['重量 | 形状 | 尺寸', '编号'], ['颜色｜净度｜切工｜抛光｜对称｜荧光｜证书', '价格']]
         })
         break;
       case 5:  /// 单颗彩钻
         this.setData({
           /// 列头  
-          titles: [['重量', '形状', '尺寸', '编号'], ['颜色｜净度｜抛光｜对称｜荧光｜证书', '价格']]
+          titles: [['重量 | 形状 | 尺寸', '编号'], ['颜色｜净度｜抛光｜对称｜荧光｜证书', '价格']]
         })
         break;
       default: /// 钻石首饰
         this.setData({
           /// 列头  
-          titles: [['重量', '形状', '款式', '尺寸', '编号'], ['颜色｜净度｜切工｜抛光｜对称｜荧光｜证书', '价格']]
+          titles: [['重量 | 形状 | 款式 | 尺寸', '编号'], ['颜色｜净度｜切工｜抛光｜对称｜荧光｜证书', '价格']]
         })
     }
     /// 查询我的库存
@@ -110,10 +110,8 @@ Page({
               isEmpty: res.data.length === 0,
               /// 显示的值
               values: zscategory != 5 ? res.data.map(obj => {
-                return {  up: [obj.weight+'ct', 
-                            isnullstr(obj.zsshapetypedisplay), 
-                            zscategory === 4 ? isnullstr(obj.zsshapetypedisplay) : '',
-                            isnullstr(obj.sizedisplay), 
+                return {  up: [obj.weight+'ct'+' | '+ 
+                            isnullstr(obj.zsshapetypedisplay)+(zscategory === 4 ? +(' | '+isnullstr(obj.zsshapetypedisplay)) : '')+' | '+ isnullstr(obj.sizedisplay), 
                             isnullstr(obj.goodsno)], 
                           dwn: [isnullstr(obj.zscolortype1display)+' | '+
                               isnullstr(obj.zsclaritytype1display)+' | '+
@@ -124,9 +122,7 @@ Page({
                               (this.data.active === 0 ? ' | '+isnullstr(obj.zscerttypedisplay) : ''),
                             obj.zscurrencytypedisplayunit+obj.price.toFixed(2)]}
               }) : res.data.map(obj => {
-                return {  up: [obj.weight+'ct', 
-                            isnullstr(obj.zsshapetypedisplay), 
-                            isnullstr(obj.sizedisplay), 
+                return {  up: [obj.weight+'ct'+' | '+isnullstr(obj.zsshapetypedisplay)+' | '+isnullstr(obj.sizedisplay), 
                             isnullstr(obj.goodsno)], 
                           dwn: [isnullstr(obj.zscolortype1display)+' | '+
                               isnullstr(obj.zsclaritytype1display)+' | '+

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

@@ -9,7 +9,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    titles: [['重量', '形状', '款式', '尺寸', '编号'], ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光 | 证书', '价格']],
+    titles: [['重量 | 形状 | 款式 | 尺寸', '编号'], ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光 | 证书', '价格']],
     /// 是否空数据
     isEmpty: false,
     /// 我的摘牌
@@ -41,7 +41,7 @@ Page({
     switch (e.target.id) {
       case 'startdate':  /// 开始日期
         this.setData({ 
-          show: true ,
+          show: true,
           isstart: true
         })
         break;
@@ -111,9 +111,9 @@ Page({
             isEmpty: res.data.length === 0,
             /// 显示的值
             values: res.data.map(obj => {
-              return {up: [obj.qty+'ct', 
-                          isnullstr(obj.zsshapetypedisplay), 
-                          '--', 
+              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.zspolishtype1display)+' | '+isnullstr(obj.zssymmetrytype1display)+' | '+isnullstr(obj.zsfluorescencetype1display)+' | '+isnullstr(obj.zscerttypedisplay),

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

@@ -17,7 +17,7 @@
   </view>
 
   <!-- 列头 --> 
-  <view class="title-view">
+  <view class="title-view" wx:if="{{ !show }}">
     <view class="title-view-up">
       <text wx:for="{{ titles[0] }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">{{ itm }}</text>
     </view>
@@ -50,4 +50,4 @@
 <!-- toast --> 
 <van-toast id="van-toast" />
 <!-- 选择日期 -->  
-<van-calendar wx:if="{{ show }}" min-date="{{ minDate }}" bind:close="onClose" bind:confirm="onConfirm" />
+<van-calendar show="{{ show }}" min-date="{{ minDate }}" bind:close="onClose" bind:confirm="onConfirm" />

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

@@ -110,10 +110,6 @@
   .item-view-up {
     border-bottom: 1px solid #ddd;
     padding-bottom: 5px;
-
-    text {
-      width: 25%;
-    }
   }
 
   .item-view-mid {

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

@@ -28,7 +28,7 @@ Page({
             {id: 1, name: '我的出售'}],
 
     /// 列头
-    titles: [['重量', '形状', '款式', '尺寸', '编号'], ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光 | 证书', '价格']],
+    titles: [['重量 ｜ 形状 ｜ 款式 ｜ 尺寸', '编号'], ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光 | 证书', '价格']],
     /// 是否空数据
     isEmpty: false,
     /// 我的摘牌
@@ -68,7 +68,7 @@ Page({
       case 0:  /// 出售挂牌
         this.setData({
           /// 列头  
-          titles: [['重量', '形状', '款式', '尺寸', '编号'], 
+          titles: [['重量 ｜形状 ｜款式 ｜ 尺寸', '编号'], 
                    ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光 | 证书', '价格']],
           width: 100
         })
@@ -76,7 +76,7 @@ Page({
       case 1:  /// 求购挂牌
         this.setData({
           /// 列头  
-          titles: [['形状', '尺寸', '分类'], 
+          titles: [['形状 ｜ 尺寸', '分类'], 
                    ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光', '']],
           width: 100
         })
@@ -84,7 +84,7 @@ Page({
       case 2:  /// 我的摘牌
         this.setData({
           /// 列头  
-          titles: [['重量', '形状', '款式', '尺寸', '编号'], 
+          titles: [['重量 ｜ 形状 ｜ 款式 ｜ 尺寸', '编号'], 
                    ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光 | 证书', '价格']],
           width: 50
         })
@@ -92,7 +92,7 @@ Page({
       case 3:  /// 我的询价
         this.setData({
           /// 列头  
-          titles: [['形状', '尺寸', '分类'], 
+          titles: [['形状 ｜ 尺寸', '分类'], 
                    ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光', ''], 
                    ['买方', '我的钻石']],
           width: 100
@@ -101,7 +101,7 @@ Page({
       default: /// 询价消息
         this.setData({
           /// 列头  
-          titles: [['重量', '形状', '尺寸', '分类'], 
+          titles: [['重量 ｜ 形状 ｜ 尺寸', '分类'], 
                    ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光', '价格'], ['', '卖方 | 联系电话']],
           width: 50
         })
@@ -157,7 +157,7 @@ Page({
             break;
           case 0:  /// 出售挂牌
             wx.navigateTo({
-              url: '/mHome/pages/goodsdetail/index?goodsno='+this.data.sellorders[index].goodsno+'&ordertime='+this.data.sellorders[index].ordertime
+              url: '/mHome/pages/goodsdetail/index?goodsno='+this.data.sellorders[index].goodsno+'&ordertime='+formatDateString(this.data.sellorders[index].ordertime, 'YYYY/MM/DD')
             })
             break;
           default:
@@ -239,10 +239,10 @@ Page({
               isEmpty: res.data.length === 0,
               /// 显示的值
               values: res.data.map(obj => {
-                return {up: [obj.qty+'ct', 
-                            isnullstr(obj.zsshapetypedisplay), 
-                            '--', 
-                            isnullstr(obj.sizedisplay), 
+                return {up: [obj.qty+'ct'+' ｜ '+
+                            isnullstr(obj.zsshapetypedisplay)+' ｜ '+ 
+                            '--'+' ｜ '+ 
+                            isnullstr(obj.sizedisplay)+' ｜ '+ 
                             isnullstr(obj.goodsno)], 
                         mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
                               isnullstr(obj.zsclaritytype1display)+' | '+
@@ -294,7 +294,7 @@ Page({
               isEmpty: res.data.length === 0,
               /// 显示的值
               values: res.data.map(obj => {
-                return {up: [isnullstr(obj.zsshapetypedisplay), 
+                return {up: [isnullstr(obj.zsshapetypedisplay)+' ｜ '+ 
                             isnullstr(obj.zssize),
                             isnullstr(obj.zscategorydisplay)], 
                         mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
@@ -346,9 +346,9 @@ Page({
             isEmpty: res.data.length === 0,
             /// 显示的值
             values: res.data.map(obj => {
-              return {up: [obj.totalqty+'ct', 
-                          isnullstr(obj.zsshapetypedisplay), 
-                          '--',
+              return {up: [obj.totalqty+'ct'+' ｜ '+ 
+                          isnullstr(obj.zsshapetypedisplay)+' ｜ '+ 
+                          '--'+' ｜ '+
                           isnullstr(obj.size1),
                           obj.goodsno], 
                       mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
@@ -403,9 +403,9 @@ Page({
               isEmpty: res.data.length === 0,
               /// 显示的值 
               values: applytype == 0 ? res.data.map(obj => {
-                return {up: [isnullstr(obj.zsshapetypedisplay), 
-                            isnullstr(obj.sizedisplay),
-                            isnullstr(obj.zscategorydisplay)], 
+                return {up: [ isnullstr(obj.zsshapetypedisplay)+' ｜ '+ 
+                              isnullstr(obj.sizedisplay),
+                              isnullstr(obj.zscategorydisplay)], 
                         mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
                               isnullstr(obj.zsclaritytypedisplay)+' | '+
                               isnullstr(obj.zscuttypedisplay)+' | '+
@@ -415,8 +415,8 @@ Page({
                           ''], 
                         dwn: [obj.buyusername, obj.goodsno]}
               }) : res.data.map(obj => {
-                return {up: [obj.applyqty+'ct',
-                            isnullstr(obj.zsshapetypedisplay), 
+                return {up: [obj.applyqty+'ct'+' ｜ '+
+                            isnullstr(obj.zsshapetypedisplay)+' ｜ '+
                             isnullstr(obj.sizedisplay),
                             isnullstr(obj.zscategorydisplay)], 
                         mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+

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

@@ -67,6 +67,7 @@ Page({
         PerformancePlanID: this.data.order.performanceplanid,
         BreachType: this.data.order.buyaccountid === accountid() ? 2 : 1,
         ApplyRemark: this.data.remark,
+        Attachment: this.data.filePath,
         Applicant: userid(),
         Header: protoHeader(FunCode.PerformanceContractedApplyReq)
       })

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

@@ -150,18 +150,23 @@
       background-color: #fff;
       color: #666;
       text-align: center;
+      display: flex;
+      flex-direction: row;
+      justify-content: center;
+      align-items: center;
     }
   }
 
   .button-view {
     border-radius: 10px;
-    width: 95%;
+    width: 90%;
     padding-top: 15px;
     display: flex;
     flex-direction: row;
     align-content: center;
     align-items: center;
     justify-content: space-between;
+    padding: 10px 20px;
 
     van-button {
       width: 48%;

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

@@ -25,7 +25,7 @@ Page({
     /// 延期备注
     remark: '',
     /// 延期天数
-    delaydays: 0,
+    delaydays: '',
     /// 是否显示延期申请
     showDelay: false,
     /// 是否显示立即执行
@@ -60,7 +60,7 @@ Page({
       /// 参数信息
       const info = JSON.stringify({
         PerformancePlanStepID: this.data.order.curstepid,
-        delaydays: this.data.delaydays,
+        delaydays: Number(this.data.delaydays),
         applyremark: this.data.remark,
         applicant: userid(),
         Header: protoHeader(FunCode.PerformanceDelayApplyReq)
@@ -160,7 +160,7 @@ Page({
   },
 
   check(isDelay: boolean): boolean {
-    if (this.data.delaydays === 0 && isDelay) {
+    if ( (Number(this.data.delaydays) === 0 || this.data.delaydays === ' ') && isDelay) {
       showToast('请输入延期天数！')
       return false
     }
@@ -219,12 +219,47 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options: any) {
-    const obj: GuangZuan.MyPerformanc = JSON.parse(options.id ?? '')
+    /// 数据处理
+    var obj: GuangZuan.MyPerformanc = JSON.parse(options.id ?? '')
+  
     if (obj) {
+      var buyer = ''
+      var seller = ''
+      /// 买方信息
+      if (obj.buyerinfo != '') {
+        const { ContactInfo, ReceiptInfo, ReceiveInfo } = JSON.parse(obj.buyerinfo)
+        if ( ContactInfo != '' ) {
+          buyer += '联络信息：'+ContactInfo
+        }
+        if ( ReceiveInfo != '' ) {
+          buyer += +' '+'收货地址：'+ReceiveInfo
+        }
+        if ( ReceiptInfo != '' ) {
+          buyer += +' '+'发票信息：'+ReceiptInfo
+        }
+      }
+      
+      /// 卖方信息
+      if (obj.sellerinfo != '') {
+        const { ContactInfo, ReceiptInfo, ReceiveInfo } = JSON.parse(obj.sellerinfo)
+        if ( ContactInfo != '' ) {
+          seller += '联络信息：'+ContactInfo
+        }
+        if ( ReceiveInfo != '' ) {
+          seller += +' '+'收货地址：'+ReceiveInfo
+        }
+        if ( ReceiptInfo != '' ) {
+          seller += +' '+'发票信息：'+ReceiptInfo
+        }
+      }
+      obj.sellerinfo = isnullstr(seller.replace('\n', ' '))
+      obj.buyerinfo = isnullstr(buyer.replace('\n', ' '))
+
       this.setData({
         order: obj,
-        values: [{up: [`${isnullstr(obj.warehousenamedisplay)} | ${isnullstr(obj.zsshapetypedisplay)} | ${isnullstr(obj.zsstyletypedisplay)} | ${isnullstr(obj.sizedisplay)}`, `${isnullstr(obj.goodsno)}`], 
-                  dwn: [`${isnullstr(obj.zscolortype1display)}~${isnullstr(obj.zscolortype2display)} | ${isnullstr(obj.zscuttype1display)}~${isnullstr(obj.zscuttype2display)} | ${isnullstr(obj.zssymmetrytype1display)}~${isnullstr(obj.zssymmetrytype2display)} | ${isnullstr(obj.zspolishtype1display)}~${isnullstr(obj.zspolishtype2display)} | ${isnullstr(obj.zsfluorescencetype1display)}~${isnullstr(obj.zsfluorescencetype2display)} | ${isnullstr(obj.zscerttypedisplay)}`, obj.price.toFixed(2)]}],
+        values: [{up: [`${isnullstr(obj.weight.toFixed(2))} | ${isnullstr(obj.zsshapetypedisplay)} | ${isnullstr(obj.zsstyletypedisplay)} | ${isnullstr(obj.sizedisplay)}`, `${isnullstr(obj.goodsno)}`], 
+                  dwn: [`${isnullstr(obj.zscolortype1display)} | ${isnullstr(obj.zscuttype1display)}| ${isnullstr(obj.zssymmetrytype1display)} | ${isnullstr(obj.zspolishtype1display)}| ${isnullstr(obj.zsfluorescencetype1display)} | ${isnullstr(obj.zscerttypedisplay)}`, 
+                  obj.price.toFixed(2)]}],
         status: getPerformancestatus(obj.performancestatus),
         step: getSteptype(obj.steptypeid)
       })

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

@@ -43,7 +43,7 @@
   <view class="perform-detail-info">
     <view class="item">
       <text>履约货款：{{ order.amount }}</text>
-      <text>履约状态：{{ order.performancestatus }}</text>
+      <text>履约状态：{{ status }}</text>
     </view>
     <view class="item">
       <text>买方已付：{{ order.buypaidamount }}</text>
@@ -86,13 +86,13 @@
 </view>
 
 <!-- 是否申请延期 -->
-<van-dialog use-slot title="是否申请延期？" show="{{ showDelay }}" show-cancel-button  bind:close="onClose" bind:getuserinfo="doDelay">
+<van-dialog use-slot title="是否申请延期？" show="{{ showDelay }}" show-cancel-button  bind:close="onClose" bind:confirm	="doDelay">
   <van-field label="天数：" model:value="{{ delaydays }}" placeholder="请输入申请延期天数" type="number" adjust-position />
   <van-field label="备注：" model:value="{{ remark }}" adjust-position autosize placeholder="请输入备注信息" />
 </van-dialog>
 
-<!-- 是否申请延期 -->
-<van-dialog use-slot title="是否手动执行当前步骤？" show="{{ showExculate }}" show-cancel-button  bind:close="onClose" bind:getuserinfo="doExculpate">
+<!-- 是否手动执行 -->
+<van-dialog use-slot title="是否手动执行当前步骤？" show="{{ showExculate }}" show-cancel-button  bind:close="onClose" bind:confirm	="doExculpate">
   <van-field label="备注：" model:value="{{ remark }}" adjust-position autosize placeholder="请输入备注信息" />
 </van-dialog>
 

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

@@ -9,6 +9,8 @@ Page({
    * 页面的初始数据
    */
   data: {
+    /// 底部安全区域
+    safeBottom: getApp().globalData.safeBottom,
     /// tab激活索引
     active: Number(0),
     /// tabs
@@ -134,7 +136,6 @@ Page({
     }
   },
 
-
   /**
    * 返回上层视图
    */
@@ -149,24 +150,20 @@ Page({
   onLoad(options: any) {
     if (options.active) {
       this.setData({ active: Number(options.active) })
-      this.queryMyPerformanc(options.active)
-    } else {
-      /// 查询我的买履约
-      this.queryMyPerformanc(0)
     }
   },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady() {
-
-  },
+  onReady() {},
 
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow() {},
+  onShow() {
+    this.queryMyPerformanc(this.data.active)
+  },
 
   /**
    * 生命周期函数--监听页面隐藏

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

@@ -7,7 +7,7 @@
 
   <!-- tabs -->
   <view class="tab-view">
-    <van-tabs active="{{ active }}" sticky animated bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#407DB8">
+    <van-tabs active="{{ active }}" sticky animated bind:click="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>
@@ -27,7 +27,7 @@
 </view>
 
 <!-- 内容滚动视图 --> 
-<scroll-view class="content-view">
+<scroll-view class="content-view" style="padding-bottom: {{ safeBottom }}px;">
   <!-- 数据 --> 
   <van-swipe-cell wx:for="{{ values }}" wx:for-item="itm" wx:for-index="idx" id="{{ idx }}" wx:key="idx" right-width="{{ 150 }}" bind:click="onSelectItem">
     <view class="item-view {{ values[idx].isChecked ? 'active' : '' }}">

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

@@ -22,7 +22,7 @@
     width: 95%;
 
     text {
-      width: 80px;
+      width: 100px;
       color: #333;
       font-size: 14px;
     }

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

@@ -82,12 +82,12 @@ Page({
       return false
     }
 
-    if (this.data.address === '') {
+    if (this.data.address === '' && this.data.order.buyorsell === 0) {
       showToast('请选择收货地址信息！')
       return false
     }
 
-    if (this.data.invoice === '') {
+    if (this.data.invoice === '' && this.data.order.buyorsell === 0) {
       showToast('请选择发票信息！')
       return false
     }
@@ -99,11 +99,19 @@ Page({
    */
   onLoad(options: any) {
     /// 数据解析
-    const myPerformanc: GuangZuan.MyPerformanc = JSON.parse(options.id ?? '')
-    if (myPerformanc) {
-      this.setData({
-        order: myPerformanc
-      })
+    const obj: GuangZuan.MyPerformanc = JSON.parse(options.id ?? '')
+    if (obj) {
+      const infos = JSON.parse(obj.buyorsell === 0 ? obj.buyerinfo : obj.sellerinfo)
+      /// 买方信息
+      if (infos) {
+        const { ContactInfo, ReceiptInfo, ReceiveInfo } = infos
+        this.setData({
+          contract: ContactInfo,
+          address: ReceiveInfo,
+          invoice: ReceiptInfo
+        })
+      }
+      this.setData({ order: obj })
     }
   },
 

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

@@ -13,13 +13,13 @@
     <view style="width: 20px;"/>
   </view>
 
-  <view class="address-info">
+  <view class="address-info" wx:if="{{ order.buyorsell === 0 }}">
     <text>收货地址：</text>
     <textarea class="text-area" model:value="{{ address }}" placeholder="请输入收货地址"></textarea>
     <van-icon id="address" name="plus" size="20" />
   </view>
 
-  <view class="invoice-info">
+  <view class="invoice-info" wx:if="{{ order.buyorsell === 0 }}">
     <text>发票信息：</text>
     <textarea class="text-area" model:value="{{ invoice }}" placeholder="请输入发票信息"></textarea>
     <van-icon id="invoice" name="plus" size="20" />

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

@@ -100,6 +100,10 @@
       .title-view-up {
         border-bottom: 1px solid #ddd;
         padding-bottom: 5px;
+
+        text {
+          width: 25%;
+        }
       }
   
       .title-view-mid {

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

@@ -89,7 +89,13 @@ Page({
    */
   onTabChange(e: any) {
     /// 设置激活项
-    this.setData({ active: e.detail.index })
+    this.setData({ 
+      active: e.detail.index,
+      /// 设置列头
+      titles: this.data.tabs[e.detail.index].id === 2 ? [['重量', '形状', '尺寸', '编号'], 
+      ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光 | 证书', '价格']] : [['重量', '形状', '尺寸', '编号'], 
+      ['颜色 | 净度 | 抛光 | 对称 | 荧光 | 证书', '价格']],
+    })
     /// 查询单据信息
     this.queryMySellOrder()
   },
@@ -143,11 +149,11 @@ Page({
               active: 0,
               /// 显示的值
               values: res.data.map(obj => {
-                return { up: [obj.totalqty+'ct', 
+                return this.data.tabs[this.data.active].id === 2 ? { up: [obj.totalqty+'ct', 
                             isnullstr(obj.zsshapetypedisplay), 
                             isnullstr(obj.sizedisplay),
                             obj.goodsno], 
-                          dwn: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
+                          dwn: [isnullstr(obj.zscolortype1display)+' | '+
                               isnullstr(obj.zsclaritytype1display)+' | '+
                               isnullstr(obj.zscuttype1display)+' | '+
                               isnullstr(obj.zspolishtype1display)+' | '+
@@ -155,7 +161,18 @@ Page({
                               isnullstr(obj.zsfluorescencetype1display)+' | '+
                               isnullstr(obj.zscerttypedisplay),
                             obj.zscurrencytypedisplayunit+obj.price.toFixed(2)], 
-                          isChecked: false}
+                          isChecked: false } : { up: [obj.totalqty+'ct', 
+                          isnullstr(obj.zsshapetypedisplay), 
+                          isnullstr(obj.sizedisplay),
+                          obj.goodsno], 
+                        dwn: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
+                            isnullstr(obj.zsclaritytype1display)+' | '+
+                            isnullstr(obj.zspolishtype1display)+' | '+
+                            isnullstr(obj.zssymmetrytype1display)+' | '+
+                            isnullstr(obj.zsfluorescencetype1display)+' | '+
+                            isnullstr(obj.zscerttypedisplay),
+                          obj.zscurrencytypedisplayunit+obj.price.toFixed(2)], 
+                        isChecked: false }
               })
             })
           })

GuangZuan/miniprogram/pages/circle/index.wxml

@@ -41,11 +41,11 @@
       <view class="item detail" id="detail {{ idx }}" style="background-color: #407DB8; color: white;" bindtap="onCancelFavorite">取消</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="无数据"/>
+
 <!--  底部视图  -->
 <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>

GuangZuan/miniprogram/pages/trade/index.ts

@@ -1,11 +1,11 @@
 import { queryBuyOrder, queryDiamond } from "../../services/api/orders/index"
-import { clientType, isEncrypted, marketid, protoHeader, userid, timetample, getEnumList, getErrorMsg, isMyFavorite } from "../../services/utils";
+import { clientType, isEncrypted, marketid, protoHeader, userid, timetample, getEnumList, getErrorMsg, isMyFavorite, accountid } from "../../services/utils";
 import { FunCode } from "../../constants/enum/funcode";
 import { sendMsgToMQ } from "../../services/api/common/index";
 import { hideLoading, showLoading } from "../../utils/message/index";
 import { encryptBody } from "../../utils/websocket/crypto";
 import { appConfig } from "../../config/index";
-import { isnullstr } from "../../utils/util";
+import { formatDateString, isnullstr } from "../../utils/util";
 
 Page({
 
@@ -54,7 +54,9 @@ Page({
     /// 商品(查询字段-模糊查询)
     zsallproperties: '',
     /// 数据缓存
-    storge: {}
+    storge: {},
+    /// 当前资金账号
+    accountid: accountid()
   },
 
   /**
@@ -95,7 +97,7 @@ Page({
         break
       case 'detail':      /// 商品详情
         wx.navigateTo({ 
-          url: this.data.active === 0 ? '/mHome/pages/goodsdetail/index?goodsno='+this.data.sellOrders[index].goodsno+'&ordertime='+this.data.sellOrders[index].ordertime : ('/mTrade/pages/orderdetail/index?item='+JSON.stringify(this.data.askOrders[index]))
+          url: this.data.active === 0 ? '/mHome/pages/goodsdetail/index?goodsno='+this.data.sellOrders[index].goodsno+'&ordertime='+formatDateString(this.data.sellOrders[index].ordertime, 'YYYY/MM/DD') : ('/mTrade/pages/orderdetail/index?item='+JSON.stringify(this.data.askOrders[index]))
         })
         break;
       case 'delisting':     /// 摘牌

GuangZuan/miniprogram/pages/trade/index.wxml

@@ -57,11 +57,11 @@
           <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">
+        <view class="vanSwipeCell-item__mid__right" wx:if="{{ itm.accountid != accountid }}" id="favorite {{ idx }}" wx:if="{{ active === 0 }}" bindtap="onButtonPressed">
           <van-icon name="star" id="favorite {{ idx }}" color="#407DB8" bind:click="onButtonPressed" />
           <text id="favorite {{ idx }}" bindtap="onButtonPressed">{{ itm.favorite ? '已收藏' : '去收藏' }}</text>
         </view>
-        <view class="vanSwipeCell-item__mid__right" id="delisting {{ idx }}" wx:if="{{ active === 1 }}" bindtap="onButtonPressed">
+        <view class="vanSwipeCell-item__mid__right" wx:if="{{ itm.accountid != accountid }}" id="delisting {{ idx }}" wx:if="{{ active === 1 }}" bindtap="onButtonPressed">
           <van-icon id="delisting {{ idx }}" name="fire-o" color="#407DB8" bind:click="onButtonPressed" />
           <text id="delisting {{ idx }}" bindtap="onButtonPressed">去摘牌</text>
         </view>
@@ -76,10 +76,9 @@
       <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>
 
 <!-- toast --> 
 <van-toast id="van-toast" />
+<!-- 无数据 --> 
+<van-empty wx:if="{{ isEmpty }}" class="custom-image" description="无数据"/>

GuangZuan/project.config.json

@@ -43,7 +43,8 @@
       "outputPath": ""
     },
     "disableUseStrict": false,
-    "minifyWXML": true
+    "minifyWXML": true,
+    "condition": false
   },
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},