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

build/webpack.base.conf.js

@@ -76,6 +76,10 @@ let webpackConfig = {
           limit: 10000,
           name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
         }
+      },
+      {
+        test: /\.sass$/,
+        loaders: ['style', 'css', 'sass']
       }
     ]
   },

config/dev.env.js

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

package.json

@@ -16,9 +16,9 @@
     "fiximg": "xcopy %cd%\\dist\\static\\img %cd%\\dist\\static\\css\\static\\img /s /y /d /e /i"
   },
   "dependencies": {
-    "axios": "^0.18.0",
+    "axios": "^0.19.0",
     "cropperjs": "^1.4.3",
-    "element-ui": "^2.4.6",
+    "element-ui": "^2.9.1",
     "lib-flexible": "^0.3.2",
     "mint-ui": "^2.2.13",
     "print-js": "^1.0.54",
@@ -29,7 +29,7 @@
     "vue-pickers": "^1.1.5",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1",
-    "vux": "^2.9.2"
+    "vux": "^2.9.4"
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",
@@ -95,7 +95,7 @@
     "vue-style-loader": "^3.0.1",
     "vue-template-compiler": "^2.5.2",
     "vux-loader": "^1.2.9",
-    "webpack": "^3.6.0",
+    "webpack": "^3.12.0",
     "webpack-bundle-analyzer": "^2.9.0",
     "webpack-dev-server": "^2.9.1",
     "webpack-merge": "^4.1.0",

src/pages/advice/DialysisAdviceTable.vue

@@ -106,10 +106,10 @@
           </tr>
         </template>
       </template>
-    </table>
+     </table>
+     <div class="NoData" v-show="zones.length  <= 1"><img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt=""></div>
+    
     </div>
-    <!--<div class="NoData" v-show="zones.length <= 1"><img src="@/assets/login/data.jpg" alt=""></div>-->
-    <div class="NoData" v-show="zones.length  <= 1"><img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt=""></div>
 
   <mt-datetime-picker
     v-model="selected_date"

src/pages/main/dialysis/InspectionItemTable.vue

@@ -5,7 +5,7 @@
     <van-list
       v-model="loading"
       :finished="finished"
-      finished-text="没有更多了"
+      finished-text="  "
       @load="onLoad"
     >
       <table class="table">

src/pages/main/today/TodayTab.vue

@@ -172,7 +172,7 @@
       </ul>
     </div> -->
  
-   <el-button class="goTop" v-show="goTopShow" @click="goTop"  type="primary" icon="el-icon-arrow-up" circle style="position:fixed;right:20px;bottom:20px;"></el-button>
+   <el-button class="goTop" v-show="goTopShow" @click="goTop"  type="primary" icon="el-icon-arrow-up" circle style="position:fixed;right:50px;bottom:50px;"></el-button>
 
    </div>
 </template>
@@ -1001,5 +1001,11 @@ export default {
     }
   }
 }
+.el-button.is-circle{
+  padding: 18px!important;
+  .el-icon-arrow-up{
+    font-size: 20px!important;
+  }
+}
 </style>
 

src/pages/monitoring/index.vue

@@ -37,6 +37,7 @@
       <van-list
         v-model="loading"
         :finished="finished"
+        finished-text="  "
         @load="onLoad"
       >
       <div class="blueBorder"></div>