xxxxxxxx

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

@@ -8,7 +8,7 @@
 
   <!-- tabs -->
   <view class="tab-view">
-    <van-tabs sticky animated bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#2270D9">
+    <van-tabs sticky animated 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/mHome/pages/cerserach/index.wxml

@@ -6,7 +6,7 @@
 
 <!-- tabs -->
 <view class="tab-view">
-  <van-tabs swipeable bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#2270D9">
+  <van-tabs swipeable 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/mHome/pages/inspection/list/index.wxml

@@ -8,7 +8,7 @@
 
   <!-- tabs -->
   <view class="tab-view">
-    <van-tabs sticky animated bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#2270D9">
+    <van-tabs sticky animated 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/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="#2270D9">
+<van-tabs animated 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>
 

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

@@ -10,7 +10,7 @@
 
     <!-- tabs -->
     <view class="tab-view">
-      <van-tabs swipeable bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#2270D9">
+      <van-tabs swipeable 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/inoutgold/index.wxml

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

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

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

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

@@ -7,7 +7,7 @@
 
   <!-- 过滤条件 -->
   <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="#2270D9">
+    <van-tabs custom-class="buyOrSell" type="card" sticky animated bind:change="onDTabChange" line-height="0px" 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" active="{{ idx }}" title="{{ itm }}"/>
     </van-tabs>  
     <text>从</text>

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

@@ -7,14 +7,14 @@
 
   <!-- tabs -->
   <view class="tab-view">
-    <van-tabs swipeable bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#2270D9">
+    <van-tabs swipeable bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#407DB8">
       <van-tab wx:for="{{ tabs }}" active="{{ active }}" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" title="{{ itm.name }}"/>
     </van-tabs>  
   </view>
 
   <!-- 我的摘牌 -->
   <view class="dtab-view" wx:if="{{ active == 2 }}">
-    <van-tabs swipeable bind:change="onDTabChange" color="#2270D9" line-width="20px"title-inactive-color="#333" title-active-color="#2270D9">
+    <van-tabs swipeable bind:change="onDTabChange" color="#2270D9" line-width="20px"title-inactive-color="#333" title-active-color="#407DB8">
       <van-tab wx:for="{{ dtabs }}" active="{{ active }}" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" title="{{ itm.name }}"/>
     </van-tabs> 
     <view id="his" bindtap="onButtonPressed">历史订单</view>

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

@@ -7,7 +7,7 @@
 
   <!-- tabs -->
   <view class="tab-view">
-    <van-tabs animated color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#2270D9">
+    <van-tabs animated 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 }}" active="{{ itm.id }}" title="{{ itm.name }}"/>
     </van-tabs>  
   </view>

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

@@ -7,7 +7,7 @@
 
   <!-- tabs -->
   <view class="tab-view">
-    <van-tabs sticky animated bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#2270D9">
+    <van-tabs sticky animated 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 }}" active="{{ itm.id }}" title="{{ itm.name }}"/>
     </van-tabs>  
   </view>

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

@@ -9,7 +9,7 @@
 
     <!-- tabs -->
     <view class="tab-view">
-      <van-tabs swipeable bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#2270D9">
+      <van-tabs swipeable 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/mTrade/pages/listingsell/index.ts

@@ -113,6 +113,8 @@ Page({
         complete: () => {
           /// hideLoading
           hideLoading()
+          /// 停止下拉刷新
+          wx.stopPullDownRefresh()
         }
       })
     })
