xxxxx

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

@@ -15,37 +15,37 @@ Page({
     /// 形状
     shapes: [{ id: 1, name: '圆明亮形', isCheck: false }],
     /// 选中形状         
-    zsshapetype: [],
+    zsshapetype: <string[]>[],
     /// 颜色
     colors: [{id: 1, name: 'D', isCheck: false}],
     /// 选中形状
-    zscolortype: [],
+    zscolortype: <number[]>[],
     /// 净度
     neatness: [{ id: 1, name: 'FL', isCheck: false }],
     /// 选中净度
-    zsclaritytype: [],
+    zsclaritytype: <number[]>[],
     /// 切工 
     qiegongs: [{ id: 1, name: 'EX', isCheck: false }],
     /// 选中切工
-    zscuttype: [],
+    zscuttype: <number[]>[],
     /// 对称
     duichengs: [{ id: 1, name: 'EX', isCheck: false }],
-    zssymmetrytype: [],
+    zssymmetrytype: <number[]>[],
     /// 抛光
     paoguangs: [{ id: 1, name: 'EX', isCheck: false }],
-    zspolishtype: [],
+    zspolishtype: <number[]>[],
     /// 莹光
     yingguangs: [{ id: 1, name: '无', isCheck: false }],
     /// 选中莹光
-    zsfluorescencetype: [],
+    zsfluorescencetype: <number[]>[],
     /// 证书
     certificates: [{ id: 1, name: 'GIA', isCheck: false }],
     /// 选中证书
-    zscerttype: [],
+    zscerttype: <string[]>[],
     /// 币种
     currencys: [{id: 1, name: '人民币(￥)', isCheck: false}, 
                 {id: 2, name: '美元($)', isCheck: false}],
-    zscurrencytype: [],
+    zscurrencytype: <string[]>[],
     /// 最小重量
     minweight: '0.00',
     /// 最大重量

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

@@ -570,8 +570,8 @@ Page({
           }
           /// 操作成功
           hideLoading(()=>{
-            /// 重新获取数据
-            this.queryMySellOrder()
+            //// 刷新数据
+            this.reloadData()
           }, '操作成功', 'success')
         },
         fail: (emsg) => {

GuangZuan/miniprogram/pages/trade/index.ts

@@ -14,7 +14,7 @@ Page({
    */
   data: {
     /// top高度
-    topHeight: 64.0,
+    topHeight: 74.0,
     /// 状态栏高度
     statusBarHeight: getApp().globalData.statusBarHeight,
     /// 导航栏高度
@@ -32,8 +32,8 @@ Page({
     /// tab索引
     active: Number(0),
     /// 钻石分类
-    categorys: [{ text: '单颗裸钻', value: 2 }, { text: '单颗彩钻', value: 5 }],
-    category: 2,
+    categorys: [{ text: '全部', value: '0' }, { text: '单颗裸钻', value: '2' }, { text: '单颗彩钻', value: '5' }],
+    category: '0',
     /// 钻石形状
     shapes: [{ value: 0, text: '形状' }],
     shape: 0,
@@ -194,7 +194,7 @@ Page({
     /// 数据存储
     var data = {
       /// 钻石分类
-      zscategory: this.data.category,
+      zscategorys: this.data.category,
       /// 形状
       zsshapetype: this.data.shape === 0 ? [] : [this.data.shape.toString()],
       /// 净度
@@ -204,13 +204,15 @@ Page({
       /// 荧光
       zsfluorescencetype: this.data.fluorescence === 0 ? [] : [this.data.fluorescence],
     }
+    /// 查所有
+    if (this.data.category === '0') { data.zscategorys = '2,5' }
     /// 获取参数
     const info = diamondFilters()
     /// 动态添加数据
     if (info != undefined) {
       /// 类型
-      data.zscategory = info.zscategory
-      this.setData({ category: info.zscategory })
+      data.zscategorys = info.zscategory.toString()
+      this.setData({ category: info.zscategory.toString() })
       /// 形状
       if (info.zsshapetype.length != 0) {
         data.zsshapetype = info.zsshapetype
@@ -345,10 +347,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad() {
-    const height = this.data.statusBarHeight+this.data.navHeight
+    const height = this.data.statusBarHeight+this.data.navHeight+10
     /// 显示默认数据
     this.setData({
-      topHeight: height > 64 ? height : 74.0,
+      topHeight: height > 74 ? height : 74.0,
       /// 形状
       shapes: [{ value: 0, text: '形状' }].concat(getEnumList('ZSShapeType').map(obj => {
         return {