Handy_Cao 2 anos atrás
pai
commit
d984189e2c
86 arquivos alterados com 2316 adições e 540 exclusões
  1. 2 2
      GuangZuan/miniprogram/components/nav-bar/nav-bar.ts
  2. 10 4
      GuangZuan/miniprogram/components/tabbar/index.ts
  3. 2 2
      GuangZuan/miniprogram/components/tabbar/index.wxml
  4. 2 1
      GuangZuan/miniprogram/config/index.ts
  5. 12 6
      GuangZuan/miniprogram/custom-tab-bar/index.ts
  6. 2 2
      GuangZuan/miniprogram/custom-tab-bar/index.wxml
  7. BIN
      GuangZuan/miniprogram/images/arrow-dwn.png
  8. BIN
      GuangZuan/miniprogram/images/home-bscyw.png
  9. BIN
      GuangZuan/miniprogram/images/home-bsfw.png
  10. BIN
      GuangZuan/miniprogram/images/home-cjjc.png
  11. BIN
      GuangZuan/miniprogram/images/home-cnys.png
  12. BIN
      GuangZuan/miniprogram/images/home-gpdt.png
  13. BIN
      GuangZuan/miniprogram/images/home-jcjy.png
  14. BIN
      GuangZuan/miniprogram/images/home-jjjy.png
  15. BIN
      GuangZuan/miniprogram/images/home-jsq.png
  16. BIN
      GuangZuan/miniprogram/images/home-more.png
  17. BIN
      GuangZuan/miniprogram/images/home-ss.png
  18. BIN
      GuangZuan/miniprogram/images/home-zscx.png
  19. BIN
      GuangZuan/miniprogram/images/home-zsss.png
  20. BIN
      GuangZuan/miniprogram/images/home_banner_bg.png
  21. BIN
      GuangZuan/miniprogram/images/home_logo.png
  22. BIN
      GuangZuan/miniprogram/images/huilv_bg.png
  23. BIN
      GuangZuan/miniprogram/images/listing-buy.png
  24. BIN
      GuangZuan/miniprogram/images/listing-sell.png
  25. BIN
      GuangZuan/miniprogram/images/mine-bg.png
  26. BIN
      GuangZuan/miniprogram/images/mine-bsfw.png
  27. BIN
      GuangZuan/miniprogram/images/mine-cjjc.png
  28. BIN
      GuangZuan/miniprogram/images/mine-fpxx.png
  29. BIN
      GuangZuan/miniprogram/images/mine-gywm.png
  30. BIN
      GuangZuan/miniprogram/images/mine-mmxg.png
  31. BIN
      GuangZuan/miniprogram/images/mine-qyzh.png
  32. BIN
      GuangZuan/miniprogram/images/mine-shdz.png
  33. BIN
      GuangZuan/miniprogram/images/mine-wddd.png
  34. BIN
      GuangZuan/miniprogram/images/mine-wdkc.png
  35. BIN
      GuangZuan/miniprogram/images/mine-wdly.png
  36. BIN
      GuangZuan/miniprogram/images/mine_qyzh.png
  37. BIN
      GuangZuan/miniprogram/images/search.png
  38. BIN
      GuangZuan/miniprogram/images/tabbar-cycle-active.png
  39. BIN
      GuangZuan/miniprogram/images/tabbar-cycle.png
  40. BIN
      GuangZuan/miniprogram/images/tabbar-home-active.png
  41. BIN
      GuangZuan/miniprogram/images/tabbar-home.png
  42. BIN
      GuangZuan/miniprogram/images/tabbar-mine-active.png
  43. BIN
      GuangZuan/miniprogram/images/tabbar-mine.png
  44. BIN
      GuangZuan/miniprogram/images/tabbar-trade-active.png
  45. BIN
      GuangZuan/miniprogram/images/tabbar-trade.png
  46. BIN
      GuangZuan/miniprogram/images/trade-listingbuy.png
  47. BIN
      GuangZuan/miniprogram/images/trade-listingsell.png
  48. BIN
      GuangZuan/miniprogram/images/trade-search.png
  49. 3 6
      GuangZuan/miniprogram/mHome/pages/goodsdetail/index.less
  50. 7 7
      GuangZuan/miniprogram/mHome/pages/goodsdetail/index.ts
  51. 3 2
      GuangZuan/miniprogram/mHome/pages/goodsdetail/index.wxml
  52. 1 1
      GuangZuan/miniprogram/mHome/pages/jewelry/list/index.ts
  53. 1 1
      GuangZuan/miniprogram/mMine/pages/address/list/index.ts
  54. 1 1
      GuangZuan/miniprogram/mMine/pages/myorders/list/index.ts
  55. 41 9
      GuangZuan/miniprogram/pages/circle/index.less
  56. 11 11
      GuangZuan/miniprogram/pages/circle/index.wxml
  57. 159 19
      GuangZuan/miniprogram/pages/home/index.less
  58. 56 23
      GuangZuan/miniprogram/pages/home/index.ts
  59. 55 15
      GuangZuan/miniprogram/pages/home/index.wxml
  60. 2 2
      GuangZuan/miniprogram/pages/login/index.wxml
  61. 11 10
      GuangZuan/miniprogram/pages/mine/index.ts
  62. 2 2
      GuangZuan/miniprogram/pages/mine/index.wxml
  63. 80 74
      GuangZuan/miniprogram/pages/trade/index.less
  64. 40 78
      GuangZuan/miniprogram/pages/trade/index.ts
  65. 35 28
      GuangZuan/miniprogram/pages/trade/index.wxml
  66. 11 1
      GuangZuan/miniprogram/services/api/common/index.ts
  67. 49 0
      GuangZuan/miniprogram/services/api/orders/index.ts
  68. 3 3
      GuangZuan/node_modules/.package-lock.json
  69. 4 0
      GuangZuan/node_modules/miniprogram-api-typings/CHANGELOG.md
  70. 1 0
      GuangZuan/node_modules/miniprogram-api-typings/README-en.md
  71. 1 0
      GuangZuan/node_modules/miniprogram-api-typings/README.md
  72. 1 1
      GuangZuan/node_modules/miniprogram-api-typings/package.json
  73. 1 1
      GuangZuan/node_modules/miniprogram-api-typings/types/wx/index.d.ts
  74. 661 16
      GuangZuan/node_modules/miniprogram-api-typings/types/wx/lib.wx.api.d.ts
  75. 1 1
      GuangZuan/node_modules/miniprogram-api-typings/types/wx/lib.wx.app.d.ts
  76. 1 1
      GuangZuan/node_modules/miniprogram-api-typings/types/wx/lib.wx.behavior.d.ts
  77. 1 1
      GuangZuan/node_modules/miniprogram-api-typings/types/wx/lib.wx.cloud.d.ts
  78. 1 1
      GuangZuan/node_modules/miniprogram-api-typings/types/wx/lib.wx.component.d.ts
  79. 1 1
      GuangZuan/node_modules/miniprogram-api-typings/types/wx/lib.wx.event.d.ts
  80. 1 1
      GuangZuan/node_modules/miniprogram-api-typings/types/wx/lib.wx.page.d.ts
  81. 2 2
      GuangZuan/node_modules/miniprogram-api-typings/types/wx/lib.wx.phys3D.d.ts
  82. 201 195
      GuangZuan/node_modules/miniprogram-api-typings/types/wx/lib.wx.xr-frame.d.ts
  83. 7 7
      GuangZuan/package-lock.json
  84. 1 1
      GuangZuan/package.json
  85. 51 1
      GuangZuan/typings/types/model/common.d.ts
  86. 778 0
      GuangZuan/typings/types/model/order.d.ts

+ 2 - 2
GuangZuan/miniprogram/components/nav-bar/nav-bar.ts

@@ -15,11 +15,11 @@ Component({
     },
     bgColor: {
       type: String,
-      value: '#fff'
+      value: '#407DB8'
     },
     titleColor: {
       type: String,
-      value: '#333'
+      value: '#fff'
     }
   },
 

+ 10 - 4
GuangZuan/miniprogram/components/tabbar/index.ts

