Browse Source

修改样式

See999 5 years ago
parent
commit
e180cf2e7e
34 changed files with 4873 additions and 4897 deletions
  1. 6 2
      src/main.js
  2. 42 26
      src/pages/console/managementConsole/staff_role/editRole/index.vue
  3. 19 5
      src/pages/console/managementConsole/staff_role/staffManagement/index.vue
  4. 3 3
      src/pages/doctorAdvice/components/CourseManagement.vue
  5. 17 53
      src/pages/doctorAdvice/components/DialysisRecord.vue
  6. 14 55
      src/pages/doctorAdvice/components/DoctorManagement.vue
  7. 5 14
      src/pages/doctorAdvice/components/DryWeight.vue
  8. 6 19
      src/pages/doctorAdvice/components/Education.vue
  9. 3 8
      src/pages/doctorAdvice/components/Inspection.vue
  10. 3 3
      src/pages/doctorAdvice/components/LongDialysis.vue
  11. 7 25
      src/pages/doctorAdvice/components/RescueRecord.vue
  12. 3 3
      src/pages/doctorAdvice/components/Scheduling.vue
  13. 7 25
      src/pages/doctorAdvice/components/deviceManagement.vue
  14. 7 25
      src/pages/doctorAdvice/components/medicationPlan.vue
  15. 7 25
      src/pages/doctorAdvice/components/recoverNotes.vue
  16. 7 25
      src/pages/doctorAdvice/components/signsRecord.vue
  17. 4239 4244
      src/pages/home/createOrg/index.vue
  18. 11 15
      src/pages/home/forgetPassword/index.vue
  19. 11 7
      src/pages/home/login.vue
  20. 1 1
      src/pages/home/noJoinedGroup/index.vue
  21. 12 13
      src/pages/home/noPassword/index.vue
  22. 1 1
      src/pages/home/register/name.vue
  23. 26 25
      src/pages/home/register/register.vue
  24. 160 165
      src/pages/homeIndex/index.vue
  25. 23 17
      src/pages/my/aboutUs.vue
  26. 53 0
      src/pages/my/companyIntroduction.vue
  27. 106 14
      src/pages/my/feedBack.vue
  28. 1 1
      src/pages/my/modifyingName.vue
  29. 4 3
      src/pages/my/myInfo.vue
  30. 1 1
      src/pages/my/organizationInfo.vue
  31. 1 1
      src/pages/my/personalSign.vue
  32. 26 33
      src/pages/privacy/index.vue
  33. 26 37
      src/pages/userAgreement/index.vue
  34. 15 3
      src/router/index.js

+ 6 - 2
src/main.js View File

@@ -51,7 +51,9 @@ import {
51 51
   Swipe,
52 52
   SwipeItem,
53 53
   Col,
54
-  Row
54
+  Row,
55
+  Switch,
56
+  Uploader
55 57
   // eslint-disable-next-line no-irregular-whitespace,import/no-duplicates
56 58
 } from "vant";
57 59
 Vue.use(DropdownMenu)
@@ -82,7 +84,9 @@ Vue.use(DropdownMenu)
82 84
   .use(Swipe)
83 85
   .use(SwipeItem)
84 86
   .use(Col)
85
-  .use(Row);
87
+  .use(Row)
88
+  .use(Switch)
89
+  .use(Uploader);
86 90
 // import "@/lib/flexible.js";
87 91
 
88 92
 // main.js

+ 42 - 26
src/pages/console/managementConsole/staff_role/editRole/index.vue View File

@@ -3,26 +3,19 @@
3 3
     <div class="editRoleTitle">
4 4
       <i class="iconfont icon-zuojiantou jiantou"></i>
5 5
       <span class="titleName">新增角色</span>
6
-      <span style="color:#F44746">删除角色</span>
6
+      <span>保存</span>
7 7
     </div>
8 8
     <div class="roleDescription">
9
-      <van-field
10
-        v-model="text"
11
-        required
12
-        label="角色名称"
13
-        placeholder="请填写角色名称"
14
-      />
15
-      <van-field
16
-        v-model="text1"
17
-        label="角色描述"
18
-        placeholder="请填写角色描述"
19
-      />
9
+      <van-field v-model="text" class="input1" required label="角色名称" placeholder="请填写角色名称">
10
+        <van-button slot="button" size="small">删除角色</van-button>
11
+      </van-field>
12
+      <van-field v-model="text1" label="角色描述" placeholder="请填写角色描述" />
20 13
     </div>
21 14
     <div class="disposeBox">
22 15
       <p class="disposeTitle">应用权限配置</p>
23 16
       <div class="disposeOne">
24 17
         <div class="disposeImg">
25
-          <img src="../../assets/images/S1.png" alt="" />
18
+          <img src="../../../../../assets/images/S1.png" alt />
26 19
         </div>
27 20
         <div class="disposeTxt">
28 21
           <div>
@@ -34,7 +27,7 @@
34 27
       </div>
35 28
       <div class="disposeOne">
36 29
         <div class="disposeImg">
37
-          <img src="../../assets/images/S2.png" alt="" />
30
+          <img src="../../../../../assets/images/S2.png" alt />
38 31
         </div>
39 32
         <div class="disposeTxt">
40 33
           <div>
@@ -46,7 +39,7 @@
46 39
       </div>
47 40
       <div class="disposeOne">
48 41
         <div class="disposeImg">
49
-          <img src="../../assets/images/S3.png" alt="" />
42
+          <img src="../../../../../assets/images/S3.png" alt />
50 43
         </div>
51 44
         <div class="disposeTxt">
52 45
           <div>
@@ -58,7 +51,7 @@
58 51
       </div>
59 52
       <div class="disposeOne">
60 53
         <div class="disposeImg">
61
-          <img src="../../assets/images/S4.png" alt="" />
54
+          <img src="../../../../../assets/images/S4.png" alt />
62 55
         </div>
63 56
         <div class="disposeTxt">
64 57
           <div>
@@ -70,7 +63,7 @@
70 63
       </div>
71 64
       <div class="disposeOne">
72 65
         <div class="disposeImg">
73
-          <img src="../../assets/images/S12.png" alt="" />
66
+          <img src="../../../../../assets/images/S12.png" alt />
74 67
         </div>
75 68
         <div class="disposeTxt">
76 69
           <div>
@@ -82,7 +75,7 @@
82 75
       </div>
83 76
       <div class="disposeOne">
84 77
         <div class="disposeImg">
85
-          <img src="../../assets/images/S5.png" alt="" />
78
+          <img src="../../../../../assets/images/S5.png" alt />
86 79
         </div>
87 80
         <div class="disposeTxt">
88 81
           <div>
@@ -94,7 +87,7 @@
94 87
       </div>
95 88
       <div class="disposeOne">
96 89
         <div class="disposeImg">
97
-          <img src="../../assets/images/S6.png" alt="" />
90
+          <img src="../../../../../assets/images/S6.png" alt />
98 91
         </div>
99 92
         <div class="disposeTxt">
100 93
           <div>
@@ -106,7 +99,7 @@
106 99
       </div>
107 100
       <div class="disposeOne">
108 101
         <div class="disposeImg">
109
-          <img src="../../assets/images/S7.png" alt="" />
102
+          <img src="../../../../../assets/images/S7.png" alt />
110 103
         </div>
111 104
         <div class="disposeTxt">
112 105
           <div>
@@ -118,7 +111,7 @@
118 111
       </div>
119 112
       <div class="disposeOne">
120 113
         <div class="disposeImg">
121
-          <img src="../../assets/images/S8.png" alt="" />
114
+          <img src="../../../../../assets/images/S8.png" alt />
122 115
         </div>
123 116
         <div class="disposeTxt">
124 117
           <div>
@@ -130,7 +123,7 @@
130 123
       </div>
131 124
       <div class="disposeOne">
132 125
         <div class="disposeImg">
133
-          <img src="../../assets/images/S9.png" alt="" />
126
+          <img src="../../../../../assets/images/S9.png" alt />
134 127
         </div>
135 128
         <div class="disposeTxt">
136 129
           <div>
@@ -142,7 +135,7 @@
142 135
       </div>
143 136
       <div class="disposeOne">
144 137
         <div class="disposeImg">
145
-          <img src="../../assets/images/S10.png" alt="" />
138
+          <img src="../../../../../assets/images/S10.png" alt />
146 139
         </div>
147 140
         <div class="disposeTxt">
148 141
           <div>
@@ -154,7 +147,7 @@
154 147
       </div>
155 148
       <div class="disposeOne">
156 149
         <div class="disposeImg">
157
-          <img src="../../assets/images/S11.png" alt="" />
150
+          <img src="../../../../../assets/images/S11.png" alt />
158 151
         </div>
159 152
         <div class="disposeTxt">
160 153
           <div>
@@ -166,7 +159,7 @@
166 159
       </div>
167 160
       <div class="disposeOne">
168 161
         <div class="disposeImg">
169
-          <img src="../../assets/images/S13.png" alt="" />
162
+          <img src="../../../../../assets/images/S13.png" alt />
170 163
         </div>
171 164
         <div class="disposeTxt noTxt">
172 165
           <div>
