xxxxx

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

@@ -72,7 +72,7 @@
       font-size: 13px;
       /*超出隐藏*/
       overflow: hidden;
-        /*溢出不换行*/
+      /*溢出不换行*/
       white-space: nowrap;
       /*溢出显示用省略号*/
       text-overflow: ellipsis;

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

@@ -1,5 +1,7 @@
 {
-  "usingComponents": {},
+  "usingComponents": {
+    "van-popup": "@vant/weapp/popup/index"
+  },
   "navigationBarTitleText": "商品详情",
   "enablePullDownRefresh": false
 }

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

@@ -168,8 +168,7 @@
     }
   }
 
-  .button-view {
-    border-radius: 10px;
+  .operator-view {
     width: 95%;
     padding-top: 15px;
     display: flex;
@@ -178,8 +177,55 @@
     align-items: center;
     justify-content: space-between;
 
-    van-button {
+    .button-view {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
       width: 90%;
+
+      van-button {
+        width: 48%;
+      }
+    }
+  }
+}
+
+.popup-view {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  align-content: center;
+
+  .title {
+    font-size: 18px;
+    font-weight: bold;
+    color: #333;
+    text-align: center;
+    padding: 15px 0px;
+  }
+
+  .message {
+    font-size: 13px;
+    color: #333;
+    text-align: center;
+    padding-bottom: 15px;
+  }
+
+  van-field {
+    width: 90%;
+  }
+
+  .button-view {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    align-content: center;
+    padding-top: 15px;
+    width: 90%;
+
+    van-button {
+      width: 45%;
     }
   }
 }

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

@@ -6,7 +6,7 @@ import { getGoods, queryPermancePlanTmp } from "../../../services/api/orders/ind
 import { accountid, clientType, getErrorMsg, isEncrypted, loginid, protoHeader, timetample, userid, loginQuery, isMyFavorite, marketID, removeMyFavorite, addMyFavotite } from "../../../services/utils"
 import { hideLoading, showLoading, showModel, showToast } from "../../../utils/message/index"
 import { encryptBody } from "../../../utils/websocket/crypto"
-import { formatDateString, isnullstr } from "../../../utils/util"
+import { formatDateString, getDecimalNum, isnullstr } from "../../../utils/util"
 
 Page({
 
@@ -41,7 +41,13 @@ Page({
     /// 资金账号信息
     accountid: accountid(),
     /// 是否显示交易
-    showTrade: Number(1)
+    showTrade: Number(1),
+    /// 是否显示弹出层
+    show: false,
+    /// 询价价格
+    orderPrice: '',
+    /// 备注信息
+    remark: ''
   },
 
   /**
@@ -52,6 +58,30 @@ Page({
     wx.navigateBack()
   },
 
+  onClose() {
+    if (!this.data.show) {
+      return
+    }
+    /// 关闭弹出层
+    this.setData({ show: false })
+  },
+
+  /// 显示弹出层
+  showPopup() {
+    if (this.data.show) {
+      return
+    }
+    /// 关闭弹出层
+    this.setData({ show: true })
+  },
+
+  // input输入中
+  getInputNum (e: any) {
+    /// 截取2位小数位
+    let num = getDecimalNum(e.detail)
+    this.setData({ orderPrice: num})
+  },
+
   /**
    * 获取商品数据信息
    */
@@ -164,7 +194,62 @@ Page({
           }
         })
       }, '请求中......')
-    }, '提示', '确定要购买吗？', true)
+    }, '提示', '确定要购买吗？', true )
+  },
+
+  /// 询价申请
+  doBargainApply() {
+    /// showLoding....
+    showLoading(() => {
+      /// 构建参数信息
+      const info = JSON.stringify({
+        Header: protoHeader(FunCode.ZSBuyOrderDestingNegPriceReq, marketID(67)),
+        UserID: userid(),
+        AccountID: accountid(),
+        RelatedOrderID: this.data.order.wrtradeorderid ? this.data.order.wrtradeorderid : this.data.goods.wrtradeorderid,
+        OrderQty: this.data.order.remainqty ? this.data.order.remainqty: this.data.goods.remainqty,
+        ApplyPrice: Number(this.data.orderPrice),
+        ApplyRemark: this.data.remark,
+        OrderSrc: EOrderSrc.ORDERSRC_CLIENT,
+        ClientSerialNo: timetample().toString(),
+        ClientType: clientType(),
+        OperatorID: loginid(),
+        MarketID: marketID(67),
+        ClientOrderTime: formatDateString(new Date().toString())
+      })
+
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          data: encryptBody(info),
+          funCodeReq: FunCode.ZSBuyOrderDestingNegPriceReq,
+          funCodeRsp: FunCode.ZSBuyOrderDestingNegPriceRsp,
+          isEncrypted: isEncrypted(),
+        },
+        success: (res) => {
+          /// 请求失败
+          if (res.code ! = 0) {
+            hideLoading(() => {}, res.msg)
+            return
+          }
+          /// 解析对象
+          const data = JSON.parse(res.data.data)
+          if (data.RetCode != 0) {
+            hideLoading(() => {}, getErrorMsg(data.RetCode))
+            return
+          }
+          /// 请求成功
+          hideLoading(() => {
+            wx.navigateBack()
+          }, '购买请求成功')
+        },
+        fail: (emsg) => {
+          hideLoading(() => {
+            showToast('购买操作请求失败，原因:'+emsg)
+          })
+        }
+      })
+    }, '请求中......')
   },
 
   /**

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

@@ -134,12 +134,28 @@
   </view>
 
    <!-- 按钮 -->
-   <view class="button-view" wx:if="{{ showTrade === 1 }}">
+   <view class="operator-view" wx:if="{{ showTrade === 1 }}">
     <van-icon name="{{ operator === 1 ? 'star' : 'star-o' }}" color="#407DB8" size="25" bind:click="onFavoriteOperator"/>
-    <van-button custom-class="excute" id="excute" round color="linear-gradient(to right, #4bb0ff, #F7A657)" block bind:click="doZSBuyOrderDesting">立即购买</van-button>
+    <view class="button-view">
+      <van-button custom-class="bargain" id="bargain" round color="#E6A23B" block bind:click="showPopup">询价申请</van-button>
+    <van-button custom-class="excute" id="excute" round color="#3176AF" block bind:click="doZSBuyOrderDesting">立即购买</van-button>
+    </view>
   </view>
 </view>
 
+<van-popup show="{{ show }}" round position="bottom" custom-style="height: 30%;" bind:close="onClose">
+  <view class="popup-view"> 
+    <text class="title">询价申请</text>
+    <text class="message">确认要询价申请吗？</text>
+    <van-field label="价格：" model:value="{{ orderPrice }}" placeholder="请输入询价价格" type="digit" required clearable border="{{ false }}" bind:input="getInputNum" ></van-field>
+    <van-field label="备注：" model:value="{{ remark }}" placeholder="请输入备注信息" type="textarea"  required clearable border="{{ false }}" ></van-field>
+    <view class="button-view" style="padding-bottom: {{ safeBottom }}px;">
+      <van-button bind:click="onClose" color="#999" round block>取消</van-button>
+      <van-button bind:click="doBargainApply" color="#407DB8" round block>确定</van-button>
+    </view>
+  </view>
+</van-popup>
+
 <!-- toast --> 
 <van-toast id="van-toast" />
 <!-- 对话弹框  -->

GuangZuan/miniprogram/mHome/pages/msg/msglist/index.less

@@ -4,13 +4,30 @@
   justify-content: space-between;
 
   .msg_title {
-    font-size: 28rpx;
+    font-size: 16px;
+    font-weight: bolder;
     color: #333333;
+    /// 溢出部分隐藏
+    overflow: hidden;
+    /// 文本移除后 使用...替换
+    text-overflow: ellipsis;
+    /*值为数字，表示一共显示几行*/
+    -webkit-line-clamp: 2;
+    /* 设置或检索伸缩盒对象的子元素的排列方式 */
+    max-height: 50px;
+    /* 设置或检索伸缩盒对象的子元素的排列方式 */
+    display: -webkit-box;
+    /* 设置或检索伸缩盒对象的子元素的排列方式 */
+    -webkit-box-orient: vertical;
+    text-align: left;
   }
