修改样式

src/pages/doctorAdvice/components/DoctorManagement.vue

@@ -130,7 +130,6 @@ export default {
   data() {
     return {
       loading: false,
-      onLoad: false,
       finished: false,
       newShow: false,
       typeShow: false,

src/pages/my/aboutUs.vue

@@ -0,0 +1,97 @@
+<template>
+  <div class="page_aboutUs">
+    <div class="aboutUsTitle">
+      <i class="iconfont icon-zuojiantou jiantou"></i>
+      <span class="titleName">关于我们</span>
+    </div>
+    <div class="aboutImg">
+      <img src="../../assets/images/aboutBanner.png" alt="" />
+    </div>
+    <div class="aboutBox">
+      <div class="aboutBoxOne">
+        <p>公司介绍</p>
+        <div>
+          <van-icon class="arrow" name="arrow" />
+        </div>
+      </div>
+      <div class="aboutBoxOne">
+        <p>隐私政策</p>
+        <div>
+          <van-icon class="arrow" name="arrow" />
+        </div>
+      </div>
+      <div class="aboutBoxOne">
+        <p>用户协议</p>
+        <div>
+          <van-icon class="arrow" name="arrow" />
+        </div>
+      </div>
+      <div class="aboutBoxOne">
+        <p>检查更新</p>
+        <div class="aboutBoxRight">
+          <p>已是最新版本</p>
+          <van-icon class="arrow" name="arrow" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.page_aboutUs {
+  height: 100%;
+  overflow: hidden;
+  .aboutUsTitle {
+    background: #fff;
+    padding: 0 1.125rem;
+    height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+  .jiantou {
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-right: 7rem;
+  }
+  .titleName {
+    font-size: 1.125rem;
+    font-weight: 600;
+  }
+  .aboutImg {
+    padding: 0 0.75rem;
+    height: 10.0625rem;
+    margin: 1rem 0 0.3125rem;
+    img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+  .aboutBox {
+    .aboutBoxOne {
+      padding: 0 0.75rem;
+      height: 3.125rem;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
+      p {
+        font-size: 0.9375rem;
+        color: #313234;
+      }
+      .arrow {
+        color: #9f9f9f;
+      }
+      .aboutBoxRight {
+        display: flex;
+        align-items: center;
+
+        p {
+          font-size: 0.8125rem;
+          margin-right: 0.25rem;
+          color: #9f9f9f;
+        }
+      }
+    }
+  }
+}
+</style>

src/pages/my/feedBack.vue

@@ -0,0 +1,115 @@
+<template>
+  <div class="page_feedBack">
+    <div class="feedBackTitle">
+      <i class="iconfont icon-zuojiantou jiantou"></i>
+      <span class="titleName">意见反馈</span>
+    </div>
+    <div class="feedBackTip">反馈内容</div>
+    <div class="feedBox">
+      <van-field
+        v-model="message"
+        rows="10"
+        autosize
+        type="textarea"
+        maxlength="200"
+        placeholder="请输入反馈信息..."
+        show-word-limit
+      />
+      <div class="uploaderBox">
+        <van-uploader v-model="fileList" multiple />
+      </div>
+    </div>
+    <div class="feedBackTip">
+      联系方式（手机号）<span style="color:#FF5400">*</span>
+    </div>
+    <div>
+      <van-field v-model="tel" type="tel" placeholder="请输入联系方式" />
+    </div>
+    <div>
+      <div class="submitBtn">提交反馈</div>
+      <!-- <div class="submitBtnSuccess">提交反馈</div> -->
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      message: "",
+      fileList: [],
+      tel: ""
+    };
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.page_feedBack {
+  height: 100%;
+  overflow: hidden;
+  overflow-y: auto;
+  .feedBackTitle {
+    background: #fff;
+    padding: 0 1.125rem;
+    height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+  .jiantou {
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-right: 7rem;
+  }
+  .titleName {
+    font-size: 1.125rem;
+    font-weight: 600;
+  }
+  .aboutImg {
+    padding: 0 0.75rem;
+    height: 10.0625rem;
+    margin: 1rem 0 0.3125rem;
+    img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+  .feedBackTip {
+    height: 2.375rem;
+    line-height: 2.375rem;
+    padding-left: 0.75rem;
+    font-size: 0.75rem;
+    color: #696969;
+    background: #eeeeee;
+  }
+  .feedBox {
+    height: 20.875rem;
+    .uploaderBox {
+      margin: 1.25rem 0 0 1rem;
+    }
+  }
+  .submitBtn {
+    width: 80%;
+    height: 2.75rem;
+    line-height: 2.75rem;
+    text-align: center;
+    background: #c5c5c5;
+    color: #fff;
+    margin: 6.25rem auto 0;
+    border-radius: 1.875rem;
+  }
+  .submitBtnSuccess {
+    width: 80%;
+    height: 2.75rem;
+    line-height: 2.75rem;
+    text-align: center;
+    background: #338afb;
+    color: #fff;
+    margin: 6.25rem auto 0;
+    border-radius: 1.875rem;
+  }
+}
+::-webkit-scrollbar {
+  width: 0;
+}
+</style>

src/pages/my/index.vue

@@ -2,37 +2,43 @@
   <div class="page_my">
     <div class="myTop">
       <img src="../../assets/images/myBanner.png" alt />
-      <div class="avatar">
-        <img src="../../assets/images/m01.png" alt />
-      </div>
-      <div class="userMain">
-        <div class="userBox">
-          <div class="userTxt">
-            <p class="userName">小可耐</p>
-            <p class="signature">一个无法用言语表达的好人</p>
+      <router-link to="/myInfo">
+        <div class="avatar">
+          <img src="../../assets/images/m01.png" alt />
+        </div>
+        <div class="userMain">
+          <div class="userBox">
+            <div class="userTxt">
+              <p class="userName">小可耐</p>
+              <p class="signature">一个无法用言语表达的好人</p>
+            </div>
+            <van-icon name="arrow" />
           </div>
-          <van-icon name="arrow" />
         </div>
-      </div>
+      </router-link>
       <div class="invitebox">
         <img src="../../assets/images/invite.png" alt />
       </div>
-      <div class="myInfo">
-        <div class="myInfoLeft">
-          <img src="../../assets/images/myIcon1.png" alt />
-          <p>我的信息</p>
+      <router-link to="/myInfo">
+        <div class="myInfo">
+          <div class="myInfoLeft">
+            <img src="../../assets/images/myIcon1.png" alt />
+            <p>我的信息</p>
+          </div>
+          <van-icon class="arrow" name="arrow" />
         </div>
-        <van-icon class="arrow" name="arrow" />
-      </div>
+      </router-link>
     </div>
     <div class="myBox">
-      <div class="myBoxOne">
-        <div class="myInfoLeft">
-          <img src="../../assets/images/myIcon2.png" alt />
-          <p>我的医院/组织/团队</p>
+      <router-link to="/organizationInfo">
+        <div class="myBoxOne">
+          <div class="myInfoLeft">
+            <img src="../../assets/images/myIcon2.png" alt />
+            <p>我的医院/组织/团队</p>
+          </div>
+          <van-icon class="arrow" name="arrow" />
         </div>
-        <van-icon class="arrow" name="arrow" />
-      </div>
+      </router-link>
       <div class="myBoxTwo">
         <div class="myInfoLeft">
           <img src="../../assets/images/m01.png" alt />
@@ -54,20 +60,24 @@
       </div>
     </div>
     <div class="myBox">
-      <div class="myBoxOne">
-        <div class="myInfoLeft">
-          <img src="../../assets/images/myIcon3.png" alt />
-          <p>创建医院/组织/团队</p>
+      <router-link to="/createorg">
+        <div class="myBoxOne">
+          <div class="myInfoLeft">
+            <img src="../../assets/images/myIcon3.png" alt />
+            <p>创建医院/组织/团队</p>
+          </div>
+          <van-icon class="arrow" name="arrow" />
         </div>
-        <van-icon class="arrow" name="arrow" />
-      </div>
-      <div class="myBoxOne">
-        <div class="myInfoLeft">
-          <img src="../../assets/images/myIcon4.png" alt />
-          <p>修改密码</p>
+      </router-link>
+      <router-link to="/forget">
+        <div class="myBoxOne">
+          <div class="myInfoLeft">
+            <img src="../../assets/images/myIcon4.png" alt />
+            <p>修改密码</p>
+          </div>
+          <van-icon class="arrow" name="arrow" />
         </div>
-        <van-icon class="arrow" name="arrow" />
-      </div>
+      </router-link>
     </div>
     <div class="myBox">
       <div class="myBoxOne">
@@ -77,20 +87,24 @@
         </div>
         <van-icon class="arrow" name="arrow" />
       </div>
-      <div class="myBoxOne">
-        <div class="myInfoLeft">
-          <img src="../../assets/images/myIcon6.png" alt />
-          <p>意见反馈</p>
+      <router-link to="/feedBack">
+        <div class="myBoxOne">
+          <div class="myInfoLeft">
+            <img src="../../assets/images/myIcon6.png" alt />
+            <p>意见反馈</p>
+          </div>
+          <van-icon class="arrow" name="arrow" />
         </div>
-        <van-icon class="arrow" name="arrow" />
-      </div>
-      <div class="myBoxOne">
-        <div class="myInfoLeft">
-          <img src="../../assets/images/myIcon7.png" alt />
-          <p>关于我们</p>
+      </router-link>
+      <router-link to="/about">
+        <div class="myBoxOne">
+          <div class="myInfoLeft">
+            <img src="../../assets/images/myIcon7.png" alt />
+            <p>关于我们</p>
+          </div>
+          <van-icon class="arrow" name="arrow" />
         </div>
-        <van-icon class="arrow" name="arrow" />
-      </div>
+      </router-link>
     </div>
     <div class="myBox">
       <div class="myBoxOne">
@@ -264,5 +278,8 @@
       }
     }
   }
+  a {
+    color: #000;
+  }
 }
 </style>

src/pages/my/myInfo.vue

@@ -0,0 +1,118 @@
+<template>
+  <div class="page_myInfo">
+    <div class="myInfoTitle">
+      <i class="iconfont icon-zuojiantou jiantou"></i>
+      <span class="titleName">我的信息</span>
+    </div>
+    <div class="infoBox">
+      <div class="infoBoxOne">
+        <p>头像</p>
+        <div class="infoBoxOneRight">
+          <img src="../../assets/images/m01.png" alt />
+          <van-icon class="arrow" name="arrow" />
+        </div>
+      </div>
+      <div class="infoBoxTwo">
+        <p>姓名</p>
+        <div class="infoBoxOneRight">
+          <p>欧巧漫</p>
+          <van-icon class="arrow" name="arrow" />
+        </div>
+      </div>
+      <div class="infoBoxTwo">
+        <p>性别</p>
+        <div class="infoBoxOneRight">
+          <p>女</p>
+          <van-icon class="arrow" name="arrow" />
+        </div>
+      </div>
+      <div class="infoBoxTwo">
+        <p>生日</p>
+        <div class="infoBoxOneRight">
+          <p>11111</p>
+          <van-icon class="arrow" name="arrow" />
+        </div>
+      </div>
+      <div class="infoBoxTwo">
+        <p>个性签名</p>
+        <div class="infoBoxOneRight">
+          <p>一个无法用语言表达的好人一个无法用语言表达的好人</p>
+          <van-icon class="arrow" name="arrow" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.page_myInfo {
+  height: 100%;
+  overflow-y: auto;
+  background: #fafafa;
+  .myInfoTitle {
+    background: #fff;
+    padding: 0 1.125rem;
+    height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+  .jiantou {
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-right: 7rem;
+  }
+  .titleName {
+    font-size: 1.125rem;
+    font-weight: 600;
+  }
+  .infoBox {
+    margin-top: 1rem;
+
+    background: #fff;
+    .infoBoxOne {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 4.5rem;
+      padding: 0 0.875rem;
+      box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
+      .infoBoxOneRight {
+        display: flex;
+        align-items: center;
+        img {
+          width: 2.5rem;
+          height: 2.5rem;
+        }
+        .arrow {
+          margin-left: 0.75rem;
+          color: #9f9f9f;
+        }
+      }
+    }
+    .infoBoxTwo {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 2.8125rem;
+      padding: 0 0.875rem;
+      box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
+      .infoBoxOneRight {
+        display: flex;
+        align-items: center;
+        p {
+          width: 13.75rem;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          overflow: hidden;
+          word-break: break-all;
+          text-align: right;
+        }
+        .arrow {
+          margin-left: 0.75rem;
+          color: #9f9f9f;
+        }
+      }
+    }
+  }
+}
+</style>

src/pages/my/organizationInfo.vue

@@ -0,0 +1,120 @@
+<template>
+  <div class="page_organizationInfo">
+    <div class="organizationInfoTitle">
+      <i class="iconfont icon-zuojiantou jiantou"></i>
+      <span class="titleName">组织信息</span>
+    </div>
+    <div class="organizeBox">
+      <div class="organizeBoxOne">
+        <div class="organizeBoxOneLeft">
+          <img src="../../assets/images/m01.png" alt />
+          <p>酷医云演示中心</p>
+        </div>
+        <van-icon class="arrow" name="arrow" />
+      </div>
+      <div class="organizeTip">我在该团队的信息</div>
+      <div class="organizeBoxTwo">
+        <div>名字</div>
+        <div class="organizeBoxTwoTxt">欧巧漫</div>
+      </div>
+      <div class="organizeBoxTwo">
+        <div>电话</div>
+        <div class="organizeBoxTwoTxt">18680319337</div>
+      </div>
+      <div class="organizeBoxTwo">
+        <div>角色</div>
+        <div class="rolebox">
+          <div class="roleboxBtn">护士</div>
+          <div class="roleboxBtn">医生</div>
+        </div>
+      </div>
+      <div class="organizeBoxTwo">
+        <div>职位</div>
+        <div class="organizeBoxTwoTxt">主治医生</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.page_organizationInfo {
+  height: 100%;
+  overflow-y: auto;
+  background: #fafafa;
+  .organizationInfoTitle {
+    background: #fff;
+    padding: 0 1.125rem;
+    height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+  .jiantou {
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-right: 7rem;
+  }
+  .titleName {
+    font-size: 1.125rem;
+    font-weight: 600;
+  }
+  .organizeBox {
+    margin-top: 1rem;
+    > div:last-child {
+      border: none;
+    }
+    .organizeBoxOne {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 0 0.875rem;
+      height: 4.5rem;
+      background: #fff;
+      .organizeBoxOneLeft {
+        display: flex;
+        align-items: center;
+        img {
+          width: 3rem;
+          height: 3rem;
+          margin-right: 0.75rem;
+        }
+      }
+      .arrow {
+        color: #9f9f9f;
+      }
+    }
+    .organizeTip {
+      height: 1.875rem;
+      line-height: 1.875rem;
+      padding-left: 0.875rem;
+      font-size: 0.75rem;
+      color: #8d8d8d;
+    }
+    .organizeBoxTwo {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 2.8125rem;
+      background: #fff;
+      padding: 0 0.875rem;
+      border-bottom: 1px solid #ccc;
+      .organizeBoxTwoTxt {
+        color: #8d8d8d;
+      }
+      .rolebox {
+        display: flex;
+        align-items: center;
+      }
+      .roleboxBtn {
+        padding: 0.5rem 0.75rem;
+        background: rgba(51, 138, 251, 0.1);
+        border: 1px solid rgba(51, 138, 251, 1);
+        border-radius: 0.3125rem;
+        text-align: center;
+        margin-left: 0.375rem;
+        color: #338afb;
+        font-size: 0.875rem;
+      }
+    }
+  }
+}
+</style>

src/pages/patients/addPatient.vue

@@ -9,12 +9,7 @@
     </van-sticky>
     <div class="basicTitle">基本信息</div>
     <div class="basicBox">
-      <van-field
-        v-model="patientForm.name"
-        required
-        label="姓名"
-        placeholder="请输入"
-      />
+      <van-field v-model="patientForm.name" required label="姓名" placeholder="请输入" />
       <van-field
         label="性别"
         v-model="patientForm.sex"
@@ -24,8 +19,8 @@
         readonly
         @click="show = true"
       />
-      <van-popup v-model="show" position="bottom" :style="{ height: '30%' }">
-        <van-picker :columns="columns" @change="onChange" />
+      <van-popup v-model="show" position="bottom" :style="{ height: '40%' }">
+        <van-picker :columns="columns" show-toolbar @change="onChange" />
       </van-popup>
       <van-field
         v-model="patientForm.idCard"
@@ -34,13 +29,7 @@
         @blur="checkIdCardNo"
         placeholder="请输入"
       />
-      <van-field
-        v-model="patientForm.birthday"
-        required
-        label="出生日期"
-        readonly
-        placeholder="请输入"
-      />
+      <van-field v-model="patientForm.birthday" required label="出生日期" readonly placeholder="请输入" />
       <van-field
         v-model="patientForm.phone"
         type="tel"
@@ -67,20 +56,8 @@
     <div v-show="bloodShow">
       <div class="basicTitle">血透信息</div>
       <div class="xtBox">
-        <van-field
-          v-model="patientForm.dialysis"
-          center
-          clearable
-          required
-          label="透析号"
-        >
-          <van-button
-            slot="button"
-            size="small"
-            type="info"
-            @click="generatedialysisno"
-            >自动生成</van-button
-          >
+        <van-field v-model="patientForm.dialysis" center clearable required label="透析号">
+          <van-button slot="button" size="small" type="info" @click="generatedialysisno">自动生成</van-button>
         </van-field>
 
         <van-field
@@ -92,12 +69,8 @@
           placeholder="请选择"
           @click="show10 = true"
         />
-        <van-popup
-          v-model="show10"
-          position="bottom"
-          :style="{ height: '30%' }"
-        >
-          <van-picker :columns="columns3" @change="onChangeOne" />
+        <van-popup v-model="show10" position="bottom" :style="{ height: '40%' }">
+          <van-picker :columns="columns3" show-toolbar @change="onChangeOne" />
         </van-popup>
 
         <van-field
@@ -109,8 +82,8 @@
           placeholder="请选择"
           @click="show9 = true"
         />
-        <van-popup v-model="show9" position="bottom" :style="{ height: '30%' }">
-          <van-picker :columns="columns4" @change="onChangeTwo" />
+        <van-popup v-model="show9" position="bottom" :style="{ height: '40%' }">
+          <van-picker :columns="columns4" show-toolbar @change="onChangeTwo" />
         </van-popup>
 
         <van-cell>
@@ -171,11 +144,7 @@
     <div v-show="slowShow">
       <div class="basicTitle">慢病信息</div>
       <div class="xtBox">
-        <van-field
-          v-model="patientForm.requipmentId"
-          label="设备ID"
-          placeholder="请输入"
-        />
+        <van-field v-model="patientForm.requipmentId" label="设备ID" placeholder="请输入" />
 
         <van-cell>
           <!-- 使用 title 插槽来自定义标题 -->
@@ -242,12 +211,8 @@
           placeholder="请选择"
           @click="show14 = true"
         />
-        <van-popup
-          v-model="show14"
-          position="bottom"
-          :style="{ height: '30%' }"
-        >
-          <van-picker :columns="patientType" @change="onChangeSix" />
+        <van-popup v-model="show14" position="bottom" :style="{ height: '40%' }">
+          <van-picker :columns="patientType" show-toolbar @change="onChangeSix" />
         </van-popup>
         <van-field
           label="治疗方式"
@@ -257,12 +222,8 @@
           placeholder="请选择"
           @click="show13 = true"
         />
-        <van-popup
-          v-model="show13"
-          position="bottom"
-          :style="{ height: '30%' }"
-        >
-          <van-picker :columns="treatmentMethod" @change="onChangeSeven" />
+        <van-popup v-model="show13" position="bottom" :style="{ height: '40%' }">
+          <van-picker :columns="treatmentMethod" show-toolbar @change="onChangeSeven" />
         </van-popup>
       </div>
     </div>

src/pages/patients/editPatient.vue

@@ -9,12 +9,7 @@
     </van-sticky>
     <div class="basicTitle">基本信息</div>
     <div class="basicBox">
-      <van-field
-        v-model="patientForm.name"
-        required
-        label="姓名"
-        placeholder="请输入"
-      />
+      <van-field v-model="patientForm.name" required label="姓名" placeholder="请输入" />
       <van-field
         label="性别"
         v-model="patientForm.sex"
@@ -24,8 +19,8 @@
         readonly
         @click="show = true"
       />
-      <van-popup v-model="show" position="bottom" :style="{ height: '30%' }">
-        <van-picker :columns="columns" @change="onChange" />
+      <van-popup v-model="show" position="bottom" :style="{ height: '40%' }">
+        <van-picker :columns="columns" show-toolbar @change="onChange" />
       </van-popup>
       <van-field
         v-model="patientForm.idCard"
@@ -34,35 +29,17 @@
         @blur="checkIdCardNo"
         placeholder="请输入"
       />
-      <van-field
-        v-model="patientForm.birthday"
-        required
-        label="出生日期"
-        readonly
-        placeholder="请输入"
-      />
-      <van-field
-        v-model="patientForm.phone"
-        type="tel"
-        required
-        label="手机号"
-        placeholder="请输入"
-      />
+      <van-field v-model="patientForm.birthday" required label="出生日期" readonly placeholder="请输入" />
+      <van-field v-model="patientForm.phone" type="tel" required label="手机号" placeholder="请输入" />
       <van-cell>
         <!-- 使用 title 插槽来自定义标题 -->
         <template slot="title">
           <span class="custom-title">患者类型</span>
           <div style="width:60%;margin-left:2rem">
             <van-checkbox-group v-model="result">
-              <van-checkbox name="1" shape="square" @click="changeMode"
-                >血透患者</van-checkbox
-              >
-              <van-checkbox name="2" shape="square" @click="changeMode"
-                >慢病患者</van-checkbox
-              >
-              <van-checkbox name="3" shape="square" @click="changeMode"
-                >会员患者</van-checkbox
-              >
+              <van-checkbox name="1" shape="square" @click="changeMode">血透患者</van-checkbox>
+              <van-checkbox name="2" shape="square" @click="changeMode">慢病患者</van-checkbox>
+              <van-checkbox name="3" shape="square" @click="changeMode">会员患者</van-checkbox>
             </van-checkbox-group>
           </div>
         </template>
@@ -71,20 +48,8 @@
     <div v-show="bloodShow">
       <div class="basicTitle">血透信息</div>
       <div class="xtBox">
-        <van-field
-          v-model="patientForm.dialysis"
-          center
-          clearable
-          required
-          label="透析号"
-        >
-          <van-button
-            slot="button"
-            size="small"
-            type="info"
-            @click="generatedialysisno"
-            >自动生成</van-button
-          >
+        <van-field v-model="patientForm.dialysis" center clearable required label="透析号">
+          <van-button slot="button" size="small" type="info" @click="generatedialysisno">自动生成</van-button>
         </van-field>
         <van-field
           label="患者来源"
@@ -95,8 +60,8 @@
           placeholder="请选择"
           @click="show3 = true"
         />
-        <van-popup v-model="show3" position="bottom" :style="{ height: '30%' }">
-          <van-picker :columns="columns2" @change="onChange1" />
+        <van-popup v-model="show3" position="bottom" :style="{ height: '40%' }">
+          <van-picker :columns="columns2" show-toolbar @change="onChange1" />
         </van-popup>
         <van-field
           label="留治状态"
@@ -107,8 +72,8 @@
           placeholder="请选择"
           @click="show4 = true"
         />
-        <van-popup v-model="show4" position="bottom" :style="{ height: '30%' }">
-          <van-picker :columns="columns4" @change="onChange2" />
+        <van-popup v-model="show4" position="bottom" :style="{ height: '40%' }">
+          <van-picker :columns="columns4" show-toolbar @change="onChange2" />
         </van-popup>
 
         <van-cell>
@@ -160,11 +125,7 @@
     <div v-show="slowShow">
       <div class="basicTitle">慢病信息</div>
       <div class="xtBox">
-        <van-field
-          v-model="patientForm.requipmentId"
-          label="设备ID"
-          placeholder="请输入"
-        />
+        <van-field v-model="patientForm.requipmentId" label="设备ID" placeholder="请输入" />
 
         <van-cell>
           <!-- 使用 title 插槽来自定义标题 -->
@@ -212,11 +173,7 @@
           placeholder="请选择"
           @click="show12 = true"
         />
-        <van-popup
-          v-model="show12"
-          position="bottom"
-          :style="{ height: '40%' }"
-        >
+        <van-popup v-model="show12" position="bottom" :style="{ height: '40%' }">
           <van-datetime-picker
             v-model="currentDate"
             type="date"
@@ -234,12 +191,8 @@
           placeholder="请选择"
           @click="show14 = true"
         />
-        <van-popup
-          v-model="show14"
-          position="bottom"
-          :style="{ height: '30%' }"
-        >
-          <van-picker :columns="patientType" @change="onChangeSix" />
+        <van-popup v-model="show14" position="bottom" :style="{ height: '40%' }">
+          <van-picker :columns="patientType" show-toolbar @change="onChangeSix" />
         </van-popup>
         <van-field
           label="治疗方式"
@@ -249,12 +202,8 @@
           placeholder="请选择"
           @click="show13 = true"
         />
-        <van-popup
-          v-model="show13"
-          position="bottom"
-          :style="{ height: '30%' }"
-        >
-          <van-picker :columns="treatmentMethod" @change="onChangeSeven" />
+        <van-popup v-model="show13" position="bottom" :style="{ height: '40%' }">
+          <van-picker :columns="treatmentMethod" show-toolbar @change="onChangeSeven" />
         </van-popup>
       </div>
     </div>

src/pages/shop/index.vue

@@ -0,0 +1,18 @@
+<template>
+  <div class="page_shop">
+    <iframe
+      src="http://shop.kuyicloud.com/app/index.php?i=2&c=entry&m=ewei_shopv2&do=mobile&wxref=mp.weixin.qq.com#wechat_redirect"
+    ></iframe>
+  </div>
+</template>
+
+
+<style lang="scss" scoped>
+.page_shop {
+  height: 100%;
+  iframe {
+    height: 100%;
+    width: 100%;
+  }
+}
+</style>

src/router/index.js

@@ -1,210 +1,240 @@
-import Vue from 'vue'
-import Router from 'vue-router'
+import Vue from "vue";
+import Router from "vue-router";
 
-Vue.use(Router)
+Vue.use(Router);
 
 export default new Router({
-  routes: [{
-      path: '/',
-      name: 'Home',
-      component: () => import('@/pages/home/verifyToken')
+  routes: [
+    {
+      path: "/",
+      name: "Home",
+      component: () => import("@/pages/home/verifyToken")
     },
     {
-      path: '/login',
-      name: 'Home',
-      component: () => import('@/pages/home/login')
+      path: "/login",
+      name: "Home",
+      component: () => import("@/pages/home/login")
     },
     {
-      path: '/nopassword',
-      name: 'Home',
-      component: () => import('@/pages/home/noPassword')
+      path: "/nopassword",
+      name: "Home",
+      component: () => import("@/pages/home/noPassword")
     },
     {
-      path: '/setname',
-      name: 'Home',
-      component: () => import('@/pages/home/register/name')
+      path: "/setname",
+      name: "Home",
+      component: () => import("@/pages/home/register/name")
     },
     {
-      path: '/register',
-      name: 'Home',
-      component: () => import('@/pages/home/register/register')
+      path: "/register",
+      name: "Home",
+      component: () => import("@/pages/home/register/register")
     },
     {
-      path: '/join',
-      name: 'Home',
-      component: () => import('@/pages/home/noJoinedGroup')
+      path: "/join",
+      name: "Home",
+      component: () => import("@/pages/home/noJoinedGroup")
     },
     {
-      path: '/forget',
-      name: 'Home',
-      component: () => import('@/pages/home/forgetPassword')
+      path: "/forget",
+      name: "Home",
+      component: () => import("@/pages/home/forgetPassword")
     },
     {
-      path: '/createorg',
-      name: 'Home',
-      component: () => import('@/pages/home/createOrg')
+      path: "/createorg",
+      name: "Home",
+      component: () => import("@/pages/home/createOrg")
     },
     // 首页
     {
-      path: '/myIndex',
-      name: 'myIndex',
-      component: () => import('@/pages/home/index'),
-      children: [{
-          path: '/homeIndex',
-          component: () => import('@/pages/homeIndex/index.vue')
+      path: "/myIndex",
+      name: "myIndex",
+      component: () => import("@/pages/home/index"),
+      children: [
+        {
+          path: "/homeIndex",
+          component: () => import("@/pages/homeIndex/index.vue")
         },
         // 我的
         {
-          path: '/newMy',
-          name: 'newMy',
-          component: () => import('@/pages/my/index')
+          path: "/newMy",
+          name: "newMy",
+          component: () => import("@/pages/my/index")
+        },
+        // 商城
+        {
+          path: "/shop",
+          name: "shop",
+          component: () => import("@/pages/shop/index")
         }
       ]
     },
     // 患者中心
     {
-      path: '/patients',
-      name: 'patients',
-      component: () => import('@/pages/patientManagement/patientManagement')
+      path: "/patients",
+      name: "patients",
+      component: () => import("@/pages/patientManagement/patientManagement")
     },
     // 新增病人
     {
-      path: '/addPatints',
-      name: 'addpatients',
-      component: () => import('@/pages/patients/addPatient')
+      path: "/addPatints",
+      name: "addpatients",
+      component: () => import("@/pages/patients/addPatient")
     },
     // 全部病程
     {
-      path: '/coursedetail',
-      name: 'coursedetail',
-      component: () => import('@/pages/allCourseManagement/index')
+      path: "/coursedetail",
+      name: "coursedetail",
+      component: () => import("@/pages/allCourseManagement/index")
     },
     // 全部干体重
     {
-      path: '/dryweight',
-      name: 'dryweight',
-      component: () => import('@/pages/allDryWeight/index')
+      path: "/dryweight",
+      name: "dryweight",
+      component: () => import("@/pages/allDryWeight/index")
     },
     // 基本信息
     {
-      path: '/editPatient',
-      name: 'editPatient',
-      component: () => import('@/pages/patients/editPatient')
+      path: "/editPatient",
+      name: "editPatient",
+      component: () => import("@/pages/patients/editPatient")
     },
     // 全部排班
     {
-      path: '/editScheduling',
-      name: 'editscheduling',
-      component: () => import('@/pages/allScheduling/index')
-
+      path: "/editScheduling",
+      name: "editscheduling",
+      component: () => import("@/pages/allScheduling/index")
     },
     // 全部透后宣教
     {
-      path: '/editEducation',
-      name: 'editeducation',
-      component: () => import('@/pages/allEducation/index')
-
+      path: "/editEducation",
+      name: "editeducation",
+      component: () => import("@/pages/allEducation/index")
     },
     // 全部抢救记录
     {
-      path: '/rescuerecord',
-      name: 'rescuerecord',
-      component: () => import('@/pages/allRescue/index')
-
+      path: "/rescuerecord",
+      name: "rescuerecord",
+      component: () => import("@/pages/allRescue/index")
     },
     //
     {
-      path: '/patientdetail',
-      name: 'patientdetail',
-      component: () => import('@/pages/doctorAdvice/index')
+      path: "/patientdetail",
+      name: "patientdetail",
+      component: () => import("@/pages/doctorAdvice/index")
     },
     // 搜索
     {
-      path: '/search',
-      name: 'search',
-      component: () => import('@/pages/search/index')
+      path: "/search",
+      name: "search",
+      component: () => import("@/pages/search/index")
+    },
+    // 我的信息
+    {
+      path: "/myInfo",
+      name: "myInfo",
+      component: () => import("@/pages/my/myInfo")
+    },
+    // 组织信息
+    {
+      path: "/organizationInfo",
+      name: "organizationInfo",
+      component: () => import("@/pages/my/organizationInfo")
+    },
+    // 意见反馈
+    {
+      path: "/feedBack",
+      name: "feedBack",
+      component: () => import("@/pages/my/feedBack")
+    },
+    // 关于我们
+    {
+      path: "/about",
+      name: "about",
+      component: () => import("@/pages/my/aboutUs")
     },
+
     // 全部长期透析记录
 
     {
-      path: '/alllongdialysis',
-      name: 'longdialysis',
-      component: () => import('@/pages/allLongDialysis/index')
+      path: "/alllongdialysis",
+      name: "longdialysis",
+      component: () => import("@/pages/allLongDialysis/index")
     },
     {
-      path: '/product',
-      name: 'Product',
-      component: () => import('@/pages/product/index')
+      path: "/product",
+      name: "Product",
+      component: () => import("@/pages/product/index")
     },
     {
-      path: '/main',
-      name: 'main',
-      component: () => import('@/pages/main/index')
+      path: "/main",
+      name: "main",
+      component: () => import("@/pages/main/index")
     },
     {
-      path: '/details',
-      name: 'details',
-      component: () => import('@/pages/main/DetailsPage')
+      path: "/details",
+      name: "details",
+      component: () => import("@/pages/main/DetailsPage")
     },
     {
-      path: '/monitoring',
-      name: 'monitorPage',
-      component: () => import('@/pages/monitoring/index')
+      path: "/monitoring",
+      name: "monitorPage",
+      component: () => import("@/pages/monitoring/index")
     },
     {
-      path: '/my',
-      name: 'my',
-      component: () => import('@/pages/personal/index')
+      path: "/my",
+      name: "my",
+      component: () => import("@/pages/personal/index")
     },
     {
-      path: '/advice',
-      name: 'doctorAdvice',
-      component: () => import('@/pages/advice/index')
+      path: "/advice",
+      name: "doctorAdvice",
+      component: () => import("@/pages/advice/index")
     },
     {
-      path: '/EditPersonal',
-      name: 'EditPersonal',
-      component: () => import('@/pages/personal/EditPersonal')
+      path: "/EditPersonal",
+      name: "EditPersonal",
+      component: () => import("@/pages/personal/EditPersonal")
     },
     {
-      path: '/ElectronicSignature',
-      name: 'ElectronicSignature',
-      component: () => import('@/pages/personal/ElectronicSignature')
+      path: "/ElectronicSignature",
+      name: "ElectronicSignature",
+      component: () => import("@/pages/personal/ElectronicSignature")
     },
     {
-      path: '/Print',
-      name: 'Print',
-      component: () => import('@/pages/main/PrintIndex')
+      path: "/Print",
+      name: "Print",
+      component: () => import("@/pages/main/PrintIndex")
     },
     {
-      path: '/add_urgent_schedule',
-      name: 'AddUrgentSchedule',
-      component: () => import('@/pages/main/add_urgent_schedule')
+      path: "/add_urgent_schedule",
+      name: "AddUrgentSchedule",
+      component: () => import("@/pages/main/add_urgent_schedule")
     },
     {
-      path: '/Prints',
-      name: 'Prints',
-      component: () => import('@/pages/main/Print')
+      path: "/Prints",
+      name: "Prints",
+      component: () => import("@/pages/main/Print")
     },
     {
-      path: '/forgetPassword',
-      name: 'forgetPassword',
-      component: () => import('@/pages/personal/ForgetPassword')
+      path: "/forgetPassword",
+      name: "forgetPassword",
+      component: () => import("@/pages/personal/ForgetPassword")
     },
     {
-      path: '/changePassword',
-      name: 'changePassword',
-      component: () => import('@/pages/personal/ChangePassword')
+      path: "/changePassword",
+      name: "changePassword",
+      component: () => import("@/pages/personal/ChangePassword")
     },
     {
-      path: '/privacy',
-      name: 'privacy',
-      component: () => import('@/pages/privacy/index')
+      path: "/privacy",
+      name: "privacy",
+      component: () => import("@/pages/privacy/index")
     },
     {
-      path: '/userAgreement',
-      name: 'userAgreement',
-      component: () => import('@/pages/userAgreement/index')
+      path: "/userAgreement",
+      name: "userAgreement",
+      component: () => import("@/pages/userAgreement/index")
     }
   ]
-})
+});