Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

src/pages/main/dialog/OrdersDialog.vue

@@ -34,16 +34,16 @@
         <span
           v-if="currentSubAdvices.length <= 0"
           @click="modifyAdviceAction"
-          :class="{ forbid: current_group_index < 0 ||  currentAdvices.length != 1  || current_select_object== 2 || (this.$store.getters.user.user.user_type == 3 && !isPremission) }"
+          :class="{ forbid: current_group_index < 0 ||  currentAdvices.length != 1  || current_select_object== 2  }"
         >修改</span>
         <span
           v-if="currentSubAdvices.length <= 0"
           @click="deleteAdviceAction"
-          :class="{ forbid: current_group_index < 0 || currentAdvices.length <= 0 || (this.$store.getters.user.user.user_type == 3 && !isPremission) }"
+          :class="{ forbid: current_group_index < 0 || currentAdvices.length <= 0 }"
         >删除</span>
 
-        <span id="fontSize" :class="{ forbid:(this.$store.getters.user.user.user_type == 3 && !isPremission) }" v-if="currentSubAdvices.length > 0" @click="modifySubdviceAction">修改子医嘱</span>
-        <span id="fontSize" :class="{ forbid:(this.$store.getters.user.user.user_type == 3 && !isPremission) }" v-if="currentSubAdvices.length > 0" @click="deleteSubAdviceAction">删除子医嘱</span>
+        <span id="fontSize" :class="{ forbid:this.$store.getters.user.user.user_type == 3}" v-if="currentSubAdvices.length > 0" @click="modifySubdviceAction">修改子医嘱</span>
+        <span id="fontSize" :class="{ forbid:this.$store.getters.user.user.user_type == 3}" v-if="currentSubAdvices.length > 0" @click="deleteSubAdviceAction">删除子医嘱</span>
       </div>
       <div class="DialogContent choose" id="dialogTop" style="height:6.5rem;">
 
@@ -781,9 +781,6 @@
         }
         return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':00'
       }, deleteSubAdviceAction: function () {
-        if (this.$store.getters.user.user.user_type == 3&& !this.isPremission){
-          return
-        }
         if (this.currentSubAdvices.length <= 0) {
           return
         }
@@ -823,9 +820,6 @@
 
       },
       deleteAdviceAction: function () {
-        if (this.$store.getters.user.user.user_type == 3&& !this.isPremission){
-          return
-        }
         if (this.current_select_object == 1) {
           if (this.currentAdvices.length <= 0) {
             return
@@ -1194,9 +1188,6 @@
         this.current_advice_index = -1
         this.current_advice = null
       }, modifySubdviceAction: function () {
-        if (this.$store.getters.user.user.user_type == 3&& !this.isPremission){
-          return
-        }
         if (this.currentSubAdvices.length <= 0) {
           return
         }
@@ -1226,9 +1217,6 @@
         if (this.currentAdvices.length != 1 || this.current_select_object == 2){
           return
         }
-        if (this.$store.getters.user.user.user_type == 3 && !this.isPremission){
-          return
-        }
         if (this.current_group_index < 0) {
           return
         }

src/styles/media.scss

@@ -1,4 +1,4 @@
-@media only screen and (max-width: 500px) {
+@media only screen and (max-width: 767px) {
   html {
     font-size: 30px;
   }
@@ -10,17 +10,17 @@
 // }
 
 /* Medium devices (landscape tablets, 768px and up) */
-@media only screen and (min-width: 768px) {
-  html {
-    font-size: 50px;
-  }
-}
-
-// @media screen and (orientation: portrait) and (max-width: 640px) {
-// .mainBox {
-//   -webkit-transform: rotate(-90deg);
-//   -moz-transform: rotate(-90deg);
-//   -ms-transform: rotate(-90deg);
-//   transform: rotate(-90deg);
-// }
+// @media only screen and (min-width: 800px) {
+//   html {
+//     font-size: 50px;
+//   }
 // }
+
+@media screen and (orientation: portrait) and (max-width: 640px) {
+  // .mainBox {
+  //   -webkit-transform: rotate(-90deg);
+  //   -moz-transform: rotate(-90deg);
+  //   -ms-transform: rotate(-90deg);
+  //   transform: rotate(-90deg);
+  // }
+}