+}
 
+.time {
   .msg_date {
-    font-size: 22rpx;
+    font-size: 11px;
     color: #999999;
+    width: 100px;
   }
 }
 
@@ -23,7 +40,7 @@
   overflow: hidden;
   /// 文本移除后 使用...替换
   text-overflow: ellipsis;
-  -webkit-line-clamp: 2;
+  -webkit-line-clamp: 3;
   /* 设置或检索伸缩盒对象的子元素的排列方式 */
   max-height: 50px;
   /* 设置或检索伸缩盒对象的子元素的排列方式 */
@@ -32,6 +49,7 @@
   -webkit-box-orient: vertical;
   font-size: 14px;
   color: #333;
+  margin: 5px 0px;
 }
 
 .loding {

GuangZuan/miniprogram/mHome/pages/msg/msglist/index.ts

@@ -15,6 +15,8 @@ Page({
     tabs: [{id: 1, title: '公告'}, {id: 2, title: '消息'}],
     /// 是否空数据
     isEmpty: false,
+    /// 激活xiang
+    active: 0
   },
 
   /// 进入公告消息详情页
@@ -35,7 +37,8 @@ Page({
 
   /// onChange
   onChange(e: any) {
-    this.queryNotice(e.detail.index+1)
+    this.setData({ active: e.detail.index })
+    this.queryNotice(this.data.active+1)
   },
 
   /// 查询公告消息信息
@@ -59,7 +62,7 @@ Page({
             this.setData({ 
               msgs: res.data.map(itm => {
                 var obj = itm
-                obj.scheduletime = formatDateString(itm.scheduletime)
+                obj.scheduletime = formatDateString(itm.scheduletime, 'YYYY/MM/DD HH:mm:ss')
                 return obj
               }),
               isEmpty: res.data.length === 0
@@ -117,7 +120,8 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh() {
-
+    /// 查询公告消息
+    this.queryNotice(this.data.active+1)
   },
 
   /**

GuangZuan/miniprogram/mHome/pages/msg/msglist/index.wxml

@@ -5,7 +5,7 @@
 </van-nav-bar>
 
 <!-- tabs -->
-<van-tabs animated bind:change="onChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#407DB8">
+<van-tabs animated active="{{ active }}" bind:change="onChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#407DB8">
   <van-tab wx:for="{{ tabs }}" wx:key="id" title="{{ item.title }}" />
 </van-tabs>
 
@@ -13,11 +13,14 @@
   <van-cell custom-class="msg-item" wx:for="{{ msgs }}" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{ idx }}" bind:click="goToMsgDetail">
     <view solt="title" class="view_top_content">
       <text class="msg_title" user-select>{{ itm.title }}</text>
-      <text class="msg_date" user-select>{{ itm.scheduletime }}</text>
+      
     </view>
     <view class="content">
       <text user-select>{{ itm.content }}</text>
     </view>
+    <view class="time">
+      <text class="msg_date" user-select>{{ itm.scheduletime }}</text>
+    </view>
   </van-cell>
 </van-cell-group>
 

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

@@ -139,7 +139,7 @@ Page({
 
     const { maxbuyqty, minbuyqty } = this.data.item
     if (Number(this.data.orderQty)>maxbuyqty || Number(this.data.orderQty)<minbuyqty) {
-      showToast('认购数量不能大于'+`${maxbuyqty}`+'不能小于'+`${minbuyqty}`)
+      showToast('不能小于'+`${minbuyqty}`+'认购数量不能大于'+`${maxbuyqty}`)
       return false
     }
     return true

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

@@ -83,7 +83,7 @@
   <view class="popup-view"> 
     <text class="title">提示</text>
     <text class="message">确认要提交认购吗？</text>
-    <van-field label="认购数量：" model:value="{{ orderQty }}" placeholder="请输入认购数量" required clearable border="{{ false }}" bind:input="getInputNum" ></van-field>
+    <van-field label="认购数量：" model:value="{{ orderQty }}" placeholder="请输入认购数量" type="digit" required clearable border="{{ false }}" bind:input="getInputNum" ></van-field>
     <view class="button-view" style="padding-bottom: {{ safeBottom }}px;">
       <van-button bind:click="onClose" color="#999" round block>取消</van-button>
       <van-button bind:click="doSubmit" color="#407DB8" round block>确定</van-button>

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

@@ -161,7 +161,7 @@ Page({
 
     const { maxbuyqty, minbuyqty } = this.data.item
     if (Number(this.data.orderQty)>maxbuyqty || Number(this.data.orderQty)<minbuyqty) {
-      showToast('采购数量不能大于'+`${maxbuyqty}`+'不能小于'+`${minbuyqty}`)
+      showToast('不能小于'+`${minbuyqty}`+'采购数量不能大于'+`${maxbuyqty}`)
       return false
     }
     return true

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

@@ -84,7 +84,7 @@
   <view class="popup-view"> 
     <text class="title">提示</text>
     <text class="message">确认要立即购买申请吗？</text>
-    <van-field label="采购数量：" model:value="{{ orderQty }}" placeholder="请输入采购数量" required clearable border="{{ false }}" bind:input="getInputNum" ></van-field>
+    <van-field label="采购数量：" model:value="{{ orderQty }}" type="digit" placeholder="请输入采购数量" required clearable border="{{ false }}" bind:input="getInputNum" ></van-field>
     <view class="button-view" style="padding-bottom: {{ safeBottom }}px;">
       <van-button bind:click="onClose" color="#999" round block>取消</van-button>
       <van-button bind:click="doSubmit" color="#407DB8" round block>确定</van-button>

GuangZuan/miniprogram/mMine/pages/bank/index.ts

@@ -249,15 +249,14 @@ Page({
           success: (res) => {
             /// 解析对象
             const data = JSON.parse(res.data.data)
-            if ( data.Status != 0 ) {
+            if ( data.Status != 0 && data.Status != 6007 ) {
               hideLoading(() => {}, getErrorMsg(data.Status))
               return
             }
             /// 请求成功
-            hideLoading(()=>{
-              /// 返回上层视图
-              wx.navigateBack()
-            }, msg+'成功', 'success')
+            hideLoading(()=>{}, '操作请求成功')
+            /// 返回上层视图
+            wx.navigateBack()
           }, 
           fail: (emsg) => {
             hideLoading(()=>{}, emsg)
@@ -307,18 +306,17 @@ Page({
           success: (res) => {
             /// 解析对象
             const data = JSON.parse(res.data.data)
-            if (data.RetCode != 0) {
+            if (data.Status != 0) {
+              console.log('xxxxx')
               hideLoading(() => {}, getErrorMsg(data.RetCode))
               return
-            }
+            } 
             /// 请求成功
-            hideLoading(()=>{
-              /// 返回上层视图
-              wx.navigateBack()
-            }, '解约请求成功', 'success')
+            hideLoading(()=>{}, '解约请求成功')
+            /// 返回上层视图
+            wx.navigateBack()
           },
           fail: (emsg) => {
-            debugger
             hideLoading(()=>{}, emsg)
           }
         })

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

@@ -29,9 +29,10 @@
      <text class="amount">{{ itm.amount }}</text>
     </view>
   </view>
+
+  <!-- 选择日期 -->  
+  <van-calendar title="请选择日期" show="{{ show }}" min-date="{{ minDate }}" bind:close="onClose" bind:confirm="onConfirm" />
 </view>
 
 <!-- empty -->
 <van-empty wx:if="{{ isEmpty }}" class="custom-image" description="无数据"/>
-<!-- 选择日期 -->  
-<van-calendar show="{{ show }}" min-date="{{ minDate }}" bind:close="onClose" bind:confirm="onConfirm" />

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

@@ -6,12 +6,12 @@
   .result-view {
     display: flex;
     justify-content: space-between;
-    padding: 5px 10px;
+    padding: 0px 10px;
     align-items: center;
     align-content: center;
 
     van-tabs {
-      width: 100px;
+      width: 80px;
     }
 
     text {

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

@@ -40,18 +40,14 @@ Page({
   onButtonPressed(e: any) {
     switch (e.target.id) {
       case 'startdate':  /// 开始日期
-        this.setData({ 
-          show: true,
-          isstart: true
-        })
+        this.setData({ show: true, isstart: true })
         break;
       case 'enddate':   /// 结束日期
-        this.setData({ 
-          show: true,
-          isstart: false
-        })
+        this.setData({ show: true, isstart: false })
         break
       default:
+        /// 查询我的摘牌数据
+        this.queryMyDeListing()
         break;
     }
   },

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

@@ -7,13 +7,13 @@
 
   <!-- 过滤条件 -->
   <view class="result-view" style="background-color: white;">
-    <van-tabs custom-class="buyOrSell" type="card" sticky animated bind:change="onDTabChange" line-height="0px" color="#2270D9" title-inactive-color="#333" title-active-color="#fff">
+    <van-tabs custom-class="buyOrSell" sticky animated bind:change="onDTabChange" line-width="10px" line-height="2px" color="#2270D9" title-inactive-color="#333" title-active-color="#407DB8">
       <van-tab wx:for="{{ ['买', '卖'] }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx" title="{{ itm }}"/>
     </van-tabs>  
-    <text>从</text>
-    <van-button size="normal" id="startdate" custom-class="startdate" plain type="default" bind:click="onButtonPressed">{{ startdate }}</van-button>
-    <text>到</text>
-    <van-button size="normal" id="enddate" custom-class="enddate" plain type="default" bind:click="onButtonPressed" >{{ enddate }}</van-button>
+    <van-button size="small" id="startdate" custom-class="startdate" plain type="info" bind:click="onButtonPressed">{{ startdate }}</van-button>
+    <text>-</text>
+    <van-button size="small" id="enddate" custom-class="enddate" plain type="info" bind:click="onButtonPressed" >{{ enddate }}</van-button>
+    <van-button type="info" id="search" round size="small" bind:click="onButtonPressed">查询</van-button>
   </view>
 
   <!-- 列头 --> 

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

@@ -1,7 +1,7 @@
 import { FunCode } from "../../../../constants/enum/funcode"
 import { EOrderSrc } from "../../../../constants/enum/index"
 import { sendMsgToMQ } from "../../../../services/api/common/index"
-import { queryMyBuyOrder, queryMyDeListing, queryMyDelistingApply, queryMySellOrder } from "../../../../services/api/orders/index"
+import { queryMyBargainApply, queryMyBuyOrder, queryMyDeListing, queryMyDelistingApply, queryMySellOrder } from "../../../../services/api/orders/index"
 import { accountid, clientType, getErrorMsg, isEncrypted, loginid, marketID, marketid, protoHeader, timetample, userid } from "../../../../services/utils"
 import { hideLoading, showLoading, showModel } from "../../../../utils/message/index"
 import { formatDateString, isnullstr } from "../../../../utils/util"
@@ -19,8 +19,10 @@ Page({
     tabs: [{id: 0, name: '出售挂牌'},  
            {id: 1, name: '求购挂牌'}, 
            {id: 2, name: '我的摘牌'}, 
-           {id: 3, name: '我的询价'}, 
-           {id: 4, name: '询价消息'}],
+           {id: 3, name: '发出买询'}, 
+           {id: 4, name: '发出卖询'}, 
+           {id: 5, name: '收到买询'}, 
+           {id: 6, name: '收到卖询'}],
     /// dtab激活索引
     dactive: Number(0),
     /// tabs
@@ -37,8 +39,10 @@ Page({
     buyorders: <GuangZuan.MyBuyOrder[]>[],
     /// 出售挂牌
     sellorders: <GuangZuan.MySellOrder[]>[],
-    /// 我的询价和询价消息
+    /// 我的询价和询价消息(出售)
     myDelistingApplys: <GuangZuan.MyDelistingApply[]>[],
+    /// 我的询价和询价消息(求购)
+    myBargainApplys: <GuangZuan.MyBargainApply[]>[],
     /// 显示的值
     values: <{}[]>[],
     /// 页签
@@ -84,7 +88,15 @@ Page({
                    ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光 | 证书', '价格']],
         })
         break;
-      case 3:  /// 我的询价
+      case 3:  /// 我发出的买询价
+        this.setData({
+          /// 列头  
+          titles: [['形状 ｜ 尺寸', '分类'], 
+                   ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光', ''], 
+                   ['卖方', '我的钻石']]
+        })
+        break;
+      case 4:  /// 我发出的卖询价
         this.setData({
           /// 列头  
           titles: [['形状 ｜ 尺寸', '分类'], 
@@ -92,7 +104,14 @@ Page({
                    ['买方', '我的钻石']]
         })
         break;
-      default: /// 询价消息
+      case 4:  /// 我收到的买询价
+        this.setData({
+          /// 列头  
+          titles: [['重量 ｜ 形状 ｜ 尺寸', '分类'], 
+                   ['颜色 | 净度 | 切工 | 抛光 | 对称 | 荧光', '价格'], ['', '买方 | 联系电话']]
+        })
+        break;
+      default: /// 我收到的卖询价
         this.setData({
           /// 列头  
           titles: [['重量 ｜ 形状 ｜ 尺寸', '分类'], 
@@ -196,15 +215,21 @@ Page({
         this.queryMySellOrder()
         break;
       case 1:  /// 求购挂牌
-      /// 查询求购挂牌
+        /// 查询求购挂牌
         this.queryMyBuyOrder()
         break;
       case 2:  /// 我的摘牌
         this.queryMyDeListing()
         break;
-      case 3:  /// 我的询价
+      case 3:  /// 我发出的买询价
+        this.queryMyBargainApply(0)
+        break;
+      case 4:  /// 我发出的卖询价
         this.queryMyDelistingApply(0)
         break;
+      case 5:  /// 我收到的买询价
+        this.queryMyBargainApply(1)
+        break;
       default: /// 询价消息
         this.queryMyDelistingApply(1)
         break;
@@ -340,10 +365,16 @@ Page({
           /// 设置数据
           this.setData({
             /// 设置列头
-            sellorders: res.data,
-            isEmpty: res.data.length === 0,
+            sellorders: res.data.filter(obj => {
+              return obj.wrtradeorderstatus === 3 || obj.wrtradeorderstatus === 7
+            }),
+            isEmpty: res.data.filter(obj => {
+              return obj.wrtradeorderstatus === 3 || obj.wrtradeorderstatus === 7
+            }).length === 0,
             /// 显示的值
-            values: res.data.map(obj => {
+            values: res.data.filter(obj => {
+              return obj.wrtradeorderstatus === 3 || obj.wrtradeorderstatus === 7
+            }).map(obj => {
               return {up: [obj.totalqty+'ct'+' ｜ '+ 
                           isnullstr(obj.zsshapetypedisplay)+' ｜ '+ 
                           '--'+' ｜ '+
@@ -374,7 +405,7 @@ Page({
     })
   },
 
-  /// 查询我的询价以及询价消息
+  /// 查询我的询价以及询价消息(出售)
   queryMyDelistingApply(applytype: number) {
     /// loding
     showLoading(()=>{
@@ -440,6 +471,72 @@ Page({
     })
   },
 
+  /// 查询我的询价以及询价消息(求购)
+ queryMyBargainApply(applytype: number) {
+    /// loding
+    showLoading(()=>{
+      /// 数据查询请求
+      queryMyBargainApply({
+        data: {
+          userid: userid(),
+          page: this.data.page,
+          pagesize: 20,
+          type: applytype
+        },
+        success: (res) => {
+          /// 请求失败
+          if (res.code != 200) {
+            /// 加载失败
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg)
+            return
+          }
+          hideLoading(()=>{
+            /// 设置数据
+            this.setData({
+              /// 设置列头
+              myBargainApplys: res.data,
+              isEmpty: res.data.length === 0,
+              /// 显示的值 
+              values: applytype == 0 ? res.data.map(obj => {
+                return {up: [ isnullstr(obj.zsshapetypedisplay)+' ｜ '+ 
+                              isnullstr(obj.sizedisplay),
+                              '--'], 
+                        mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
+                              isnullstr(obj.zsclaritytype1display)+' | '+
+                              isnullstr(obj.zscuttype1display)+' | '+
+                              isnullstr(obj.zspolishtype1display)+' | '+
+                              isnullstr(obj.zssymmetrytype1display)+' | '+
+                              isnullstr(obj.zsfluorescencetype1display),
+                          ''], 
+                        dwn: [obj.sellusername, obj.goodsno], width: applytype === 0 ? 100 : 50}
+              }) : res.data.map(obj => {
+                return {up: [obj.qty+'ct'+' ｜ '+
+                            isnullstr(obj.zsshapetypedisplay)+' ｜ '+
+                            isnullstr(obj.sizedisplay),
+                            '--'], 
+                        mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
+                              isnullstr(obj.zsclaritytype1display)+' | '+
+                              isnullstr(obj.zscuttype1display)+' | '+
+                              isnullstr(obj.zspolishtype1display)+' | '+
+                              isnullstr(obj.zssymmetrytype1display)+' | '+
+                              isnullstr(obj.zsfluorescencetype1display),
+                            obj.zscurrencytypedisplayunit+obj.applyprice], 
+                        dwn: ['', obj.sellusername+' | --'], width: applytype === 0 ? 100 : 50}
+              })
+            })
+          })
+        },
+        fail: (emsg) => {
+          hideLoading(()=>{}, emsg)
+        },
+        complete: () => { 
+          /// 停止下拉刷新
+          wx.stopPullDownRefresh()
+        }
+      })
+    })
+  },
+
   /// 出售挂牌-求购挂牌撤单请求(下架)
   doWRListingCancelOrder(wrtradeorderid: string) {
     /// loading

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

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

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

@@ -73,7 +73,7 @@ Page({
         data: {
           data: encryptBody(info),
           funCodeReq: FunCode.PerformanceDelayApplyReq,
-          funCodeRsp: FunCode.PerformanceDelayApplyReq,
+          funCodeRsp: FunCode.PerformanceDelayApplyRsp,
           isEncrypted: isEncrypted()
         },
         success: (res) => {

GuangZuan/miniprogram/pages/circle/index.ts

@@ -2,7 +2,7 @@ import { queryMyFavorite } from "../../services/api/orders/index"
 import { clientType, isEncrypted, protoHeader, userid, timetample, getErrorMsg, marketID, removeMyFavorite } from "../../services/utils";
 import { sendMsgToMQ } from "../../services/api/common/index";
 import { FunCode } from "../../constants/enum/funcode";
-import { isnullstr } from "../../utils/util";
+import { formatDateString, isnullstr } from "../../utils/util";
 import { hideLoading, showLoading, showToast } from "../../utils/message/index";
 import { encryptBody } from "../../utils/websocket/crypto";
 import services from "../../services/index";
@@ -35,7 +35,7 @@ Page({
     /// 显示的值
     values: [{ up: <string[]>[], dwn: <string[]>[] }],
     /// 左滑宽度
-    width: 50,
+    width: 100,
   },
 
   /**
@@ -76,6 +76,19 @@ Page({
       url: '/mCircle/pages/contrast/index?params='+JSON.stringify(objs)
     })
   },
+
+  /// 跳转到商品详情
+  goToGoodsDetail(e: any) {
+    /// 获取对应的id
+    const ids = (<string> e.currentTarget.id).split(' ')
+    const index = <number><unknown>ids[1]
+
+    const { goodsno } = this.data.favorites[index]
+    /// 商品详情
+    wx.navigateTo({ 
+      url: '/mHome/pages/goodsdetail/index?goodsno='+goodsno+'&ordertime=-'+'&showTrade='+1 
+    })
+  },
   
   /**
    * tab触发事件

GuangZuan/miniprogram/pages/circle/index.wxml

@@ -38,7 +38,8 @@
     </view>
     <!-- 取消收藏 --> 
     <view slot="right" class="van-swipe-cell__right">
-      <view class="item detail" id="detail {{ idx }}" style="background-color: #407DB8; color: white;" bindtap="onCancelFavorite">取消</view>
+      <view class="item detail" id="detail {{ idx }}" style="background-color: #407DB8; color: white;" bindtap="goToGoodsDetail">详情</view>
+      <view class="item cancel" id="detail {{ idx }}" style="background-color: #F7A657; color: white;" bindtap="onCancelFavorite">取消</view>
     </view>
   </van-swipe-cell>
 </scroll-view>

GuangZuan/miniprogram/services/http/index.ts

@@ -1,4 +1,5 @@
-import { loginid, xtoken } from '../utils'
+import { hideLoading, showLoading } from '../../utils/message/index'
+import { getLoginCode, loginid, setLoginCode, xtoken } from '../utils'
 import { Method, HttpConfig, HttpRequest, HttpResponse, ResultCode } from './interface'
 import { addPending, removePending } from './pending/index'
 
@@ -19,6 +20,25 @@ function getRequestKey<T>(config: HttpConfig<T>) {
   return requestKey.join('&')
 }
 
+function logout() {
+  /// 获取上次登录账号
+  const username = getLoginCode()
+  /// 清楚所有的缓存数据
+  wx.clearStorage()
+  /// 设置登录账号
+  setLoginCode(username)
+  /// loding....
+  showLoading(()=>{
+    /// 登出
+    setTimeout(function () {
+      hideLoading(()=>{
+        // on confirm
+        wx.reLaunch({ url: '/pages/login/index' })
+      })
+    }, 3000)
+  }, '登出中....')
+}
+
 /**
  * Http请求
  */
@@ -77,6 +97,9 @@ export async function httpRequest<T extends { req?: unknown, rsp?: unknown }>(ur
         // 退出登录
         // logout();
         return Promise.reject('令牌无效')
+      case ResultCode.UnvalidToken:
+        logout();
+        return Promise.reject('异地登录，请重新登录')
       case ResultCode.Success:
         success && success(data)
         return Promise.resolve()

GuangZuan/miniprogram/services/http/interface.ts

@@ -41,4 +41,5 @@ export enum ResultCode {
   Code = 0,         // 请求成功
   Error = 7,        // 失败
   InvalidToken = 8, // 令牌无效
+  UnvalidToken = 20002, // Token鉴权失败
 }