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

config/dev.env.js

@@ -4,9 +4,9 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"'
+  // BASE_API: '"http://api.xt.test.sgjyun.com"'
    //http://api.xt.test.sgjyun.com http://localhost:9529
-   // BASE_API: '"http://api.xt.test.sgjyun.com"'
+   BASE_API: '"http://api.xt.test.sgjyun.com"'
   // BASE_API: '"https://api.xt.kuyicloud.com"'
 
 })

config/prod.env.js

@@ -1,9 +1,9 @@
 "use strict";
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"https://api.xt.kuyicloud.com"'
+  // BASE_API: '"https://api.xt.kuyicloud.com"'
 
-  // BASE_API: '"http://api.xt.test.sgjyun.com"'
+  BASE_API: '"http://api.xt.test.sgjyun.com"'
   // http://api.xt.test.sgjyun.com
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
 };

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1289,7 +1289,7 @@
               this.zhiShow = true
               this.totalShow = true
               this.huShow  = true
-              console.log("aa")
+             
             }
           }
         }

src/styles/style.scss

@@ -413,7 +413,10 @@ body {
   .Dialog {
     font-size: 0.36rem;
     width: 11.8rem;
-    @media only screen and (min-width: 415px) and (max-width: 737px) {
+    @media only screen and (min-width: 415px) and (max-width: 500px) {
+      width: 10.8rem !important;
+    }
+    @media only screen and (min-width: 501px) and (max-width: 737px) {
       width: 12.8rem !important;
     }
     @media only screen and (min-width: 376px) and (max-width: 415px) {