ui update

dist.sh

@@ -2,4 +2,5 @@
 cd ./src/images/ || exit
 svn add . --no-ignore --force
 svn ci -m "版本更新"
+ssh hb127 "cd /data1/wwwroot/default/yd/data/images && svn up && exit"
 exit

project.config.json

@@ -3,7 +3,10 @@
   "miniprogramRoot": "src/",
   "compileType": "miniprogram",
   "setting": {
-    "useCompilerPlugins": ["typescript", "sass"],
+    "useCompilerPlugins": [
+      "typescript",
+      "sass"
+    ],
     "urlCheck": true,
     "coverView": true,
     "es6": true,

project.private.config.json

@@ -1,5 +1,5 @@
 {
-  "projectname": "drug-miniporgram",
+    "projectname": "drug-miniprogram",
     "setting": {
         "compileHotReLoad": true,
         "urlCheck": true,
@@ -19,123 +19,6 @@
         "bigPackageSizeSupport": false
     },
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "condition": {
+    "condition": {},
-    "miniprogram": {
-      "list": [
-        {
-          "name": "药店-教育详情",
-          "pathName": "doctor/pages/article/index",
-          "query": "",
-          "scene": null,
-          "launchMode": "default"
-        },
-        {
-          "name": "药店-教育",
-          "pathName": "doctor/pages/articleList/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "药店-患者列表",
-          "pathName": "doctor/pages/patientList/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "药店-注册",
-          "pathName": "doctor/pages/loginForm/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "药店-登录",
-          "pathName": "doctor/pages/login/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "药店-邀约",
-          "pathName": "doctor/pages/invite/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "药店-我的",
-          "pathName": "doctor/pages/my/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "药店-首页",
-          "pathName": "doctor/pages/home/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "地推端-邀约数明细",
-          "pathName": "ground/pages/stat/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "地推端-邀约",
-          "pathName": "ground/pages/invite/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "地推端-登录页",
-          "pathName": "ground/pages/login/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "工作人员起始页",
-          "pathName": "pages/work/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "患者-首页",
-          "pathName": "pages/index/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "地推端-我的",
-          "pathName": "ground/pages/my/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "地推端-药师管理",
-          "pathName": "ground/pages/pharmacist/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "地推-首页",
-          "pathName": "ground/pages/home/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        }
-      ]
-    }
-  },
     "libVersion": "3.5.8"
 }

src/doctor/pages/article/index.wxml

@@ -6,16 +6,16 @@
 </navbar>
 
 <view class="page" style="padding-top: {{pageTop+20}}px;">
-  <image class="banner" src="/images/cache/bg3.png"></image>
+  <image class="banner" src="{{imageUrl}}cache/bg3.png?t={{Timestamp}}"></image>
   <view class="title">从强降糖到防事件，那些糖尿病指南走过的路</view>
   <mp-html content="{{doc}}"></mp-html>
   <view class="page-footer">
     <view class="o-item">
-      <image class="icon" src="/images/icon22.png"></image>
+      <image class="icon" src="{{imageUrl}}icon22.png?t={{Timestamp}}"></image>
       <text class="num">123</text>
     </view>
     <view class="o-item">
-      <image class="icon" src="/images/icon23.png"></image>
+      <image class="icon" src="{{imageUrl}}icon23.png?t={{Timestamp}}"></image>
       <text class="num">123</text>
     </view>
   </view>

src/doctor/pages/articleList/index.wxml

@@ -23,11 +23,11 @@
         <view class="title">从强降糖到防事件，那些糖尿病指南走过的路</view>
         <view class="options">
           <view class="o-item">
-            <image class="icon" src="/images/icon22.png"></image>
+            <image class="icon" src="{{imageUrl}}icon22.png?t={{Timestamp}}"></image>
             <text class="num">123</text>
           </view>
           <view class="o-item">
-            <image class="icon" src="/images/icon23.png"></image>
+            <image class="icon" src="{{imageUrl}}icon23.png?t={{Timestamp}}"></image>
             <text class="num">123</text>
           </view>
         </view>

src/doctor/pages/home/index.scss

@@ -50,11 +50,10 @@ page {
         font-size: 28rpx;
         color: #ffffff;
       }
-      .date{
+      .date {
         margin-top: 10rpx;
         font-size: 28rpx;
         color: #fff;
-
       }
     }
     .code {
@@ -91,6 +90,18 @@ page {
         font-size: 36rpx;
         color: #1a2020;
         font-weight: bold;
+        .fold {
+          display: inline-block;
+          font-weight: normal;
+          font-size: 28rpx;
+          color: #b7b7b7;
+          transition: all 0.3s;
+          &.active {
+            .icon {
+              transform: rotate(180deg);
+            }
+          }
+        }
       }
       .tip {
         font-size: 28rpx;
@@ -126,9 +137,16 @@ page {
           background-color: rgba(238, 245, 245, 0.35);
         }
       }
+      .card-container {
+        max-height: 600rpx;
+        transition: all 0.3s;
+        &.fold {
+          max-height: 0;
+        }
         .row3 {
           background-color: #fff;
           display: flex;
+          overflow: hidden;
           .col {
             position: relative;
             padding: 28rpx 34rpx;
@@ -162,6 +180,7 @@ page {
         }
       }
     }
+  }
   .chat-data {
     margin: 32rpx 32rpx;
     padding: 32rpx;
@@ -178,10 +197,12 @@ page {
         font-weight: bold;
       }
       .switch-btns {
+        flex: 1;
         display: flex;
         align-items: center;
         gap: 24rpx;
         .btn {
+          flex: 1;
           width: 148rpx;
           height: 56rpx;
           display: flex;
@@ -209,6 +230,18 @@ page {
         font-size: 32rpx;
         color: #342317;
         font-weight: bold;
+        .fold {
+          display: inline-block;
+          font-weight: normal;
+          font-size: 28rpx;
+          color: #b7b7b7;
+          transition: all 0.3s;
+          &.active {
+            .icon {
+              transform: rotate(180deg);
+            }
+          }
+        }
       }
       .picker {
         color: #ffa64d;
@@ -254,6 +287,12 @@ page {
           background-color: rgba(238, 245, 245, 0.35);
         }
       }
+      .card-container {
+        max-height: 600rpx;
+        transition: all 0.3s;
+        &.fold {
+          max-height: 0;
+        }
         .row3 {
           background-color: #fff;
           display: flex;
@@ -289,6 +328,7 @@ page {
           }
         }
       }
+    }
     .chart-range {
       margin-top: 40rpx;
       display: flex;
@@ -328,7 +368,7 @@ page {
     .more {
       padding: 20rpx 0 0;
       font-size: 28rpx;
-      color: #FF8A4C;
+      color: #ff8a4c;
       text-align: center;
     }
   }

src/doctor/pages/home/index.ts

@@ -1,7 +1,10 @@
 const echarts = require('../../../components/ec-canvas/echarts.js')
 
 Page({
-  data: {},
+  data: {
+    fold1: false,
+    fold2: false,
+  },
   ecDataTrendComponent1_1: null as any,
   async onLoad() {
     const app = getApp<IAppOption>()
@@ -144,4 +147,10 @@ Page({
       url: '/doctor/pages/stat/index',
     })
   },
+  handleFold(e) {
+    const { key } = e.currentTarget.dataset
+    this.setData({
+      [key]: !this.data[key],
+    })
+  },
 })

src/doctor/pages/home/index.wxml

@@ -27,7 +27,13 @@
   </view>
   <view class="stat-data">
     <view class="s-header">
-      <view class="title">累计邀约</view>
+      <view class="title" bind:tap="handleFold" data-key="fold1">
+        累计邀约
+        <view class="fold {{fold1&&'active'}}">
+          {{fold1?'展开':'收起'}}
+          <van-icon class="icon" name="arrow-down" />
+        </view>
+      </view>
       <view class="tip">截止昨日数据</view>
     </view>
     <view class="card">
@@ -47,6 +53,7 @@
           <view class="num">750</view>
         </view>
       </view>
+      <view class="card-container {{fold1&&'fold'}}">
         <view class="row3">
           <view class="col">
             <view class="name">入组患者数</view>
@@ -95,16 +102,22 @@
         </view>
       </view>
     </view>
+  </view>
   <view class="chat-data">
     <view class="c-header">
-      <view class="title">邀约患者统计</view>
       <view class="switch-btns">
         <view class="btn">月统计</view>
         <view class="btn active">日统计</view>
       </view>
     </view>
     <view class="c-options">
-      <view class="name">今日邀约患者数</view>
+      <view class="name" bind:tap="handleFold" data-key="fold2">
+        邀约患者统计
+        <view class="fold {{fold2&&'active'}}">
+          {{fold1?'展开':'收起'}}
+          <van-icon class="icon" name="arrow-down" />
+        </view>
+      </view>
       <picker class="picker" mode="date">
         <view class="p-content">
           <van-icon class="icon" name="arrow-left" />
@@ -130,6 +143,7 @@
           <view class="num">750</view>
         </view>
       </view>
+      <view class="card-container {{fold2&&'fold'}}">
         <view class="row3">
           <view class="col">
             <view class="name">入组患者数</view>
@@ -177,6 +191,7 @@
           </view>
         </view>
       </view>
+    </view>
     <view class="chart-range">
       <picker class="picker" mode="date" end="{{end}}">
         <view class="p-content">

src/ground/pages/home/index.scss

@@ -81,6 +81,18 @@ page {
         font-size: 36rpx;
         color: #1a2020;
         font-weight: bold;
+        .fold {
+          display: inline-block;
+          font-weight: normal;
+          font-size: 28rpx;
+          color: #b7b7b7;
+          transition: all 0.3s;
+          &.active {
+            .icon {
+              transform: rotate(180deg);
+            }
+          }
+        }
       }
       .tip {
         font-size: 28rpx;
@@ -141,6 +153,12 @@ page {
           background-color: rgba(238, 245, 245, 0.35);
         }
       }
+      .card-container {
+        max-height: 600rpx;
+        transition: all 0.3s;
+        &.fold {
+          max-height: 0;
+        }
         .row3 {
           display: flex;
           .col {
@@ -176,6 +194,7 @@ page {
         }
       }
     }
+  }
   .chat-data {
     margin: 32rpx 32rpx;
     padding: 32rpx;
@@ -192,10 +211,12 @@ page {
         font-weight: bold;
       }
       .switch-btns {
+        flex: 1;
         display: flex;
         align-items: center;
         gap: 24rpx;
         .btn {
+          flex: 1;
           width: 148rpx;
           height: 56rpx;
           display: flex;
@@ -221,6 +242,18 @@ page {
         font-size: 32rpx;
         color: #1a2020;
         font-weight: bold;
+        .fold {
+          display: inline-block;
+          font-weight: normal;
+          font-size: 28rpx;
+          color: #b7b7b7;
+          transition: all 0.3s;
+          &.active {
+            .icon {
+              transform: rotate(180deg);
+            }
+          }
+        }
       }
       .picker {
         color: #4a8dff;
@@ -241,6 +274,7 @@ page {
       margin-top: 32rpx;
       border: 1px solid #f2f6f8;
       border-radius: 16rpx;
+      overflow: hidden;
       .row2 {
         display: flex;
         background: linear-gradient(265deg, #5393ff 0%, #3edec9 100%);
@@ -265,6 +299,14 @@ page {
           background-color: rgba(238, 245, 245, 0.35);
         }
       }
+
+      .card-container {
+        max-height: 600rpx;
+        transition: all 0.3s;
+        overflow: hidden;
+        &.fold {
+          max-height: 0;
+        }
         .row3 {
           display: flex;
           .col {
@@ -299,6 +341,7 @@ page {
           }
         }
       }
+    }
     .chart-range {
       margin-top: 40rpx;
       display: flex;

src/ground/pages/home/index.ts

@@ -1,7 +1,10 @@
 const echarts = require('../../../components/ec-canvas/echarts.js')
 
 Page({
-  data: {},
+  data: {
+    fold1: false,
+    fold2: false,
+  },
   ecDataTrendComponent1_1: null as any,
   ecDataTrendComponent2_1: null as any,
   ecDataTrendComponent3_1: null as any,
@@ -254,4 +257,10 @@ Page({
       url: '/ground/pages/stat/index',
     })
   },
+  handleFold(e) {
+    const { key } = e.currentTarget.dataset
+    this.setData({
+      [key]: !this.data[key],
+    })
+  },
 })

src/ground/pages/home/index.wxml

@@ -1,6 +1,7 @@
 <navbar fixed custom-style="background: {{background}};">
   <view class="page-switch" slot="left" style="color: {{background=='transparent'?'#fff':'#4A8DFF'}};">
-    特诺雅<text style="font-size:0.5em;vertical-align: top;">®</text>
+    特诺雅
+    <text style="font-size: 0.5em; vertical-align: top">®</text>
     <van-icon class="arrow" name="arrow-down" />
   </view>
 </navbar>
@@ -22,7 +23,13 @@
   </view>
   <view class="stat-data">
     <view class="s-header">
-      <view class="title">累计邀约</view>
+      <view class="title" bind:tap="handleFold" data-key="fold1">
+        累计邀约
+        <view class="fold {{fold1&&'active'}}">
+          {{fold1?'展开':'收起'}}
+          <van-icon class="icon" name="arrow-down" />
+        </view>
+      </view>
       <view class="tip">截止昨日数据</view>
     </view>
     <view class="row1">
@@ -53,6 +60,7 @@
           <view class="num">750</view>
         </view>
       </view>
+      <view class="card-container {{fold1&&'fold'}}">
         <view class="row3">
           <view class="col">
             <view class="name">入组患者数</view>
@@ -101,16 +109,23 @@
         </view>
       </view>
     </view>
+  </view>
   <view class="chat-data">
     <view class="c-header">
-      <view class="title">邀约患者统计</view>
+      <!-- <view class="title">邀约患者统计</view> -->
       <view class="switch-btns">
         <view class="btn">月统计</view>
         <view class="btn active">日统计</view>
       </view>
     </view>
     <view class="c-options">
-      <view class="name">今日邀约患者数</view>
+      <view class="name" bind:tap="handleFold" data-key="fold2">
+        邀约患者统计
+        <view class="fold {{fold2&&'active'}}">
+          {{fold1?'展开':'收起'}}
+          <van-icon class="icon" name="arrow-down" />
+        </view>
+      </view>
       <picker class="picker" mode="date">
         <view class="p-content">
           <van-icon class="icon" name="arrow-left" />
@@ -136,6 +151,7 @@
           <view class="num">750</view>
         </view>
       </view>
+      <view class="card-container {{fold2&&'fold'}}">
         <view class="row3">
           <view class="col">
             <view class="name">入组患者数</view>
@@ -183,6 +199,7 @@
           </view>
         </view>
       </view>
+    </view>
     <view class="chart-range">
       <picker class="picker" mode="date" end="{{end}}">
         <view class="p-content">