d

igirl-web/app/front/vues/pages/policyquery/policyquery.js

@@ -789,7 +789,6 @@
     },
     zcPost(size) {
       /*http://43.247.184.92:8018/gsb/api/zc*/
-<<<<<<< HEAD
       axios.post('https://policy.gongsibao.com/gsb/api/zcsearch',{
           "zctext": this.zctext,
           "currentpage": size || 1,
@@ -806,24 +805,6 @@
           "address":this.$root.areaName
       }).then( d => {
         console.log(d,'---------------------------------');
-=======
-      axios.post('http://43.247.184.92:8019/gsb/api/zc', {
-        "zctext": this.zctext,
-        "currentpage": size || 1,
-        "pagesize": 15,
-        "cityname": this.input1,
-        "policygrade": this.input2,
-        "policydepartment": this.input3,
-        "policytype": this.input4,
-        "qiye": this.input5,
-        "classification": this.input6,
-        "policydomain": this.input7,
-        "fieldtext": this.input8,
-        "year": this.input9,
-        "address": this.$root.areaName
-      }).then(d => {
-        console.log(d, '---------------------------------');
->>>>>>> a285278851d0d57c048d045ffff8ab29172b429e
         var data = d.data.data;
         this.recommendationsArr = data;
         this.total = d.data.total;