取消返回判断

src/views/firmContent/drugInfo/PZchouyang/PZchouyang.vue

@@ -554,10 +554,8 @@ export default {
       this.value = "";
     },
     getPagination(e) {
-      console.log(e);
       this.form1.current = e.page;
       this.form1.size = e.limit;
-      this.chinaCosmetics();
       this.listyp();
     },
     filterLevel(e) {

src/views/firmContent/drugInfo/index.vue

@@ -12,8 +12,7 @@
         </div>
       </div>
       <div>
-        <el-button v-if="goback" type="primary" plain size="mini" @click="goBack">返回</el-button>
-        <i v-else class="el-icon-close close" @click="goBack"></i>
+        <el-button  type="primary" plain size="mini" @click="goBack">返回</el-button>
       </div>
     </div>
     <div class="drugInfo-bottom">
@@ -94,7 +93,6 @@ export default {
         height:'',
       },
       // isOne:false,
-      goback:true,
       id:null,
       token:null,
       //产品名称
@@ -198,27 +196,27 @@ export default {
     // console.log(this.$route.params)
     // this.row = JSON.parse(this.$route.params.row)
     // this.row = this.$route.params.row;
-    let search = window.location.search.slice(1);
-    let params = search.split('&');
-    let paramsLabel = params[2].split('=')[0]
-    this.id = params[0].split('=')[1];
-    this.token = params[1].split('=')[1];
-    if (paramsLabel == 'yppzwh') {
-      this.isYppzwh = true;
-      this.getVRdgYpwhGxwz(params[2].split('=')[1]);
-    } else if(paramsLabel == 'qxzczh') {
-      this.ylqxJnyelcp(params[2].split('=')[1]);
-    }
+    // let search = window.location.search.slice(1);
+    // let params = search.split('&');
+    // let paramsLabel = params[2].split('=')[0]
+    // this.id = params[0].split('=')[1];
+    // this.token = params[1].split('=')[1];
+    // if (paramsLabel == 'yppzwh') {
+    //   this.isYppzwh = true;
+    //   this.getVRdgYpwhGxwz(params[2].split('=')[1]);
+    // } else if(paramsLabel == 'qxzczh') {
+    //   this.ylqxJnyelcp(params[2].split('=')[1]);
+    // }
 
-    // 判断是用⌈ 返回 ⌋ 还是用⌈ X ⌋ 用来返回上一级
-    if(this.id == '1') {
-      this.goback = true;
-    } else {
-      this.goback = false;
-    }
-    this.$nextTick(()=>{
-      this.getHeight();
-    })
+    // // 判断是用⌈ 返回 ⌋ 还是用⌈ X ⌋ 用来返回上一级
+    // if(this.id == '1') {
+    //   this.goback = true;
+    // } else {
+    //   this.goback = false;
+    // }
+    // this.$nextTick(()=>{
+    //   this.getHeight();
+    // })
   }
 }
 </script>