Merge branch '新功能开发/筛选只有一个领域不显示' into 德莱宝测试除了手机登录不合并

# Conflicts:
#	packageA/orderForm/index.js

packageA/orderForm/index.js

@@ -184,7 +184,7 @@ Page({
     }, false).then(res => {
       console.log("获取领域", res)
       if (res.msg == '成功') this.setData({
-        "filtratelist[1].list": res.data
+        'filtratelist[1].list': res.data
       });
     })
   },

pages/index/market/index.js

@@ -1,11 +1,6 @@
 const content = {
     pageNumber: 1,
-    pageTotal: 1,
-    where: {
-      condition: "",
-      itemclassid: "",
-      tradefield: ""
-    }
+    pageTotal: 1
   },
   _Http = getApp().globalData.http;
 let sa_brandid = null,
@@ -18,32 +13,15 @@ Component({
     CustomBar: getApp().globalData.CustomBar,
     typeList: [],
     list: [],
-    filtratelist: [{
-      label: "领域",
-      index: 0,
-      showName: "tradefield", //显示字段
-      valueKey: "tradefield", //返回Key
-      selectKey: "tradefield", //传参 代表选着字段 不传参返回整个选择对象
-      value: "", //选中值
-      list: [{
-        rowindex: 0,
-        subvalues: [],
-        sys_enterprise_tradefieldid: 0,
-        tradefield: "全部"
-      }]
-    }, {
-      label: "营销分类",
-      index: 0,
-      type: "multilevelClass",
-      showName: "itemclassname", //显示字段
-      valueKey: "itemclassid", //返回Key
-      selectKey: "itemclassid", //传参 代表选着字段 不传参返回整个选择对象
-      value: "", //选中值
-      list: []
-    }]
+    filtratelist: []
   },
   methods: {
     init() {
+      content.where = {
+        condition: "",
+        itemclassid: "",
+        tradefield: ""
+      }
       this.getBrand();
       this.getTradefie();
       this.setData({
@@ -108,8 +86,18 @@ Component({
             itemclassname: "全部",
             subdep: []
           })
+          this.data.filtratelist.push({
+            label: "营销分类",
+            index: 0,
+            type: "multilevelClass",
+            showName: "itemclassname", //显示字段
+            valueKey: "itemclassid", //返回Key
+            selectKey: "itemclassid", //传参 代表选着字段 不传参返回整个选择对象
+            value: "", //选中值
+            list: res.data[0].ttemclass
+          })
           this.setData({
-            ['filtratelist[1].list']: res.data[0].ttemclass
+            filtratelist: this.data.filtratelist
           });
         }
         this.getList(true);
@@ -160,15 +148,24 @@ Component({
         }
       }, false).then(res => {
         console.log("获取领域", res)
-        if (res.msg == '成功') {
+        if (res.msg == '成功' && res.data.length > 1) {
           res.data.unshift({
             rowindex: 0,
             subvalues: [],
             sys_enterprise_tradefieldid: 0,
             tradefield: "全部"
           })
+          this.data.filtratelist.unshift({
+            label: "领域",
+            index: 0,
+            showName: "tradefield", //显示字段
+            valueKey: "tradefield", //返回Key
+            selectKey: "tradefield", //传参 代表选着字段 不传参返回整个选择对象
+            value: "", //选中值
+            list: res.data
+          })
           this.setData({
-            'filtratelist[0].list': res.data
+            filtratelist: this.data.filtratelist
           });
         }
       })