@@ -146,7 +148,6 @@ Page({
               values: res.data.map(obj => {
                 return { up: [obj.totalqty+'ct', 
                             isnullstr(obj.zsshapetypedisplay), 
-                            '--',
                             isnullstr(obj.size1),
                             obj.goodsno], 
                           dwn: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
@@ -268,7 +269,10 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh() {
-
+    /// 查询我的出售
+    this.queryMySellOrder()
+    /// 获取履约模板信息
+    this.queryPermancePlanTmp()
   },
 
   /**

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

@@ -9,7 +9,7 @@
 
     <!-- tabs -->
     <view class="tab-view">
-      <van-tabs swipeable bind:change="onTabChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#2270D9">
+      <van-tabs swipeable 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/pages/trade/index.ts

@@ -30,21 +30,22 @@ Page({
     /// tab索引
     active: 0,
     /// 钻石分类
-    categorys: [{ text: '单颗裸钻', value: 2 },
+    categorys: [{ text: '分类', value: 0 },
+                { text: '单颗裸钻', value: 2 },
                 { text: '单颗彩钻', value: 5 }],
-    category: 2,
+    category: 0,
     /// 钻石形状
-    shapes: [{ value: 1, text: '圆明亮形' }],
-    shape: 1,
+    shapes: [{ value: 0, text: '形状' }],
+    shape: 0,
     /// 净度
-    claritys: [{ text: 'FL', value: 1 }],
-    clarity: 1,
+    claritys: [{ text: '净度', value: 0 }],
+    clarity: 0,
     /// 切工
-    cuts: [{ text: 'EX', value: 1 }],
-    cut: 1,
+    cuts: [{ text: '切工', value: 0 }],
+    cut: 0,
     /// 荧光
-    fluorescences: [{ text: '无', value: 1 }],
-    fluorescence: 1,
+    fluorescences: [{ text: '荧光', value: 0 }],
+    fluorescence: 0,
     ///出售大厅数据
     sellOrders: <GuangZuan.SellOrder[]>[],
     /// 求购大厅数据
@@ -75,24 +76,7 @@ Page({
   /**
    * 下拉菜单触发时间
    */
-  onDropdownChange(e: any) {
-    switch (e.target.id) {
-      case "categorys":  /// 钻石分类
-        this.setData({ category: e.detail })
-        break;
-      case "shapes":     /// 形状
-        this.setData({ shape: e.detail })
-        break;
-      case "claritys":   /// 钻石净度
-        this.setData({ clarity: e.detail })
-        break;
-      case "cuts":       /// 切工
-        this.setData({ cut: e.detail })
-        break;
-      default:           /// 荧光
-        this.setData({ fluorescence: e.detail })
-        break;
-    }
+  onDropdownChange() {
     /// 数据查询
     this.data.active == 0 ? this.queryDiamond() : this.queryBuyOrder()
   },
@@ -305,33 +289,33 @@ Page({
     /// 显示默认数据
     this.setData({
       /// 形状
-      shapes: getEnumList('ZSShapeType').map(obj => {
+      shapes: [{ value: 0, text: '形状' }].concat(getEnumList('ZSShapeType').map(obj => {
         return {
           value: obj.enumitemname,
           text: obj.enumdicname
         }
-      }),
+      })),
       /// 净度
-      claritys: getEnumList('ZSClarityType').map(obj => {
+      claritys: [{ value: 0, text: '净度' }].concat(getEnumList('ZSClarityType').map(obj => {
         return {
           value: obj.enumitemname,
           text: obj.enumdicname
         }
-      }),
+      })),
       /// 切工
-      cuts: getEnumList('ZSCutType').map(obj => {
+      cuts: [{ value: 0, text: '切工' }].concat(getEnumList('ZSCutType').map(obj => {
         return {
           value: obj.enumitemname,
           text: obj.enumdicname
         }
-      }),
+      })),
       /// 荧光
-      fluorescences: getEnumList('ZSFluorescenceType').map(obj => {
+      fluorescences: [{ value: 0, text: '荧光' }].concat(getEnumList('ZSFluorescenceType').map(obj => {
         return {
           value: obj.enumitemname,
           text: obj.enumdicname
         }
-      }),
+      })),
     })
   },
 

GuangZuan/miniprogram/pages/trade/index.wxml

@@ -19,12 +19,12 @@
   </view>
 
   <!-- 下拉菜单 -->
-  <van-dropdown-menu custom-class="dropdown-menu" active-color="#1989fa">
-    <van-dropdown-item id="categorys" value="{{ category }}" options="{{ categorys }}" bind:change="onDropdownChange" />
-    <van-dropdown-item id="shapes" value="{{ shape }}" options="{{ shapes }}" bind:change="onDropdownChange" />
-    <van-dropdown-item id="claritys" value="{{ clarity }}" options="{{ claritys }}" bind:change="onDropdownChange" />
-    <van-dropdown-item id="cuts" value="{{ cut }}" options="{{ cuts }}" bind:change="onDropdownChange" />
-    <van-dropdown-item id="fluorescences" value="{{ fluorescence }}" options="{{ fluorescences }}" bind:change="onDropdownChange"/>
+  <van-dropdown-menu custom-class="dropdown-menu" active-color="#1989fa" wx:if="{{ active === 0 }}">
+    <van-dropdown-item id="categorys" model:value="{{ category }}" options="{{ categorys }}" bind:change="onDropdownChange" />
+    <van-dropdown-item id="shapes" model:value="{{ shape }}" options="{{ shapes }}" bind:change="onDropdownChange" />
+    <van-dropdown-item id="claritys" model:value="{{ clarity }}" options="{{ claritys }}" bind:change="onDropdownChange" />
+    <van-dropdown-item id="cuts" model:value="{{ cut }}" options="{{ cuts }}" bind:change="onDropdownChange" />
+    <van-dropdown-item id="fluorescences" model:value="{{ fluorescence }}" options="{{ fluorescences }}" bind:change="onDropdownChange"/>
   </van-dropdown-menu>
 
   <!-- 搜索框 -->
@@ -73,7 +73,6 @@
       <view class="item detail" id="detail {{ idx }}" style="background-color: #407DB8;" bindtap="onButtonPressed">详情</view>
     </view>
   </van-swipe-cell>
-
   <!-- 求购大厅 -->
 </scroll-view>