Merge branch 'master' of http://git.fmode.cn:3000/yuebuzu/s202226701018

wisdom-app/src/app/tab3/tab3.page.html

@@ -16,23 +16,30 @@
   (ionInput)="searchProducts($event)">
 </ion-searchbar>
 
-  <!-- 分类区域（可横向滑动） -->
-  <div class="category-scroll">
-    <div class="category-scroll-inner">
-      <ion-grid>
-        <ion-row class="category-row">
-          <ion-col size="3" *ngFor="let category of categories" class="category-col">
-            <div class="category-item" (click)="onCategoryClick(category)">
-              <div class="category-image-wrapper">
-                <img [src]="category.image" alt="{{category.name}}" class="category-image">
-              </div>
-              <div class="category-text">{{ category.name }}</div>
+ <!-- 分类区域（可横向滑动） -->
+<div class="category-scroll">
+  <div class="category-scroll-inner">
+    <ion-grid>
+      <ion-row class="category-row">
+        <ion-col 
+          size="3" 
+          size-sm="3" 
+          size-md="3" 
+          size-lg="3" 
+          size-xl="3" 
+          *ngFor="let category of categories" 
+          class="category-col">
+          <div class="category-item" (click)="onCategoryClick(category)">
+            <div class="category-image-wrapper">
+              <img [src]="category.image" alt="{{category.name}}" class="category-image">
             </div>
-          </ion-col>
-        </ion-row>
-      </ion-grid>
-    </div>
+            <div class="category-text">{{ category.name }}</div>
+          </div>
+        </ion-col>
+      </ion-row>
+    </ion-grid>
   </div>
+</div>
 
 <!-- 热销模块 -->
 <div class="marketing-section">
@@ -81,9 +88,7 @@
     <ion-button fill="clear" (click)="viewMore('special')">查看更多</ion-button>
   </div>
 </div>
-<div>
 
-</div>
 <!-- 商品卡片列表区域 -->
 <div class="product-container">
   <ng-container *ngFor="let product of products">

wisdom-app/src/app/tab3/tab3.page.scss

@@ -1,10 +1,10 @@
-// 整体背景渐变，可以根据需要调整或移除
+/* 整体背景渐变，可以根据需要调整或移除 */
 .content-background {
   background: linear-gradient(to bottom, #e0f7fa, #ffffff);
   --padding-bottom: 0;
 }
 
-// 标题栏相关样式
+/* 标题栏相关样式 */
 .custom-toolbar {
   --background: transparent;
   display: flex;
@@ -23,7 +23,7 @@
   font-family: "微软雅黑", sans-serif;
 }
 
-// 搜索栏区域样式
+/* 搜索栏区域样式 */
 .search-container {
   padding: 0 16px;
   margin-top: 8px;
@@ -35,7 +35,16 @@
   box-shadow: 0 2px 6px rgba(0,0,0,0.1);
 }
 
-// 分类区域（可横向滚动）
+/* 分类区域（可横向滚动） */
+.category-scroll {
+  overflow-x: auto; /* 如果需要横向滚动 */
+  width: 100%;
+}
+
+.category-scroll-inner {
+  width: 100%;
+}
+
 .category-row {
   margin: 0;
 }
@@ -46,6 +55,8 @@
   align-items: center;
   text-align: center;
   margin-bottom: 16px; 
+  max-width: 25%; /* 确保每个列最大宽度为25%，即四个一行 */
+  flex: 0 0 25%; /* 防止列自动扩展 */
 }
 
 .category-item {
@@ -55,11 +66,17 @@
   justify-content: center;
   text-align: center;
   cursor: pointer; /* 可选：让鼠标移上去有点击手势 */
+  width: 100%; /* 占满整个列 */
+}
+
+.category-image-wrapper {
+  width: 80px; /* 设定一个固定的宽度和高度 */
+  height: 80px;
 }
 
 .category-image {
-  max-width: 90%;
-  max-height: 90%;
+  width: 100%;
+  height: 100%;
   object-fit: contain; 
 }
 
@@ -72,7 +89,7 @@
   max-width: 100%;
 }
 
