diff --git a/.env.development b/.env.development
index de7243a..26a51dd 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 全医通护理站管理平台
+VUE_APP_TITLE = 泉医到家护理站管理平台
 
 # 开发环境配置
 ENV = 'development'
 
-# 全医通护理站管理平台/开发环境
+# 泉医到家护理站管理平台/开发环境
 # VUE_APP_BASE_API = '/dev-api'
 VUE_APP_BASE_API = 'http://192.168.16.64:8080'
 
diff --git a/.env.production b/.env.production
index efbafa1..c9d5454 100644
--- a/.env.production
+++ b/.env.production
@@ -1,8 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = 全医通护理站管理平台
+VUE_APP_TITLE = 泉医到家护理站管理平台
 
 # 生产环境配置
 ENV = 'production'
 
-# 全医通护理站管理平台/生产环境
+# 泉医到家护理站管理平台/生产环境
 VUE_APP_BASE_API = '/prod-api'
diff --git a/.env.staging b/.env.staging
index af99706..983cf61 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 全医通护理站管理平台
+VUE_APP_TITLE = 泉医到家护理站管理平台
 
 NODE_ENV = production
 
 # 测试环境配置
 ENV = 'staging'
 
-# 全医通护理站管理平台/测试环境
+# 泉医到家护理站管理平台/测试环境
 VUE_APP_BASE_API = '/stage-api'
diff --git a/src/assets/images/mian.png b/src/assets/images/mian.png
deleted file mode 100644
index 19f5704..0000000
Binary files a/src/assets/images/mian.png and /dev/null differ
diff --git a/src/views/login.vue b/src/views/login.vue
index 554af1d..31f5a5f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -13,7 +13,7 @@
           type="text"
           auto-complete="off"
           placeholder="账号"
-          style="width: 300px;"
+        style="width: 310px"
         >
           <svg-icon
             slot="prefix"
@@ -29,7 +29,8 @@
           auto-complete="off"
           placeholder="密码"
           @keyup.enter.native="handleLogin"
-          style="width: 300px"
+          style="width: 310px"
+       
         >
           <svg-icon
             slot="prefix"
@@ -187,7 +188,20 @@ export default {
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
+<style rel="stylesheet/scss" lang="scss" scoped>
+// .login .el-input::v-deep .el-input__inner {
+//   width: 300px;
+//   background-color: #F8F8F8;
+ 
+//   border: none;
+// }
+.el-input--medium ::v-deep .el-input__inner{
+    height: 50px;
+    line-height: 36px;
+    background-color: #F8F8F6;
+    border: none;
+  border-radius: 10px;
+}
 .login {
   display: flex;
   justify-content: center;
@@ -201,7 +215,9 @@ export default {
   text-align: center;
   color: #707070;
 }
-
+.login-form .el-input{
+  border: none;
+}
 .login-form {
   margin-left: 20%;
   border-radius: 6px;
@@ -218,6 +234,7 @@ export default {
     height: 39px;
     width: 14px;
     margin-left: 2px;
+    margin-top: 5px;
   }
 }
 .login-tip {
@@ -249,6 +266,7 @@ export default {
 }
 .login-code-img {
   height: 38px;
+  margin-top: 5px;
 }
 // .el-button{
 //    background-image: linear-gradient(to right , #90C8DF, #4CA8CD);
diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 7dc884f..cb32ba6 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -24,7 +24,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="订单状态" prop="orderStatusinfo">
+      <el-form-item label="订单状态" prop="orderStatus">
         <el-select
           v-model="queryParams.orderStatus"
           placeholder="请选择订单状态"
@@ -729,6 +729,9 @@ seelogistics(id) {
 searchlogistics() {
   console.log(this.queryexpressNo)
   editExpressNo(this.queryexpressNo).then(res => {
+     if(res.code == 200){
+          this.$modal.msgSuccess("录入成功");
+        }
     this.queryexpressNo.expressNo = ""
     this.innerlogistics = false
     console.log(res)
@@ -759,6 +762,9 @@ submitRefundOrder() {
   obj.remark = this.refundlist.refundReasonRemark
   obj.goodsStatus = this.refundlist.orderStatus
   weChatRefundOrderApply(obj).then(res => {
+     if(res.code == 200){
+          this.$modal.msgSuccess("退款成功");
+        }
     // console.log(obj)
     this.innerrefund = false
   })
@@ -805,7 +811,6 @@ reset() {
     nurseStationId: null,
     patientId: null,
     orderNo: null,
-    orderStatus: "0",
     totalPrice: null,
     receiver: null,
     receiveAddress: null,
@@ -817,7 +822,8 @@ reset() {
     createBy: null,
     createTime: null,
     updateBy: null,
-    updateTime: null
+    updateTime: null,
+    orderStatus: "",
   };
   this.resetForm("form");
 },
@@ -830,7 +836,8 @@ handleQuery() {
 resetQuery() {
   this.resetForm("queryForm");
   this.handleQuery();
-  //  this.getList();
+ 
+
 },
 // 多选框选中数据
 handleSelectionChange(selection) {
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index 4f60db3..e9ad6a4 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -91,6 +91,7 @@
             icon="el-icon-s-promotion"
             @click="dispatch(scope.row)"
             v-hasPermi="['system:nurseType:edit']"
+            v-if="scope.row.orderStatus==WAIT_DISPATCH"
             >派单</el-button
           >
           <el-button