@@ -184,6 +177,7 @@
184 177
 export default {
185 178
   data() {
186 179
     return {
180
+      text: "",
187 181
       text1: "",
188 182
       checked: false
189 183
     };
@@ -207,7 +201,7 @@ export default {
207 201
   .jiantou {
208 202
     font-size: 1.5rem;
209 203
     font-weight: 600;
210
-    margin-right: 3rem;
204
+    margin-right: 1rem;
211 205
   }
212 206
   .titleName {
213 207
     font-size: 1.125rem;
@@ -218,6 +212,11 @@ export default {
218 212
     .van-cell {
219 213
       font-size: 1rem;
220 214
     }
215
+    .input1 {
216
+      .van-field__body {
217
+        width: 100%;
218
+      }
219
+    }
221 220
   }
222 221
   .disposeBox {
223 222
     margin-bottom: 1.25rem;
@@ -285,3 +284,20 @@ export default {
285 284
   }
286 285
 }
287 286
 </style>
287
+
288
+<style lang="scss">
289
+.roleDescription {
290
+  .input1 {
291
+    .van-field__body {
292
+      width: 100%;
293
+    }
294
+    .van-button {
295
+      color: #f44746;
296
+      border: none;
297
+      text-align: right;
298
+      font-size: 1rem;
299
+      padding: 0;
300
+    }
301
+  }
302
+}
303
+</style>

+ 19 - 5
src/pages/console/managementConsole/staff_role/staffManagement/index.vue View File

@@ -11,7 +11,7 @@
11 11
     </van-sticky>
12 12
     <van-tabs v-model="active" sticky>
13 13
       <van-tab title="在职员工">
14
-        <div class="staffBox">
14
+        <!-- <div class="staffBox">
15 15
           <div
16 16
             class="staffOne"
17 17
             v-for="(item,index) in admin_user"
@@ -29,6 +29,9 @@
29 29
               <i @click="goEditStaff(item.user_id)" class="iconfont icon-bianji bianji"></i>
30 30
             </p>
31 31
           </div>
32
+        </div>-->
33
+        <div class="noData">
34
+          <img src="../../../../../assets/images/none.png" alt />
32 35
         </div>
33 36
       </van-tab>
34 37
       <van-tab title="禁用员工">
@@ -81,10 +84,9 @@ export default {
81 84
     },
82 85
     goEditStaff: function(id) {
83 86
       this.$router.push({ path: "/staff/editstaff?id=" + id });
84
-    },goAddStaff:function () {
85
-
86
-      this.$router.push({ path: "/staff/addstaff"});
87
-
87
+    },
88
+    goAddStaff: function() {
89
+      this.$router.push({ path: "/staff/addstaff" });
88 90
     }
89 91
   },
90 92
   created() {
@@ -145,6 +147,18 @@ export default {
145 147
       }
146 148
     }
147 149
   }
150
+  .noData {
151
+    width: 6.25rem;
152
+    height: 6.25rem;
153
+    position: fixed;
154
+    left: 50%;
155
+    top: 50%;
156
+    transform: translate(-50%, -50%);
157
+    img {
158
+      width: 100%;
159
+      height: 100%;
160
+    }
161
+  }
148 162
 }
149 163
 ::-webkit-scrollbar {
150 164
   width: 0;

+ 3 - 3
src/pages/doctorAdvice/components/CourseManagement.vue View File

@@ -47,11 +47,11 @@
47 47
         <img src="../../../assets/images/none.png" alt />
48 48
       </div>
49 49
     </div>
50
-    <div class="add">
50
+    <!-- <div class="add">
51 51
       <div style="display: flex;align-items: center;">
52 52
         <van-icon class="addIcon" name="add" />新增
53 53
       </div>
54
-    </div>
54
+    </div>-->
55 55
 
56 56
     <!-- 弹出层 -->
57 57
     <div>
@@ -117,7 +117,7 @@ export default {
117 117
       minDate: new Date(1970, 0, 1),
118 118
       maxDate: new Date(2025, 10, 1),
119 119
       currentDate: new Date(),
120
-      actions: [{ name: "编辑" }, { name: "删除" }],
120
+      actions: [{ name: "删除" }],
121 121
       limit: 10,
122 122
       page: 1,
123 123
       total: 0,

+ 17 - 53
src/pages/doctorAdvice/components/DialysisRecord.vue View File

@@ -23,17 +23,8 @@
23 23
       </div>
24 24
 
25 25
       <div class="adviceBox" v-show="showOne">
26
-        <van-list
27
-          v-model="loading"
28
-          :finished="finished"
29
-          finished-text="没有更多了"
30
-          @load="onLoad"
31
-        >
32
-          <div
33
-            class="adviceOne"
34
-            v-for="(item, index) in dialysisRecord"
35
-            :key="index"
36
-          >
26
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
27
+          <div class="adviceOne" v-for="(item, index) in dialysisRecord" :key="index">
37 28
             <div class="adviceTitle">
38 29
               <p>{{ getTime(item.dialysis_date) }}</p>
39 30
             </div>
@@ -65,19 +56,15 @@
65 56
               </p>
66 57
               <p>
67 58
                 透析时长(h):{{ item.prescription.dialysis_duration_hour }}h{{
68
-                  item.prescription.dialysis_duration_minute
59
+                item.prescription.dialysis_duration_minute
69 60
                 }}min
70 61
               </p>
71 62
               <p>干体重(kg):{{ item.predialysis_evaluation.dry_weight }}</p>
72
-              <p>
73
-                透前称重(kg):{{ item.predialysis_evaluation.weight_before }}
74
-              </p>
75
-              <p>
76
-                透后称重(kg):{{ item.assessment_after_dislysis.weight_after }}
77
-              </p>
63
+              <p>透前称重(kg):{{ item.predialysis_evaluation.weight_before }}</p>
64
+              <p>透后称重(kg):{{ item.assessment_after_dislysis.weight_after }}</p>
78 65
               <p>
79 66
                 透前血压(mmHg):{{
80
-                  item.predialysis_evaluation.systolic_blood_pressure
67
+                item.predialysis_evaluation.systolic_blood_pressure
81 68
                 }}/
82 69
                 {{ item.predialysis_evaluation.diastolic_blood_pressure }}
83 70
               </p>
@@ -89,18 +76,10 @@
89 76
               <p>
90 77
                 抗凝剂:
91 78
                 <span v-if="item.prescription.anticoagulant == 1">无肝素</span>
92
-                <span v-if="item.prescription.anticoagulant == 2"
93
-                  >普通肝素</span
94
-                >
95
-                <span v-if="item.prescription.anticoagulant == 3"
96
-                  >低分子肝素</span
97
-                >
98
-                <span v-if="item.prescription.anticoagulant == 4"
99
-                  >阿加曲班</span
100
-                >
101
-                <span v-if="item.prescription.anticoagulant == 5"
102
-                  >枸橼酸钠</span
103
-                >
79
+                <span v-if="item.prescription.anticoagulant == 2">普通肝素</span>
80
+                <span v-if="item.prescription.anticoagulant == 3">低分子肝素</span>
81
+                <span v-if="item.prescription.anticoagulant == 4">阿加曲班</span>
82
+                <span v-if="item.prescription.anticoagulant == 5">枸橼酸钠</span>
104 83
               </p>
105 84
               <p>
106 85
                 首剂:
@@ -138,9 +117,7 @@
138 117
               @click="
139 118
                 toDialysisRecordDetail(item.patient_id, item.dialysis_date)
140 119
               "
141
-            >
142
-              全部
143
-            </div>
120
+            >全部</div>
144 121
           </div>
145 122
         </van-list>
146 123
       </div>
@@ -149,31 +126,18 @@
149 126
         <img src="../../../assets/images/none.png" alt />
150 127
       </div>
151 128
     </div>
152
-    <div class="add">
129
+    <!-- <div class="add">
153 130
       <div style="display: flex;align-items: center;">
154 131
         <van-icon class="addIcon" name="add" />新增
155 132
       </div>
156
-    </div>
133
+    </div>-->
157 134
 
158 135
     <!-- 弹出层 -->
159 136
     <div>
160
-      <van-popup
161
-        v-model="typeShow"
162
-        position="bottom"
163
-        :style="{ height: '40%' }"
164
-      >
165
-        <van-picker
166
-          show-toolbar
167
-          :columns="columns"
168
-          @cancel="onCancel"
169
-          @confirm="onConfirm"
170
-        />
137
+      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
138
+        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
171 139
       </van-popup>
172
-      <van-popup
173
-        v-model="startShow"
174
-        position="bottom"
175
-        :style="{ height: '40%' }"
176
-      >
140
+      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
177 141
         <van-datetime-picker
178 142
           v-model="currentDate"
179 143
           type="date"
@@ -244,7 +208,7 @@ export default {
244 208
       minDate: new Date(1970, 0, 1),
245 209
       maxDate: new Date(2025, 10, 1),
246 210
       currentDate: new Date(),
247
-      actions: [{ name: "编辑" }, { name: "删除" }],
211
+      actions: [{ name: "删除" }],
248 212
       showOne: true,
249 213
       showTwo: false,
250 214
       limit: 10,

+ 14 - 55
src/pages/doctorAdvice/components/DoctorManagement.vue View File

@@ -23,36 +23,18 @@
23 23
       </div>
24 24
 
25 25
       <div class="adviceBox" v-show="showOne">
26
-        <van-list
27
-          v-model="loading"
28
-          :finished="finished"
29
-          finished-text="没有更多了"
30
-          @load="onLoad"
31
-        >
32
-          <div
33
-            class="adviceOne"
34
-            v-for="(item, index) in doctorAdvice"
35
-            :key="index"
36
-          >
26
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
27
+          <div class="adviceOne" v-for="(item, index) in doctorAdvice" :key="index">
37 28
             <div v-for="(it, i) in item.child" :key="i">
38 29
               <div class="adviceTitle" v-if="it.advice_date">
39 30
                 <p>{{ it.advice_date ? getTime(it.advice_date) : "" }}</p>
40
-                <van-icon
41
-                  class="ellipsis"
42
-                  name="ellipsis"
43
-                  @click="Delete(item.groupno, index)"
44
-                />
31
+                <van-icon class="ellipsis" name="ellipsis" @click="Delete(item.groupno, index)" />
45 32
               </div>
46 33
 
47
-              <div
48
-                class="statOrder"
49
-                v-if="it.advice_type == 1 && it.parent_id == 0"
50
-              >
34
+              <div class="statOrder" v-if="it.advice_type == 1 && it.parent_id == 0">
51 35
                 <div class="statOrderTitle">
52 36
                   <span>长期医嘱</span>
53
-                  <span style="margin-left:1rem">
54
-                    {{ getTimes(it.start_time) }}
55
-                  </span>
37
+                  <span style="margin-left:1rem">{{ getTimes(it.start_time) }}</span>
56 38
                 </div>
57 39
                 <div class="orderContent">
58 40
                   <p v-if="it.parent_id === 0">
@@ -80,15 +62,10 @@
80 62
                 </div>
81 63
               </div>
82 64
 
83
-              <div
84
-                class="statOrder"
85
-                v-if="it.advice_type == 3 && it.parent_id == 0"
86
-              >
65
+              <div class="statOrder" v-if="it.advice_type == 3 && it.parent_id == 0">
87 66
                 <div class="longOrderTitle">
88 67
                   <span>临时医嘱</span>
89
-                  <span style="margin-left:1rem">
90
-                    {{ getTimes(item.child[0].start_time) }}
91
-                  </span>
68
+                  <span style="margin-left:1rem">{{ getTimes(item.child[0].start_time) }}</span>
92 69
                 </div>
93 70
                 <div class="orderContent">
94 71
                   <p>
@@ -117,12 +94,7 @@
117 94
                 </div>
118 95
               </div>
119 96
             </div>
120
-            <div
121
-              class="all"
122
-              @click="toDoctorAdviceDetail(item.child[0].groupno)"
123
-            >
124
-              全部
125
-            </div>
97
+            <div class="all" @click="toDoctorAdviceDetail(item.child[0].groupno)">全部</div>
126 98
           </div>
127 99
         </van-list>
128 100
       </div>
@@ -131,32 +103,19 @@
131 103
         <img src="../../../assets/images/none.png" alt />
132 104
       </div>
133 105
     </div>
134
-    <div class="add">
106
+    <!-- <div class="add">
135 107
       <div style="display: flex;align-items: center;">
136 108
         <van-icon class="addIcon" name="add" />新增
137 109
       </div>
138
-    </div>
110
+    </div>-->
139 111
 
140 112
     <!-- 弹出层 -->
141 113
     <div>
142
-      <van-popup
143
-        v-model="typeShow"
144
-        position="bottom"
145
-        :style="{ height: '40%' }"
146
-      >
147
-        <van-picker
148
-          show-toolbar
149
-          :columns="columns"
150
-          @cancel="onCancel"
151
-          @confirm="onConfirm"
152
-        />
114
+      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
115
+        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
153 116
       </van-popup>
154 117
 
155
-      <van-popup
156
-        v-model="startShow"
157
-        position="bottom"
158
-        :style="{ height: '40%' }"
159
-      >
118
+      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
160 119
         <van-datetime-picker
161 120
           v-model="currentDate"
162 121
           type="date"
@@ -220,7 +179,7 @@ export default {
220 179
       minDate: new Date(1970, 0, 1),
221 180
       maxDate: new Date(2025, 10, 1),
222 181
       currentDate: new Date(),
223
-      actions: [{ name: "编辑" }, { name: "删除" }],
182
+      actions: [{ name: "删除" }],
224 183
       form: {
225 184
         type: "",
226 185
         limit: 10,

+ 5 - 14
src/pages/doctorAdvice/components/DryWeight.vue View File

@@ -17,17 +17,8 @@
17 17
       </div>
18 18
 
19 19
       <div class="adviceBox" v-show="showOne">
20
-        <van-list
21
-          v-model="loading"
22
-          :finished="finished"
23
-          finished-text="没有更多了"
24
-          @load="onLoad"
25
-        >
26
-          <div
27
-            class="adviceOne"
28
-            v-for="(item, index) in dryweight"
29
-            :key="index"
30
-          >
20
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
21
+          <div class="adviceOne" v-for="(item, index) in dryweight" :key="index">
31 22
             <div class="adviceTitle">
32 23
               <p>{{ getTime(item.ctime) }}</p>
33 24
               <van-icon
@@ -54,11 +45,11 @@
54 45
         <img src="../../../assets/images/none.png" alt />
55 46
       </div>
56 47
     </div>
57
-    <div class="add">
48
+    <!-- <div class="add">
58 49
       <div style="display: flex;align-items: center;">
59 50
         <van-icon class="addIcon" name="add" />新增
60 51
       </div>
61
-    </div>
52
+    </div>-->
62 53
 
63 54
     <!-- 弹出层 -->
64 55
     <div>
@@ -102,7 +93,7 @@ export default {
102 93
         .add(1, "days")
103 94
         .format("YYYY-MM-DD"),
104 95
       currentDate: new Date(),
105
-      actions: [{ name: "编辑" }, { name: "删除" }],
96
+      actions: [{ name: "删除" }],
106 97
       page: 1,
107 98
       limit: 10,
108 99
       dryweight: [],

+ 6 - 19
src/pages/doctorAdvice/components/Education.vue View File

@@ -16,17 +16,8 @@
16 16
         </div>
17 17
       </div>
18 18
       <div class="adviceBox" v-show="showOne">
19
-        <van-list
20
-          v-model="loading"
21
-          :finished="finished"
22
-          finished-text="没有更多了"
23
-          @load="onLoad"
24
-        >
25
-          <div
26
-            class="adviceOne"
27
-            v-for="(item, index) in Education"
28
-            :key="index"
29
-          >
19
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
20
+          <div class="adviceOne" v-for="(item, index) in Education" :key="index">
30 21
             <div class="adviceTitle">
31 22
               <p>{{ getTime(item.assessment_date) }}</p>
32 23
               <van-icon
@@ -49,19 +40,15 @@
49 40
         <img src="../../../assets/images/none.png" alt />
50 41
       </div>
51 42
     </div>
52
-    <div class="add">
43
+    <!-- <div class="add">
53 44
       <div style="display: flex;align-items: center;">
54 45
         <van-icon class="addIcon" name="add" />新增
55 46
       </div>
56
-    </div>
47
+    </div>-->
57 48
 
58 49
     <!-- 弹出层 -->
59 50
     <div>
60
-      <van-popup
61
-        v-model="startShow"
62
-        position="bottom"
63
-        :style="{ height: '40%' }"
64
-      >
51
+      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
65 52
         <van-datetime-picker
66 53
           v-model="currentDate"
67 54
           type="date"
@@ -117,7 +104,7 @@ export default {
117 104
       minDate: new Date(1970, 0, 1),
118 105
       maxDate: new Date(2025, 10, 1),
119 106
       currentDate: new Date(),
120
-      actions: [{ name: "编辑" }, { name: "删除" }],
107
+      actions: [{ name: "删除" }],
121 108
       showOne: true,
122 109
       showTwo: false,
123 110
       limit: 10,

+ 3 - 8
src/pages/doctorAdvice/components/Inspection.vue View File

@@ -41,11 +41,11 @@
41 41
         <img src="../../../assets/images/none.png" alt />
42 42
       </div>
43 43
     </div>
44
-    <div class="add">
44
+    <!-- <div class="add">
45 45
       <div style="display: flex;align-items: center;">
46 46
         <van-icon class="addIcon" name="add" />新增
47 47
       </div>
48
-    </div>
48
+    </div>-->
49 49
 
50 50
     <!-- 弹出层 -->
51 51
     <div>
@@ -104,7 +104,7 @@ export default {
104 104
       minDate: new Date(1970, 0, 1),
105 105
       maxDate: new Date(2025, 10, 1),
106 106
       currentDate: new Date(),
107
-      actions: [{ name: "编辑" }, { name: "删除" }],
107
+      actions: [{ name: "删除" }],
108 108
       showOne: true,
109 109
       showTwo: false,
110 110
       list: [],
@@ -210,17 +210,12 @@ export default {
210 210
             a.push(item.child);
211 211
             item.child.map((it, i) => {
212 212
               if (arr.indexOf(it.project_name) != -1) {
213
-                // a[index].splice(i, 1);
214
-                // a.splice(i, 1);
215
-                console.log("执行");
216 213
               } else {
217 214
                 arr.push(it.project_name);
218 215
               }
219 216
             });
220 217
             item.child = arr;
221
-            console.log(arr);
222 218
           });
223
-          console.log("红红火火恍恍惚惚", list);
224 219
           this.Inspection = list;
225 220
         }
226 221
       });

+ 3 - 3
src/pages/doctorAdvice/components/LongDialysis.vue View File

@@ -106,11 +106,11 @@
106 106
         <img src="../../../assets/images/none.png" alt />
107 107
       </div>
108 108
     </div>
109
-    <div class="add">
109
+    <!-- <div class="add">
110 110
       <div style="display: flex;align-items: center;">
111 111
         <van-icon class="addIcon" name="add" />新增
112 112
       </div>
113
-    </div>
113
+    </div>-->
114 114
 
115 115
     <!-- 弹出层 -->
116 116
     <div>
@@ -191,7 +191,7 @@ export default {
191 191
       minDate: new Date(1970, 0, 1),
192 192
       maxDate: new Date(2025, 10, 1),
193 193
       currentDate: new Date(),
194
-      actions: [{ name: "编辑" }, { name: "删除" }],
194
+      actions: [{ name: "删除" }],
195 195
       loading: false,
196 196
       finished: false,
197 197
       limit: 10,

+ 7 - 25
src/pages/doctorAdvice/components/RescueRecord.vue View File

@@ -16,17 +16,8 @@
16 16
         </div>
17 17
       </div>
18 18
       <div class="adviceBox" v-show="showOne">
19
-        <van-list
20
-          v-model="loading"
21
-          :finished="finished"
22
-          finished-text="没有更多了"
23
-          @load="onLoad"
24
-        >
25
-          <div
26
-            class="adviceOne"
27
-            v-for="(item, index) in this.rescueRecords"
28
-            :key="index"
29
-          >
19
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
20
+          <div class="adviceOne" v-for="(item, index) in this.rescueRecords" :key="index">
30 21
             <div class="adviceTitle">
31 22
               <p>{{ getTime(item.record_time) }}</p>
32 23
               <van-icon
@@ -53,19 +44,15 @@
53 44
         <img src="../../../assets/images/none.png" alt />
54 45
       </div>
55 46
     </div>
56
-    <div class="add">
47
+    <!-- <div class="add">
57 48
       <div style="display: flex;align-items: center;">
58 49
         <van-icon class="addIcon" name="add" />新增
59 50
       </div>
60
-    </div>
51
+    </div>-->
61 52
 
62 53
     <!-- 弹出层 -->
63 54
     <div>
64
-      <van-popup
65
-        v-model="startShow"
66
-        position="bottom"
67
-        :style="{ height: '40%' }"
68
-      >
55
+      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
69 56
         <van-datetime-picker
70 57
           v-model="currentDate"
71 58
           type="date"
@@ -85,12 +72,7 @@
85 72
           @cancel="endShow = false"
86 73
         />
87 74
       </van-popup>
88
-      <van-action-sheet
89
-        v-model="newShow"
90
-        :actions="actions"
91
-        cancel-text="取消"
92
-        @select="Delete"
93
-      />
75
+      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @select="Delete" />
94 76
     </div>
95 77
   </div>
96 78
 </template>
@@ -121,7 +103,7 @@ export default {
121 103
       minDate: new Date(1970, 0, 1),
122 104
       maxDate: new Date(2025, 10, 1),
123 105
       currentDate: new Date(),
124
-      actions: [{ name: "编辑" }, { name: "删除" }],
106
+      actions: [{ name: "删除" }],
125 107
       showOne: true,
126 108
       showTwo: false,
127 109
       limit: 10,

+ 3 - 3
src/pages/doctorAdvice/components/Scheduling.vue View File

@@ -54,11 +54,11 @@
54 54
         <img src="../../../assets/images/none.png" alt />
55 55
       </div>
56 56
     </div>
57
-    <div class="add">
57
+    <!-- <div class="add">
58 58
       <div style="display: flex;align-items: center;">
59 59
         <van-icon class="addIcon" name="add" />新增
60 60
       </div>
61
-    </div>
61
+    </div> -->
62 62
 
63 63
     <!-- 弹出层 -->
64 64
     <div>
@@ -136,7 +136,7 @@ export default {
136 136
       minDate: new Date(1970, 0, 1),
137 137
       maxDate: new Date(2025, 10, 1),
138 138
       currentDate: new Date(),
139
-      actions: [{ name: '编辑' }, { name: '删除' }],
139
+      actions: [{ name: '删除' }],
140 140
       showOne: true,
141 141
       showTwo: false,
142 142
       limit: 10,

+ 7 - 25
src/pages/doctorAdvice/components/deviceManagement.vue View File

@@ -37,31 +37,18 @@
37 37
         </van-list>
38 38
       </div>-->
39 39
     </div>
40
-    <div class="add">
40
+    <!-- <div class="add">
41 41
       <div style="display: flex;align-items: center;">
42 42
         <van-icon class="addIcon" name="add" />新增
43 43
       </div>
44
-    </div>
44
+    </div>-->
45 45
 
46 46
     <!-- 弹出层 -->
47 47
     <div>
48
-      <van-popup
49
-        v-model="typeShow"
50
-        position="bottom"
51
-        :style="{ height: '40%' }"
52
-      >
53
-        <van-picker
54
-          show-toolbar
55
-          :columns="columns"
56
-          @cancel="onCancel"
57
-          @confirm="onConfirm"
58
-        />
48
+      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
49
+        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
59 50
       </van-popup>
60
-      <van-popup
61
-        v-model="startShow"
62
-        position="bottom"
63
-        :style="{ height: '40%' }"
64
-      >
51
+      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
65 52
         <van-datetime-picker
66 53
           v-model="currentDate"
67 54
           type="date"
@@ -81,12 +68,7 @@
81 68
           @cancel="endShow = false"
82 69
         />
83 70
       </van-popup>
84
-      <van-action-sheet
85
-        v-model="newShow"
86
-        :actions="actions"
87
-        cancel-text="取消"
88
-        @cancel="onCancel"
89
-      />
71
+      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
90 72
     </div>
91 73
   </div>
92 74
 </template>
@@ -117,7 +99,7 @@ export default {
117 99
       minDate: new Date(1970, 0, 1),
118 100
       maxDate: new Date(2025, 10, 1),
119 101
       currentDate: new Date(),
120
-      actions: [{ name: "编辑" }, { name: "删除" }]
102
+      actions: [{ name: "删除" }]
121 103
     };
122 104
   },
123 105
   methods: {

+ 7 - 25
src/pages/doctorAdvice/components/medicationPlan.vue View File

@@ -37,31 +37,18 @@
37 37
         </van-list>
38 38
       </div>-->
39 39
     </div>
40
-    <div class="add">
40
+    <!-- <div class="add">
41 41
       <div style="display: flex;align-items: center;">
42 42
         <van-icon class="addIcon" name="add" />新增
43 43
       </div>
44
-    </div>
44
+    </div>-->
45 45
 
46 46
     <!-- 弹出层 -->
47 47
     <div>
48
-      <van-popup
49
-        v-model="typeShow"
50
-        position="bottom"
51
-        :style="{ height: '40%' }"
52
-      >
53
-        <van-picker
54
-          show-toolbar
55
-          :columns="columns"
56
-          @cancel="onCancel"
57
-          @confirm="onConfirm"
58
-        />
48
+      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
49
+        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
59 50
       </van-popup>
60
-      <van-popup
61
-        v-model="startShow"
62
-        position="bottom"
63
-        :style="{ height: '40%' }"
64
-      >
51
+      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
65 52
         <van-datetime-picker
66 53
           v-model="currentDate"
67 54
           type="date"
@@ -81,12 +68,7 @@
81 68
           @cancel="endShow = false"
82 69
         />
83 70
       </van-popup>
84
-      <van-action-sheet
85
-        v-model="newShow"
86
-        :actions="actions"
87
-        cancel-text="取消"
88
-        @cancel="onCancel"
89
-      />
71
+      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
90 72
     </div>
91 73
   </div>
92 74
 </template>
@@ -117,7 +99,7 @@ export default {
117 99
       minDate: new Date(1970, 0, 1),
118 100
       maxDate: new Date(2025, 10, 1),
119 101
       currentDate: new Date(),
120
-      actions: [{ name: "编辑" }, { name: "删除" }]
102
+      actions: [{ name: "删除" }]
121 103
     };
122 104
   },
123 105
   methods: {

+ 7 - 25
src/pages/doctorAdvice/components/recoverNotes.vue View File

@@ -37,31 +37,18 @@
37 37
         </van-list>
38 38
       </div>-->
39 39
     </div>
40
-    <div class="add">
40
+    <!-- <div class="add">
41 41
       <div style="display: flex;align-items: center;">
42 42
         <van-icon class="addIcon" name="add" />新增
43 43
       </div>
44
-    </div>
44
+    </div>-->
45 45
 
46 46
     <!-- 弹出层 -->
47 47
     <div>
48
-      <van-popup
49
-        v-model="typeShow"
50
-        position="bottom"
51
-        :style="{ height: '40%' }"
52
-      >
53
-        <van-picker
54
-          show-toolbar
55
-          :columns="columns"
56
-          @cancel="onCancel"
57
-          @confirm="onConfirm"
58
-        />
48
+      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
49
+        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
59 50
       </van-popup>
60
-      <van-popup
61
-        v-model="startShow"
62
-        position="bottom"
63
-        :style="{ height: '40%' }"
64
-      >
51
+      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
65 52
         <van-datetime-picker
66 53
           v-model="currentDate"
67 54
           type="date"
@@ -81,12 +68,7 @@
81 68
           @cancel="endShow = false"
82 69
         />
83 70
       </van-popup>
84
-      <van-action-sheet
85
-        v-model="newShow"
86
-        :actions="actions"
87
-        cancel-text="取消"
88
-        @cancel="onCancel"
89
-      />
71
+      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
90 72
     </div>
91 73
   </div>
92 74
 </template>
@@ -117,7 +99,7 @@ export default {
117 99
       minDate: new Date(1970, 0, 1),
118 100
       maxDate: new Date(2025, 10, 1),
119 101
       currentDate: new Date(),
120
-      actions: [{ name: "编辑" }, { name: "删除" }]
102
+      actions: [{ name: "删除" }]
121 103
     };
122 104
   },
123 105
   methods: {

+ 7 - 25
src/pages/doctorAdvice/components/signsRecord.vue View File

@@ -43,31 +43,18 @@
43 43
         </van-list>
44 44
       </div>-->
45 45
     </div>
46
-    <div class="add">
46
+    <!-- <div class="add">
47 47
       <div style="display: flex;align-items: center;">
48 48
         <van-icon class="addIcon" name="add" />新增
49 49
       </div>
50
-    </div>
50
+    </div>-->
51 51
 
52 52
     <!-- 弹出层 -->
53 53
     <div>
54
-      <van-popup
55
-        v-model="typeShow"
56
-        position="bottom"
57
-        :style="{ height: '40%' }"
58
-      >
59
-        <van-picker
60
-          show-toolbar
61
-          :columns="columns"
62
-          @cancel="onCancel"
63
-          @confirm="onConfirm"
64
-        />
54
+      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
55
+        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
65 56
       </van-popup>
66
-      <van-popup
67
-        v-model="startShow"
68
-        position="bottom"
69
-        :style="{ height: '40%' }"
70
-      >
57
+      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
71 58
         <van-datetime-picker
72 59
           v-model="currentDate"
73 60
           type="date"
@@ -87,12 +74,7 @@
87 74
           @cancel="endShow = false"
88 75
         />
89 76
       </van-popup>
90
-      <van-action-sheet
91
-        v-model="newShow"
92
-        :actions="actions"
93
-        cancel-text="取消"
94
-        @cancel="onCancel"
95
-      />
77
+      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
96 78
     </div>
97 79
   </div>
98 80
 </template>
@@ -123,7 +105,7 @@ export default {
123 105
       minDate: new Date(1970, 0, 1),
124 106
       maxDate: new Date(2025, 10, 1),
125 107
       currentDate: new Date(),
126
-      actions: [{ name: "编辑" }, { name: "删除" }]
108
+      actions: [{ name: "删除" }]
127 109
     };
128 110
   },
129 111
   methods: {

File diff suppressed because it is too large
+ 4239 - 4244
src/pages/home/createOrg/index.vue


+ 11 - 15
src/pages/home/forgetPassword/index.vue View File

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_noPassword">
3 3
     <div class="nopasswordTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">忘记密码</span>
6 6
     </div>
7 7
     <div class="forgetmyInput">
@@ -22,14 +22,8 @@
22 22
         <el-form-item required prop="code">
23 23
           <div class="code">
24 24
             <i class="iconfont icon-dunpai dunpai"></i>
25
-            <el-input
26
-              v-model="forgetForm.code"
27
-              placeholder="请填写验证码"
28
-              v-on:input="watchNum"
29
-            ></el-input>
30
-            <div class="getCode" @click="getVerifyCode()">
31
-              {{ code_btn_title }}
32
-            </div>
25
+            <el-input v-model="forgetForm.code" placeholder="请填写验证码" v-on:input="watchNum"></el-input>
26
+            <div class="getCode" @click="getVerifyCode()">{{ code_btn_title }}</div>
33 27
           </div>
34 28
         </el-form-item>
35 29
         <el-form-item>
@@ -48,9 +42,7 @@
48 42
       </el-form>
49 43
     </div>
50 44
 
51
-    <div class="login" @click="modifyAndLogin()" v-show="loginshow">
52
-      登录
53
-    </div>
45
+    <div class="login" @click="modifyAndLogin()" v-show="loginshow">登录</div>
54 46
     <div class="logintwo" v-show="loginshowtwo">登录</div>
55 47
     <div class="problem">
56 48
       遇到问题?点击
@@ -193,7 +185,7 @@ export default {
193 185
       if (!this.count_downing) {
194 186
         let parms = {
195 187
           phone: this.forgetForm.phone,
196
-          aespass: this.aespass,
188
+          aespass: this.aespass
197 189
         };
198 190
         getVerifyCode(parms).then(response => {
199 191
           if (response.data.state === 1) {
@@ -228,7 +220,11 @@ export default {
228 220
         this.codeshowtwo = true;
229 221
       }
230 222
 
231
-      if (this.forgetForm.phone === "" || this.forgetForm.code === "" || this.psd === "" ) {
223
+      if (
224
+        this.forgetForm.phone === "" ||
225
+        this.forgetForm.code === "" ||
226
+        this.psd === ""
227
+      ) {
232 228
         this.loginshow = false;
233 229
         this.loginshowtwo = true;
234 230
       } else {
@@ -266,7 +262,7 @@ export default {
266 262
     margin-left: 1.25rem;
267 263
     font-size: 1.5rem;
268 264
     font-weight: 600;
269
-    margin-right: 6.625rem;
265
+    margin-right: 7rem;
270 266
   }
271 267
   .titleName {
272 268
     font-size: 1.125rem;

+ 11 - 7
src/pages/home/login.vue View File

@@ -38,10 +38,9 @@
38 38
       </div>
39 39
     </div>
40 40
     <div class="agreeBox">
41
-      <van-checkbox v-model="checked" shape="square" icon-size="14px"
42
-        >我已阅读并同意</van-checkbox
43
-      ><span class="newColor" @click="agree()">《隐私服务协议》</span
44
-      ><span class="newColor" @click="agree1()">《用户协议》</span>
41
+      <van-checkbox v-model="checked" v-on:input="watchNum" shape="square" icon-size="14px">我已阅读并同意</van-checkbox>
42
+      <span class="newColor" @click="agree()">《隐私服务协议》</span>
43
+      <span class="newColor" @click="agree1()">《用户协议》</span>
45 44
     </div>
46 45
   </div>
47 46
 </template>
@@ -108,7 +107,11 @@ export default {
108 107
       this.LoginForm.tel = val.replace(/[^0-9]+/g, "");
109 108
     },
110 109
     watchNum() {
111
-      if (this.LoginForm.tel === "" || this.LoginForm.psd === "") {
110
+      if (
111
+        this.LoginForm.tel === "" ||
112
+        this.LoginForm.psd === "" ||
113
+        this.checked == false
114
+      ) {
112 115
         this.loginshow = false;
113 116
         this.loginshowtwo = true;
114 117
       } else {
@@ -128,11 +131,12 @@ export default {
128 131
     submitForm() {
129 132
       loginByPwd(this.LoginForm.tel, hex_md5(this.LoginForm.psd)).then(rs => {
130 133
         var resp = rs.data;
131
-        if (this.agreement != true) {
134
+        if (this.checked != true) {
132 135
           Toast("请同意隐私服务协议");
136
+          return;
133 137
         }
134 138
 
135
-        if (resp.state == 1 && this.agreement == true) {
139
+        if (resp.state == 1 && this.checked == true) {
136 140
           var user = resp.data.user;
137 141
           var admin = resp.data.admin;
138 142
           var org = resp.data.org;

+ 1 - 1
src/pages/home/noJoinedGroup/index.vue View File

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_noJoinedGroup">
3 3
     <div class="noJoinedGroupTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
     </div>
6 6
     <div class="noJoinedGroupTxt">你还没有加入任何医院/组织/团队</div>
7 7
     <div class="nojoinBox">

+ 12 - 13
src/pages/home/noPassword/index.vue View File

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_noPassword">
3 3
     <div class="nopasswordTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">免密码登录</span>
6 6
     </div>
7 7
     <div class="myInput">
@@ -29,23 +29,18 @@
29 29
               v-on:input="watchNum"
30 30
             ></el-input>
31 31
             <div>
32
-              <div class="getCode" @click="getVerifyCode()">
33
-                {{ code_btn_title }}
34
-              </div>
32
+              <div class="getCode" @click="getVerifyCode()">{{ code_btn_title }}</div>
35 33
             </div>
36 34
           </div>
37 35
         </el-form-item>
38 36
       </el-form>
39 37
     </div>
40
-    <div class="login" @click="NoPassToLogin('NoPassForm')" v-show="loginshow">
41
-      登录
42
-    </div>
38
+    <div class="login" @click="NoPassToLogin('NoPassForm')" v-show="loginshow">登录</div>
43 39
     <div class="logintwo" v-show="loginshowtwo">登录</div>
44 40
     <div class="agreeBox">
45
-      <van-checkbox v-model="checked" shape="square" icon-size="14px"
46
-        >我已阅读并同意</van-checkbox
47
-      ><span class="newColor" @click="agree()">《隐私服务协议》</span
48
-      ><span class="newColor" @click="agree1()">《用户协议》</span>
41
+      <van-checkbox v-model="checked" v-on:input="watchNum" shape="square" icon-size="14px">我已阅读并同意</van-checkbox>
42
+      <span class="newColor" @click="agree()">《隐私服务协议》</span>
43
+      <span class="newColor" @click="agree1()">《用户协议》</span>
49 44
     </div>
50 45
     <div class="problem">
51 46
       遇到问题?点击
@@ -144,7 +139,7 @@ export default {
144 139
             this.count_downing = true;
145 140
             this.count_down = 61;
146 141
             this.countDown();
147
-          }else{
142
+          } else {
148 143
             this.$toast({
149 144
               message: response.data.msg
150 145
             });
@@ -231,7 +226,11 @@ export default {
231 226
         this.codeshow = false;
232 227
       }
233 228
 
234
-      if (this.NoPassForm.phone === "" || this.NoPassForm.code === "") {
229
+      if (
230
+        this.NoPassForm.phone === "" ||
231
+        this.NoPassForm.code === "" ||
232
+        this.checked == false
233
+      ) {
235 234
         this.loginshow = false;
236 235
         this.loginshowtwo = true;
237 236
       } else {

+ 1 - 1
src/pages/home/register/name.vue View File

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_getName">
3 3
     <div class="getNameTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
     </div>
6 6
     <div class="getNameBox">
7 7
       <div class="welcome">你好,欢迎使用酷医云</div>

+ 26 - 25
src/pages/home/register/register.vue View File

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_register">
3 3
     <div class="registerTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">注册</span>
6 6
     </div>
7 7
     <div class="registermyInput">
@@ -21,14 +21,8 @@
21 21
         <el-form-item required prop="code">
22 22
           <div class="code">
23 23
             <i class="iconfont icon-dunpai dunpai"></i>
24
-            <el-input
25
-              v-model="registerForm.code"
26
-              placeholder="请填写验证码"
27
-              v-on:input="watchNum"
28
-            ></el-input>
29
-            <div class="getCode" @click="getVerifyCode()">
30
-              {{ code_btn_title }}
31
-            </div>
24
+            <el-input v-model="registerForm.code" placeholder="请填写验证码" v-on:input="watchNum"></el-input>
25
+            <div class="getCode" @click="getVerifyCode()">{{ code_btn_title }}</div>
32 26
             <!-- <el-button class="getCode" :type="count_downing ? 'info' : 'primary'" :disabled="count_downing" @click="getCodeAction" v-show="codeshow">{{ code_btn_title }}</el-button>
33 27
             <el-button class="getCodetwo" :type="count_downing ? 'info' : 'primary'" :disabled="count_downing" v-show="codeshowtwo">{{ code_btn_title }}</el-button>-->
34 28
           </div>
@@ -37,6 +31,7 @@
37 31
           <div class="phoneLine">
38 32
             <i class="el-icon-lock lock"></i>
39 33
             <el-input
34
+              v-on:input="watchNum"
40 35
               v-model="registerForm.password"
41 36
               show-password
42 37
               clearable
@@ -54,19 +49,12 @@
54 49
       </div>
55 50
       <el-input placeholder="请输入密码" prefix-icon="el-icon-lock" v-model="psd" show-password></el-input>-->
56 51
     </div>
57
-    <div
58
-      class="login"
59
-      @click="submitRegister('registerForm')"
60
-      v-show="loginshow"
61
-    >
62
-      下一步
63
-    </div>
52
+    <div class="login" @click="submitRegister('registerForm')" v-show="loginshow">下一步</div>
64 53
     <div class="logintwo" v-show="loginshowtwo">下一步</div>
65 54
     <div class="agreeBox">
66
-      <van-checkbox v-model="checked" shape="square" icon-size="14px"
67
-        >我已阅读并同意</van-checkbox
68
-      ><span class="newColor">《隐私服务协议》</span
69
-      ><span class="newColor">《用户协议》</span>
55
+      <van-checkbox v-model="checked" v-on:input="watchNum" shape="square" icon-size="14px">我已阅读并同意</van-checkbox>
56
+      <span class="newColor" @click="agree()">《隐私服务协议》</span>
57
+      <span class="newColor" @click="agree1()">《用户协议》</span>
70 58
     </div>
71 59
     <div class="problem">
72 60
       遇到问题?点击
@@ -96,6 +84,7 @@
96 84
 import "@/styles/newStyle.scss";
97 85
 import { checkMobile, checkPassWordTwo } from "@/utils/tools";
98 86
 import { getCodeInit, getVerifyCode, register } from "@/api/login";
87
+import { setRem } from "@/libs/functionRem";
99 88
 
100 89
 import { hex_md5 } from "@/utils/md5";
101 90
 
@@ -140,14 +129,15 @@ export default {
140 129
           { validator: checkPasswordRule }
141 130
         ]
142 131
       },
143
-      loginshow: true,
144
-      loginshowtwo: false,
132
+      loginshow: false,
133
+      loginshowtwo: true,
145 134
       codeshow: false,
146 135
       codeshowtwo: true,
147 136
       aespass: ""
148 137
     };
149 138
   },
150 139
   created() {
140
+    setRem();
151 141
     this.GetCodeInit();
152 142
   },
153 143
   methods: {
@@ -176,14 +166,14 @@ export default {
176 166
         let parms = {
177 167
           phone: this.registerForm.phone,
178 168
           aespass: this.aespass,
179
-          type : 1
169
+          type: 1
180 170
         };
181 171
         getVerifyCode(parms).then(response => {
182 172
           if (response.data.state === 1) {
183 173
             this.count_downing = true;
184 174
             this.count_down = 61;
185 175
             this.countDown();
186
-          }else{
176
+          } else {
187 177
             this.$toast({
188 178
               message: response.data.msg
189 179
             });
@@ -211,7 +201,12 @@ export default {
211 201
         this.codeshow = false;
212 202
         this.codeshowtwo = true;
213 203
       }
214
-      if (this.registerForm.phone === "" || this.registerForm.code === "") {
204
+      if (
205
+        this.registerForm.phone === "" ||
206
+        this.registerForm.code === "" ||
207
+        this.registerForm.password === "" ||
208
+        this.checked == false
209
+      ) {
215 210
         this.loginshow = false;
216 211
         this.loginshowtwo = true;
217 212
       } else {
@@ -247,6 +242,12 @@ export default {
247 242
     change(val) {
248 243
       console.log("val", val);
249 244
       this.registerForm.phone = val.replace(/[^0-9]+/g, "");
245
+    },
246
+    agree() {
247
+      this.$router.push({ path: "/privacy" });
248
+    },
249
+    agree1() {
250
+      this.$router.push({ path: "/userAgreement" });
250 251
     }
251 252
   },
252 253
   computed: {

+ 160 - 165
src/pages/homeIndex/index.vue View File

@@ -4,24 +4,28 @@
4 4
       <div class="homeTitle">
5 5
         <div class="homeTitleLeft" style="visibility: hidden" v-if="isCreateOrg == false">
6 6
           <van-dropdown-menu>
7
-            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr"/>
7
+            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr" />
8 8
           </van-dropdown-menu>
9 9
         </div>
10
-        <div class="homeTitleLeft"  v-if="isCreateOrg == true">
10
+        <div class="homeTitleLeft" v-if="isCreateOrg == true">
11 11
           <van-dropdown-menu>
12
-            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr"/>
12
+            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr" />
13 13
           </van-dropdown-menu>
14 14
         </div>
15 15
         <div class="homeTitleRight">
16 16
           <i class="iconfont icon-sousuo search1" @click="toSearch"></i>
17 17
           <!--<van-icon class="iconOne" name="comment-o"/>-->
18
-          <van-icon class="iconOne" name="add-o" @click="toCreateOrg"/>
18
+          <van-icon class="iconOne" name="add-o" @click="toCreateOrg" />
19 19
         </div>
20 20
       </div>
21 21
     </van-sticky>
22 22
     <div class="banner">
23 23
       <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
24
-        <van-swipe-item v-for="(banner, index) in this.banners" @click="jump(banner.url)" :key="index">
24
+        <van-swipe-item
25
+          v-for="(banner, index) in this.banners"
26
+          @click="jump(banner.url)"
27
+          :key="index"
28
+        >
25 29
           <img :src="banner.thumb" alt />
26 30
         </van-swipe-item>
27 31
       </van-swipe>
@@ -45,30 +49,31 @@
45 49
     <!--</div>-->
46 50
     <div class="background1"></div>
47 51
 
48
-
49
-    <div class="management" v-if="this.$store.getters.user.admin.id ==  this.$store.getters.user.org.creator&&this.isCreateOrg">
52
+    <div
53
+      class="management"
54
+      v-if="this.$store.getters.user.admin.id ==  this.$store.getters.user.org.creator&&this.isCreateOrg"
55
+    >
50 56
       <div class="managementTitle">
51 57
         <div class="managementName">
52 58
           管理控制台
53 59
           <span>(仅管理员可见)</span>
54 60
         </div>
55 61
         <div class="setting" @click="toConsole()">
56
-          <van-icon name="setting-o"/>
57
-          管理
62
+          <van-icon name="setting-o" />管理
58 63
         </div>
59 64
       </div>
60 65
       <div class="managementBox">
61 66
         <div class="managementOne">
62
-          <img src="../../assets/images/M1.png" alt/>员工管理
67
+          <img src="../../assets/images/M1.png" alt />员工管理
63 68
         </div>
64 69
         <div class="managementOne">
65
-          <img src="../../assets/images/M2.png" alt/>权限管理
70
+          <img src="../../assets/images/M2.png" alt />权限管理
66 71
         </div>
67 72
         <div class="managementOne">
68
-          <img src="../../assets/images/M3.png" alt/>配置中心
73
+          <img src="../../assets/images/M3.png" alt />配置中心
69 74
         </div>
70 75
         <div class="managementOne">
71
-          <img src="../../assets/images/M4.png" alt/>机构设置
76
+          <img src="../../assets/images/M4.png" alt />机构设置
72 77
         </div>
73 78
       </div>
74 79
     </div>
@@ -76,193 +81,183 @@
76 81
     <div class="management" v-if="!this.isCreateOrg">
77 82
       <div class="managementTitle">
78 83
         <div class="managementName">
79
-          管理控制台<span>(仅管理员可见)</span>
84
+          管理控制台
85
+          <span>(仅管理员可见)</span>
86
+        </div>
87
+        <div class="setting">
88
+          <van-icon name="setting-o" />管理
80 89
         </div>
81
-        <div class="setting"><van-icon name="setting-o" />管理</div>
82 90
       </div>
83 91
       <div class="managementBox">
84 92
         <div class="managementOne">
85
-          <img src="../../assets/images/M1.png" alt="" />员工管理
93
+          <img src="../../assets/images/M1.png" alt />员工管理
86 94
         </div>
87 95
         <div class="managementOne">
88
-          <img src="../../assets/images/M2.png" alt="" />权限管理
96
+          <img src="../../assets/images/M2.png" alt />权限管理
89 97
         </div>
90 98
         <div class="managementOne">
91
-          <img src="../../assets/images/M3.png" alt="" />配置中心
99
+          <img src="../../assets/images/M3.png" alt />配置中心
92 100
         </div>
93 101
         <div class="managementOne">
94
-          <img src="../../assets/images/M4.png" alt="" />机构设置
102
+          <img src="../../assets/images/M4.png" alt />机构设置
95 103
         </div>
96 104
       </div>
97 105
     </div>
98 106
 
99
-
100
-
101
-
102
-
103 107
     <div class="application">
104 108
       <div class="applicationTitle">
105 109
         <div class="applicationName">应用工作台</div>
106 110
         <!--<div class="applicationService">+ 更多应用</div>-->
107 111
       </div>
108 112
       <div class="applicationBox">
109
-        <div v-for="(item, index) in this.apps" :key="index"  :class="item.open_status == 1? 'applicationOne':'applicationOne opacity'" @click="jumpApp(item)">
110
-          <img :src="item.url" alt/>{{item.name}}
113
+        <div
114
+          v-for="(item, index) in this.apps"
115
+          :key="index"
116
+          :class="item.open_status == 1? 'applicationOne':'applicationOne opacity'"
117
+          @click="jumpApp(item)"
118
+        >
119
+          <img :src="item.url" alt />
120
+          {{item.name}}
111 121
         </div>
112 122
       </div>
113 123
     </div>
114 124
   </div>
115 125
 </template>
116 126
 <script>
117
-  // import "../libs/rem.js";
118
-  import { Toast } from "vant";
127
+// import "../libs/rem.js";
128
+import { Toast } from "vant";
119 129
 
120
-  import {GetHomeData,ChangeOrg} from "@/api/home";
121
-  import "../../libs/rem.js";
122
-  import "../../styles/newStyle.scss";
123
-  import {setRem} from "@/libs/functionRem";
130
+import { GetHomeData, ChangeOrg } from "@/api/home";
131
+import "../../libs/rem.js";
132
+import "../../styles/newStyle.scss";
133
+import { setRem } from "@/libs/functionRem";
124 134
 
125
-  export default {
126
-    data() {
127
-      return {
128
-        value1: 0,
129
-        isCreateOrg: false,
130
-        org_arr: [],
131
-        banners: [],
132
-        apps: [],
133
-        option1: [
134
-          {text: "新款商品", value: 0},
135
-          {text: "全部商品全部商品全部商品全部商品全部商品全部商品", value: 1},
136
-          {text: "活动商品", value: 2}
137
-        ]
135
+export default {
136
+  data() {
137
+    return {
138
+      value1: 0,
139
+      isCreateOrg: false,
140
+      org_arr: [],
141
+      banners: [],
142
+      apps: [],
143
+      option1: [
144
+        { text: "新款商品", value: 0 },
145
+        { text: "全部商品全部商品全部商品全部商品全部商品全部商品", value: 1 },
146
+        { text: "活动商品", value: 2 }
147
+      ]
148
+    };
149
+  },
150
+  methods: {
151
+    changeOrg(value) {
152
+      Toast.loading({ forbidClick: true, duration: 0 });
153
+      let params = {
154
+        org_id: value
138 155
       };
139
-    },
140
-    methods: {
141
-      changeOrg(value){
142
-        Toast.loading({forbidClick: true, duration: 0})
143
-        let params={
144
-          org_id : value
145
-
146
-        }
147
-        ChangeOrg(params).then(response => {
148
-          if (response.data.state === 1) {
149
-            var user = response.data.data.user;
150
-            var admin = response.data.data.admin;
151
-            var org = response.data.data.org;
152
-            var subscibe = response.data.data.subscibe;
153
-            var config_list = response.data.data.config_list;
154
-            var template_info = response.data.data.template_info;
155
-            var filed_list = response.data.data.filed_list;
156
-            this.$store.dispatch("InitUserInfo", {
157
-              admin: admin,
158
-              user: user,
159
-              org: org,
160
-              subscibe: subscibe,
161
-              template_info: template_info,
162
-              filed_list: filed_list
163
-            });
164
-            this.$store.dispatch("SetConfigList", config_list);
165
-            this.GetHomeData()
166
-            Toast.success('切换机构成功')
167
-          } else {
168
-            Toast.fail(response.data.msg)
169
-          }
170
-        });
171
-
172
-
173
-      },
174
-      jump(url){
175
-        window.location.href = url
176
-      },jumpApp(app){
177
-        if(!this.isCreateOrg){
178
-          Toast.fail('你尚未创建机构,无法使用该功能')
179
-          return
180
-        }
181
-        if(app.open_status == 0){
182
-          Toast.success('敬请期待')
183
-          return
184
-        }
185
-        switch (app.app_type) {
186
-          case 6:
187
-            this.toPatients()
188
-            break
189
-          case 7:
190
-
191
-            break
192
-          case 8:
193
-
194
-            break
195
-          case 9:
196
-
197
-            break
198
-          case 10:
199
-
200
-            break
201
-          case 11:
202
-
203
-            break
204
-          case 12:
205
-
206
-            break
207
-          case 13:
208
-
209
-            break
210
-          case 14:
211
-
212
-            break
156
+      ChangeOrg(params).then(response => {
157
+        if (response.data.state === 1) {
158
+          var user = response.data.data.user;
159
+          var admin = response.data.data.admin;
160
+          var org = response.data.data.org;
161
+          var subscibe = response.data.data.subscibe;
162
+          var config_list = response.data.data.config_list;
163
+          var template_info = response.data.data.template_info;
164
+          var filed_list = response.data.data.filed_list;
165
+          this.$store.dispatch("InitUserInfo", {
166
+            admin: admin,
167
+            user: user,
168
+            org: org,
169
+            subscibe: subscibe,
170
+            template_info: template_info,
171
+            filed_list: filed_list
172
+          });
173
+          this.$store.dispatch("SetConfigList", config_list);
174
+          this.GetHomeData();
175
+          Toast.success("切换机构成功");
176
+        } else {
177
+          Toast.fail(response.data.msg);
213 178
         }
214
-
215
-
216
-
217
-
218
-      },toCreateOrg(){
219
-        this.$router.push({path: "/perfectOrg"});
220
-
221
-      },
222
-      toPatients() {
223
-        this.$router.push({path: "/patients"});
224
-      },
225
-      toSearch() {
226
-        this.$router.push({path: "/search"});
227
-      }, GetHomeData() {
228
-        GetHomeData().then(response => {
229
-          if (response.data.state === 1) {
230
-            this.isCreateOrg = response.data.data.isCreateOrg
231
-            if(this.isCreateOrg){
232
-              this.orgs = response.data.data.orgs
233
-              this.apps = response.data.data.apps
234
-              this.banners = response.data.data.banners
235
-              this.org_arr = []
236
-              for (let i = 0; i < this.orgs.length; i++){
237
-                let obj= {
238
-                  text: this.orgs[i].org_name,
239
-                  value: this.orgs[i].id
240
-
241
-                }
242
-                this.org_arr.push(obj)
243
-              }
244
-              this.value1 = this.$store.getters.user.org.id
245
-            }else{
246
-              this.apps = response.data.data.apps
247
-              this.banners = response.data.data.banners
179
+      });
180
+    },
181
+    jump(url) {
182
+      window.location.href = url;
183
+    },
184
+    jumpApp(app) {
185
+      if (!this.isCreateOrg) {
186
+        Toast.fail("你尚未创建机构,无法使用该功能");
187
+        return;
188
+      }
189
+      if (app.open_status == 0) {
190
+        Toast.success("敬请期待");
191
+        return;
192
+      }
193
+      switch (app.app_type) {
194
+        case 6:
195
+          this.toPatients();
196
+          break;
197
+        case 7:
198
+          break;
199
+        case 8:
200
+          break;
201
+        case 9:
202
+          break;
203
+        case 10:
204
+          break;
205
+        case 11:
206
+          break;
207
+        case 12:
208
+          break;
209
+        case 13:
210
+          break;
211
+        case 14:
212
+          break;
213
+      }
214
+    },
215
+    toCreateOrg() {
216
+      this.$router.push({ path: "/perfectOrg" });
217
+    },
218
+    toPatients() {
219
+      this.$router.push({ path: "/patients" });
220
+    },
221
+    toSearch() {
222
+      this.$router.push({ path: "/search" });
223
+    },
224
+    GetHomeData() {
225
+      GetHomeData().then(response => {
226
+        if (response.data.state === 1) {
227
+          this.isCreateOrg = response.data.data.isCreateOrg;
228
+          if (this.isCreateOrg) {
229
+            this.orgs = response.data.data.orgs;
230
+            this.apps = response.data.data.apps;
231
+            this.banners = response.data.data.banners;
232
+            this.org_arr = [];
233
+            for (let i = 0; i < this.orgs.length; i++) {
234
+              let obj = {
235
+                text: this.orgs[i].org_name,
236
+                value: this.orgs[i].id
237
+              };
238
+              this.org_arr.push(obj);
248 239
             }
240
+            this.value1 = this.$store.getters.user.org.id;
249 241
           } else {
250
-            this.$toast({
251
-              message: response.data.msg
252
-            });
242
+            this.apps = response.data.data.apps;
243
+            this.banners = response.data.data.banners;
253 244
           }
254
-        });
255
-
256
-      },toConsole(){
257
-        this.$router.push({path: "/manageconsole"});
258
-
259
-      },
245
+        } else {
246
+          this.$toast({
247
+            message: response.data.msg
248
+          });
249
+        }
250
+      });
260 251
     },
261
-    created() {
262
-      this.GetHomeData()
263
-      setRem();
252
+    toConsole() {
253
+      this.$router.push({ path: "/manageconsole" });
264 254
     }
265
-  };
255
+  },
256
+  created() {
257
+    this.GetHomeData();
258
+    setRem();
259
+  }
260
+};
266 261
 </script>
267 262
 <style lang="scss" scoped>
268 263
 .page_homeIndex {

+ 23 - 17
src/pages/my/aboutUs.vue View File

@@ -1,31 +1,37 @@
1 1
 <template>
2 2
   <div class="page_aboutUs">
3 3
     <div class="aboutUsTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">关于我们</span>
6 6
     </div>
7 7
     <div class="aboutImg">
8
-      <img src="../../assets/images/aboutBanner.png" alt="" />
8
+      <img src="../../assets/images/aboutBanner.png" alt />
9 9
     </div>
10 10
     <div class="aboutBox">
11
-      <div class="aboutBoxOne">
12
-        <p>公司介绍</p>
13
-        <div>
14
-          <van-icon class="arrow" name="arrow" />
11
+      <router-link to="/introduce">
12
+        <div class="aboutBoxOne">
13
+          <p>公司介绍</p>
14
+          <div>
15
+            <van-icon class="arrow" name="arrow" />
16
+          </div>
15 17
         </div>
16
-      </div>
17
-      <div class="aboutBoxOne">
18
-        <p>隐私政策</p>
19
-        <div>
20
-          <van-icon class="arrow" name="arrow" />
18
+      </router-link>
19
+      <router-link to="/privacy">
20
+        <div class="aboutBoxOne">
21
+          <p>隐私政策</p>
22
+          <div>
23
+            <van-icon class="arrow" name="arrow" />
24
+          </div>
21 25
         </div>
22
-      </div>
23
-      <div class="aboutBoxOne">
24
-        <p>用户协议</p>
25
-        <div>
26
-          <van-icon class="arrow" name="arrow" />
26
+      </router-link>
27
+      <router-link to="/userAgreement">
28
+        <div class="aboutBoxOne">
29
+          <p>用户协议</p>
30
+          <div>
31
+            <van-icon class="arrow" name="arrow" />
32
+          </div>
27 33
         </div>
28
-      </div>
34
+      </router-link>
29 35
       <div class="aboutBoxOne">
30 36
         <p>检查更新</p>
31 37
         <div class="aboutBoxRight">

+ 53 - 0
src/pages/my/companyIntroduction.vue View File

@@ -0,0 +1,53 @@
1
+<template>
2
+  <div class="page_companyIntroduction">
3
+    <div class="companyIntroductionTitle">
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5
+      <span class="titleName">公司介绍</span>
6
+    </div>
7
+    <div class="introduce">
8
+      <p>酷医云是一家正在改变血透行业的科技公司</p>
9
+      <br />
10
+
11
+      <p>我们致力于用技术赋能血透产业,打造值得信赖的血透医疗互联网平台,推动血透产业升级。</p>
12
+      <br />
13
+
14
+      <p>酷医云,是专为肾科和血透中心研发的免费血透管理平台,覆盖诊前、诊中、诊后全流程管理;为血透中心提供覆盖智能营销管理、血透管理、慢病管理、医患沟通、进销存管理以及商城管理等全流程一体化的管理平台。</p>
15
+      <br />
16
+
17
+      <p>平台目前有血液透析管理、患者关系管理、慢病管理系统、线上商城系统几大业务,我们致力于用一个平台实现院内院外全方位管理。</p>
18
+      <br />
19
+
20
+      <p>在酷医云,我们既着眼于现实,用产品和服务帮助每一所血透机构实现互联网医疗+的改革方案;也放眼于未来,通过数据挖掘、人工智能为血透医疗机构带来真正更深远的价值。</p>
21
+      <br />
22
+    </div>
23
+  </div>
24
+</template>
25
+
26
+
27
+<style lang="scss" scoped>
28
+.page_companyIntroduction {
29
+  .companyIntroductionTitle {
30
+    background: #fff;
31
+    padding: 0 1.125rem;
32
+    height: 3.125rem;
33
+    display: flex;
34
+    align-items: center;
35
+  }
36
+  .jiantou {
37
+    font-size: 1.5rem;
38
+    font-weight: 600;
39
+    margin-right: 7rem;
40
+  }
41
+  .titleName {
42
+    font-size: 1.125rem;
43
+    font-weight: 600;
44
+  }
45
+  .introduce {
46
+    padding: 0 1.125rem;
47
+    p {
48
+      font-size: 1rem;
49
+      line-height: 1.125rem;
50
+    }
51
+  }
52
+}
53
+</style>

+ 106 - 14
src/pages/my/feedBack.vue View File

@@ -1,30 +1,54 @@
1 1
 <template>
2 2
   <div class="page_feedBack">
3
-    <div class="feedBackTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou"></i>
5
-      <span class="titleName">意见反馈</span>
3
+    <van-sticky>
4
+      <div class="feedBackTitle">
5
+        <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
6
+        <span class="titleName">意见反馈</span>
7
+      </div>
8
+    </van-sticky>
9
+    <div class="feedBackTip">问题类型</div>
10
+    <div class="typeBox">
11
+      <p :class="Num == 1 ? 'active' : ''" @click="onClick(1)">使用操作</p>
12
+      <p :class="Num == 2 ? 'active' : ''" @click="onClick(2)">产品建议</p>
13
+      <p :class="Num == 3 ? 'active' : ''" @click="onClick(3)">产品缺陷</p>
14
+      <p :class="Num == 4 ? 'active' : ''" @click="onClick(4)">投诉</p>
15
+    </div>
16
+    <div class="feedBackTip">反馈标题</div>
17
+    <div>
18
+      <van-field v-model="tel" type="text" maxlength="30" placeholder="请填写标题30个字以内" />
19
+    </div>
20
+    <div class="feedBackTip">
21
+      反馈内容
22
+      <span style="font-size: .75rem;color:#ABABAB">(最多上传6张图片)</span>
6 23
     </div>
7
-    <div class="feedBackTip">反馈内容</div>
8 24
     <div class="feedBox">
9 25
       <van-field
10 26
         v-model="message"
11
-        rows="10"
27
+        rows="3"
12 28
         autosize
13 29
         type="textarea"
14
-        maxlength="200"
30
+        maxlength="50"
15 31
         placeholder="请输入反馈信息..."
16 32
         show-word-limit
17 33
       />
18 34
       <div class="uploaderBox">
19
-        <van-uploader v-model="fileList" multiple />
35
+        <van-uploader v-model="fileList" multiple :max-count="6" />
20 36
       </div>
21 37
     </div>
22 38
     <div class="feedBackTip">
23
-      联系方式(手机号)<span style="color:#FF5400">*</span>
39
+      联系方式(手机号)
40
+      <span style="color:#FF5400">*</span>
24 41
     </div>
25 42
     <div>
26 43
       <van-field v-model="tel" type="tel" placeholder="请输入联系方式" />
27 44
     </div>
45
+    <div class="feedBackTip">接受电话处理时间</div>
46
+    <div class="typeBox1">
47
+      <p :class="time == 1 ? 'active' : ''" @click="clickTime(1)">使用操作</p>
48
+      <p :class="time == 2 ? 'active' : ''" @click="clickTime(2)">09:00~12:00</p>
49
+      <p :class="time == 3 ? 'active' : ''" @click="clickTime(3)">13:00~18:00</p>
50
+      <p :class="time == 4 ? 'active' : ''" @click="clickTime(4)">从不接受</p>
51
+    </div>
28 52
     <div>
29 53
       <div class="submitBtn">提交反馈</div>
30 54
       <!-- <div class="submitBtnSuccess">提交反馈</div> -->
@@ -38,8 +62,34 @@ export default {
38 62
     return {
39 63
       message: "",
40 64
       fileList: [],
41
-      tel: ""
65
+      tel: "",
66
+      Num: 1,
67
+      time: 1
42 68
     };
69
+  },
70
+  methods: {
71
+    onClick(id) {
72
+      if (id == 1) {
73
+        this.Num = 1;
74
+      } else if (id == 2) {
75
+        this.Num = 2;
76
+      } else if (id == 3) {
77
+        this.Num = 3;
78
+      } else if (id == 4) {
79
+        this.Num = 4;
80
+      }
81
+    },
82
+    clickTime(id) {
83
+      if (id == 1) {
84
+        this.time = 1;
85
+      } else if (id == 2) {
86
+        this.time = 2;
87
+      } else if (id == 3) {
88
+        this.time = 3;
89
+      } else if (id == 4) {
90
+        this.time = 4;
91
+      }
92
+    }
43 93
   }
44 94
 };
45 95
 </script>
@@ -49,6 +99,7 @@ export default {
49 99
   height: 100%;
50 100
   overflow: hidden;
51 101
   overflow-y: auto;
102
+  background: #eeeeee;
52 103
   .feedBackTitle {
53 104
     background: #fff;
54 105
     padding: 0 1.125rem;
@@ -78,16 +129,57 @@ export default {
78 129
     height: 2.375rem;
79 130
     line-height: 2.375rem;
80 131
     padding-left: 0.75rem;
81
-    font-size: 0.75rem;
132
+    font-size: 0.875rem;
82 133
     color: #696969;
83
-    background: #eeeeee;
84 134
   }
85 135
   .feedBox {
86
-    height: 20.875rem;
136
+    min-height: 11.875rem;
137
+    background: #fff;
87 138
     .uploaderBox {
88 139
       margin: 1.25rem 0 0 1rem;
89 140
     }
90 141
   }
142
+  .typeBox {
143
+    display: flex;
144
+    justify-content: space-around;
145
+    p {
146
+      width: 5rem;
147
+      height: 1.875rem;
148
+      line-height: 1.875rem;
149
+      text-align: center;
150
+      border: 1px solid rgba(204, 204, 204, 1);
151
+      font-size: 0.875rem;
152
+      color: #696969;
153
+      border-radius: 5px;
154
+      cursor: pointer;
155
+    }
156
+    .active {
157
+      background: rgba(51, 138, 251, 1);
158
+      color: #fff;
159
+      border: 1px solid #338afb;
160
+    }
161
+  }
162
+  .typeBox1 {
163
+    display: flex;
164
+    justify-content: space-around;
165
+    p {
166
+      // width: 5rem;
167
+      // height: 1.875rem;
168
+      // line-height: 1.875rem;
169
+      padding: 8px 6px;
170
+      text-align: center;
171
+      border: 1px solid rgba(204, 204, 204, 1);
172
+      font-size: 0.875rem;
173
+      color: #696969;
174
+      border-radius: 5px;
175
+      cursor: pointer;
176
+    }
177
+    .active {
178
+      background: rgba(51, 138, 251, 1);
179
+      color: #fff;
180
+      border: 1px solid #338afb;
181
+    }
182
+  }
91 183
   .submitBtn {
92 184
     width: 80%;
93 185
     height: 2.75rem;
@@ -95,7 +187,7 @@ export default {
95 187
     text-align: center;
96 188
     background: #c5c5c5;
97 189
     color: #fff;
98
-    margin: 6.25rem auto 0;
190
+    margin: 1.25rem auto;
99 191
     border-radius: 1.875rem;
100 192
   }
101 193
   .submitBtnSuccess {
@@ -105,7 +197,7 @@ export default {
105 197
     text-align: center;
106 198
     background: #338afb;
107 199
     color: #fff;
108
-    margin: 6.25rem auto 0;
200
+    margin: 1.25rem auto;
109 201
     border-radius: 1.875rem;
110 202
   }
111 203
 }

+ 1 - 1
src/pages/my/modifyingName.vue View File

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_modifyingName">
3 3
     <div class="modifyingNameTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">修改姓名</span>
6 6
       <span>保存</span>
7 7
     </div>

+ 4 - 3
src/pages/my/myInfo.vue View File

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_myInfo">
3 3
     <div class="myInfoTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">我的信息</span>
6 6
     </div>
7 7
     <div class="infoBox">
@@ -26,7 +26,7 @@
26 26
           <van-icon class="arrow" name="arrow" />
27 27
         </div>
28 28
       </div>
29
-      <div class="infoBoxTwo">
29
+      <div class="infoBoxTwo" @click="show1 = true">
30 30
         <p>生日</p>
31 31
         <div class="infoBoxOneRight">
32 32
           <p></p>
@@ -46,7 +46,7 @@
46 46
       <van-popup v-model="show" position="bottom" :style="{ height: '40%' }">
47 47
         <van-picker :columns="columns" show-toolbar @change="onChange" />
48 48
       </van-popup>
49
-      <van-popup v-model="show" position="bottom" :style="{ height: '40%' }">
49
+      <van-popup v-model="show1" position="bottom" :style="{ height: '40%' }">
50 50
         <van-datetime-picker
51 51
           v-model="currentDate"
52 52
           type="date"
@@ -65,6 +65,7 @@ export default {
65 65
     return {
66 66
       sex: "",
67 67
       show: false,
68
+      show1: false,
68 69
       columns: ["男", "女"],
69 70
       minDate: new Date(1900, 0, 1),
70 71
       maxDate: new Date(2025, 10, 1),

+ 1 - 1
src/pages/my/organizationInfo.vue View File

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_organizationInfo">
3 3
     <div class="organizationInfoTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">组织信息</span>
6 6
     </div>
7 7
     <div class="organizeBox">

+ 1 - 1
src/pages/my/personalSign.vue View File

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_personalSign">
3 3
     <div class="personalSignTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">修改姓名</span>
6 6
       <span>保存</span>
7 7
     </div>

+ 26 - 33
src/pages/privacy/index.vue View File

@@ -1,14 +1,11 @@
1 1
 <template>
2 2
   <div class="page_privacy">
3
-    <h1 class="title">
4
-      <div class="GoBack" @click="$router.go(-1)">
5
-        <span class="iconfont">&#xe720;</span>返回
6
-      </div>
7
-      <span class="name">隐私声明</span>
8
-      <div class="GoBack"></div>
9
-    </h1>
3
+    <div class="privacyTitle">
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5
+      <span class="titleName">隐私服务协议</span>
6
+    </div>
10 7
     <div class="boxList">
11
-      <div class="privacyTitle">声明</div>
8
+      <div class="boxListTitle">声明</div>
12 9
       <div class="privacyBox">
13 10
         <p>本软件尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务,本软件会按照本隐私权政策的规定使用和披露您的个人信息。但本软件将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外,在未征得您事先许可的情况下,本软件不会将这些信息对外披露或向第三方提供。本软件会不时更新本隐私权政策。您在同意本软件服务使用协议之时,即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本软件服务使用协议不可分割的一部分。</p>
14 11
         <br />
@@ -52,42 +49,38 @@ export default {
52 49
     flex: 1;
53 50
     overflow-y: auto;
54 51
   }
55
-  .title {
56
-    font-size: 0.45rem;
57
-    padding: 0.3rem 0.37rem;
58
-    color: $title-color;
59
-    @include align-items-center;
60
-    @include display-flex;
61
-    @include justify-content-between;
62
-    @include text-align;
52
+  .privacyTitle {
63 53
     background: #fff;
64
-    .GoBack {
65
-      color: $main-color;
66
-      font-size: 0.45rem;
67
-      @include display-flex;
68
-      .iconfont {
69
-        color: $main-color;
70
-        font-size: 0.5rem;
71
-        margin-top: 1px;
72
-        @media only screen and (min-width: 768px) {
73
-          margin-top: 3px;
74
-        }
75
-      }
76
-    }
54
+    padding: 0 1.125rem;
55
+    height: 3.125rem;
56
+    display: flex;
57
+    align-items: center;
58
+  }
59
+  .jiantou {
60
+    font-size: 1.5rem;
61
+    font-weight: 600;
62
+    margin-right: 6rem;
63
+  }
64
+  .titleName {
65
+    font-size: 1.125rem;
66
+    font-weight: 600;
77 67
   }
78 68
   .name {
79 69
     margin-right: 1.3rem;
80 70
     font-size: 0.5rem;
81 71
   }
82
-  .privacyTitle {
83
-    font-size: 0.6rem;
72
+  .boxListTitle {
73
+    font-size: 1rem;
84 74
     text-align: center;
85 75
     margin-top: 0.4rem;
86 76
   }
87 77
   .privacyBox {
88
-    font-size: 0.45rem;
78
+    font-size: 1rem;
89 79
     width: 90%;
90
-    margin: 0 auto;
80
+    margin: 0 auto 1.25rem;
91 81
   }
92 82
 }
83
+::-webkit-scrollbar {
84
+  width: 0;
85
+}
93 86
 </style>

+ 26 - 37
src/pages/userAgreement/index.vue View File

@@ -1,14 +1,11 @@
1 1
 <template>
2
-  <div class="page_privacy">
3
-    <h1 class="title">
4
-      <div class="GoBack" @click="$router.go(-1)">
5
-        <span class="iconfont">&#xe720;</span>返回
6
-      </div>
7
-      <span class="name">用户协议</span>
8
-      <div class="GoBack"></div>
9
-    </h1>
2
+  <div class="page_userAgreement">
3
+    <div class="companyIntroductionTitle">
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5
+      <span class="titleName">用户协议</span>
6
+    </div>
10 7
     <div class="boxList">
11
-      <div class="privacyTitle">协议</div>
8
+      <div class="boxListTitle">协议</div>
12 9
       <div class="privacyBox">
13 10
         <p>
14 11
           您的信任对我们非常重要,酷医云(或简称“我们”)制定本《注册协议》(或简称“本协议”)并提醒您:
@@ -196,7 +193,7 @@ export default {
196 193
 </script>
197 194
 
198 195
 <style lang="scss" scoped>
199
-.page_privacy {
196
+.page_userAgreement {
200 197
   width: 100%;
201 198
   margin: 0 auto;
202 199
   height: 100%;
@@ -207,42 +204,34 @@ export default {
207 204
     flex: 1;
208 205
     overflow-y: auto;
209 206
   }
210
-  .title {
211
-    font-size: 0.45rem;
212
-    padding: 0.3rem 0.37rem;
213
-    color: $title-color;
214
-    @include align-items-center;
215
-    @include display-flex;
216
-    @include justify-content-between;
217
-    @include text-align;
207
+  .companyIntroductionTitle {
218 208
     background: #fff;
219
-    .GoBack {
220
-      color: $main-color;
221
-      font-size: 0.45rem;
222
-      @include display-flex;
223
-      .iconfont {
224
-        color: $main-color;
225
-        font-size: 0.5rem;
226
-        margin-top: 1px;
227
-        @media only screen and (min-width: 768px) {
228
-          margin-top: 3px;
229
-        }
230
-      }
231
-    }
209
+    padding: 0 1.125rem;
210
+    height: 3.125rem;
211
+    display: flex;
212
+    align-items: center;
232 213
   }
233
-  .name {
234
-    margin-right: 1.3rem;
235
-    font-size: 0.5rem;
214
+  .jiantou {
215
+    font-size: 1.5rem;
216
+    font-weight: 600;
217
+    margin-right: 7rem;
236 218
   }
237
-  .privacyTitle {
238
-    font-size: 0.6rem;
219
+  .titleName {
220
+    font-size: 1.125rem;
221
+    font-weight: 600;
222
+  }
223
+  .boxListTitle {
224
+    font-size: 1rem;
239 225
     text-align: center;
240 226
     margin-top: 0.4rem;
241 227
   }
242 228
   .privacyBox {
243
-    font-size: 0.45rem;
229
+    font-size: 1rem;
244 230
     width: 90%;
245 231
     margin: 0 auto;
246 232
   }
233
+  ::-webkit-scrollbar {
234
+    width: 0;
235
+  }
247 236
 }
248 237
 </style>

+ 15 - 3
src/router/index.js View File

@@ -83,8 +83,7 @@ export default new Router({
83 83
     {
84 84
       path: "/manageconsole",
85 85
       name: "console",
86
-      component: () => import("@/pages/console/managementConsole"),
87
-
86
+      component: () => import("@/pages/console/managementConsole")
88 87
     },
89 88
     {
90 89
       path: "/manageconsole/staff",
@@ -97,12 +96,19 @@ export default new Router({
97 96
       name: "editstaff",
98 97
       component: () =>
99 98
         import("@/pages/console/managementConsole/staff_role/editStaff")
100
-    }, {
99
+    },
100
+    {
101 101
       path: "/staff/addstaff",
102 102
       name: "addstaff",
103 103
       component: () =>
104 104
         import("@/pages/console/managementConsole/staff_role/addStaff")
105 105
     },
106
+    {
107
+      path: "/role/editrole",
108
+      name: "editrole",
109
+      component: () =>
110
+        import("@/pages/console/managementConsole/staff_role/editRole")
111
+    },
106 112
     // 患者中心
107 113
     {
108 114
       path: "/patients",
@@ -181,6 +187,12 @@ export default new Router({
181 187
       name: "about",
182 188
       component: () => import("@/pages/my/aboutUs")
183 189
     },
190
+    // 公司介绍
191
+    {
192
+      path: "/introduce",
193
+      name: "introduce",
194
+      component: () => import("@/pages/my/companyIntroduction")
195
+    },
184 196
 
185 197
     // 全部长期透析记录
186 198