-// 商品列表区域样式
+/* 商品列表区域样式 */
 .product-container {
   padding: 0 16px;
   margin-top: 16px;
@@ -116,7 +133,7 @@
 .product-image {
   width: 100%;
   height: 100%;
-  // object-fit: cover;
+  /* object-fit: cover; */
 }
 
 .product-info {
@@ -141,7 +158,7 @@
   font-weight: bold;
 }
 
-// 底部弹窗(modal)样式
+/* 底部弹窗(modal)样式 */
 .bottom-modal {
   --height: 75vh;
   --width: 100%;

wisdom-server/migration/data.js

@@ -1159,7 +1159,7 @@ module.exports.DrugList = [
       "function": "抗菌消炎，用于敏感菌引起的感染",
       "spec": "0.25g*10片/盒",
       "composition": "头孢克肟",
-      "taboo": "对头孢菌素过敏者禁用"
+      "taboo": "对头孢菌素过敏者禁用",
   },
   {
       "objectId": "002",
@@ -1171,7 +1171,8 @@ module.exports.DrugList = [
       "function": "解热镇痛，用于轻至中度疼痛",
       "spec": "200mg*10粒/盒",
       "composition": "布洛芬",
-      "taboo": "孕妇、哺乳期妇女慎用"
+      "taboo": "孕妇、哺乳期妇女慎用",
+      "marketing": "special" 
   },
   {
       "objectId": "003",
@@ -1183,8 +1184,101 @@ module.exports.DrugList = [
       "function": "抗过敏，用于缓解鼻炎症状",
       "spec": "10mg*10片/盒",
       "composition": "氯雷他定",
-      "taboo": "对本品成分过敏者禁用"
+      "taboo": "对本品成分过敏者禁用",
+      "marketing": "special" 
   },
+  {
+    "objectId": "004",
+    "name": "阿莫西林胶囊",
+    "price": "¥40",
+    "image": "https://img1.baidu.com/it/u=285032516,1257588176&fm=253&fmt=auto&app=120&f=JPEG?w=800&h=800",
+    "prescription": true,
+    "usage": "口服，每次1粒，每日3次",
+    "function": "抗菌消炎，用于敏感菌引起的感染",
+    "spec": "500mg*10粒/瓶",
+    "composition": "阿莫西林",
+    "taboo": "对青霉素类药物过敏者禁用",
+    "marketing": "hot"
+  },
+  {
+    "objectId": "005",
+    "name": "感冒灵颗粒",
+    "price": "¥25",
+    "image": "https://img0.baidu.com/it/u=1196302112,3635932670&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500",
+    "prescription": false,
+    "usage": "口服，每次1袋，每日3次",
+    "function": "缓解感冒症状，减轻头痛、咳嗽、流感症状",
+    "spec": "10g*12袋/盒",
+    "composition": "氯苯那敏、对乙酰氨基酚",
+    "taboo": "孕妇、哺乳期妇女慎用",
+    "marketing": "hot",
+
+  },
+  {
+    "objectId": "006",
+    "name": "硝呋太尔片",
+    "price": "¥60",
+    "image": "http://t14.baidu.com/it/u=804604368,3931341753&fm=224&app=112&f=JPEG?w=500&h=500",
+    "prescription": true,
+    "usage": "口服，每次1片，每日2次",
+    "function": "抗菌消炎，用于泌尿系统感染",
+    "spec": "0.2g*20片/盒",
+    "composition": "硝呋太尔",
+    "taboo": "孕妇、哺乳期妇女慎用"
+  },
+  {
+    "objectId": "007",
+    "name": "复方氯雷他定片",
+    "price": "¥35",
+    "image": "https://drug-platform.cdn.bcebos.com/drug-platform/online/drug/d1708155468458393265.jpg?x-bce-process=image/auto-orient,o_1/resize,w_1242,limit_1/quality,Q_85/format,f_auto",
+    "prescription": false,
+    "usage": "口服，每次1片，每日1次",
+    "function": "缓解过敏症状，如鼻炎、皮肤过敏",
+    "spec": "5mg+5mg*10片/盒",
+    "composition": "氯雷他定、伪麻黄碱",
+    "taboo": "对本品成分过敏者禁用"
+  },
+  {
+    "objectId": "008",
+    "name": "泮托拉唑钠肠溶片",
+    "price": "¥45",
+    "image": "http://t14.baidu.com/it/u=872318615,816279038&fm=224&app=112&f=JPEG?w=500&h=500",
+    "prescription": true,
+    "usage": "口服，每次1片，每日1次",
+    "function": "抗酸药，用于治疗胃酸过多、胃溃疡等",
+    "spec": "20mg*14片/盒",
+    "composition": "泮托拉唑钠",
+    "taboo": "孕妇、哺乳期妇女慎用"
+  },
+  {
+    "objectId": "009",
+    "name": "马来酸氯苯那敏片",
+    "price": "¥15",
+    "image": "https://img20.360buyimg.com/imgzone/jfs/t1/188854/34/12309/122345/60e6c435Ea107d0be/b065122f38867a10.jpg",
+    "prescription": false,
+    "usage": "口服，每次1片，每日2次",
+    "function": "用于缓解过敏引起的鼻塞、流鼻涕、喷嚏等症状",
+    "spec": "4mg*10片/盒",
+    "composition": "马来酸氯苯那敏",
+    "taboo": "对本品成分过敏者禁用",
+    "marketing": "hot"
+  },
+  {
+    "objectId": "010",
+    "name": "复方甘草片",
+    "price": "¥18",
+    "image": "https://img0.baidu.com/it/u=691273625,453632032&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500",
+    "prescription": false,
+    "usage": "口服，每次2片，每日3次",
+    "function": "用于缓解咳嗽、喉咙痛等症状",
+    "spec": "10g*20片/盒",
+    "composition": "甘草、薄荷、桔梗",
+    "taboo": "孕妇、哺乳期妇女慎用",
+    "marketing": "hot"
+  },
+
+  // parse-dashboard --appId dev --masterKey devmk --serverURL http://dev.fmode.cn:1337/parse --appName DevServer
+  // http://127.0.0.1:4040/
 ];
 
 // module.exports.AgentList = [

wisdom-server/migration/import-data.js

@@ -12,7 +12,7 @@ DataMap = {
 };
 
 async function inportDapartAndDoctor() {
-    导入药品数据
+    // 导入药品数据
     let drugList = DrugList;
     for (let index = 0; index < drugList.length; index++) {
         let drug = drugList[index];