修改bug

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.1.2"
+  "version": "1.1.52"
 }

src/pages/home/login.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="container">
+
     <div class="newLogin">
       <div class="login">
         <div class="logo">
@@ -53,12 +54,16 @@
               <!--&lt;!&ndash; </router-link> &ndash;&gt;-->
             <!--</el-checkbox>-->
             <!--&lt;!&ndash; <router-link to="/privacyPolicy"> &ndash;&gt;-->
-            <!--<span class="agreeText" @click="agree">《隐私服务协议》</span>-->
             <!--&lt;!&ndash; </router-link> &ndash;&gt;-->
           <!--</div>-->
+          <router-link to="/privacy">
+            <span class="agreeText">《隐私服务协议》</span>
+          </router-link>
+
         </div>
       </div>
     </div>
+
   </div>
 </template>
 
@@ -216,9 +221,9 @@ export default {
     clearCookie: function() {
       this.setCookie("", "", -1); //修改2值都为空，天数为负1天就好了
     },
-    agree() {
-      this.$router.push({ path: "/privacyPolicy" });
-    }
+    // agree() {
+    //   this.$router.push({ path: "/privacy" });
+    // }
   }
 };
 </script>

src/pages/main/add_urgent_schedule.vue

@@ -239,7 +239,6 @@
 
       var today = new Date();
       this.date = parseTime(today, "{y}-{m}-{d}");
-
       var hour = today.getHours();
       if (hour > 3 && hour < 11) {
         this.schedule_type = 1;
@@ -248,11 +247,6 @@
       } else {
         this.schedule_type = 3;
       }
-
-
-
-
-
     },
     mounted() {
 

src/pages/main/dialog/ComputerDialog.vue

@@ -137,31 +137,33 @@
     }, mounted () {
 
       if (this.record.id == 0) {
+        let now = new Date()
+        let hour = now.getHours()
+
+        if (hour >= 6 && hour < 12){
+          this.schedual_type = 1
+
+        }else if(hour >= 12 && hour < 18){
+
+          this.schedual_type = 2
+
+
+        }else if(hour >= 18){
+          this.schedual_type = 3
+        }
         this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
       } else {
         if (this.record.start_time == 0) {
           this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
-
+          this.schedual_type = this.record.schedual_type
         } else {
           this.start_time_str = parseTime(this.record.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
+          this.schedual_type = this.record.schedual_type
+
         }
       }
     },
     created () {
-      let now = new Date()
-      let hour = now.getHours()
-
-      if (hour >= 6 && hour < 12){
-        this.schedual_type = 1
-
-      }else if(hour >= 12 && hour < 18){
-
-        this.schedual_type = 2
-
-
-      }else if(hour >= 18){
-        this.schedual_type = 3
-      }
 
 
       this.GetSchedualNumber()

src/pages/main/dialog/TreatmentDialog.vue

@@ -241,42 +241,40 @@ export default {
     },
 
     dialysisSummarySelectChange: function(values) {
-      if (this.dialysisSummary.summaryContent == null) {
-        this.dialysisSummary.summaryContent == "";
+      if(this.dialysisSummary.summaryContent == null){
+        this.dialysisSummary.summaryContent == ""
       }
+
       if (this.dialysisSummary.summaryContent == "") {
         this.dialysisSummary.summaryContent = values;
       } else {
-        this.dialysisSummary.summaryContent =
-          this.dialysisSummary.summaryContent + values;
+        if (this.dialysisSummary.summaryContent.indexOf(values) == -1) {
+          if (this.dialysisSummary.summaryContent.charAt(this.dialysisSummary.summaryContent.length - 1).indexOf("。") == -1) {
+            this.dialysisSummary.summaryContent =
+              this.dialysisSummary.summaryContent + "," + values;
+          } else {
+            this.dialysisSummary.summaryContent =
+              this.dialysisSummary.summaryContent  + values;
+          }
+        }
       }
     },
     dialysisAfterTeachSelectChange: function(values) {
-      if (this.dialysisSummary.propagandaAndEducationContent == null) {
-        this.dialysisSummary.propagandaAndEducationContent == "";
+      if(this.dialysisSummary.propagandaAndEducationContent == null){
+        this.dialysisSummary.propagandaAndEducationContent == ""
       }
       if (this.dialysisSummary.propagandaAndEducationContent == "") {
         this.dialysisSummary.propagandaAndEducationContent = values;
       } else {
-        this.dialysisSummary.propagandaAndEducationContent =
-          this.dialysisSummary.propagandaAndEducationContent + values;
-        // if (
-        //   this.dialysisSummary.propagandaAndEducationContent.indexOf(values) ==
-        //   -1
-        // ) {
-        //   if (
-        //     this.dialysisSummary.propagandaAndEducationContent
-        //       .charAt(
-        //         this.dialysisSummary.propagandaAndEducationContent.length - 1
-        //       )
-        //       .indexOf("。") == -1
-        //   ) {
-        //     this.dialysisSummary.propagandaAndEducationContent =
-        //       this.dialysisSummary.propagandaAndEducationContent + "," + values;
-        //   } else {
-        //
-        //   }
-        // }
+        if (this.dialysisSummary.propagandaAndEducationContent.indexOf(values) == -1) {
+          if (this.dialysisSummary.propagandaAndEducationContent.charAt(this.dialysisSummary.propagandaAndEducationContent.length - 1).indexOf("。") == -1) {
+            this.dialysisSummary.propagandaAndEducationContent =
+              this.dialysisSummary.propagandaAndEducationContent + "," + values;
+          } else {
+            this.dialysisSummary.propagandaAndEducationContent =
+              this.dialysisSummary.propagandaAndEducationContent + values;
+          }
+        }
       }
     },
     commitInfo: function() {

src/pages/privacy/index.vue

@@ -36,7 +36,7 @@
 
 <script>
     export default {
-        name: "privacyPolicy"
+        name: "privacy"
 
     }
 </script>

src/router/index.js

@@ -77,7 +77,7 @@ export default new Router({
     },
     {
       path: "/privacy",
-      name: "privacyPolicy",
+      name: "privacy",
       component: () => import("@/pages/privacy/index")
     }
   ]