xxxxx

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

@@ -214,8 +214,10 @@ Page({
     /// 获取商品数据
     this.getGoods()
     /// 单据信息
-    const item = JSON.parse(options.item)
-    if (item) { this.setData({ order: item }) }
+    if (options.item) {
+      const item = JSON.parse(options.item)
+      if (item) { this.setData({ order: item }) }
+    }
   },
 
   /**

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

@@ -39,7 +39,7 @@
       </view>
       <view class="content__item" wx:if="{{ goods.zscategory !== 4 }}">
         <text class="content__item__price">市场价：{{ unit+goods.marketprice }}</text>
-        <text class="content__item__price">挂牌时间：{{ ordertime }}</text>
+        <text class="content__item__price" wx:if="{{ ordertime != '-' }}">挂牌时间：{{ ordertime }}</text>
       </view>
   </view>
 
@@ -82,28 +82,33 @@
     </view>
     <view class="attribute-info__item">
       <text class="title">颜色：</text>
-      <text class="value" wx:if="{{ goods.zscategory === 4 }}">{{ goods.zscolortype1display }}</text>
-      <text class="value" wx:if="{{ goods.zscategory != 4 }}">{{ goods.zscolortype1display }}~{{goods.zscolortype2display}}</text>
+      <text class="value" wx:if="{{ goods.zscolortype2 === 0 }}">{{ goods.zscolortype1display }}</text>
+      <text class="value" wx:if="{{ goods.zscolortype2 != 0 }}">{{ goods.zscolortype1display }}~{{goods.zscolortype2display}}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">净度：</text>
-      <text class="value" wx:if="{{ goods.zscategory === 4 }}">{{ goods.zsclaritytype1display }}</text>
-      <text class="value" wx:if="{{ goods.zscategory != 4 }}">{{ goods.zsclaritytype1display }}~{{goods.zsclaritytype2display}}</text>
+      <text class="value" wx:if="{{ goods.zsclaritytype2 === 0 }}">{{ goods.zsclaritytype1display }}</text>
+      <text class="value" wx:if="{{ goods.zsclaritytype2 != 0 }}">{{ goods.zsclaritytype1display }}~{{goods.zsclaritytype2display}}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">切工：</text>
-      <text class="value" wx:if="{{ goods.zscategory === 4 }}">{{ goods.zscuttype1display }}</text>
-      <text class="value" wx:if="{{ goods.zscategory != 4 }}">{{ goods.zscuttype1display }}~{{goods.zscuttype2display}}</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>
     </view>
     <view class="attribute-info__item">
       <text class="title">抛光：</text>
-      <text class="value" wx:if="{{ goods.zscategory === 4 }}">{{ goods.zspolishtype1display }}</text>
-      <text class="value" wx:if="{{ goods.zscategory != 4 }}">{{ goods.zspolishtype1display }}~{{goods.zspolishtype2display}}</text>
+      <text class="value" wx:if="{{ goods.zspolishtype2 === 0 }}">{{ goods.zspolishtype1display }}</text>
+      <text class="value" wx:if="{{ goods.zspolishtype2 != 0 }}">{{ goods.zspolishtype1display }}~{{goods.zspolishtype2display}}</text>
+    </view>
+    <view class="attribute-info__item">
+      <text class="title">对称：</text>
+      <text class="value" wx:if="{{ goods.zssymmetrytype2 === 0 }}">{{ goods.zssymmetrytype1display }}</text>
+      <text class="value" wx:if="{{ goods.zssymmetrytype2 != 0 }}">{{ goods.zssymmetrytype1display }}~{{goods.zssymmetrytype2display}}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">荧光：</text>
-      <text class="value" wx:if="{{ goods.zscategory === 4 }}">{{ goods.zsfluorescencetype1display }}</text>
-      <text class="value" wx:if="{{ goods.zscategory != 4 }}">{{ goods.zsfluorescencetype1display }}~{{goods.zsfluorescencetype2display}}</text>
+      <text class="value" wx:if="{{ goods.zsfluorescencetype2 === 0 }}">{{ goods.zsfluorescencetype1display }}</text>
+      <text class="value" wx:if="{{ goods.zsfluorescencetype2 != 0 }}">{{ goods.zsfluorescencetype1display }}~{{goods.zsfluorescencetype2display}}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">尺寸：</text>

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

@@ -45,10 +45,9 @@ Page({
     switch (id) {
       case 'detail':     /// 详情
         wx.navigateTo({
-          url: "/mHome/pages/goodsdetail/index?goodsno="+this.data.datas[index].goodsno
+          url: "/mHome/pages/goodsdetail/index?goodsno="+this.data.datas[index].goodsno+'&'+'ordertime'+'='+'-'
         })
         break;
-    
       default:
         break;
     }
@@ -103,15 +102,17 @@ Page({
             return
           }
           hideLoading(()=>{
+            const zscategory = this.data.tabs[this.data.active].id
             /// 设置数据
             this.setData({
               /// 数据信息
               datas: res.data,
               isEmpty: res.data.length === 0,
               /// 显示的值
-              values: this.data.active != 2 ? res.data.map(obj => {
+              values: zscategory != 5 ? res.data.map(obj => {
                 return {  up: [obj.weight+'ct', 
                             isnullstr(obj.zsshapetypedisplay), 
+                            zscategory === 4 ? isnullstr(obj.zsshapetypedisplay) : '',
                             isnullstr(obj.sizedisplay), 
                             isnullstr(obj.goodsno)], 
                           dwn: [isnullstr(obj.zscolortype1display)+' | '+
@@ -125,12 +126,10 @@ Page({
               }) : res.data.map(obj => {
                 return {  up: [obj.weight+'ct', 
                             isnullstr(obj.zsshapetypedisplay), 
-                            isnullstr(obj.zsstyletypedisplay), 
                             isnullstr(obj.sizedisplay), 
                             isnullstr(obj.goodsno)], 
                           dwn: [isnullstr(obj.zscolortype1display)+' | '+
                               isnullstr(obj.zsclaritytype1display)+' | '+
-                              isnullstr(obj.zscuttype1display)+' | '+
                               isnullstr(obj.zspolishtype1display)+' | '+
                               isnullstr(obj.zssymmetrytype1display)+' | '+
                               isnullstr(obj.zsfluorescencetype1display)+' | '+

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

@@ -18,7 +18,7 @@ Page({
     /// 当前页签
     page: 1,
     /// 列头
-    titles: [['价格 | 已付金额 | 剩余冻结金额', '当前步骤 | 剩余天数'], 
+    titles: [['履约金额 | 已付金额 | 剩余冻结金额', '当前步骤 | 剩余天数'], 
              ['形状 | 颜色 | 重量 | 对手方', '状态']],
     /// 查询数据
     datas: <GuangZuan.MyPerformanc[]>[],
@@ -52,13 +52,13 @@ Page({
               isEmpty: res.data.length === 0,
               /// 显示的值
               values: res.data.map(obj => {
-                return {up: [obj.zscurrencytypedisplayunit+obj.price.toFixed(2)+' | '+ 
+                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.buyerfreezeamount : obj.sellerfreezeamount).toFixed(2), 
+                            obj.zscurrencytypedisplayunit+(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)+' | '+
                               isnullstr(obj.accountname),
                             getPerformancestatus(obj.performancestatus)], isChecked: false}
               })

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

@@ -28,8 +28,8 @@
     <text class="title">履约方式</text>
     <view class="content prestyle">
       <view class="plantmp" id="plantmp" bindtap="showPlanTmps">{{ tmp.templatename }}</view>
-      <view class="content__item__step">
-        <view class="content__item__step__item" wx:for="{{ tmp.LstStep }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx"> 
+      <view class="content__item__step" id="plantmp" bindtap="showPlanTmps">
+        <view class="content__item__step__item" wx:for="{{ tmp.LstStep }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx" id="plantmp" bindtap="showPlanTmps"> 
           <text style="background-color: {{ tcolors[idx] }}; color: white;">{{ itm.stepinfo }}</text>
           <text>{{ itm.stepdate }}</text>
         </view>

GuangZuan/miniprogram/pages/home/index.less

@@ -17,7 +17,6 @@
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
-    padding: 20px 10px;
     align-content: center;
     width: 95%;
   }

GuangZuan/miniprogram/pages/home/index.wxml

@@ -7,8 +7,8 @@
 <scroll-view style="padding-bottom: 80px; background-color: #f0f0f0;" scroll-y>
   <!-- banner视图 -->
   <view class="banner-bg" style="background-image: url('{{ imgUrl }}home_banner_bg.png'); background-size: 100% 100%;">
-    <view class="banner-bg__top" style="padding: 5px 0px;">
-      <image style="width: 40%;" mode="widthFix" src="{{ imgUrl+'home_logo.png'}}">logo</image>
+    <view class="banner-bg__top" style="padding: 10px 0px;">
+      <image style="width: 50%;" mode="widthFix" src="{{ imgUrl+'home_logo.png'}}">logo</image>
     </view>
     <!-- banner轮播图 -->
     <swiper class="banner" wx:if="{{ banners.count != 0 }}" indicator-active-color="orange" indicator-dots autoplay interval="5000" circular>

GuangZuan/miniprogram/pages/mine/index.ts

@@ -40,7 +40,13 @@ Page({
     /// 状态栏高度
     statusBarHeight: getApp().globalData.statusBarHeight,
     /// 导航栏高度
-    navHeight: getApp().globalData.navHeight
+    navHeight: getApp().globalData.navHeight,
+    /// 余额
+    balance: '0.00',
+    /// 冻结
+    freezemargin: '0.00',
+    /// 可用
+    currentbalance: '0.00',
   },
 
   onEye() {
@@ -67,7 +73,7 @@ Page({
       case 'into-gold':  /// 充值
         wx.navigateTo({ url: '/mMine/pages/inoutgold/index?id=0' })
         break;
-      default:   /// 提现
+      default:           /// 提现
         wx.navigateTo({ url: '/mMine/pages/inoutgold/index?id=1' })
         break;
     }
@@ -89,8 +95,15 @@ Page({
     this.setData({
       /// 设置账户信息
       ta: taAccount(accountid()),
+      balance: taAccount(accountid()).balance.toFixed(2),
       nickName: loginQuery().userInfo.customername 
     })
+    /// 冻结金额
+    const { orifreezecharge, oriotherfreezemargin, balance } = this.data.ta
+    this.setData({ 
+      freezemargin: (orifreezecharge+oriotherfreezemargin).toFixed(2),
+      currentbalance: (balance-orifreezecharge-oriotherfreezemargin).toFixed(2)
+    })
     /// 查询签约信息
     this.queryBankAccountSign()
   },

GuangZuan/miniprogram/pages/mine/index.wxml

@@ -20,15 +20,15 @@
     <view class="taaccount-info">
       <view class="item">
         <text>余额</text>
-        <text>{{ isOpenEye ? ta.balance : '******'}}</text>
+        <text>{{ isOpenEye ? balance : '******'}}</text>
       </view>
       <view class="item">
         <text>冻结</text>
-        <text>{{ isOpenEye ? ta.freezemargin : '******' }}</text>
+        <text>{{ isOpenEye ? freezemargin : '******' }}</text>
       </view>
       <view class="item">
         <text>可用</text>
-        <text>{{ isOpenEye ? ta.currentbalance : '******' }}</text>
+        <text>{{ isOpenEye ? currentbalance : '******' }}</text>
       </view>
     </view>
     <!-- 出金 入金 -->

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

@@ -1011,6 +1011,8 @@ declare namespace GuangZuan {
     isChecked: boolean
     /// 
     warehousenamedisplay: string
+    /// 重量
+    weight: number
     /// 
     zscategorydisplay: string
     ///