Merge branch 'master' of http://192.168.20.122:3000/root/qiyewechatApp

UI/src/pages/sellmanage/channelCode.js

@@ -487,29 +487,17 @@ editMessage = (data) => {
   //点击粉丝查看设置
   fansOpen = () => {
     self = this;
-
-    // console.log(this.state.editArray);
-
-    let list = {
-      pageIndex: 1,
-      pageSize: 10,
-      sortField: "TagId",
-      sortDirection: 1,
-      filters: [{ field: "TagTypeId", operate: "equal", value: "24" }],
-      sumFields: []
-    };
     request({
-      url: WXMpAPI + "/wx/tag/" + self.props.wxAppIdValue + "/list",
-      method: "post",
-      data: list
+      url: WXMpAPI + "/wx/tag/" + self.props.wxAppIdValue + "/queryAll",
+      method: "get",
     }).then(function (res) {
       // 将查询出的res.items 和选中的 editArray对比
-      let selectArray = self.state.selectArray;
       let qrcodeTag = self.state.editArray.qrcodeTagList;
+      let selectArray = self.state.selectArray;
       if (!qrcodeTag) {
         qrcodeTag = [];
       }
-      res.items.map(item => {
+      res.result.map(item => {
         for (var i = 0; i < qrcodeTag.length; i++) {
           if (item.id == qrcodeTag[i].tagId) {
             selectArray.push(item.id);
@@ -517,7 +505,7 @@ editMessage = (data) => {
         }
       })
       self.setState({
-        dataGroup: res.items,
+        dataGroup: res.result,
         fanslookVisiable: true,
         selectArray, selectArray
       });