Handy_Cao 2 年 前
コミット
d0c913b75b

+ 1 - 1
GuangZuan/miniprogram/mHome/pages/goodsdetail/index.less

@@ -92,7 +92,7 @@
             align-content: center;
     
             text {
-              font-size: 12px;
+              font-size: 13px;
               padding: 2.5px;
               text-align: center;
             }

+ 3 - 3
GuangZuan/miniprogram/mHome/pages/goodsdetail/index.ts

@@ -25,7 +25,7 @@ Page({
     /// 卖单信息
     order: <GuangZuan.SellOrder>({}),
     /// 颜色
-    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown'],
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown', 'hotpink', 'orange', 'darkgoldenrod'],
     /// 操作
     operator: 1,
     /// 委托时间
@@ -90,8 +90,8 @@ Page({
     })
   },
 
-   /// 获取履约模板信息
-   queryPermancePlanTmp(performancetemplateid: number) {
+  /// 获取履约模板信息
+  queryPermancePlanTmp(performancetemplateid: number) {
     /// showLoading
     showLoading(() => {
       queryPermancePlanTmp({

+ 1 - 1
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>

+ 2 - 2
GuangZuan/miniprogram/mHome/pages/inspection/detail/index.wxml

@@ -9,7 +9,7 @@
 <!-- top-view -->
 <view class="top-view">
   <!-- 单据信息 -->
-  <view class="orderinfo" style="padding-bottom: {{ safeBottom }}px;">
+  <view class="orderinfo">
     <view class="title_item" style="margin-left: -10px;">
       <text class="ordertitle" style="font-size: 18px;">【单据信息】</text>
       <text>{{ order.orderno }}</text>
@@ -92,7 +92,7 @@
 </view>
 
 <!-- 内容 --> 
-<scroll-view class="container">
+<scroll-view class="container" style="padding-bottom: {{ safeBottom }}px;">
   <!-- 数据 --> 
   <van-swipe-cell wx:for="{{ values }}" wx:for-item="itm" wx:for-index="idx" wx:key="orderid" right-width="{{ width }}" id="{{ idx }}">
     <view class="item-view">

+ 1 - 1
GuangZuan/miniprogram/mHome/pages/presell/detail/index.ts

@@ -23,7 +23,7 @@ Page({
     /// 选中履约模板
     tmp: <GuangZuan.PermancePlanTmp>({}),
     /// 颜色
-    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown'],
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown', 'hotpink', 'orange', 'darkgoldenrod'],
     /// banner图
     banners: [''],
     /// 是否显示弹出层

+ 1 - 1
GuangZuan/miniprogram/mHome/pages/presell/new/index.ts

@@ -24,7 +24,7 @@ Page({
     /// 是否显示日历
     showCal: false,
     /// 颜色
-    tcolors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'firebrick'],
+    tcolors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'firebrick', 'hotpink', 'orange', 'darkgoldenrod', 'hotpink', 'orange', 'darkgoldenrod'],
     /// 是否开始日期
     isstart: true,
     /// 开始日期

+ 1 - 1
GuangZuan/miniprogram/mHome/pages/purchase/detail/index.ts

@@ -23,7 +23,7 @@ Page({
     /// 选中履约模板
     tmp: <GuangZuan.PermancePlanTmp>({}),
     /// 颜色
-    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown'],
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown', 'hotpink', 'orange', 'darkgoldenrod'],
     /// banner图
     banners: [''],
     /// 预售认购列表查询

+ 1 - 1
GuangZuan/miniprogram/mHome/pages/purchase/new/index.ts

@@ -24,7 +24,7 @@ Page({
     /// 是否显示日历
     showCal: false,
     /// 颜色
-    tcolors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown'],
+    tcolors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown', 'hotpink', 'orange', 'darkgoldenrod'],
     /// 是否开始日期
     isstart: true,
     /// 开始日期

+ 1 - 1
GuangZuan/miniprogram/mMine/pages/bank/index.wxml

@@ -24,7 +24,7 @@
 <!-- 按钮 -->
 <view class="button-view">
   <van-button wx:if="{{ !bankAccountSign.cusbankid }}" custom-class="submit" id="submit" round block color="linear-gradient(to right, #4bb0ff, #6149f6)" bind:click="onButtonPressed">添加</van-button>
-  <van-button wx:if="{{ bankAccountSign.signstatus === 4 }}" custom-class="cancel" id="cancel" round block color="linear-gradient(to right, #999, #aaa)" bind:click="onButtonPressed">解约</van-button>
+  <van-button wx:if="{{ bankAccountSign.signstatus === 4 }}" custom-class="cancel" id="cancel" round block color="linear-gradient(to right, #F6504D, #C42B12)" bind:click="onButtonPressed">解约</van-button>
 </view>
 
 <!-- 选择开户行 -->

+ 5 - 1
GuangZuan/miniprogram/mMine/pages/myorders/list/index.ts

@@ -117,6 +117,8 @@ Page({
   onDTabChange(e: any) {
     /// 设置激活项
     this.setData({ dactive: Number(e.detail.index), page: 1 })
+    /// 查询我的摘牌
+    this.queryMyDeListing()
   },
 
   /**
@@ -127,6 +129,7 @@ Page({
     const ids = (<string> e.target.id).split(' ')
     let id = (<string> e.target.id).split(' ')[0]
     const index = <number> <unknown>ids[1]
+    console.log(e)
     switch (id) {
       case 'his':      /// 历史订单
         wx.navigateTo({
@@ -147,7 +150,7 @@ Page({
             break;
           case 2:  /// 我的摘牌
             wx.navigateTo({
-              url: '/mHome/pages/goodsdetail/index?item='+JSON.stringify(this.data.dlistings[index].goodsno)+'&showTrade='+true
+              url: '/mHome/pages/goodsdetail/index?goodsno='+this.data.dlistings[index].goodsno+'&showTrade='+true
             })
             break;
           case 1:  /// 求购挂牌
@@ -225,6 +228,7 @@ Page({
           userid: userid(),
           page: this.data.page,
           pagesize: 20,
+          buyorsell: this.data.dactive
         },
         success: (res) => {
           /// 请求失败

+ 49 - 22
GuangZuan/miniprogram/mMine/pages/myorders/mydelistingapplydetail/index.less

@@ -33,7 +33,7 @@
       font-size: 20px;
     }
 
-    .attribute-info__item, .content__item{
+    .attribute-info__item, .content__item {
       width: 100%;
       padding-left: 15px;
       height: 44px;
@@ -80,16 +80,20 @@
     }
   }
 
-  .buyinfo-info {
+  .attribute-info, .seller-info, .buyinfo-info {
     .title-view {
       display: flex;
       flex-direction: row;
-      width: 100%;
+      width: 95%;
       align-items: center;
       align-content: center;
+      justify-content: space-between;
+      margin: 0px 10px;
 
       .title {
+        font-weight: bolder;
         width: 120px;
+        font-size: 16px;
       }
 
       .wrstandname {
@@ -97,33 +101,56 @@
         color: #333;
       }
     }
+  }
 
-    .buyinfo-detail-info {
-      width: 90%;
-      background-color: #f0f0f0;
-      padding: 10px;
+  .buyinfo-detail-info {
+    width: 92%;
+    background-color: #f0f0f0;
+    padding: 10px;
+    display: flex;
+    flex-direction: column;
+    align-content: center;
+    border-radius: 10px;
+
+    .item {
+      width: 100%;
       display: flex;
-      flex-direction: column;
-      align-content: center;
-      border-radius: 10px;
-  
-      .item {
-        height: 25px;
-        width: 100%;
+      flex-direction: row;
+      justify-content: space-between;
+      padding-top: 5px;
+
+      &__step {
         display: flex;
         flex-direction: row;
-        justify-content: space-between;
+        justify-content: start;
+        align-items: center;
+        align-content: center;
+        white-space: nowrap;
+        width: 100%;
   
-        text {
-          color: #333;
-          font-size: 14px;
-          text-align: left;
-        }
+        &__item {
+          display: inline-flex;
+          flex-direction: column;
+          align-items: center;
+          align-content: center;
   
-        text:nth-child(2) {
-          width: 45%;
+          text {
+            font-size: 13px;
+            padding: 2.5px;
+            text-align: center;
+          }
         }
       }
+
+      text {
+        color: #333;
+        font-size: 14px;
+        text-align: left;
+      }
+
+      text:nth-child(2) {
+        width: 45%;
+      }
     }
   }
 

+ 43 - 14
GuangZuan/miniprogram/mMine/pages/myorders/mydelistingapplydetail/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 { queryWrPerformancePlanStep } from "../../../../services/api/orders/index"
+import { getGoods, queryPermancePlanTmp } from "../../../../services/api/orders/index"
 import { accountid, clientType, getErrorMsg, isEncrypted, marketID, marketid, protoHeader, timetample, userid } from "../../../../services/utils"
 import { hideLoading, showLoading, showModel } from "../../../../utils/message/index"
 import { encryptBody } from "../../../../utils/websocket/crypto"
@@ -18,8 +18,12 @@ Page({
     item: <GuangZuan.MyDelistingApply>({}),
     /// 类型
     type: 1,
-    /// 履约步骤信息
-    steps: <GuangZuan.WrPerformancePlanStep[]>[]
+    /// 商品信息
+    goods: <GuangZuan.GetGoods>({}),
+    /// 选中履约模板
+    tmp: <GuangZuan.PermancePlanTmp>({}),
+    /// 颜色
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown', 'hotpink', 'orange', 'darkgoldenrod', 'hotpink', 'orange', 'darkgoldenrod']
   },
 
   /**
@@ -95,21 +99,46 @@ Page({
     })
   },
 
-  /// 查询履约步骤信息
-  queryWrPerformancePlanStep() {
-    showLoading(()=>{
-      /// 发送查询
-      queryWrPerformancePlanStep({
+  /**
+   * 获取商品数据信息
+   */
+  getGoods() {
+    showLoading(() => {
+      /// 发送请求
+      getGoods({
         data: {
-          planid: this.data.item.performancetemplateid
+          goodsno: this.data.item.goodsno
         },
         success: (res) => {
-          hideLoading(()=>{
-            this.setData({ steps: res.data })
+          hideLoading( ()=> {
+            this.setData({ 
+              goods: res.data,
+             })
+            /// 查询履约模板信息
+            this.queryPermancePlanTmp()
           })
         },
         fail: (emsg) => {
-          hideLoading(()=>{}, emsg)
+          hideLoading( ()=> {}, emsg)
+        }
+      })
+    })
+  },
+
+  /// 获取履约模板信息
+  queryPermancePlanTmp() {
+    /// showLoading
+    showLoading(() => {
+      queryPermancePlanTmp({
+        success: (res) => {
+          /// 获取数据
+          this.setData({ 
+            tmp: res.data[1]
+           })
+        },
+        complete: () => {
+          /// hideLoading
+          hideLoading()
         }
       })
     })
@@ -132,8 +161,8 @@ Page({
       /// 数据赋值
       this.setData({  item: obj, type: optinos.type  })
     }
-    /// 查询履约步骤信息
-    this.queryWrPerformancePlanStep()
+    /// 获取商品信息
+    this.getGoods()
   },
 
   /**

+ 40 - 32
GuangZuan/miniprogram/mMine/pages/myorders/mydelistingapplydetail/index.wxml

@@ -1,4 +1,3 @@
-<!--mMine/pages/myorders/MyDelistingApplyDetail/index.wxml-->
 <view class="container" style="padding-bottom: {{ safeBottom }}px;">
   <view class="topView">
     <!-- 导航栏 -->
@@ -10,108 +9,117 @@
 
   <view class="buyinfo-info">
     <view class="title-view">
-      <text class="title">{{ type === 1 ? '【求购信息】' : '【我的求购】'}}</text>
-      <text class="wrstandname">单颗裸钻-人民币:{{}}</text>
+      <text class="title">{{ type === 1 ? '[求购信息]' : '[我的求购]'}}</text>
+      <text class="wrstandname">{{ item.zscategorydisplay }}-{{ item.zscurrencytypedisplay }}:{{ item.sellusername }}</text>
     </view>
     <!-- 履约信息 --> 
     <view class="buyinfo-detail-info">
       <view class="item">
-        <text>形状:圆明亮形, 心形, 三角形</text>
-        <text>尺寸:1.20-1.33</text>
+        <text>形状:{{ item.zsshapetypedisplay }}</text>
+        <text>尺寸:{{ item.zssizedisplay }}</text>
       </view>
       <view class="item">
-        <text>颜色:F-K</text>
-        <text>净度:VVS-SI2</text>
+        <text>颜色:{{ item.zscolortypedisplay }}</text>
+        <text>净度:{{ item.zsclaritytypedisplay }}</text>
       </view>
       <view class="item">
-        <text>切工:VG-F</text>
-        <text>对称:EX-GF</text>
+        <text>切工:{{ item.zscuttypedisplay }}</text>
+        <text>对称:{{ item.zssymmetrytypedisplay }}</text>
       </view>
       <view class="item">
-        <text>抛光:EX-G</text>
-        <text>荧光:无-极强</text>
+        <text>抛光:{{ item.zspolishtypedisplay }}</text>
+        <text>荧光:{{ item.zsfluorescencetypedisplay }}</text>
       </view>
       <view class="item">
-        <text>履约:</text>
+        <text>履约:{{ tmp.templatename }}</text>
+      </view>
+      <view class="item">
+        <scroll-view class="item__step" scroll-left="true" scroll-x="true">
+          <view class="item__step__item" wx:for="{{ tmp.LstStep }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx"> 
+            <text style="color: white; background-color: {{ colors[idx] }};">{{ itm.stepinfo }}</text>
+            <text>{{ itm.stepdate }}</text>
+          </view>
+        </scroll-view>
       </view>
     </view>
   </view>
 
   <!-- 卖家信息 -->
   <view class="seller-info" wx:if="{{ type != 1 }}">
-    <text class="title">【卖家信息】</text>
+    <text class="title">[卖家信息]</text>
     <view class="content">
       <view class="content__item">
         <text class="title">名称:</text>
-        <text class="value">{{ item.sellusername }}</text>
+        <text class="value">{{ goods.sellusername }}</text>
       </view>
       <view class="content__item">
         <text class="title">电话:</text>
-        <text class="value">--</text>
+        <text class="value">{{ goods.mobile }}</text>
       </view>
       <view class="content__item">
         <text class="title">仓库:</text>
-        <text class="value">{{ item.warehouseinfosdisplay }}</text>
+        <text class="value">{{ goods.warehousenamedisplay }}</text>
       </view>
       <view class="content__item">
-        <text class="title">履约:</text>
-        <text class="value">中国-广东省-广州市-南沙XXXxxxxX仓库</text>
+        <text class="title">地址:</text>
+        <text class="value">{{ goods.provincename+goods.cityname+goods.districtname+goods.address }}</text>
       </view>
     </view>
   </view>
 
   <!-- 钻石属性 -->
   <view class="attribute-info">
-    <view class="attribute-info__item">
-      <text class="title" style="width: 100%;">{{ item.zscategorydisplay }} - 商品编号{{ item.goodsno }} </text>
+    <view class="title-view">
+      <text class="title">[我的钻石]</text>
+      <text class="wrstandname">商品编号:{{ item.goodsno }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">价格:</text>
-      <text class="value">{{ item.price }}</text>
+      <text class="value">{{ goods.price }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">重量:</text>
-      <text class="value">{{ item.weight }}</text>
+      <text class="value">{{ goods.weight }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">克拉单价:</text>
-      <text class="value">--</text>
+      <text class="value">{{ goods.priceper }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">形状:</text>
-      <text class="value">{{ item.zsshapetypedisplay }}</text>
+      <text class="value">{{ goods.zsshapetypedisplay }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">颜色:</text>
-      <text class="value">{{ item.zsczcolor1typedisplay }}</text>
+      <text class="value">{{ goods.zscolortype1display }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">净度:</text>
-      <text class="value">{{ item.zsclaritytypedisplay }}</text>
+      <text class="value">{{ goods.zsclaritytype1display }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">切工:</text>
-      <text class="value">{{ item.zscuttypedisplay }}</text>
+      <text class="value">{{ goods.zscuttypedisplay }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">抛光:</text>
-      <text class="value">{{ item.zspolishtypedisplay }}</text>
+      <text class="value">{{ goods.zspolishtype1display }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">荧光:</text>
-      <text class="value">{{ item.zsfluorescencetypedisplay }}</text>
+      <text class="value">{{ goods.zsfluorescencetype1display }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">尺寸:</text>
-      <text class="value">{{ item.sizedisplay }}</text>
+      <text class="value">{{ goods.sizedisplay }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">证书类型:</text>
-      <text class="value">--</text>
+      <text class="value">{{ goods.zscerttypedisplay }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">证书编号:</text>
-      <text class="value">--</text>
+      <text class="value">{{ goods.cpcertno }}</text>
     </view>
   </view>
 

+ 1 - 1
GuangZuan/miniprogram/mTrade/pages/delistingsell/index.ts

@@ -38,7 +38,7 @@ Page({
     /// 单据显示
     orderValue: { up: [''], dwn: ['']},
     /// 颜色
-    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown']
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown', 'hotpink', 'orange', 'darkgoldenrod']
   },
 
   /**

+ 1 - 1
GuangZuan/miniprogram/mTrade/pages/listingbuy/index.ts

@@ -15,7 +15,7 @@ Page({
     /// 底部安全区域
     safeBottom: getApp().globalData.safeBottom,
     /// 颜色
-    tcolors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown'],
+    tcolors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown', 'hotpink', 'orange', 'darkgoldenrod'],
     /// tabs
     tabs: [{ id: 2, name: '单颗裸钻' }, { id: 5, name: '单颗彩钻' }],
     /// tab索引

+ 1 - 1
GuangZuan/miniprogram/mTrade/pages/listingsell/index.ts

@@ -41,7 +41,7 @@ Page({
     /// 显示信息
     actions: [''],
     /// 颜色
-    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown']
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown', 'hotpink', 'orange', 'darkgoldenrod']
   },
 
   /**

+ 1 - 1
GuangZuan/miniprogram/mTrade/pages/orderdetail/index.ts

@@ -18,7 +18,7 @@ Page({
     /// 选中履约模板
     tmp: <GuangZuan.PermancePlanTmp>({}),
     /// 颜色
-    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown'],
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown', 'hotpink', 'orange', 'darkgoldenrod'],
     /// 资金账户ID
     accountid: accountid()
   },

+ 4 - 5
GuangZuan/miniprogram/pages/home/index.less

@@ -22,13 +22,13 @@
   }
 
   .banner {
-    height: 210px;
-    width: 92%;
+    height: 215px;
+    width: 95%;
 
     .swiper-item {
       image {
         width: 100%;
-        border-radius: 10px;
+        border-radius: 15px;
       }
       width: 100%;
     }
@@ -39,7 +39,7 @@
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  margin: 10px 15px;
+  margin: 10px;
   padding-top: 15px;
   background-color: #fff;
   border-radius: 10px;
@@ -103,7 +103,6 @@ van-grid-item {
   }
 }
 
-
 .memberinfo {
   display: flex;
   flex-direction: column;

+ 1 - 1
GuangZuan/miniprogram/pages/trade/index.less

@@ -70,7 +70,7 @@
 
   .vanSwipeCell-item {
     background-color: #fff;
-    margin: 10px 10px 0px 10px;
+    margin: 5px 5px 0px 5px;
     border-radius: 10px;
     display: flex;
     flex-direction: column;

+ 1 - 1
GuangZuan/miniprogram/pages/trade/index.wxml

@@ -34,7 +34,7 @@
 </view>
 
 <!-- 内容滚动视图 --> 
-<scroll-view wx:if="{{ !isEmpty }}" class="content-view" style="padding-bottom: {{ sellOrders.length > 3 ? safeBottom+navHeight+15 : 15 }}px;">
+<scroll-view wx:if="{{ !isEmpty }}" class="content-view" style="padding-bottom: {{ sellOrders.length > 3 ? safeBottom+navHeight+15 : 5  }}px;">
   <!-- 数据 --> 
   <van-swipe-cell wx:for="{{ active === 0 ? sellOrders : askOrders }}" wx:for-item="itm" wx:for-index="idx" wx:key="wrtradeorderid" right-width="50" >
     <view class="vanSwipeCell-item">