@@ -1,3 +1,5 @@
+import { appConfig } from "../../config/index"
+
 Component({
     options: {
         multipleSlots: true, // 在组件定义时的选项中启用多slot支持
@@ -6,22 +8,26 @@ Component({
         tabs: {
             type: Array,
             value: [{
-              icon: 'home-o',
+              icon: appConfig.imgUrl+'tabbar-home',
+              aicon: appConfig.imgUrl+'tabbar-home-active',
               text: '首页',
               url: '/pages/home/index'
             },
             {
-              icon: 'todo-list-o',
+              icon: appConfig.imgUrl+'tabbar-trade',
+              aicon: appConfig.imgUrl+'tabbar-trade-active',
               text: '挂牌大厅',
               url: '/pages/trade/index'
             },
             {
-              icon: 'gem-o',
+              icon: appConfig.imgUrl+'tabbar-cycle-active',
+              aicon: appConfig.imgUrl+'tabbar-cycle-active',
               text: '钻石圈',
               url: '/pages/circle/index'
             },
             {
-              icon: 'contact',
+              icon: appConfig.imgUrl+'tabbar-mine',
+              aicon: appConfig.imgUrl+'tabbar-mine-active',
               text: '我的',
               url: '/pages/mine/index'
             }],

+ 2 - 2
GuangZuan/miniprogram/components/tabbar/index.wxml

@@ -5,8 +5,8 @@
                 <!--判断是否图片图标-->
                 <block wx:if="{{ item.icon }}">
                     <view class="cat-icon {{['cat-icon-' + item.name, active === index ? 'active' : '']}}">
-                        <image class="image" src="{{ item.icon.active }}" wx:if="{{ active === index }}"></image>
-                        <image class="image" src="{{ item.icon.inactive }}" wx:else></image>
+                        <image class="image" src="{{ item.aicon }}.png" wx:if="{{ active === index }}"></image>
+                        <image class="image" src="{{ item.icon }}.png" wx:else></image>
                         <text class="text">{{ item.label }}</text>
                     </view>
                 </block>

+ 2 - 1
GuangZuan/miniprogram/config/index.ts

@@ -1,4 +1,5 @@
 export const appConfig = {
   version: '1.0.0',
-  apiUrl: 'http://218.17.158.45:23015/cfg?key=test_gzzs'
+  apiUrl: 'http://218.17.158.45:23015/cfg?key=test_gzzs',
+  imgUrl: 'http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/'
 }

+ 12 - 6
GuangZuan/miniprogram/custom-tab-bar/index.ts

@@ -1,3 +1,5 @@
+import { appConfig } from "../config/index";
+
 Component({
   /**
    * 组件的属性列表
@@ -15,26 +17,30 @@ Component({
    */
   data: {
     active: 0,
-    color: '#888888',
-    activeColor: '#387BDC',
+    color: '#4C4C4E',
+    activeColor: '#407DB8',
     list: [
 			{
-				icon: 'home-o',
+				icon: appConfig.imgUrl+'tabbar-home',
+        aicon: appConfig.imgUrl+'tabbar-home-active',
 				text: '首页',
 				url: '/pages/home/index'
       },
       {
-				icon: 'todo-list-o',
+				icon: appConfig.imgUrl+'tabbar-trade',
+        aicon: appConfig.imgUrl+'tabbar-trade-active',
 				text: '挂牌大厅',
 				url: '/pages/trade/index'
 			},
       {
-				icon: 'gem-o',
+				icon: appConfig.imgUrl+'tabbar-cycle',
+        aicon: appConfig.imgUrl+'tabbar-cycle-active',
 				text: '钻石圈',
 				url: '/pages/circle/index'
       },
 			{
-				icon: 'contact',
+				icon: appConfig.imgUrl+'tabbar-mine',
+        aicon: appConfig.imgUrl+'tabbar-mine-active',
 				text: '我的',
 				url: '/pages/mine/index'
 			}

+ 2 - 2
GuangZuan/miniprogram/custom-tab-bar/index.wxml

@@ -1,5 +1,5 @@
-<van-tabbar active="{{ active }}" active-color="{{activeColor}}" inactive-color="{{color}}" bind:change="onChange">
-  <van-tabbar-item wx:for="{{ list }}" wx:key="index" icon="{{ item.icon }}">{{
+<van-tabbar active="{{ active }}" active-color="{{ activeColor }}" inactive-color="{{ color }}" bind:change="onChange">
+  <van-tabbar-item wx:for="{{ list }}" wx:key="index" icon="{{ active === index ? item.aicon : item.icon }}.png">{{
     item.text
   }}</van-tabbar-item>
 </van-tabbar>

BIN
GuangZuan/miniprogram/images/arrow-dwn.png


BIN
GuangZuan/miniprogram/images/home-bscyw.png


BIN
GuangZuan/miniprogram/images/home-bsfw.png


BIN
GuangZuan/miniprogram/images/home-cjjc.png


BIN
GuangZuan/miniprogram/images/home-cnys.png


BIN
GuangZuan/miniprogram/images/home-gpdt.png


BIN
GuangZuan/miniprogram/images/home-jcjy.png


BIN
GuangZuan/miniprogram/images/home-jjjy.png


BIN
GuangZuan/miniprogram/images/home-jsq.png


BIN
GuangZuan/miniprogram/images/home-more.png


BIN
GuangZuan/miniprogram/images/home-ss.png


BIN
GuangZuan/miniprogram/images/home-zscx.png


BIN
GuangZuan/miniprogram/images/home-zsss.png


BIN
GuangZuan/miniprogram/images/home_banner_bg.png


BIN
GuangZuan/miniprogram/images/home_logo.png


BIN
GuangZuan/miniprogram/images/huilv_bg.png


BIN
GuangZuan/miniprogram/images/listing-buy.png


BIN
GuangZuan/miniprogram/images/listing-sell.png


BIN
GuangZuan/miniprogram/images/mine-bg.png


BIN
GuangZuan/miniprogram/images/mine-bsfw.png


BIN
GuangZuan/miniprogram/images/mine-cjjc.png


BIN
GuangZuan/miniprogram/images/mine-fpxx.png


BIN
GuangZuan/miniprogram/images/mine-gywm.png


BIN
GuangZuan/miniprogram/images/mine-mmxg.png


BIN
GuangZuan/miniprogram/images/mine-qyzh.png


BIN
GuangZuan/miniprogram/images/mine-shdz.png


BIN
GuangZuan/miniprogram/images/mine-wddd.png


BIN
GuangZuan/miniprogram/images/mine-wdkc.png


BIN
GuangZuan/miniprogram/images/mine-wdly.png


BIN
GuangZuan/miniprogram/images/mine_qyzh.png


BIN
GuangZuan/miniprogram/images/search.png


BIN
GuangZuan/miniprogram/images/tabbar-cycle-active.png


BIN
GuangZuan/miniprogram/images/tabbar-cycle.png


BIN
GuangZuan/miniprogram/images/tabbar-home-active.png


BIN
GuangZuan/miniprogram/images/tabbar-home.png


BIN
GuangZuan/miniprogram/images/tabbar-mine-active.png


BIN
GuangZuan/miniprogram/images/tabbar-mine.png


BIN
GuangZuan/miniprogram/images/tabbar-trade-active.png


BIN
GuangZuan/miniprogram/images/tabbar-trade.png


BIN
GuangZuan/miniprogram/images/trade-listingbuy.png


BIN
GuangZuan/miniprogram/images/trade-listingsell.png


BIN
GuangZuan/miniprogram/images/trade-search.png


+ 3 - 6
GuangZuan/miniprogram/mHome/pages/goodsdetail/index.less

@@ -147,16 +147,13 @@
       }
 
       &__name {
-        font-size: 20px;
+        font-size: 16px;
         padding: 5px 0px;
       }
 
-      &__weight, &__gprice, &__market-price {
-        font-size: 14px;
-      }
-
-      &__weight, &__gprice {
+      &__weight, &__gprice, &__price, &__ordertime {
         width: 50%;
+        font-size: 13px;
       }
     }
   }

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

@@ -25,7 +25,9 @@ Page({
     /// 颜色
     colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod'],
     /// 操作
-    operator: 1
+    operator: 1,
+    /// 委托时间
+    ordertime: ''
   },
 
   /**
@@ -189,17 +191,15 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options: any) {
-    /// 单据信息
-    const item = JSON.parse(options.item)
-    if (item) {
-      this.setData({ order: item })
-    }
     /// 商品编号
-    this.setData({ goodsno: options.goodsno })
+    this.setData({ goodsno: options.goodsno, ordertime: options.ordertime })
     /// 获取商品数据
     this.getGoods()
     /// 查询履约模板信息
     this.queryPermancePlanTmp()
+    /// 单据信息
+    const item = JSON.parse(options.item)
+    if (item) { this.setData({ order: item }) }
   },
 
   /**

+ 3 - 2
GuangZuan/miniprogram/mHome/pages/goodsdetail/index.wxml

@@ -30,7 +30,8 @@
         <text class="content__item__gprice">克拉单价:$ {{ goods.priceper }}</text>
       </view>
       <view class="content__item">
-        <text class="content__item__market-price">市场价:¥{{ goods.marketprice }}</text>
+        <text class="content__item__price">市场价:¥{{ goods.marketprice }}</text>
+        <text class="content__item__ordertime">挂牌时间:{{ ordertime }}</text>
       </view>
   </view>
 
@@ -113,7 +114,7 @@
 
    <!-- 按钮 -->
    <view class="button-view" style="padding-bottom: {{ safeBottom }}px;">
-    <van-icon name="{{ operator === 1 ? 'star' : 'star-o' }}" color="red" size="25" bind:click="onFavoriteOperator"/>
+    <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>
 </view>

+ 1 - 1
GuangZuan/miniprogram/mHome/pages/jewelry/list/index.ts

@@ -36,7 +36,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])}`
+      url: "/mHome/pages/goodsdetail/index?goodsno="+this.data.sellOrders[num].goodsno+'&item='+`${JSON.stringify(this.data.sellOrders[num])}`+'&ordertime='+this.data.sellOrders[num].ordertime
     })
   },
 

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

@@ -1,4 +1,4 @@
-import {queryUserReceiveInfo} from "../../../../services/api/common/index"
+import { queryUserReceiveInfo } from "../../../../services/api/common/index"
 import { userid } from "../../../../services/utils"
 import { hideLoading, showLoading } from "../../../../utils/message/index"
 

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

@@ -157,7 +157,7 @@ Page({
             break;
           case 0:  /// 出售挂牌
             wx.navigateTo({
-              url: '/mHome/pages/goodsdetail/index?goodsno='+this.data.sellorders[index].goodsno
+              url: '/mHome/pages/goodsdetail/index?goodsno='+this.data.sellorders[index].goodsno+'&ordertime='+this.data.sellorders[index].ordertime
             })
             break;
           default:

+ 41 - 9
GuangZuan/miniprogram/pages/circle/index.less

@@ -8,11 +8,11 @@
     width: 100%;
     padding-bottom: 10px;
 
-    .nav-tabview {
-      background-color: #407DB8;
-      width: 70%;
+    .tab-view  {
+      --tabs-nav-background-color: #407DB8;
+      width: 50%;
 
-      .tab-view {
+      .van-tabs__nav {
         background-color: #407DB8;
         width: 100%;
       }
@@ -20,8 +20,7 @@
   }
 
   .title-view {
-    margin: 10px;
-    background-color: #f0f0f0;
+    background-color: #fff;
     border-radius: 10px;
     display: flex;
     align-items: center;
@@ -39,7 +38,7 @@
       height: 25px;
   
       text {
-        color: #aaa;
+        color: #999999;
         font-size: 13px;
         text-align: center;
       }
@@ -71,8 +70,8 @@
   align-items: center;
   align-content: center;
   flex-direction: column;
-  padding: 5px 10px;
-  border: 1px solid #C6DFFF;
+  padding: 10px 10px;
+  background-color: #fff;
 
   .item-view-up, .item-view-dwn {
     display: flex;
@@ -126,6 +125,39 @@
 /* 选中时添加这个 样式 */
 .active {
   background: #E6F1FF;
+  border: 1px solid #C6DFFF;
+}
+
+ /* 三角形 */
+ .active::before {
+  content: '';
+  display: inline-block;
+  position: absolute;
+  top: 0;
+  left: 5px;
+  width: 0;
+  height: 0;
+  border-top: 25px solid #407DB8;
+  border-right: 25px solid transparent; 
+}
+
+/* 小勾 */
+.active::after {
+  content: '';
+  position: absolute;
+  left: 7.5px;
+  top: 5px;
+  width: 8px;
+  height: 4px;
+  display: inline-block;
+  border: 1px solid #fff;
+  border-width: 0 0 2px 2px;
+  transform: rotate(-45deg);
+  -ms-transform: rotate(-45deg);
+  -moz-transform: rotate(-45deg);
+  -webkit-transform: rotate(-45deg);
+  -o-transform: rotate(-45deg);
+  vertical-align: baseline; 
 }
 
 .van-swipe-cell__right {

+ 11 - 11
GuangZuan/miniprogram/pages/circle/index.wxml

@@ -2,9 +2,9 @@
 <view class="top-view" style="position: sticky; top: 0; z-index: 999;"> 
   <!-- 导航栏 -->
   <view class="nav-view" style="padding-top: {{ statusBarHeight }}px; height: {{ navHeight }}px;">
-    <view class="nav-tabview">
+    <view class="tab-view">
       <!-- tabs -->
-      <van-tabs nav-class="tab-view" sticky animated bind:change="onTabChange" color="#fff" line-width="20px" title-inactive-color="#CAE5FF" title-active-color="#fff">
+      <van-tabs custom-class="van-tabs" nav-class="van-tabs__nav" sticky animated bind:change="onTabChange" color="#fff" line-width="20px" title-inactive-color="#CAE5FF" title-active-color="#fff">
         <van-tab wx:for="{{ tabs }}" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" title="{{ itm.name }}"/>
       </van-tabs>  
     </view>
@@ -13,27 +13,27 @@
   <!-- 列头 --> 
   <view class="title-view">
     <view class="title-view-up">
-      <text wx:for="{{titles[0]}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">{{itm}}</text>
+      <text wx:for="{{ titles[0] }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">{{itm}}</text>
     </view>
     <view class="title-view-dwn">
-      <text wx:for="{{titles[1]}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">{{itm}}</text>
+      <text wx:for="{{ titles[1] }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">{{itm}}</text>
     </view>
   </view>
 </view>
 
 <!-- 内容滚动视图 --> 
-<scroll-view class="content-view">
+<scroll-view class="content-view" style="background-color: #f0f0f0;">
   <!-- 出售大厅数据 --> 
-  <van-swipe-cell wx:for="{{values}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx" id="{{idx}}" right-width="{{ width }}" bind:click="onSelectItem">
-    <view class="item-view {{favorites[idx].isChecked ? 'active' : ''}}">
+  <van-swipe-cell wx:for="{{ values }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx" id="{{idx}}" right-width="{{ width }}" bind:click="onSelectItem">
+    <view class="item-view {{ favorites[idx].isChecked ? 'active' : ''}}">
       <view class="item-view-up">
-        <text wx:for="{{itm.up}}" wx:for-item="data" wx:for-index="idx" wx:key="idx">{{data}}</text>
+        <text wx:for="{{ itm.up }}" wx:for-item="data" wx:for-index="idx" wx:key="idx">{{data}}</text>
       </view>
       <view class="item-view-mid">
-        <text wx:for="{{itm.mid}}" wx:for-item="data" wx:for-index="idx" wx:key="idx">{{data}}</text>
+        <text wx:for="{{ itm.mid }}" wx:for-item="data" wx:for-index="idx" wx:key="idx">{{data}}</text>
       </view>
-      <view class="item-view-dwn" wx:if="{{itm.dwn.length != 0}}">
-        <text wx:for="{{itm.dwn}}" wx:for-item="data" wx:for-index="idx" wx:key="idx">{{data}}</text>
+      <view class="item-view-dwn" wx:if="{{ itm.dwn.length != 0 }}">
+        <text wx:for="{{ itm.dwn }}" wx:for-item="data" wx:for-index="idx" wx:key="idx">{{data}}</text>
       </view>
     </view>
     <!-- 取消收藏 --> 

+ 159 - 19
GuangZuan/miniprogram/pages/home/index.less

@@ -1,5 +1,11 @@
 /* pages/home/index.less */
 
+.top-view {
+  position: sticky;
+  top: 0px;
+  z-index: 999;
+}
+
 .banner-bg {
   display: flex;
   flex-direction: column;
@@ -11,14 +17,15 @@
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
-    padding: 5px;
+    padding: 20px 10px;
     align-content: center;
     width: 95%;
   }
 
   .banner {
     height: 210px;
-    width: 95%;
+    width: 92%;
+    border-radius: 10px;
 
     .swiper-item, image {
       width: 100%;
@@ -28,32 +35,165 @@
 
 .statistics {
   display: flex;
-  flex-direction: row;
+  flex-direction: column;
   justify-content: space-between;
-  margin: 10px;
-  padding: 15px;
+  margin: 15px;
+  padding-top: 15px;
+  background-color: #fff;
+  border-radius: 10px;
 
-  .statistics-item {
+  &__top {
     display: flex;
-    flex-direction: column;
-    justify-content: center;
-    width: 100%;
+    flex-direction: row;
+    justify-content: space-between;
+    align-content: center;
+    align-items: center;
+    border-radius: 0px 0px 10px 10px;
 
-    text:nth-child(1) {
-      color: #333;
-      font-size: 30rpx;
-      font-weight: bold;
-      text-align: center;
-      padding-right: 10px;
+    .statistics-item {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      width: 100%;
+  
+      text:nth-child(1) {
+        color: #333;
+        font-size: 30rpx;
+        font-weight: bold;
+        text-align: center;
+        padding-right: 10px;
+      }
+  
+      text:nth-child(2) {
+        color: #333;
+        font-size: 24rpx;
+        text-align: center;
+        padding-right: 10px;
+      }
     }
+  }
 
-    text:nth-child(2) {
-      color: #333;
-      font-size: 24rpx;
+  &__rate {
+    background-color: #9DBAD6;
+    display: flex;
+    flex-direction: row;
+    align-content: center;
+    align-items: center;
+    margin-top: 10px;
+    border-radius: 0px 0px 10px 10px; 
+    
+    .exchangerate {
+      color: #fff;
+      font-size: 13px;
+      height: 25px;
+      width: 100%;
       text-align: center;
-      padding-right: 10px;
+      padding-top: 5px;
+      border-radius: 10px 0px 10px 0px ;
     }
   }
+  
 }
 
+.memberinfo {
+  display: flex;
+  flex-direction: column;
+
+  &__top {
+    display: flex;
+    flex-direction: row;
+    width: 100%;
+    height: 44px;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 1px solid #f0f0f0;
+
+    .title {
+      margin-left: 10px;
+      color: #000;
+      font-size: 14px;
+      text-align: center;
+      border-left: 5px solid #407DB8;
+      width: 80px;
+    }
 
+    .more {
+      color: #4C4C4E;
+      font-size: 12px;
+      margin-right: 10px;
+    }
+  }
+
+  &__list {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    align-content: center;
+    align-items: center;
+
+    &__item {
+      display: flex;
+      flex-direction: row;
+      align-content: center;
+      align-items: center;
+      justify-content: space-around;
+      width: 95%;
+      border-bottom: 1px solid #f0f0f0;
+      padding: 10px 0px;
+
+      &__right {
+        display: flex;
+        flex-direction: column;
+        width: 100%;
+        align-content: center;
+        align-items: center;
+        margin-left: 15px;
+        height: 100%;
+
+        &__top, &__btm {
+          height: 35px;
+        }
+
+        &__top, &__mid {
+          display: flex;
+          flex-direction: row;
+          justify-content: start;
+          align-items: center;
+          width: 100%;
+
+          .goodsname, .username {
+            color: #000000;
+            font-size: 15px;
+            margin-right: 10px;
+            font-weight: bold;
+          } 
+
+          .tag {
+            background-color: #407DB8;
+            padding: 2.5px 10px;
+            border-radius: 10px;
+            color: #fff;
+            font-size: 11px;
+          }
+        }
+
+        &__mid {
+          height: 100%;
+        }
+
+        &__btm {
+          display: flex;
+          flex-direction: row;
+          justify-content: space-between;
+          align-items: center;
+          width: 100%;
+
+          .mobile, .wechat {
+            font-size: 13px;
+            color: #000;
+          }
+        }
+      }
+    }
+  }
+}

+ 56 - 23
GuangZuan/miniprogram/pages/home/index.ts

@@ -1,8 +1,9 @@
 import services from "../../services/index"
-import { queryImageConfigs, queryNotice } from "../../services/api/common/index"
+import { queryImageConfigs, queryNotice, getGZMemberInfo } from "../../services/api/common/index"
 import { homeData } from "../../services/api/orders/index"
 import { loginid, loginQuery, userid } from "../../services/utils"
 import { hideLoading, showLoading } from "../../utils/message/index"
+import { appConfig } from "../../config/index"
 
 Page({
 
@@ -17,25 +18,27 @@ Page({
     /// banner轮播图
     banners: [''],
     /// 功能菜单
-    menus: [{id: 1, icon: 'home-gpdt', title: '挂牌大厅', path: '/pages/trade/index'}, 
-            {id: 2, icon: 'home-ss', title: '钻石首饰', path: '/mHome/pages/jewelry/list/index'},
-            {id: 3, icon: 'home-cjjc', title: '出境检测', path: '/mHome/pages/inspection/list/index'}, 
-            {id: 4, icon: 'home-bsfw', title: '保税服务', path: '/mHome/pages/bond/list/index'}, 
-            {id: 5, icon: 'home-bscyw', title: '保税仓业务', path: '/pages/trade/index'}, 
-            {id: 6, icon: 'home-zsss', title: '钻石搜索', path: '/mHome/pages/search/index'}, 
-            {id: 7, icon: 'home-jsq', title: '钻石计算器', path: '/mHome/pages/calculator/index'}, 
-            {id: 8, icon: 'home-zscx', title: '证书查询', path: '/mHome/pages/cerserach/index'}, 
-            {id: 9, icon: 'home-jjjy', title: '竞价交易', path: '/mHome/pages/bond/list/index'}, 
-            {id: 10, icon: 'home-cnys', title: '产能预售', path: '/mHome/pages/bond/list/index'}, 
-            {id: 11, icon: 'home-jcyj', title: '集采交易', path: '/mHome/pages/bond/list/index'}],
+    menus: [{id: 1, icon: appConfig.imgUrl+'home-gpdt', title: '挂牌大厅', path: '/pages/trade/index'}, 
+            {id: 2, icon: appConfig.imgUrl+'home-ss', title: '钻石首饰', path: '/mHome/pages/jewelry/list/index'},
+            {id: 3, icon: appConfig.imgUrl+'home-cjjc', title: '出境检测', path: '/mHome/pages/inspection/list/index'}, 
+            {id: 4, icon: appConfig.imgUrl+'home-bsfw', title: '保税服务', path: '/mHome/pages/bond/list/index'}, 
+            {id: 5, icon: appConfig.imgUrl+'home-bscyw', title: '保税仓业务', path: '/pages/trade/index'}, 
+            {id: 6, icon: appConfig.imgUrl+'home-zsss', title: '钻石搜索', path: '/mHome/pages/search/index'}, 
+            {id: 7, icon: appConfig.imgUrl+'home-jsq', title: '钻石计算器', path: '/mHome/pages/calculator/index'}, 
+            {id: 8, icon: appConfig.imgUrl+'home-zscx', title: '证书查询', path: '/mHome/pages/cerserach/index'}, 
+            {id: 9, icon: appConfig.imgUrl+'home-jjjy', title: '竞价交易', path: '/mHome/pages/bond/list/index'}, 
+            {id: 10, icon: appConfig.imgUrl+'home-cnys', title: '产能预售', path: '/mHome/pages/bond/list/index'}, 
+            {id: 11, icon: appConfig.imgUrl+'home-jcjy', title: '集采交易', path: '/mHome/pages/bond/list/index'}],
     /// 统计
-    statistics: [{id: 1, title: '出售中', value: 0, class: ''}],
+    statistics: { top: [{id: 1, title: '出售中', value: 0, class: ''}], rate: '' },
     /// tabs
     tabs:[{id: 1, title: '公告'}, {id: 2, title: '消息'}],
     /// 公告消息
     notice: {},
     /// 公告系XO
     msgs: [{}],
+    /// 会员信息
+    members: [{}],
     /// 是否为空
     isEmpty: true
   },
@@ -68,13 +71,14 @@ Page({
       success:(res) => {
         /// 数据设置
         this.setData({ 
-          statistics: [
+          statistics: { 
+            top:[
             { id: 1, title: '出售中', value: res.data.transactionssold, class: 'transactionssold' },
             { id: 2, title: '求购中', value: res.data.transactioninpurchase, class: 'transactioninpurchase' },
             { id: 3, title: '已购买', value: res.data.purchasedtransactions, class: 'purchasedtransactions' },
-            { id: 4, title: '已出售', value: res.data.transactionsonsale, class: 'transactionsonsale' },
-            { id: 5, title: '今日汇率', value: loginQuery().exchangeRateConfigs[0].exchangerate, class: 'exchangerate' },
-          ] 
+            { id: 4, title: '已出售', value: res.data.transactionsonsale, class: 'transactionsonsale' }], 
+            rate: '今日汇率   '+loginQuery().exchangeRateConfigs[0].exchangerate.toString()
+          }
         })
       }
     })
@@ -103,6 +107,39 @@ Page({
             this.setData({ 
               notice: res.data[0],
               msgs: res.data,
+            })
+          })
+        },
+        fail: (emsg) => {
+          /// 加载失败
+          hideLoading(()=>{}, emsg)
+        }
+      })
+    })
+  },
+
+   /**
+   * 获取会员风采表
+   */
+  queryGZMemberInfo(){
+    /// loading
+    showLoading(()=>{
+      /// 发送查询请求
+      getGZMemberInfo({
+        success:(res) => {
+          /// 数据为空
+          if (res.code != 200) {
+            hideLoading(()=>{}, '会员信息请求失败,原因:'+res.msg)
+            return
+          }
+          hideLoading(()=>{
+            /// 加载成功 数据复制
+            this.setData({ 
+              members: res.data.map(itm => {
+                var obj = itm
+                obj.imageurl = (services.config.openApiUrl+itm.imageurl).replace('./uploadFile', '/uploadFile')
+                return obj
+             }),
               isEmpty: res.data.length === 0
             })
           })
@@ -133,12 +170,6 @@ Page({
     })
   },
 
-  /// onTabChange
-  onTabChange(e: any) {
-    /// 查询公告消息
-    this.queryNotice(e.detail.index)
-  },
-
   /**
    * 证书查询
    */
@@ -182,6 +213,8 @@ Page({
     this.queryNotice(1)
     /// 查询轮播图数据
     this.queryImageConfigs()
+    /// 查询会员信息
+    this.queryGZMemberInfo()
   },
 
   /**

+ 55 - 15
GuangZuan/miniprogram/pages/home/index.wxml

@@ -1,18 +1,22 @@
-<!-- 导航栏 -->
-<nav-bar title="广州钻石交易中心" left="{{ false }}"></nav-bar>
 
-<scroll-view style="padding-bottom: 80px;" scroll-y>
+
+<!-- 头部视图 -->
+<view class="top-view" style="position: sticky; top: 0; z-index: 999;"> 
+  <!-- 导航栏 -->
+  <nav-bar title="广州钻石交易中心" bgColor="#fff" titleColor="#000" left="{{ false }}"></nav-bar>
+</view>
+
+<scroll-view style="padding-bottom: 80px; background-color: #f0f0f0;" scroll-y>
   <!-- banner视图 -->
-  <view class="banner-bg">
-    <view class="banner-bg__top">
-      <image style="width: 60%;" mode="widthFix" src="http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/login_logo.png">logo</image>
-      <van-button type="info" round icon="search">证书号搜索钻石</van-button>
+  <view class="banner-bg" style="background-image: url('../../images/home_banner_bg.png'); background-size: 100% 100%;">
+    <view class="banner-bg__top" style="padding: 5px 0px;">
+      <image style="width: 50%;" mode="widthFix" src="../../images/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>
       <swiper-item class="banner_item" wx:for="{{ banners }}" wx:key="index" id="{{ item }}">
         <view class="swiper-item">
-          <image src='{{ item }}' mode="widthFix"></image>
+          <image src='{{ item }}' style="border-radius: 10px;" mode="widthFix"></image>
         </view>
       </swiper-item>
     </swiper>
@@ -20,19 +24,55 @@
 
   <!-- 统计 -->
   <view class="statistics">
-    <view class="statistics-item" wx:for="{{ statistics }}" wx:key="id" wx:for-index="idx" wx:for-item="itm">
-      <text class="{{ itm.class }}">{{ itm.value }}</text>
-      <text class="{{ itm.class }}">{{ itm.title }}</text>
+    <view class="statistics__top">
+      <view class="statistics-item" wx:for="{{ statistics.top }}" wx:key="id" wx:for-index="idx" wx:for-item="itm">
+        <text class="{{ itm.class }}">{{ itm.value }}</text>
+        <text class="{{ itm.class }}">{{ itm.title }}</text>
+      </view>
+    </view>
+    <view class="statistics__rate">
+      <text class="exchangerate">{{ statistics.rate }}</text>
     </view>
   </view>
 
-  <!-- 功能菜单 -->
-  <van-grid column-num="4" border="{{ false }}" icon-size="{{ 50 }}">
-    <van-grid-item wx:for="{{ menus }}" wx:for-item="index" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{ itm.id }}" url="{{ itm.path }}" text="{{ itm.title }}" icon="http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/{{ itm.icon }}.png"/>
-  </van-grid>
+  <view style="background-color: #fff;">
+    <!-- 功能菜单 -->
+    <van-grid column-num="5" border="{{ false }}" icon-size="{{ 40 }}">
+      <van-grid-item content-class ="van-grid-item" wx:for="{{ menus }}" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{ itm.id }}" url="{{ itm.path }}" text="{{ itm.title }}" icon="{{ itm.icon }}.png"/>
+    </van-grid>
+  </view>
 
   <!-- 通知栏 -->
   <van-notice-bar wx:if="{{ msgs.length != 0 }}" left-icon="volume-o" mode="link" bind:click="goToMsg" color="#333" background="#f3f3f3" text="{{ notice.title }}" scrollable />
+
+  <view style="background-color: #f0f0f0; width: 100%; height: 15px;"></view>
+
+  <!-- 会员风采 -->
+  <view class="memberinfo" style="background-color: white;">
+    <view class="memberinfo__top">
+      <text class="title">会员风采</text>
+      <text class="more">更多 ></text>
+    </view>
+    <view class="memberinfo__list">
+      <view class="memberinfo__list__item" wx:for="{{ members }}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">
+        <van-image width="70" height="70" radius="10" fit="cover" src="{{ itm.imageurl }}"></van-image>
+        <view class="memberinfo__list__item__right">
+          <view class="memberinfo__list__item__right__top">
+            <text class="goodsname">{{ itm.membername }}</text>
+            <text class="username">{{ itm.contactname }}</text>
+          </view>
+          <view class="memberinfo__list__item__right__mid">
+            <text class="tag">{{ itm.membertags }}</text>
+          </view>
+          <view class="memberinfo__list__item__right__btm">
+            <text class="mobile">电话: {{ itm.contactphone }}</text>
+            <text class="wechat">微信: {{ itm.contactwx }}</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+
 </scroll-view>
 
 

+ 2 - 2
GuangZuan/miniprogram/pages/login/index.wxml

@@ -13,10 +13,10 @@
 </view>
 
 <!--  登录按钮  -->
-<van-button loading="{{isLoding}}" round color="linear-gradient(to right, #FF7252, #55A154)" block style="width: 90%; padding-top: 5px;" loading-text="登录中..." bind:click="onLogin">登录</van-button>
+<van-button loading="{{ isLoding }}" round color="#407DB8" block style="width: 90%; padding-top: 5px;" loading-text="登录中..." bind:click="onLogin">登录</van-button>
 
 <!--  版权信息  -->
-<van-divider contentPosition="center" textColor="#1989fa" style="position: absolute; bottom: {{ safeBottom+20 }}px;" customStyle="color: #1989fa; border-color: #1989fa; font-size: 10px;">Copyright 2022 GuangZuan. ALL Right Reserved.版本号V{{version}}
+<van-divider contentPosition="center" textColor="#407DB8" style="position: absolute; bottom: {{ safeBottom+20 }}px;" customStyle="color: #1989fa; border-color: #1989fa; font-size: 10px;">Copyright 2022 GuangZuan. ALL Right Reserved.版本号V{{ version }}
 </van-divider>
 
 <!-- toast -->

+ 11 - 10
GuangZuan/miniprogram/pages/mine/index.ts

@@ -1,3 +1,4 @@
+import { appConfig } from '../../config/index';
 import Dialog from  '../../miniprogram_npm/@vant/weapp/dialog/dialog'
 import { queryBankAccountSign } from '../../services/api/account/index';
 import { accountid, loginid, loginQuery, taAccount, userid } from '../../services/utils';
@@ -10,18 +11,18 @@ Page({
    */
   data: {
     // 功能菜单项
-    menulists: [{id: 1, title: '我的库存', img: 'mine-wdkc', path: '/mMine/pages/myinventorys/list/index'}, 
-                {id: 2, title: "我的订单", img: 'mine-wddd',  path: '/mMine/pages/myorders/list/index'}, 
-                {id: 3, title: '我的履约', img: 'mine-wdly',    path: '/mMine/pages/myperformance/list/index'}, 
-                {id: 4, title: '我的出境', img: 'mine-cjjc',         path: '/mHome/pages/inspection/list/index'}, 
-                {id: 5, title: '我的保税', img: 'mine-bsfw',      path: '/mHome/pages/bond/list/index'}],
+    menulists: [{id: 1, title: '我的库存', img: appConfig.imgUrl+'mine-wdkc', path: '/mMine/pages/myinventorys/list/index'}, 
+                {id: 2, title: "我的订单", img: appConfig.imgUrl+'mine-wddd',  path: '/mMine/pages/myorders/list/index'}, 
+                {id: 3, title: '我的履约', img: appConfig.imgUrl+'mine-wdly',    path: '/mMine/pages/myperformance/list/index'}, 
+                {id: 4, title: '我的出境', img: appConfig.imgUrl+'mine-cjjc',         path: '/mHome/pages/inspection/list/index'}, 
+                {id: 5, title: '我的保税', img: appConfig.imgUrl+'mine-bsfw',      path: '/mHome/pages/bond/list/index'}],
 
     // 列表菜单项
-    tablelists: [{id: 1, title: '签约账户', iconfont: 'mine-qyzh',   path: '/mMine/pages/bank/index'}, 
-                 {id: 2, title: '收货地址', iconfont: 'mine-shdz',    path: '/mMine/pages/address/list/index'}, 
-                 {id: 3, title: '发票信息', iconfont: 'mine-fpxx',    path: '/mMine/pages/invoice/list/index'}, 
-                 {id: 4, title: '账户安全', iconfont: 'mine-mmxg',    path: '/mMine/pages/modifypwd/index'}, 
-                 {id: 5, title: '关于我们', iconfont: 'mine-gywm',    path: '/mMine/pages/about/about/index'}],
+    tablelists: [{id: 1, title: '签约账户', iconfont: appConfig.imgUrl+'mine-qyzh',   path: '/mMine/pages/bank/index'}, 
+                 {id: 2, title: '收货地址', iconfont: appConfig.imgUrl+'mine-shdz',    path: '/mMine/pages/address/list/index'}, 
+                 {id: 3, title: '发票信息', iconfont: appConfig.imgUrl+'mine-fpxx',    path: '/mMine/pages/invoice/list/index'}, 
+                 {id: 4, title: '账户安全', iconfont: appConfig.imgUrl+'mine-mmxg',    path: '/mMine/pages/modifypwd/index'}, 
+                 {id: 5, title: '关于我们', iconfont: appConfig.imgUrl+'mine-gywm',    path: '/mMine/pages/about/about/index'}],
     /// 微信头像 
     avatarUrl: "",
     /// 微信昵称

+ 2 - 2
GuangZuan/miniprogram/pages/mine/index.wxml

@@ -41,7 +41,7 @@
   <!-- 功能菜单项 -->
   <van-grid column-num="5" wx:if="{{ menulists.count != 0 }}">
     <van-grid-item wx:for="{{ menulists }}" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{ itm.id }}" link-type="navigateTo" url="{{ itm.path }}">
-      <image slot="icon" style="width: 25px; height: 25px;" src="http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/{{ itm.img }}.png"></image>
+      <image slot="icon" style="width: 25px; height: 25px;" src="{{ itm.img }}.png"></image>
       <text slot="text" style="font-size: 14px;">{{ itm.title }}</text>
     </van-grid-item>
   </van-grid>
@@ -51,7 +51,7 @@
   <!-- 列表菜单项 -->
   <van-cell-group>
     <van-cell clickable title-class="cell-title" size="large" center is-link border wx:for="{{ tablelists }}" clickable wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{itm.id}}" title="{{ itm.title }}" link-type="navigateTo" url="{{itm.path}}">
-      <image slot="icon" style="width: 25px; height: 25px;" src="http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/{{ itm.iconfont }}.png"></image>
+      <image slot="icon" style="width: 25px; height: 25px;" src="{{ itm.iconfont }}.png"></image>
     </van-cell>
   </van-cell-group>
 

+ 80 - 74
GuangZuan/miniprogram/pages/trade/index.less

@@ -15,7 +15,7 @@
       align-items: center;
       margin-right: 12px;
       width: 75%;
-      background-color: #407DB8;
+      --tabs-nav-background-color: #407DB8;
       padding-bottom: 10px;
   
       van-tabs {
@@ -60,103 +60,109 @@
     }
   }
 
-  .title-view {
-    margin: 10px 5px;
-    background-color: #f0f0f0;
+  .dropdown-menu {
+    --dropdown-menu-title-font-size: 12px;
+  }
+}
+
+.content-view {
+  background-color: #f0f0f0;
+
+  .vanSwipeCell-item {
+    background-color: #fff;
+    margin: 10px 10px 0px 10px;
     border-radius: 10px;
     display: flex;
+    flex-direction: column;
     align-items: center;
     align-content: center;
-    flex-direction: column;
-    padding: 5px 10px;
-  
-    .title-view-up, .title-view-mid, .title-view-dwn {
+
+    &__top, &__dwn, &__mid {
+      width: 100%;
+    }
+
+    &__top {
+      border-bottom: 1px solid #f0f0f0;
+      padding: 10px;
       display: flex;
       flex-direction: row;
       justify-content: space-between;
-      align-items: center;
-      width: 100%;
       align-content: center;
-      height: 25px;
-  
-      text {
-        color: #AAA;
-        font-size: 13px;
-        text-align: center;
-      }
+      align-items: center;
 
-      :first-child {
-        text-align: left;
+      text:nth-child(1), text:nth-child(2) {
+        color: #000;
+        font-size: 14px;
+        margin-left: 10px;
       }
 
-      :last-child {
-        text-align: right;
+      text:nth-last-child(1) {
+        color: #999;
+        font-size: 14px;
+        margin-right: 10px;
       }
     }
-  
-    .title-view-up {
-      border-bottom: 1px solid #ddd;
-      padding-bottom: 5px;
-    }
 
-    .title-view-mid {
-      padding: 5px 0px;
-    }
-  }
-}
-  
-.item-view {
-  margin: 5px;
-  border-radius: 10px;
-  display: flex;
-  align-items: center;
-  align-content: center;
-  flex-direction: column;
-  padding: 5px 10px;
-  border: 1px solid #E6F1FF;
+    &__mid {
+      padding: 10px;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-content: center;
+      align-items: center;
 
-  .item-view-up, .item-view-dwn {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-    height: 50%;
-    width: 100%;
-    align-content: center;
-    height: 25px;
-
-    text {
-      color: #4D565D;
-      font-size: 13px;
-      /*超出隐藏*/
-      overflow: hidden;
-        /*溢出不换行*/
-      white-space: nowrap;
-      /*溢出显示用省略号*/
-      text-overflow: ellipsis;
-      text-align: center;
-    }
+      &__left, &__mid {
+        margin-left: 10px;
+      }
 
-    :first-child {
-      text-align: left;
-    }
+      &__left, &__mid, &__right {
+        display: flex;
+        flex-direction: column;
+        align-content: center;
+        width: 100%;
 
-    :last-child {
-      text-align: right;
+        text {
+          color: #4D565D;
+          font-size: 13px;
+          padding: 2.5px 0px;
+        }
+      }
+
+      &__right {
+        margin-right: 10px;
+        border: 1px solid #407DB8;
+        width: 40%;
+        border-radius: 10px;
+        padding: 10px 0px;
+        align-items: center;
+      }
     }
-  }
 
-  .item-view-up {
-    border-bottom: 1px solid #E6F1FF;
-    padding-bottom: 5px;
+    &__dwn {
+      border-top: 1px solid #f0f0f0;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-content: center;
+      align-items: center;
+      padding: 10px;
+
+      text:nth-child(1) {
+        color: #000;
+        font-size: 14px;
+        margin-left: 10px;
+      }
 
-    text {
-      width: 25%;
+      text:nth-child(2) {
+        color: #999;
+        font-size: 12px;
+        margin-right: 10px;
+      }
     }
   }
 }
 
-.van-swipe-cell__right {
+.vanSwipeCell-right {
   height: inherit;
   color: white;
   display: flex;

+ 40 - 78
GuangZuan/miniprogram/pages/trade/index.ts

@@ -2,9 +2,9 @@ import { queryBuyOrder, queryDiamond } from "../../services/api/orders/index"
 import { clientType, isEncrypted, marketid, protoHeader, userid, timetample, getEnumList, getErrorMsg } from "../../services/utils";
 import { FunCode } from "../../constants/enum/funcode";
 import { sendMsgToMQ } from "../../services/api/common/index";
-import { isnullstr } from "../../utils/util";
 import { hideLoading, showLoading, showToast } from "../../utils/message/index";
 import { encryptBody } from "../../utils/websocket/crypto";
+import { appConfig } from "../../config/index";
 
 Page({
 
@@ -23,17 +23,11 @@ Page({
     /// tabs
     tabs: [{id: 1, name: '出售大厅'}, {id: 2, name: '求购大厅'}],
     /// 功能菜单
-    menus: [{id: "listing-buy", icon: 'trade-listingbuy', title: '求购', path: '/mTrade/pages/listingbuy/index'}, 
-            {id: "listing-sell", icon: 'trade-listingsell', title: '出售', path: '/mTrade/pages/listingsell/index'},
-            {id: "search", icon: 'trade-search', title: '筛选', path: '/mHome/pages/search/index'}],
+    menus: [{id: "listing-buy", icon: appConfig.imgUrl+'trade-listingbuy', title: '求购', path: '/mTrade/pages/listingbuy/index'}, 
+            {id: "listing-sell", icon: appConfig.imgUrl+'trade-listingsell', title: '出售', path: '/mTrade/pages/listingsell/index'},
+            {id: "search", icon: appConfig.imgUrl+'trade-search', title: '筛选', path: '/mHome/pages/search/index'}],
     /// tab索引
     active: 0,
-    /// 出售大厅列头
-    asktitles: [['形状', '尺寸', '分类'],
-                ['颜色 | 净度 | 切工 | 对称 | 抛光 | 荧光 | 证书', '']],
-    /// 求购大厅列头
-    selltitles: [['重量', '形状', '尺寸', '分类'],
-                 ['颜色 | 净度 | 切工 | 对称 | 抛光 | 荧光', '价格']],
     /// 钻石分类
     categorys: [{ text: '单颗裸钻', value: 2 },
                 { text: '单颗彩钻', value: 5 }],
@@ -54,10 +48,6 @@ Page({
     sellOrders: <GuangZuan.SellOrder[]>[],
     /// 求购大厅数据
     askOrders: <GuangZuan.BuyOrder[]>[],
-    /// 显示的值
-    values: [{ up: [''], dwn: [''] }],
-    /// 左滑宽度
-    width: 100,
     /// 数据是否为空
     isEmpty: true,
     /// 商品(查询字段-模糊查询)
@@ -73,9 +63,6 @@ Page({
     this.setData({ active: e.detail.index })
     /// 查询数据
     e.detail.index == 0 ? this.queryDiamond() : this.queryBuyOrder()
-    /// 清空搜索条件
-    const info = wx.getStorageSync('TradeParams')
-    if (info) { wx.removeStorageSync('TradeParams') }
   },
 
   /// 搜索按钮点击
@@ -124,7 +111,7 @@ Page({
         break
       case 'detail':      /// 商品详情
         wx.navigateTo({ 
-          url: this.data.active === 0 ? '/mHome/pages/goodsdetail/index?goodsno='+this.data.sellOrders[index].goodsno : ('/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='+this.data.sellOrders[index].ordertime : ('/mTrade/pages/orderdetail/index?item='+JSON.stringify(this.data.askOrders[index]))
         })
         break;
       case 'delisting':     /// 摘牌
@@ -223,26 +210,26 @@ Page({
       /// 荧光
       zsfluorescencetype: [this.data.fluorescence],
     }
-    /// 获取参数
-    const info = JSON.parse(wx.getStorageSync('TradeParams')) 
+    // /// 获取参数
+    // const info = JSON.parse(wx.getStorageSync('TradeParams')) 
     /// 钻石查询
     queryDiamond({
       data: {
         ...data,
-        /// 颜色
-        zscolortype: info ? info.zscolortype : [null],
-        /// 货币类型
-        zscurrencytype: info ? [info.zscurrencytype.toString()] : [''],
-        /// 证书类型
-        zscerttype: info ? [info.zscerttype.toString()] : [''],
-        /// 抛光
-        zspolishtype: info ? [info.zspolishtype] : [],
-        /// 对称
-        zssymmetrytype: info ? [info.zssymmetrytype] : [],
-        /// 总重量(克拉重量)-从
-        weight1: info ? info.weight1 : 0.0,
-        /// 总重量(克拉重量)-至
-        weight2: info ? info.weight2 : 0
+        // /// 颜色
+        // zscolortype: info ? info.zscolortype : [null],
+        // /// 货币类型
+        // zscurrencytype: info ? [info.zscurrencytype.toString()] : [''],
+        // /// 证书类型
+        // zscerttype: info ? [info.zscerttype.toString()] : [''],
+        // /// 抛光
+        // zspolishtype: info ? [info.zspolishtype] : [],
+        // /// 对称
+        // zssymmetrytype: info ? [info.zssymmetrytype] : [],
+        // /// 总重量(克拉重量)-从
+        // weight1: info ? info.weight1 : 0.0,
+        // /// 总重量(克拉重量)-至
+        // weight2: info ? info.weight2 : 0
       },
       /// 加载成功
       success: (res) => {
@@ -255,19 +242,6 @@ Page({
         this.setData({ 
           sellOrders: res.data,
           isEmpty: res.data.length === 0,
-          /// 显示的值
-          values: res.data.map(obj => {
-            return {up: [obj.kpweight.toString()+'ct', 
-                        isnullstr(obj.zsshapetypedisplay), 
-                        isnullstr(obj.sizedisplay), 
-                        isnullstr(obj.zscategorydisplay)], 
-                    dwn: [isnullstr(obj.zscolortype1display)+' | '+
-                          isnullstr(obj.zsclaritytype1display)+' | '+
-                          isnullstr(obj.zscuttype1display)+' | '+
-                          isnullstr(obj.zssymmetrytype1display)+' | '+isnullstr(obj.zspolishtype1display)+' | '+
-                          isnullstr(obj.zsfluorescencetype1display),
-                        obj.zscurrencytypedisplayunit+obj.price]}
-          })
         })
       },
       fail: (emsg) => {
@@ -302,19 +276,7 @@ Page({
             /// 数据赋值
             this.setData({ 
               askOrders: res.data,
-              isEmpty: res.data.length === 0,
-              /// 显示的值
-              values: res.data.map(obj => {
-                return {up: [isnullstr(obj.zsshapetypedisplay), 
-                            obj.zssize, 
-                            isnullstr(obj.zscategorydisplay)], 
-                        dwn: [isnullstr(obj.zscolortypedisplay)+' | '+
-                            isnullstr(obj.zsclaritytypedisplay)+' | '+
-                            isnullstr(obj.zscuttypedisplay)+' | '+
-                            isnullstr(obj.zssymmetrytypedisplay)+' | '+
-                            isnullstr(obj.zspolishtypedisplay)+' | '+
-                            isnullstr(obj.zsfluorescencetypedisplay), '']}
-              })
+              isEmpty: res.data.length === 0
             })
           })
         },
@@ -368,24 +330,24 @@ Page({
   },
 
   onShow() {
-    /// 获取参数
-    const storge = wx.getStorageSync('TradeParams')
-    if (storge) {
-      try {
-        const info = JSON.parse(storge)
-        if (storge) {
-          /// 数据缓存
-          this.setData({ 
-            storge: info,
-            category: info.category,
-            cut: info.zscuttype,
-            shape: info.zsshapetype,
-            clarity: info.zsclaritytype,
-            fluorescence: info.zsfluorescencetype
-          })
-        }
-      } catch (error) {}
-    }
+    // /// 获取参数
+    // const storge = wx.getStorageSync('TradeParams')
+    // if (storge) {
+    //   try {
+    //     const info = JSON.parse(storge)
+    //     if (storge) {
+    //       /// 数据缓存
+    //       this.setData({ 
+    //         storge: info,
+    //         category: info.category,
+    //         cut: info.zscuttype,
+    //         shape: info.zsshapetype,
+    //         clarity: info.zsclaritytype,
+    //         fluorescence: info.zsfluorescencetype
+    //       })
+    //     }
+    //   } catch (error) {}
+    // }
     /// 查询出售大厅委托单
     this.data.active == 0 ? this.queryDiamond() : this.queryBuyOrder()
   },

+ 35 - 28
GuangZuan/miniprogram/pages/trade/index.wxml

@@ -10,9 +10,9 @@
 
       <!-- 功能区 -->
       <view class="gird-view">
-        <view class="gird-view__item" wx:for="{{ menus }}" wx:for-index="idx" wx:for-item="itm" wx:key="{{ id }}" id="{{ itm.id }}" bindtap="onIconClick">
-          <image src="http://218.17.158.45:23012/mtp2-onlineopen/uploadFile/gz/{{ itm.icon }}.png" mode="heightFix"></image>
-          <text>{{ itm.title }}</text>
+        <view class="gird-view__item" wx:for="{{ menus }}" wx:for-index="idx" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" bindtap="onIconClick">
+          <image src="{{ itm.icon }}.png" mode="heightFix"></image>
+          <text style="color: #CAE5FF; font-size: 12px;">{{ itm.title }}</text>
         </view>
       </view>
     </view>
@@ -28,42 +28,49 @@
   </van-dropdown-menu>
 
   <!-- 搜索框 -->
-  <van-search model:value="{{ zsallproperties }}" use-action-slot="{{ true }}" wx:if="{{ active != 0 }}" shape="round" input-align="center" background="#E6F1FF" placeholder="请输入商品属性 支持模糊查询">
-    <view slot="action" style="color: #333;" bind:tap="onClick">搜索</view>
+  <van-search model:value="{{ zsallproperties }}" use-action-slot="{{ true }}" wx:if="{{ active != 0 }}" shape="round" input-align="center" background="#407DB8" placeholder="请输入商品属性 支持模糊查询">
+    <view slot="action" style="color: #fff;" bind:tap="onClick">搜索</view>
   </van-search>
-
-  <!-- 列头 --> 
-  <view class="title-view">
-    <view class="title-view-up">
-      <text wx:for="{{active == 0 ? selltitles[0] : asktitles[0]}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">{{itm}}</text>
-    </view>
-    <view class="title-view-dwn">
-      <text wx:for="{{active == 0 ? selltitles[1] : asktitles[1]}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx">{{itm}}</text>
-    </view>
-  </view>
 </view>
 
 <!-- 内容滚动视图 --> 
-<scroll-view class="content-view" style="padding-bottom: {{safeBottom+48}}px;">
+<scroll-view class="content-view" style="padding-bottom: 10px;">
   <!-- 数据 --> 
-  <van-swipe-cell wx:if="{{active == 1}}" wx:for="{{ values }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx" right-width="{{ width }}">
-    <view class="item-view">
-      <view class="item-view-up">
-        <text wx:for="{{itm.up}}" wx:for-item="data" wx:for-index="idx" wx:key="idx">{{data}}</text>
+  <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">
+      <view class="vanSwipeCell-item__top">
+        <text>{{ itm.zsshapetypedisplay }}</text>
+        <tetx>{{ active === 0 ? itm.remainqty+"ct"+"|"+itm.zscolortype1display+"|"+itm.zsclaritytype1display : itm.zstabledisplay }}</tetx>
+        <text>{{ active === 0 ? itm.zscurrencytypedisplayunit+itm.price : '' }}</text>
       </view>
-      <view class="item-view-mid">
-        <text wx:for="{{itm.mid}}" wx:for-item="data" wx:for-index="idx" wx:key="idx">{{data}}</text>
+      <view class="vanSwipeCell-item__mid">
+        <view class="vanSwipeCell-item__mid__left">
+          <text>切工:{{ active === 0 ? itm.zscuttype1display : itm.zscuttypedisplay }}</text>
+          <text>抛光:{{ active === 0 ? itm.zspolishtype1display : itm.zspolishtypedisplay }}</text>
+          <text>尺寸:--</text>
+        </view>
+        <view class="vanSwipeCell-item__mid__mid">
+          <text>对称:{{ active === 0 ? itm.zssymmetrytype1display : itm.zssymmetrytypedisplay }}</text>
+          <text>荧光:{{ active === 0 ? itm.zsfluorescencetype1display  : itm.zsfluorescencetypedisplay }}</text>
+          <text wx:if="{{ active === 0 }}">证书:--</text>
+        </view>
+        <view class="vanSwipeCell-item__mid__right" id="favorite {{ idx }}" wx:if="{{ active === 0 }}" bindtap="onButtonPressed">
+          <van-icon name="star" color="#407DB8"></van-icon>
+          <text>已收藏</text>
+        </view>
       </view>
-      <view class="item-view-dwn" wx:if="{{itm.dwn.length != 0}}">
-        <text wx:for="{{itm.dwn}}" wx:for-item="data" wx:for-index="idx" wx:key="idx">{{data}}</text>
+      <view class="vanSwipeCell-item__dwn">
+        <text>{{ active === 0 ? itm.sellusername : itm.buyusername }}</text>
+        <text>{{ itm.ordertime }}</text>
       </view>
     </view>
-    <view slot="right" class="van-swipe-cell__right ">
-      <view class="item detail" id="detail {{idx}}" style="background-color: yellowgreen;" bindtap="onButtonPressed">详情</view>
-      <view wx:if="{{active == 0}}" class="item favorite" id="favorite {{idx}}" style="background-color: red;" bindtap="onButtonPressed">收藏</view>
-      <view wx:if="{{active == 1}}" class="item delisting" id="delisting {{idx}}" style="background-color: goldenrod;" bindtap="onButtonPressed">摘牌</view>
+    <!-- 左滑按钮 -->
+    <view slot="right" class="vanSwipeCell-right ">
+      <view class="item detail" id="detail {{ idx }}" style="background-color: yellowgreen;" bindtap="onButtonPressed">详情</view>
     </view>
   </van-swipe-cell>
+
+  <!-- 求购大厅 -->
 </scroll-view>
 
 <!-- 无数据 --> 

+ 11 - 1
GuangZuan/miniprogram/services/api/common/index.ts

@@ -42,7 +42,17 @@ export function getAllEnums(params: HttpRequest<{req: GuangZuan.AllEnumsReq, rsp
   return httpRequest(service.config.goCommonSearchUrl+'/Common/GetAllEnums', 'GET', params)
 }
 
-/* 获取数据库错误信息*/
+/* 获取数据库错误信息 */
 export function queryErrorInfos(params: HttpRequest<{req: GuangZuan.ErrorReq, rsp: GuangZuan.Error[]}>) {
   return httpRequest(service.config.goCommonSearchUrl+'/Common/QueryErrorInfos', 'GET', params)
+}
+
+/* 获取会员风采表 */
+export function getGZMemberInfo(params: HttpRequest<{req: GuangZuan.GzCertAddressParamReq, rsp: GuangZuan.GZMemberInfo[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/GetGZMemberInfo', 'GET', params)
+}
+
+/* 获取保税商品表 */
+export function getGZBSCGoods(params: HttpRequest<{req: GuangZuan.GzCertAddressParamReq, rsp: GuangZuan.GZBSCGoods[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/GetGZBSCGoods', 'GET', params)
 }

+ 49 - 0
GuangZuan/miniprogram/services/api/orders/index.ts

@@ -97,6 +97,55 @@ export function queryPermancePlanTmp(params: HttpRequest<{req: GuangZuan.Permanc
   return httpRequest(service.config.goCommonSearchUrl+'/WrTrade2/QueryPermancePlanTmp', 'GET', params)
 }
 
+/* 查询仓储报表 */
+export function queryWRPositionReport(params: HttpRequest<{req: GuangZuan.WRPositionReportReq, rsp: GuangZuan.WRPositionReport[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryWRPositionReport', 'GET', params)
+}
+
+/* 查询交易报表 */
+export function queryTradeReport(params: HttpRequest<{req: GuangZuan.WRPositionReportReq, rsp: GuangZuan.TradeReport[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryTradeReport', 'GET', params)
+}
+
+/* 查询会员报表 */
+export function queryMemberReport(params: HttpRequest<{req: GuangZuan.MemberReportReq, rsp: GuangZuan.MemberReport[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryMemberReport', 'GET', params)
+}
+
+/* 保税仓月电费登记表查询 */
+export function queryGzbscuserpowerfee(params: HttpRequest<{req: GuangZuan.GZBscuserPowerFeeReq, rsp: GuangZuan.GZBscuserPowerFee[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryGzbscuserpowerfee', 'GET', params)
+}
+
+/* 保税仓用户月付款通知书表查询(计费管理) */
+export function queryGzbscusermonthpay(params: HttpRequest<{req: GuangZuan.GZBSCuserMonthPayReq, rsp: GuangZuan.GZBSCuserMonthPay[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryGzbscusermonthpay', 'GET', params)
+}
+
+/* 保税仓出入库申请表查询 */
+export function queryGzbscinOutOrder(params: HttpRequest<{req: GuangZuan.GZBSCinOutOrderReq, rsp: GuangZuan.GZBSCinOutOrder[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryGzbscinOutOrder', 'GET', params)
+}
+
+/* 保税商品报关头寸表查询 */
+export function queryGzbscPosition(params: HttpRequest<{req: GuangZuan.GZBSCPositionReq, rsp: GuangZuan.GZBSCPosition[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryGzbscPosition', 'GET', params)
+}
+
+/* 保税仓本月进口明细/本月出境明细/本月转厂明细查询 */
+export function queryBscinoutorder(params: HttpRequest<{req: GuangZuan.BSCInoutOrderReq, rsp: GuangZuan.BSCInoutOrder[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryBscinoutorder', 'GET', params)
+}
+
+/* 保税仓出入库申请明细表查询 */
+export function queryBScinOutOrderDetail(params: HttpRequest<{req: GuangZuan.BSCInoutOrderDetailReq, rsp: GuangZuan.BSCInoutOrderDetail[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryBScinOutOrderDetail', 'GET', params)
+}
+
+/* 保税仓出库申请明细附表查询 */
+export function queryBScOutOrderDetailatt(params: HttpRequest<{req: GuangZuan.BSCOutOrderDetailAttReq, rsp: GuangZuan.BSCOutOrderDetailAtt[]}>) {
+  return httpRequest(service.config.goCommonSearchUrl+'/Guangzuan/QueryBScOutOrderDetailatt', 'GET', params)
+}
 
 
 

+ 3 - 3
GuangZuan/node_modules/.package-lock.json

@@ -2286,9 +2286,9 @@
       }
     },
     "node_modules/miniprogram-api-typings": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmmirror.com/miniprogram-api-typings/-/miniprogram-api-typings-3.8.1.tgz",
-      "integrity": "sha512-AjuBYxghx3LZeTtWQ48TfDMxoACGRUA+NdPrgl+mPPNgi5g0YXn3sDELNHRw0LcjTxfqhVufwLL65AjwT+W+FQ==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmmirror.com/miniprogram-api-typings/-/miniprogram-api-typings-3.9.0.tgz",
+      "integrity": "sha512-QCXHHW9H4XYazb8J9EMiFyaOWHXhBG4oehkQqi+76FJpKKIlpgL0ZkXxzJ2L+6T/c5OxKm7iegovKIQGVkZDLQ==",
       "dev": true
     },
     "node_modules/mixin-deep": {

+ 4 - 0
GuangZuan/node_modules/miniprogram-api-typings/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2023-01-12 v3.9.0
+- 更新 API 定义到 2.29.1
+- 将 xr-frame 的命名空间由 `WechatXrFrame` 改为 `XrFrame`。这是一个 **破坏性改动**
+
 ## 2022-09-09 v3.6.0
 - 更新 API 定义到 2.26.0
 - 更改了部分监听方法及其参数的命名

+ 1 - 0
GuangZuan/node_modules/miniprogram-api-typings/README-en.md

@@ -55,6 +55,7 @@ Both PR and issue are welcomed for definitions of pages (`Page`), custom compone
 - [Mr.Hope](https://github.com/Mister-Hope)
 - [chs97](https://github.com/chs97)
 - [Jelf](https://github.com/okxiaoliang4)
+- [xieyuhang](https://github.com/haiya6)
 
 ### Automated tests
 

+ 1 - 0
GuangZuan/node_modules/miniprogram-api-typings/README.md

@@ -55,6 +55,7 @@ API 的定义文件(`lib.wx.api.d.ts`)是随 [文档](https://developers.wei
 - [Mr.Hope](https://github.com/Mister-Hope)
 - [chs97](https://github.com/chs97)
 - [Jelf](https://github.com/okxiaoliang4)
+- [xieyuhang](https://github.com/haiya6)
 
 ### 测试
 

+ 1 - 1
GuangZuan/node_modules/miniprogram-api-typings/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miniprogram-api-typings",
-  "version": "3.8.1",
+  "version": "3.9.0",
   "description": "Type definitions for APIs of Wechat Mini Program in TypeScript",
   "main": "./index.d.ts",
   "types": "./index.d.ts",

+ 1 - 1
GuangZuan/node_modules/miniprogram-api-typings/types/wx/index.d.ts

@@ -1,5 +1,5 @@
 /*! *****************************************************************************
-Copyright (c) 2022 Tencent, Inc. All rights reserved.
+Copyright (c) 2023 Tencent, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

+ 661 - 16
GuangZuan/node_modules/miniprogram-api-typings/types/wx/lib.wx.api.d.ts

@@ -1,5 +1,5 @@
 /*! *****************************************************************************
-Copyright (c) 2022 Tencent, Inc. All rights reserved.
+Copyright (c) 2023 Tencent, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -452,6 +452,102 @@ declare namespace WechatMiniprogram {
         /** 接口调用成功的回调函数 */
         success?: AppendFileSuccessCallback
     }
+    interface ApplyBlusherStickMakeupOption {
+        /** 上色程度 0-1 */
+        alpha: number
+        blendMode: string
+        /** 左腮红资源路径 */
+        path: string
+        /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+        complete?: ApplyBlusherStickMakeupCompleteCallback
+        /** 接口调用失败的回调函数 */
+        fail?: ApplyBlusherStickMakeupFailCallback
+        /** 接口调用成功的回调函数 */
+        success?: ApplyBlusherStickMakeupSuccessCallback
+    }
+    interface ApplyEyeBrowMakeupOption {
+        /** 上色程度 0-1 */
+        alpha: number
+        blendMode: string
+        path: string
+        shrinkRate: number
+        /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+        complete?: ApplyEyeBrowMakeupCompleteCallback
+        /** 接口调用失败的回调函数 */
+        fail?: ApplyEyeBrowMakeupFailCallback
+        /** 接口调用成功的回调函数 */
+        success?: ApplyEyeBrowMakeupSuccessCallback
+    }
+    interface ApplyEyeShadowMakeupOption {
+        /** 上色程度 0-1 */
+        alpha: number
+        blendMode: string
+        /** 眼影资源路径 */
+        path: string
+        /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+        complete?: ApplyEyeShadowMakeupCompleteCallback
+        /** 接口调用失败的回调函数 */
+        fail?: ApplyEyeShadowMakeupFailCallback
+        /** 细致效果图片资源路径 */
+        shimmerPosition?: string
+        /** 细致效果图片资源 md5 */
+        shimmerPositionMD5?: string
+        /** 接口调用成功的回调函数 */
+        success?: ApplyEyeShadowMakeupSuccessCallback
+    }
+    interface ApplyFaceContourMakeupOption {
+        alpha: number
+        /** 高光资源路径 */
+        path: string
+        /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+        complete?: ApplyFaceContourMakeupCompleteCallback
+        /** 接口调用失败的回调函数 */
+        fail?: ApplyFaceContourMakeupFailCallback
+        /** 接口调用成功的回调函数 */
+        success?: ApplyFaceContourMakeupSuccessCallback
+    }
+    interface ApplyFilterOption {
+        /** 滤镜效果透明度,范围是 0-1 */
+        alpha: number
+        /** 滤镜资源路径 */
+        path: string
+        /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+        complete?: ApplyFilterCompleteCallback
+        /** 接口调用失败的回调函数 */
+        fail?: ApplyFilterFailCallback
+        /** 滤镜资源 md5 */
+        md5?: string
+        /** 接口调用成功的回调函数 */
+        success?: ApplyFilterSuccessCallback
+    }
+    interface ApplyLipStickMakeupOption {
+        /** 上色程度 0-1 */
+        alpha: number
+        blendMode: string
+        faceModel: string
+        path: string
+        shimmerPath: string
+        shimmerType: string
+        /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+        complete?: ApplyLipStickMakeupCompleteCallback
+        /** 接口调用失败的回调函数 */
+        fail?: ApplyLipStickMakeupFailCallback
+        /** 接口调用成功的回调函数 */
+        success?: ApplyLipStickMakeupSuccessCallback
+    }
+    interface ApplyStickerOption {
+        /** 贴纸类型 */
+        stickers: Sticker[]
+        /** 贴纸类型 */
+        type: string
+        /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+        complete?: ApplyStickerCompleteCallback
+        /** 接口调用失败的回调函数 */
+        fail?: ApplyStickerFailCallback
+        /** 接口调用成功的回调函数 */
+        success?: ApplyStickerSuccessCallback
+        templateTransSet?: IAnyObject
+    }
     interface Asset {
         src: string
         /** 可选值:
@@ -729,6 +825,19 @@ backgroundAudioManager.src = 'http://ws.stream.qqmusic.qq.com/M500001VfvsJ21xFqb
         /** 接口调用成功的回调函数 */
         success?: BlurSuccessCallback
     }
+    /** 需要基础库: `2.28.0`
+     *
+     * 人体检测配置。用法详情[指南文档](https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/visionkit/body.html)。 */
+    interface BodyTrack {
+        /** 需要基础库: `2.28.0`
+         *
+         * 人体检测模式
+         *
+         * 可选值:
+         * - 1: 通过摄像头实时检测;
+         * - 2: 静态图片检测; */
+        mode: 1 | 2
+    }
     interface BoundingClientRectCallbackResult {
         /** 节点的下边界坐标 */
         bottom: number
@@ -1066,6 +1175,19 @@ backgroundAudioManager.src = 'http://ws.stream.qqmusic.qq.com/M500001VfvsJ21xFqb
         /** 无回复写 */
         writeNoResponse?: boolean
     }
+    interface CheckIsAddedToMyMiniProgramOption {
+        /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+        complete?: CheckIsAddedToMyMiniProgramCompleteCallback
+        /** 接口调用失败的回调函数 */
+        fail?: CheckIsAddedToMyMiniProgramFailCallback
+        /** 接口调用成功的回调函数 */
+        success?: CheckIsAddedToMyMiniProgramSuccessCallback
+    }
+    interface CheckIsAddedToMyMiniProgramSuccessCallbackResult {
+        /** 是否被添加至 「我的小程序」 */
+        added: boolean
+        errMsg: string
+    }
     interface CheckIsOpenAccessibilityOption {
         /** 接口调用结束的回调函数(调用成功、失败都会执行) */
         complete?: CheckIsOpenAccessibilityCompleteCallback
@@ -1434,6 +1556,22 @@ backgroundAudioManager.src = 'http://ws.stream.qqmusic.qq.com/M500001VfvsJ21xFqb
         width: number
         errMsg: string
     }
+    interface ClearFiltersOption {
+        /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+        complete?: ClearFiltersCompleteCallback
+        /** 接口调用失败的回调函数 */
+        fail?: ClearFiltersFailCallback
+        /** 接口调用成功的回调函数 */
+        success?: ClearFiltersSuccessCallback
+    }
+    interface ClearMakeupsOption {
+        /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+        complete?: ClearMakeupsCompleteCallback
+        /** 接口调用失败的回调函数 */
+        fail?: ClearMakeupsFailCallback
+        /** 接口调用成功的回调函数 */
+        success?: ClearMakeupsSuccessCallback
+    }
     interface ClearOption {
         /** 接口调用结束的回调函数(调用成功、失败都会执行) */
         complete?: ClearCompleteCallback
@@ -1442,6 +1580,14 @@ backgroundAudioManager.src = 'http://ws.stream.qqmusic.qq.com/M500001VfvsJ21xFqb
         /** 接口调用成功的回调函数 */
         success?: ClearSuccessCallback
     }
+    interface ClearStickersOption {
+        /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+        complete?: ClearStickersCompleteCallback
+        /** 接口调用失败的回调函数 */
+        fail?: ClearStickersFailCallback
+        /** 接口调用成功的回调函数 */
+        success?: ClearStickersSuccessCallback
+    }
     interface ClearStorageOption {
         /** 接口调用结束的回调函数(调用成功、失败都会执行) */
         complete?: ClearStorageCompleteCallback
@@ -1729,6 +1875,10 @@ backgroundAudioManager.src = 'http://ws.stream.qqmusic.qq.com/M500001VfvsJ21xFqb
         complete?: ConnectSocketCompleteCallback
         /** 接口调用失败的回调函数 */
         fail?: ConnectSocketFailCallback
+        /** 需要基础库: `2.29.0`
+         *
+         * wifi下使用移动网络发送请求 */
+        forceCellularNetwork?: boolean
         /** HTTP Header,Header 中不能设置 Referer */
         header?: IAnyObject
         /** 需要基础库: `2.8.0`
@@ -1977,6 +2127,22 @@ backgroundAudioManager.src = 'http://ws.stream.qqmusic.qq.com/M500001VfvsJ21xFqb
         /** 经度 */
         longitude: number
     }
+    interface DetectBodyOption {
+        /** 人脸图像像素点数据,每四项表示一个像素点的 RGBA */
+        frameBuffer: ArrayBuffer
+        /** 图像高度 */
+        height: number
+        /** 图像宽度 */
+        width: number
+        /** 评分阈值。正常情况传入 0.8 即可。 */
+        scoreThreshold?: number
+        /** 图像源类型。正常情况传入 1 即可。当输入的图片是来自一个连续视频的每一帧图像时,sourceType 传入 0 会得到更优的效果
+         *
+         * 可选值:
+         * - 1: 表示输入的图片是随机的图片;
+         * - 0: 表示输入的图片是来自一个连续视频的每一帧图像; */
+        sourceType?: 1 | 0
+    }
     interface DetectFaceOption {
         /** 人脸图像像素点数据,每四项表示一个像素点的 RGBA */
         frameBuffer: ArrayBuffer
@@ -2000,7 +2166,28 @@ backgroundAudioManager.src = 'http://ws.stream.qqmusic.qq.com/M500001VfvsJ21xFqb
          * - 0: 表示输入的图片是来自一个连续视频的每一帧图像; */
         sourceType?: 1 | 0
     }
+    interface DetectHandOption {
+        /** 人脸图像像素点数据,每四项表示一个像素点的 RGBA */
+        frameBuffer: ArrayBuffer
+        /** 图像高度 */
+        height: number
+        /** 图像宽度 */
+        width: number
+        /** 算法检测模式
+         *
+         * 可选值:
+         * - 0: 检测模式,输出框和点;
+         * - 1: 手势模式,输出框和手势分类;
+         * - 2: 结合0和1模式,输出框、点、手势分类; */
+        algoMode?: 0 | 1 | 2
+        /** 评分阈值。正常情况传入 0.8 即可。 */
+        scoreThreshold?: number
+    }
     interface DeviceInfo {
+        /** 需要基础库: `2.29.0`
+         *
+         * 设备 CPU 型号(仅 Android 支持) */
+        CPUType: string
         /** 应用(微信APP)二进制接口类型(仅 Android 支持) */
         abi: string
         /** 设备性能等级(仅 Android 支持)。取值为:-2 或 0(该设备无法运行小游戏),-1(性能未知),>=1(设备性能值,该值越高,设备性能越好,目前最高不到50) */
@@ -2685,8 +2872,16 @@ backgroundAudioManager.src = 'http://ws.stream.qqmusic.qq.com/M500001VfvsJ21xFqb
         finderUserName: string
         /** 接口调用结束的回调函数(调用成功、失败都会执行) */
         complete?: GetChannelsLiveInfoCompleteCallback
+        /** 需要基础库: `2.29.0`
+         *
+         * 结束时间,筛选指定时段的直播 */
+        endTime?: number
         /** 接口调用失败的回调函数 */
         fail?: GetChannelsLiveInfoFailCallback
+        /** 需要基础库: `2.29.0`
+         *
+         * 起始时间,筛选指定时段的直播 */
+        startTime?: number
         /** 接口调用成功的回调函数 */
         success?: GetChannelsLiveInfoSuccessCallback
     }
@@ -2701,6 +2896,14 @@ backgroundAudioManager.src = 'http://ws.stream.qqmusic.qq.com/M500001VfvsJ21xFqb
         nickname: string
         /** 直播 nonceId */
         nonceId: string
+        /** 需要基础库: `2.29.0`
+         *
+         * 除最近的一条直播外,其他的直播列表(注意:每次最多返回按时间戳增序排列的15个直播信息,其中时间最近的那个直播会在接口其他的返回参数中展示,其余的直播会在该字段中展示)。 */
+        otherInfos: any[]
+        /** 需要基础库: `2.29.0`
+         *
+         * 视频号回放状态:0未生成,1已生成,3生成中,6已过期 */
+        replayStatus: string
         /** 直播状态,2直播中,3直播结束 */
         status: number
         errMsg: string
@@ -3502,6 +3705,19 @@ backgroundAudioManager.src = 'http://ws.stream.qqmusic.qq.com/M500001VfvsJ21xFqb
         /** 接口调用成功的回调函数 */
         success?: GetWifiListSuccessCallback
     }
+    /** 需要基础库: `2.28.0`
+     *
+     * 手势检测配置。用法详情[指南文档](https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/visionkit/hand.html)。 */
+    interface HandTrack {
+        /** 需要基础库: `2.28.0`
+         *
+         * 手势检测模式
+         *
+         * 可选值:
+         * - 1: 通过摄像头实时检测;
+         * - 2: 静态图片检测; */
+        mode: 1 | 2
+    }
     interface HideHomeButtonOption {
         /** 接口调用结束的回调函数(调用成功、失败都会执行) */
         complete?: HideHomeButtonCompleteCallback
@@ -3654,7 +3870,7 @@ backgroundAudioManager.src = 'http://ws.stream.qqmusic.qq.com/M500001VfvsJ21xFqb
         /** 接口调用失败的回调函数 */
         fail?: InitMarkerClusterFailCallback
         /** 聚合算法的可聚合距离,即距离小于该值的点会聚合至一起,以像素为单位 */
-        gridSize?: boolean
+        gridSize?: number
         /** 接口调用成功的回调函数 */
         success?: InitMarkerClusterSuccessCallback
         /** 点击已经聚合的标记点时是否实现聚合分离 */
@@ -3886,6 +4102,10 @@ innerAudioContext.onError((res) => {
         complete?: JoinVoIPChatCompleteCallback
         /** 接口调用失败的回调函数 */
         fail?: JoinVoIPChatFailCallback
+        /** 需要基础库: `2.29.0`
+         *
+         * wifi下使用移动网络发送请求 */
+        forceCellularNetwork?: boolean
         /** 静音设置 */
         muteConfig?: MuteConfig
         /** 房间类型
@@ -4082,7 +4302,7 @@ innerAudioContext.onError((res) => {
         timeout?: number
     }
     interface LoginSuccessCallbackResult {
-        /** 用户登录凭证(有效期五分钟)。开发者需要在开发者服务器后台调用 [auth.code2Session](#),使用 code 换取 openid、unionid、session_key 等信息 */
+        /** 用户登录凭证(有效期五分钟)。开发者需要在开发者服务器后台调用 [code2Session](https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-login/code2Session.html),使用 code 换取 openid、unionid、session_key 等信息 */
         code: string
         errMsg: string
     }
@@ -4591,6 +4811,12 @@ innerAudioContext.onError((res) => {
         /** 用短链打开小程序时当前页面携带的查询字符串。小程序中使用时,应在进入页面时调用 `wx.onCopyUrl` 自定义 `query`,退出页面时调用 `wx.offCopyUrl`,防止影响其它页面。 */
         query: string
     }
+    interface OnCustomRendererEventCallbackResult {
+        /** 推流高度 */
+        height: number
+        /** 推流宽度 */
+        width: number
+    }
     interface OnDeviceMotionChangeListenerResult {
         /** 当 手机坐标 X/Y 和 地球 X/Y 重合时,绕着 Z 轴转动的夹角为 alpha,范围值为 [0, 2*PI)。逆时针转动为正。 */
         alpha: number
@@ -6020,7 +6246,7 @@ innerAudioContext.onError((res) => {
      *
      * - 通过 Canvas.getContext('2d') 接口可以获取 CanvasRenderingContext2D 对象,实现了 [HTML Canvas 2D Context](https://www.w3.org/TR/2dcontext/) 定义的属性、方法。
      * - 通过 Canvas.getContext('webgl') 或 OffscreenCanvas.getContext('webgl') 接口可以获取 WebGLRenderingContext 对象,实现了 [WebGL 1.0](https://www.khronos.org/registry/webgl/specs/latest/1.0/) 定义的所有属性、方法、常量。
-     * - CanvasRenderingContext2D 的 drawImage 方法 2.10.0 起支持传入通过 [SelectorQuery](https://developers.weixin.qq.com/miniprogram/dev/api/wxml/SelectorQuery.html) 获取的 video 对象
+     * - CanvasRenderingContext2D 的 drawImage 方法 2.10.0 起支持传入通过 [SelectorQuery](https://developers.weixin.qq.com/miniprogram/dev/api/wxml/SelectorQuery.html) 获取的 video 对象,2.29.0 起支持传入开启了自定义渲染的 [LivePusherContext](https://developers.weixin.qq.com/miniprogram/dev/api/media/live/LivePusherContext.html) 对象。
      *
      * **示例代码**
      *
@@ -6564,13 +6790,13 @@ innerAudioContext.onError((res) => {
     interface ScrollToOption {
         /** 是否启用滚动动画 */
         animated?: boolean
-        /** 滚动动画时长 */
+        /** 滚动动画时长 (仅在 iOS 下生效) */
         duration?: number
         /** 左边界距离 */
         left?: number
         /** 顶部距离 */
         top?: number
-        /** 初始速度 */
+        /** 初始速度 (仅在 iOS 下生效) */
         velocity?: number
     }
     /** 需要基础库: `2.14.4`
@@ -6593,7 +6819,7 @@ wx.createSelectorQuery()
         bounces: boolean
         /** 取消滚动惯性 (仅在 iOS 下生效) */
         decelerationDisabled: boolean
-        /** 设置滚动减速速率 */
+        /** 设置滚动减速速率 (仅在 iOS 下生效) */
         fastDeceleration: boolean
         /** 分页滑动开关 */
         pagingEnabled: boolean
@@ -7581,6 +7807,75 @@ wx.createSelectorQuery()
             | 'step-end'
         transformOrigin?: string
     }
+    /** 贴纸类型 */
+    interface Sticker {
+        /** 贴纸帧数 */
+        len: number
+        /** 贴纸资源路径。资源必须为一个资源文件夹路径或一个压缩包路径,文件夹或压缩包内的贴纸资源必须按照 `{title}_{index}.{ext}` 格式命名。其中 `{title}` 为贴纸名称;`{index}` 为帧序号,从0开始;`{ext}` 为拓展名。 */
+        path: string
+        /** 贴纸名称 */
+        title: string
+        /** 贴纸触发动作
+         *
+         * 可选值:
+         * - -1: 循环播放;
+         * - 10: 张嘴;
+         * - 11: 噘嘴/kiss;
+         * - 12: 眨/闭左眼;
+         * - 13: 眨/闭右眼;
+         * - 14: 眨/闭眼;
+         * - 15: 挑眉毛;
+         * - 16: 左右摇头;
+         * - 17: 上下点头;
+         * - 100: 比心;
+         * - 101: 张开手掌;
+         * - 102: 剪刀手/比耶/胜利;
+         * - 103: 握拳;
+         * - 104: 数字1;
+         * - 105: 我爱你;
+         * - 106: 点赞;
+         * - 107: OK;
+         * - 108: Rock&Roll;
+         * - 109: 数字6;
+         * - 110: 数字8;
+         * - 111: 暂不支持(留空);
+         * - 112: 双手抱拳/恭喜发财; */
+        active?:
+            | -1
+            | 10
+            | 11
+            | 12
+            | 13
+            | 14
+            | 15
+            | 16
+            | 17
+            | 100
+            | 101
+            | 102
+            | 103
+            | 104
+            | 105
+            | 106
+            | 107
+            | 108
+            | 109
+            | 110
+            | 111
+            | 112
+        /** 贴纸ID */
+        id?: string
+        /** 贴纸资源 md5 */
+        md5?: string
+        /** 贴纸位置,格式为 [x1,y1,x2,y2] 。当 `type` 为 `'2D'` 或 `'front'` 时必填。仅 2D 贴纸和前景贴纸有效 */
+        pos?: string[]
+        /** 背景贴纸展示位置。仅背景贴纸有效
+         *
+         * 可选值:
+         * - 0: 背景贴纸;
+         * - 1: 只在人像区域显示的贴纸; */
+        segtype?: 0 | 1
+    }
     interface StopAccelerometerOption {
         /** 接口调用结束的回调函数(调用成功、失败都会执行) */
         complete?: StopAccelerometerCompleteCallback
@@ -8068,14 +8363,26 @@ wx.getSetting({
          *
          * OSD 跟踪配置 */
         OSD?: boolean
+        /** 需要基础库: `2.28.0`
+         *
+         * 人体检测配置。用法详情[指南文档](https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/visionkit/body.html)。 */
+        body?: BodyTrack
         /** 需要基础库: `2.25.0`
          *
          * 人脸检测配置。用法详情[指南文档](https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/visionkit/face.html)。安卓微信8.0.25开始支持,iOS微信8.0.24开始支持。 */
         face?: FaceTrack
+        /** 需要基础库: `2.28.0`
+         *
+         * 手势检测配置。用法详情[指南文档](https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/visionkit/hand.html)。 */
+        hand?: HandTrack
         /** 需要基础库: `2.24.5`
          *
          * marker 跟踪配置 */
         marker?: boolean
+        /** 需要基础库: `2.28.0`
+         *
+         * 提供基础AR功能,输出相机旋转的3个自由度的位姿,利用手机陀螺仪传感器,实现快速稳定的AR定位能力,适用于简单AR场景。 */
+        threeDof?: boolean
     }
     interface TransceiveOption {
         /** 需要传递的二进制数据 */
@@ -8368,6 +8675,36 @@ wx.getSetting({
         /** 用户所在省份。不再返回,参考 [相关公告](https://developers.weixin.qq.com/community/develop/doc/00028edbe3c58081e7cc834705b801) */
         province: string
     }
+    /** 需要基础库: `2.28.0`
+     *
+     * 人体 anchor
+     *
+     * **示例代码**
+     *
+     * [静态图像body检测能力使用参考](https://github.com/wechat-miniprogram/miniprogram-demo/tree/master/miniprogram/packageAPI/pages/ar/photo-body-detect)
+     *
+     * [实时摄像头body检测能力使用参考](https://github.com/wechat-miniprogram/miniprogram-demo/tree/master/miniprogram/packageAPI/pages/ar/body-detect) */
+    interface VKBodyAnchor {
+        /** 关键点的置信度 */
+        confidence: number[]
+        /** 识别序号 */
+        detectId: number
+        /** 唯一标识 */
+        id: number
+        /** 相对视窗的位置信息,取值范围为 [0, 1],0 为左/上边缘,1 为右/下边缘 */
+        origin: VKOrigin
+        /** 关键点 */
+        points: VKOrigin[]
+        /** 总体置信值 */
+        score: number
+        /** 相对视窗的尺寸,取值范围为 [0, 1],0 为左/上边缘,1 为右/下边缘 */
+        size: VKSize
+        /** 类型
+         *
+         * 可选值:
+         * - 5: 人体; */
+        type: 5
+    }
     /** 需要基础库: `2.20.0`
      *
      * 相机对象 */
@@ -8392,7 +8729,7 @@ wx.getSetting({
          *
          * 可选值:
          * - 'v1': v1适用于用户在平面场景下,例如桌面,地面,泛平面场景,放置虚拟物体,不提供真实世界距离。用户放置物体时,手机相机倾斜向下对着目标平面点击即可,具有广泛的机型支持;
-         * - 'v2': v2提供真实物理距离的 ar 定位功能,提供平面识别功能,用户在平面范围点击放置虚拟物体的功能,具有[有限的机型支持](https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/visionkit/plane.html#%E9%99%84%E5%BD%95)。iOS 设备在基础库 2.22.0 开始支持v2。安卓设备在基础库 2.25.1 开始支持v2,另外,安卓v2不支持竖直平面。; */
+         * - 'v2': v2提供真实物理距离的 ar 定位功能,提供平面识别功能,用户在平面范围点击放置虚拟物体的功能,具有[有限的机型支持](https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/visionkit/plane.html#%E9%99%84%E5%BD%95)。iOS 设备在基础库 2.22.0 开始支持v2。安卓设备在基础库 2.25.1 开始支持v2,另外,安卓v2不支持竖直平面。**使用v2算法需要初始化,移动手机进行左右平移初始化效果最佳。**; */
         version?: 'v1' | 'v2'
     }
     /** 需要基础库: `2.25.0`
@@ -8433,9 +8770,83 @@ wx.getSetting({
          *
          * 相机对象 */
         camera: VKCamera
-        /** 生成时间 */
+        /** 生成时间,单位:纳秒(ns) */
         timestamp: number
     }
+    /** 需要基础库: `2.28.0`
+     *
+     * 手势 anchor
+     *
+     * **示例代码**
+     *
+     * [静态图像hand检测能力使用参考](https://github.com/wechat-miniprogram/miniprogram-demo/tree/master/miniprogram/packageAPI/pages/ar/photo-hand-detect)
+     *
+     * [实时摄像头hand检测能力使用参考](https://github.com/wechat-miniprogram/miniprogram-demo/tree/master/miniprogram/packageAPI/pages/ar/hand-detect) */
+    interface VKHandAnchor {
+        /** 关键点的置信度 */
+        confidence: number[]
+        /** 识别序号 */
+        detectId: number
+        /** 手势分类, 返回整数-1到18, -1表示无效手势
+         *
+         * 可选值:
+         * - 0: 单手比心;
+         * - 1: 布(数字5);
+         * - 2: 剪刀(数字2);
+         * - 3: 握拳;
+         * - 4: 数字1;
+         * - 5: 热爱;
+         * - 6: 点赞;
+         * - 7: 数字3;
+         * - 8: 摇滚;
+         * - 9: 数字6;
+         * - 10: 数字8;
+         * - 11: 双手抱拳(恭喜发财);
+         * - 12: 数字4;
+         * - 13: 比ok;
+         * - 14: 不喜欢(踩);
+         * - 15: 双手比心;
+         * - 16: 祈祷(双手合十);
+         * - 17: 双手抱拳;
+         * - 18: 无手势动作;
+         * - -1: 无效手势; */
+        gesture:
+            | 0
+            | 1
+            | 2
+            | 3
+            | 4
+            | 5
+            | 6
+            | 7
+            | 8
+            | 9
+            | 10
+            | 11
+            | 12
+            | 13
+            | 14
+            | 15
+            | 16
+            | 17
+            | 18
+            | -1
+        /** 唯一标识 */
+        id: number
+        /** 相对视窗的位置信息,取值范围为 [0, 1],0 为左/上边缘,1 为右/下边缘 */
+        origin: VKOrigin
+        /** 关键点 */
+        points: VKOrigin[]
+        /** 总体置信值 */
+        score: number
+        /** 相对视窗的尺寸,取值范围为 [0, 1],0 为左/上边缘,1 为右/下边缘 */
+        size: VKSize
+        /** 类型
+         *
+         * 可选值:
+         * - 7: 手势; */
+        type: 7
+    }
     interface VKMarker {
         /** marker id */
         markerId: number
@@ -8508,7 +8919,6 @@ wx.getSetting({
          * - 2: OSD; */
         type: 2
     }
-    /** 相对视窗的位置信息,取值范围为 [0, 1],0 为左/上边缘,1 为右/下边缘 */
     interface VKOrigin {
         /** 横坐标 */
         x: number
@@ -8558,8 +8968,9 @@ wx.getSetting({
          * 可选值:
          * - 0: 不可用;
          * - 1: 运行中;
-         * - 2: 暂停中; */
-        state: 0 | 1 | 2
+         * - 2: 暂停中;
+         * - 3: 初始化中; */
+        state: 0 | 1 | 2 | 3
     }
     interface VKSize {
         /** 高度 */
@@ -14320,6 +14731,97 @@ InterstitialAd.offLoad(listener) // 需传入与监听时同一个的函数对
         stop(option?: StopOption): void
     }
     interface LivePusherContext {
+        /** [LivePusherContext.applyBlusherStickMakeup(Object object)](https://developers.weixin.qq.com/miniprogram/dev/api/media/live/LivePusherContext.applyBlusherStickMakeup.html)
+         *
+         * 需要基础库: `2.14.0`
+         *
+         * 在插件中使用:不支持
+         *
+         * 添加腮红美妆特效 */
+        applyBlusherStickMakeup(option: ApplyBlusherStickMakeupOption): void
+        /** [LivePusherContext.applyEyeBrowMakeup(Object object)](https://developers.weixin.qq.com/miniprogram/dev/api/media/live/LivePusherContext.applyEyeBrowMakeup.html)
+         *
+         * 需要基础库: `2.14.0`
+         *
+         * 在插件中使用:不支持
+         *
+         * 添加眉毛美妆特效 */
+        applyEyeBrowMakeup(option: ApplyEyeBrowMakeupOption): void
+        /** [LivePusherContext.applyEyeShadowMakeup(Object object)](https://developers.weixin.qq.com/miniprogram/dev/api/media/live/LivePusherContext.applyEyeShadowMakeup.html)
+         *
+         * 需要基础库: `2.14.0`
+         *
+         * 在插件中使用:不支持
+         *
+         * 添加眼影美妆特效 */
+        applyEyeShadowMakeup(option: ApplyEyeShadowMakeupOption): void
+        /** [LivePusherContext.applyFaceContourMakeup(Object object)](https://developers.weixin.qq.com/miniprogram/dev/api/media/live/LivePusherContext.applyFaceContourMakeup.html)
+         *
+         * 需要基础库: `2.14.0`
+         *
+         * 在插件中使用:不支持
+         *
+         * 添加修容美妆特效 */
+        applyFaceContourMakeup(option: ApplyFaceContourMakeupOption): void
+        /** [LivePusherContext.applyFilter(Object object)](https://developers.weixin.qq.com/miniprogram/dev/api/media/live/LivePusherContext.applyFilter.html)
+         *
+         * 需要基础库: `2.14.0`
+         *
+         * 在插件中使用:不支持
+         *
+         * 添加滤镜效果 */
+        applyFilter(option: ApplyFilterOption): void
+        /** [LivePusherContext.applyLipStickMakeup(Object object)](https://developers.weixin.qq.com/miniprogram/dev/api/media/live/LivePusherContext.applyLipStickMakeup.html)
+         *
+         * 需要基础库: `2.14.0`
+         *
+         * 在插件中使用:不支持
+         *
+         * 添加口红美妆特效 */
+        applyLipStickMakeup(option: ApplyLipStickMakeupOption): void
+        /** [LivePusherContext.applySticker(Object object)](https://developers.weixin.qq.com/miniprogram/dev/api/media/live/LivePusherContext.applySticker.html)
+         *
+         * 需要基础库: `2.14.0`
+         *
+         * 在插件中使用:不支持
+         *
+         * 添加贴纸特效 */
+        applySticker(option: ApplyStickerOption): void
+        /** [LivePusherContext.clearFilters(Object object)](https://developers.weixin.qq.com/miniprogram/dev/api/media/live/LivePusherContext.clearFilters.html)
+         *
+         * 需要基础库: `2.14.0`
+         *
+         * 在插件中使用:不支持
+         *
+         * 清除所有滤镜效果 */
+        clearFilters(option?: ClearFiltersOption): void
+        /** [LivePusherContext.clearMakeups(Object object)](https://developers.weixin.qq.com/miniprogram/dev/api/media/live/LivePusherContext.clearMakeups.html)
+         *
+         * 需要基础库: `2.14.0`
+         *
+         * 在插件中使用:不支持
+         *
+         * 清除所有美妆特效 */
+        clearMakeups(option?: ClearMakeupsOption): void
+        /** [LivePusherContext.clearStickers(Object object)](https://developers.weixin.qq.com/miniprogram/dev/api/media/live/LivePusherContext.clearStickers.html)
+         *
+         * 需要基础库: `2.14.0`
+         *
+         * 在插件中使用:不支持
+         *
+         * 清除所有贴纸特效 */
+        clearStickers(option?: ClearStickersOption): void
+        /** [LivePusherContext.createOffscreenCanvas(object options)](https://developers.weixin.qq.com/miniprogram/dev/api/media/live/LivePusherContext.createOffscreenCanvas.html)
+         *
+         * 需要基础库: `2.29.0`
+         *
+         * 在插件中使用:支持
+         *
+         * 创建一个能够承接 LivePusher 采集纹理的离屏 Canvas,客户端 8.0.31 版本开始支持。 */
+        createOffscreenCanvas(
+            /** 同[wx.createOffscreenCanvas](https://developers.weixin.qq.com/miniprogram/dev/api/canvas/wx.createOffscreenCanvas.html) */
+            options: IAnyObject
+        ): void
         /** [LivePusherContext.exitPictureInPicture(Object object)](https://developers.weixin.qq.com/miniprogram/dev/api/media/live/LivePusherContext.exitPictureInPicture.html)
          *
          * 需要基础库: `2.25.0`
@@ -14328,6 +14830,23 @@ InterstitialAd.offLoad(listener) // 需传入与监听时同一个的函数对
          *
          * 退出小窗,该方法可在任意页面调用 */
         exitPictureInPicture(option?: ExitPictureInPictureOption): void
+        /** [LivePusherContext.onCustomRendererEvent(string event, function|function callback)](https://developers.weixin.qq.com/miniprogram/dev/api/media/live/LivePusherContext.onCustomRendererEvent.html)
+         *
+         * 需要基础库: `2.29.0`
+         *
+         * 在插件中使用:支持
+         *
+         * 开启自定义渲染时,开发者通过此方法订阅相关事件,客户端 8.0.31 版本开始支持。 */
+        onCustomRendererEvent(
+            /** 事件类型,后订阅的监听器会取消之前的监听器
+             *
+             * 参数 event 可选值:
+             * - 'frame': 采集到视频帧后触发;
+             * - 'update': 推流尺寸变更时触发; */
+            event: 'frame' | 'update',
+            /** 自定义渲染事件处理回调函数 */
+            callback: CustomRendererFrameEventCallback
+        ): void
         /** [LivePusherContext.pause(Object object)](https://developers.weixin.qq.com/miniprogram/dev/api/media/live/LivePusherContext.pause.html)
          *
          * 在插件中使用:支持
@@ -17089,6 +17608,14 @@ wx.getRandomValues({
          *
          * 销毁会话。 */
         destroy(): void
+        /** [VKSession.detectBody(Object object)](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKSession.detectBody.html)
+         *
+         * 需要基础库: `2.28.0`
+         *
+         * 在插件中使用:需要基础库 `2.28.0`
+         *
+         * 静态图像人体关键点检测。当 wx.createVKSession 参数传入 {track: {body: {mode: 2} } } 时可用。用法详情[指南文档](https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/visionkit/body.html)。 */
+        detectBody(option: DetectBodyOption): void
         /** [VKSession.detectFace(Object object)](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKSession.detectFace.html)
          *
          * 需要基础库: `2.25.0`
@@ -17102,6 +17629,14 @@ wx.getRandomValues({
          * ### 特别说明
          * 若小程序人脸识别功能涉及采集、存储用户生物特征(如人脸照片或视频、身份证和手持身份证、身份证照和免冠照等),此类型服务需使用[微信原生人脸识别接口](https://developers.weixin.qq.com/community/develop/doc/000442d352c1202bd498ecb105c00d?highline=%E4%BA%BA%E8%84%B8%E6%A0%B8%E8%BA%AB)。 */
         detectFace(option: DetectFaceOption): void
+        /** [VKSession.detectHand(Object object)](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKSession.detectHand.html)
+         *
+         * 需要基础库: `2.28.0`
+         *
+         * 在插件中使用:需要基础库 `2.28.0`
+         *
+         * 静态图像手势关键点检测。当 wx.createVKSession 参数传入 {track: {hand: {mode: 2} } } 时可用。用法详情[指南文档](https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/visionkit/hand.html)。 */
+        detectHand(option: DetectHandOption): void
         /** [VKSession.off(string eventName, function fn)](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKSession.off.html)
          *
          * 需要基础库: `2.20.0`
@@ -17128,8 +17663,8 @@ wx.getRandomValues({
              * 参数 eventName 可选值:
              * - 'resize': 相机尺寸变化事件,回调参数为相机尺寸;
              * - 'addAnchors': 增加 anchor 事件,回调参数为 [VKPlaneAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKPlaneAnchor.html)/[VKMarkerAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKMarkerAnchor.html)/[VKOSDAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKOSDAnchor.html) 列表(只有v2版本支持);
-             * - 'updateAnchors': 更新 anchor 事件,回调参数为 [VKPlaneAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKPlaneAnchor.html)/[VKMarkerAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKMarkerAnchor.html)/[VKOSDAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKOSDAnchor.html) 列表(只有v2版本支持) 或 [VKFaceAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKFaceAnchor.html)/[VKOCRAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKOCRAnchor.html) 列表(v1、v2都支持);
-             * - 'removeAnchors': 删除 anchor 事件,回调参数为 [VKPlaneAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKPlaneAnchor.html)/[VKMarkerAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKMarkerAnchor.html)/[VKOSDAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKOSDAnchor.html) 列表(只有v2版本支持) 或 [VKFaceAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKFaceAnchor.html)/[VKOCRAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKOCRAnchor.html) 列表(v1、v2都支持); */
+             * - 'updateAnchors': 更新 anchor 事件,回调参数为 [VKPlaneAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKPlaneAnchor.html)/[VKMarkerAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKMarkerAnchor.html)/[VKOSDAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKOSDAnchor.html) 列表(只有v2版本支持) 或 [VKFaceAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKFaceAnchor.html)/[VKOCRAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKOCRAnchor.html)/[VKHandAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKHandAnchor.html)/[VKBodyAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKBodyAnchor.html)列表(v1、v2都支持);
+             * - 'removeAnchors': 删除 anchor 事件,回调参数为 [VKPlaneAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKPlaneAnchor.html)/[VKMarkerAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKMarkerAnchor.html)/[VKOSDAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKOSDAnchor.html) 列表(只有v2版本支持) 或 [VKFaceAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKFaceAnchor.html)/[VKOCRAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKOCRAnchor.html)/[VKHandAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKHandAnchor.html)/[VKBodyAnchor](https://developers.weixin.qq.com/miniprogram/dev/api/ai/visionkit/VKBodyAnchor.html) 列表(v1、v2都支持); */
             eventName:
                 | 'resize'
                 | 'addAnchors'
@@ -17204,7 +17739,7 @@ wx.getRandomValues({
          *
          * 在插件中使用:需要基础库 `2.20.0`
          *
-         * 获取帧对象,每调用一次都会触发一次帧分析过程。 */
+         * 获取帧对象,每调用一次都会触发一次帧分析过程。目前 VKSession 相机的最大帧数是 30 fps,因此调用 getVKFrame 的频率也可以限制在 30 fps,以减少渲染开销。 */
         getVKFrame(
             /** 宽度 */
             width: number,
@@ -19560,6 +20095,16 @@ wx.canvasGetImageData({
             /** 在自定义组件下,当前组件实例的this,以操作组件内 [canvas](https://developers.weixin.qq.com/miniprogram/dev/component/canvas.html) 组件 */
             component?: Component.TrivialInstance | Page.TrivialInstance
         ): PromisifySuccessResult<T, CanvasToTempFilePathOption>
+        /** [wx.checkIsAddedToMyMiniProgram(Object object)](https://developers.weixin.qq.com/miniprogram/dev/api/open-api/my-miniprogram/wx.checkIsAddedToMyMiniProgram.html)
+         *
+         * 需要基础库: `2.29.1`
+         *
+         * 在插件中使用:不支持
+         *
+         * 检查小程序是否被添加至 「我的小程序」 */
+        checkIsAddedToMyMiniProgram(
+            option: CheckIsAddedToMyMiniProgramOption
+        ): void
         /** [wx.checkIsOpenAccessibility(Object object)](https://developers.weixin.qq.com/miniprogram/dev/api/device/accessibility/wx.checkIsOpenAccessibility.html)
          *
          * 需要基础库: `2.13.0`
@@ -25943,7 +26488,7 @@ wx.writeBLECharacteristicValue({
         /** 文件系统中的用户目录路径 */
         env: { USER_DATA_PATH: string }
         /** 获得 xr-frame 接口系统 */
-        getXrFrameSystem(): import('WechatXrFrame').IXrFrameSystem
+        getXrFrameSystem(): import('XrFrame').IXrFrameSystem
         /** 需要基础库: `2.25.2`
          *
          * worklet 对象,可以通过 [wx.worklet](https://developers.weixin.qq.com/miniprogram/dev/api/ui/worklet/wx.worklet.html) 获取。 */
@@ -26049,6 +26594,72 @@ wx.writeBLECharacteristicValue({
     /** 接口调用成功的回调函数 */
     type AppendFileSuccessCallback = (res: GeneralCallbackResult) => void
     /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+    type ApplyBlusherStickMakeupCompleteCallback = (
+        res: GeneralCallbackResult
+    ) => void
+    /** 接口调用失败的回调函数 */
+    type ApplyBlusherStickMakeupFailCallback = (
+        res: GeneralCallbackResult
+    ) => void
+    /** 接口调用成功的回调函数 */
+    type ApplyBlusherStickMakeupSuccessCallback = (
+        res: GeneralCallbackResult
+    ) => void
+    /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+    type ApplyEyeBrowMakeupCompleteCallback = (
+        res: GeneralCallbackResult
+    ) => void
+    /** 接口调用失败的回调函数 */
+    type ApplyEyeBrowMakeupFailCallback = (res: GeneralCallbackResult) => void
+    /** 接口调用成功的回调函数 */
+    type ApplyEyeBrowMakeupSuccessCallback = (
+        res: GeneralCallbackResult
+    ) => void
+    /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+    type ApplyEyeShadowMakeupCompleteCallback = (
+        res: GeneralCallbackResult
+    ) => void
+    /** 接口调用失败的回调函数 */
+    type ApplyEyeShadowMakeupFailCallback = (res: GeneralCallbackResult) => void
+    /** 接口调用成功的回调函数 */
+    type ApplyEyeShadowMakeupSuccessCallback = (
+        res: GeneralCallbackResult
+    ) => void
+    /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+    type ApplyFaceContourMakeupCompleteCallback = (
+        res: GeneralCallbackResult
+    ) => void
+    /** 接口调用失败的回调函数 */
+    type ApplyFaceContourMakeupFailCallback = (
+        res: GeneralCallbackResult
+    ) => void
+    /** 接口调用成功的回调函数 */
+    type ApplyFaceContourMakeupSuccessCallback = (
+        res: GeneralCallbackResult
+    ) => void
+    /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+    type ApplyFilterCompleteCallback = (res: GeneralCallbackResult) => void
+    /** 接口调用失败的回调函数 */
+    type ApplyFilterFailCallback = (res: GeneralCallbackResult) => void
+    /** 接口调用成功的回调函数 */
+    type ApplyFilterSuccessCallback = (res: GeneralCallbackResult) => void
+    /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+    type ApplyLipStickMakeupCompleteCallback = (
+        res: GeneralCallbackResult
+    ) => void
+    /** 接口调用失败的回调函数 */
+    type ApplyLipStickMakeupFailCallback = (res: GeneralCallbackResult) => void
+    /** 接口调用成功的回调函数 */
+    type ApplyLipStickMakeupSuccessCallback = (
+        res: GeneralCallbackResult
+    ) => void
+    /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+    type ApplyStickerCompleteCallback = (res: GeneralCallbackResult) => void
+    /** 接口调用失败的回调函数 */
+    type ApplyStickerFailCallback = (res: GeneralCallbackResult) => void
+    /** 接口调用成功的回调函数 */
+    type ApplyStickerSuccessCallback = (res: GeneralCallbackResult) => void
+    /** 接口调用结束的回调函数(调用成功、失败都会执行) */
     type AuthPrivateMessageCompleteCallback = (
         res: GeneralCallbackResult
     ) => void
@@ -26141,6 +26752,18 @@ wx.writeBLECharacteristicValue({
         result: CanvasToTempFilePathSuccessCallbackResult
     ) => void
     /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+    type CheckIsAddedToMyMiniProgramCompleteCallback = (
+        res: GeneralCallbackResult
+    ) => void
+    /** 接口调用失败的回调函数 */
+    type CheckIsAddedToMyMiniProgramFailCallback = (
+        res: GeneralCallbackResult
+    ) => void
+    /** 接口调用成功的回调函数 */
+    type CheckIsAddedToMyMiniProgramSuccessCallback = (
+        result: CheckIsAddedToMyMiniProgramSuccessCallbackResult
+    ) => void
+    /** 接口调用结束的回调函数(调用成功、失败都会执行) */
     type CheckIsOpenAccessibilityCompleteCallback = (
         res: GeneralCallbackResult
     ) => void
@@ -26281,6 +26904,24 @@ wx.writeBLECharacteristicValue({
     /** 接口调用失败的回调函数 */
     type ClearFailCallback = (res: GeneralCallbackResult) => void
     /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+    type ClearFiltersCompleteCallback = (res: GeneralCallbackResult) => void
+    /** 接口调用失败的回调函数 */
+    type ClearFiltersFailCallback = (res: GeneralCallbackResult) => void
+    /** 接口调用成功的回调函数 */
+    type ClearFiltersSuccessCallback = (res: GeneralCallbackResult) => void
+    /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+    type ClearMakeupsCompleteCallback = (res: GeneralCallbackResult) => void
+    /** 接口调用失败的回调函数 */
+    type ClearMakeupsFailCallback = (res: GeneralCallbackResult) => void
+    /** 接口调用成功的回调函数 */
+    type ClearMakeupsSuccessCallback = (res: GeneralCallbackResult) => void
+    /** 接口调用结束的回调函数(调用成功、失败都会执行) */
+    type ClearStickersCompleteCallback = (res: GeneralCallbackResult) => void
+    /** 接口调用失败的回调函数 */
+    type ClearStickersFailCallback = (res: GeneralCallbackResult) => void
+    /** 接口调用成功的回调函数 */
+    type ClearStickersSuccessCallback = (res: GeneralCallbackResult) => void
+    /** 接口调用结束的回调函数(调用成功、失败都会执行) */
     type ClearStorageCompleteCallback = (res: GeneralCallbackResult) => void
     /** 接口调用失败的回调函数 */
     type ClearStorageFailCallback = (res: GeneralCallbackResult) => void
@@ -26374,6 +27015,10 @@ wx.writeBLECharacteristicValue({
     type CropImageSuccessCallback = (
         result: EditImageSuccessCallbackResult
     ) => void
+    /** 自定义渲染事件处理回调函数 */
+    type CustomRendererFrameEventCallback = (
+        result: OnCustomRendererEventCallbackResult
+    ) => void
     /** 接口调用结束的回调函数(调用成功、失败都会执行) */
     type DisableAlertBeforeUnloadCompleteCallback = (
         res: GeneralCallbackResult

+ 1 - 1
GuangZuan/node_modules/miniprogram-api-typings/types/wx/lib.wx.app.d.ts

@@ -1,5 +1,5 @@
 /*! *****************************************************************************
-Copyright (c) 2022 Tencent, Inc. All rights reserved.
+Copyright (c) 2023 Tencent, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

+ 1 - 1
GuangZuan/node_modules/miniprogram-api-typings/types/wx/lib.wx.behavior.d.ts

@@ -1,5 +1,5 @@
 /*! *****************************************************************************
-Copyright (c) 2022 Tencent, Inc. All rights reserved.
+Copyright (c) 2023 Tencent, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

+ 1 - 1
GuangZuan/node_modules/miniprogram-api-typings/types/wx/lib.wx.cloud.d.ts

@@ -1,5 +1,5 @@
 /*! *****************************************************************************
-Copyright (c) 2022 Tencent, Inc. All rights reserved.
+Copyright (c) 2023 Tencent, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

+ 1 - 1
GuangZuan/node_modules/miniprogram-api-typings/types/wx/lib.wx.component.d.ts

@@ -1,5 +1,5 @@
 /*! *****************************************************************************
-Copyright (c) 2022 Tencent, Inc. All rights reserved.
+Copyright (c) 2023 Tencent, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

+ 1 - 1
GuangZuan/node_modules/miniprogram-api-typings/types/wx/lib.wx.event.d.ts

@@ -1,5 +1,5 @@
 /*! *****************************************************************************
-Copyright (c) 2022 Tencent, Inc. All rights reserved.
+Copyright (c) 2023 Tencent, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

+ 1 - 1
GuangZuan/node_modules/miniprogram-api-typings/types/wx/lib.wx.page.d.ts

@@ -1,5 +1,5 @@
 /*! *****************************************************************************
-Copyright (c) 2022 Tencent, Inc. All rights reserved.
+Copyright (c) 2023 Tencent, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

+ 2 - 2
GuangZuan/node_modules/miniprogram-api-typings/types/wx/lib.wx.phys3D.d.ts

@@ -1,5 +1,5 @@
 /*! *****************************************************************************
-Copyright (c) 2022 Tencent, Inc. All rights reserved.
+Copyright (c) 2023 Tencent, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ***************************************************************************** */
 
-declare namespace WechatPhys3D {
+declare namespace phys3D {
     // pvd调试配置
     export interface PhysicsDebugConfig {
         isNetwork: boolean // 采用网络的方式

Diferenças do arquivo suprimidas por serem muito extensas
+ 201 - 195
GuangZuan/node_modules/miniprogram-api-typings/types/wx/lib.wx.xr-frame.d.ts


+ 7 - 7
GuangZuan/package-lock.json

@@ -22,7 +22,7 @@
         "@types/crypto-js": "^4.1.1",
         "@types/node": "^18.7.2",
         "gulp": "^4.0.2",
-        "miniprogram-api-typings": "^3.8.1"
+        "miniprogram-api-typings": "^3.9.0"
       }
     },
     "node_modules/@miniprogram-i18n/compile": {
@@ -2307,9 +2307,9 @@
       }
     },
     "node_modules/miniprogram-api-typings": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmmirror.com/miniprogram-api-typings/-/miniprogram-api-typings-3.8.1.tgz",
-      "integrity": "sha512-AjuBYxghx3LZeTtWQ48TfDMxoACGRUA+NdPrgl+mPPNgi5g0YXn3sDELNHRw0LcjTxfqhVufwLL65AjwT+W+FQ==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmmirror.com/miniprogram-api-typings/-/miniprogram-api-typings-3.9.0.tgz",
+      "integrity": "sha512-QCXHHW9H4XYazb8J9EMiFyaOWHXhBG4oehkQqi+76FJpKKIlpgL0ZkXxzJ2L+6T/c5OxKm7iegovKIQGVkZDLQ==",
       "dev": true
     },
     "node_modules/mixin-deep": {
@@ -6147,9 +6147,9 @@
       }
     },
     "miniprogram-api-typings": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmmirror.com/miniprogram-api-typings/-/miniprogram-api-typings-3.8.1.tgz",
-      "integrity": "sha512-AjuBYxghx3LZeTtWQ48TfDMxoACGRUA+NdPrgl+mPPNgi5g0YXn3sDELNHRw0LcjTxfqhVufwLL65AjwT+W+FQ==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmmirror.com/miniprogram-api-typings/-/miniprogram-api-typings-3.9.0.tgz",
+      "integrity": "sha512-QCXHHW9H4XYazb8J9EMiFyaOWHXhBG4oehkQqi+76FJpKKIlpgL0ZkXxzJ2L+6T/c5OxKm7iegovKIQGVkZDLQ==",
       "dev": true
     },
     "mixin-deep": {

+ 1 - 1
GuangZuan/package.json

@@ -21,6 +21,6 @@
     "@types/crypto-js": "^4.1.1",
     "@types/node": "^18.7.2",
     "gulp": "^4.0.2",
-    "miniprogram-api-typings": "^3.8.1"
+    "miniprogram-api-typings": "^3.9.0"
   }
 }

+ 51 - 1
GuangZuan/typings/types/model/common.d.ts

@@ -47,7 +47,7 @@ declare namespace GuangZuan {
   /// 查询收货地址信息请求
   interface QueryUserReceiveInfoReq {
     /// 用户id
-    userid: number,
+    userid: number
   }
 
   /// 查询收货地址信息
@@ -254,4 +254,54 @@ declare namespace GuangZuan {
     /// 行号
     rownumber: string
   }
+
+  /// 获取会员风采表
+  interface GZMemberInfo {
+    /// 联系人
+    contactname: string
+    /// 电话
+    contactphone: string
+    /// 微信号
+    contactwx: string
+    /// 图片地址
+    imageurl: string
+    /// 会员ID(SEQ_GZ_MEMBERINFO)
+    memberid: number
+    /// 会员名称
+    membername: string
+    /// 标签(逗号分隔)
+    membertags: string
+    /// 显示顺序
+    orderindex: number
+    /// 更新时间
+    updatetime: string
+    /// 标签
+    membertagsdisplay: string[]
+  }
+
+  /// 获取保税商品表
+  interface GZBSCGoods {
+    /// 产销国
+    countryname: string
+    /// 币制
+    currencyname: string
+    /// 海关执行标志
+    executionflag: string
+    /// 商品ID(料号)
+    goodsid: number
+    /// 商品名称
+    goodsname: string
+    /// 商品编号
+    goodsnum: string
+    /// 规格型号
+    goodsspec: string
+    /// 法定计量单位
+    legalunit: string
+    /// 申报计量单位
+    reportunit: string
+    /// 存储(监管)期限
+    storageperiod: string
+    /// 单价
+    unitprice: number
+  }
 }

+ 778 - 0
GuangZuan/typings/types/model/order.d.ts

@@ -1971,4 +1971,782 @@ declare namespace GuangZuan {
     /// 履约计划模板ID
     templateid: number
   }
+
+  /// 查询仓储报表请求
+  interface WRPositionReportReq {
+    /// 用户ID
+    userid: number
+    /// 页码
+    page?: number
+    /// 每页条数
+    pagesize?: number
+    /// 周期类型 - 1:月 2:季 3:年 4:周 5:全报表 (日报表不传此参数)
+    cycletype?: string
+    /// 开始时段(日报表:yyyymmdd 月报表:yyyymm 年报表:yyyy)
+    begindate?: string
+    /// 结束时段(日报表:yyyymmdd 月报表:yyyymm 年报表:yyyy)
+    enddate?: string
+    /// 商品分类
+    zscategory?: number
+    /// 商品币种
+    zscurrencytype?: number
+  }
+
+  /// 查询仓储报表
+  interface WRPositionReport {
+    /// 帐户ID
+    accountid: number
+    /// 品牌ID(1交割品种升贴水参数表 AutoID) - 作废
+    brandid: number
+    /// 买挂牌宗数
+    buylistinglot: number
+    /// 购买金额
+    buytradeamount: number
+    /// 购买宗数
+    buytradelot: number
+    /// 购买数量
+    buytradeqty: number
+    /// 授信当前数量
+    creditcurqty: number
+    /// 授信冻结数量
+    creditfreezeqty: number
+    /// 授信总数量
+    credittotalqty: number
+    /// 授信成交数量
+    credittradeqty: number
+    /// 今日减少数量
+    decreaseqty: number
+    /// 交割商品ID
+    deliverygoodsid: number
+    /// 月份ID(1交割品种升贴水参数表 AutoID) - 作废
+    deliverymonthid: number
+    /// 总冻结数量
+    freezeqty: number
+    /// 今日增加数量
+    increaseqty: number
+    /// 市值
+    marketvalue: number
+    /// 今日提货数量
+    pickupqty: number
+    /// 品质ID(1交割品种升贴水参数表 AutoID) - 作废
+    qualityid: number
+    /// 日照时期(yyyyMMdd)
+    reckondate: string
+    /// 关联数量
+    relatedqty: number
+    /// 卖挂牌金额
+    selllistingamount: number
+    /// 卖挂牌宗数
+    selllistinglot: number
+    /// 卖挂牌数量
+    selllistingqty: number
+    /// 销售金额
+    selltradeamount: number
+    /// 销售宗数
+    selltradelot: number
+    /// 销售数量
+    selltradeqty: number
+    /// 规格ID(1交割品种升贴水参数表 AutoID) - 作废
+    specid: number
+    /// 销售金额(¥)
+    totalprice: number
+    /// 总数量
+    totalqty: number
+    /// 销售重量(ct)
+    totalweight: number
+    /// 订单仓单头寸总数量
+    tradewrqty: number
+    /// 今日转订单数量
+    transfertradewrqty: number
+    /// 仓库ID(1交割品种升贴水参数表 AutoID) - 作废
+    warehouseid: number
+    /// 仓单要素类型ID
+    wrfactortypeid: number
+    /// 仓单头寸ID(201+Unix秒时间戳(10位)+xxxxxx)
+    wrpositionid: number 
+    /// 现货商品代码
+    wrstandardcode: string
+    /// 现货商品ID
+    wrstandardid: number
+    /// 持有人ID
+    wruserid: number
+    /// 商品分类
+    zscategory: number
+    /// 商品分类
+    zscategorydisplay: string
+    /// 商品币种
+    zscurrencytype: number
+    /// 商品币种
+    zscurrencytypedisplay: string
+    /// 商品币种
+    zscurrencytypedisplayunit: string
+  }
+
+  /// 查询交易报表
+  interface TradeReport {
+    /// 买挂牌金额 - 无数据,预留
+    buylistingamount: number
+    /// 买挂牌宗数
+    buylistinglot: number
+    /// 买挂牌数量 - 无数据,预留
+    buylistingqty: number
+    /// 购买金额
+    buytradeamount: number
+    /// 购买宗数
+    buytradelot: number
+    /// 购买数量
+    buytradeqty: number
+    /// 市场ID
+    marketid: number
+    /// 日照日期(yyyyMMdd)
+    reckondate: string
+    /// 卖挂牌金额
+    selllistingamount: number
+    /// 卖挂牌宗数
+    selllistinglot: number
+    /// 卖挂牌数量
+    selllistingqty: number
+    /// 销售金额
+    selltradeamount: number
+    /// 销售宗数
+    selltradelot: number
+    /// 销售数量
+    selltradeqty: number
+    /// 更新时间
+    updatetime: string
+    /// 用户ID
+    userid: number
+    /// 钻石分类 - 枚举”ZSCategory“
+    zscategory: number
+    /// 货币类型 - 枚举“ZSCurrencyType”
+    zscategorydisplay: string
+    /// 货币类型 - 枚举“ZSCurrencyType”
+    zscurrencytype: number
+    /// 货币类型 - 枚举“ZSCurrencyType”
+    zscurrencytypedisplay: string
+    /// 货币类型 - 枚举“ZSCurrencyType”
+    zscurrencytypedisplayunit: string
+  }
+
+  /// 查询会员报表请求
+  interface MemberReportReq {
+    /// 用户ID
+    userid: number
+    /// 页码
+    page?: number
+    /// 每页条数
+    pagesize?: number
+    /// 周期类型 - 1:月 2:季 3:年 4:周 5:全报表 (日报表不传此参数)
+    cycletype?: string
+    /// 开始时段(日报表:yyyymmdd 月报表:yyyymm 年报表:yyyy)
+    begindate?: string
+    /// 结束时段(日报表:yyyymmdd 月报表:yyyymm 年报表:yyyy)
+    enddate?: string
+  }
+
+  /// 查询会员报表
+  interface MemberReport {
+    /// 资金账户ID
+    accountid: number
+    /// 账户名称
+    accountname: string
+    /// 今日账户盈亏 = 今日净值-昨日净值+今日出金-今日入金-今日划转+今日授信减少-今日授信增加+今日其它授信减少-今日其它授信增加+今日三方出金-今日三方入金;由统计服务更新
+    accountpl: number
+    /// 可用资金
+    avaiablemoney: number
+    /// 可出资金
+    avaiableoutmoney: number
+    /// 期初余额
+    balance: number
+    /// 本金余额[外部子账户实际出入金余额]
+    capitalbalance: number
+    /// 变动标志(当前账户资金有任何变动更新为1系统结算时更新0;供清算时使用) 0:无变动 1:有变动
+    changeflag: number
+    /// 清算余额 = 期末余额 - 授信金额 - 其它授信金额
+    clearbalance: number
+    /// 真实资金变动值(除出入金、应付交易所手续费)清算盈亏 = 期末余额 - 期初余额 - (今日入金 + 今日出金) - 今日应付交易所手续费 - 【(今日授信增加 + 今日授信减少) - (今日其它授信增加 + 今日其它授信减少) ----母账户】 = 今日手续费支出 + 今日平仓盈亏 + 今日结算盈亏 + 其他支出 + 其他收入 + 今日划转金额 + 今日已收手续费分成 - 今日应付交易所手续费
+    clearpl: number
+    /// 今日平仓盈亏
+    closepl: number
+    /// 平仓盈亏(逐笔)
+    closepl2: number
+    /// 今日授信减少
+    creditdecrease: number
+    /// 今日授信增加
+    creditincrease: number
+    /// 期末欠款
+    curdebt: number
+    /// 货币ID
+    currencyid: number
+    /// 期末余额
+    currentbalance: number
+    /// 周期类型 - 1:月 2:季 3:年 4:周 5:全报表 (日报表不传此参数)
+    cycletype: number
+    /// 今日递延费2支出[111, 112]
+    defercharge: number
+    /// 今日交收货款收入
+    deliveryamountin: number
+    /// 今日交收货款支出
+    deliveryamountout: number
+    /// 今日交收手续费支出 [105,106]
+    deliverycharge: number
+    /// 今日交收补偿费收入
+    deliverycompensationfeein: number
+    /// 今日交收补偿费支出
+    deliverycompensationfeeout: number
+    /// 今日已收手续费分成
+    dividedcharge: number
+    /// 浮动净值 = 净值 + 浮动盈亏
+    floatnetvalue: number
+    /// 浮动盈亏 - 每日有负债类商品
+    floatpl: number
+    /// 手续费冻结
+    freezecharge: number
+    /// 冻结保证金
+    freezemargin: number
+    /// 所属上级账户
+    fromaccountid: number
+    /// 今日持仓过夜费支出[108,109,110]
+    holdcharge: number
+    /// 今日入金金额
+    inamount: number
+    /// 今日递延费支出[103, 104]
+    interestcharge: number
+    /// 是否账号 0:不是母账户 1:是母账户
+    ismain: number
+    /// 是否机构接单账号 0:不是 1:是
+    ismarketaccount: number
+    /// 是否机构分润账号 0:不是 1:是
+    isreckonaccount: number
+    /// 授信金额
+    mortgagecredit: number
+    /// 净值 = 期末余额 + 所有权市值 + 仓单市值仓单市值由统计服务更新
+    netvalue: number
+    /// 期初欠款
+    oridebt: number
+    /// 期初手续费冻结
+    orifreezecharge: number
+    /// 期初冻结保证金
+    orifreezemargin: number
+    /// 期初授信金额
+    orimortgagecredit: number
+    /// 期初其它授信金额
+    oriothercredit: number
+    /// 期初其他冻结保证金(出金冻结资金 交割买方冻结 申购冻结 全款买入 商城买入)
+    oriotherfreezemargin: number
+    /// 期初出金冻结
+    orioutamountfreeze: number
+    /// 期初占用保证金
+    oriusedmargin: number
+    /// 其它授信金额
+    othercredit: number
+    /// 今日其它授信减少
+    othercreditdecrease: number
+    /// 今日其它授信增加
+    othercreditincrease: number
+    /// 其他冻结保证金(出金冻结资金 交割买方冻结 申购冻结 全款买入 商城买入)
+    otherfreezemargin: number
+    /// 其他收入(交割收款 申购收款 全款卖出 商城卖出 买家退货 会员手续费收入)
+    otherincome: number
+    /// 其他支出(交割付款 申购付款 全款买入 商城买入 卖家退货)
+    otherpay: number
+    /// 今日出金金额
+    outamount: number
+    /// 出金冻结
+    outamountfreeze: number
+    /// 出金阈值
+    outthreshold: number
+    /// 所有权市值
+    ownershipvalue: number
+    /// 所属根账户
+    parentaccountid: number
+    /// 资金密码
+    password: string
+    /// 今日手续费支出
+    paycharge: number
+    /// 今日手续费支出(外部配置)
+    paycharge2: number
+    /// 今日应付交易所手续费
+    payexchcharge: number
+    /// 日照日期(yyyyMMdd)
+    reckondate: string
+    /// 今日结算盈亏
+    reckonpl: number
+    /// 结算盈亏(逐笔) - 汇总取期末
+    reckonpl2: number
+    /// 关联用户交易状态 - 1:正常(可交易) 2:受限(可平仓,不可建仓) 3:冻结(不可交易)
+    relatedaccountstatus: number
+    /// 关联用户
+    relateuserid: number
+    /// 风险率 = 占用/ 浮动净值 或 浮动净值/占用
+    riskrate: number
+    /// 签约状态 - 1:未签约 2:已签约 3:已解约
+    signstatus: number
+    /// 现货市值-统计服务更新
+    spotvalue: number
+    /// 账号层级路径(逗号分隔,首尾加逗号)
+    sublevelpath: string
+    /// 外部/内部账号 - 1:外部账号 2:内部账号
+    taaccounttype: number
+    /// 今日三方入金
+    thirdinamount: number
+    /// 今日三方出金
+    thirdoutamount: number
+    /// 今日成交金额
+    tradeamount: number
+    /// 今日交易手续费支出 [101,102]
+    tradecharge: number
+    /// 今日成交量
+    tradeqty: number
+    /// 交易状态 - 1:正常 2:受限 3:冻结 4:禁止建仓(人工受限) 5:禁止交易(人工冻结)
+    tradestatus: number
+    /// 今日划转金额(母子账号资金划转,从账号划入为正,从账号划出为负)
+    transferamount: number
+    /// 占用保证金
+    usedmargin: number
+    /// 用户ID
+    userid: number
+  }
+
+  /// 保税仓月电费登记表查询请求
+  interface GZBscuserPowerFeeReq {
+    /// 用户ID
+    userid: number	
+    /// 月份(yyyMM)
+    trademonth: string
+    /// 页码
+    page?: number	
+    /// 每页条数
+    pagesize?: number
+  }
+
+  /// 保税仓月电费登记表查询
+  interface GZBscuserPowerFee {
+    /// 创建时间
+    createtime: string
+    /// 月末初数
+    endpower: number
+    /// 仪表编号
+    instrumentno: number
+    /// 电费(元)
+    powerfee: number
+    /// 电费单ID(809+Unix秒时间戳(10位)+xxxxxx)
+    powerfeeid: string
+    /// 本月用量
+    powernum: number
+    /// 单位
+    powerunit: number
+    /// 月初读数
+    startpower: number
+    /// 月份(yyyMM)
+    trademonth: string
+    /// 用户ID
+    userid: number
+    /// 使用单位
+    username: number
+  }
+
+  /// 保税仓用户月付款通知书表查询(计费管理)请求
+  interface GZBSCuserMonthPayReq {
+    /// 用户ID
+    userid: number	
+    /// 支付状态 - 1:待确认 2:待支付 3:已支付(枚举:GZBSCPayStatus)
+    paystatus: number
+    /// 页码
+    page?: number	
+    /// 每页条数
+    pagesize?: number
+  }
+
+  /// 保税仓用户月付款通知书表查询(计费管理)
+  interface GZBSCuserMonthPay {
+    /// 资金账户ID
+    accountid: number
+    /// 确认时间
+    confirmtime: string
+    /// 处理状态
+    handlestatus: number
+    /// 进仓报关费
+    infee: number
+    /// 进仓报关单数
+    innum: number
+    /// 出仓报关费
+    outfee: number
+    /// 出仓报关单数
+    outnum: number
+    /// 支付方式 - 1:线上 2:线下(枚举:GZBSCPayMode)
+    paymode: number
+    /// 支付状态 - 1:待确认 2:待支付 3:已支付(枚举:GZBSCPayStatus)
+    paystatus: number
+    /// 支付时间
+    paytime: string
+    /// 分拣室电费
+    powerfee: number
+    /// 保险费
+    premium: number
+    /// 月租天数
+    rentdays: number
+    /// 分拣室服务费
+    servicefee: number
+    /// 协议起始日
+    startdate: string
+    /// 仓储费
+    storagefee: number
+    /// 合计费用
+    totalfee: number
+    /// 月份(yyyMM)
+    trademonth: string
+    /// 用户ID
+    userid: number
+  }
+
+  /// 保税仓出入库申请表查询请求
+  interface GZBSCinOutOrderReq {
+    /// 用户ID
+    userid: number	
+    /// 单据类型 - 1:进仓 2:出仓(枚举:GZBSCOrderType)
+    ordertype: number
+    /// 列表类型 - 0.全部 1.待上传 2.进行中 3.已结束
+    listtype: number
+    /// 出仓类型 - 1:转厂 2:出境(枚举:GZBSCOutType)
+    outtype: number
+    /// 页码
+    page?: number	
+    /// 每页条数
+    pagesize?: number
+  }
+
+  /// 保税仓出入库申请表查询 
+  interface GZBSCinOutOrder {
+    /// 申请时间
+    applicanttime: string
+    /// 连袋重(克)
+    bagweightgm: number
+    /// 核注清单号
+    checklistno: string
+    /// 进出仓确认时间
+    confirmdate: string
+    /// 进出仓确认人
+    confirmername: string
+    /// 进出仓确认交易日(yyyyMMdd)
+    confirmtradedate: string
+    /// 申请方联系人
+    contactname: string
+    /// 申请方联系电话
+    contactnum: string
+    /// 报关单号
+    customsno: string
+    /// 报关总值
+    customstotalvalue: number
+    /// 商品名称 - 明细的商品名称拼接(“/”)
+    goodsname: string
+    /// 进出口日期
+    jckdate: string
+    /// 物流公司名称
+    logisticscompany: string
+    /// 托运单号
+    logisticsno: string
+    /// 净重(克拉)
+    netweightct: number
+    /// 净重(克)
+    netweightgm: number
+    /// 申请ID(806+Unix秒时间戳(10位)+xxxxxx)
+    orderid: string
+    /// 单据编号
+    ordernum: string
+    /// 进出仓状态 - 1.待确认 2.待上传 3.报关中 4.进仓中 5.出仓中 20.已关闭 21.确认拒绝(枚举:GZBSCOrderStatus)
+    orderstatus: number
+    /// 单据类型 - 1:进仓 2:出仓(枚举:GZBSCOrderType)
+    ordertype: number
+    /// 出仓类型 - 1:转厂 2:出境(枚举:GZBSCOutType)
+    outtype: number
+    /// 进出仓封条号
+    sealno: string
+    /// 收发货人日期
+    signeedate: string
+    /// 收发货人
+    signeename: string
+    /// 总价
+    totalprice: number
+    /// 申请方地点
+    useraddress: string
+    /// 申请用户ID
+    userid: number
+    /// 申请方名称
+    username: string
+  }
+
+  /// 保税商品报关头寸表查询请求
+  interface GZBSCPositionReq {
+    /// 用户ID
+    userid: number	
+    /// 页码
+    page?: number	
+    /// 每页条数
+    pagesize?: number
+  }
+
+  /// 保税商品报关头寸表查询
+  interface GZBSCPosition {
+    /// 产销国
+    countryname: string
+    /// 币制
+    currencyname: string
+    /// 报关单号
+    customsno: string
+    /// 报关总值
+    customsvalue: number
+    /// 海关执行标志
+    executionflag: string
+    /// 冻结净重(克拉)
+    freezenetweightct: number
+    /// 商品ID
+    goodsid: string
+    /// 商品名称
+    goodsname: string
+    /// 商品编号
+    goodsnum: string
+    /// 规格型号
+    goodsspec: string
+    /// 进口日期
+    jckdate: string
+    /// 法定计量单位
+    legalunit: string
+    /// 净重(克拉)
+    netweightct: number
+    /// 净重(克)
+    netweightgm: number
+    /// 期初报关总值
+    oricustomsvalue: number
+    /// 期初冻结净重(克拉)
+    orifreezeweight: number
+    /// 期初净重(克拉)
+    orinetweightct: number
+    /// 期初净重(克)
+    orinetweightgm: number
+    /// 期初总价
+    oritotalprice: number
+    /// 申报计量单位
+    reportunit: string
+    /// 存储(监管)期限
+    storageperiod: string
+    /// 总价
+    totalprice: number
+    /// 单价
+    unitprice: number
+    /// 用户ID
+    userid: number
+  }
+
+  /// 保税仓本月进口明细/本月出境明细/本月转厂明细查询请求
+  interface BSCInoutOrderReq {
+    /// 用户ID
+    userid: number	
+    /// 进出口月份(yyyMM)
+    jckdate: string
+    /// 页码
+    page?: number	
+    /// 每页条数
+    pagesize?: number
+  }
+
+  /// 保税仓本月进口明细/本月出境明细/本月转厂明细查询
+  interface BSCInoutOrder {
+    /// 申请时间
+    applicanttime: string
+    /// 连袋重(克)
+    bagweightgm: number
+    /// 核注清单号
+    checklistno: string
+    /// 进出仓确认时间
+    confirmdate: string
+    /// 进出仓确认人
+    confirmername: string
+    /// 进出仓确认交易日(yyyyMMdd)
+    confirmtradedate: string
+    /// 申请方联系人
+    contactname: string
+    /// 申请方联系电话
+    contactnum: string
+    /// 报关单号
+    customsno: string
+    /// 报关总值
+    customstotalvalue: number
+    /// 商品名称 - 明细的商品名称拼接(“/”)
+    goodsname: string
+    /// 进出口日期
+    jckdate: string
+    /// 物流公司名称
+    logisticscompany: string
+    /// 托运单号
+    logisticsno: string
+    /// 净重(克拉)
+    netweightct: number
+    /// 净重(克)
+    netweightgm: number
+    /// 申请ID(806+Unix秒时间戳(10位)+xxxxxx)
+    orderid: string
+    /// 单据编号
+    ordernum: string
+    /// 进出仓状态 - 1.待确认 2.待上传 3.报关中 4.进仓中 5.出仓中 20.已关闭 21.确认拒绝(枚举:GZBSCOrderStatus)
+    orderstatus: number
+    /// 单据类型 - 1:进仓 2:出仓(枚举:GZBSCOrderType)
+    ordertype: number
+    /// 出仓类型 - 1:转厂 2:出境(枚举:GZBSCOutType)
+    outtype: number
+    /// 进出仓封条号
+    sealno: string
+    /// 收发货人日期
+    signeedate: string
+    /// 收发货人
+    signeename: string
+    /// 总价
+    totalprice: number
+    /// 申请方地点
+    useraddress: string
+    /// 申请用户ID
+    userid: number
+    /// 申请方名称
+    username: string
+  }
+
+  /// 保税仓出入库申请明细表查询请求
+  interface BSCInoutOrderDetailReq {
+    /// 用户ID
+    userid: number	
+    /// 申请ID
+    orderid: string
+    /// 页码
+    page?: number	
+    /// 每页条数
+    pagesize?: number
+  }
+
+  /// 保税仓出入库申请明细表查询
+  interface BSCInoutOrderDetail {
+    /// 件数
+    backagenum: number
+    /// 连袋重(克)
+    bagweightgm: number
+    /// 产销国
+    countryname: string
+    /// 币种
+    currencydes: string
+    /// 币制
+    currencyname: string
+    /// 报关单号(进仓:录入时更新,出仓申请时有)
+    customsno: string
+    /// 报关总值
+    customsvalue: number
+    /// 明细ID(807+Unix秒时间戳(10位)+xxxxxx)
+    detailid: string
+    /// 海关执行标志
+    executionflag: string
+    /// 商品ID
+    goodsid: number
+    /// 商品名称
+    goodsname: string
+    /// 商品编号
+    goodsnum: string
+    /// 规格
+    goodsspec: string
+    /// 法定计量单位
+    legalunit: string
+    /// 净重(克拉)
+    netweightct: number
+    /// 净重(克)
+    netweightgm: number
+    /// 申请ID
+    orderid: string
+    /// 原产国
+    origincountry: string
+    /// 单价(克)
+    prepricegm: number
+    /// 原料明细
+    rawdetail: string
+    /// 备注
+    remark: string
+    /// 申报计量单位
+    reportunit: string
+    /// 存储(监管)期限
+    storageperiod: string
+    /// 总价
+    totalprice: number
+    /// 单价
+    unitprice: number
+    /// 用户ID
+    userid: number
+  }
+
+  /// 保税仓出库申请明细附表查询请求
+  interface BSCOutOrderDetailAttReq {
+    /// 用户ID
+    userid: number	
+    /// 申请ID
+    orderid: string
+    /// 页码
+    page?: number	
+    /// 每页条数
+    pagesize?: number
+  }
+
+  /// 保税仓出库申请明细附表查询
+  interface BSCOutOrderDetailAtt {
+    /// 产销国
+    countryname: string
+    /// 本次扣减货值(报关总值)
+    curcustomsvalue: number
+    /// 本次扣减量(克拉)
+    curnetweightct: number
+    /// 本次扣减净重(克)
+    curnetweightgm: number
+    /// 币制
+    currencyname: string
+    /// 本次扣减货值
+    curtotalprice: number
+    /// 报关单号
+    customsno: string
+    /// 报关总值
+    customsvalue: number
+    /// 明细ID(810+Unix秒时间戳(10位)+xxxxxx)
+    detailattid: string
+    /// 海关执行标志
+    executionflag: string
+    /// 商品ID
+    goodsid: number
+    /// 商品名称
+    goodsname: string
+    /// 商品编号
+    goodsnum: string
+    /// 规格型号
+    goodsspec: string
+    /// 进口日期
+    jckdate: string
+    /// 法定计量单位
+    legalunit: string
+    /// 净重(克拉)
+    netweightct: number
+    /// 净重(克)
+    netweightgm: number
+    /// 申请ID
+    orderid: string
+    /// 结余净重(克)
+    remaincurnetweightgm: number
+    /// 结余报关总值
+    remaincustomsvalue: number
+    /// 结余净重(克拉)
+    remainnetweightct: number
+    /// 结余总价
+    remaintotalprice: number
+    /// 申报计量单位
+    reportunit: string
+    /// 存储(监管)期限
+    storageperiod: string
+    /// 总价
+    totalprice: number
+    /// 单价
+    unitprice: number
+    /// 用户ID
+    userid: number
+  }
 }

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff