Merge remote-tracking branch 'origin/master' into dev

.env.development

@@ -6,9 +6,7 @@ ENV = 'development'
 
 # 泉医到家运营管理平台/开发环境
 # VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://192.168.16.49:8080'
+VUE_APP_BASE_API = 'https://quanyidaojia.xinelu.cn'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
-
-

.env.production

@@ -5,4 +5,4 @@ VUE_APP_TITLE = 泉医到家运营管理平台
 ENV = 'production'
 
 # 泉医到家运营管理平台/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'https://quanyidaojia.xinelu.cn'

src/api/baseurl.js

@@ -1,3 +1,3 @@
-var baseurl = "http://192.168.16.30:8080";
+var baseurl = "https://quanyidaojia.xinelu.cn";
 
 export default baseurl

src/main.js

@@ -1,6 +1,5 @@
 import Vue from 'vue'
 
-
 import Cookies from 'js-cookie'
 
 import Element from 'element-ui'

src/views/system/stationItem/index.vue

@@ -8,7 +8,7 @@
       v-show="showSearch"
       label-width="110px"
     >
-      <el-form-item label="护理站名称" prop="nurseStationId" label-width="100px">
+      <el-form-item label="护理站名称" prop="nurseStationId" >
         <el-button type class="stationbtn" @click="ParamsStation(true)">
           {{
           queryParams.nurseStationName
@@ -340,7 +340,6 @@
             <el-table-column property="nurseStationConsumableId" label="耗材包名称" align="center">
               <template slot-scope="scope">{{ scope.row.consumableDetail }}</template>
             </el-table-column>
-
             <el-table-column property="consumableCount" label="耗材包数量" align="center">
               <template slot-scope="scope">
                 <el-input