Merge branch 'master' of http://git.shengws.com/csx/Pad_New

src/pages/doctorAdvice/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="page_doctorAdvice">
     <div class="doctorAdviceTitle">
-      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
+      <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
       <div class="patientName" @click="show = true">
         {{ patientName }}
         <van-icon name="arrow-down" />
@@ -542,7 +542,7 @@ export default {
           var id = this.patient[i].id;
           this.show = false;
           this.$router.push(
-            "/patientdetail?patientid=" + id + "&active=" + this.active
+            "/patientdetail?patientid=" + id + "&seacherActive=" + this.active
           );
           this.patientName = this.value;
           this.reload();
@@ -551,6 +551,9 @@ export default {
     },
     toEditPatient() {
       this.$router.push("/editPatient?patientid=" + this.patient_id);
+    },
+    toReturn() {
+      this.$router.push("/patients");
     }
   },
   created() {