tmp

pages/ai/index.js

@@ -6,6 +6,7 @@ Page({
     inputValue: '',
     isTyping: false,
     scrollToMessage: '',
+    expandedIds: {},
     quickQuestions: [
       '今日待处理订单有哪些？',
       '最近客户反馈统计',
@@ -17,6 +18,13 @@ Page({
   messageIdCounter: 0,
   socket: null,
 
+  // 生成消息 id：保证计数器始终为数字，避免出现 msg_NaN
+  genId() {
+    const n = Number(this.messageIdCounter)
+    this.messageIdCounter = Number.isFinite(n) ? n + 1 : 1
+    return `msg_${this.messageIdCounter}`
+  },
+
   onLoad() {
     this.loadChatHistory()
     this.initSocket()
@@ -66,13 +74,18 @@ Page({
         lastMessage.content += data.content || ''
         messages = this.data.messages
       }
+      if (lastMessage.type === 'ai' && data.source == "subagent" && lastMessage.source == data.source) {
+        lastMessage.content += '' + data.content || ''
+        messages = this.data.messages
+      }
     }
 
     if (!messages) {
       const aiResponse = {
-        id: `msg_${++this.messageIdCounter}`,
+        id: this.genId(),
         _serverId: data.id,
         type: 'ai',
+        source: data.source,
         contentType: 'text',
         content: data.content || '',
         time: this.formatTime(new Date())
@@ -97,6 +110,19 @@ Page({
     try {
       const history = wx.getStorageSync('admin_ai_chat_history')
       if (history && history.length > 0) {
+        // 清洗历史中的无效/重复 id（如 msg_NaN），并把计数器拨到最大 id 之后
+        let max = 0
+        const seen = new Set()
+        history.forEach((m, i) => {
+          const n = parseInt(String(m.id).slice(4), 10)
+          if (Number.isFinite(n) && !seen.has(n)) {
+            seen.add(n)
+            if (n > max) max = n
+          } else {
+            m.id = `msg_h${Date.now()}_${i}`
+          }
+        })
+        this.messageIdCounter = max
         this.setData({ messages: history })
         this.scrollToBottom()
       }
@@ -132,7 +158,7 @@ Page({
     if (!content) return
 
     const userMessage = {
-      id: `msg_${++this.messageIdCounter}`,
+      id: this.genId(),
       type: 'user',
       contentType: 'text',
       content: content,
@@ -187,7 +213,7 @@ Page({
 
   handleAIError(errorMessage) {
     const errorResponse = {
-      id: `msg_${++this.messageIdCounter}`,
+      id: this.genId(),
       type: 'ai',
       contentType: 'text',
       content: errorMessage,
@@ -203,6 +229,14 @@ Page({
     this.scrollToBottom()
   },
 
+  // 展开/折叠 subagent 消息（默认折叠，key 不存在即为折叠态）
+  toggleSubagent(e) {
+    const id = e.currentTarget.dataset.id
+    this.setData({
+      [`expandedIds.${id}`]: !this.data.expandedIds[id]
+    })
+  },
+
   scrollToBottom() {
     setTimeout(() => {
       const lastMessage = this.data.messages[this.data.messages.length - 1]

pages/ai/index.wxml

@@ -15,8 +15,18 @@
       </view>
       <view class="message-content">
         <view class="message-bubble {{item.type}}-bubble">
+          <!-- subagent 消息：引用卡片样式，默认折叠 -->
+          <block wx:if="{{item.source === 'subagent'}}">
+            <view class="subagent-header" data-id="{{item.id}}" bindtap="toggleSubagent">
+              <text class="subagent-label">思考中...</text>
+              <text class="subagent-arrow {{expandedIds[item.id] ? 'expanded' : ''}}">▸</text>
+            </view>
+            <view class="subagent-body" wx:if="{{expandedIds[item.id]}}">
+              <t-chat-markdown class="message-markdown" content="{{item.content}}" />
+            </view>
+          </block>
           <t-chat-markdown
-            wx:if="{{item.contentType === 'text' && item.type === 'ai'}}"
+            wx:elif="{{item.contentType === 'text' && item.type === 'ai'}}"
             class="message-markdown"
             content="{{item.content}}"
           />

pages/ai/index.wxss

@@ -230,6 +230,35 @@ page {
   word-break: break-all;
 }
 
+/* subagent 引用卡片（默认折叠） */
+.subagent-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 4rpx 0;
+}
+
+.subagent-label {
+  font-size: 24rpx;
+  color: #6b7280;
+}
+
+.subagent-arrow {
+  font-size: 24rpx;
+  color: #9ca3af;
+  transition: transform 0.2s ease;
+}
+
+.subagent-arrow.expanded {
+  transform: rotate(90deg);
+}
+
+.subagent-body {
+  margin-top: 12rpx;
+  padding-top: 12rpx;
+  border-top: 1rpx solid #e5e7eb;
+}
+
 .typing-indicator {
   display: flex;
   flex-direction: column;

pages/home/index.js

@@ -155,7 +155,10 @@ Page({
       .slice(0, 10)
       .map(item => {
         const d = new Date(item.schedule.date);
-        item.schedule.date = `${d.getMonth() + 1}月${d.getDate()}日 ${pad(d.getHours())}:${pad(d.getMinutes())}`;
+        const dateText = `${d.getMonth() + 1}月${d.getDate()}日`;
+        item.schedule.date = item.schedule.startTime
+          ? `${dateText} ${item.schedule.startTime}`
+          : `${dateText} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
         return item;
       });
     this.setData({ recentOrders: records });

pages/home/index.wxss

@@ -1,7 +1,7 @@
 /* pages/home/index.wxss */
 
 page {
-  background: #f5f6fa;
+  background: #ededed;
   color: #1a1a2e;
   font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
 }
@@ -10,6 +10,7 @@ page {
   min-height: 100vh;
   box-sizing: border-box;
   padding: 24rpx 24rpx 64rpx;
+  background-color: transparent;
 }
 
 /* === 头部信息卡（翡翠绿实底） === */

pages/order/index.less

@@ -9,12 +9,6 @@
 @accent: #1abc9c;
 @accent-end: #17c3a5;
 
-@pending: #e6a23c;
-@confirmed: #409eff;
-@in-progress: #67c23a;
-@completed: #7c5cfc;
-@cancelled: #b0b0b0;
-
 page {
   background-color: @bg;
   color: @dark;
@@ -26,13 +20,16 @@ page {
   display: flex;
   flex-direction: column;
   background: @bg;
+  padding: 24rpx 24rpx 0;
+  box-sizing: border-box;
 }
 
-/* === 顶部 === */
+/* === 顶部（home 同款翡翠绿圆角卡片） === */
 .header {
-  background: linear-gradient(135deg, #2dd36f 0%, #17c3a5 100%);
+  background: linear-gradient(135deg, #29b785 0%, #1a8a63 100%);
-  box-shadow: 0 8rpx 24rpx rgba(23, 195, 165, 0.25);
+  border-radius: 28rpx;
-  padding: 60rpx 40rpx 70rpx;
+  box-shadow: 0 12rpx 32rpx rgba(26, 138, 99, 0.25);
+  padding: 36rpx 32rpx;
   position: relative;
   overflow: hidden;
   display: flex;
@@ -69,7 +66,7 @@ page {
 
 .header-title {
   display: block;
-  font-size: 44rpx;
+  font-size: 36rpx;
   font-weight: 700;
   color: #fff;
   letter-spacing: 2rpx;
@@ -78,8 +75,8 @@ page {
 
 .header-sub {
   display: block;
-  font-size: 26rpx;
+  font-size: 22rpx;
-  color: rgba(255, 255, 255, 0.5);
+  color: rgba(255, 255, 255, 0.65);
   font-weight: 300;
   letter-spacing: 1rpx;
 }
@@ -98,9 +95,7 @@ page {
 
 /* === 筛选栏 === */
 .filter-bar {
-  background: @card;
+  padding: 24rpx 0 0;
-  padding: 20rpx 0;
-  border-bottom: 1rpx solid @border;
 }
 
 .filter-scroll {
@@ -117,11 +112,12 @@ page {
   display: inline-flex;
   align-items: center;
   padding: 12rpx 28rpx;
-  background: @bg;
+  background: #ffffff;
   border-radius: 28rpx;
   font-size: 24rpx;
   color: @muted;
-  border: 1rpx solid transparent;
+  border: 1rpx solid rgba(31, 61, 56, 0.06);
+  box-shadow: 0 4rpx 12rpx rgba(31, 61, 56, 0.05);
   transition: all 0.25s;
 
   &.active {
@@ -160,17 +156,27 @@ page {
 
 .list-scroll {
   height: 100%;
-  padding: 0 24rpx;
 }
 
-.loading-box,
+.loading-box {
-.empty-box {
   display: flex;
   align-items: center;
   justify-content: center;
   padding: 200rpx 40rpx;
 }
 
+.empty-box {
+  margin-top: 24rpx;
+  background: @card;
+  border-radius: 24rpx;
+  border: 1rpx solid rgba(31, 61, 56, 0.06);
+  box-shadow: 0 6rpx 20rpx rgba(31, 61, 56, 0.07);
+  padding: 64rpx 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 .loading-text {
   color: @muted !important;
   font-size: 26rpx !important;
@@ -200,11 +206,14 @@ page {
   margin-bottom: 20rpx;
   background: @card;
   border-radius: 24rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+  border: 1rpx solid rgba(31, 61, 56, 0.06);
-  overflow: hidden;
+  box-shadow: 0 6rpx 20rpx rgba(31, 61, 56, 0.07);
+  padding: 24rpx 32rpx;
+  transition: transform 0.3s cubic-bezier(0.32, 0.72, 0, 1), box-shadow 0.3s cubic-bezier(0.32, 0.72, 0, 1);
 
   &:active {
-    opacity: 0.92;
+    transform: scale(0.98);
+    box-shadow: 0 4rpx 12rpx rgba(31, 61, 56, 0.08);
   }
 }
 
@@ -212,7 +221,7 @@ page {
   display: flex;
   justify-content: flex-end;
   align-items: center;
-  padding: 20rpx 28rpx 0;
+  margin-bottom: 12rpx;
 }
 
 .order-no {
@@ -225,38 +234,38 @@ page {
 .status-badge {
   font-size: 22rpx;
   padding: 6rpx 20rpx;
-  border-radius: 24rpx;
+  border-radius: 30rpx;
   font-weight: 500;
 }
 
 .status-pending {
-  background: #fff8e6;
+  background: #fdf3e0;
-  color: @pending;
+  color: #d99a2b;
 }
 
 .status-confirmed {
-  background: #ecf5ff;
+  background: #e9f1f8;
-  color: @confirmed;
+  color: #5c88a8;
 }
 
 .status-in_progress {
-  background: #f0f9eb;
+  background: #e6f4ee;
-  color: @in-progress;
+  color: #43a08a;
 }
 
 .status-completed {
-  background: #f4f0ff;
+  background: #efedf6;
-  color: @completed;
+  color: #8a7bb5;
 }
 
 .status-cancelled {
   background: #f5f5f5;
-  color: @cancelled;
+  color: #b0b0b0;
 }
 
 /* === 卡片主体 === */
 .card-main {
-  padding: 0 28rpx;
+  padding: 0;
 }
 
 .patient-line {
@@ -357,8 +366,8 @@ page {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 20rpx 28rpx 24rpx;
+  padding: 20rpx 0 4rpx;
-  margin-top: 8rpx;
+  margin-top: 16rpx;
   border-top: 1rpx solid @border;
 }
 

pages/order/orderDetail.wxss

@@ -43,19 +43,19 @@ page {
 }
 
 .status-header.status-pending {
-  background: linear-gradient(135deg, #e6a23c 0%, #f5b041 100%);
+  background: linear-gradient(135deg, #f0b352 0%, #d99a2b 100%);
 }
 
 .status-header.status-confirmed {
-  background: linear-gradient(135deg, #409eff 0%, #66b1ff 100%);
+  background: linear-gradient(135deg, #74a3c4 0%, #5c88a8 100%);
 }
 
 .status-header.status-in_progress {
-  background: linear-gradient(135deg, #67c23a 0%, #85ce61 100%);
+  background: linear-gradient(135deg, #55b39c 0%, #43a08a 100%);
 }
 
 .status-header.status-completed {
-  background: linear-gradient(135deg, #7c5cfc 0%, #9b7dff 100%);
+  background: linear-gradient(135deg, #9a8ac4 0%, #8a7bb5 100%);
 }
 
 .status-header.status-cancelled {
@@ -112,9 +112,10 @@ page {
 
 .info-card {
   background: #ffffff;
-  border-radius: 8rpx;
+  border-radius: 24rpx;
-  padding: 28rpx;
+  border: 1rpx solid rgba(31, 61, 56, 0.06);
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+  padding: 28rpx 32rpx;
+  box-shadow: 0 6rpx 20rpx rgba(31, 61, 56, 0.07);
 }
 
 .info-row {

pages/order/orderEdit.js

@@ -11,8 +11,8 @@ Page({
     isEdit: false,
     form: {
       hospital: { name: '', department: '', doctor: '' },
-      schedule: { date: '' },
+      schedule: { date: '', startTime: '08:30' },
-      escort: { serviceName: '' },
+      escort: { serviceId: -1, serviceName: '' },
       payment: { totalFee: '' },
       notes: { patientNote: '' }
     },
@@ -24,6 +24,7 @@ Page({
     profileList: [],
     filteredProfiles: [],
     profileKeyword: '',
+    serviceOptions: [],
     today: '',
     submitting: false
   },
@@ -37,6 +38,7 @@ Page({
     const now = new Date()
     const today = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`
     this.setData({ today })
+    this.loadServices()
 
     if (options && options.orderId) {
       // 编辑模式
@@ -176,8 +178,14 @@ Page({
               department: (order.hospital && order.hospital.department) || '',
               doctor: (order.hospital && order.hospital.doctor) || ''
             },
-            schedule: { date: this.formatDate(order.schedule && order.schedule.date) },
+            schedule: {
-            escort: { serviceName: (order.escort && order.escort.serviceName) || '' },
+              date: this.formatDate(order.schedule && order.schedule.date),
+              startTime: (order.schedule && order.schedule.startTime) || '08:30'
+            },
+            escort: {
+              serviceId: (order.escort && order.escort.serviceId) || -1,
+              serviceName: (order.escort && order.escort.serviceName) || ''
+            },
             payment: {
               totalFee: order.payment && order.payment.totalFee ? String(order.payment.totalFee) : '',
               paid: !!(order.payment && order.payment.status === 'paid')
@@ -242,6 +250,39 @@ Page({
     this.setData({ 'form.schedule.date': e.detail.value })
   },
 
+  /**
+   * 开始时间选择
+   */
+  onTimeChange(e) {
+    this.setData({ 'form.schedule.startTime': e.detail.value })
+  },
+
+  /**
+   * 加载陪诊服务列表（供服务名称下拉选择）
+   */
+  loadServices() {
+    API.resource.getServices()
+      .then(res => {
+        if (res.code !== 0) return
+        this.setData({ serviceOptions: (res.data && res.data.services) || [] })
+      })
+      .catch(err => {
+        console.error('获取服务列表失败', err)
+      })
+  },
+
+  /**
+   * 服务名称选择：同时记录服务ID与服务名称
+   */
+  onServiceChange(e) {
+    const svc = this.data.serviceOptions[Number(e.detail.value)]
+    if (!svc) return
+    this.setData({
+      'form.escort.serviceId': svc.id,
+      'form.escort.serviceName': svc.title
+    })
+  },
+
   /**
    * 是否已支付切换
    */
@@ -289,10 +330,11 @@ Page({
       },
       schedule: {
         date: form.schedule.date,
+        startTime: form.schedule.startTime || '',
         duration: 60
       },
       escort: {
-        serviceId: -1,
+        serviceId: form.escort.serviceId || -1,
         serviceName: form.escort.serviceName
       },
       payment: {
@@ -337,6 +379,8 @@ Page({
       'hospital.department': form.hospital.department,
       'hospital.doctor': form.hospital.doctor,
       'schedule.date': form.schedule.date,
+      'schedule.startTime': form.schedule.startTime || '',
+      'escort.serviceId': form.escort.serviceId || -1,
       'escort.serviceName': form.escort.serviceName,
       'payment.totalFee': form.payment.totalFee ? Number(form.payment.totalFee) : 0,
       'payment.paidFee': form.payment.paid ? (form.payment.totalFee ? Number(form.payment.totalFee) : 0) : 0,

pages/order/orderEdit.less

@@ -20,9 +20,10 @@ page {
 .profile-brief {
   background: #ffffff;
   border-radius: 24rpx;
+  border: 1rpx solid rgba(31, 61, 56, 0.06);
   padding: 28rpx 32rpx;
   margin-bottom: 24rpx;
-  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04);
+  box-shadow: 0 6rpx 20rpx rgba(31, 61, 56, 0.07);
 }
 
 .brief-tags {
@@ -147,7 +148,7 @@ page {
   display: flex;
   align-items: center;
   padding: 24rpx 0;
-  border-bottom: 1rpx solid #f0f0f2;
+  border-bottom: 1rpx solid #f0f1f5;
 }
 
 .picker-item:last-child {
@@ -211,25 +212,45 @@ page {
 }
 
 .section {
-  background: #ffffff;
+  margin-bottom: 32rpx;
-  border-radius: 24rpx;
-  padding: 0 32rpx;
-  margin-bottom: 24rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
 }
 
+/* home 同款绿色竖条标题 */
 .section-title {
-  font-size: 32rpx;
+  position: relative;
-  font-weight: 700;
+  font-size: 30rpx;
+  font-weight: 600;
   color: #1a1a1a;
-  padding: 28rpx 0 12rpx;
+  margin-bottom: 16rpx;
+  margin-left: 20rpx;
+  letter-spacing: 1rpx;
+
+  &::before {
+    content: '';
+    position: absolute;
+    left: -20rpx;
+    top: 50%;
+    transform: translateY(-50%);
+    width: 8rpx;
+    height: 28rpx;
+    border-radius: 4rpx;
+    background: linear-gradient(180deg, #2dd36f, #17c3a5);
+  }
+}
+
+.info-card {
+  background: #ffffff;
+  border-radius: 24rpx;
+  border: 1rpx solid rgba(31, 61, 56, 0.06);
+  padding: 8rpx 32rpx;
+  box-shadow: 0 6rpx 20rpx rgba(31, 61, 56, 0.07);
 }
 
 .field {
   display: flex;
   align-items: center;
   min-height: 96rpx;
-  border-bottom: 1rpx solid #f0f0f2;
+  border-bottom: 1rpx solid #f0f1f5;
 }
 
 .field:last-child {

pages/order/orderEdit.wxml

@@ -39,7 +39,7 @@
     <!-- 就诊信息 -->
     <view class="section">
       <view class="section-title">就诊信息</view>
-
+      <view class="info-card">
         <view class="field">
           <text class="field-label">医院</text>
           <input class="field-input" placeholder="请输入医院名称" value="{{form.hospital.name}}" data-key="hospital.name" bindinput="onInput" />
@@ -64,15 +64,31 @@
             </view>
           </picker>
         </view>
+
+        <view class="field">
+          <text class="field-label">开始时间</text>
+          <picker class="field-picker" mode="time" value="{{form.schedule.startTime}}" bindchange="onTimeChange">
+            <view class="field-value {{form.schedule.startTime ? '' : 'placeholder'}}">
+              {{form.schedule.startTime || '请选择开始时间(选填)'}}
+              <text class="arrow">›</text>
+            </view>
+          </picker>
+        </view>
+      </view>
     </view>
 
     <!-- 服务信息 -->
     <view class="section">
       <view class="section-title">服务信息</view>
-
+      <view class="info-card">
         <view class="field">
           <text class="field-label">服务名称</text>
-        <input class="field-input" placeholder="请输入服务名称" value="{{form.escort.serviceName}}" data-key="escort.serviceName" bindinput="onInput" />
+          <picker class="field-picker" mode="selector" range="{{serviceOptions}}" range-key="title" bindchange="onServiceChange">
+            <view class="field-value {{form.escort.serviceName ? '' : 'placeholder'}}">
+              {{form.escort.serviceName || '请选择服务'}}
+              <text class="arrow">›</text>
+            </view>
+          </picker>
         </view>
 
         <view class="field">
@@ -93,6 +109,7 @@
           <textarea class="field-area" placeholder="请输入备注信息(选填)" value="{{form.notes.patientNote}}" data-key="notes.patientNote" bindinput="onInput" />
         </view>
       </view>
+    </view>
 
     <!-- 提交 -->
     <view class="submit-btn" bindtap="onSubmit">{{isEdit ? '保存修改' : '提交订单'}}</view>

pages/set/index.js

@@ -15,9 +15,7 @@ Page({
     menuList: [
       { icon: 'user', title: '个人资料', url: '/pages/me/index' },
       { icon: 'notification', title: '消息通知', url: '' },
-      { icon: 'lock-on', title: '账号安全', url: '' },
       { icon: 'help-circle', title: '帮助中心', url: '' },
-      { icon: 'info-circle', title: '关于我们', url: '' },
     ]
   },
 

pages/set/index.wxss

@@ -1,5 +1,5 @@
 page {
-  background: linear-gradient(180deg, #eaf6f1 0%, #f5f6fa 360rpx);
+  background: #ededed;
   color: #1a1a2e;
   font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
 }

utils/api.js

@@ -2,12 +2,12 @@ const request = require('./request.js')
 
 const API = {
   user: {
-    wxGetPhoneNumber: (data) => request.post('/user/wxgetphonenumber', data),
+    wxGetPhoneNumber: (data) => request.post('https://api.huashengtec.com/user/wxgetphonenumber', data),
-    wxSignin: (data) => request.post('/user/wxsignin', data, { skipAuthWait: true }),
+    wxSignin: (data) => request.post('https://api.huashengtec.com/user/wxsignin', data, { skipAuthWait: true }),
-    signout: (data) => request.post('/user/signout', data),
+    signout: (data) => request.post('https://api.huashengtec.com/user/signout', data),
-    update: (data) => request.post('/user/update', data),
+    update: (data) => request.post('https://api.huashengtec.com/user/update', data),
-    userInfo: (data) => request.post('/user/userInfo', data),
+    userInfo: (data) => request.post('https://api.huashengtec.com/user/userInfo', data),
-    userList: (data) => request.post('/user/list', data),
+    userList: (data) => request.post('https://api.huashengtec.com/user/list', data),
   },
 
   escort: {