bug处理

project.private.config.json

@@ -9,6 +9,13 @@
     "miniprogram": {
       "list": [
         {
+          "name": "module1/pages/setCaseDoctor/index",
+          "pathName": "module1/pages/setChatDoctor/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "聊天室",
           "pathName": "module1/pages/chatRoom/index",
           "query": "id=4",

src/custom-tab-bar/index.scss

@@ -95,8 +95,8 @@
         position: absolute;
         top: 0;
         right: 0;
-        width: 10rpx;
+        width: 16rpx;
-        height: 10rpx;
+        height: 16rpx;
         border-radius: 50%;
         background-color: #ED4F39;
       }

src/echart/components/homeLevel2/index.wxml

@@ -78,7 +78,7 @@
       <view class="item">
         <view class="name">
           新病历
-          <van-icon name="question" color="rgba(224, 224, 224, 1)" />
+          <van-icon bind:tap="handleQuestion" data-index="1" name="question" color="rgba(224, 224, 224, 1)" />
         </view>
         <view class="num">{{case.newCaseCount}}</view>
       </view>
@@ -86,7 +86,7 @@
       <view class="item">
         <view class="name">
           讨论中
-          <van-icon name="question" color="rgba(224, 224, 224, 1)" />
+          <van-icon bind:tap="handleQuestion" data-index="2" name="question" color="rgba(224, 224, 224, 1)" />
         </view>
         <view class="num">{{case.feedbackCaseCount}}</view>
       </view>
@@ -94,7 +94,7 @@
       <view class="item">
         <view class="name">
           已归档
-          <van-icon name="question" color="rgba(224, 224, 224, 1)" />
+          <van-icon bind:tap="handleQuestion" data-index="3" name="question" color="rgba(224, 224, 224, 1)" />
         </view>
         <view class="num">{{case.archiveCaseCount}}</view>
       </view>

src/module1/pages/cHostipal/index.json

@@ -1,8 +1,5 @@
 {
   "navigationBarTitleText": "提交新医院",
   "navigationStyle": "default",
-  "usingComponents": {
+  "usingComponents": {}
-    "van-cascader": "@vant/weapp/cascader/index",
-    "van-popup": "@vant/weapp/popup/index"
-  }
 }

src/module1/pages/cHostipal/index.scss

@@ -17,7 +17,7 @@ page {
   font-size: 28rpx;
   color: #f77900;
   text-align: center;
-  background-color: #FFF7E8;
+  background-color: #fff7e8;
 }
 .page {
   padding: 32rpx;
@@ -45,6 +45,9 @@ page {
           content: "";
         }
       }
+      .picker {
+        flex: 1;
+      }
       .content {
         flex: 1;
         .input {

src/module1/pages/cHostipal/index.ts

@@ -95,12 +95,12 @@ Page({
   },
   onFinish(e: any) {
     this.setData({
-      ProvinceId: e.detail.selectedOptions[0].value,
+      ProvinceId: e.detail.code[0],
-      ProvinceName: e.detail.selectedOptions[0].label,
+      ProvinceName: e.detail.value[0],
-      CityId: e.detail.selectedOptions[1].value,
+      CityId: e.detail.code[1],
-      CityName: e.detail.selectedOptions[1].label,
+      CityName: e.detail.value[1],
-      CountyId: e.detail.selectedOptions[2].value,
+      CountyId: e.detail.code[2],
-      CountyName: e.detail.selectedOptions[2].label,
+      CountyName: e.detail.value[2],
       showArea: false,
     });
   },

src/module1/pages/cHostipal/index.wxml

@@ -33,13 +33,15 @@
     </view>
     <view class="row">
       <view class="label required">城市地区</view>
-      <view class="select-wrap" bind:tap="handleArea">
+      <picker class="picker" mode="region" bindchange="onFinish" bindcancel="onClose" bind:tap="handleArea">
-        <view class="select">
+        <view class="select-wrap">
-          <!-- prettier-ignore -->
+          <view class="select">
-          <view class="content" data-place="请选择省份/城市/地区">{{ProvinceName ? ProvinceName+'/' :''}}{{CityName ? CityName+'/' : ''}}{{CountyName}}</view>
+            <!-- prettier-ignore -->
-          <image class="icon" src="{{imageUrl}}triangle-down.png?t={{Timestamp}}"></image>
+            <view class="content" data-place="请选择省份/城市/地区">{{ProvinceName ? ProvinceName+'/' :''}}{{CityName ? CityName+'/' : ''}}{{CountyName}}</view>
+            <image class="icon" src="{{imageUrl}}triangle-down.png?t={{Timestamp}}"></image>
+          </view>
         </view>
-      </view>
+      </picker>
     </view>
     <view class="row">
       <view class="label">详细地址</view>
@@ -89,14 +91,3 @@
     <view class="submit" bind:tap="handleSubmit">提交</view>
   </view>
 </view>
-
-<van-popup show="{{ showArea }}" round position="bottom">
-  <van-cascader
-    value="{{ cascaderValue }}"
-    title="请选择所在地区"
-    options="{{ area }}"
-    field-names="{{fieldNames}}"
-    bind:close="onClose"
-    bind:finish="onFinish"
-  />
-</van-popup>

src/module1/pages/chatRoom/index.ts

@@ -126,6 +126,7 @@ Page({
       wx.setNavigationBarTitle({
         title: `聊天室(${res.roomDoctors.length})`,
       });
+
       this.WebIMLogin();
     });
   },

src/module1/pages/sHostipal/index.json

@@ -3,8 +3,6 @@
   "navigationStyle": "default",
   "usingComponents": {
     "van-icon": "@vant/weapp/icon/index",
-    "pagination": "/components/pagination/index",
+    "pagination": "/components/pagination/index"
-    "van-cascader": "@vant/weapp/cascader/index",
-    "van-popup": "@vant/weapp/popup/index"
   }
 }

src/module1/pages/sHostipal/index.ts

@@ -106,12 +106,12 @@ Page({
   },
   onFinish(e: any) {
     this.setData({
-      ProvinceId: e.detail.selectedOptions[0].value,
+      ProvinceId: e.detail.code[0],
-      ProvinceName: e.detail.selectedOptions[0].label,
+      ProvinceName: e.detail.value[0],
-      CityId: e.detail.selectedOptions[1].value,
+      CityId: e.detail.code[1],
-      CityName: e.detail.selectedOptions[1].label,
+      CityName: e.detail.value[1],
-      CountyId: e.detail.selectedOptions[2].value,
+      CountyId: e.detail.code[2],
-      CountyName: e.detail.selectedOptions[2].label,
+      CountyName: e.detail.value[2],
       showArea: false,
     });
     this.handleSearch();

src/module1/pages/sHostipal/index.wxml

@@ -1,9 +1,11 @@
 <view class="page">
   <view class="header">
-    <view class="region" bind:tap="handleArea">
+    <picker class="picker" mode="region" bindchange="onFinish" bindcancel="onClose"  bind:tap="handleArea">
-      {{CountyName || '地区'}}
+      <view class="region">
-      <van-icon name="arrow-down" />
+        {{CountyName || '地区'}}
-    </view>
+        <van-icon name="arrow-down" />
+      </view>
+    </picker>
     <view class="search">
       <image class="icon" src="{{imageUrl}}icon-search.png?t={{Timestamp}}"></image>
       <input
@@ -42,14 +44,3 @@
     <pagination wx:else pagination="{{pagination}}"></pagination>
   </view>
 </view>
-
-<van-popup show="{{ showArea }}" round position="bottom">
-  <van-cascader
-    value="{{ cascaderValue }}"
-    title="请选择所在地区"
-    options="{{ area }}"
-    field-names="{{fieldNames}}"
-    bind:close="onClose"
-    bind:finish="onFinish"
-  />
-</van-popup>

src/module1/pages/setCaseDoctor/index.json

@@ -4,7 +4,6 @@
   "usingComponents": {
     "popupDoctorDetail": "/components/popupDoctorDetail/index",
     "doctorAvatar": "/components/doctorAvatar/index",
-    "van-cascader": "@vant/weapp/cascader/index",
     "van-popup": "@vant/weapp/popup/index",
     "van-dialog": "@vant/weapp/dialog/index",
     "pagination": "/components/pagination/index"

src/module1/pages/setCaseDoctor/index.scss

@@ -50,6 +50,9 @@ page {
       display: flex;
       align-items: center;
       justify-content: space-between;
+      .picker {
+        flex: 1;
+      }
       .option-wrap {
         flex: 1;
         .option {

src/module1/pages/setCaseDoctor/index.ts

@@ -215,12 +215,12 @@ Page({
   },
   onFinish(e: any) {
     this.setData({
-      provinceId: e.detail.selectedOptions[0].value,
+      provinceId: e.detail.code[0],
-      ProvinceName: e.detail.selectedOptions[0].label,
+      ProvinceName: e.detail.value[0],
-      cityId: e.detail.selectedOptions[1].value,
+      cityId: e.detail.code[1],
-      CityName: e.detail.selectedOptions[1].label,
+      CityName: e.detail.value[1],
-      countyId: e.detail.selectedOptions[2].value,
+      countyId: e.detail.code[2],
-      CountyName: e.detail.selectedOptions[2].label,
+      CountyName: e.detail.value[2],
       showArea: false,
     });
     this.handleSearch();
@@ -250,7 +250,7 @@ Page({
         title: "请选择医生",
         icon: "none",
       });
-      return
+      return;
     }
     if (feedBackInvite) {
       wx.ajax({

src/module1/pages/setCaseDoctor/index.wxml

@@ -23,12 +23,14 @@
           <image class="icon" src="{{imageUrl}}triangle-down.png?t={{Timestamp}}"></image>
         </view>
       </view>
-      <view class="option-wrap" bind:tap="handleArea">
+      <picker class="picker" mode="region" bindchange="onFinish" bindcancel="onClose" bind:tap="handleArea">
-        <view class="option">
+        <view class="option-wrap">
-          <text class="option-text">{{CountyName || '地区'}}</text>
+          <view class="option">
-          <image class="icon" src="{{imageUrl}}triangle-down.png?t={{Timestamp}}"></image>
+            <text class="option-text">{{CountyName || '地区'}}</text>
+            <image class="icon" src="{{imageUrl}}triangle-down.png?t={{Timestamp}}"></image>
+          </view>
         </view>
-      </view>
+      </picker>
       <picker class="option-wrap" range="{{SpecialtyList}}" range-key="label" bindchange="handleSpecialChange">
         <view class="option">
           <text class="option-text">{{SpecialtyName || '医生专长'}}</text>
@@ -90,14 +92,3 @@
   params="{{popupDoctorDetail}}"
   bind:close="handlePopupClose"
 ></popupDoctorDetail>
-
-<van-popup show="{{ showArea }}" round position="bottom">
-  <van-cascader
-    value="{{ cascaderValue }}"
-    title="请选择所在地区"
-    options="{{ area }}"
-    field-names="{{fieldNames}}"
-    bind:close="onClose"
-    bind:finish="onFinish"
-  />
-</van-popup>

src/module1/pages/setChatDoctor/index.json

@@ -4,7 +4,6 @@
   "usingComponents": {
     "popupDoctorDetail": "/components/popupDoctorDetail/index",
     "doctorAvatar": "/components/doctorAvatar/index",
-    "van-cascader": "@vant/weapp/cascader/index",
     "van-popup": "@vant/weapp/popup/index",
     "van-dialog": "@vant/weapp/dialog/index",
     "pagination": "/components/pagination/index"

src/module1/pages/setChatDoctor/index.scss

@@ -49,6 +49,9 @@ page {
       display: flex;
       align-items: center;
       justify-content: space-between;
+      .picker {
+        flex: 1;
+      }
       .option-wrap {
         flex: 1;
         .option {

src/module1/pages/setChatDoctor/index.ts

@@ -207,12 +207,12 @@ Page({
   },
   onFinish(e: any) {
     this.setData({
-      provinceId: e.detail.selectedOptions[0].value,
+      provinceId: e.detail.code[0],
-      ProvinceName: e.detail.selectedOptions[0].label,
+      ProvinceName: e.detail.value[0],
-      cityId: e.detail.selectedOptions[1].value,
+      cityId: e.detail.code[1],
-      CityName: e.detail.selectedOptions[1].label,
+      CityName: e.detail.value[1],
-      countyId: e.detail.selectedOptions[2].value,
+      countyId: e.detail.code[2],
-      CountyName: e.detail.selectedOptions[2].label,
+      CountyName: e.detail.value[2],
       showArea: false,
     });
     this.handleSearch();

src/module1/pages/setChatDoctor/index.wxml

@@ -24,12 +24,14 @@
           <image class="icon" src="{{imageUrl}}triangle-down.png?t={{Timestamp}}"></image>
         </view>
       </view>
-      <view class="option-wrap" bind:tap="handleArea">
+      <picker class="picker" mode="region" bindchange="onFinish" bindcancel="onClose" bind:tap="handleArea">
-        <view class="option">
+        <view class="option-wrap">
-          <text class="option-text">{{CountyName || '地区'}}</text>
+          <view class="option">
-          <image class="icon" src="{{imageUrl}}triangle-down.png?t={{Timestamp}}"></image>
+            <text class="option-text">{{CountyName || '地区'}}</text>
+            <image class="icon" src="{{imageUrl}}triangle-down.png?t={{Timestamp}}"></image>
+          </view>
         </view>
-      </view>
+      </picker>
       <picker class="option-wrap" range="{{SpecialtyList}}" range-key="label" bindchange="handleSpecialChange">
         <view class="option">
           <text class="option-text">{{SpecialtyName || '医生专长'}}</text>
@@ -89,14 +91,3 @@
   params="{{popupDoctorDetail}}"
   bind:close="handlePopupClose"
 ></popupDoctorDetail>
-
-<van-popup show="{{ showArea }}" round position="bottom">
-  <van-cascader
-    value="{{ cascaderValue }}"
-    title="请选择所在地区"
-    options="{{ area }}"
-    field-names="{{fieldNames}}"
-    bind:close="onClose"
-    bind:finish="onFinish"
-  />
-</van-popup>

src/module1/pages/setDoctor/index.json

@@ -4,7 +4,6 @@
   "usingComponents": {
     "popupDoctorDetail": "/components/popupDoctorDetail/index",
     "doctorAvatar": "/components/doctorAvatar/index",
-    "van-cascader": "@vant/weapp/cascader/index",
     "van-popup": "@vant/weapp/popup/index",
     "van-dialog": "@vant/weapp/dialog/index"
   }

src/module1/pages/setDoctor/index.scss

@@ -49,6 +49,9 @@ page {
       display: flex;
       align-items: center;
       justify-content: space-between;
+      .picker {
+        flex: 1;
+      }
       .option-wrap {
         flex: 1;
         .option {

src/module1/pages/setDoctor/index.ts

@@ -194,12 +194,12 @@ Page({
   },
   onFinish(e: any) {
     this.setData({
-      ProvinceId: e.detail.selectedOptions[0].value,
+      ProvinceId: e.detail.code[0],
-      ProvinceName: e.detail.selectedOptions[0].label,
+      ProvinceName: e.detail.value[0],
-      CityId: e.detail.selectedOptions[1].value,
+      CityId: e.detail.code[1],
-      CityName: e.detail.selectedOptions[1].label,
+      CityName: e.detail.value[1],
-      CountyId: e.detail.selectedOptions[2].value,
+      CountyId: e.detail.code[2],
-      CountyName: e.detail.selectedOptions[2].label,
+      CountyName: e.detail.value[2],
       showArea: false,
     });
     this.handleSearch();

src/module1/pages/setDoctor/index.wxml

@@ -27,12 +27,14 @@
           <image class="icon" src="{{imageUrl}}triangle-down.png?t={{Timestamp}}"></image>
         </view>
       </view>
-      <view class="option-wrap" bind:tap="handleArea">
+      <picker class="picker" mode="region" bindchange="onFinish" bindcancel="onClose" bind:tap="handleArea">
-        <view class="option">
+        <view class="option-wrap">
-          <text class="option-text">{{CountyName || '地区'}}</text>
+          <view class="option">
-          <image class="icon" src="{{imageUrl}}triangle-down.png?t={{Timestamp}}"></image>
+            <text class="option-text">{{CountyName || '地区'}}</text>
+            <image class="icon" src="{{imageUrl}}triangle-down.png?t={{Timestamp}}"></image>
+          </view>
         </view>
-      </view>
+      </picker>
       <picker class="option-wrap" range="{{SpecialtyList}}" range-key="label" bindchange="handleSpecialChange">
         <view class="option">
           <text class="option-text">{{SpecialtyName || '医生专长'}}</text>
@@ -97,17 +99,6 @@
   bind:close="handlePopupClose"
 ></popupDoctorDetail>
 
-<van-popup show="{{ showArea }}" round position="bottom">
-  <van-cascader
-    value="{{ cascaderValue }}"
-    title="请选择所在地区"
-    options="{{ area }}"
-    field-names="{{fieldNames}}"
-    bind:close="onClose"
-    bind:finish="onFinish"
-  />
-</van-popup>
-
 <!-- 审核通过 -->
 <van-dialog
   custom-style="background:transparent"

src/module1/pages/userInfo/index.ts

@@ -177,6 +177,25 @@ Page({
       },
     });
   },
+  handleLogout() {
+    wx.showModal({
+      confirmColor: "#00B4C5",
+      cancelColor: "#141515",
+      title: "确认注销该账号？",
+      success(res) {
+        if (res.confirm) {
+          wx.ajax({
+            method: "POST",
+            url: "?r=takeda/account/delete-account",
+          }).then(() => {
+            wx.reLaunch({
+              url: "/module1/pages/login/index",
+            });
+          });
+        }
+      },
+    });
+  },
 });
 
 export {};

src/module1/pages/userInfo/index.wxml

@@ -3,7 +3,7 @@
   <uploadFile class="upload" chooseAvatar bind:file="handleFile">
     <image class="avatar" mode="aspectFill" src="{{userInfo.Img}}"></image>
     <view class="edit">
-      <image class="icon"  src="{{imageUrl}}icon-edit.png?t={{Timestamp}}"></image>
+      <image class="icon" src="{{imageUrl}}icon-edit.png?t={{Timestamp}}"></image>
     </view>
   </uploadFile>
   <view class="row">
@@ -44,7 +44,7 @@
 </view>
 <view class="btn" bind:tap="handleLoginOut">退出登录</view>
 <view class="btn" bind:tap="changePhone">更换手机号</view>
-<view class="btn">注销账号</view>
+<view class="btn" bind:tap="handleLogout">注销账号</view>
 
 <van-popup
   show="{{ show1 }}"

src/pages/cases/index.json

@@ -5,7 +5,6 @@
     "van-icon": "@vant/weapp/icon/index",
     "van-popup": "@vant/weapp/popup/index",
     "pagination": "/components/pagination/index",
-    "van-cascader": "@vant/weapp/cascader/index",
     "van-dialog": "@vant/weapp/dialog/index"
   }
 }

src/pages/cases/index.ts

@@ -141,9 +141,8 @@ Page({
   getList(newPage = 1) {
     wx.ajax({
       method: "POST",
-      url: `?r=takeda/case/get-list&type=${Number(this.data.nav) + 1}`,
+      url: `?r=takeda/case/get-list&type=${Number(this.data.nav) + 1}&page=${newPage}`,
       data: {
-        page: newPage,
         search: this.data.search,
         caseStatus: this.data.caseStatus,
         submitTimeBegin: this.data.submitTimeBegin,
@@ -189,6 +188,13 @@ Page({
       show1: true,
     });
   },
+  handleCancel(e) {
+    const { key } = e.currentTarget.dataset;
+    this.setData({
+      [key]: "",
+    });
+    this.handleSearch();
+  },
   handleCase(e) {
     const { value } = e.currentTarget.dataset;
     const { caseStatus, caseStatusList } = this.data;
@@ -406,12 +412,12 @@ Page({
   },
   onFinish(e: any) {
     this.setData({
-      provinceId: e.detail.selectedOptions[0].value,
+      provinceId: e.detail.code[0],
-      provinceName: e.detail.selectedOptions[0].label,
+      provinceName: e.detail.value[0],
-      cityId: e.detail.selectedOptions[1].value,
+      cityId: e.detail.code[1],
-      cityName: e.detail.selectedOptions[1].label,
+      cityName: e.detail.value[1],
-      countyId: e.detail.selectedOptions[2].value,
+      countyId: e.detail.code[2],
-      countyName: e.detail.selectedOptions[2].label,
+      countyName: e.detail.value[2],
       showArea: false,
     });
     this.handleSearch();

src/pages/cases/index.wxml

@@ -59,6 +59,8 @@
                 model:value="{{submitTimeBegin}}"
                 mode="date"
                 bind:change="handleSearch"
+                bindcancel="handleCancel"
+                data-key="submitTimeBegin"
               >
                 <view class="date-content">{{submitTimeBegin || '开始'}}</view>
               </picker>
@@ -69,6 +71,8 @@
                 model:value="{{submitTimeEnd}}"
                 mode="date"
                 bind:change="handleSearch"
+                bindcancel="handleCancel"
+                data-key="submitTimeEnd"
               >
                 <view class="date-content">{{submitTimeEnd || '结束'}}</view>
               </picker>
@@ -88,6 +92,8 @@
                 model:value="{{feedbackTimeBegin}}"
                 mode="date"
                 bind:change="handleSearch"
+                bindcancel="handleCancel"
+                data-key="feedbackTimeBegin"
               >
                 <view class="date-content">{{feedbackTimeBegin || '开始'}}</view>
               </picker>
@@ -98,6 +104,8 @@
                 model:value="{{feedbackTimeEnd}}"
                 mode="date"
                 bind:change="handleSearch"
+                bindcancel="handleCancel"
+                data-key="feedbackTimeEnd"
               >
                 <view class="date-content">{{feedbackTimeEnd || '结束'}}</view>
               </picker>
@@ -115,10 +123,12 @@
       </view>
       <view class="row">
         <view class="label">地区</view>
-        <view class="picker-content" bind:tap="handleArea">
+        <picker class="picker" mode="region" bindchange="onFinish" bindcancel="onClose" bind:tap="handleArea">
-          <view class="content">{{cityName + countyName || '全部'}}</view>
+          <view class="picker-content">
-          <van-icon name="arrow-down" />
+            <view class="content">{{cityName + countyName || '全部'}}</view>
-        </view>
+            <van-icon name="arrow-down" />
+          </view>
+        </picker>
       </view>
     </view>
     <view class="station">
@@ -184,7 +194,6 @@
     <view class="list-total" wx:if="{{pagination.count}}">共有{{pagination.count}}条病历</view>
     <view class="list-item" wx:for="{{list}}" bind:tap="handleDetail" wx:key="caseId" data-params="{{item}}">
       <image wx:if="{{item.isHighQuality==='1'}}" class="quality" src="{{imageUrl}}quality.png?t={{Timestamp}}"></image>
-      <image class="quality" src="{{imageUrl}}quality.png?t={{Timestamp}}"></image>
       <view class="li-header">
         <view class="wrap">
           <view class="id">ID:{{item.caseNo}}</view>
@@ -367,14 +376,3 @@
     <view class="submit" bind:tap="handleTagSubmit">确定</view>
   </view>
 </van-popup>
-
-<van-popup show="{{ showArea }}" round position="bottom" z-index="100000">
-  <van-cascader
-    value="{{ cascaderValue }}"
-    title="请选择所在地区"
-    options="{{ area }}"
-    field-names="{{fieldNames}}"
-    bind:close="onClose"
-    bind:finish="onFinish"
-  />
-</van-popup>

src/pages/chatRoomList/index.json

@@ -5,7 +5,6 @@
     "van-icon": "@vant/weapp/icon/index",
     "van-popup": "@vant/weapp/popup/index",
     "pagination": "/components/pagination/index",
-    "van-cascader": "@vant/weapp/cascader/index",
     "van-dialog": "@vant/weapp/dialog/index"
   }
 }

src/pages/chatRoomList/index.scss

@@ -228,30 +228,24 @@ page {
         }
       }
       .c-footer {
-        padding: 32rpx;
+        padding: 6rpx 32rpx 32rpx;
-        display: flex;
+        .tag {
-        justify-content: space-between;
+          display: inline-block;
+          margin-top: 10rpx;
+          margin-right: 10rpx;
+          padding: 2rpx 8rpx;
+          font-size: 22rpx;
+          color: rgba(0, 180, 197, 1);
+          line-height: 32rpx;
+          border-radius: 4rpx 4rpx 4rpx 4rpx;
+          border: 1px solid #bfeff4;
+        }
         .name {
+          margin-top: 24rpx;
           font-size: 28rpx;
           color: rgba(20, 21, 21, 1);
           line-height: 32rpx;
         }
-        .tags {
-          padding-left: 24rpx;
-          flex: 1;
-          display: flex;
-          justify-content: flex-end;
-          flex-wrap: wrap;
-          gap: 12rpx;
-          .tag {
-            padding: 2rpx 8rpx;
-            font-size: 22rpx;
-            color: rgba(0, 180, 197, 1);
-            line-height: 32rpx;
-            border-radius: 4rpx 4rpx 4rpx 4rpx;
-            border: 1px solid #bfeff4;
-          }
-        }
       }
     }
   }

src/pages/chatRoomList/index.ts

@@ -133,9 +133,8 @@ Page({
   getList(newPage = 1) {
     wx.ajax({
       method: "POST",
-      url: "?r=takeda/chat/get-list",
+      url: `?r=takeda/chat/get-list&page=${newPage}`,
       data: {
-        page: newPage,
         search: this.data.search,
         caseStatus: this.data.caseStatus,
         createRoomTimeBegin: this.data.createRoomTimeBegin,
@@ -426,16 +425,23 @@ Page({
   },
   onFinish(e: any) {
     this.setData({
-      provinceId: e.detail.selectedOptions[0].value,
+      provinceId: e.detail.code[0],
-      provinceName: e.detail.selectedOptions[0].label,
+      provinceName: e.detail.value[0],
-      cityId: e.detail.selectedOptions[1].value,
+      cityId: e.detail.code[1],
-      cityName: e.detail.selectedOptions[1].label,
+      cityName: e.detail.value[1],
-      countyId: e.detail.selectedOptions[2].value,
+      countyId: e.detail.code[2],
-      countyName: e.detail.selectedOptions[2].label,
+      countyName: e.detail.value[2],
       showArea: false,
     });
     this.handleSearch();
   },
+  handleCancel(e) {
+    const { key } = e.currentTarget.dataset;
+    this.setData({
+      [key]: "",
+    });
+    this.handleSearch()
+  },
 
   handleFold() {
     this.setData({
@@ -473,11 +479,9 @@ Page({
     });
   },
   handleNoRead() {
-    wx.showModal({
+    wx.showToast({
+      icon: "none",
       title: "暂无未读消息",
-      confirmColor: "#00B4C5",
-      cancelColor: "#141515",
-      showCancel: false,
     });
   },
 });

src/pages/chatRoomList/index.wxml

@@ -43,6 +43,8 @@
                 model:value="{{createRoomTimeBegin}}"
                 mode="date"
                 bind:change="handleSearch"
+                bindcancel="handleCancel"
+                data-key="createRoomTimeBegin"
               >
                 <view class="date-content">{{createRoomTimeBegin || '开始'}}</view>
               </picker>
@@ -53,6 +55,8 @@
                 model:value="{{createRoomTimeEnd}}"
                 mode="date"
                 bind:change="handleSearch"
+                bindcancel="handleCancel"
+                data-key="createRoomTimeEnd"
               >
                 <view class="date-content">{{createRoomTimeEnd || '结束'}}</view>
               </picker>
@@ -72,6 +76,8 @@
                 model:value="{{createCaseTimeBegin}}"
                 mode="date"
                 bind:change="handleSearch"
+                bindcancel="handleCancel"
+                data-key="createCaseTimeBegin"
               >
                 <view class="date-content">{{createCaseTimeBegin || '开始'}}</view>
               </picker>
@@ -82,6 +88,8 @@
                 model:value="{{createCaseTimeEnd}}"
                 mode="date"
                 bind:change="handleSearch"
+                bindcancel="handleCancel"
+                data-key="createCaseTimeEnd"
               >
                 <view class="date-content">{{createCaseTimeEnd || '结束'}}</view>
               </picker>
@@ -106,10 +114,12 @@
       </view>
       <view class="row">
         <view class="label">地区</view>
-        <view class="picker-content" bind:tap="handleArea">
+        <picker class="picker" mode="region" bindchange="onFinish" bindcancel="onClose" bind:tap="handleArea">
-          <view class="content">{{cityName + countyName || '全部'}}</view>
+          <view class="picker-content">
-          <van-icon name="arrow-down" />
+            <view class="content">{{cityName + countyName || '全部'}}</view>
-        </view>
+            <van-icon name="arrow-down" />
+          </view>
+        </picker>
       </view>
       <view wx:if="{{!fold}}" class="fold" bind:tap="handleFold">
         收起
@@ -152,10 +162,8 @@
         </view>
       </view>
       <view class="c-footer">
+        <view class="tag" wx:for="{{item.caseLabels}}" wx:key="labelId">{{item.labelName}}</view>
         <view class="name">{{item.doctorName}} {{item.doctorTitleName || item.doctorOtherTitle}}</view>
-        <view class="tags">
-          <view class="tag" wx:for="{{item.caseLabels}}" wx:key="labelId">{{item.labelName}}</view>
-        </view>
       </view>
     </view>
     <pagination pagination="{{pagination}}"></pagination>
@@ -283,14 +291,3 @@
     <view class="submit" bind:tap="handleTagSubmit">确定</view>
   </view>
 </van-popup>
-
-<van-popup show="{{ showArea }}" round position="bottom" z-index="100000">
-  <van-cascader
-    value="{{ cascaderValue }}"
-    title="请选择所在地区"
-    options="{{ area }}"
-    field-names="{{fieldNames}}"
-    bind:close="onClose"
-    bind:finish="onFinish"
-  />
-</van-popup>